Completed
Push — master ( b1de3e...465722 )
by Yannick
28:21
created
require/class.Stats.php 3 patches
Doc Comments   +35 added lines patch added patch discarded remove patch
@@ -19,6 +19,10 @@  discard block
 block discarded – undo
19 19
 		if ($this->db === null) die('Error: No DB connection. (Stats)');
20 20
 	}
21 21
 
22
+	/**
23
+	 * @param string $type
24
+	 * @param string $stats_date
25
+	 */
22 26
 	public function addLastStatsUpdate($type,$stats_date) {
23 27
 		$query = "DELETE FROM config WHERE name = :type;
24 28
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
@@ -1369,6 +1373,10 @@  discard block
 block discarded – undo
1369 1373
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1370 1374
 		return $all;
1371 1375
 	}
1376
+
1377
+	/**
1378
+	 * @param string $type
1379
+	 */
1372 1380
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1373 1381
 		if ($filter_name == '') $filter_name = $this->filter_name;
1374 1382
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1380,6 +1388,11 @@  discard block
 block discarded – undo
1380 1388
 			echo "error : ".$e->getMessage();
1381 1389
 		}
1382 1390
 	}
1391
+
1392
+	/**
1393
+	 * @param string $type
1394
+	 * @param string $year
1395
+	 */
1383 1396
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1384 1397
 		if ($filter_name == '') $filter_name = $this->filter_name;
1385 1398
 		global $globalArchiveMonths, $globalDBdriver;
@@ -1579,6 +1592,10 @@  discard block
 block discarded – undo
1579 1592
 		else return 0;
1580 1593
 	}
1581 1594
 
1595
+	/**
1596
+	 * @param string $type
1597
+	 * @param string $stats_date
1598
+	 */
1582 1599
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1583 1600
 		global $globalDBdriver;
1584 1601
 		if ($filter_name == '') $filter_name = $this->filter_name;
@@ -1632,6 +1649,9 @@  discard block
 block discarded – undo
1632 1649
         }
1633 1650
         */
1634 1651
 
1652
+	/**
1653
+	 * @param string $stats_type
1654
+	 */
1635 1655
 	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
1636 1656
 		global $globalDBdriver;
1637 1657
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
@@ -1675,6 +1695,9 @@  discard block
 block discarded – undo
1675 1695
 		return $all;
1676 1696
 	}
1677 1697
 
1698
+	/**
1699
+	 * @param string $stats_type
1700
+	 */
1678 1701
 	public function addStatSource($data,$source_name,$stats_type,$date) {
1679 1702
 		global $globalDBdriver;
1680 1703
 		if ($globalDBdriver == 'mysql') {
@@ -1690,6 +1713,10 @@  discard block
 block discarded – undo
1690 1713
 			return "error : ".$e->getMessage();
1691 1714
 		}
1692 1715
 	}
1716
+
1717
+	/**
1718
+	 * @param string $type
1719
+	 */
1693 1720
 	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1694 1721
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1695 1722
 		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
@@ -1956,6 +1983,10 @@  discard block
 block discarded – undo
1956 1983
 			return "error : ".$e->getMessage();
1957 1984
 		}
1958 1985
 	}
1986
+
1987
+	/**
1988
+	 * @param string $type
1989
+	 */
1959 1990
 	public function deleteStatFlight($type) {
1960 1991
 		$query = "DELETE FROM stats_flight WHERE stats_type = :type";
1961 1992
 		$query_values = array(':type' => $type);
@@ -1966,6 +1997,10 @@  discard block
 block discarded – undo
1966 1997
 			return "error : ".$e->getMessage();
1967 1998
 		}
1968 1999
 	}
2000
+
2001
+	/**
2002
+	 * @param string $type
2003
+	 */
1969 2004
 	public function deleteStatAirport($type) {
1970 2005
 		$query = "DELETE FROM stats_airport WHERE stats_type = :type";
1971 2006
 		$query_values = array(':type' => $type);
Please login to merge, or discard this patch.
Spacing   +548 added lines, -548 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@  discard block
 block discarded – undo
19 19
 		if ($this->db === null) die('Error: No DB connection. (Stats)');
20 20
 	}
21 21
 
22
-	public function addLastStatsUpdate($type,$stats_date) {
22
+	public function addLastStatsUpdate($type, $stats_date) {
23 23
 		$query = "DELETE FROM config WHERE name = :type;
24 24
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
25
-		$query_values = array('type' => $type,':stats_date' => $stats_date);
25
+		$query_values = array('type' => $type, ':stats_date' => $stats_date);
26 26
 		try {
27 27
 			$sth = $this->db->prepare($query);
28 28
 			$sth->execute($query_values);
29
-		} catch(PDOException $e) {
29
+		} catch (PDOException $e) {
30 30
 			return "error : ".$e->getMessage();
31 31
 		}
32 32
 	}
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		try {
37 37
 			$sth = $this->db->prepare($query);
38 38
 			$sth->execute(array(':type' => $type));
39
-		} catch(PDOException $e) {
39
+		} catch (PDOException $e) {
40 40
 			echo "error : ".$e->getMessage();
41 41
 		}
42 42
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		try {
58 58
 			$sth = $this->db->prepare($query);
59 59
 			$sth->execute(array(':filter_name' => $filter_name));
60
-		} catch(PDOException $e) {
60
+		} catch (PDOException $e) {
61 61
 			return "error : ".$e->getMessage();
62 62
 		}
63 63
 	}
@@ -70,14 +70,14 @@  discard block
 block discarded – undo
70 70
 		try {
71 71
 			$sth = $this->db->prepare($query);
72 72
 			$sth->execute();
73
-		} catch(PDOException $e) {
73
+		} catch (PDOException $e) {
74 74
 			return "error : ".$e->getMessage();
75 75
 		}
76 76
 		$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;";
77 77
 		try {
78 78
 			$sth = $this->db->prepare($query);
79 79
 			$sth->execute(array(':filter_name' => $filter_name));
80
-		} catch(PDOException $e) {
80
+		} catch (PDOException $e) {
81 81
 			return "error : ".$e->getMessage();
82 82
 		}
83 83
 	}
@@ -89,77 +89,77 @@  discard block
 block discarded – undo
89 89
 		 try {
90 90
 			$sth = $this->db->prepare($query);
91 91
 			$sth->execute(array(':filter_name' => $filter_name));
92
-		} catch(PDOException $e) {
92
+		} catch (PDOException $e) {
93 93
 			echo "error : ".$e->getMessage();
94 94
 		}
95 95
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
96 96
 		if (empty($all)) {
97 97
 			$filters = array();
98 98
 			if ($filter_name != '') {
99
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
99
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
100 100
 			}
101 101
 			$Spotter = new Spotter($this->db);
102
-			$all = $Spotter->getAllAirlineNames('',NULL,$filters);
102
+			$all = $Spotter->getAllAirlineNames('', NULL, $filters);
103 103
 		}
104 104
 		return $all;
105 105
 	}
106
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
106
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
107 107
 		if ($filter_name == '') $filter_name = $this->filter_name;
108 108
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
109 109
 		try {
110 110
 			$sth = $this->db->prepare($query);
111
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
112
-		} catch(PDOException $e) {
111
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
112
+		} catch (PDOException $e) {
113 113
 			echo "error : ".$e->getMessage();
114 114
 		}
115 115
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
116 116
 		return $all;
117 117
 	}
118
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
118
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
119 119
 		if ($filter_name == '') $filter_name = $this->filter_name;
120 120
 		$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";
121 121
 		try {
122 122
 			$sth = $this->db->prepare($query);
123
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
124
-		} catch(PDOException $e) {
123
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
124
+		} catch (PDOException $e) {
125 125
 			echo "error : ".$e->getMessage();
126 126
 		}
127 127
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
128 128
 		return $all;
129 129
 	}
130
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
130
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
131 131
 		if ($filter_name == '') $filter_name = $this->filter_name;
132 132
 		$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";
133 133
 		try {
134 134
 			$sth = $this->db->prepare($query);
135
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
136
-		} catch(PDOException $e) {
135
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
136
+		} catch (PDOException $e) {
137 137
 			echo "error : ".$e->getMessage();
138 138
 		}
139 139
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
140 140
 		return $all;
141 141
 	}
142 142
 
143
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
143
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
144 144
 		if ($filter_name == '') $filter_name = $this->filter_name;
145 145
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
146 146
 		try {
147 147
 			$sth = $this->db->prepare($query);
148
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
149
-		} catch(PDOException $e) {
148
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
149
+		} catch (PDOException $e) {
150 150
 			echo "error : ".$e->getMessage();
151 151
 		}
152 152
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
153 153
 		return $all;
154 154
 	}
155 155
 
156
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
156
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
157 157
 		if ($filter_name == '') $filter_name = $this->filter_name;
158 158
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
159 159
 		try {
160 160
 			$sth = $this->db->prepare($query);
161
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
162
-		} catch(PDOException $e) {
161
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
162
+		} catch (PDOException $e) {
163 163
 			echo "error : ".$e->getMessage();
164 164
 		}
165 165
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -167,23 +167,23 @@  discard block
 block discarded – undo
167 167
 	}
168 168
 
169 169
 
170
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
170
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
171 171
 		global $globalStatsFilters;
172 172
 		if ($filter_name == '') $filter_name = $this->filter_name;
173
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
173
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
174 174
 			$Spotter = new Spotter($this->db);
175
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
175
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
176 176
 			$alliance_airlines = array();
177 177
 			foreach ($airlines as $airline) {
178
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
178
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
179 179
 			}
180 180
 			if ($year == '' && $month == '') {
181
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
181
+				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182
+				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
183 183
 				try {
184 184
 					$sth = $this->db->prepare($query);
185 185
 					$sth->execute(array(':filter_name' => $filter_name));
186
-				} catch(PDOException $e) {
186
+				} catch (PDOException $e) {
187 187
 					echo "error : ".$e->getMessage();
188 188
 				}
189 189
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -194,29 +194,29 @@  discard block
 block discarded – undo
194 194
 				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
195 195
 				try {
196 196
 					$sth = $this->db->prepare($query);
197
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
198
-				} catch(PDOException $e) {
197
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
198
+				} catch (PDOException $e) {
199 199
 					echo "error : ".$e->getMessage();
200 200
 				}
201 201
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
202 202
 			} else $all = array();
203 203
 		}
204 204
 		if (empty($all)) {
205
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
206
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
205
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
206
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
207 207
 			} else {
208
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
208
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
209 209
 			}
210 210
 			if ($filter_name != '') {
211
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
211
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
212 212
 			}
213 213
 			$Spotter = new Spotter($this->db);
214 214
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
215
-			$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
215
+			$all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
216 216
 		}
217 217
 		return $all;
218 218
 	}
219
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
219
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
220 220
 		global $globalStatsFilters;
221 221
 		if ($filter_name == '') $filter_name = $this->filter_name;
222 222
 		if ($year == '' && $month == '') {
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 			try {
226 226
 				$sth = $this->db->prepare($query);
227 227
 				$sth->execute(array(':filter_name' => $filter_name));
228
-			} catch(PDOException $e) {
228
+			} catch (PDOException $e) {
229 229
 				echo "error : ".$e->getMessage();
230 230
 			}
231 231
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -233,32 +233,32 @@  discard block
 block discarded – undo
233 233
 		if (empty($all)) {
234 234
 			$Spotter = new Spotter($this->db);
235 235
 			$filters = array();
236
-			$filters = array('year' => $year,'month' => $month);
236
+			$filters = array('year' => $year, 'month' => $month);
237 237
 			if ($filter_name != '') {
238
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
238
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
239 239
 			}
240 240
 			//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
241
-			$all = $Spotter->countAllAirlineCountries($limit,$filters);
241
+			$all = $Spotter->countAllAirlineCountries($limit, $filters);
242 242
 		}
243 243
 		return $all;
244 244
 	}
245
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
245
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
246 246
 		global $globalStatsFilters;
247 247
 		if ($filter_name == '') $filter_name = $this->filter_name;
248
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
248
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
249 249
 			$Spotter = new Spotter($this->db);
250
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
250
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
251 251
 			$alliance_airlines = array();
252 252
 			foreach ($airlines as $airline) {
253
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
253
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
254 254
 			}
255 255
 			if ($year == '' && $month == '') {
256
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
256
+				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257
+				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
258 258
 				try {
259 259
 					$sth = $this->db->prepare($query);
260 260
 					$sth->execute(array(':filter_name' => $filter_name));
261
-				} catch(PDOException $e) {
261
+				} catch (PDOException $e) {
262 262
 					echo "error : ".$e->getMessage();
263 263
 				}
264 264
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -269,21 +269,21 @@  discard block
 block discarded – undo
269 269
 				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
270 270
 				try {
271 271
 					$sth = $this->db->prepare($query);
272
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
273
-				} catch(PDOException $e) {
272
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
273
+				} catch (PDOException $e) {
274 274
 					echo "error : ".$e->getMessage();
275 275
 				}
276 276
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
277 277
 			} else $all = array();
278 278
 		}
279 279
 		if (empty($all)) {
280
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
281
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
280
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
281
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
282 282
 			} else {
283
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
283
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
284 284
 			}
285 285
 			if ($filter_name != '') {
286
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
286
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
287 287
 			}
288 288
 			$Spotter = new Spotter($this->db);
289 289
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
@@ -292,23 +292,23 @@  discard block
 block discarded – undo
292 292
 		return $all;
293 293
 	}
294 294
 
295
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
295
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
296 296
 		global $globalStatsFilters;
297 297
 		if ($filter_name == '') $filter_name = $this->filter_name;
298
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
298
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
299 299
 			$Spotter = new Spotter($this->db);
300
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
300
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
301 301
 			$alliance_airlines = array();
302 302
 			foreach ($airlines as $airline) {
303
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
303
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
304 304
 			}
305 305
 			if ($year == '' && $month == '') {
306
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
306
+				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307
+				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
308 308
 				try {
309 309
 					$sth = $this->db->prepare($query);
310 310
 					$sth->execute(array(':filter_name' => $filter_name));
311
-				} catch(PDOException $e) {
311
+				} catch (PDOException $e) {
312 312
 					echo "error : ".$e->getMessage();
313 313
 				}
314 314
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -319,61 +319,61 @@  discard block
 block discarded – undo
319 319
 				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
320 320
 				try {
321 321
 					$sth = $this->db->prepare($query);
322
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
323
-				} catch(PDOException $e) {
322
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
323
+				} catch (PDOException $e) {
324 324
 					echo "error : ".$e->getMessage();
325 325
 				}
326 326
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
327 327
 			} else $all = array();
328 328
 		}
329 329
 		if (empty($all)) {
330
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
331
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
330
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
331
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
332 332
 			} else {
333
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
333
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
334 334
 			}
335 335
 			if ($filter_name != '') {
336
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
336
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
337 337
 			}
338 338
 			$Spotter = new Spotter($this->db);
339 339
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
340
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
340
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
341 341
 		}
342 342
 		return $all;
343 343
 	}
344 344
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
345 345
 		global $globalStatsFilters;
346 346
 		if ($filter_name == '') $filter_name = $this->filter_name;
347
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
347
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
348 348
 			$Spotter = new Spotter($this->db);
349
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
349
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
350 350
 			$alliance_airlines = array();
351 351
 			foreach ($airlines as $airline) {
352
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
352
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
353 353
 			}
354
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
354
+			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355
+			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
356 356
 			$query_values = array(':filter_name' => $filter_name);
357 357
 		} else {
358 358
 			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";
359 359
 			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";
360
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
360
+			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
361 361
 		}
362 362
 		try {
363 363
 			$sth = $this->db->prepare($query);
364 364
 			$sth->execute($query_values);
365
-		} catch(PDOException $e) {
365
+		} catch (PDOException $e) {
366 366
 			echo "error : ".$e->getMessage();
367 367
 		}
368 368
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
369 369
 		if (empty($all)) {
370
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
371
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
370
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
371
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
372 372
 			} else {
373
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
373
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
374 374
 			}
375 375
 			if ($filter_name != '') {
376
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
376
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
377 377
 			}
378 378
 			$Spotter = new Spotter($this->db);
379 379
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 		return $all;
383 383
 	}
384 384
 
385
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
385
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
386 386
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
387 387
 		if ($filter_name == '') $filter_name = $this->filter_name;
388 388
 		if ($year == '' && $month == '') {
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 			if (isset($forsource)) {
392 392
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
393 393
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
394
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
394
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
395 395
 			} else {
396 396
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
397 397
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 			try {
401 401
 				$sth = $this->db->prepare($query);
402 402
 				$sth->execute($query_values);
403
-			} catch(PDOException $e) {
403
+			} catch (PDOException $e) {
404 404
 				echo "error : ".$e->getMessage();
405 405
 			}
406 406
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -408,32 +408,32 @@  discard block
 block discarded – undo
408 408
                 if (empty($all)) {
409 409
 	                $Spotter = new Spotter($this->db);
410 410
             		$filters = array();
411
-			$filters = array('year' => $year,'month' => $month);
411
+			$filters = array('year' => $year, 'month' => $month);
412 412
             		if ($filter_name != '') {
413
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
413
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
414 414
 			}
415 415
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
416
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
416
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
417 417
                 }
418 418
                 return $all;
419 419
 	}
420
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
420
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
421 421
 		global $globalStatsFilters;
422 422
 		if ($filter_name == '') $filter_name = $this->filter_name;
423
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
423
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
424 424
 			$Spotter = new Spotter($this->db);
425
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
425
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
426 426
 			$alliance_airlines = array();
427 427
 			foreach ($airlines as $airline) {
428
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
428
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
429 429
 			}
430 430
 			if ($year == '' && $month == '') {
431
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
431
+				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432
+				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
433 433
 				try {
434 434
 					$sth = $this->db->prepare($query);
435 435
 					$sth->execute(array(':filter_name' => $filter_name));
436
-				} catch(PDOException $e) {
436
+				} catch (PDOException $e) {
437 437
 					echo "error : ".$e->getMessage();
438 438
 				}
439 439
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -444,45 +444,45 @@  discard block
 block discarded – undo
444 444
 				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
445 445
 				try {
446 446
 					$sth = $this->db->prepare($query);
447
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
448
-				} catch(PDOException $e) {
447
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
448
+				} catch (PDOException $e) {
449 449
 					echo "error : ".$e->getMessage();
450 450
 				}
451 451
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
452 452
 			} else $all = array();
453 453
 		}
454 454
 		if (empty($all)) {
455
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
456
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
455
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
456
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
457 457
 			} else {
458
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
458
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
459 459
 			}
460 460
 			if ($filter_name != '') {
461
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
461
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
462 462
 			}
463 463
 			$Spotter = new Spotter($this->db);
464 464
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
465
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
465
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
466 466
 		}
467 467
 		return $all;
468 468
 	}
469
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
469
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
470 470
 		global $globalStatsFilters;
471 471
 		if ($filter_name == '') $filter_name = $this->filter_name;
472
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
472
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
473 473
 			$Spotter = new Spotter($this->db);
474
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
474
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
475 475
 			$alliance_airlines = array();
476 476
 			foreach ($airlines as $airline) {
477
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
477
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
478 478
 			}
479 479
 			if ($year == '' && $month == '') {
480
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
480
+				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481
+				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
482 482
 				 try {
483 483
 					$sth = $this->db->prepare($query);
484 484
 					$sth->execute(array(':filter_name' => $filter_name));
485
-				} catch(PDOException $e) {
485
+				} catch (PDOException $e) {
486 486
 					echo "error : ".$e->getMessage();
487 487
 				}
488 488
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -493,46 +493,46 @@  discard block
 block discarded – undo
493 493
 				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
494 494
 				 try {
495 495
 					$sth = $this->db->prepare($query);
496
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
497
-				} catch(PDOException $e) {
496
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
497
+				} catch (PDOException $e) {
498 498
 					echo "error : ".$e->getMessage();
499 499
 				}
500 500
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
501 501
 			} else $all = array();
502 502
 		}
503 503
 		if (empty($all)) {
504
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
505
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
504
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
505
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
506 506
 			} else {
507
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
507
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
508 508
 			}
509 509
 			if ($filter_name != '') {
510
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
510
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
511 511
 			}
512 512
 			$Spotter = new Spotter($this->db);
513 513
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
514
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
514
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
515 515
 		}
516 516
 		return $all;
517 517
 	}
518
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
518
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
519 519
 		$Connection = new Connection($this->db);
520 520
 		if ($filter_name == '') $filter_name = $this->filter_name;
521 521
 		if ($Connection->tableExists('countries')) {
522
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
522
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
523 523
 				$Spotter = new Spotter($this->db);
524
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
524
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
525 525
 				if ($year == '' && $month == '') {
526 526
 					$alliance_airlines = array();
527 527
 					foreach ($airlines as $airline) {
528
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
528
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
529 529
 					}
530
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
530
+					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531
+					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
532 532
 					 try {
533 533
 						$sth = $this->db->prepare($query);
534 534
 						$sth->execute(array(':filter_name' => $filter_name));
535
-					} catch(PDOException $e) {
535
+					} catch (PDOException $e) {
536 536
 						echo "error : ".$e->getMessage();
537 537
 					}
538 538
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -544,8 +544,8 @@  discard block
 block discarded – undo
544 544
 					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
545 545
 					 try {
546 546
 						$sth = $this->db->prepare($query);
547
-						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
548
-					} catch(PDOException $e) {
547
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
548
+					} catch (PDOException $e) {
549 549
 						echo "error : ".$e->getMessage();
550 550
 					}
551 551
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
 			return array();
563 563
 		}
564 564
 	}
565
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
565
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
566 566
 		global $globalStatsFilters;
567 567
 		if ($filter_name == '') $filter_name = $this->filter_name;
568 568
 		if ($year == '' && $month == '') {
@@ -570,41 +570,41 @@  discard block
 block discarded – undo
570 570
 			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
571 571
 			try {
572 572
 				$sth = $this->db->prepare($query);
573
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
574
-			} catch(PDOException $e) {
573
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
574
+			} catch (PDOException $e) {
575 575
 				echo "error : ".$e->getMessage();
576 576
 			}
577 577
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
578 578
 		} else $all = array();
579 579
 		if (empty($all)) {
580
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
580
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
581 581
 			if ($filter_name != '') {
582
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
582
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
583 583
 			}
584 584
 			$Spotter = new Spotter($this->db);
585 585
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
586
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
586
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
587 587
 		}
588 588
 		return $all;
589 589
 	}
590 590
 
591
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
591
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
592 592
 		global $globalStatsFilters;
593 593
 		if ($filter_name == '') $filter_name = $this->filter_name;
594
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
594
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
595 595
 			$Spotter = new Spotter($this->db);
596
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
596
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
597 597
 			if ($year == '' && $month == '') {
598 598
 				$alliance_airlines = array();
599 599
 				foreach ($airlines as $airline) {
600
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
600
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
601 601
 				}
602
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
602
+				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603
+				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
604 604
 				try {
605 605
 					$sth = $this->db->prepare($query);
606 606
 					$sth->execute(array(':filter_name' => $filter_name));
607
-				} catch(PDOException $e) {
607
+				} catch (PDOException $e) {
608 608
 					echo "error : ".$e->getMessage();
609 609
 				}
610 610
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -615,45 +615,45 @@  discard block
 block discarded – undo
615 615
 				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
616 616
 				try {
617 617
 					$sth = $this->db->prepare($query);
618
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
619
-				} catch(PDOException $e) {
618
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
619
+				} catch (PDOException $e) {
620 620
 					echo "error : ".$e->getMessage();
621 621
 				}
622 622
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
623 623
 			} else $all = array();
624 624
 		}
625 625
 		if (empty($all)) {
626
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
627
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
626
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
627
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
628 628
 			} else {
629
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
629
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
630 630
 			}
631 631
 			if ($filter_name != '') {
632
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
632
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
633 633
 			}
634 634
 			$Spotter = new Spotter($this->db);
635 635
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
636
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
636
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
637 637
 		}
638 638
 		return $all;
639 639
 	}
640
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
640
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
641 641
 		global $globalStatsFilters;
642 642
 		if ($filter_name == '') $filter_name = $this->filter_name;
643
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
643
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
644 644
 			$Spotter = new Spotter($this->db);
645
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
645
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
646 646
 			if ($year == '' && $month == '') {
647 647
 				$alliance_airlines = array();
648 648
 				foreach ($airlines as $airline) {
649
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
649
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
650 650
 				}
651
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
651
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
653 653
 				try {
654 654
 					$sth = $this->db->prepare($query);
655 655
 					$sth->execute(array(':filter_name' => $filter_name));
656
-				} catch(PDOException $e) {
656
+				} catch (PDOException $e) {
657 657
 					echo "error : ".$e->getMessage();
658 658
 				}
659 659
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -664,27 +664,27 @@  discard block
 block discarded – undo
664 664
 				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
665 665
 				try {
666 666
 					$sth = $this->db->prepare($query);
667
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
668
-				} catch(PDOException $e) {
667
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
668
+				} catch (PDOException $e) {
669 669
 					echo "error : ".$e->getMessage();
670 670
 				}
671 671
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
672 672
 			} else $all = array();
673 673
 		}
674 674
 		if (empty($all)) {
675
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
676
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
675
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
676
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
677 677
 			} else {
678
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
678
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
679 679
 			}
680 680
 			if ($filter_name != '') {
681
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
681
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
682 682
 			}
683 683
 			$Spotter = new Spotter($this->db);
684 684
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
685 685
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
686
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
687
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
686
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
687
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
688 688
 			$all = array();
689 689
 			foreach ($pall as $value) {
690 690
 				$icao = $value['airport_departure_icao'];
@@ -700,27 +700,27 @@  discard block
 block discarded – undo
700 700
 			foreach ($all as $key => $row) {
701 701
 				$count[$key] = $row['airport_departure_icao_count'];
702 702
 			}
703
-			array_multisort($count,SORT_DESC,$all);
703
+			array_multisort($count, SORT_DESC, $all);
704 704
 		}
705 705
 		return $all;
706 706
 	}
707
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
707
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
708 708
 		global $globalStatsFilters;
709 709
 		if ($filter_name == '') $filter_name = $this->filter_name;
710
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
710
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
711 711
 			$Spotter = new Spotter($this->db);
712
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
712
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
713 713
 			if ($year == '' && $month == '') {
714 714
 				$alliance_airlines = array();
715 715
 				foreach ($airlines as $airline) {
716
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
716
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
717 717
 				}
718
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
718
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
720 720
 				try {
721 721
 					$sth = $this->db->prepare($query);
722 722
 					$sth->execute(array(':filter_name' => $filter_name));
723
-				} catch(PDOException $e) {
723
+				} catch (PDOException $e) {
724 724
 					echo "error : ".$e->getMessage();
725 725
 				}
726 726
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -731,27 +731,27 @@  discard block
 block discarded – undo
731 731
 				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
732 732
 				try {
733 733
 					$sth = $this->db->prepare($query);
734
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
735
-				} catch(PDOException $e) {
734
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
735
+				} catch (PDOException $e) {
736 736
 					echo "error : ".$e->getMessage();
737 737
 				}
738 738
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
739 739
 			} else $all = array();
740 740
 		}
741 741
 		if (empty($all)) {
742
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
743
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
742
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
743
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
744 744
 			} else {
745
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
745
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
746 746
 			}
747 747
 			if ($filter_name != '') {
748
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
748
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
749 749
 			}
750 750
 			$Spotter = new Spotter($this->db);
751 751
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
752 752
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
753
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
754
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
753
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
754
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
755 755
 			$all = array();
756 756
 			foreach ($pall as $value) {
757 757
 				$icao = $value['airport_arrival_icao'];
@@ -767,26 +767,26 @@  discard block
 block discarded – undo
767 767
 			foreach ($all as $key => $row) {
768 768
 				$count[$key] = $row['airport_arrival_icao_count'];
769 769
 			}
770
-			array_multisort($count,SORT_DESC,$all);
770
+			array_multisort($count, SORT_DESC, $all);
771 771
 		}
772 772
 		return $all;
773 773
 	}
774
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
774
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
775 775
 		global $globalDBdriver, $globalStatsFilters;
776 776
 		if ($filter_name == '') $filter_name = $this->filter_name;
777
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
777
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
778 778
 			$Spotter = new Spotter($this->db);
779
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
779
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
780 780
 			$alliance_airlines = array();
781 781
 			foreach ($airlines as $airline) {
782
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
782
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
783 783
 			}
784 784
 			if ($globalDBdriver == 'mysql') {
785
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
785
+				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786
+				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
787 787
 			} else {
788
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
788
+				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789
+				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
790 790
 			}
791 791
 			$query_data = array(':filter_name' => $filter_name);
792 792
 		} else {
@@ -797,23 +797,23 @@  discard block
 block discarded – undo
797 797
 				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
798 798
 				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";
799 799
 			}
800
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
800
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
801 801
 		}
802 802
 		try {
803 803
 			$sth = $this->db->prepare($query);
804 804
 			$sth->execute($query_data);
805
-		} catch(PDOException $e) {
805
+		} catch (PDOException $e) {
806 806
 			echo "error : ".$e->getMessage();
807 807
 		}
808 808
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
809 809
 		if (empty($all)) {
810
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
811
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
810
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
811
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
812 812
 			} else {
813 813
 				$filters = array('airlines' => array($stats_airline));
814 814
 			}
815 815
 			if ($filter_name != '') {
816
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
816
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
817 817
 			}
818 818
 			$Spotter = new Spotter($this->db);
819 819
 			$all = $Spotter->countAllMonthsLastYear($filters);
@@ -821,57 +821,57 @@  discard block
 block discarded – undo
821 821
 		return $all;
822 822
 	}
823 823
 	
824
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
824
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
825 825
 		global $globalStatsFilters;
826 826
 		if ($filter_name == '') $filter_name = $this->filter_name;
827
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
827
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
828 828
 			$Spotter = new Spotter($this->db);
829
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
829
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
830 830
 			$alliance_airlines = array();
831 831
 			foreach ($airlines as $airline) {
832
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
832
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
833 833
 			}
834
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
834
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
835 835
 			$query_data = array(':filter_name' => $filter_name);
836 836
 		} else {
837 837
 			$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";
838
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
838
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
839 839
 		}
840 840
 		try {
841 841
 			$sth = $this->db->prepare($query);
842 842
 			$sth->execute($query_data);
843
-		} catch(PDOException $e) {
843
+		} catch (PDOException $e) {
844 844
 			echo "error : ".$e->getMessage();
845 845
 		}
846 846
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
847 847
 		if (empty($all)) {
848
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
849
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
848
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
849
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
850 850
 			} else {
851 851
 				$filters = array('airlines' => array($stats_airline));
852 852
 			}
853 853
 			if ($filter_name != '') {
854
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
854
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
855 855
 			}
856 856
 			$Spotter = new Spotter($this->db);
857 857
 			$all = $Spotter->countAllDatesLastMonth($filters);
858 858
 		}
859 859
 		return $all;
860 860
 	}
861
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
861
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
862 862
 		global $globalDBdriver, $globalStatsFilters;
863 863
 		if ($filter_name == '') $filter_name = $this->filter_name;
864
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
864
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
865 865
 			$Spotter = new Spotter($this->db);
866
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
866
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
867 867
 			$alliance_airlines = array();
868 868
 			foreach ($airlines as $airline) {
869
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
869
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
870 870
 			}
871 871
 			if ($globalDBdriver == 'mysql') {
872
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
872
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
873 873
 			} else {
874
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
874
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
875 875
 			}
876 876
 			$query_data = array(':filter_name' => $filter_name);
877 877
 		} else {
@@ -880,60 +880,60 @@  discard block
 block discarded – undo
880 880
 			} else {
881 881
 				$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";
882 882
 			}
883
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
883
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
884 884
 		}
885 885
 		try {
886 886
 			$sth = $this->db->prepare($query);
887 887
 			$sth->execute($query_data);
888
-		} catch(PDOException $e) {
888
+		} catch (PDOException $e) {
889 889
 			echo "error : ".$e->getMessage();
890 890
 		}
891 891
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
892 892
 		if (empty($all)) {
893
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
894
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
893
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
894
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
895 895
 			} else {
896 896
 				$filters = array('airlines' => array($stats_airline));
897 897
 			}
898 898
 			if ($filter_name != '') {
899
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
899
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
900 900
 			}
901 901
 			$Spotter = new Spotter($this->db);
902 902
 			$all = $Spotter->countAllDatesLast7Days($filters);
903 903
 		}
904 904
 		return $all;
905 905
 	}
906
-	public function countAllDates($stats_airline = '',$filter_name = '') {
906
+	public function countAllDates($stats_airline = '', $filter_name = '') {
907 907
 		global $globalStatsFilters;
908 908
 		if ($filter_name == '') $filter_name = $this->filter_name;
909
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
909
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
910 910
 			$Spotter = new Spotter($this->db);
911
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
911
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
912 912
 			$alliance_airlines = array();
913 913
 			foreach ($airlines as $airline) {
914
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
914
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
915 915
 			}
916
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
916
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
917 917
 			$query_data = array(':filter_name' => $filter_name);
918 918
 		} else {
919 919
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
920
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
920
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
921 921
 		}
922 922
 		try {
923 923
 			$sth = $this->db->prepare($query);
924 924
 			$sth->execute($query_data);
925
-		} catch(PDOException $e) {
925
+		} catch (PDOException $e) {
926 926
 			echo "error : ".$e->getMessage();
927 927
 		}
928 928
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
929 929
 		if (empty($all)) {
930
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
931
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
930
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
931
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
932 932
 			} else {
933 933
 				$filters = array('airlines' => array($stats_airline));
934 934
 			}
935 935
 			if ($filter_name != '') {
936
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
936
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
937 937
 			}
938 938
 			$Spotter = new Spotter($this->db);
939 939
 			$all = $Spotter->countAllDates($filters);
@@ -948,34 +948,34 @@  discard block
 block discarded – undo
948 948
 		try {
949 949
 			$sth = $this->db->prepare($query);
950 950
 			$sth->execute($query_data);
951
-		} catch(PDOException $e) {
951
+		} catch (PDOException $e) {
952 952
 			echo "error : ".$e->getMessage();
953 953
 		}
954 954
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
955 955
 		if (empty($all)) {
956 956
 			$filters = array();
957 957
 			if ($filter_name != '') {
958
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
958
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
959 959
 			}
960 960
 			$Spotter = new Spotter($this->db);
961 961
 			$all = $Spotter->countAllDatesByAirlines($filters);
962 962
 		}
963 963
 		return $all;
964 964
 	}
965
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
965
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
966 966
 		global $globalStatsFilters, $globalDBdriver;
967 967
 		if ($filter_name == '') $filter_name = $this->filter_name;
968
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
968
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
969 969
 			$Spotter = new Spotter($this->db);
970
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
970
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
971 971
 			$alliance_airlines = array();
972 972
 			foreach ($airlines as $airline) {
973
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
973
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
974 974
 			}
975 975
 			if ($globalDBdriver == 'mysql') {
976
-				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
976
+				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
977 977
 			} else {
978
-				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
978
+				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
979 979
 			}
980 980
 			$query_data = array(':filter_name' => $filter_name);
981 981
 		} else {
@@ -989,18 +989,18 @@  discard block
 block discarded – undo
989 989
 		try {
990 990
 			$sth = $this->db->prepare($query);
991 991
 			$sth->execute($query_data);
992
-		} catch(PDOException $e) {
992
+		} catch (PDOException $e) {
993 993
 			echo "error : ".$e->getMessage();
994 994
 		}
995 995
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
996 996
 		if (empty($all)) {
997
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
998
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
997
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
998
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
999 999
 			} else {
1000 1000
 				$filters = array('airlines' => array($stats_airline));
1001 1001
 			}
1002 1002
 			if ($filter_name != '') {
1003
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1003
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1004 1004
 			}
1005 1005
 			$Spotter = new Spotter($this->db);
1006 1006
 			$all = $Spotter->countAllMonths($filters);
@@ -1017,7 +1017,7 @@  discard block
 block discarded – undo
1017 1017
 		try {
1018 1018
 			$sth = $this->db->prepare($query);
1019 1019
 			$sth->execute();
1020
-		} catch(PDOException $e) {
1020
+		} catch (PDOException $e) {
1021 1021
 			echo "error : ".$e->getMessage();
1022 1022
 		}
1023 1023
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1037,7 +1037,7 @@  discard block
 block discarded – undo
1037 1037
 		try {
1038 1038
 			$sth = $this->db->prepare($query);
1039 1039
 			$sth->execute();
1040
-		} catch(PDOException $e) {
1040
+		} catch (PDOException $e) {
1041 1041
 			echo "error : ".$e->getMessage();
1042 1042
 		}
1043 1043
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1054,32 +1054,32 @@  discard block
 block discarded – undo
1054 1054
 		try {
1055 1055
 			$sth = $this->db->prepare($query);
1056 1056
 			$sth->execute(array(':filter_name' => $filter_name));
1057
-		} catch(PDOException $e) {
1057
+		} catch (PDOException $e) {
1058 1058
 			echo "error : ".$e->getMessage();
1059 1059
 		}
1060 1060
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1061 1061
 		if (empty($all)) {
1062 1062
 			$filters = array();
1063 1063
 			if ($filter_name != '') {
1064
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1064
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1065 1065
 			}
1066 1066
 			$Spotter = new Spotter($this->db);
1067 1067
 			$all = $Spotter->countAllMilitaryMonths($filters);
1068 1068
 		}
1069 1069
 		return $all;
1070 1070
 	}
1071
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1071
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
1072 1072
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1073 1073
 		if ($filter_name == '') $filter_name = $this->filter_name;
1074
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1074
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1075 1075
 			$Spotter = new Spotter($this->db);
1076
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1076
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1077 1077
 			$alliance_airlines = array();
1078 1078
 			foreach ($airlines as $airline) {
1079
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1079
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1080 1080
 			}
1081
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1081
+			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082
+			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1083 1083
 			$query_data = array(':filter_name' => $filter_name);
1084 1084
 		} else {
1085 1085
 			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1097,37 +1097,37 @@  discard block
 block discarded – undo
1097 1097
 		try {
1098 1098
 			$sth = $this->db->prepare($query);
1099 1099
 			$sth->execute($query_data);
1100
-		} catch(PDOException $e) {
1100
+		} catch (PDOException $e) {
1101 1101
 			echo "error : ".$e->getMessage();
1102 1102
 		}
1103 1103
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1104 1104
 		if (empty($all)) {
1105
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1106
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1105
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1106
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1107 1107
 			} else {
1108 1108
 				$filters = array('airlines' => array($stats_airline));
1109 1109
 			}
1110 1110
 			if ($filter_name != '') {
1111
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1111
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1112 1112
 			}
1113 1113
 			$Spotter = new Spotter($this->db);
1114
-			$all = $Spotter->countAllHours($orderby,$filters);
1114
+			$all = $Spotter->countAllHours($orderby, $filters);
1115 1115
 		}
1116 1116
 		return $all;
1117 1117
 	}
1118
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1118
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1119 1119
 		global $globalStatsFilters;
1120 1120
 		if ($filter_name == '') $filter_name = $this->filter_name;
1121 1121
 		if ($year == '') $year = date('Y');
1122
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1122
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
1123 1123
 		if (empty($all)) {
1124
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1125
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1124
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1125
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1126 1126
 			} else {
1127
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1127
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1128 1128
 			}
1129 1129
 			if ($filter_name != '') {
1130
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1130
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1131 1131
 			}
1132 1132
 			$Spotter = new Spotter($this->db);
1133 1133
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
@@ -1135,16 +1135,16 @@  discard block
 block discarded – undo
1135 1135
 		}
1136 1136
 		return $all;
1137 1137
 	}
1138
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1138
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
1139 1139
 		global $globalStatsFilters;
1140 1140
 		if ($filter_name == '') $filter_name = $this->filter_name;
1141 1141
 		if ($year == '') $year = date('Y');
1142
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1142
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
1143 1143
 		if (empty($all)) {
1144 1144
 			$filters = array();
1145
-			$filters = array('year' => $year,'month' => $month);
1145
+			$filters = array('year' => $year, 'month' => $month);
1146 1146
 			if ($filter_name != '') {
1147
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1147
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1148 1148
 			}
1149 1149
 			$Spotter = new Spotter($this->db);
1150 1150
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
@@ -1152,19 +1152,19 @@  discard block
 block discarded – undo
1152 1152
 		}
1153 1153
 		return $all;
1154 1154
 	}
1155
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1155
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1156 1156
 		global $globalStatsFilters;
1157 1157
 		if ($filter_name == '') $filter_name = $this->filter_name;
1158 1158
 		if ($year == '') $year = date('Y');
1159
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1159
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
1160 1160
 		if (empty($all)) {
1161
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1162
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1161
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1162
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1163 1163
 			} else {
1164
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1164
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1165 1165
 			}
1166 1166
 			if ($filter_name != '') {
1167
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1167
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1168 1168
 			}
1169 1169
 			$Spotter = new Spotter($this->db);
1170 1170
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
@@ -1172,48 +1172,48 @@  discard block
 block discarded – undo
1172 1172
 		}
1173 1173
 		return $all;
1174 1174
 	}
1175
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1175
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1176 1176
 		global $globalStatsFilters;
1177 1177
 		if ($filter_name == '') $filter_name = $this->filter_name;
1178
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1178
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1179 1179
 			$Spotter = new Spotter($this->db);
1180
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1180
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1181 1181
 			if ($year == '' && $month == '') {
1182 1182
 				$alliance_airlines = array();
1183 1183
 				foreach ($airlines as $airline) {
1184
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1184
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1185 1185
 				}
1186
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1186
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1187 1187
 				try {
1188 1188
 					$sth = $this->db->prepare($query);
1189 1189
 					$sth->execute(array(':filter_name' => $filter_name));
1190
-				} catch(PDOException $e) {
1190
+				} catch (PDOException $e) {
1191 1191
 					echo "error : ".$e->getMessage();
1192 1192
 				}
1193 1193
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1194 1194
 				$all = $result[0]['nb'];
1195
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1195
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1196 1196
 		} else {
1197 1197
 			if ($year == '' && $month == '') {
1198 1198
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1199 1199
 				try {
1200 1200
 					$sth = $this->db->prepare($query);
1201
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
1202
-				} catch(PDOException $e) {
1201
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
1202
+				} catch (PDOException $e) {
1203 1203
 					echo "error : ".$e->getMessage();
1204 1204
 				}
1205 1205
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1206 1206
 				$all = $result[0]['nb'];
1207
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1207
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1208 1208
 		}
1209 1209
 		if (empty($all)) {
1210
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1211
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1210
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1211
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1212 1212
 			} else {
1213
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1213
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1214 1214
 			}
1215 1215
 			if ($filter_name != '') {
1216
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1216
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1217 1217
 			}
1218 1218
 			$Spotter = new Spotter($this->db);
1219 1219
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
@@ -1221,7 +1221,7 @@  discard block
 block discarded – undo
1221 1221
 		}
1222 1222
 		return $all;
1223 1223
 	}
1224
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1224
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
1225 1225
 		global $globalStatsFilters;
1226 1226
 		if ($filter_name == '') $filter_name = $this->filter_name;
1227 1227
 		if ($year == '' && $month == '') {
@@ -1229,17 +1229,17 @@  discard block
 block discarded – undo
1229 1229
 			try {
1230 1230
 				$sth = $this->db->prepare($query);
1231 1231
 				$sth->execute(array(':filter_name' => $filter_name));
1232
-			} catch(PDOException $e) {
1232
+			} catch (PDOException $e) {
1233 1233
 				echo "error : ".$e->getMessage();
1234 1234
 			}
1235 1235
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1236 1236
 			$all = $result[0]['nb_airline'];
1237
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1237
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
1238 1238
 		if (empty($all)) {
1239 1239
 			$filters = array();
1240
-			$filters = array('year' => $year,'month' => $month);
1240
+			$filters = array('year' => $year, 'month' => $month);
1241 1241
 			if ($filter_name != '') {
1242
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1242
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1243 1243
 			}
1244 1244
 			$Spotter = new Spotter($this->db);
1245 1245
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -1247,29 +1247,29 @@  discard block
 block discarded – undo
1247 1247
 		}
1248 1248
 		return $all;
1249 1249
 	}
1250
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1250
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1251 1251
 		global $globalStatsFilters;
1252 1252
 		if ($filter_name == '') $filter_name = $this->filter_name;
1253
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1253
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1254 1254
 			$Spotter = new Spotter($this->db);
1255
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1255
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1256 1256
 			if ($year == '' && $month == '') {
1257 1257
 				$alliance_airlines = array();
1258 1258
 				foreach ($airlines as $airline) {
1259
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1259
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1260 1260
 				}
1261
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1261
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1262 1262
 				$query_values = array(':filter_name' => $filter_name);
1263 1263
 				try {
1264 1264
 					$sth = $this->db->prepare($query);
1265 1265
 					$sth->execute($query_values);
1266
-				} catch(PDOException $e) {
1266
+				} catch (PDOException $e) {
1267 1267
 					echo "error : ".$e->getMessage();
1268 1268
 				}
1269 1269
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1270 1270
 				$all = $result[0]['nb'];
1271 1271
 			} else {
1272
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1272
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1273 1273
 			}
1274 1274
 		} else {
1275 1275
 			if ($year == '' && $month == '') {
@@ -1278,23 +1278,23 @@  discard block
 block discarded – undo
1278 1278
 				try {
1279 1279
 					$sth = $this->db->prepare($query);
1280 1280
 					$sth->execute($query_values);
1281
-				} catch(PDOException $e) {
1281
+				} catch (PDOException $e) {
1282 1282
 					echo "error : ".$e->getMessage();
1283 1283
 				}
1284 1284
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1285 1285
 				$all = $result[0]['nb'];
1286 1286
 			} else {
1287
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1287
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1288 1288
 			}
1289 1289
 		}
1290 1290
 		if (empty($all)) {
1291
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1292
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1291
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1292
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1293 1293
 			} else {
1294
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1294
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1295 1295
 			}
1296 1296
 			if ($filter_name != '') {
1297
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1297
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1298 1298
 			}
1299 1299
 			$Spotter = new Spotter($this->db);
1300 1300
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
@@ -1302,7 +1302,7 @@  discard block
 block discarded – undo
1302 1302
 		}
1303 1303
 		return $all;
1304 1304
 	}
1305
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1305
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1306 1306
 		global $globalStatsFilters;
1307 1307
 		if ($filter_name == '') $filter_name = $this->filter_name;
1308 1308
 		//if ($year == '') $year = date('Y');
@@ -1312,18 +1312,18 @@  discard block
 block discarded – undo
1312 1312
 			try {
1313 1313
 				$sth = $this->db->prepare($query);
1314 1314
 				$sth->execute($query_values);
1315
-			} catch(PDOException $e) {
1315
+			} catch (PDOException $e) {
1316 1316
 				echo "error : ".$e->getMessage();
1317 1317
 			}
1318 1318
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1319 1319
 			$all = $result[0]['nb'];
1320 1320
 		} else {
1321
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
1321
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
1322 1322
 		}
1323 1323
 		if (empty($all)) {
1324
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1324
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1325 1325
 			if ($filter_name != '') {
1326
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1326
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1327 1327
 			}
1328 1328
 			$Spotter = new Spotter($this->db);
1329 1329
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
@@ -1332,104 +1332,104 @@  discard block
 block discarded – undo
1332 1332
 		return $all;
1333 1333
 	}
1334 1334
 
1335
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1335
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
1336 1336
 		if ($filter_name == '') $filter_name = $this->filter_name;
1337
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1337
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1338 1338
 			$Spotter = new Spotter($this->db);
1339
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1339
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1340 1340
 			$alliance_airlines = array();
1341 1341
 			foreach ($airlines as $airline) {
1342
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1342
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1343 1343
 			}
1344
-			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
1345
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
1344
+			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
1345
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
1346 1346
 		} else {
1347 1347
 			$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";
1348
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1348
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1349 1349
 		}
1350 1350
 		try {
1351 1351
 			$sth = $this->db->prepare($query);
1352 1352
 			$sth->execute($query_values);
1353
-		} catch(PDOException $e) {
1353
+		} catch (PDOException $e) {
1354 1354
 			echo "error : ".$e->getMessage();
1355 1355
 		}
1356 1356
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1357 1357
 		return $all;
1358 1358
 	}
1359
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
1359
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
1360 1360
 		if ($filter_name == '') $filter_name = $this->filter_name;
1361 1361
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1362
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1362
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1363 1363
 		try {
1364 1364
 			$sth = $this->db->prepare($query);
1365 1365
 			$sth->execute($query_values);
1366
-		} catch(PDOException $e) {
1366
+		} catch (PDOException $e) {
1367 1367
 			echo "error : ".$e->getMessage();
1368 1368
 		}
1369 1369
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1370 1370
 		return $all;
1371 1371
 	}
1372
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1372
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
1373 1373
 		if ($filter_name == '') $filter_name = $this->filter_name;
1374 1374
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1375
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1375
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1376 1376
 		try {
1377 1377
 			$sth = $this->db->prepare($query);
1378 1378
 			$sth->execute($query_values);
1379
-		} catch(PDOException $e) {
1379
+		} catch (PDOException $e) {
1380 1380
 			echo "error : ".$e->getMessage();
1381 1381
 		}
1382 1382
 	}
1383
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1383
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
1384 1384
 		if ($filter_name == '') $filter_name = $this->filter_name;
1385 1385
 		global $globalArchiveMonths, $globalDBdriver;
1386
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1386
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1387 1387
 			$Spotter = new Spotter($this->db);
1388
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1388
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1389 1389
 			$alliance_airlines = array();
1390 1390
 			foreach ($airlines as $airline) {
1391
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1391
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1392 1392
 			}
1393 1393
 			if ($globalDBdriver == 'mysql') {
1394 1394
 				if ($month == '') {
1395
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1395
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1396 1396
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1397 1397
 				} else {
1398
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1399
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1398
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1399
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1400 1400
 				}
1401 1401
 			} else {
1402 1402
 				if ($month == '') {
1403
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1403
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1404 1404
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1405 1405
 				} else {
1406
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1407
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1406
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1407
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1408 1408
 				}
1409 1409
 			}
1410 1410
 		} else {
1411 1411
 			if ($globalDBdriver == 'mysql') {
1412 1412
 				if ($month == '') {
1413 1413
 					$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";
1414
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1414
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1415 1415
 				} else {
1416 1416
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
1417
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1417
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1418 1418
 				}
1419 1419
 			} else {
1420 1420
 				if ($month == '') {
1421 1421
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
1422
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1422
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1423 1423
 				} else {
1424 1424
 					$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";
1425
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1425
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1426 1426
 				}
1427 1427
 			}
1428 1428
 		}
1429 1429
 		try {
1430 1430
 			$sth = $this->db->prepare($query);
1431 1431
 			$sth->execute($query_values);
1432
-		} catch(PDOException $e) {
1432
+		} catch (PDOException $e) {
1433 1433
 			echo "error : ".$e->getMessage();
1434 1434
 		}
1435 1435
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1438,17 +1438,17 @@  discard block
 block discarded – undo
1438 1438
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1439 1439
 		global $globalArchiveMonths, $globalDBdriver;
1440 1440
 		if ($filter_name == '') $filter_name = $this->filter_name;
1441
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1441
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1442 1442
 			$Spotter = new Spotter($this->db);
1443
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1443
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1444 1444
 			$alliance_airlines = array();
1445 1445
 			foreach ($airlines as $airline) {
1446
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1446
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1447 1447
 			}
1448 1448
 			if ($globalDBdriver == 'mysql') {
1449
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1449
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1450 1450
 			} else {
1451
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1451
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1452 1452
 			}
1453 1453
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
1454 1454
 		} else {
@@ -1462,7 +1462,7 @@  discard block
 block discarded – undo
1462 1462
 		try {
1463 1463
 			$sth = $this->db->prepare($query);
1464 1464
 			$sth->execute($query_values);
1465
-		} catch(PDOException $e) {
1465
+		} catch (PDOException $e) {
1466 1466
 			echo "error : ".$e->getMessage();
1467 1467
 		}
1468 1468
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1471,17 +1471,17 @@  discard block
 block discarded – undo
1471 1471
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1472 1472
 		global $globalArchiveMonths, $globalDBdriver;
1473 1473
 		if ($filter_name == '') $filter_name = $this->filter_name;
1474
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1474
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1475 1475
 			$Spotter = new Spotter($this->db);
1476
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1476
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1477 1477
 			$alliance_airlines = array();
1478 1478
 			foreach ($airlines as $airline) {
1479
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1479
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1480 1480
 			}
1481 1481
 			if ($globalDBdriver == 'mysql') {
1482
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1482
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1483 1483
 			} else {
1484
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1484
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1485 1485
 			}
1486 1486
 		} else {
1487 1487
 			if ($globalDBdriver == 'mysql') {
@@ -1493,7 +1493,7 @@  discard block
 block discarded – undo
1493 1493
 		try {
1494 1494
 			$sth = $this->db->prepare($query);
1495 1495
 			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1496
-		} catch(PDOException $e) {
1496
+		} catch (PDOException $e) {
1497 1497
 			echo "error : ".$e->getMessage();
1498 1498
 		}
1499 1499
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1510,7 +1510,7 @@  discard block
 block discarded – undo
1510 1510
 		try {
1511 1511
 			$sth = $this->db->prepare($query);
1512 1512
 			$sth->execute(array(':filter_name' => $filter_name));
1513
-		} catch(PDOException $e) {
1513
+		} catch (PDOException $e) {
1514 1514
 			echo "error : ".$e->getMessage();
1515 1515
 		}
1516 1516
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1527,20 +1527,20 @@  discard block
 block discarded – undo
1527 1527
 		try {
1528 1528
 			$sth = $this->db->prepare($query);
1529 1529
 			$sth->execute(array(':filter_name' => $filter_name));
1530
-		} catch(PDOException $e) {
1530
+		} catch (PDOException $e) {
1531 1531
 			echo "error : ".$e->getMessage();
1532 1532
 		}
1533 1533
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1534 1534
 		return $all[0]['total'];
1535 1535
 	}
1536
-	public function getStatsOwner($owner_name,$filter_name = '') {
1536
+	public function getStatsOwner($owner_name, $filter_name = '') {
1537 1537
 		global $globalArchiveMonths, $globalDBdriver;
1538 1538
 		if ($filter_name == '') $filter_name = $this->filter_name;
1539 1539
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1540 1540
 		try {
1541 1541
 			$sth = $this->db->prepare($query);
1542
-			$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1543
-		} catch(PDOException $e) {
1542
+			$sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
1543
+		} catch (PDOException $e) {
1544 1544
 			echo "error : ".$e->getMessage();
1545 1545
 		}
1546 1546
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1558,20 +1558,20 @@  discard block
 block discarded – undo
1558 1558
 		try {
1559 1559
 			$sth = $this->db->prepare($query);
1560 1560
 			$sth->execute(array(':filter_name' => $filter_name));
1561
-		} catch(PDOException $e) {
1561
+		} catch (PDOException $e) {
1562 1562
 			echo "error : ".$e->getMessage();
1563 1563
 		}
1564 1564
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1565 1565
 		return $all[0]['total'];
1566 1566
 	}
1567
-	public function getStatsPilot($pilot,$filter_name = '') {
1567
+	public function getStatsPilot($pilot, $filter_name = '') {
1568 1568
 		global $globalArchiveMonths, $globalDBdriver;
1569 1569
 		if ($filter_name == '') $filter_name = $this->filter_name;
1570 1570
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1571 1571
 		try {
1572 1572
 			$sth = $this->db->prepare($query);
1573
-			$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1574
-		} catch(PDOException $e) {
1573
+			$sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
1574
+		} catch (PDOException $e) {
1575 1575
 			echo "error : ".$e->getMessage();
1576 1576
 		}
1577 1577
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1579,7 +1579,7 @@  discard block
 block discarded – undo
1579 1579
 		else return 0;
1580 1580
 	}
1581 1581
 
1582
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1582
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1583 1583
 		global $globalDBdriver;
1584 1584
 		if ($filter_name == '') $filter_name = $this->filter_name;
1585 1585
 		if ($globalDBdriver == 'mysql') {
@@ -1587,15 +1587,15 @@  discard block
 block discarded – undo
1587 1587
 		} else {
1588 1588
 			$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);"; 
1589 1589
 		}
1590
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1590
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1591 1591
 		try {
1592 1592
 			$sth = $this->db->prepare($query);
1593 1593
 			$sth->execute($query_values);
1594
-		} catch(PDOException $e) {
1594
+		} catch (PDOException $e) {
1595 1595
 			return "error : ".$e->getMessage();
1596 1596
 		}
1597 1597
 	}
1598
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1598
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1599 1599
 		global $globalDBdriver;
1600 1600
 		if ($filter_name == '') $filter_name = $this->filter_name;
1601 1601
 		if ($globalDBdriver == 'mysql') {
@@ -1604,11 +1604,11 @@  discard block
 block discarded – undo
1604 1604
 			//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1605 1605
 			$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);"; 
1606 1606
 		}
1607
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1607
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1608 1608
 		try {
1609 1609
 			$sth = $this->db->prepare($query);
1610 1610
 			$sth->execute($query_values);
1611
-		} catch(PDOException $e) {
1611
+		} catch (PDOException $e) {
1612 1612
 			return "error : ".$e->getMessage();
1613 1613
 		}
1614 1614
 	}
@@ -1632,75 +1632,75 @@  discard block
 block discarded – undo
1632 1632
         }
1633 1633
         */
1634 1634
 
1635
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
1635
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
1636 1636
 		global $globalDBdriver;
1637 1637
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
1638 1638
 		$query_values = array();
1639 1639
 		if ($globalDBdriver == 'mysql') {
1640 1640
 			if ($year != '') {
1641 1641
 				$query .= ' AND YEAR(stats_date) = :year';
1642
-				$query_values = array_merge($query_values,array(':year' => $year));
1642
+				$query_values = array_merge($query_values, array(':year' => $year));
1643 1643
 			}
1644 1644
 			if ($month != '') {
1645 1645
 				$query .= ' AND MONTH(stats_date) = :month';
1646
-				$query_values = array_merge($query_values,array(':month' => $month));
1646
+				$query_values = array_merge($query_values, array(':month' => $month));
1647 1647
 			}
1648 1648
 			if ($day != '') {
1649 1649
 				$query .= ' AND DAY(stats_date) = :day';
1650
-				$query_values = array_merge($query_values,array(':day' => $day));
1650
+				$query_values = array_merge($query_values, array(':day' => $day));
1651 1651
 			}
1652 1652
 		} else {
1653 1653
 			if ($year != '') {
1654 1654
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
1655
-				$query_values = array_merge($query_values,array(':year' => $year));
1655
+				$query_values = array_merge($query_values, array(':year' => $year));
1656 1656
 			}
1657 1657
 			if ($month != '') {
1658 1658
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
1659
-				$query_values = array_merge($query_values,array(':month' => $month));
1659
+				$query_values = array_merge($query_values, array(':month' => $month));
1660 1660
 			}
1661 1661
 			if ($day != '') {
1662 1662
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
1663
-				$query_values = array_merge($query_values,array(':day' => $day));
1663
+				$query_values = array_merge($query_values, array(':day' => $day));
1664 1664
 			}
1665 1665
 		}
1666 1666
 		$query .= " ORDER BY source_name";
1667
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
1667
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
1668 1668
 		try {
1669 1669
 			$sth = $this->db->prepare($query);
1670 1670
 			$sth->execute($query_values);
1671
-		} catch(PDOException $e) {
1671
+		} catch (PDOException $e) {
1672 1672
 			echo "error : ".$e->getMessage();
1673 1673
 		}
1674 1674
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1675 1675
 		return $all;
1676 1676
 	}
1677 1677
 
1678
-	public function addStatSource($data,$source_name,$stats_type,$date) {
1678
+	public function addStatSource($data, $source_name, $stats_type, $date) {
1679 1679
 		global $globalDBdriver;
1680 1680
 		if ($globalDBdriver == 'mysql') {
1681 1681
 			$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";
1682 1682
 		} else {
1683 1683
 			$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);"; 
1684 1684
 		}
1685
-		$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1685
+		$query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
1686 1686
 		try {
1687 1687
 			$sth = $this->db->prepare($query);
1688 1688
 			$sth->execute($query_values);
1689
-		} catch(PDOException $e) {
1689
+		} catch (PDOException $e) {
1690 1690
 			return "error : ".$e->getMessage();
1691 1691
 		}
1692 1692
 	}
1693
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1693
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
1694 1694
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1695
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1695
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1696 1696
 		try {
1697 1697
 			$sth = $this->db->prepare($query);
1698 1698
 			$sth->execute($query_values);
1699
-		} catch(PDOException $e) {
1699
+		} catch (PDOException $e) {
1700 1700
 			return "error : ".$e->getMessage();
1701 1701
 		}
1702 1702
 	}
1703
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
1703
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
1704 1704
 		global $globalDBdriver;
1705 1705
 		if ($globalDBdriver == 'mysql') {
1706 1706
 			if ($reset) {
@@ -1715,15 +1715,15 @@  discard block
 block discarded – undo
1715 1715
 				$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);"; 
1716 1716
 			}
1717 1717
 		}
1718
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1718
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1719 1719
 		try {
1720 1720
 			$sth = $this->db->prepare($query);
1721 1721
 			$sth->execute($query_values);
1722
-		} catch(PDOException $e) {
1722
+		} catch (PDOException $e) {
1723 1723
 			return "error : ".$e->getMessage();
1724 1724
 		}
1725 1725
 	}
1726
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
1726
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1727 1727
 		global $globalDBdriver;
1728 1728
 		if ($globalDBdriver == 'mysql') {
1729 1729
 			if ($reset) {
@@ -1738,15 +1738,15 @@  discard block
 block discarded – undo
1738 1738
 				$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);"; 
1739 1739
 			}
1740 1740
 		}
1741
-		$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1741
+		$query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
1742 1742
 		try {
1743 1743
 			$sth = $this->db->prepare($query);
1744 1744
 			$sth->execute($query_values);
1745
-		} catch(PDOException $e) {
1745
+		} catch (PDOException $e) {
1746 1746
 			return "error : ".$e->getMessage();
1747 1747
 		}
1748 1748
 	}
1749
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
1749
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1750 1750
 		global $globalDBdriver;
1751 1751
 		if ($globalDBdriver == 'mysql') {
1752 1752
 			if ($reset) {
@@ -1761,15 +1761,15 @@  discard block
 block discarded – undo
1761 1761
 				$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);"; 
1762 1762
 			}
1763 1763
 		}
1764
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1764
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
1765 1765
 		try {
1766 1766
 			$sth = $this->db->prepare($query);
1767 1767
 			$sth->execute($query_values);
1768
-		} catch(PDOException $e) {
1768
+		} catch (PDOException $e) {
1769 1769
 			return "error : ".$e->getMessage();
1770 1770
 		}
1771 1771
 	}
1772
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1772
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1773 1773
 		global $globalDBdriver;
1774 1774
 		if ($globalDBdriver == 'mysql') {
1775 1775
 			if ($reset) {
@@ -1784,15 +1784,15 @@  discard block
 block discarded – undo
1784 1784
 				$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);"; 
1785 1785
 			}
1786 1786
 		}
1787
-		$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);
1787
+		$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);
1788 1788
 		try {
1789 1789
 			$sth = $this->db->prepare($query);
1790 1790
 			$sth->execute($query_values);
1791
-		} catch(PDOException $e) {
1791
+		} catch (PDOException $e) {
1792 1792
 			return "error : ".$e->getMessage();
1793 1793
 		}
1794 1794
 	}
1795
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
1795
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
1796 1796
 		global $globalDBdriver;
1797 1797
 		if ($globalDBdriver == 'mysql') {
1798 1798
 			if ($reset) {
@@ -1807,15 +1807,15 @@  discard block
 block discarded – undo
1807 1807
 				$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);"; 
1808 1808
 			}
1809 1809
 		}
1810
-		$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1810
+		$query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1811 1811
 		try {
1812 1812
 			$sth = $this->db->prepare($query);
1813 1813
 			$sth->execute($query_values);
1814
-		} catch(PDOException $e) {
1814
+		} catch (PDOException $e) {
1815 1815
 			return "error : ".$e->getMessage();
1816 1816
 		}
1817 1817
 	}
1818
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
1818
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
1819 1819
 		global $globalDBdriver;
1820 1820
 		if ($globalDBdriver == 'mysql') {
1821 1821
 			if ($reset) {
@@ -1830,15 +1830,15 @@  discard block
 block discarded – undo
1830 1830
 				$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);"; 
1831 1831
 			}
1832 1832
 		}
1833
-		$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1833
+		$query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1834 1834
 		try {
1835 1835
 			$sth = $this->db->prepare($query);
1836 1836
 			$sth->execute($query_values);
1837
-		} catch(PDOException $e) {
1837
+		} catch (PDOException $e) {
1838 1838
 			return "error : ".$e->getMessage();
1839 1839
 		}
1840 1840
 	}
1841
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
1841
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
1842 1842
 		global $globalDBdriver;
1843 1843
 		if ($globalDBdriver == 'mysql') {
1844 1844
 			if ($reset) {
@@ -1853,15 +1853,15 @@  discard block
 block discarded – undo
1853 1853
 				$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);"; 
1854 1854
 			}
1855 1855
 		}
1856
-		$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);
1856
+		$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);
1857 1857
 		try {
1858 1858
 			$sth = $this->db->prepare($query);
1859 1859
 			$sth->execute($query_values);
1860
-		} catch(PDOException $e) {
1860
+		} catch (PDOException $e) {
1861 1861
 			return "error : ".$e->getMessage();
1862 1862
 		}
1863 1863
 	}
1864
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
1864
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
1865 1865
 		global $globalDBdriver;
1866 1866
 		if ($airport_icao != '') {
1867 1867
 			if ($globalDBdriver == 'mysql') {
@@ -1877,16 +1877,16 @@  discard block
 block discarded – undo
1877 1877
 					$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
1878 1878
 				}
1879 1879
 			}
1880
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1880
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1881 1881
 			try {
1882 1882
 				$sth = $this->db->prepare($query);
1883 1883
 				$sth->execute($query_values);
1884
-			} catch(PDOException $e) {
1884
+			} catch (PDOException $e) {
1885 1885
 				return "error : ".$e->getMessage();
1886 1886
 			}
1887 1887
 		}
1888 1888
 	}
1889
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1889
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
1890 1890
 		global $globalDBdriver;
1891 1891
 		if ($airport_icao != '') {
1892 1892
 			if ($globalDBdriver == 'mysql') {
@@ -1894,16 +1894,16 @@  discard block
 block discarded – undo
1894 1894
 			} else {
1895 1895
 				$query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1896 1896
 			}
1897
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1897
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1898 1898
 			 try {
1899 1899
 				$sth = $this->db->prepare($query);
1900 1900
 				$sth->execute($query_values);
1901
-			} catch(PDOException $e) {
1901
+			} catch (PDOException $e) {
1902 1902
 				return "error : ".$e->getMessage();
1903 1903
 			}
1904 1904
 		}
1905 1905
 	}
1906
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
1906
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
1907 1907
 		global $globalDBdriver;
1908 1908
 		if ($airport_icao != '') {
1909 1909
 			if ($globalDBdriver == 'mysql') {
@@ -1919,16 +1919,16 @@  discard block
 block discarded – undo
1919 1919
 					$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);"; 
1920 1920
 				}
1921 1921
 			}
1922
-			$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);
1922
+			$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);
1923 1923
 			try {
1924 1924
 				$sth = $this->db->prepare($query);
1925 1925
 				$sth->execute($query_values);
1926
-			} catch(PDOException $e) {
1926
+			} catch (PDOException $e) {
1927 1927
 				return "error : ".$e->getMessage();
1928 1928
 			}
1929 1929
 		}
1930 1930
 	}
1931
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1931
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
1932 1932
 		global $globalDBdriver;
1933 1933
 		if ($airport_icao != '') {
1934 1934
 			if ($globalDBdriver == 'mysql') {
@@ -1936,11 +1936,11 @@  discard block
 block discarded – undo
1936 1936
 			} else {
1937 1937
 				$query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1938 1938
 			}
1939
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1939
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1940 1940
 			try {
1941 1941
 				$sth = $this->db->prepare($query);
1942 1942
 				$sth->execute($query_values);
1943
-			} catch(PDOException $e) {
1943
+			} catch (PDOException $e) {
1944 1944
 				return "error : ".$e->getMessage();
1945 1945
 			}
1946 1946
 		}
@@ -1952,7 +1952,7 @@  discard block
 block discarded – undo
1952 1952
 		try {
1953 1953
 			$sth = $this->db->prepare($query);
1954 1954
 			$sth->execute($query_values);
1955
-		} catch(PDOException $e) {
1955
+		} catch (PDOException $e) {
1956 1956
 			return "error : ".$e->getMessage();
1957 1957
 		}
1958 1958
 	}
@@ -1962,7 +1962,7 @@  discard block
 block discarded – undo
1962 1962
 		try {
1963 1963
 			$sth = $this->db->prepare($query);
1964 1964
 			$sth->execute($query_values);
1965
-		} catch(PDOException $e) {
1965
+		} catch (PDOException $e) {
1966 1966
 			return "error : ".$e->getMessage();
1967 1967
 		}
1968 1968
 	}
@@ -1972,13 +1972,13 @@  discard block
 block discarded – undo
1972 1972
 		try {
1973 1973
 			$sth = $this->db->prepare($query);
1974 1974
 			$sth->execute($query_values);
1975
-		} catch(PDOException $e) {
1975
+		} catch (PDOException $e) {
1976 1976
 			return "error : ".$e->getMessage();
1977 1977
 		}
1978 1978
 	}
1979 1979
 
1980 1980
 	public function addOldStats() {
1981
-		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
1981
+		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
1982 1982
 		$Common = new Common();
1983 1983
 		$Connection = new Connection($this->db);
1984 1984
 		date_default_timezone_set('UTC');
@@ -1996,41 +1996,41 @@  discard block
 block discarded – undo
1996 1996
 			$Spotter = new Spotter($this->db);
1997 1997
 
1998 1998
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
1999
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
1999
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
2000 2000
 			foreach ($alldata as $number) {
2001
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2001
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
2002 2002
 			}
2003 2003
 			if ($globalDebug) echo 'Count all airlines...'."\n";
2004
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2004
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
2005 2005
 			foreach ($alldata as $number) {
2006
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2006
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
2007 2007
 			}
2008 2008
 			if ($globalDebug) echo 'Count all registrations...'."\n";
2009
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2009
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
2010 2010
 			foreach ($alldata as $number) {
2011
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2011
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
2012 2012
 			}
2013 2013
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
2014
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2014
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
2015 2015
 			foreach ($alldata as $number) {
2016
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2016
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2017 2017
 			}
2018 2018
 			if ($globalDebug) echo 'Count all owners...'."\n";
2019
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2019
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
2020 2020
 			foreach ($alldata as $number) {
2021
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2021
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
2022 2022
 			}
2023 2023
 			if ($globalDebug) echo 'Count all pilots...'."\n";
2024
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2024
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
2025 2025
 			foreach ($alldata as $number) {
2026 2026
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2027
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2027
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
2028 2028
 			}
2029 2029
 			
2030 2030
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
2031
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2031
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
2032 2032
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2033
-			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2033
+			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
2034 2034
 			if ($globalDebug) echo 'Order departure airports...'."\n";
2035 2035
 			$alldata = array();
2036 2036
 			foreach ($pall as $value) {
@@ -2047,14 +2047,14 @@  discard block
 block discarded – undo
2047 2047
 			foreach ($alldata as $key => $row) {
2048 2048
 				$count[$key] = $row['airport_departure_icao_count'];
2049 2049
 			}
2050
-			array_multisort($count,SORT_DESC,$alldata);
2050
+			array_multisort($count, SORT_DESC, $alldata);
2051 2051
 			foreach ($alldata as $number) {
2052
-				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);
2052
+				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);
2053 2053
 			}
2054 2054
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2055
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2055
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
2056 2056
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2057
-			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2057
+			$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
2058 2058
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
2059 2059
 			$alldata = array();
2060 2060
 			foreach ($pall as $value) {
@@ -2071,18 +2071,18 @@  discard block
 block discarded – undo
2071 2071
 			foreach ($alldata as $key => $row) {
2072 2072
 				$count[$key] = $row['airport_arrival_icao_count'];
2073 2073
 			}
2074
-			array_multisort($count,SORT_DESC,$alldata);
2074
+			array_multisort($count, SORT_DESC, $alldata);
2075 2075
 			foreach ($alldata as $number) {
2076
-				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);
2076
+				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);
2077 2077
 			}
2078 2078
 			if ($Connection->tableExists('countries')) {
2079 2079
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2080 2080
 				//$SpotterArchive = new SpotterArchive();
2081 2081
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2082 2082
 				$Spotter = new Spotter($this->db);
2083
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
2083
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
2084 2084
 				foreach ($alldata as $number) {
2085
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
2085
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
2086 2086
 				}
2087 2087
 			}
2088 2088
 			
@@ -2092,12 +2092,12 @@  discard block
 block discarded – undo
2092 2092
 				$this->deleteStatsByType('fatalities_byyear');
2093 2093
 				$alldata = $Accident->countFatalitiesByYear();
2094 2094
 				foreach ($alldata as $number) {
2095
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
2095
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
2096 2096
 				}
2097 2097
 				$this->deleteStatsByType('fatalities_bymonth');
2098 2098
 				$alldata = $Accident->countFatalitiesLast12Months();
2099 2099
 				foreach ($alldata as $number) {
2100
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
2100
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
2101 2101
 				}
2102 2102
 			}
2103 2103
 
@@ -2111,37 +2111,37 @@  discard block
 block discarded – undo
2111 2111
 			$lastyear = false;
2112 2112
 			foreach ($alldata as $number) {
2113 2113
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2114
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2114
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2115 2115
 			}
2116 2116
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2117 2117
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2118 2118
 			foreach ($alldata as $number) {
2119
-				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2119
+				$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2120 2120
 			}
2121 2121
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
2122 2122
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2123 2123
 			foreach ($alldata as $number) {
2124
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2124
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2125 2125
 			}
2126 2126
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2127 2127
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2128 2128
 			foreach ($alldata as $number) {
2129
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2129
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2130 2130
 			}
2131 2131
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2132 2132
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2133 2133
 			foreach ($alldata as $number) {
2134
-				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2134
+				$this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2135 2135
 			}
2136 2136
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2137 2137
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2138 2138
 			foreach ($alldata as $number) {
2139
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2139
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2140 2140
 			}
2141 2141
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2142 2142
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2143 2143
 			foreach ($alldata as $number) {
2144
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2144
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2145 2145
 			}
2146 2146
 			if ($globalDebug) echo 'Airports data...'."\n";
2147 2147
 			if ($globalDebug) echo '...Departure'."\n";
@@ -2186,7 +2186,7 @@  discard block
 block discarded – undo
2186 2186
 			}
2187 2187
 			$alldata = $pall;
2188 2188
 			foreach ($alldata as $number) {
2189
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
2189
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
2190 2190
 			}
2191 2191
 			echo '...Arrival'."\n";
2192 2192
 			$pall = $Spotter->getLast7DaysAirportsArrival();
@@ -2227,7 +2227,7 @@  discard block
 block discarded – undo
2227 2227
 			}
2228 2228
 			$alldata = $pall;
2229 2229
 			foreach ($alldata as $number) {
2230
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
2230
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
2231 2231
 			}
2232 2232
 
2233 2233
 			echo 'Flights data...'."\n";
@@ -2235,28 +2235,28 @@  discard block
 block discarded – undo
2235 2235
 			echo '-> countAllDatesLastMonth...'."\n";
2236 2236
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
2237 2237
 			foreach ($alldata as $number) {
2238
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
2238
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
2239 2239
 			}
2240 2240
 			echo '-> countAllDates...'."\n";
2241 2241
 			$previousdata = $this->countAllDates();
2242 2242
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
2243 2243
 			$this->deleteStatFlight('date');
2244
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
2244
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
2245 2245
 			$values = array();
2246 2246
 			foreach ($alldata as $cnt) {
2247 2247
 				$values[] = $cnt['date_count'];
2248 2248
 			}
2249
-			array_multisort($values,SORT_DESC,$alldata);
2250
-			array_splice($alldata,11);
2249
+			array_multisort($values, SORT_DESC, $alldata);
2250
+			array_splice($alldata, 11);
2251 2251
 			foreach ($alldata as $number) {
2252
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
2252
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
2253 2253
 			}
2254 2254
 			
2255 2255
 			$this->deleteStatFlight('hour');
2256 2256
 			echo '-> countAllHours...'."\n";
2257
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
2257
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
2258 2258
 			foreach ($alldata as $number) {
2259
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
2259
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
2260 2260
 			}
2261 2261
 
2262 2262
 			// Count by airlines
@@ -2265,42 +2265,42 @@  discard block
 block discarded – undo
2265 2265
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2266 2266
 				$SpotterArchive = new SpotterArchive($this->db);
2267 2267
 				//$Spotter = new Spotter($this->db);
2268
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2268
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
2269 2269
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2270 2270
 				foreach ($alldata as $number) {
2271
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2271
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
2272 2272
 				}
2273 2273
 			}
2274 2274
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2275 2275
 			$Spotter = new Spotter($this->db);
2276
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2276
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
2277 2277
 			foreach ($alldata as $number) {
2278
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2278
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
2279 2279
 			}
2280 2280
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2281
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2281
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
2282 2282
 			foreach ($alldata as $number) {
2283
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2283
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
2284 2284
 			}
2285 2285
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2286
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2286
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
2287 2287
 			foreach ($alldata as $number) {
2288
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2288
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2289 2289
 			}
2290 2290
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2291
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2291
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
2292 2292
 			foreach ($alldata as $number) {
2293
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2293
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
2294 2294
 			}
2295 2295
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2296
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2296
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
2297 2297
 			foreach ($alldata as $number) {
2298
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2298
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
2299 2299
 			}
2300 2300
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2301
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2301
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
2302 2302
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2303
-			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2303
+			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
2304 2304
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2305 2305
 			//$alldata = array();
2306 2306
 			foreach ($dall as $value) {
@@ -2320,12 +2320,12 @@  discard block
 block discarded – undo
2320 2320
 			}
2321 2321
 			$alldata = $pall;
2322 2322
 			foreach ($alldata as $number) {
2323
-				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);
2323
+				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);
2324 2324
 			}
2325 2325
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2326
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2326
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
2327 2327
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2328
-			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2328
+			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
2329 2329
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2330 2330
 			//$alldata = array();
2331 2331
 			foreach ($dall as $value) {
@@ -2345,7 +2345,7 @@  discard block
 block discarded – undo
2345 2345
 			}
2346 2346
 			$alldata = $pall;
2347 2347
 			foreach ($alldata as $number) {
2348
-				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);
2348
+				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);
2349 2349
 			}
2350 2350
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2351 2351
 			$Spotter = new Spotter($this->db);
@@ -2353,27 +2353,27 @@  discard block
 block discarded – undo
2353 2353
 			$lastyear = false;
2354 2354
 			foreach ($alldata as $number) {
2355 2355
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2356
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2356
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2357 2357
 			}
2358 2358
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2359 2359
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2360 2360
 			foreach ($alldata as $number) {
2361
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2361
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2362 2362
 			}
2363 2363
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2364 2364
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2365 2365
 			foreach ($alldata as $number) {
2366
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2366
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2367 2367
 			}
2368 2368
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2369 2369
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2370 2370
 			foreach ($alldata as $number) {
2371
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2371
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2372 2372
 			}
2373 2373
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2374 2374
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2375 2375
 			foreach ($alldata as $number) {
2376
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2376
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2377 2377
 			}
2378 2378
 			if ($globalDebug) echo '...Departure'."\n";
2379 2379
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
@@ -2396,7 +2396,7 @@  discard block
 block discarded – undo
2396 2396
 			}
2397 2397
 			$alldata = $pall;
2398 2398
 			foreach ($alldata as $number) {
2399
-				$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']);
2399
+				$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']);
2400 2400
 			}
2401 2401
 			if ($globalDebug) echo '...Arrival'."\n";
2402 2402
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
@@ -2419,32 +2419,32 @@  discard block
 block discarded – undo
2419 2419
 			}
2420 2420
 			$alldata = $pall;
2421 2421
 			foreach ($alldata as $number) {
2422
-				$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']);
2422
+				$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']);
2423 2423
 			}
2424 2424
 
2425 2425
 			if ($globalDebug) echo 'Flights data...'."\n";
2426 2426
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2427 2427
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2428 2428
 			foreach ($alldata as $number) {
2429
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2429
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
2430 2430
 			}
2431 2431
 			if ($globalDebug) echo '-> countAllDates...'."\n";
2432 2432
 			//$previousdata = $this->countAllDatesByAirlines();
2433
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2433
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
2434 2434
 			$values = array();
2435 2435
 			foreach ($alldata as $cnt) {
2436 2436
 				$values[] = $cnt['date_count'];
2437 2437
 			}
2438
-			array_multisort($values,SORT_DESC,$alldata);
2439
-			array_splice($alldata,11);
2438
+			array_multisort($values, SORT_DESC, $alldata);
2439
+			array_splice($alldata, 11);
2440 2440
 			foreach ($alldata as $number) {
2441
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2441
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
2442 2442
 			}
2443 2443
 			
2444 2444
 			if ($globalDebug) echo '-> countAllHours...'."\n";
2445
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2445
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
2446 2446
 			foreach ($alldata as $number) {
2447
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2447
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
2448 2448
 			}
2449 2449
 
2450 2450
 			// Stats by filters
@@ -2468,7 +2468,7 @@  discard block
 block discarded – undo
2468 2468
 							$last_update_day = date('Y').'-01-01 00:00:00';
2469 2469
 						}
2470 2470
 					}
2471
-					if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
2471
+					if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
2472 2472
 						$last_update_day = date('Y').'-01-01 00:00:00';
2473 2473
 						$reset = true;
2474 2474
 					}
@@ -2476,38 +2476,38 @@  discard block
 block discarded – undo
2476 2476
 					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2477 2477
 					$Spotter = new Spotter($this->db);
2478 2478
 					if ($globalDebug) echo 'Count all aircraft types...'."\n";
2479
-					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2479
+					$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
2480 2480
 					foreach ($alldata as $number) {
2481
-						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
2481
+						$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
2482 2482
 					}
2483 2483
 					if ($globalDebug) echo 'Count all airlines...'."\n";
2484
-					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
2484
+					$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
2485 2485
 					foreach ($alldata as $number) {
2486
-						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
2486
+						$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
2487 2487
 					}
2488 2488
 					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
2489
-					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
2489
+					$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
2490 2490
 					foreach ($alldata as $number) {
2491
-						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
2491
+						$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
2492 2492
 					}
2493 2493
 					if ($globalDebug) echo 'Count all callsigns...'."\n";
2494
-					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
2494
+					$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
2495 2495
 					foreach ($alldata as $number) {
2496
-						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
2496
+						$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
2497 2497
 					}
2498 2498
 					if ($globalDebug) echo 'Count all owners...'."\n";
2499
-					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
2499
+					$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
2500 2500
 					foreach ($alldata as $number) {
2501
-						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
2501
+						$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
2502 2502
 					}
2503 2503
 					if ($globalDebug) echo 'Count all pilots...'."\n";
2504
-					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
2504
+					$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
2505 2505
 					foreach ($alldata as $number) {
2506
-						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2506
+						$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
2507 2507
 					}
2508 2508
 					if ($globalDebug) echo 'Count departure airports...'."\n";
2509
-					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2510
-					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2509
+					$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
2510
+					$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
2511 2511
 					$alldata = array();
2512 2512
 					foreach ($pall as $value) {
2513 2513
 						$icao = $value['airport_departure_icao'];
@@ -2523,13 +2523,13 @@  discard block
 block discarded – undo
2523 2523
 					foreach ($alldata as $key => $row) {
2524 2524
 						$count[$key] = $row['airport_departure_icao_count'];
2525 2525
 					}
2526
-					array_multisort($count,SORT_DESC,$alldata);
2526
+					array_multisort($count, SORT_DESC, $alldata);
2527 2527
 					foreach ($alldata as $number) {
2528
-						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);
2528
+						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);
2529 2529
 					}
2530 2530
 					if ($globalDebug) echo 'Count all arrival airports...'."\n";
2531
-					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2532
-					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2531
+					$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
2532
+					$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
2533 2533
 					$alldata = array();
2534 2534
 					foreach ($pall as $value) {
2535 2535
 						$icao = $value['airport_arrival_icao'];
@@ -2545,9 +2545,9 @@  discard block
 block discarded – undo
2545 2545
 					foreach ($alldata as $key => $row) {
2546 2546
 						$count[$key] = $row['airport_arrival_icao_count'];
2547 2547
 					}
2548
-					array_multisort($count,SORT_DESC,$alldata);
2548
+					array_multisort($count, SORT_DESC, $alldata);
2549 2549
 					foreach ($alldata as $number) {
2550
-						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);
2550
+						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);
2551 2551
 					}
2552 2552
 					if ($globalDebug) echo 'Count all months...'."\n";
2553 2553
 					$Spotter = new Spotter($this->db);
@@ -2555,36 +2555,36 @@  discard block
 block discarded – undo
2555 2555
 					$lastyear = false;
2556 2556
 					foreach ($alldata as $number) {
2557 2557
 						if ($number['year_name'] != date('Y')) $lastyear = true;
2558
-						$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2558
+						$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2559 2559
 					}
2560 2560
 					if ($globalDebug) echo 'Count all owners by months...'."\n";
2561 2561
 					$alldata = $Spotter->countAllMonthsOwners($filter);
2562 2562
 					foreach ($alldata as $number) {
2563
-						$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2563
+						$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2564 2564
 					}
2565 2565
 					if ($globalDebug) echo 'Count all pilots by months...'."\n";
2566 2566
 					$alldata = $Spotter->countAllMonthsPilots($filter);
2567 2567
 					foreach ($alldata as $number) {
2568
-						$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2568
+						$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2569 2569
 					}
2570 2570
 					if ($globalDebug) echo 'Count all military by months...'."\n";
2571 2571
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
2572 2572
 					foreach ($alldata as $number) {
2573
-						$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2573
+						$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2574 2574
 					}
2575 2575
 					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2576 2576
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
2577 2577
 				    	foreach ($alldata as $number) {
2578
-			    			$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2578
+			    			$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2579 2579
 					}
2580 2580
 					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2581 2581
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2582 2582
 					foreach ($alldata as $number) {
2583
-						$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2583
+						$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name);
2584 2584
 					}
2585 2585
 					echo '...Departure'."\n";
2586
-					$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
2587
-					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2586
+					$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
2587
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
2588 2588
 					foreach ($dall as $value) {
2589 2589
 						$icao = $value['departure_airport_icao'];
2590 2590
 						$ddate = $value['date'];
@@ -2602,11 +2602,11 @@  discard block
 block discarded – undo
2602 2602
 					}
2603 2603
 					$alldata = $pall;
2604 2604
 					foreach ($alldata as $number) {
2605
-						$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);
2605
+						$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);
2606 2606
 					}
2607 2607
 					echo '...Arrival'."\n";
2608
-					$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
2609
-					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2608
+					$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
2609
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
2610 2610
 					foreach ($dall as $value) {
2611 2611
 						$icao = $value['arrival_airport_icao'];
2612 2612
 						$ddate = $value['date'];
@@ -2624,39 +2624,39 @@  discard block
 block discarded – undo
2624 2624
 					}
2625 2625
 					$alldata = $pall;
2626 2626
 					foreach ($alldata as $number) {
2627
-						$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);
2627
+						$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);
2628 2628
 					}
2629 2629
 					echo 'Flights data...'."\n";
2630 2630
 					echo '-> countAllDatesLastMonth...'."\n";
2631 2631
 					$alldata = $Spotter->countAllDatesLastMonth($filter);
2632 2632
 					foreach ($alldata as $number) {
2633
-						$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
2633
+						$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
2634 2634
 					}
2635 2635
 					echo '-> countAllDates...'."\n";
2636
-					$previousdata = $this->countAllDates('',$filter_name);
2637
-					$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
2636
+					$previousdata = $this->countAllDates('', $filter_name);
2637
+					$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
2638 2638
 					$values = array();
2639 2639
 					foreach ($alldata as $cnt) {
2640 2640
 						$values[] = $cnt['date_count'];
2641 2641
 					}
2642
-					array_multisort($values,SORT_DESC,$alldata);
2643
-					array_splice($alldata,11);
2642
+					array_multisort($values, SORT_DESC, $alldata);
2643
+					array_splice($alldata, 11);
2644 2644
 					foreach ($alldata as $number) {
2645
-						$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
2645
+						$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
2646 2646
 					}
2647 2647
 				
2648 2648
 					echo '-> countAllHours...'."\n";
2649
-					$alldata = $Spotter->countAllHours('hour',$filter);
2649
+					$alldata = $Spotter->countAllHours('hour', $filter);
2650 2650
 					foreach ($alldata as $number) {
2651
-						$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
2651
+						$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
2652 2652
 					}
2653 2653
 					echo 'Insert last stats update date...'."\n";
2654 2654
 					date_default_timezone_set('UTC');
2655
-					$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
2655
+					$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
2656 2656
 					if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
2657
-						if (date('Y',strtotime($last_update_day)) != date('Y')) {
2657
+						if (date('Y', strtotime($last_update_day)) != date('Y')) {
2658 2658
 							$this->deleteOldStats($filter_name);
2659
-							$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
2659
+							$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
2660 2660
 						}
2661 2661
 					}
2662 2662
 				}
@@ -2668,16 +2668,16 @@  discard block
 block discarded – undo
2668 2668
 				// SUM all previous month to put as year
2669 2669
 				$previous_year = date('Y');
2670 2670
 				$previous_year--;
2671
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2672
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2673
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2674
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2671
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2672
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2673
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2674
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2675 2675
 				$allairlines = $this->getAllAirlineNames();
2676 2676
 				foreach ($allairlines as $data) {
2677
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2678
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2679
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2680
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2677
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2678
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2679
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2680
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2681 2681
 				}
2682 2682
 				
2683 2683
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
@@ -2686,21 +2686,21 @@  discard block
 block discarded – undo
2686 2686
 						try {
2687 2687
 							$sth = $this->db->prepare($query);
2688 2688
 							$sth->execute();
2689
-						} catch(PDOException $e) {
2689
+						} catch (PDOException $e) {
2690 2690
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2691 2691
 						}
2692 2692
 						$query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'";
2693 2693
 						try {
2694 2694
 							$sth = $this->db->prepare($query);
2695 2695
 							$sth->execute();
2696
-						} catch(PDOException $e) {
2696
+						} catch (PDOException $e) {
2697 2697
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2698 2698
 						}
2699 2699
 						$query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'";
2700 2700
 						try {
2701 2701
 							$sth = $this->db->prepare($query);
2702 2702
 							$sth->execute();
2703
-						} catch(PDOException $e) {
2703
+						} catch (PDOException $e) {
2704 2704
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2705 2705
 						}
2706 2706
 					}
@@ -2713,7 +2713,7 @@  discard block
 block discarded – undo
2713 2713
 					try {
2714 2714
 						$sth = $this->db->prepare($query);
2715 2715
 						$sth->execute();
2716
-					} catch(PDOException $e) {
2716
+					} catch (PDOException $e) {
2717 2717
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2718 2718
 					}
2719 2719
 					if ($globalDBdriver == 'mysql') {
@@ -2724,7 +2724,7 @@  discard block
 block discarded – undo
2724 2724
 					try {
2725 2725
 						$sth = $this->db->prepare($query);
2726 2726
 						$sth->execute();
2727
-					} catch(PDOException $e) {
2727
+					} catch (PDOException $e) {
2728 2728
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2729 2729
 					}
2730 2730
 					if ($globalDBdriver == 'mysql') {
@@ -2735,15 +2735,15 @@  discard block
 block discarded – undo
2735 2735
 					try {
2736 2736
 						$sth = $this->db->prepare($query);
2737 2737
 						$sth->execute();
2738
-					} catch(PDOException $e) {
2738
+					} catch (PDOException $e) {
2739 2739
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2740 2740
 					}
2741 2741
 				}
2742 2742
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
2743 2743
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
2744
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
2744
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
2745 2745
 						$this->deleteOldStats();
2746
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
2746
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
2747 2747
 						$lastyearupdate = true;
2748 2748
 					}
2749 2749
 				}
@@ -2765,7 +2765,7 @@  discard block
 block discarded – undo
2765 2765
 					try {
2766 2766
 						$sth = $this->db->prepare($query);
2767 2767
 						$sth->execute();
2768
-					} catch(PDOException $e) {
2768
+					} catch (PDOException $e) {
2769 2769
 						return "error : ".$e->getMessage();
2770 2770
 					}
2771 2771
 					echo 'Archive old tracker data...'."\n";
@@ -2781,7 +2781,7 @@  discard block
 block discarded – undo
2781 2781
 					try {
2782 2782
 						$sth = $this->db->prepare($query);
2783 2783
 						$sth->execute();
2784
-					} catch(PDOException $e) {
2784
+					} catch (PDOException $e) {
2785 2785
 						return "error : ".$e->getMessage();
2786 2786
 					}
2787 2787
 					echo 'Archive old marine data...'."\n";
@@ -2797,7 +2797,7 @@  discard block
 block discarded – undo
2797 2797
 					try {
2798 2798
 						$sth = $this->db->prepare($query);
2799 2799
 						$sth->execute();
2800
-					} catch(PDOException $e) {
2800
+					} catch (PDOException $e) {
2801 2801
 						return "error : ".$e->getMessage();
2802 2802
 					}
2803 2803
 				}
@@ -2810,7 +2810,7 @@  discard block
 block discarded – undo
2810 2810
 				try {
2811 2811
 					$sth = $this->db->prepare($query);
2812 2812
 					$sth->execute();
2813
-				} catch(PDOException $e) {
2813
+				} catch (PDOException $e) {
2814 2814
 					return "error : ".$e->getMessage();
2815 2815
 				}
2816 2816
 				echo 'Deleting old tracker data...'."\n";
@@ -2822,7 +2822,7 @@  discard block
 block discarded – undo
2822 2822
 				try {
2823 2823
 					$sth = $this->db->prepare($query);
2824 2824
 					$sth->execute();
2825
-				} catch(PDOException $e) {
2825
+				} catch (PDOException $e) {
2826 2826
 					return "error : ".$e->getMessage();
2827 2827
 				}
2828 2828
 				echo 'Deleting old marine data...'."\n";
@@ -2834,14 +2834,14 @@  discard block
 block discarded – undo
2834 2834
 				try {
2835 2835
 					$sth = $this->db->prepare($query);
2836 2836
 					$sth->execute();
2837
-				} catch(PDOException $e) {
2837
+				} catch (PDOException $e) {
2838 2838
 					return "error : ".$e->getMessage();
2839 2839
 				}
2840 2840
 			}
2841 2841
 			if (!isset($lastyearupdate)) {
2842 2842
 				echo 'Insert last stats update date...'."\n";
2843 2843
 				date_default_timezone_set('UTC');
2844
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
2844
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
2845 2845
 			}
2846 2846
 			if ($globalStatsResetYear) {
2847 2847
 				require_once(dirname(__FILE__).'/../install/class.settings.php');
Please login to merge, or discard this patch.
Braces   +625 added lines, -219 removed lines patch added patch discarded remove patch
@@ -13,10 +13,14 @@  discard block
 block discarded – undo
13 13
 	
14 14
 	public function __construct($dbc = null) {
15 15
 		global $globalFilterName;
16
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
16
+		if (isset($globalFilterName)) {
17
+			$this->filter_name = $globalFilterName;
18
+		}
17 19
 		$Connection = new Connection($dbc);
18 20
 		$this->db = $Connection->db();
19
-		if ($this->db === null) die('Error: No DB connection. (Stats)');
21
+		if ($this->db === null) {
22
+			die('Error: No DB connection. (Stats)');
23
+		}
20 24
 	}
21 25
 
22 26
 	public function addLastStatsUpdate($type,$stats_date) {
@@ -84,7 +88,9 @@  discard block
 block discarded – undo
84 88
 
85 89
 	public function getAllAirlineNames($filter_name = '') {
86 90
 		global $globalStatsFilters;
87
-		if ($filter_name == '') $filter_name = $this->filter_name;
91
+		if ($filter_name == '') {
92
+			$filter_name = $this->filter_name;
93
+		}
88 94
 		$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
89 95
 		 try {
90 96
 			$sth = $this->db->prepare($query);
@@ -104,7 +110,9 @@  discard block
 block discarded – undo
104 110
 		return $all;
105 111
 	}
106 112
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
107
-		if ($filter_name == '') $filter_name = $this->filter_name;
113
+		if ($filter_name == '') {
114
+			$filter_name = $this->filter_name;
115
+		}
108 116
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
109 117
 		try {
110 118
 			$sth = $this->db->prepare($query);
@@ -116,7 +124,9 @@  discard block
 block discarded – undo
116 124
 		return $all;
117 125
 	}
118 126
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
119
-		if ($filter_name == '') $filter_name = $this->filter_name;
127
+		if ($filter_name == '') {
128
+			$filter_name = $this->filter_name;
129
+		}
120 130
 		$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";
121 131
 		try {
122 132
 			$sth = $this->db->prepare($query);
@@ -128,7 +138,9 @@  discard block
 block discarded – undo
128 138
 		return $all;
129 139
 	}
130 140
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
131
-		if ($filter_name == '') $filter_name = $this->filter_name;
141
+		if ($filter_name == '') {
142
+			$filter_name = $this->filter_name;
143
+		}
132 144
 		$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";
133 145
 		try {
134 146
 			$sth = $this->db->prepare($query);
@@ -141,7 +153,9 @@  discard block
 block discarded – undo
141 153
 	}
142 154
 
143 155
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
144
-		if ($filter_name == '') $filter_name = $this->filter_name;
156
+		if ($filter_name == '') {
157
+			$filter_name = $this->filter_name;
158
+		}
145 159
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
146 160
 		try {
147 161
 			$sth = $this->db->prepare($query);
@@ -154,7 +168,9 @@  discard block
 block discarded – undo
154 168
 	}
155 169
 
156 170
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
157
-		if ($filter_name == '') $filter_name = $this->filter_name;
171
+		if ($filter_name == '') {
172
+			$filter_name = $this->filter_name;
173
+		}
158 174
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
159 175
 		try {
160 176
 			$sth = $this->db->prepare($query);
@@ -169,7 +185,9 @@  discard block
 block discarded – undo
169 185
 
170 186
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
171 187
 		global $globalStatsFilters;
172
-		if ($filter_name == '') $filter_name = $this->filter_name;
188
+		if ($filter_name == '') {
189
+			$filter_name = $this->filter_name;
190
+		}
173 191
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
174 192
 			$Spotter = new Spotter($this->db);
175 193
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -178,8 +196,11 @@  discard block
 block discarded – undo
178 196
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
179 197
 			}
180 198
 			if ($year == '' && $month == '') {
181
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
199
+				if ($limit) {
200
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
201
+				} else {
202
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
203
+				}
183 204
 				try {
184 205
 					$sth = $this->db->prepare($query);
185 206
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -187,11 +208,16 @@  discard block
 block discarded – undo
187 208
 					echo "error : ".$e->getMessage();
188 209
 				}
189 210
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
190
-			} else $all = array();
211
+			} else {
212
+				$all = array();
213
+			}
191 214
 		} else {
192 215
 			if ($year == '' && $month == '') {
193
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
194
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
216
+				if ($limit) {
217
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
218
+				} else {
219
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
220
+				}
195 221
 				try {
196 222
 					$sth = $this->db->prepare($query);
197 223
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -199,7 +225,9 @@  discard block
 block discarded – undo
199 225
 					echo "error : ".$e->getMessage();
200 226
 				}
201 227
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
202
-			} else $all = array();
228
+			} else {
229
+				$all = array();
230
+			}
203 231
 		}
204 232
 		if (empty($all)) {
205 233
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -218,10 +246,15 @@  discard block
 block discarded – undo
218 246
 	}
219 247
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
220 248
 		global $globalStatsFilters;
221
-		if ($filter_name == '') $filter_name = $this->filter_name;
249
+		if ($filter_name == '') {
250
+			$filter_name = $this->filter_name;
251
+		}
222 252
 		if ($year == '' && $month == '') {
223
-			if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
224
-			else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
253
+			if ($limit) {
254
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
255
+			} else {
256
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
257
+			}
225 258
 			try {
226 259
 				$sth = $this->db->prepare($query);
227 260
 				$sth->execute(array(':filter_name' => $filter_name));
@@ -229,7 +262,9 @@  discard block
 block discarded – undo
229 262
 				echo "error : ".$e->getMessage();
230 263
 			}
231 264
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
232
-		} else $all = array();
265
+		} else {
266
+			$all = array();
267
+		}
233 268
 		if (empty($all)) {
234 269
 			$Spotter = new Spotter($this->db);
235 270
 			$filters = array();
@@ -244,7 +279,9 @@  discard block
 block discarded – undo
244 279
 	}
245 280
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
246 281
 		global $globalStatsFilters;
247
-		if ($filter_name == '') $filter_name = $this->filter_name;
282
+		if ($filter_name == '') {
283
+			$filter_name = $this->filter_name;
284
+		}
248 285
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
249 286
 			$Spotter = new Spotter($this->db);
250 287
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -253,8 +290,11 @@  discard block
 block discarded – undo
253 290
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
254 291
 			}
255 292
 			if ($year == '' && $month == '') {
256
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
293
+				if ($limit) {
294
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
295
+				} else {
296
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
297
+				}
258 298
 				try {
259 299
 					$sth = $this->db->prepare($query);
260 300
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -262,11 +302,16 @@  discard block
 block discarded – undo
262 302
 					echo "error : ".$e->getMessage();
263 303
 				}
264 304
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
265
-			} else $all = array();
305
+			} else {
306
+				$all = array();
307
+			}
266 308
 		} else {
267 309
 			if ($year == '' && $month == '') {
268
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
269
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
310
+				if ($limit) {
311
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
312
+				} else {
313
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
314
+				}
270 315
 				try {
271 316
 					$sth = $this->db->prepare($query);
272 317
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -274,7 +319,9 @@  discard block
 block discarded – undo
274 319
 					echo "error : ".$e->getMessage();
275 320
 				}
276 321
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
277
-			} else $all = array();
322
+			} else {
323
+				$all = array();
324
+			}
278 325
 		}
279 326
 		if (empty($all)) {
280 327
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -294,7 +341,9 @@  discard block
 block discarded – undo
294 341
 
295 342
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
296 343
 		global $globalStatsFilters;
297
-		if ($filter_name == '') $filter_name = $this->filter_name;
344
+		if ($filter_name == '') {
345
+			$filter_name = $this->filter_name;
346
+		}
298 347
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
299 348
 			$Spotter = new Spotter($this->db);
300 349
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -303,8 +352,11 @@  discard block
 block discarded – undo
303 352
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
304 353
 			}
305 354
 			if ($year == '' && $month == '') {
306
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
355
+				if ($limit) {
356
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
357
+				} else {
358
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
359
+				}
308 360
 				try {
309 361
 					$sth = $this->db->prepare($query);
310 362
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -312,11 +364,16 @@  discard block
 block discarded – undo
312 364
 					echo "error : ".$e->getMessage();
313 365
 				}
314 366
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
315
-			} else $all = array();
367
+			} else {
368
+				$all = array();
369
+			}
316 370
 		} else {
317 371
 			if ($year == '' && $month == '') {
318
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
319
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
372
+				if ($limit) {
373
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
374
+				} else {
375
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
376
+				}
320 377
 				try {
321 378
 					$sth = $this->db->prepare($query);
322 379
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -324,7 +381,9 @@  discard block
 block discarded – undo
324 381
 					echo "error : ".$e->getMessage();
325 382
 				}
326 383
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
327
-			} else $all = array();
384
+			} else {
385
+				$all = array();
386
+			}
328 387
 		}
329 388
 		if (empty($all)) {
330 389
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -343,7 +402,9 @@  discard block
 block discarded – undo
343 402
 	}
344 403
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
345 404
 		global $globalStatsFilters;
346
-		if ($filter_name == '') $filter_name = $this->filter_name;
405
+		if ($filter_name == '') {
406
+			$filter_name = $this->filter_name;
407
+		}
347 408
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
348 409
 			$Spotter = new Spotter($this->db);
349 410
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -351,12 +412,18 @@  discard block
 block discarded – undo
351 412
 			foreach ($airlines as $airline) {
352 413
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
353 414
 			}
354
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
415
+			if ($limit) {
416
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
417
+			} else {
418
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
419
+			}
356 420
 			$query_values = array(':filter_name' => $filter_name);
357 421
 		} else {
358
-			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";
359
-			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";
422
+			if ($limit) {
423
+				$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";
424
+			} else {
425
+				$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";
426
+			}
360 427
 			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
361 428
 		}
362 429
 		try {
@@ -384,17 +451,29 @@  discard block
 block discarded – undo
384 451
 
385 452
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
386 453
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
387
-		if ($filter_name == '') $filter_name = $this->filter_name;
454
+		if ($filter_name == '') {
455
+			$filter_name = $this->filter_name;
456
+		}
388 457
 		if ($year == '' && $month == '') {
389
-			if ($globalVATSIM) $forsource = 'vatsim';
390
-			if ($globalIVAO) $forsource = 'ivao';
458
+			if ($globalVATSIM) {
459
+				$forsource = 'vatsim';
460
+			}
461
+			if ($globalIVAO) {
462
+				$forsource = 'ivao';
463
+			}
391 464
 			if (isset($forsource)) {
392
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
393
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
465
+				if ($limit) {
466
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
467
+				} else {
468
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
469
+				}
394 470
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
395 471
 			} else {
396
-				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
397
-				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
472
+				if ($limit) {
473
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
474
+				} else {
475
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
476
+				}
398 477
 				$query_values = array(':filter_name' => $filter_name);
399 478
 			}
400 479
 			try {
@@ -404,7 +483,9 @@  discard block
 block discarded – undo
404 483
 				echo "error : ".$e->getMessage();
405 484
 			}
406 485
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
407
-		} else $all = array();
486
+		} else {
487
+			$all = array();
488
+		}
408 489
                 if (empty($all)) {
409 490
 	                $Spotter = new Spotter($this->db);
410 491
             		$filters = array();
@@ -419,7 +500,9 @@  discard block
 block discarded – undo
419 500
 	}
420 501
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
421 502
 		global $globalStatsFilters;
422
-		if ($filter_name == '') $filter_name = $this->filter_name;
503
+		if ($filter_name == '') {
504
+			$filter_name = $this->filter_name;
505
+		}
423 506
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
424 507
 			$Spotter = new Spotter($this->db);
425 508
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -428,8 +511,11 @@  discard block
 block discarded – undo
428 511
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
429 512
 			}
430 513
 			if ($year == '' && $month == '') {
431
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
514
+				if ($limit) {
515
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
516
+				} else {
517
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
518
+				}
433 519
 				try {
434 520
 					$sth = $this->db->prepare($query);
435 521
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -437,11 +523,16 @@  discard block
 block discarded – undo
437 523
 					echo "error : ".$e->getMessage();
438 524
 				}
439 525
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
440
-			} else $all = array();
526
+			} else {
527
+				$all = array();
528
+			}
441 529
 		} else {
442 530
 			if ($year == '' && $month == '') {
443
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
444
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
531
+				if ($limit) {
532
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
533
+				} else {
534
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
535
+				}
445 536
 				try {
446 537
 					$sth = $this->db->prepare($query);
447 538
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -449,7 +540,9 @@  discard block
 block discarded – undo
449 540
 					echo "error : ".$e->getMessage();
450 541
 				}
451 542
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
452
-			} else $all = array();
543
+			} else {
544
+				$all = array();
545
+			}
453 546
 		}
454 547
 		if (empty($all)) {
455 548
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -468,7 +561,9 @@  discard block
 block discarded – undo
468 561
 	}
469 562
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
470 563
 		global $globalStatsFilters;
471
-		if ($filter_name == '') $filter_name = $this->filter_name;
564
+		if ($filter_name == '') {
565
+			$filter_name = $this->filter_name;
566
+		}
472 567
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
473 568
 			$Spotter = new Spotter($this->db);
474 569
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -477,8 +572,11 @@  discard block
 block discarded – undo
477 572
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
478 573
 			}
479 574
 			if ($year == '' && $month == '') {
480
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
575
+				if ($limit) {
576
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
577
+				} else {
578
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
579
+				}
482 580
 				 try {
483 581
 					$sth = $this->db->prepare($query);
484 582
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -486,11 +584,16 @@  discard block
 block discarded – undo
486 584
 					echo "error : ".$e->getMessage();
487 585
 				}
488 586
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
489
-			} else $all = array();
587
+			} else {
588
+				$all = array();
589
+			}
490 590
 		} else {
491 591
 			if ($year == '' && $month == '') {
492
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
493
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
592
+				if ($limit) {
593
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
594
+				} else {
595
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
596
+				}
494 597
 				 try {
495 598
 					$sth = $this->db->prepare($query);
496 599
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -498,7 +601,9 @@  discard block
 block discarded – undo
498 601
 					echo "error : ".$e->getMessage();
499 602
 				}
500 603
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
501
-			} else $all = array();
604
+			} else {
605
+				$all = array();
606
+			}
502 607
 		}
503 608
 		if (empty($all)) {
504 609
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -517,7 +622,9 @@  discard block
 block discarded – undo
517 622
 	}
518 623
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
519 624
 		$Connection = new Connection($this->db);
520
-		if ($filter_name == '') $filter_name = $this->filter_name;
625
+		if ($filter_name == '') {
626
+			$filter_name = $this->filter_name;
627
+		}
521 628
 		if ($Connection->tableExists('countries')) {
522 629
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
523 630
 				$Spotter = new Spotter($this->db);
@@ -527,8 +634,11 @@  discard block
 block discarded – undo
527 634
 					foreach ($airlines as $airline) {
528 635
 						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
529 636
 					}
530
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
637
+					if ($limit) {
638
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
639
+					} else {
640
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
641
+					}
532 642
 					 try {
533 643
 						$sth = $this->db->prepare($query);
534 644
 						$sth->execute(array(':filter_name' => $filter_name));
@@ -537,11 +647,16 @@  discard block
 block discarded – undo
537 647
 					}
538 648
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
539 649
 					return $all;
540
-				} else return array();
650
+				} else {
651
+					return array();
652
+				}
541 653
 			} else {
542 654
 				if ($year == '' && $month == '') {
543
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
544
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
655
+					if ($limit) {
656
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
657
+					} else {
658
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
659
+					}
545 660
 					 try {
546 661
 						$sth = $this->db->prepare($query);
547 662
 						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -550,7 +665,9 @@  discard block
 block discarded – undo
550 665
 					}
551 666
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
552 667
 					return $all;
553
-				} else return array();
668
+				} else {
669
+					return array();
670
+				}
554 671
 			}
555 672
 		} else {
556 673
 			/*
@@ -564,10 +681,15 @@  discard block
 block discarded – undo
564 681
 	}
565 682
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
566 683
 		global $globalStatsFilters;
567
-		if ($filter_name == '') $filter_name = $this->filter_name;
684
+		if ($filter_name == '') {
685
+			$filter_name = $this->filter_name;
686
+		}
568 687
 		if ($year == '' && $month == '') {
569
-			if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
570
-			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
688
+			if ($limit) {
689
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
690
+			} else {
691
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
692
+			}
571 693
 			try {
572 694
 				$sth = $this->db->prepare($query);
573 695
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -575,7 +697,9 @@  discard block
 block discarded – undo
575 697
 				echo "error : ".$e->getMessage();
576 698
 			}
577 699
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
578
-		} else $all = array();
700
+		} else {
701
+			$all = array();
702
+		}
579 703
 		if (empty($all)) {
580 704
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
581 705
 			if ($filter_name != '') {
@@ -590,7 +714,9 @@  discard block
 block discarded – undo
590 714
 
591 715
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
592 716
 		global $globalStatsFilters;
593
-		if ($filter_name == '') $filter_name = $this->filter_name;
717
+		if ($filter_name == '') {
718
+			$filter_name = $this->filter_name;
719
+		}
594 720
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
595 721
 			$Spotter = new Spotter($this->db);
596 722
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -599,8 +725,11 @@  discard block
 block discarded – undo
599 725
 				foreach ($airlines as $airline) {
600 726
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
601 727
 				}
602
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
728
+				if ($limit) {
729
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
730
+				} else {
731
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
732
+				}
604 733
 				try {
605 734
 					$sth = $this->db->prepare($query);
606 735
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -608,11 +737,16 @@  discard block
 block discarded – undo
608 737
 					echo "error : ".$e->getMessage();
609 738
 				}
610 739
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
611
-			} else $all = array();
740
+			} else {
741
+				$all = array();
742
+			}
612 743
 		} else {
613 744
 			if ($year == '' && $month == '') {
614
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
615
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
745
+				if ($limit) {
746
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
747
+				} else {
748
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
749
+				}
616 750
 				try {
617 751
 					$sth = $this->db->prepare($query);
618 752
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -620,7 +754,9 @@  discard block
 block discarded – undo
620 754
 					echo "error : ".$e->getMessage();
621 755
 				}
622 756
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
623
-			} else $all = array();
757
+			} else {
758
+				$all = array();
759
+			}
624 760
 		}
625 761
 		if (empty($all)) {
626 762
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -639,7 +775,9 @@  discard block
 block discarded – undo
639 775
 	}
640 776
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
641 777
 		global $globalStatsFilters;
642
-		if ($filter_name == '') $filter_name = $this->filter_name;
778
+		if ($filter_name == '') {
779
+			$filter_name = $this->filter_name;
780
+		}
643 781
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
644 782
 			$Spotter = new Spotter($this->db);
645 783
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -648,8 +786,11 @@  discard block
 block discarded – undo
648 786
 				foreach ($airlines as $airline) {
649 787
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
650 788
 				}
651
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
789
+				if ($limit) {
790
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
791
+				} else {
792
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
793
+				}
653 794
 				try {
654 795
 					$sth = $this->db->prepare($query);
655 796
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -657,11 +798,16 @@  discard block
 block discarded – undo
657 798
 					echo "error : ".$e->getMessage();
658 799
 				}
659 800
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
660
-			} else $all = array();
801
+			} else {
802
+				$all = array();
803
+			}
661 804
 		} else {
662 805
 			if ($year == '' && $month == '') {
663
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
664
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
806
+				if ($limit) {
807
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
808
+				} else {
809
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
810
+				}
665 811
 				try {
666 812
 					$sth = $this->db->prepare($query);
667 813
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -669,7 +815,9 @@  discard block
 block discarded – undo
669 815
 					echo "error : ".$e->getMessage();
670 816
 				}
671 817
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
672
-			} else $all = array();
818
+			} else {
819
+				$all = array();
820
+			}
673 821
 		}
674 822
 		if (empty($all)) {
675 823
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -694,7 +842,9 @@  discard block
 block discarded – undo
694 842
 				$icao = $value['airport_departure_icao'];
695 843
 				if (isset($all[$icao])) {
696 844
 					$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
697
-				} else $all[$icao] = $value;
845
+				} else {
846
+					$all[$icao] = $value;
847
+				}
698 848
 			}
699 849
 			$count = array();
700 850
 			foreach ($all as $key => $row) {
@@ -706,7 +856,9 @@  discard block
 block discarded – undo
706 856
 	}
707 857
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
708 858
 		global $globalStatsFilters;
709
-		if ($filter_name == '') $filter_name = $this->filter_name;
859
+		if ($filter_name == '') {
860
+			$filter_name = $this->filter_name;
861
+		}
710 862
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
711 863
 			$Spotter = new Spotter($this->db);
712 864
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -715,8 +867,11 @@  discard block
 block discarded – undo
715 867
 				foreach ($airlines as $airline) {
716 868
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
717 869
 				}
718
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
870
+				if ($limit) {
871
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
872
+				} else {
873
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
874
+				}
720 875
 				try {
721 876
 					$sth = $this->db->prepare($query);
722 877
 					$sth->execute(array(':filter_name' => $filter_name));
@@ -724,11 +879,16 @@  discard block
 block discarded – undo
724 879
 					echo "error : ".$e->getMessage();
725 880
 				}
726 881
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
727
-			} else $all = array();
882
+			} else {
883
+				$all = array();
884
+			}
728 885
 		} else {
729 886
 			if ($year == '' && $month == '') {
730
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
731
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
887
+				if ($limit) {
888
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
889
+				} else {
890
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
891
+				}
732 892
 				try {
733 893
 					$sth = $this->db->prepare($query);
734 894
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
@@ -736,7 +896,9 @@  discard block
 block discarded – undo
736 896
 					echo "error : ".$e->getMessage();
737 897
 				}
738 898
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
739
-			} else $all = array();
899
+			} else {
900
+				$all = array();
901
+			}
740 902
 		}
741 903
 		if (empty($all)) {
742 904
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -761,7 +923,9 @@  discard block
 block discarded – undo
761 923
 				$icao = $value['airport_arrival_icao'];
762 924
 				if (isset($all[$icao])) {
763 925
 					$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
764
-				} else $all[$icao] = $value;
926
+				} else {
927
+					$all[$icao] = $value;
928
+				}
765 929
 			}
766 930
 			$count = array();
767 931
 			foreach ($all as $key => $row) {
@@ -773,7 +937,9 @@  discard block
 block discarded – undo
773 937
 	}
774 938
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
775 939
 		global $globalDBdriver, $globalStatsFilters;
776
-		if ($filter_name == '') $filter_name = $this->filter_name;
940
+		if ($filter_name == '') {
941
+			$filter_name = $this->filter_name;
942
+		}
777 943
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
778 944
 			$Spotter = new Spotter($this->db);
779 945
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -782,20 +948,32 @@  discard block
 block discarded – undo
782 948
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
783 949
 			}
784 950
 			if ($globalDBdriver == 'mysql') {
785
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
951
+				if ($limit) {
952
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
953
+				} else {
954
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
955
+				}
787 956
 			} else {
788
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
957
+				if ($limit) {
958
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
959
+				} else {
960
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
961
+				}
790 962
 			}
791 963
 			$query_data = array(':filter_name' => $filter_name);
792 964
 		} else {
793 965
 			if ($globalDBdriver == 'mysql') {
794
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
795
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
966
+				if ($limit) {
967
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
968
+				} else {
969
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
970
+				}
796 971
 			} else {
797
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
798
-				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";
972
+				if ($limit) {
973
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
974
+				} else {
975
+					$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";
976
+				}
799 977
 			}
800 978
 			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
801 979
 		}
@@ -823,7 +1001,9 @@  discard block
 block discarded – undo
823 1001
 	
824 1002
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
825 1003
 		global $globalStatsFilters;
826
-		if ($filter_name == '') $filter_name = $this->filter_name;
1004
+		if ($filter_name == '') {
1005
+			$filter_name = $this->filter_name;
1006
+		}
827 1007
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
828 1008
 			$Spotter = new Spotter($this->db);
829 1009
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -860,7 +1040,9 @@  discard block
 block discarded – undo
860 1040
 	}
861 1041
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
862 1042
 		global $globalDBdriver, $globalStatsFilters;
863
-		if ($filter_name == '') $filter_name = $this->filter_name;
1043
+		if ($filter_name == '') {
1044
+			$filter_name = $this->filter_name;
1045
+		}
864 1046
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
865 1047
 			$Spotter = new Spotter($this->db);
866 1048
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -905,7 +1087,9 @@  discard block
 block discarded – undo
905 1087
 	}
906 1088
 	public function countAllDates($stats_airline = '',$filter_name = '') {
907 1089
 		global $globalStatsFilters;
908
-		if ($filter_name == '') $filter_name = $this->filter_name;
1090
+		if ($filter_name == '') {
1091
+			$filter_name = $this->filter_name;
1092
+		}
909 1093
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
910 1094
 			$Spotter = new Spotter($this->db);
911 1095
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -942,7 +1126,9 @@  discard block
 block discarded – undo
942 1126
 	}
943 1127
 	public function countAllDatesByAirlines($filter_name = '') {
944 1128
 		global $globalStatsFilters;
945
-		if ($filter_name == '') $filter_name = $this->filter_name;
1129
+		if ($filter_name == '') {
1130
+			$filter_name = $this->filter_name;
1131
+		}
946 1132
 		$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";
947 1133
 		$query_data = array('filter_name' => $filter_name);
948 1134
 		try {
@@ -964,7 +1150,9 @@  discard block
 block discarded – undo
964 1150
 	}
965 1151
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
966 1152
 		global $globalStatsFilters, $globalDBdriver;
967
-		if ($filter_name == '') $filter_name = $this->filter_name;
1153
+		if ($filter_name == '') {
1154
+			$filter_name = $this->filter_name;
1155
+		}
968 1156
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
969 1157
 			$Spotter = new Spotter($this->db);
970 1158
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1049,7 +1237,9 @@  discard block
 block discarded – undo
1049 1237
 	}
1050 1238
 	public function countAllMilitaryMonths($filter_name = '') {
1051 1239
 		global $globalStatsFilters;
1052
-		if ($filter_name == '') $filter_name = $this->filter_name;
1240
+		if ($filter_name == '') {
1241
+			$filter_name = $this->filter_name;
1242
+		}
1053 1243
 		$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";
1054 1244
 		try {
1055 1245
 			$sth = $this->db->prepare($query);
@@ -1070,7 +1260,9 @@  discard block
 block discarded – undo
1070 1260
 	}
1071 1261
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1072 1262
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1073
-		if ($filter_name == '') $filter_name = $this->filter_name;
1263
+		if ($filter_name == '') {
1264
+			$filter_name = $this->filter_name;
1265
+		}
1074 1266
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1075 1267
 			$Spotter = new Spotter($this->db);
1076 1268
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1078,12 +1270,18 @@  discard block
 block discarded – undo
1078 1270
 			foreach ($airlines as $airline) {
1079 1271
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1080 1272
 			}
1081
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1273
+			if ($limit) {
1274
+				$query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1275
+			} else {
1276
+				$query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1277
+			}
1083 1278
 			$query_data = array(':filter_name' => $filter_name);
1084 1279
 		} else {
1085
-			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1086
-			else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1280
+			if ($limit) {
1281
+				$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1282
+			} else {
1283
+				$query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1284
+			}
1087 1285
 			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1088 1286
 		}
1089 1287
 		if ($orderby == 'hour') {
@@ -1093,7 +1291,9 @@  discard block
 block discarded – undo
1093 1291
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
1094 1292
 			}
1095 1293
 		}
1096
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1294
+		if ($orderby == 'count') {
1295
+			$query .= " ORDER BY hour_count DESC";
1296
+		}
1097 1297
 		try {
1098 1298
 			$sth = $this->db->prepare($query);
1099 1299
 			$sth->execute($query_data);
@@ -1117,8 +1317,12 @@  discard block
 block discarded – undo
1117 1317
 	}
1118 1318
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1119 1319
 		global $globalStatsFilters;
1120
-		if ($filter_name == '') $filter_name = $this->filter_name;
1121
-		if ($year == '') $year = date('Y');
1320
+		if ($filter_name == '') {
1321
+			$filter_name = $this->filter_name;
1322
+		}
1323
+		if ($year == '') {
1324
+			$year = date('Y');
1325
+		}
1122 1326
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1123 1327
 		if (empty($all)) {
1124 1328
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1137,8 +1341,12 @@  discard block
 block discarded – undo
1137 1341
 	}
1138 1342
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1139 1343
 		global $globalStatsFilters;
1140
-		if ($filter_name == '') $filter_name = $this->filter_name;
1141
-		if ($year == '') $year = date('Y');
1344
+		if ($filter_name == '') {
1345
+			$filter_name = $this->filter_name;
1346
+		}
1347
+		if ($year == '') {
1348
+			$year = date('Y');
1349
+		}
1142 1350
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1143 1351
 		if (empty($all)) {
1144 1352
 			$filters = array();
@@ -1154,8 +1362,12 @@  discard block
 block discarded – undo
1154 1362
 	}
1155 1363
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1156 1364
 		global $globalStatsFilters;
1157
-		if ($filter_name == '') $filter_name = $this->filter_name;
1158
-		if ($year == '') $year = date('Y');
1365
+		if ($filter_name == '') {
1366
+			$filter_name = $this->filter_name;
1367
+		}
1368
+		if ($year == '') {
1369
+			$year = date('Y');
1370
+		}
1159 1371
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1160 1372
 		if (empty($all)) {
1161 1373
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1174,7 +1386,9 @@  discard block
 block discarded – undo
1174 1386
 	}
1175 1387
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1176 1388
 		global $globalStatsFilters;
1177
-		if ($filter_name == '') $filter_name = $this->filter_name;
1389
+		if ($filter_name == '') {
1390
+			$filter_name = $this->filter_name;
1391
+		}
1178 1392
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1179 1393
 			$Spotter = new Spotter($this->db);
1180 1394
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1192,7 +1406,9 @@  discard block
 block discarded – undo
1192 1406
 				}
1193 1407
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1194 1408
 				$all = $result[0]['nb'];
1195
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1409
+			} else {
1410
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1411
+			}
1196 1412
 		} else {
1197 1413
 			if ($year == '' && $month == '') {
1198 1414
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1204,7 +1420,9 @@  discard block
 block discarded – undo
1204 1420
 				}
1205 1421
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1206 1422
 				$all = $result[0]['nb'];
1207
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1423
+			} else {
1424
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1425
+			}
1208 1426
 		}
1209 1427
 		if (empty($all)) {
1210 1428
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
@@ -1223,7 +1441,9 @@  discard block
 block discarded – undo
1223 1441
 	}
1224 1442
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1225 1443
 		global $globalStatsFilters;
1226
-		if ($filter_name == '') $filter_name = $this->filter_name;
1444
+		if ($filter_name == '') {
1445
+			$filter_name = $this->filter_name;
1446
+		}
1227 1447
 		if ($year == '' && $month == '') {
1228 1448
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
1229 1449
 			try {
@@ -1234,7 +1454,9 @@  discard block
 block discarded – undo
1234 1454
 			}
1235 1455
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1236 1456
 			$all = $result[0]['nb_airline'];
1237
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1457
+		} else {
1458
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1459
+		}
1238 1460
 		if (empty($all)) {
1239 1461
 			$filters = array();
1240 1462
 			$filters = array('year' => $year,'month' => $month);
@@ -1249,7 +1471,9 @@  discard block
 block discarded – undo
1249 1471
 	}
1250 1472
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1251 1473
 		global $globalStatsFilters;
1252
-		if ($filter_name == '') $filter_name = $this->filter_name;
1474
+		if ($filter_name == '') {
1475
+			$filter_name = $this->filter_name;
1476
+		}
1253 1477
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1254 1478
 			$Spotter = new Spotter($this->db);
1255 1479
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1304,7 +1528,9 @@  discard block
 block discarded – undo
1304 1528
 	}
1305 1529
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1306 1530
 		global $globalStatsFilters;
1307
-		if ($filter_name == '') $filter_name = $this->filter_name;
1531
+		if ($filter_name == '') {
1532
+			$filter_name = $this->filter_name;
1533
+		}
1308 1534
 		//if ($year == '') $year = date('Y');
1309 1535
 		if ($year == '' && $month == '') {
1310 1536
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1333,7 +1559,9 @@  discard block
 block discarded – undo
1333 1559
 	}
1334 1560
 
1335 1561
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1336
-		if ($filter_name == '') $filter_name = $this->filter_name;
1562
+		if ($filter_name == '') {
1563
+			$filter_name = $this->filter_name;
1564
+		}
1337 1565
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1338 1566
 			$Spotter = new Spotter($this->db);
1339 1567
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1357,7 +1585,9 @@  discard block
 block discarded – undo
1357 1585
 		return $all;
1358 1586
 	}
1359 1587
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
1360
-		if ($filter_name == '') $filter_name = $this->filter_name;
1588
+		if ($filter_name == '') {
1589
+			$filter_name = $this->filter_name;
1590
+		}
1361 1591
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1362 1592
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1363 1593
 		try {
@@ -1370,7 +1600,9 @@  discard block
 block discarded – undo
1370 1600
 		return $all;
1371 1601
 	}
1372 1602
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1373
-		if ($filter_name == '') $filter_name = $this->filter_name;
1603
+		if ($filter_name == '') {
1604
+			$filter_name = $this->filter_name;
1605
+		}
1374 1606
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1375 1607
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1376 1608
 		try {
@@ -1381,7 +1613,9 @@  discard block
 block discarded – undo
1381 1613
 		}
1382 1614
 	}
1383 1615
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1384
-		if ($filter_name == '') $filter_name = $this->filter_name;
1616
+		if ($filter_name == '') {
1617
+			$filter_name = $this->filter_name;
1618
+		}
1385 1619
 		global $globalArchiveMonths, $globalDBdriver;
1386 1620
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1387 1621
 			$Spotter = new Spotter($this->db);
@@ -1437,7 +1671,9 @@  discard block
 block discarded – undo
1437 1671
 	}
1438 1672
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1439 1673
 		global $globalArchiveMonths, $globalDBdriver;
1440
-		if ($filter_name == '') $filter_name = $this->filter_name;
1674
+		if ($filter_name == '') {
1675
+			$filter_name = $this->filter_name;
1676
+		}
1441 1677
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1442 1678
 			$Spotter = new Spotter($this->db);
1443 1679
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1470,7 +1706,9 @@  discard block
 block discarded – undo
1470 1706
 	}
1471 1707
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1472 1708
 		global $globalArchiveMonths, $globalDBdriver;
1473
-		if ($filter_name == '') $filter_name = $this->filter_name;
1709
+		if ($filter_name == '') {
1710
+			$filter_name = $this->filter_name;
1711
+		}
1474 1712
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1475 1713
 			$Spotter = new Spotter($this->db);
1476 1714
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
@@ -1501,7 +1739,9 @@  discard block
 block discarded – undo
1501 1739
 	}
1502 1740
 	public function getStatsAirlineTotal($filter_name = '') {
1503 1741
 		global $globalArchiveMonths, $globalDBdriver;
1504
-		if ($filter_name == '') $filter_name = $this->filter_name;
1742
+		if ($filter_name == '') {
1743
+			$filter_name = $this->filter_name;
1744
+		}
1505 1745
 		if ($globalDBdriver == 'mysql') {
1506 1746
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1507 1747
 		} else {
@@ -1518,7 +1758,9 @@  discard block
 block discarded – undo
1518 1758
 	}
1519 1759
 	public function getStatsOwnerTotal($filter_name = '') {
1520 1760
 		global $globalArchiveMonths, $globalDBdriver;
1521
-		if ($filter_name == '') $filter_name = $this->filter_name;
1761
+		if ($filter_name == '') {
1762
+			$filter_name = $this->filter_name;
1763
+		}
1522 1764
 		if ($globalDBdriver == 'mysql') {
1523 1765
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1524 1766
 		} else {
@@ -1535,7 +1777,9 @@  discard block
 block discarded – undo
1535 1777
 	}
1536 1778
 	public function getStatsOwner($owner_name,$filter_name = '') {
1537 1779
 		global $globalArchiveMonths, $globalDBdriver;
1538
-		if ($filter_name == '') $filter_name = $this->filter_name;
1780
+		if ($filter_name == '') {
1781
+			$filter_name = $this->filter_name;
1782
+		}
1539 1783
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1540 1784
 		try {
1541 1785
 			$sth = $this->db->prepare($query);
@@ -1544,12 +1788,17 @@  discard block
 block discarded – undo
1544 1788
 			echo "error : ".$e->getMessage();
1545 1789
 		}
1546 1790
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1547
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1548
-		else return 0;
1791
+		if (isset($all[0]['cnt'])) {
1792
+			return $all[0]['cnt'];
1793
+		} else {
1794
+			return 0;
1795
+		}
1549 1796
 	}
1550 1797
 	public function getStatsPilotTotal($filter_name = '') {
1551 1798
 		global $globalArchiveMonths, $globalDBdriver;
1552
-		if ($filter_name == '') $filter_name = $this->filter_name;
1799
+		if ($filter_name == '') {
1800
+			$filter_name = $this->filter_name;
1801
+		}
1553 1802
 		if ($globalDBdriver == 'mysql') {
1554 1803
 			$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1555 1804
 		} else {
@@ -1566,7 +1815,9 @@  discard block
 block discarded – undo
1566 1815
 	}
1567 1816
 	public function getStatsPilot($pilot,$filter_name = '') {
1568 1817
 		global $globalArchiveMonths, $globalDBdriver;
1569
-		if ($filter_name == '') $filter_name = $this->filter_name;
1818
+		if ($filter_name == '') {
1819
+			$filter_name = $this->filter_name;
1820
+		}
1570 1821
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1571 1822
 		try {
1572 1823
 			$sth = $this->db->prepare($query);
@@ -1575,13 +1826,18 @@  discard block
 block discarded – undo
1575 1826
 			echo "error : ".$e->getMessage();
1576 1827
 		}
1577 1828
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1578
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1579
-		else return 0;
1829
+		if (isset($all[0]['cnt'])) {
1830
+			return $all[0]['cnt'];
1831
+		} else {
1832
+			return 0;
1833
+		}
1580 1834
 	}
1581 1835
 
1582 1836
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1583 1837
 		global $globalDBdriver;
1584
-		if ($filter_name == '') $filter_name = $this->filter_name;
1838
+		if ($filter_name == '') {
1839
+			$filter_name = $this->filter_name;
1840
+		}
1585 1841
 		if ($globalDBdriver == 'mysql') {
1586 1842
 			$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";
1587 1843
 		} else {
@@ -1597,7 +1853,9 @@  discard block
 block discarded – undo
1597 1853
 	}
1598 1854
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1599 1855
 		global $globalDBdriver;
1600
-		if ($filter_name == '') $filter_name = $this->filter_name;
1856
+		if ($filter_name == '') {
1857
+			$filter_name = $this->filter_name;
1858
+		}
1601 1859
 		if ($globalDBdriver == 'mysql') {
1602 1860
 			$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";
1603 1861
 		} else {
@@ -1983,10 +2241,14 @@  discard block
 block discarded – undo
1983 2241
 		$Connection = new Connection($this->db);
1984 2242
 		date_default_timezone_set('UTC');
1985 2243
 		$last_update = $this->getLastStatsUpdate('last_update_stats');
1986
-			if ($globalDebug) echo 'Update stats !'."\n";
2244
+			if ($globalDebug) {
2245
+				echo 'Update stats !'."\n";
2246
+			}
1987 2247
 			if (isset($last_update[0]['value'])) {
1988 2248
 				$last_update_day = $last_update[0]['value'];
1989
-			} else $last_update_day = '2012-12-12 12:12:12';
2249
+			} else {
2250
+				$last_update_day = '2012-12-12 12:12:12';
2251
+			}
1990 2252
 			$reset = false;
1991 2253
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
1992 2254
 			if ($globalStatsResetYear) {
@@ -1995,43 +2257,63 @@  discard block
 block discarded – undo
1995 2257
 			}
1996 2258
 			$Spotter = new Spotter($this->db);
1997 2259
 
1998
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
2260
+			if ($globalDebug) {
2261
+				echo 'Count all aircraft types...'."\n";
2262
+			}
1999 2263
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2000 2264
 			foreach ($alldata as $number) {
2001 2265
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2002 2266
 			}
2003
-			if ($globalDebug) echo 'Count all airlines...'."\n";
2267
+			if ($globalDebug) {
2268
+				echo 'Count all airlines...'."\n";
2269
+			}
2004 2270
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2005 2271
 			foreach ($alldata as $number) {
2006 2272
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2007 2273
 			}
2008
-			if ($globalDebug) echo 'Count all registrations...'."\n";
2274
+			if ($globalDebug) {
2275
+				echo 'Count all registrations...'."\n";
2276
+			}
2009 2277
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2010 2278
 			foreach ($alldata as $number) {
2011 2279
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2012 2280
 			}
2013
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
2281
+			if ($globalDebug) {
2282
+				echo 'Count all callsigns...'."\n";
2283
+			}
2014 2284
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2015 2285
 			foreach ($alldata as $number) {
2016 2286
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2017 2287
 			}
2018
-			if ($globalDebug) echo 'Count all owners...'."\n";
2288
+			if ($globalDebug) {
2289
+				echo 'Count all owners...'."\n";
2290
+			}
2019 2291
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2020 2292
 			foreach ($alldata as $number) {
2021 2293
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2022 2294
 			}
2023
-			if ($globalDebug) echo 'Count all pilots...'."\n";
2295
+			if ($globalDebug) {
2296
+				echo 'Count all pilots...'."\n";
2297
+			}
2024 2298
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2025 2299
 			foreach ($alldata as $number) {
2026
-				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2300
+				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') {
2301
+					$number['pilot_id'] = $number['pilot_name'];
2302
+				}
2027 2303
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2028 2304
 			}
2029 2305
 			
2030
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
2306
+			if ($globalDebug) {
2307
+				echo 'Count all departure airports...'."\n";
2308
+			}
2031 2309
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2032
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2310
+			if ($globalDebug) {
2311
+				echo 'Count all detected departure airports...'."\n";
2312
+			}
2033 2313
 			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2034
-			if ($globalDebug) echo 'Order departure airports...'."\n";
2314
+			if ($globalDebug) {
2315
+				echo 'Order departure airports...'."\n";
2316
+			}
2035 2317
 			$alldata = array();
2036 2318
 			foreach ($pall as $value) {
2037 2319
 				$icao = $value['airport_departure_icao'];
@@ -2041,7 +2323,9 @@  discard block
 block discarded – undo
2041 2323
 				$icao = $value['airport_departure_icao'];
2042 2324
 				if (isset($alldata[$icao])) {
2043 2325
 					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2044
-				} else $alldata[$icao] = $value;
2326
+				} else {
2327
+					$alldata[$icao] = $value;
2328
+				}
2045 2329
 			}
2046 2330
 			$count = array();
2047 2331
 			foreach ($alldata as $key => $row) {
@@ -2051,11 +2335,17 @@  discard block
 block discarded – undo
2051 2335
 			foreach ($alldata as $number) {
2052 2336
 				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);
2053 2337
 			}
2054
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2338
+			if ($globalDebug) {
2339
+				echo 'Count all arrival airports...'."\n";
2340
+			}
2055 2341
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2056
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2342
+			if ($globalDebug) {
2343
+				echo 'Count all detected arrival airports...'."\n";
2344
+			}
2057 2345
 			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2058
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
2346
+			if ($globalDebug) {
2347
+				echo 'Order arrival airports...'."\n";
2348
+			}
2059 2349
 			$alldata = array();
2060 2350
 			foreach ($pall as $value) {
2061 2351
 				$icao = $value['airport_arrival_icao'];
@@ -2065,7 +2355,9 @@  discard block
 block discarded – undo
2065 2355
 				$icao = $value['airport_arrival_icao'];
2066 2356
 				if (isset($alldata[$icao])) {
2067 2357
 					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2068
-				} else $alldata[$icao] = $value;
2358
+				} else {
2359
+					$alldata[$icao] = $value;
2360
+				}
2069 2361
 			}
2070 2362
 			$count = array();
2071 2363
 			foreach ($alldata as $key => $row) {
@@ -2076,7 +2368,9 @@  discard block
 block discarded – undo
2076 2368
 				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);
2077 2369
 			}
2078 2370
 			if ($Connection->tableExists('countries')) {
2079
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2371
+				if ($globalDebug) {
2372
+					echo 'Count all flights by countries...'."\n";
2373
+				}
2080 2374
 				//$SpotterArchive = new SpotterArchive();
2081 2375
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2082 2376
 				$Spotter = new Spotter($this->db);
@@ -2087,7 +2381,9 @@  discard block
 block discarded – undo
2087 2381
 			}
2088 2382
 			
2089 2383
 			if (isset($globalAccidents) && $globalAccidents) {
2090
-				if ($globalDebug) echo 'Count fatalities stats...'."\n";
2384
+				if ($globalDebug) {
2385
+					echo 'Count fatalities stats...'."\n";
2386
+				}
2091 2387
 				$Accident = new Accident($this->db);
2092 2388
 				$this->deleteStatsByType('fatalities_byyear');
2093 2389
 				$alldata = $Accident->countFatalitiesByYear();
@@ -2103,48 +2399,68 @@  discard block
 block discarded – undo
2103 2399
 
2104 2400
 			// Add by month using getstat if month finish...
2105 2401
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
2106
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
2402
+			if ($globalDebug) {
2403
+				echo 'Count all flights by months...'."\n";
2404
+			}
2107 2405
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2108 2406
 			$filter_last_month = array('since_date' => $last_month);
2109 2407
 			$Spotter = new Spotter($this->db);
2110 2408
 			$alldata = $Spotter->countAllMonths($filter_last_month);
2111 2409
 			$lastyear = false;
2112 2410
 			foreach ($alldata as $number) {
2113
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2411
+				if ($number['year_name'] != date('Y')) {
2412
+					$lastyear = true;
2413
+				}
2114 2414
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2115 2415
 			}
2116
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2416
+			if ($globalDebug) {
2417
+				echo 'Count all military flights by months...'."\n";
2418
+			}
2117 2419
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2118 2420
 			foreach ($alldata as $number) {
2119 2421
 				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2120 2422
 			}
2121
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
2423
+			if ($globalDebug) {
2424
+				echo 'Count all owners by months...'."\n";
2425
+			}
2122 2426
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2123 2427
 			foreach ($alldata as $number) {
2124 2428
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2125 2429
 			}
2126
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2430
+			if ($globalDebug) {
2431
+				echo 'Count all pilots by months...'."\n";
2432
+			}
2127 2433
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2128 2434
 			foreach ($alldata as $number) {
2129 2435
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2130 2436
 			}
2131
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2437
+			if ($globalDebug) {
2438
+				echo 'Count all airlines by months...'."\n";
2439
+			}
2132 2440
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2133 2441
 			foreach ($alldata as $number) {
2134 2442
 				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2135 2443
 			}
2136
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2444
+			if ($globalDebug) {
2445
+				echo 'Count all aircrafts by months...'."\n";
2446
+			}
2137 2447
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2138 2448
 			foreach ($alldata as $number) {
2139 2449
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2140 2450
 			}
2141
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2451
+			if ($globalDebug) {
2452
+				echo 'Count all real arrivals by months...'."\n";
2453
+			}
2142 2454
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2143 2455
 			foreach ($alldata as $number) {
2144 2456
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2145 2457
 			}
2146
-			if ($globalDebug) echo 'Airports data...'."\n";
2147
-			if ($globalDebug) echo '...Departure'."\n";
2458
+			if ($globalDebug) {
2459
+				echo 'Airports data...'."\n";
2460
+			}
2461
+			if ($globalDebug) {
2462
+				echo '...Departure'."\n";
2463
+			}
2148 2464
 			$this->deleteStatAirport('daily');
2149 2465
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
2150 2466
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
@@ -2262,7 +2578,9 @@  discard block
 block discarded – undo
2262 2578
 			// Count by airlines
2263 2579
 			echo '--- Stats by airlines ---'."\n";
2264 2580
 			if ($Connection->tableExists('countries')) {
2265
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2581
+				if ($globalDebug) {
2582
+					echo 'Count all flights by countries by airlines...'."\n";
2583
+				}
2266 2584
 				$SpotterArchive = new SpotterArchive($this->db);
2267 2585
 				//$Spotter = new Spotter($this->db);
2268 2586
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
@@ -2271,37 +2589,53 @@  discard block
 block discarded – undo
2271 2589
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2272 2590
 				}
2273 2591
 			}
2274
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2592
+			if ($globalDebug) {
2593
+				echo 'Count all aircraft types by airlines...'."\n";
2594
+			}
2275 2595
 			$Spotter = new Spotter($this->db);
2276 2596
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2277 2597
 			foreach ($alldata as $number) {
2278 2598
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2279 2599
 			}
2280
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2600
+			if ($globalDebug) {
2601
+				echo 'Count all aircraft registrations by airlines...'."\n";
2602
+			}
2281 2603
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2282 2604
 			foreach ($alldata as $number) {
2283 2605
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2284 2606
 			}
2285
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2607
+			if ($globalDebug) {
2608
+				echo 'Count all callsigns by airlines...'."\n";
2609
+			}
2286 2610
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2287 2611
 			foreach ($alldata as $number) {
2288 2612
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2289 2613
 			}
2290
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2614
+			if ($globalDebug) {
2615
+				echo 'Count all owners by airlines...'."\n";
2616
+			}
2291 2617
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2292 2618
 			foreach ($alldata as $number) {
2293 2619
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2294 2620
 			}
2295
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2621
+			if ($globalDebug) {
2622
+				echo 'Count all pilots by airlines...'."\n";
2623
+			}
2296 2624
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2297 2625
 			foreach ($alldata as $number) {
2298 2626
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2299 2627
 			}
2300
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2628
+			if ($globalDebug) {
2629
+				echo 'Count all departure airports by airlines...'."\n";
2630
+			}
2301 2631
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2302
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2632
+			if ($globalDebug) {
2633
+				echo 'Count all detected departure airports by airlines...'."\n";
2634
+			}
2303 2635
 			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2304
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2636
+			if ($globalDebug) {
2637
+				echo 'Order detected departure airports by airlines...'."\n";
2638
+			}
2305 2639
 			//$alldata = array();
2306 2640
 			foreach ($dall as $value) {
2307 2641
 				$icao = $value['airport_departure_icao'];
@@ -2322,11 +2656,17 @@  discard block
 block discarded – undo
2322 2656
 			foreach ($alldata as $number) {
2323 2657
 				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);
2324 2658
 			}
2325
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2659
+			if ($globalDebug) {
2660
+				echo 'Count all arrival airports by airlines...'."\n";
2661
+			}
2326 2662
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2327
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2663
+			if ($globalDebug) {
2664
+				echo 'Count all detected arrival airports by airlines...'."\n";
2665
+			}
2328 2666
 			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2329
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2667
+			if ($globalDebug) {
2668
+				echo 'Order arrival airports by airlines...'."\n";
2669
+			}
2330 2670
 			//$alldata = array();
2331 2671
 			foreach ($dall as $value) {
2332 2672
 				$icao = $value['airport_arrival_icao'];
@@ -2345,37 +2685,53 @@  discard block
 block discarded – undo
2345 2685
 			}
2346 2686
 			$alldata = $pall;
2347 2687
 			foreach ($alldata as $number) {
2348
-				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);
2688
+				if ($number['airline_icao'] != '') {
2689
+					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);
2690
+				}
2691
+			}
2692
+			if ($globalDebug) {
2693
+				echo 'Count all flights by months by airlines...'."\n";
2349 2694
 			}
2350
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2351 2695
 			$Spotter = new Spotter($this->db);
2352 2696
 			$alldata = $Spotter->countAllMonthsByAirlines($filter_last_month);
2353 2697
 			$lastyear = false;
2354 2698
 			foreach ($alldata as $number) {
2355
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2699
+				if ($number['year_name'] != date('Y')) {
2700
+					$lastyear = true;
2701
+				}
2356 2702
 				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2357 2703
 			}
2358
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2704
+			if ($globalDebug) {
2705
+				echo 'Count all owners by months by airlines...'."\n";
2706
+			}
2359 2707
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2360 2708
 			foreach ($alldata as $number) {
2361 2709
 				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2362 2710
 			}
2363
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2711
+			if ($globalDebug) {
2712
+				echo 'Count all pilots by months by airlines...'."\n";
2713
+			}
2364 2714
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2365 2715
 			foreach ($alldata as $number) {
2366 2716
 				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2367 2717
 			}
2368
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2718
+			if ($globalDebug) {
2719
+				echo 'Count all aircrafts by months by airlines...'."\n";
2720
+			}
2369 2721
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2370 2722
 			foreach ($alldata as $number) {
2371 2723
 				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2372 2724
 			}
2373
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2725
+			if ($globalDebug) {
2726
+				echo 'Count all real arrivals by months by airlines...'."\n";
2727
+			}
2374 2728
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2375 2729
 			foreach ($alldata as $number) {
2376 2730
 				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2377 2731
 			}
2378
-			if ($globalDebug) echo '...Departure'."\n";
2732
+			if ($globalDebug) {
2733
+				echo '...Departure'."\n";
2734
+			}
2379 2735
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
2380 2736
 			$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
2381 2737
 			foreach ($dall as $value) {
@@ -2398,7 +2754,9 @@  discard block
 block discarded – undo
2398 2754
 			foreach ($alldata as $number) {
2399 2755
 				$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']);
2400 2756
 			}
2401
-			if ($globalDebug) echo '...Arrival'."\n";
2757
+			if ($globalDebug) {
2758
+				echo '...Arrival'."\n";
2759
+			}
2402 2760
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
2403 2761
 			$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
2404 2762
 			foreach ($dall as $value) {
@@ -2422,13 +2780,19 @@  discard block
 block discarded – undo
2422 2780
 				$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']);
2423 2781
 			}
2424 2782
 
2425
-			if ($globalDebug) echo 'Flights data...'."\n";
2426
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2783
+			if ($globalDebug) {
2784
+				echo 'Flights data...'."\n";
2785
+			}
2786
+			if ($globalDebug) {
2787
+				echo '-> countAllDatesLastMonth...'."\n";
2788
+			}
2427 2789
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2428 2790
 			foreach ($alldata as $number) {
2429 2791
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2430 2792
 			}
2431
-			if ($globalDebug) echo '-> countAllDates...'."\n";
2793
+			if ($globalDebug) {
2794
+				echo '-> countAllDates...'."\n";
2795
+			}
2432 2796
 			//$previousdata = $this->countAllDatesByAirlines();
2433 2797
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2434 2798
 			$values = array();
@@ -2441,14 +2805,18 @@  discard block
 block discarded – undo
2441 2805
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2442 2806
 			}
2443 2807
 			
2444
-			if ($globalDebug) echo '-> countAllHours...'."\n";
2808
+			if ($globalDebug) {
2809
+				echo '-> countAllHours...'."\n";
2810
+			}
2445 2811
 			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2446 2812
 			foreach ($alldata as $number) {
2447 2813
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2448 2814
 			}
2449 2815
 
2450 2816
 			// Stats by filters
2451
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
2817
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
2818
+				$globalStatsFilters = array();
2819
+			}
2452 2820
 			foreach ($globalStatsFilters as $name => $filter) {
2453 2821
 				if (!empty($filter)) {
2454 2822
 					//$filter_name = $filter['name'];
@@ -2456,7 +2824,9 @@  discard block
 block discarded – undo
2456 2824
 					$reset = false;
2457 2825
 					$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
2458 2826
 					if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
2459
-						if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2827
+						if ($globalDebug) {
2828
+							echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
2829
+						}
2460 2830
 						$this->deleteOldStats($filter_name);
2461 2831
 						unset($last_update);
2462 2832
 					}
@@ -2473,39 +2843,55 @@  discard block
 block discarded – undo
2473 2843
 						$reset = true;
2474 2844
 					}
2475 2845
 					// Count by filter
2476
-					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2846
+					if ($globalDebug) {
2847
+						echo '--- Stats for filter '.$filter_name.' ---'."\n";
2848
+					}
2477 2849
 					$Spotter = new Spotter($this->db);
2478
-					if ($globalDebug) echo 'Count all aircraft types...'."\n";
2850
+					if ($globalDebug) {
2851
+						echo 'Count all aircraft types...'."\n";
2852
+					}
2479 2853
 					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2480 2854
 					foreach ($alldata as $number) {
2481 2855
 						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
2482 2856
 					}
2483
-					if ($globalDebug) echo 'Count all airlines...'."\n";
2857
+					if ($globalDebug) {
2858
+						echo 'Count all airlines...'."\n";
2859
+					}
2484 2860
 					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
2485 2861
 					foreach ($alldata as $number) {
2486 2862
 						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
2487 2863
 					}
2488
-					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
2864
+					if ($globalDebug) {
2865
+						echo 'Count all aircraft registrations...'."\n";
2866
+					}
2489 2867
 					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
2490 2868
 					foreach ($alldata as $number) {
2491 2869
 						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
2492 2870
 					}
2493
-					if ($globalDebug) echo 'Count all callsigns...'."\n";
2871
+					if ($globalDebug) {
2872
+						echo 'Count all callsigns...'."\n";
2873
+					}
2494 2874
 					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
2495 2875
 					foreach ($alldata as $number) {
2496 2876
 						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
2497 2877
 					}
2498
-					if ($globalDebug) echo 'Count all owners...'."\n";
2878
+					if ($globalDebug) {
2879
+						echo 'Count all owners...'."\n";
2880
+					}
2499 2881
 					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
2500 2882
 					foreach ($alldata as $number) {
2501 2883
 						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
2502 2884
 					}
2503
-					if ($globalDebug) echo 'Count all pilots...'."\n";
2885
+					if ($globalDebug) {
2886
+						echo 'Count all pilots...'."\n";
2887
+					}
2504 2888
 					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
2505 2889
 					foreach ($alldata as $number) {
2506 2890
 						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2507 2891
 					}
2508
-					if ($globalDebug) echo 'Count departure airports...'."\n";
2892
+					if ($globalDebug) {
2893
+						echo 'Count departure airports...'."\n";
2894
+					}
2509 2895
 					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2510 2896
 					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2511 2897
 					$alldata = array();
@@ -2517,7 +2903,9 @@  discard block
 block discarded – undo
2517 2903
 						$icao = $value['airport_departure_icao'];
2518 2904
 						if (isset($alldata[$icao])) {
2519 2905
 							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2520
-						} else $alldata[$icao] = $value;
2906
+						} else {
2907
+							$alldata[$icao] = $value;
2908
+						}
2521 2909
 					}
2522 2910
 					$count = array();
2523 2911
 					foreach ($alldata as $key => $row) {
@@ -2527,7 +2915,9 @@  discard block
 block discarded – undo
2527 2915
 					foreach ($alldata as $number) {
2528 2916
 						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);
2529 2917
 					}
2530
-					if ($globalDebug) echo 'Count all arrival airports...'."\n";
2918
+					if ($globalDebug) {
2919
+						echo 'Count all arrival airports...'."\n";
2920
+					}
2531 2921
 					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2532 2922
 					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2533 2923
 					$alldata = array();
@@ -2539,7 +2929,9 @@  discard block
 block discarded – undo
2539 2929
 						$icao = $value['airport_arrival_icao'];
2540 2930
 						if (isset($alldata[$icao])) {
2541 2931
 							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2542
-						} else $alldata[$icao] = $value;
2932
+						} else {
2933
+							$alldata[$icao] = $value;
2934
+						}
2543 2935
 					}
2544 2936
 					$count = array();
2545 2937
 					foreach ($alldata as $key => $row) {
@@ -2549,35 +2941,49 @@  discard block
 block discarded – undo
2549 2941
 					foreach ($alldata as $number) {
2550 2942
 						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);
2551 2943
 					}
2552
-					if ($globalDebug) echo 'Count all months...'."\n";
2944
+					if ($globalDebug) {
2945
+						echo 'Count all months...'."\n";
2946
+					}
2553 2947
 					$Spotter = new Spotter($this->db);
2554 2948
 					$alldata = $Spotter->countAllMonths($filter);
2555 2949
 					$lastyear = false;
2556 2950
 					foreach ($alldata as $number) {
2557
-						if ($number['year_name'] != date('Y')) $lastyear = true;
2951
+						if ($number['year_name'] != date('Y')) {
2952
+							$lastyear = true;
2953
+						}
2558 2954
 						$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2559 2955
 					}
2560
-					if ($globalDebug) echo 'Count all owners by months...'."\n";
2956
+					if ($globalDebug) {
2957
+						echo 'Count all owners by months...'."\n";
2958
+					}
2561 2959
 					$alldata = $Spotter->countAllMonthsOwners($filter);
2562 2960
 					foreach ($alldata as $number) {
2563 2961
 						$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2564 2962
 					}
2565
-					if ($globalDebug) echo 'Count all pilots by months...'."\n";
2963
+					if ($globalDebug) {
2964
+						echo 'Count all pilots by months...'."\n";
2965
+					}
2566 2966
 					$alldata = $Spotter->countAllMonthsPilots($filter);
2567 2967
 					foreach ($alldata as $number) {
2568 2968
 						$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2569 2969
 					}
2570
-					if ($globalDebug) echo 'Count all military by months...'."\n";
2970
+					if ($globalDebug) {
2971
+						echo 'Count all military by months...'."\n";
2972
+					}
2571 2973
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
2572 2974
 					foreach ($alldata as $number) {
2573 2975
 						$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2574 2976
 					}
2575
-					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2977
+					if ($globalDebug) {
2978
+						echo 'Count all aircrafts by months...'."\n";
2979
+					}
2576 2980
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
2577 2981
 				    	foreach ($alldata as $number) {
2578 2982
 			    			$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
2579 2983
 					}
2580
-					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2984
+					if ($globalDebug) {
2985
+						echo 'Count all real arrivals by months...'."\n";
2986
+					}
2581 2987
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2582 2988
 					foreach ($alldata as $number) {
2583 2989
 						$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
Please login to merge, or discard this patch.
require/class.ACARS.php 2 patches
Spacing   +256 added lines, -256 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 	public $db;
11 11
 	public $SI;
12 12
 	private $fromACARSscript = false;
13
-	public function __construct($dbc = null,$fromACARSscript = false) {
13
+	public function __construct($dbc = null, $fromACARSscript = false) {
14 14
 		$Connection = new Connection($dbc);
15 15
 		$this->db = $Connection->db();
16 16
 		if ($this->db === null) die('Error: No DB connection. (ACARS)');
@@ -26,14 +26,14 @@  discard block
 block discarded – undo
26 26
 	* @return String the icao
27 27
 	*/
28 28
 	public function ident2icao($ident) {
29
-		if (substr($ident,0,2) == 'AF') {
30
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
31
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
29
+		if (substr($ident, 0, 2) == 'AF') {
30
+			if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
31
+			else $icao = 'AFR'.ltrim(substr($ident, 2), '0');
32 32
 		} else {
33 33
 			$Spotter = new Spotter($this->db);
34
-			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
34
+			$identicao = $Spotter->getAllAirlineInfo(substr($ident, 0, 2));
35 35
 			if (isset($identicao[0])) {
36
-				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
36
+				$icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0');
37 37
 			} else $icao = $ident;
38 38
 		}
39 39
 		return $icao;
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
 			$sth = $this->db->prepare($query);
59 59
 			$sth->execute();
60
-		} catch(PDOException $e) {
60
+		} catch (PDOException $e) {
61 61
 			return "error";
62 62
 		}
63 63
 		return "success";
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
 			$sth = $this->db->prepare($query);
83 83
 			$sth->execute();
84
-		} catch(PDOException $e) {
84
+		} catch (PDOException $e) {
85 85
 			return "error";
86 86
 		}
87 87
 		return "success";
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
106 106
 		$ident = '';
107 107
 		$message = '';
108 108
 		$result = array();
109
-		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
110
-		if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
111
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
112
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
109
+		$n = sscanf($data, '(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
110
+		if ($n == 0) $n = sscanf($data, 'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
111
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
112
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
113 113
 		if ($n != 0) {
114
-			$registration = str_replace('.','',$registration);
115
-			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
114
+			$registration = str_replace('.', '', $registration);
115
+			$result = array('registration' => $registration, 'ident' => $ident, 'label' => $label, 'block_id' => $block_id, 'msg_no' => $msg_no, 'message' => $message);
116 116
 			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
117 117
 		} else $message = $data;
118 118
 		$decode = array();
@@ -132,14 +132,14 @@  discard block
 block discarded – undo
132 132
 				$temp = '';
133 133
 				$n = sscanf($message, "FST01%4c%4c%c%06d%c%07d%03d%*8[0-9a-zA-Z ]-%02dC", $dair, $darr, $lac, $la, $lnc, $ln, $alt, $temp);
134 134
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
135
-					$latitude = $la / 10000.0;
136
-					$longitude = $ln / 10000.0;
135
+					$latitude = $la/10000.0;
136
+					$longitude = $ln/10000.0;
137 137
 					if ($lac == 'S') $latitude = '-'.$latitude;
138 138
 					if ($lnc == 'W') $longitude = '-'.$longitude;
139 139
 					// Temp not always available
140 140
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
141
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
142
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
141
+					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => $alt);
142
+					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt, 'Temperature' => $temp.'°C');
143 143
 
144 144
 					//$icao = $Translation->checkTranslation($ident);
145 145
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -151,19 +151,19 @@  discard block
 block discarded – undo
151 151
 				$dhour = '';
152 152
 				$darr = '';
153 153
 				$ahour = '';
154
-				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
154
+				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr, $ahour);
155 155
 				if ($n == 4 && strlen($darr) == 4) {
156
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
157
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
158
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
156
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
157
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
158
+					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '.$darr.' - departure hour : '.$dhour.' - arrival hour : '.$ahour."\n";
159 159
 					//$icao = ACARS->ident2icao($ident);
160 160
 					//$icao = $Translation->checkTranslation($ident);
161 161
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
162 162
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
163 163
 					$found = true;
164 164
 				}
165
-				elseif ($n == 2 || $n  == 4) {
166
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
165
+				elseif ($n == 2 || $n == 4) {
166
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
167 167
 					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
168 168
 					//$icao = ACARS->ident2icao($ident);
169 169
 					//$icao = $Translation->checkTranslation($ident);
@@ -221,11 +221,11 @@  discard block
 block discarded – undo
221 221
 				$ahour = '';
222 222
 				$aair = '';
223 223
 				$apiste = '';
224
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
224
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao, $aident, $dair, $darr, $ddate, $dhour, $ahour, $aair, $apiste);
225 225
 				if ($n > 8) {
226
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
227
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
228
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
226
+					if ($globalDebug) echo 'airicao : '.$airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '.$darr.' - date depart : '.$ddate.' - departure hour : '.$dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
227
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
228
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
229 229
 					$icao = trim($aident);
230 230
 
231 231
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
@@ -250,8 +250,8 @@  discard block
 block discarded – undo
250 250
 				if ($n == 10 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
251 251
 					$las = $las.'.'.$lass;
252 252
 					$lns = $lns.'.'.$lns;
253
-					$latitude = $las / 1000.0;
254
-					$longitude = $lns / 1000.0;
253
+					$latitude = $las/1000.0;
254
+					$longitude = $lns/1000.0;
255 255
 					if ($lac == 'S') $latitude = '-'.$latitude;
256 256
 					if ($lnc == 'W') $longitude = '-'.$longitude;
257 257
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
@@ -346,17 +346,17 @@  discard block
 block discarded – undo
346 346
 				$alt = '';
347 347
 				$fuel = '';
348 348
 				$speed = '';
349
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
349
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
350 350
 				if ($n == 9) {
351 351
 					//if (self->$debug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
352 352
 					$icao = trim($aident);
353 353
 					$decode['icao'] = $icao;
354
-					$latitude = $las / 100.0;
355
-					$longitude = $lns / 100.0;
354
+					$latitude = $las/100.0;
355
+					$longitude = $lns/100.0;
356 356
 					if ($lac == 'S') $latitude = '-'.$latitude;
357 357
 					if ($lnc == 'W') $longitude = '-'.$longitude;
358 358
 
359
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
359
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Altitude' => 'FL'.$alt, 'Fuel' => $fuel, 'speed' => $speed);
360 360
 					$found = true;
361 361
 				}
362 362
 			}
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 					if ($lac == 'S') $latitude = '-'.$latitude;
376 376
 					if ($lnc == 'W') $longitude = '-'.$longitude;
377 377
 
378
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
378
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
379 379
 					$found = true;
380 380
 				}
381 381
 			}
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 				$dair = '';
409 409
 				$darr = '';
410 410
 				$aident = '';
411
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
411
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
412 412
 				if ($n == 8) {
413 413
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
414 414
 					$icao = trim($aident);
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
 				*/
441 441
 				$dair = '';
442 442
 				$darr = '';
443
-				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
443
+				$n = sscanf($message, '%4[A-Z]%4[A-Z]%*4d', $dair, $darr);
444 444
 				if ($n == 3) {
445 445
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
446 446
 					//$icao = $Translation->checkTranslation($ident);
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
 				*/
456 456
 				$dair = '';
457 457
 				$darr = '';
458
-				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
458
+				$n = sscanf($message, '3J01 DSPTCH %*d/%*d %4s/%4s .%*6s', $dair, $darr);
459 459
 				if ($n == 3) {
460 460
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
461 461
 					//$icao = $Translation->checkTranslation($ident);
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
 				}
466 466
 			}
467 467
 			if (!$found) {
468
-				$n = sscanf($message,'MET01%4c',$airport);
468
+				$n = sscanf($message, 'MET01%4c', $airport);
469 469
 				if ($n == 1) {
470 470
 					if ($globalDebug) echo 'airport name : '.$airport;
471 471
 					$decode = array('Airport/Waypoint name' => $airport);
@@ -473,241 +473,241 @@  discard block
 block discarded – undo
473 473
 				}
474 474
 			}
475 475
 			if ($label == 'H1') {
476
-				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
477
-					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
476
+				if (preg_match('/^#CFBFLR/', $message) || preg_match('/^#CFBWRN/', $message)) {
477
+					$decode = array_merge(array('Message nature' => 'Equipment failure'), $decode);
478 478
 				}
479
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
480
-					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
479
+				elseif (preg_match('/^#DFB\*TKO/', $message) || preg_match('/^#DFBTKO/', $message)) {
480
+					$decode = array_merge(array('Message nature' => 'Take off performance data'), $decode);
481 481
 				}
482
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
483
-					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
482
+				elseif (preg_match('/^#DFB\*CRZ/', $message) || preg_match('/^#DFBCRZ/', $message)) {
483
+					$decode = array_merge(array('Message nature' => 'Cruise performance data'), $decode);
484 484
 				}
485
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
486
-					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
485
+				elseif (preg_match('/^#DFB\*WOB/', $message) || preg_match('/^#DFBWOB/', $message)) {
486
+					$decode = array_merge(array('Message nature' => 'Weather observation'), $decode);
487 487
 				}
488
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
489
-					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
488
+				elseif (preg_match(':^#DFB/PIREP:', $message)) {
489
+					$decode = array_merge(array('Message nature' => 'Pilot Report'), $decode);
490 490
 				}
491
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
492
-					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
491
+				elseif (preg_match('/^#DFBEDA/', $message) || preg_match('/^#DFBENG/', $message)) {
492
+					$decode = array_merge(array('Message nature' => 'Engine Data'), $decode);
493 493
 				}
494
-				elseif (preg_match(':^#M1AAEP:',$message)) {
495
-					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
494
+				elseif (preg_match(':^#M1AAEP:', $message)) {
495
+					$decode = array_merge(array('Message nature' => 'Position/Weather Report'), $decode);
496 496
 				}
497
-				elseif (preg_match(':^#M2APWD:',$message)) {
498
-					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
497
+				elseif (preg_match(':^#M2APWD:', $message)) {
498
+					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'), $decode);
499 499
 				}
500
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
501
-					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
500
+				elseif (preg_match(':^#M1BREQPWI:', $message)) {
501
+					$decode = array_merge(array('Message nature' => 'Predicted wind info request'), $decode);
502 502
 				}
503
-				elseif (preg_match(':^#CF:',$message)) {
504
-					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
503
+				elseif (preg_match(':^#CF:', $message)) {
504
+					$decode = array_merge(array('Message nature' => 'Central Fault Display'), $decode);
505 505
 				}
506
-				elseif (preg_match(':^#DF:',$message)) {
507
-					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
506
+				elseif (preg_match(':^#DF:', $message)) {
507
+					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'), $decode);
508 508
 				}
509
-				elseif (preg_match(':^#EC:',$message)) {
510
-					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
509
+				elseif (preg_match(':^#EC:', $message)) {
510
+					$decode = array_merge(array('Message nature' => 'Engine Display System'), $decode);
511 511
 				}
512
-				elseif (preg_match(':^#EI:',$message)) {
513
-					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
512
+				elseif (preg_match(':^#EI:', $message)) {
513
+					$decode = array_merge(array('Message nature' => 'Engine Report'), $decode);
514 514
 				}
515
-				elseif (preg_match(':^#H1:',$message)) {
516
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
515
+				elseif (preg_match(':^#H1:', $message)) {
516
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'), $decode);
517 517
 				}
518
-				elseif (preg_match(':^#H2:',$message)) {
519
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
518
+				elseif (preg_match(':^#H2:', $message)) {
519
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'), $decode);
520 520
 				}
521
-				elseif (preg_match(':^#HD:',$message)) {
522
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
521
+				elseif (preg_match(':^#HD:', $message)) {
522
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'), $decode);
523 523
 				}
524
-				elseif (preg_match(':^#M1:',$message)) {
525
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
524
+				elseif (preg_match(':^#M1:', $message)) {
525
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'), $decode);
526 526
 				}
527
-				elseif (preg_match(':^#M2:',$message)) {
528
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
527
+				elseif (preg_match(':^#M2:', $message)) {
528
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'), $decode);
529 529
 				}
530
-				elseif (preg_match(':^#M3:',$message)) {
531
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
530
+				elseif (preg_match(':^#M3:', $message)) {
531
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'), $decode);
532 532
 				}
533
-				elseif (preg_match(':^#MD:',$message)) {
534
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
533
+				elseif (preg_match(':^#MD:', $message)) {
534
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'), $decode);
535 535
 				}
536
-				elseif (preg_match(':^#PS:',$message)) {
537
-					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
536
+				elseif (preg_match(':^#PS:', $message)) {
537
+					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'), $decode);
538 538
 				}
539
-				elseif (preg_match(':^#S1:',$message)) {
540
-					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
539
+				elseif (preg_match(':^#S1:', $message)) {
540
+					$decode = array_merge(array('Message nature' => 'SDU - Left'), $decode);
541 541
 				}
542
-				elseif (preg_match(':^#S2:',$message)) {
543
-					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
542
+				elseif (preg_match(':^#S2:', $message)) {
543
+					$decode = array_merge(array('Message nature' => 'SDU - Right'), $decode);
544 544
 				}
545
-				elseif (preg_match(':^#SD:',$message)) {
546
-					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
545
+				elseif (preg_match(':^#SD:', $message)) {
546
+					$decode = array_merge(array('Message nature' => 'SDU - Selected'), $decode);
547 547
 				}
548
-				elseif (preg_match(':^#T[0-8]:',$message)) {
549
-					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
548
+				elseif (preg_match(':^#T[0-8]:', $message)) {
549
+					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'), $decode);
550 550
 				}
551
-				elseif (preg_match(':^#WO:',$message)) {
552
-					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
551
+				elseif (preg_match(':^#WO:', $message)) {
552
+					$decode = array_merge(array('Message nature' => 'Weather Observation Report'), $decode);
553 553
 				}
554
-				elseif (preg_match(':^#A1:',$message)) {
555
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
554
+				elseif (preg_match(':^#A1:', $message)) {
555
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'), $decode);
556 556
 				}
557
-				elseif (preg_match(':^#A3:',$message)) {
558
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
557
+				elseif (preg_match(':^#A3:', $message)) {
558
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'), $decode);
559 559
 				}
560
-				elseif (preg_match(':^#A4:',$message)) {
561
-					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
560
+				elseif (preg_match(':^#A4:', $message)) {
561
+					$decode = array_merge(array('Message nature' => 'Flight Systems Message'), $decode);
562 562
 				}
563
-				elseif (preg_match(':^#A6:',$message)) {
564
-					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
563
+				elseif (preg_match(':^#A6:', $message)) {
564
+					$decode = array_merge(array('Message nature' => 'Request ADS Reports'), $decode);
565 565
 				}
566
-				elseif (preg_match(':^#A8:',$message)) {
567
-					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
566
+				elseif (preg_match(':^#A8:', $message)) {
567
+					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'), $decode);
568 568
 				}
569
-				elseif (preg_match(':^#A9:',$message)) {
570
-					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
569
+				elseif (preg_match(':^#A9:', $message)) {
570
+					$decode = array_merge(array('Message nature' => 'ATIS report'), $decode);
571 571
 				}
572
-				elseif (preg_match(':^#A0:',$message)) {
573
-					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
572
+				elseif (preg_match(':^#A0:', $message)) {
573
+					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'), $decode);
574 574
 				}
575
-				elseif (preg_match(':^#AA:',$message)) {
576
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
575
+				elseif (preg_match(':^#AA:', $message)) {
576
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
577 577
 				}
578
-				elseif (preg_match(':^#AB:',$message)) {
579
-					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
578
+				elseif (preg_match(':^#AB:', $message)) {
579
+					$decode = array_merge(array('Message nature' => 'TWIP Report'), $decode);
580 580
 				}
581
-				elseif (preg_match(':^#AC:',$message)) {
582
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
581
+				elseif (preg_match(':^#AC:', $message)) {
582
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance'), $decode);
583 583
 				}
584
-				elseif (preg_match(':^#AD:',$message)) {
585
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
584
+				elseif (preg_match(':^#AD:', $message)) {
585
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'), $decode);
586 586
 				}
587
-				elseif (preg_match(':^#AF:',$message)) {
588
-					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
587
+				elseif (preg_match(':^#AF:', $message)) {
588
+					$decode = array_merge(array('Message nature' => 'CPC Command/Response'), $decode);
589 589
 				}
590
-				elseif (preg_match(':^#B1:',$message)) {
591
-					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
590
+				elseif (preg_match(':^#B1:', $message)) {
591
+					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'), $decode);
592 592
 				}
593
-				elseif (preg_match(':^#B2:',$message)) {
594
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
593
+				elseif (preg_match(':^#B2:', $message)) {
594
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'), $decode);
595 595
 				}
596
-				elseif (preg_match(':^#B3:',$message)) {
597
-					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
596
+				elseif (preg_match(':^#B3:', $message)) {
597
+					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'), $decode);
598 598
 				}
599
-				elseif (preg_match(':^#B4:',$message)) {
600
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
599
+				elseif (preg_match(':^#B4:', $message)) {
600
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'), $decode);
601 601
 				}
602
-				elseif (preg_match(':^#B6:',$message)) {
603
-					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
602
+				elseif (preg_match(':^#B6:', $message)) {
603
+					$decode = array_merge(array('Message nature' => 'Provide ADS Report'), $decode);
604 604
 				}
605
-				elseif (preg_match(':^#B8:',$message)) {
606
-					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
605
+				elseif (preg_match(':^#B8:', $message)) {
606
+					$decode = array_merge(array('Message nature' => 'Request Departure Slot'), $decode);
607 607
 				}
608
-				elseif (preg_match(':^#B9:',$message)) {
609
-					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
608
+				elseif (preg_match(':^#B9:', $message)) {
609
+					$decode = array_merge(array('Message nature' => 'Request ATIS Report'), $decode);
610 610
 				}
611
-				elseif (preg_match(':^#B0:',$message)) {
612
-					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
611
+				elseif (preg_match(':^#B0:', $message)) {
612
+					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'), $decode);
613 613
 				}
614
-				elseif (preg_match(':^#BA:',$message)) {
615
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
614
+				elseif (preg_match(':^#BA:', $message)) {
615
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
616 616
 				}
617
-				elseif (preg_match(':^#BB:',$message)) {
618
-					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
617
+				elseif (preg_match(':^#BB:', $message)) {
618
+					$decode = array_merge(array('Message nature' => 'Request TWIP Report'), $decode);
619 619
 				}
620
-				elseif (preg_match(':^#BC:',$message)) {
621
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
620
+				elseif (preg_match(':^#BC:', $message)) {
621
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'), $decode);
622 622
 				}
623
-				elseif (preg_match(':^#BD:',$message)) {
624
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
623
+				elseif (preg_match(':^#BD:', $message)) {
624
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'), $decode);
625 625
 				}
626
-				elseif (preg_match(':^#BE:',$message)) {
627
-					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
626
+				elseif (preg_match(':^#BE:', $message)) {
627
+					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'), $decode);
628 628
 				}
629
-				elseif (preg_match(':^#BF:',$message)) {
630
-					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
629
+				elseif (preg_match(':^#BF:', $message)) {
630
+					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'), $decode);
631 631
 				}
632
-				elseif (preg_match(':^#H3:',$message)) {
633
-					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
632
+				elseif (preg_match(':^#H3:', $message)) {
633
+					$decode = array_merge(array('Message nature' => 'Icing Report'), $decode);
634 634
 				}
635 635
 			}
636 636
 			if ($label == '10') {
637
-				if (preg_match(':^DTO01:',$message)) {
638
-					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
637
+				if (preg_match(':^DTO01:', $message)) {
638
+					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'), $decode);
639 639
 				}
640
-				elseif (preg_match(':^AIS01:',$message)) {
641
-					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
640
+				elseif (preg_match(':^AIS01:', $message)) {
641
+					$decode = array_merge(array('Message nature' => 'AIS Request'), $decode);
642 642
 				}
643
-				elseif (preg_match(':^FTX01:',$message)) {
644
-					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
643
+				elseif (preg_match(':^FTX01:', $message)) {
644
+					$decode = array_merge(array('Message nature' => 'Free Text Downlink'), $decode);
645 645
 				}
646
-				elseif (preg_match(':^FPL01:',$message)) {
647
-					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
646
+				elseif (preg_match(':^FPL01:', $message)) {
647
+					$decode = array_merge(array('Message nature' => 'Flight Plan Request'), $decode);
648 648
 				}
649
-				elseif (preg_match(':^WAB01:',$message)) {
650
-					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
649
+				elseif (preg_match(':^WAB01:', $message)) {
650
+					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'), $decode);
651 651
 				}
652
-				elseif (preg_match(':^MET01:',$message)) {
653
-					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
652
+				elseif (preg_match(':^MET01:', $message)) {
653
+					$decode = array_merge(array('Message nature' => 'Weather Data Request'), $decode);
654 654
 				}
655
-				elseif (preg_match(':^WAB02:',$message)) {
656
-					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
655
+				elseif (preg_match(':^WAB02:', $message)) {
656
+					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'), $decode);
657 657
 				}
658 658
 			}
659 659
 			if ($label == '15') {
660
-				if (preg_match(':^FST01:',$message)) {
661
-					$decode = array_merge(array('Message nature' => 'Flight Status Report'),$decode);
660
+				if (preg_match(':^FST01:', $message)) {
661
+					$decode = array_merge(array('Message nature' => 'Flight Status Report'), $decode);
662 662
 				}
663 663
 			}
664 664
 			if (!$found && $label == 'SA') {
665
-				$n = sscanf($message, "%d%c%c%6[0-9]", $version,$state,$type,$at);
665
+				$n = sscanf($message, "%d%c%c%6[0-9]", $version, $state, $type, $at);
666 666
 				if ($n == 4) {
667 667
 					$vsta = array('Version' => $version);
668 668
 					if ($state == 'E') {
669
-						$vsta = array_merge($vsta,array('Link state' => 'Established'));
669
+						$vsta = array_merge($vsta, array('Link state' => 'Established'));
670 670
 					}
671 671
 					elseif ($state == 'L') {
672
-						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
672
+						$vsta = array_merge($vsta, array('Link state' => 'Lost'));
673 673
 					}
674 674
 					else {
675
-						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
675
+						$vsta = array_merge($vsta, array('Link state' => 'Unknown'));
676 676
 					}
677 677
 					if ($type == 'V') {
678
-						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
678
+						$vsta = array_merge($vsta, array('Link type' => 'VHF ACARS'));
679 679
 					}
680 680
 					elseif ($type == 'S') {
681
-						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
681
+						$vsta = array_merge($vsta, array('Link type' => 'Generic SATCOM'));
682 682
 					}
683 683
 					elseif ($type == 'H') {
684
-						$vsta = array_merge($vsta,array('Link type' => 'HF'));
684
+						$vsta = array_merge($vsta, array('Link type' => 'HF'));
685 685
 					}
686 686
 					elseif ($type == 'G') {
687
-						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
687
+						$vsta = array_merge($vsta, array('Link type' => 'GlobalStar SATCOM'));
688 688
 					}
689 689
 					elseif ($type == 'C') {
690
-						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
690
+						$vsta = array_merge($vsta, array('Link type' => 'ICO SATCOM'));
691 691
 					}
692 692
 					elseif ($type == '2') {
693
-						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
693
+						$vsta = array_merge($vsta, array('Link type' => 'VDL Mode 2'));
694 694
 					}
695 695
 					elseif ($type == 'X') {
696
-						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
696
+						$vsta = array_merge($vsta, array('Link type' => 'Inmarsat Aero'));
697 697
 					}
698 698
 					elseif ($type == 'I') {
699
-						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
699
+						$vsta = array_merge($vsta, array('Link type' => 'Irridium SATCOM'));
700 700
 					}
701 701
 					else {
702
-						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
702
+						$vsta = array_merge($vsta, array('Link type' => 'Unknown'));
703 703
 					}
704
-					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
705
-					$decode = array_merge($vsta,$decode);
704
+					$vsta = array_merge($vsta, array('Event occured at' => implode(':', str_split($at, 2))));
705
+					$decode = array_merge($vsta, $decode);
706 706
 				}
707 707
 			}
708 708
 
709 709
 			$title = $this->getTitlefromLabel($label);
710
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
710
+			if ($title != '') $decode = array_merge(array('Message title' => $title), $decode);
711 711
 			/*
712 712
 			// Business jets always use GS0001
713 713
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
@@ -735,13 +735,13 @@  discard block
 block discarded – undo
735 735
 		$Translation = new Translation($this->db);
736 736
 		$message = $this->parse($data);
737 737
 		if (isset($message['registration']) && $message['registration'] != '' && $message['ident'] != '' && $message['registration'] != '!') {
738
-			$ident = (string)$message['ident'];
738
+			$ident = (string) $message['ident'];
739 739
 			$label = $message['label'];
740 740
 			$block_id = $message['block_id'];
741 741
 			$msg_no = $message['msg_no'];
742 742
 			$msg = $message['message'];
743 743
 			$decode = $message['decode'];
744
-			$registration = (string)$message['registration'];
744
+			$registration = (string) $message['registration'];
745 745
 			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
746 746
 			else $latitude = '';
747 747
 			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
@@ -755,20 +755,20 @@  discard block
 block discarded – undo
755 755
 				$Image->addSpotterImage($registration);
756 756
 			}
757 757
 			// Business jets always use GS0001
758
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
758
+			if ($ident != 'GS0001') $info = $this->addModeSData($ident, $registration, $icao, $airicao, $latitude, $longitude);
759 759
 			if ($globalDebug && isset($info) && $info != '') echo $info;
760 760
 			if (count($decode) > 0) $decode_json = json_encode($decode);
761 761
 			else $decode_json = '';
762 762
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
763
-				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
763
+				$Schedule->addSchedule($icao, $decode['Departure airport'], $decode['Departure hour'], $decode['Arrival airport'], $decode['Arrival hour'], 'ACARS');
764 764
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
765
-				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
765
+				$Schedule->addSchedule($icao, $decode['Departure airport'], '', $decode['Arrival airport'], '', 'ACARS');
766 766
 			}
767
-			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
768
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
769
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
767
+			$result = $this->addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
768
+			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10', '80', '81', '82', '3F');
769
+			if ($result && in_array($label, $globalACARSArchive)) $this->addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
770 770
 			if ($globalDebug && count($decode) > 0) {
771
-				echo "Human readable data : ".implode(' - ',$decode)."\n";
771
+				echo "Human readable data : ".implode(' - ', $decode)."\n";
772 772
 			}
773 773
 		}
774 774
 	}
@@ -783,7 +783,7 @@  discard block
 block discarded – undo
783 783
 	* @param String $msg_no Number of the ACARS message
784 784
 	* @param String $message ACARS message
785 785
 	*/
786
-	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
786
+	public function addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
787 787
 		global $globalDebug;
788 788
 		date_default_timezone_set('UTC');
789 789
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
@@ -791,21 +791,21 @@  discard block
 block discarded – undo
791 791
 			$this->db = $Connection->db;
792 792
 			if ($globalDebug) echo "Test if not already in Live ACARS table...";
793 793
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
794
-			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
794
+			$query_test_values = array(':ident' => $ident, ':registration' => $registration, ':message' => $message);
795 795
 			try {
796 796
 				$stht = $this->db->prepare($query_test);
797 797
 				$stht->execute($query_test_values);
798
-			} catch(PDOException $e) {
798
+			} catch (PDOException $e) {
799 799
 				return "error : ".$e->getMessage();
800 800
 			}
801 801
 			if ($stht->fetchColumn() == 0) {
802 802
 				if ($globalDebug) echo "Add Live ACARS data...";
803 803
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
804
-				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
804
+				$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode, ':date' => date("Y-m-d H:i:s"));
805 805
 				try {
806 806
 					$sth = $this->db->prepare($query);
807 807
 					$sth->execute($query_values);
808
-				} catch(PDOException $e) {
808
+				} catch (PDOException $e) {
809 809
 					return "error : ".$e->getMessage();
810 810
 				}
811 811
 			} else {
@@ -827,10 +827,10 @@  discard block
 block discarded – undo
827 827
 	* @param String $msg_no Number of the ACARS message
828 828
 	* @param String $message ACARS message
829 829
 	*/
830
-	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
830
+	public function addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
831 831
 		global $globalDebug;
832 832
 		date_default_timezone_set('UTC');
833
-		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/',$message) === 0 && preg_match('/^ARR0/',$message) === 0 && preg_match('/^ETA/',$message) === 0 && preg_match('/^WXR/',$message) === 0 && preg_match('/^FTX01.FIC/',$message) === 0) {
833
+		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/', $message) === 0 && preg_match('/^ARR0/', $message) === 0 && preg_match('/^ETA/', $message) === 0 && preg_match('/^WXR/', $message) === 0 && preg_match('/^FTX01.FIC/', $message) === 0) {
834 834
 			/*
835 835
 				    if ($globalDebug) echo "Test if not already in Archive ACARS table...";
836 836
 			    	    $query_test = "SELECT COUNT(*) as nb FROM acars_archive WHERE ident = :ident AND registration = :registration AND message = :message";
@@ -845,11 +845,11 @@  discard block
 block discarded – undo
845 845
 			*/
846 846
 			if ($globalDebug) echo "Add Live ACARS data...";
847 847
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
848
-			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
848
+			$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
849 849
 			try {
850 850
 				$sth = $this->db->prepare($query);
851 851
 				$sth->execute($query_values);
852
-			} catch(PDOException $e) {
852
+			} catch (PDOException $e) {
853 853
 				return "error : ".$e->getMessage();
854 854
 			}
855 855
 			if ($globalDebug) echo "Done\n";
@@ -870,7 +870,7 @@  discard block
 block discarded – undo
870 870
 		try {
871 871
 			$sth = $this->db->prepare($query);
872 872
 			$sth->execute($query_values);
873
-		} catch(PDOException $e) {
873
+		} catch (PDOException $e) {
874 874
 			echo "error : ".$e->getMessage();
875 875
 			return '';
876 876
 		}
@@ -890,7 +890,7 @@  discard block
 block discarded – undo
890 890
 		try {
891 891
 			$sth = $this->db->prepare($query);
892 892
 			$sth->execute($query_values);
893
-		} catch(PDOException $e) {
893
+		} catch (PDOException $e) {
894 894
 			echo "error : ".$e->getMessage();
895 895
 			return array();
896 896
 		}
@@ -911,7 +911,7 @@  discard block
 block discarded – undo
911 911
 		try {
912 912
 			$sth = $this->db->prepare($query);
913 913
 			$sth->execute($query_values);
914
-		} catch(PDOException $e) {
914
+		} catch (PDOException $e) {
915 915
 			echo "error : ".$e->getMessage();
916 916
 			return array();
917 917
 		}
@@ -925,7 +925,7 @@  discard block
 block discarded – undo
925 925
 	*
926 926
 	* @return Array Return ACARS data in array
927 927
 	*/
928
-	public function getLatestAcarsData($limit = '',$label = '') {
928
+	public function getLatestAcarsData($limit = '', $label = '') {
929 929
 		global $globalURL, $globalDBdriver;
930 930
 		$Image = new Image($this->db);
931 931
 		$Spotter = new Spotter($this->db);
@@ -936,8 +936,8 @@  discard block
 block discarded – undo
936 936
 		if ($limit != "")
937 937
 		{
938 938
 			$limit_array = explode(",", $limit);
939
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
940
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
939
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
940
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
941 941
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
942 942
 			{
943 943
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -953,46 +953,46 @@  discard block
 block discarded – undo
953 953
 		try {
954 954
 			$sth = $this->db->prepare($query);
955 955
 			$sth->execute($query_values);
956
-		} catch(PDOException $e) {
956
+		} catch (PDOException $e) {
957 957
 			return "error : ".$e->getMessage();
958 958
 		}
959 959
 		$i = 0;
960 960
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
961 961
 			$data = array();
962 962
 			if ($row['registration'] != '') {
963
-				$row['registration'] = str_replace('.','',$row['registration']);
963
+				$row['registration'] = str_replace('.', '', $row['registration']);
964 964
 				$image_array = $Image->getSpotterImage($row['registration']);
965
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
966
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
967
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
965
+				if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
966
+				else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
967
+			} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
968 968
 			if ($row['registration'] == '') $row['registration'] = 'NA';
969 969
 			if ($row['ident'] == '') $row['ident'] = 'NA';
970
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
970
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
971 971
 			if (isset($identicao[0])) {
972
-				if (substr($row['ident'],0,2) == 'AF') {
973
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
974
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
975
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
976
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
972
+				if (substr($row['ident'], 0, 2) == 'AF') {
973
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
974
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
975
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
976
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
977 977
 			} else $icao = $row['ident'];
978
-			$icao = $Translation->checkTranslation($icao,false);
979
-			$decode = json_decode($row['decode'],true);
978
+			$icao = $Translation->checkTranslation($icao, false);
979
+			$decode = json_decode($row['decode'], true);
980 980
 			$found = false;
981
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
981
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
982 982
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
983 983
 				if (isset($airport_info[0]['icao'])) {
984 984
 					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
985 985
 					$found = true;
986 986
 				}
987 987
 			}
988
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
988
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
989 989
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
990 990
 				if (isset($airport_info[0]['icao'])) {
991 991
 					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
992 992
 					$found = true;
993 993
 				}
994 994
 			}
995
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
995
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
996 996
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
997 997
 				if (isset($airport_info[0]['icao'])) {
998 998
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
@@ -1000,7 +1000,7 @@  discard block
 block discarded – undo
1000 1000
 				}
1001 1001
 			}
1002 1002
 			if ($found) $row['decode'] = json_encode($decode);
1003
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1003
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1004 1004
 			$result[] = $data;
1005 1005
 			$i++;
1006 1006
 		}
@@ -1016,7 +1016,7 @@  discard block
 block discarded – undo
1016 1016
 	*
1017 1017
 	* @return Array Return ACARS data in array
1018 1018
 	*/
1019
-	public function getArchiveAcarsData($limit = '',$label = '') {
1019
+	public function getArchiveAcarsData($limit = '', $label = '') {
1020 1020
 		global $globalURL, $globalDBdriver;
1021 1021
 		$Image = new Image($this->db);
1022 1022
 		$Spotter = new Spotter($this->db);
@@ -1026,8 +1026,8 @@  discard block
 block discarded – undo
1026 1026
 		if ($limit != "")
1027 1027
 		{
1028 1028
 			$limit_array = explode(",", $limit);
1029
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1030
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1029
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1030
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1031 1031
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1032 1032
 			{
1033 1033
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -1048,43 +1048,43 @@  discard block
 block discarded – undo
1048 1048
 		try {
1049 1049
 			$sth = $this->db->prepare($query);
1050 1050
 			$sth->execute($query_values);
1051
-		} catch(PDOException $e) {
1051
+		} catch (PDOException $e) {
1052 1052
 			return "error : ".$e->getMessage();
1053 1053
 		}
1054
-		$i=0;
1054
+		$i = 0;
1055 1055
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
1056 1056
 			$data = array();
1057 1057
 			if ($row['registration'] != '') {
1058
-				$row['registration'] = str_replace('.','',$row['registration']);
1058
+				$row['registration'] = str_replace('.', '', $row['registration']);
1059 1059
 				$image_array = $Image->getSpotterImage($row['registration']);
1060
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
1061
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1062
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1060
+				if (count($image_array) > 0) $data = array_merge($data, array('image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
1061
+				else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
1062
+			} else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
1063 1063
 			$icao = '';
1064 1064
 			if ($row['registration'] == '') $row['registration'] = 'NA';
1065 1065
 			if ($row['ident'] == '') $row['ident'] = 'NA';
1066
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
1066
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
1067 1067
 			if (isset($identicao[0])) {
1068
-				if (substr($row['ident'],0,2) == 'AF') {
1069
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1070
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1071
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1072
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
1068
+				if (substr($row['ident'], 0, 2) == 'AF') {
1069
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1070
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
1071
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
1072
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
1073 1073
 			} else $icao = $row['ident'];
1074 1074
 			$icao = $Translation->checkTranslation($icao);
1075
-			$decode = json_decode($row['decode'],true);
1075
+			$decode = json_decode($row['decode'], true);
1076 1076
 			$found = false;
1077
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
1077
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
1078 1078
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
1079 1079
 				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1080 1080
 				$found = true;
1081 1081
 			}
1082
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
1082
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
1083 1083
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
1084 1084
 				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1085 1085
 				$found = true;
1086 1086
 			}
1087
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
1087
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
1088 1088
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
1089 1089
 				if (isset($airport_info[0]['icao'])) {
1090 1090
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
@@ -1092,7 +1092,7 @@  discard block
 block discarded – undo
1092 1092
 				}
1093 1093
 			}
1094 1094
 			if ($found) $row['decode'] = json_encode($decode);
1095
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1095
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1096 1096
 			$result[] = $data;
1097 1097
 			$i++;
1098 1098
 		}
@@ -1110,7 +1110,7 @@  discard block
 block discarded – undo
1110 1110
 	* @param String $icao
1111 1111
 	* @param String $ICAOTypeCode
1112 1112
 	*/
1113
-	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
1113
+	public function addModeSData($ident, $registration, $icao = '', $ICAOTypeCode = '', $latitude = '', $longitude = '') {
1114 1114
 		global $globalDebug, $globalDBdriver;
1115 1115
 		$ident = trim($ident);
1116 1116
 		$Translation = new Translation($this->db);
@@ -1123,7 +1123,7 @@  discard block
 block discarded – undo
1123 1123
 			if ($globalDebug) echo "Ident or registration null, exit\n";
1124 1124
 			return '';
1125 1125
 		}
1126
-		$registration = str_replace('.','',$registration);
1126
+		$registration = str_replace('.', '', $registration);
1127 1127
 		$ident = $Translation->ident2icao($ident);
1128 1128
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
1129 1129
 		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
@@ -1132,7 +1132,7 @@  discard block
 block discarded – undo
1132 1132
 		try {
1133 1133
 			$sthsi = $this->db->prepare($querysi);
1134 1134
 			$sthsi->execute($querysi_values);
1135
-		} catch(PDOException $e) {
1135
+		} catch (PDOException $e) {
1136 1136
 			if ($globalDebug) echo $e->getMessage();
1137 1137
 			return "error : ".$e->getMessage();
1138 1138
 		}
@@ -1142,8 +1142,8 @@  discard block
 block discarded – undo
1142 1142
 			$Translation = new Translation($this->db);
1143 1143
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
1144 1144
 			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1145
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1146
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1145
+			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'], $ident, 'ACARS');
1146
+			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'], $ident, 'ACARS');
1147 1147
 		} else {
1148 1148
 			if ($registration != '' && $latitude != '' && $longitude != '') {
1149 1149
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1151,7 +1151,7 @@  discard block
 block discarded – undo
1151 1151
 				try {
1152 1152
 					$sth = $this->db->prepare($query);
1153 1153
 					$sth->execute($query_values);
1154
-				} catch(PDOException $e) {
1154
+				} catch (PDOException $e) {
1155 1155
 					if ($globalDebug) echo $e->getMessage();
1156 1156
 					return "error : ".$e->getMessage();
1157 1157
 				}
@@ -1159,7 +1159,7 @@  discard block
 block discarded – undo
1159 1159
 				$sth->closeCursor();
1160 1160
 				if (isset($result['modes'])) $hex = $result['modes'];
1161 1161
 				else $hex = '';
1162
-				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
1162
+				$SI_data = array('hex' => $hex, 'ident' => $ident, 'aircraft_icao' => $ICAOTypeCode, 'registration' => $registration, 'latitude' => $latitude, '$longitude' => $longitude, 'format_source' => 'ACARS');
1163 1163
 				if ($this->fromACARSscript) $this->SI->add($SI_data);
1164 1164
 			}
1165 1165
 		}
@@ -1169,7 +1169,7 @@  discard block
 block discarded – undo
1169 1169
 		try {
1170 1170
 			$sth = $this->db->prepare($query);
1171 1171
 			$sth->execute($query_values);
1172
-		} catch(PDOException $e) {
1172
+		} catch (PDOException $e) {
1173 1173
 			if ($globalDebug) echo $e->getMessage();
1174 1174
 			return "error : ".$e->getMessage();
1175 1175
 		}
@@ -1179,7 +1179,7 @@  discard block
 block discarded – undo
1179 1179
 			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
1180 1180
 			else $ModeS = '';
1181 1181
 			if ($ModeS == '') {
1182
-				$id = explode('-',$result['flightaware_id']);
1182
+				$id = explode('-', $result['flightaware_id']);
1183 1183
 				$ModeS = $id[0];
1184 1184
 			}
1185 1185
 			if ($ModeS != '') {
@@ -1189,20 +1189,20 @@  discard block
 block discarded – undo
1189 1189
 				try {
1190 1190
 					$sthc = $this->db->prepare($queryc);
1191 1191
 					$sthc->execute($queryc_values);
1192
-				} catch(PDOException $e) {
1192
+				} catch (PDOException $e) {
1193 1193
 					if ($globalDebug) echo $e->getMessage();
1194 1194
 					return "error : ".$e->getMessage();
1195 1195
 				}
1196 1196
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
1197 1197
 				$sthc->closeCursor();
1198
-				if (count($row) ==  0) {
1198
+				if (count($row) == 0) {
1199 1199
 					if ($globalDebug) echo " Add to ModeS table - ";
1200 1200
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
1201
-					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1201
+					$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1202 1202
 					try {
1203 1203
 						$sthi = $this->db->prepare($queryi);
1204 1204
 						$sthi->execute($queryi_values);
1205
-					} catch(PDOException $e) {
1205
+					} catch (PDOException $e) {
1206 1206
 						if ($globalDebug) echo $e->getMessage();
1207 1207
 						return "error : ".$e->getMessage();
1208 1208
 					}
@@ -1210,15 +1210,15 @@  discard block
 block discarded – undo
1210 1210
 					if ($globalDebug) echo " Update ModeS table - ";
1211 1211
 					if ($ICAOTypeCode != '') {
1212 1212
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1213
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1213
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1214 1214
 					} else {
1215 1215
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1216
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration);
1216
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration);
1217 1217
 					}
1218 1218
 					try {
1219 1219
 						$sthi = $this->db->prepare($queryi);
1220 1220
 						$sthi->execute($queryi_values);
1221
-					} catch(PDOException $e) {
1221
+					} catch (PDOException $e) {
1222 1222
 						if ($globalDebug) echo $e->getMessage();
1223 1223
 						return "error : ".$e->getMessage();
1224 1224
 					}
@@ -1255,12 +1255,12 @@  discard block
 block discarded – undo
1255 1255
 					elseif ($globalDBdriver == 'pgsql') {
1256 1256
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
1257 1257
 					}
1258
-					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
1258
+					$queryi_values = array(':Registration' => $registration, ':ident' => $icao);
1259 1259
 				}
1260 1260
 				try {
1261 1261
 					$sthi = $this->db->prepare($queryi);
1262 1262
 					$sthi->execute($queryi_values);
1263
-				} catch(PDOException $e) {
1263
+				} catch (PDOException $e) {
1264 1264
 					if ($globalDebug) echo $e->getMessage();
1265 1265
 					return "error : ".$e->getMessage();
1266 1266
 				}
Please login to merge, or discard this patch.
Braces   +415 added lines, -263 removed lines patch added patch discarded remove patch
@@ -13,7 +13,9 @@  discard block
 block discarded – undo
13 13
 	public function __construct($dbc = null,$fromACARSscript = false) {
14 14
 		$Connection = new Connection($dbc);
15 15
 		$this->db = $Connection->db();
16
-		if ($this->db === null) die('Error: No DB connection. (ACARS)');
16
+		if ($this->db === null) {
17
+			die('Error: No DB connection. (ACARS)');
18
+		}
17 19
 		if ($fromACARSscript) {
18 20
 			$this->fromACARSscript = true;
19 21
 			$this->SI = new SpotterImport($this->db);
@@ -27,14 +29,19 @@  discard block
 block discarded – undo
27 29
 	*/
28 30
 	public function ident2icao($ident) {
29 31
 		if (substr($ident,0,2) == 'AF') {
30
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
31
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
32
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
33
+				$icao = $ident;
34
+			} else {
35
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
36
+			}
32 37
 		} else {
33 38
 			$Spotter = new Spotter($this->db);
34 39
 			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
35 40
 			if (isset($identicao[0])) {
36 41
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
37
-			} else $icao = $ident;
42
+			} else {
43
+				$icao = $ident;
44
+			}
38 45
 		}
39 46
 		return $icao;
40 47
 	}
@@ -107,14 +114,24 @@  discard block
 block discarded – undo
107 114
 		$message = '';
108 115
 		$result = array();
109 116
 		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
110
-		if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
111
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
112
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
117
+		if ($n == 0) {
118
+			$n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
119
+		}
120
+		if ($n == 0) {
121
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
122
+		}
123
+		if ($n == 0) {
124
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
125
+		}
113 126
 		if ($n != 0) {
114 127
 			$registration = str_replace('.','',$registration);
115 128
 			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
116
-			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
117
-		} else $message = $data;
129
+			if ($globalDebug) {
130
+				echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
131
+			}
132
+		} else {
133
+			$message = $data;
134
+		}
118 135
 		$decode = array();
119 136
 		$found = false;
120 137
 //		if ($registration != '' && $ident != '' && $registration != '!') {
@@ -134,12 +151,21 @@  discard block
 block discarded – undo
134 151
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
135 152
 					$latitude = $la / 10000.0;
136 153
 					$longitude = $ln / 10000.0;
137
-					if ($lac == 'S') $latitude = '-'.$latitude;
138
-					if ($lnc == 'W') $longitude = '-'.$longitude;
154
+					if ($lac == 'S') {
155
+						$latitude = '-'.$latitude;
156
+					}
157
+					if ($lnc == 'W') {
158
+						$longitude = '-'.$longitude;
159
+					}
139 160
 					// Temp not always available
140
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
141
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
142
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
161
+					if ($globalDebug) {
162
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
163
+					}
164
+					if ($temp == '') {
165
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
166
+					} else {
167
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
168
+					}
143 169
 
144 170
 					//$icao = $Translation->checkTranslation($ident);
145 171
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -153,25 +179,35 @@  discard block
 block discarded – undo
153 179
 				$ahour = '';
154 180
 				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
155 181
 				if ($n == 4 && strlen($darr) == 4) {
156
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
157
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
158
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
182
+					if ($dhour != '') {
183
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
184
+					}
185
+					if ($ahour != '') {
186
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
187
+					}
188
+					if ($globalDebug) {
189
+						echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
190
+					}
159 191
 					//$icao = ACARS->ident2icao($ident);
160 192
 					//$icao = $Translation->checkTranslation($ident);
161 193
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
162 194
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
163 195
 					$found = true;
164
-				}
165
-				elseif ($n == 2 || $n  == 4) {
166
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
167
-					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
196
+				} elseif ($n == 2 || $n  == 4) {
197
+					if ($dhour != '') {
198
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
199
+					}
200
+					if ($globalDebug) {
201
+						echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
202
+					}
168 203
 					//$icao = ACARS->ident2icao($ident);
169 204
 					//$icao = $Translation->checkTranslation($ident);
170 205
 					$decode = array('Arrival airport' => $dair, 'Arrival hour' => $dhour);
171 206
 					$found = true;
172
-				}
173
-				elseif ($n == 1) {
174
-					if ($globalDebug) echo 'airport arrival : '.$darr."\n";
207
+				} elseif ($n == 1) {
208
+					if ($globalDebug) {
209
+						echo 'airport arrival : '.$darr."\n";
210
+					}
175 211
 					//$icao = ACARS->ident2icao($ident);
176 212
 					//$icao = $Translation->checkTranslation($ident);
177 213
 					$decode = array('Arrival airport' => $darr);
@@ -189,7 +225,9 @@  discard block
 block discarded – undo
189 225
 				$darr = '';
190 226
 				$n = sscanf($message, "%4c,%4c,%*7s,%*d", $dair, $darr);
191 227
 				if ($n == 4) {
192
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
228
+					if ($globalDebug) {
229
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
230
+					}
193 231
 					//$icao = ACARS->ident2icao($ident);
194 232
 					//$icao = $Translation->checkTranslation($ident);
195 233
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -223,14 +261,23 @@  discard block
 block discarded – undo
223 261
 				$apiste = '';
224 262
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
225 263
 				if ($n > 8) {
226
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
227
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
228
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
264
+					if ($globalDebug) {
265
+						echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
266
+					}
267
+					if ($dhour != '') {
268
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
269
+					}
270
+					if ($ahour != '') {
271
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
272
+					}
229 273
 					$icao = trim($aident);
230 274
 
231 275
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
232
-					if ($ahour == '') $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
233
-					else $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
276
+					if ($ahour == '') {
277
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
278
+					} else {
279
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
280
+					}
234 281
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
235 282
 					$decode['icao'] = $icao;
236 283
 					$found = true;
@@ -252,9 +299,15 @@  discard block
 block discarded – undo
252 299
 					$lns = $lns.'.'.$lns;
253 300
 					$latitude = $las / 1000.0;
254 301
 					$longitude = $lns / 1000.0;
255
-					if ($lac == 'S') $latitude = '-'.$latitude;
256
-					if ($lnc == 'W') $longitude = '-'.$longitude;
257
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
302
+					if ($lac == 'S') {
303
+						$latitude = '-'.$latitude;
304
+					}
305
+					if ($lnc == 'W') {
306
+						$longitude = '-'.$longitude;
307
+					}
308
+					if ($globalDebug) {
309
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
310
+					}
258 311
 					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
259 312
 					$found = true;
260 313
 				}
@@ -272,7 +325,9 @@  discard block
 block discarded – undo
272 325
 				$darr = '';
273 326
 				$n = sscanf($message, "%*[0-9A-Z ]/%*s %4c/%4c .", $dair, $darr);
274 327
 				if ($n == 4) {
275
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
328
+					if ($globalDebug) {
329
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
330
+					}
276 331
 					//$icao = $Translation->checkTranslation($ident);
277 332
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
278 333
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -285,7 +340,9 @@  discard block
 block discarded – undo
285 340
 				$darr = '';
286 341
 				$n = sscanf($message, "%*[0-9],%4c,%4c,", $dair, $darr);
287 342
 				if ($n == 4) {
288
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
343
+					if ($globalDebug) {
344
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
345
+					}
289 346
 					//$icao = $Translation->checkTranslation($ident);
290 347
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
291 348
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -298,7 +355,9 @@  discard block
 block discarded – undo
298 355
 				$darr = '';
299 356
 				$n = sscanf($message, "002AF %4c %4c ", $dair, $darr);
300 357
 				if ($n == 2) {
301
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
358
+					if ($globalDebug) {
359
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
360
+					}
302 361
 					//$icao = $Translation->checkTranslation($ident);
303 362
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
304 363
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -312,7 +371,9 @@  discard block
 block discarded – undo
312 371
 				$darr = '';
313 372
 				$n = sscanf($message, "#DFBA%*02d/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
314 373
 				if ($n == 6) {
315
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
374
+					if ($globalDebug) {
375
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
376
+					}
316 377
 					//$icao = $Translation->checkTranslation($ident);
317 378
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
318 379
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -325,7 +386,9 @@  discard block
 block discarded – undo
325 386
 				$darr = '';
326 387
 				$n = sscanf($message, "#DFBA%*02d/%*[0-9A-Z,]/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
327 388
 				if ($n == 7) {
328
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
389
+					if ($globalDebug) {
390
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
391
+					}
329 392
 					//$icao = $Translation->checkTranslation($ident);
330 393
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
331 394
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -353,8 +416,12 @@  discard block
 block discarded – undo
353 416
 					$decode['icao'] = $icao;
354 417
 					$latitude = $las / 100.0;
355 418
 					$longitude = $lns / 100.0;
356
-					if ($lac == 'S') $latitude = '-'.$latitude;
357
-					if ($lnc == 'W') $longitude = '-'.$longitude;
419
+					if ($lac == 'S') {
420
+						$latitude = '-'.$latitude;
421
+					}
422
+					if ($lnc == 'W') {
423
+						$longitude = '-'.$longitude;
424
+					}
358 425
 
359 426
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
360 427
 					$found = true;
@@ -372,8 +439,12 @@  discard block
 block discarded – undo
372 439
 				if ($n == 4) {
373 440
 					$latitude = $las;
374 441
 					$longitude = $lns;
375
-					if ($lac == 'S') $latitude = '-'.$latitude;
376
-					if ($lnc == 'W') $longitude = '-'.$longitude;
442
+					if ($lac == 'S') {
443
+						$latitude = '-'.$latitude;
444
+					}
445
+					if ($lnc == 'W') {
446
+						$longitude = '-'.$longitude;
447
+					}
377 448
 
378 449
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
379 450
 					$found = true;
@@ -389,7 +460,9 @@  discard block
 block discarded – undo
389 460
 				$darr = '';
390 461
 				$n = sscanf($message, "%*[0-9A-Z] NLINFO %*d/%*d %4c/%4c .", $dair, $darr);
391 462
 				if ($n == 5) {
392
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
463
+					if ($globalDebug) {
464
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
465
+					}
393 466
 					//$icao = $Translation->checkTranslation($ident);
394 467
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
395 468
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -410,7 +483,9 @@  discard block
 block discarded – undo
410 483
 				$aident = '';
411 484
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
412 485
 				if ($n == 8) {
413
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
486
+					if ($globalDebug) {
487
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
488
+					}
414 489
 					$icao = trim($aident);
415 490
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
416 491
 					$decode['icao'] = $icao;
@@ -427,7 +502,9 @@  discard block
 block discarded – undo
427 502
 				$darr = '';
428 503
 				$n = sscanf($message, "%*d/%*d %4s/%4s .%*6s", $dair, $darr);
429 504
 				if ($n == 5) {
430
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
505
+					if ($globalDebug) {
506
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
507
+					}
431 508
 					//$icao = $Translation->checkTranslation($ident);
432 509
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
433 510
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -442,7 +519,9 @@  discard block
 block discarded – undo
442 519
 				$darr = '';
443 520
 				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
444 521
 				if ($n == 3) {
445
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
522
+					if ($globalDebug) {
523
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
524
+					}
446 525
 					//$icao = $Translation->checkTranslation($ident);
447 526
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
448 527
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -457,7 +536,9 @@  discard block
 block discarded – undo
457 536
 				$darr = '';
458 537
 				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
459 538
 				if ($n == 3) {
460
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
539
+					if ($globalDebug) {
540
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
541
+					}
461 542
 					//$icao = $Translation->checkTranslation($ident);
462 543
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
463 544
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -467,7 +548,9 @@  discard block
 block discarded – undo
467 548
 			if (!$found) {
468 549
 				$n = sscanf($message,'MET01%4c',$airport);
469 550
 				if ($n == 1) {
470
-					if ($globalDebug) echo 'airport name : '.$airport;
551
+					if ($globalDebug) {
552
+						echo 'airport name : '.$airport;
553
+					}
471 554
 					$decode = array('Airport/Waypoint name' => $airport);
472 555
 					$found = true;
473 556
 				}
@@ -475,184 +558,126 @@  discard block
 block discarded – undo
475 558
 			if ($label == 'H1') {
476 559
 				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
477 560
 					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
478
-				}
479
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
561
+				} elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
480 562
 					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
481
-				}
482
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
563
+				} elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
483 564
 					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
484
-				}
485
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
565
+				} elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
486 566
 					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
487
-				}
488
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
567
+				} elseif (preg_match(':^#DFB/PIREP:',$message)) {
489 568
 					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
490
-				}
491
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
569
+				} elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
492 570
 					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
493
-				}
494
-				elseif (preg_match(':^#M1AAEP:',$message)) {
571
+				} elseif (preg_match(':^#M1AAEP:',$message)) {
495 572
 					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
496
-				}
497
-				elseif (preg_match(':^#M2APWD:',$message)) {
573
+				} elseif (preg_match(':^#M2APWD:',$message)) {
498 574
 					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
499
-				}
500
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
575
+				} elseif (preg_match(':^#M1BREQPWI:',$message)) {
501 576
 					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
502
-				}
503
-				elseif (preg_match(':^#CF:',$message)) {
577
+				} elseif (preg_match(':^#CF:',$message)) {
504 578
 					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
505
-				}
506
-				elseif (preg_match(':^#DF:',$message)) {
579
+				} elseif (preg_match(':^#DF:',$message)) {
507 580
 					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
508
-				}
509
-				elseif (preg_match(':^#EC:',$message)) {
581
+				} elseif (preg_match(':^#EC:',$message)) {
510 582
 					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
511
-				}
512
-				elseif (preg_match(':^#EI:',$message)) {
583
+				} elseif (preg_match(':^#EI:',$message)) {
513 584
 					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
514
-				}
515
-				elseif (preg_match(':^#H1:',$message)) {
585
+				} elseif (preg_match(':^#H1:',$message)) {
516 586
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
517
-				}
518
-				elseif (preg_match(':^#H2:',$message)) {
587
+				} elseif (preg_match(':^#H2:',$message)) {
519 588
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
520
-				}
521
-				elseif (preg_match(':^#HD:',$message)) {
589
+				} elseif (preg_match(':^#HD:',$message)) {
522 590
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
523
-				}
524
-				elseif (preg_match(':^#M1:',$message)) {
591
+				} elseif (preg_match(':^#M1:',$message)) {
525 592
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
526
-				}
527
-				elseif (preg_match(':^#M2:',$message)) {
593
+				} elseif (preg_match(':^#M2:',$message)) {
528 594
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
529
-				}
530
-				elseif (preg_match(':^#M3:',$message)) {
595
+				} elseif (preg_match(':^#M3:',$message)) {
531 596
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
532
-				}
533
-				elseif (preg_match(':^#MD:',$message)) {
597
+				} elseif (preg_match(':^#MD:',$message)) {
534 598
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
535
-				}
536
-				elseif (preg_match(':^#PS:',$message)) {
599
+				} elseif (preg_match(':^#PS:',$message)) {
537 600
 					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
538
-				}
539
-				elseif (preg_match(':^#S1:',$message)) {
601
+				} elseif (preg_match(':^#S1:',$message)) {
540 602
 					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
541
-				}
542
-				elseif (preg_match(':^#S2:',$message)) {
603
+				} elseif (preg_match(':^#S2:',$message)) {
543 604
 					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
544
-				}
545
-				elseif (preg_match(':^#SD:',$message)) {
605
+				} elseif (preg_match(':^#SD:',$message)) {
546 606
 					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
547
-				}
548
-				elseif (preg_match(':^#T[0-8]:',$message)) {
607
+				} elseif (preg_match(':^#T[0-8]:',$message)) {
549 608
 					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
550
-				}
551
-				elseif (preg_match(':^#WO:',$message)) {
609
+				} elseif (preg_match(':^#WO:',$message)) {
552 610
 					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
553
-				}
554
-				elseif (preg_match(':^#A1:',$message)) {
611
+				} elseif (preg_match(':^#A1:',$message)) {
555 612
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
556
-				}
557
-				elseif (preg_match(':^#A3:',$message)) {
613
+				} elseif (preg_match(':^#A3:',$message)) {
558 614
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
559
-				}
560
-				elseif (preg_match(':^#A4:',$message)) {
615
+				} elseif (preg_match(':^#A4:',$message)) {
561 616
 					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
562
-				}
563
-				elseif (preg_match(':^#A6:',$message)) {
617
+				} elseif (preg_match(':^#A6:',$message)) {
564 618
 					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
565
-				}
566
-				elseif (preg_match(':^#A8:',$message)) {
619
+				} elseif (preg_match(':^#A8:',$message)) {
567 620
 					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
568
-				}
569
-				elseif (preg_match(':^#A9:',$message)) {
621
+				} elseif (preg_match(':^#A9:',$message)) {
570 622
 					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
571
-				}
572
-				elseif (preg_match(':^#A0:',$message)) {
623
+				} elseif (preg_match(':^#A0:',$message)) {
573 624
 					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
574
-				}
575
-				elseif (preg_match(':^#AA:',$message)) {
625
+				} elseif (preg_match(':^#AA:',$message)) {
576 626
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
577
-				}
578
-				elseif (preg_match(':^#AB:',$message)) {
627
+				} elseif (preg_match(':^#AB:',$message)) {
579 628
 					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
580
-				}
581
-				elseif (preg_match(':^#AC:',$message)) {
629
+				} elseif (preg_match(':^#AC:',$message)) {
582 630
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
583
-				}
584
-				elseif (preg_match(':^#AD:',$message)) {
631
+				} elseif (preg_match(':^#AD:',$message)) {
585 632
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
586
-				}
587
-				elseif (preg_match(':^#AF:',$message)) {
633
+				} elseif (preg_match(':^#AF:',$message)) {
588 634
 					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
589
-				}
590
-				elseif (preg_match(':^#B1:',$message)) {
635
+				} elseif (preg_match(':^#B1:',$message)) {
591 636
 					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
592
-				}
593
-				elseif (preg_match(':^#B2:',$message)) {
637
+				} elseif (preg_match(':^#B2:',$message)) {
594 638
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
595
-				}
596
-				elseif (preg_match(':^#B3:',$message)) {
639
+				} elseif (preg_match(':^#B3:',$message)) {
597 640
 					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
598
-				}
599
-				elseif (preg_match(':^#B4:',$message)) {
641
+				} elseif (preg_match(':^#B4:',$message)) {
600 642
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
601
-				}
602
-				elseif (preg_match(':^#B6:',$message)) {
643
+				} elseif (preg_match(':^#B6:',$message)) {
603 644
 					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
604
-				}
605
-				elseif (preg_match(':^#B8:',$message)) {
645
+				} elseif (preg_match(':^#B8:',$message)) {
606 646
 					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
607
-				}
608
-				elseif (preg_match(':^#B9:',$message)) {
647
+				} elseif (preg_match(':^#B9:',$message)) {
609 648
 					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
610
-				}
611
-				elseif (preg_match(':^#B0:',$message)) {
649
+				} elseif (preg_match(':^#B0:',$message)) {
612 650
 					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
613
-				}
614
-				elseif (preg_match(':^#BA:',$message)) {
651
+				} elseif (preg_match(':^#BA:',$message)) {
615 652
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
616
-				}
617
-				elseif (preg_match(':^#BB:',$message)) {
653
+				} elseif (preg_match(':^#BB:',$message)) {
618 654
 					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
619
-				}
620
-				elseif (preg_match(':^#BC:',$message)) {
655
+				} elseif (preg_match(':^#BC:',$message)) {
621 656
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
622
-				}
623
-				elseif (preg_match(':^#BD:',$message)) {
657
+				} elseif (preg_match(':^#BD:',$message)) {
624 658
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
625
-				}
626
-				elseif (preg_match(':^#BE:',$message)) {
659
+				} elseif (preg_match(':^#BE:',$message)) {
627 660
 					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
628
-				}
629
-				elseif (preg_match(':^#BF:',$message)) {
661
+				} elseif (preg_match(':^#BF:',$message)) {
630 662
 					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
631
-				}
632
-				elseif (preg_match(':^#H3:',$message)) {
663
+				} elseif (preg_match(':^#H3:',$message)) {
633 664
 					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
634 665
 				}
635 666
 			}
636 667
 			if ($label == '10') {
637 668
 				if (preg_match(':^DTO01:',$message)) {
638 669
 					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
639
-				}
640
-				elseif (preg_match(':^AIS01:',$message)) {
670
+				} elseif (preg_match(':^AIS01:',$message)) {
641 671
 					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
642
-				}
643
-				elseif (preg_match(':^FTX01:',$message)) {
672
+				} elseif (preg_match(':^FTX01:',$message)) {
644 673
 					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
645
-				}
646
-				elseif (preg_match(':^FPL01:',$message)) {
674
+				} elseif (preg_match(':^FPL01:',$message)) {
647 675
 					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
648
-				}
649
-				elseif (preg_match(':^WAB01:',$message)) {
676
+				} elseif (preg_match(':^WAB01:',$message)) {
650 677
 					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
651
-				}
652
-				elseif (preg_match(':^MET01:',$message)) {
678
+				} elseif (preg_match(':^MET01:',$message)) {
653 679
 					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
654
-				}
655
-				elseif (preg_match(':^WAB02:',$message)) {
680
+				} elseif (preg_match(':^WAB02:',$message)) {
656 681
 					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
657 682
 				}
658 683
 			}
@@ -667,38 +692,28 @@  discard block
 block discarded – undo
667 692
 					$vsta = array('Version' => $version);
668 693
 					if ($state == 'E') {
669 694
 						$vsta = array_merge($vsta,array('Link state' => 'Established'));
670
-					}
671
-					elseif ($state == 'L') {
695
+					} elseif ($state == 'L') {
672 696
 						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
673
-					}
674
-					else {
697
+					} else {
675 698
 						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
676 699
 					}
677 700
 					if ($type == 'V') {
678 701
 						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
679
-					}
680
-					elseif ($type == 'S') {
702
+					} elseif ($type == 'S') {
681 703
 						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
682
-					}
683
-					elseif ($type == 'H') {
704
+					} elseif ($type == 'H') {
684 705
 						$vsta = array_merge($vsta,array('Link type' => 'HF'));
685
-					}
686
-					elseif ($type == 'G') {
706
+					} elseif ($type == 'G') {
687 707
 						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
688
-					}
689
-					elseif ($type == 'C') {
708
+					} elseif ($type == 'C') {
690 709
 						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
691
-					}
692
-					elseif ($type == '2') {
710
+					} elseif ($type == '2') {
693 711
 						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
694
-					}
695
-					elseif ($type == 'X') {
712
+					} elseif ($type == 'X') {
696 713
 						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
697
-					}
698
-					elseif ($type == 'I') {
714
+					} elseif ($type == 'I') {
699 715
 						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
700
-					}
701
-					else {
716
+					} else {
702 717
 						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
703 718
 					}
704 719
 					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
@@ -707,7 +722,9 @@  discard block
 block discarded – undo
707 722
 			}
708 723
 
709 724
 			$title = $this->getTitlefromLabel($label);
710
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
725
+			if ($title != '') {
726
+				$decode = array_merge(array('Message title' => $title),$decode);
727
+			}
711 728
 			/*
712 729
 			// Business jets always use GS0001
713 730
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
@@ -742,31 +759,54 @@  discard block
 block discarded – undo
742 759
 			$msg = $message['message'];
743 760
 			$decode = $message['decode'];
744 761
 			$registration = (string)$message['registration'];
745
-			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
746
-			else $latitude = '';
747
-			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
748
-			else $longitude = '';
749
-			if (isset($decode['airicao'])) $airicao = $decode['airicao'];
750
-			else $airicao = '';
751
-			if (isset($decode['icao'])) $icao = $decode['icao'];
752
-			else $icao = $Translation->checkTranslation($ident);
762
+			if (isset($decode['latitude'])) {
763
+				$latitude = $decode['latitude'];
764
+			} else {
765
+				$latitude = '';
766
+			}
767
+			if (isset($decode['longitude'])) {
768
+				$longitude = $decode['longitude'];
769
+			} else {
770
+				$longitude = '';
771
+			}
772
+			if (isset($decode['airicao'])) {
773
+				$airicao = $decode['airicao'];
774
+			} else {
775
+				$airicao = '';
776
+			}
777
+			if (isset($decode['icao'])) {
778
+				$icao = $decode['icao'];
779
+			} else {
780
+				$icao = $Translation->checkTranslation($ident);
781
+			}
753 782
 			$image_array = $Image->getSpotterImage($registration);
754 783
 			if (!isset($image_array[0]['registration'])) {
755 784
 				$Image->addSpotterImage($registration);
756 785
 			}
757 786
 			// Business jets always use GS0001
758
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
759
-			if ($globalDebug && isset($info) && $info != '') echo $info;
760
-			if (count($decode) > 0) $decode_json = json_encode($decode);
761
-			else $decode_json = '';
787
+			if ($ident != 'GS0001') {
788
+				$info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
789
+			}
790
+			if ($globalDebug && isset($info) && $info != '') {
791
+				echo $info;
792
+			}
793
+			if (count($decode) > 0) {
794
+				$decode_json = json_encode($decode);
795
+			} else {
796
+				$decode_json = '';
797
+			}
762 798
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
763 799
 				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
764 800
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
765 801
 				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
766 802
 			}
767 803
 			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
768
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
769
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
804
+			if (!isset($globalACARSArchive)) {
805
+				$globalACARSArchive = array('10','80','81','82','3F');
806
+			}
807
+			if ($result && in_array($label,$globalACARSArchive)) {
808
+				$this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
809
+			}
770 810
 			if ($globalDebug && count($decode) > 0) {
771 811
 				echo "Human readable data : ".implode(' - ',$decode)."\n";
772 812
 			}
@@ -789,7 +829,9 @@  discard block
 block discarded – undo
789 829
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
790 830
 			$Connection = new Connection($this->db);
791 831
 			$this->db = $Connection->db;
792
-			if ($globalDebug) echo "Test if not already in Live ACARS table...";
832
+			if ($globalDebug) {
833
+				echo "Test if not already in Live ACARS table...";
834
+			}
793 835
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
794 836
 			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
795 837
 			try {
@@ -799,7 +841,9 @@  discard block
 block discarded – undo
799 841
 				return "error : ".$e->getMessage();
800 842
 			}
801 843
 			if ($stht->fetchColumn() == 0) {
802
-				if ($globalDebug) echo "Add Live ACARS data...";
844
+				if ($globalDebug) {
845
+					echo "Add Live ACARS data...";
846
+				}
803 847
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
804 848
 				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
805 849
 				try {
@@ -809,10 +853,14 @@  discard block
 block discarded – undo
809 853
 					return "error : ".$e->getMessage();
810 854
 				}
811 855
 			} else {
812
-				if ($globalDebug) echo "Data already in DB...\n";
856
+				if ($globalDebug) {
857
+					echo "Data already in DB...\n";
858
+				}
813 859
 				return false;
814 860
 			}
815
-			if ($globalDebug) echo "Done\n";
861
+			if ($globalDebug) {
862
+				echo "Done\n";
863
+			}
816 864
 			return true;
817 865
 		}
818 866
 	}
@@ -843,7 +891,9 @@  discard block
 block discarded – undo
843 891
 			    	    }
844 892
 				    if ($stht->fetchColumn() == 0) {
845 893
 			*/
846
-			if ($globalDebug) echo "Add Live ACARS data...";
894
+			if ($globalDebug) {
895
+				echo "Add Live ACARS data...";
896
+			}
847 897
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
848 898
 			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
849 899
 			try {
@@ -852,7 +902,9 @@  discard block
 block discarded – undo
852 902
 			} catch(PDOException $e) {
853 903
 				return "error : ".$e->getMessage();
854 904
 			}
855
-			if ($globalDebug) echo "Done\n";
905
+			if ($globalDebug) {
906
+				echo "Done\n";
907
+			}
856 908
 		}
857 909
 	}
858 910
 
@@ -875,8 +927,11 @@  discard block
 block discarded – undo
875 927
 			return '';
876 928
 		}
877 929
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
878
-		if (count($row) > 0) return $row[0]['title'];
879
-		else return '';
930
+		if (count($row) > 0) {
931
+			return $row[0]['title'];
932
+		} else {
933
+			return '';
934
+		}
880 935
 	}
881 936
 
882 937
 	/**
@@ -895,8 +950,11 @@  discard block
 block discarded – undo
895 950
 			return array();
896 951
 		}
897 952
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
898
-		if (count($row) > 0) return $row;
899
-		else return array();
953
+		if (count($row) > 0) {
954
+			return $row;
955
+		} else {
956
+			return array();
957
+		}
900 958
 	}
901 959
 
902 960
 	/**
@@ -916,8 +974,11 @@  discard block
 block discarded – undo
916 974
 			return array();
917 975
 		}
918 976
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
919
-		if (count($row) > 0) return $row[0];
920
-		else return array();
977
+		if (count($row) > 0) {
978
+			return $row[0];
979
+		} else {
980
+			return array();
981
+		}
921 982
 	}
922 983
 
923 984
 	/**
@@ -962,19 +1023,35 @@  discard block
 block discarded – undo
962 1023
 			if ($row['registration'] != '') {
963 1024
 				$row['registration'] = str_replace('.','',$row['registration']);
964 1025
 				$image_array = $Image->getSpotterImage($row['registration']);
965
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
966
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
967
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
968
-			if ($row['registration'] == '') $row['registration'] = 'NA';
969
-			if ($row['ident'] == '') $row['ident'] = 'NA';
1026
+				if (count($image_array) > 0) {
1027
+					$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
1028
+				} else {
1029
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1030
+				}
1031
+			} else {
1032
+				$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1033
+			}
1034
+			if ($row['registration'] == '') {
1035
+				$row['registration'] = 'NA';
1036
+			}
1037
+			if ($row['ident'] == '') {
1038
+				$row['ident'] = 'NA';
1039
+			}
970 1040
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
971 1041
 			if (isset($identicao[0])) {
972 1042
 				if (substr($row['ident'],0,2) == 'AF') {
973
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
974
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
975
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1043
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
1044
+						$icao = $row['ident'];
1045
+					} else {
1046
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1047
+					}
1048
+				} else {
1049
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1050
+				}
976 1051
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
977
-			} else $icao = $row['ident'];
1052
+			} else {
1053
+				$icao = $row['ident'];
1054
+			}
978 1055
 			$icao = $Translation->checkTranslation($icao,false);
979 1056
 			$decode = json_decode($row['decode'],true);
980 1057
 			$found = false;
@@ -999,7 +1076,9 @@  discard block
 block discarded – undo
999 1076
 					$found = true;
1000 1077
 				}
1001 1078
 			}
1002
-			if ($found) $row['decode'] = json_encode($decode);
1079
+			if ($found) {
1080
+				$row['decode'] = json_encode($decode);
1081
+			}
1003 1082
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1004 1083
 			$result[] = $data;
1005 1084
 			$i++;
@@ -1007,8 +1086,9 @@  discard block
 block discarded – undo
1007 1086
 		if (isset($result)) {
1008 1087
 			$result[0]['query_number_rows'] = $i;
1009 1088
 			return $result;
1089
+		} else {
1090
+			return array();
1010 1091
 		}
1011
-		else return array();
1012 1092
 	}
1013 1093
 
1014 1094
 	/**
@@ -1057,31 +1137,51 @@  discard block
 block discarded – undo
1057 1137
 			if ($row['registration'] != '') {
1058 1138
 				$row['registration'] = str_replace('.','',$row['registration']);
1059 1139
 				$image_array = $Image->getSpotterImage($row['registration']);
1060
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
1061
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1062
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1140
+				if (count($image_array) > 0) {
1141
+					$data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
1142
+				} else {
1143
+					$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1144
+				}
1145
+			} else {
1146
+				$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1147
+			}
1063 1148
 			$icao = '';
1064
-			if ($row['registration'] == '') $row['registration'] = 'NA';
1065
-			if ($row['ident'] == '') $row['ident'] = 'NA';
1149
+			if ($row['registration'] == '') {
1150
+				$row['registration'] = 'NA';
1151
+			}
1152
+			if ($row['ident'] == '') {
1153
+				$row['ident'] = 'NA';
1154
+			}
1066 1155
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
1067 1156
 			if (isset($identicao[0])) {
1068 1157
 				if (substr($row['ident'],0,2) == 'AF') {
1069
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1070
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1071
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1158
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
1159
+						$icao = $row['ident'];
1160
+					} else {
1161
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1162
+					}
1163
+				} else {
1164
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1165
+				}
1072 1166
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
1073
-			} else $icao = $row['ident'];
1167
+			} else {
1168
+				$icao = $row['ident'];
1169
+			}
1074 1170
 			$icao = $Translation->checkTranslation($icao);
1075 1171
 			$decode = json_decode($row['decode'],true);
1076 1172
 			$found = false;
1077 1173
 			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
1078 1174
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
1079
-				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1175
+				if (isset($airport_info[0]['icao'])) {
1176
+					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1177
+				}
1080 1178
 				$found = true;
1081 1179
 			}
1082 1180
 			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
1083 1181
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
1084
-				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1182
+				if (isset($airport_info[0]['icao'])) {
1183
+					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1184
+				}
1085 1185
 				$found = true;
1086 1186
 			}
1087 1187
 			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
@@ -1091,7 +1191,9 @@  discard block
 block discarded – undo
1091 1191
 					$found = true;
1092 1192
 				}
1093 1193
 			}
1094
-			if ($found) $row['decode'] = json_encode($decode);
1194
+			if ($found) {
1195
+				$row['decode'] = json_encode($decode);
1196
+			}
1095 1197
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1096 1198
 			$result[] = $data;
1097 1199
 			$i++;
@@ -1099,7 +1201,9 @@  discard block
 block discarded – undo
1099 1201
 		if (isset($result)) {
1100 1202
 			$result[0]['query_number_rows'] = $i;
1101 1203
 			return $result;
1102
-		} else return array();
1204
+		} else {
1205
+			return array();
1206
+		}
1103 1207
 	}
1104 1208
 
1105 1209
 	/**
@@ -1115,25 +1219,37 @@  discard block
 block discarded – undo
1115 1219
 		$ident = trim($ident);
1116 1220
 		$Translation = new Translation($this->db);
1117 1221
 		$Spotter = new Spotter($this->db);
1118
-		if ($globalDebug) echo "Test if we add ModeS data...";
1222
+		if ($globalDebug) {
1223
+			echo "Test if we add ModeS data...";
1224
+		}
1119 1225
 		//if ($icao == '') $icao = ACARS->ident2icao($ident);
1120
-		if ($icao == '') $icao = $Translation->checkTranslation($ident);
1121
-		if ($globalDebug) echo '- Ident : '.$icao.' - ';
1226
+		if ($icao == '') {
1227
+			$icao = $Translation->checkTranslation($ident);
1228
+		}
1229
+		if ($globalDebug) {
1230
+			echo '- Ident : '.$icao.' - ';
1231
+		}
1122 1232
 		if ($ident == '' || $registration == '') {
1123
-			if ($globalDebug) echo "Ident or registration null, exit\n";
1233
+			if ($globalDebug) {
1234
+				echo "Ident or registration null, exit\n";
1235
+			}
1124 1236
 			return '';
1125 1237
 		}
1126 1238
 		$registration = str_replace('.','',$registration);
1127 1239
 		$ident = $Translation->ident2icao($ident);
1128 1240
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
1129
-		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
1241
+		if ($globalDebug) {
1242
+			echo "Check if needed to add translation ".$ident.'... ';
1243
+		}
1130 1244
 		$querysi = "SELECT ident FROM spotter_live s,aircraft_modes a WHERE a.ModeS = s.ModeS AND a.Registration = :registration AND s.format_source <> 'ACARS' LIMIT 1";
1131 1245
 		$querysi_values = array(':registration' => $registration);
1132 1246
 		try {
1133 1247
 			$sthsi = $this->db->prepare($querysi);
1134 1248
 			$sthsi->execute($querysi_values);
1135 1249
 		} catch(PDOException $e) {
1136
-			if ($globalDebug) echo $e->getMessage();
1250
+			if ($globalDebug) {
1251
+				echo $e->getMessage();
1252
+			}
1137 1253
 			return "error : ".$e->getMessage();
1138 1254
 		}
1139 1255
 		$resultsi = $sthsi->fetch(PDO::FETCH_ASSOC);
@@ -1141,9 +1257,14 @@  discard block
 block discarded – undo
1141 1257
 		if (count($resultsi) > 0 && $resultsi['ident'] != $ident && $resultsi['ident'] != '') {
1142 1258
 			$Translation = new Translation($this->db);
1143 1259
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
1144
-			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1145
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1146
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1260
+			if ($globalDebug) {
1261
+				echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1262
+			}
1263
+			if ($ident != $trans_ident) {
1264
+				$Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1265
+			} elseif ($trans_ident == $ident) {
1266
+				$Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1267
+			}
1147 1268
 		} else {
1148 1269
 			if ($registration != '' && $latitude != '' && $longitude != '') {
1149 1270
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1152,32 +1273,46 @@  discard block
 block discarded – undo
1152 1273
 					$sth = $this->db->prepare($query);
1153 1274
 					$sth->execute($query_values);
1154 1275
 				} catch(PDOException $e) {
1155
-					if ($globalDebug) echo $e->getMessage();
1276
+					if ($globalDebug) {
1277
+						echo $e->getMessage();
1278
+					}
1156 1279
 					return "error : ".$e->getMessage();
1157 1280
 				}
1158 1281
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
1159 1282
 				$sth->closeCursor();
1160
-				if (isset($result['modes'])) $hex = $result['modes'];
1161
-				else $hex = '';
1283
+				if (isset($result['modes'])) {
1284
+					$hex = $result['modes'];
1285
+				} else {
1286
+					$hex = '';
1287
+				}
1162 1288
 				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
1163
-				if ($this->fromACARSscript) $this->SI->add($SI_data);
1289
+				if ($this->fromACARSscript) {
1290
+					$this->SI->add($SI_data);
1291
+				}
1164 1292
 			}
1165 1293
 		}
1166
-		if ($globalDebug) echo 'Done'."\n";
1294
+		if ($globalDebug) {
1295
+			echo 'Done'."\n";
1296
+		}
1167 1297
 		$query = "SELECT flightaware_id, ModeS FROM spotter_output WHERE ident = :ident AND format_source <> 'ACARS' ORDER BY spotter_id DESC LIMIT 1";
1168 1298
 		$query_values = array(':ident' => $icao);
1169 1299
 		try {
1170 1300
 			$sth = $this->db->prepare($query);
1171 1301
 			$sth->execute($query_values);
1172 1302
 		} catch(PDOException $e) {
1173
-			if ($globalDebug) echo $e->getMessage();
1303
+			if ($globalDebug) {
1304
+				echo $e->getMessage();
1305
+			}
1174 1306
 			return "error : ".$e->getMessage();
1175 1307
 		}
1176 1308
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
1177 1309
 		$sth->closeCursor();
1178 1310
 		if (isset($result['flightaware_id'])) {
1179
-			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
1180
-			else $ModeS = '';
1311
+			if (isset($result['ModeS'])) {
1312
+				$ModeS = $result['ModeS'];
1313
+			} else {
1314
+				$ModeS = '';
1315
+			}
1181 1316
 			if ($ModeS == '') {
1182 1317
 				$id = explode('-',$result['flightaware_id']);
1183 1318
 				$ModeS = $id[0];
@@ -1190,24 +1325,32 @@  discard block
 block discarded – undo
1190 1325
 					$sthc = $this->db->prepare($queryc);
1191 1326
 					$sthc->execute($queryc_values);
1192 1327
 				} catch(PDOException $e) {
1193
-					if ($globalDebug) echo $e->getMessage();
1328
+					if ($globalDebug) {
1329
+						echo $e->getMessage();
1330
+					}
1194 1331
 					return "error : ".$e->getMessage();
1195 1332
 				}
1196 1333
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
1197 1334
 				$sthc->closeCursor();
1198 1335
 				if (count($row) ==  0) {
1199
-					if ($globalDebug) echo " Add to ModeS table - ";
1336
+					if ($globalDebug) {
1337
+						echo " Add to ModeS table - ";
1338
+					}
1200 1339
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
1201 1340
 					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1202 1341
 					try {
1203 1342
 						$sthi = $this->db->prepare($queryi);
1204 1343
 						$sthi->execute($queryi_values);
1205 1344
 					} catch(PDOException $e) {
1206
-						if ($globalDebug) echo $e->getMessage();
1345
+						if ($globalDebug) {
1346
+							echo $e->getMessage();
1347
+						}
1207 1348
 						return "error : ".$e->getMessage();
1208 1349
 					}
1209 1350
 				} else {
1210
-					if ($globalDebug) echo " Update ModeS table - ";
1351
+					if ($globalDebug) {
1352
+						echo " Update ModeS table - ";
1353
+					}
1211 1354
 					if ($ICAOTypeCode != '') {
1212 1355
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1213 1356
 						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
@@ -1219,7 +1362,9 @@  discard block
 block discarded – undo
1219 1362
 						$sthi = $this->db->prepare($queryi);
1220 1363
 						$sthi->execute($queryi_values);
1221 1364
 					} catch(PDOException $e) {
1222
-						if ($globalDebug) echo $e->getMessage();
1365
+						if ($globalDebug) {
1366
+							echo $e->getMessage();
1367
+						}
1223 1368
 						return "error : ".$e->getMessage();
1224 1369
 					}
1225 1370
 				}
@@ -1240,7 +1385,9 @@  discard block
 block discarded – undo
1240 1385
 					    return "error : ".$e->getMessage();
1241 1386
 				}
1242 1387
 				*/
1243
-				if ($globalDebug) echo " Update Spotter_output table - ";
1388
+				if ($globalDebug) {
1389
+					echo " Update Spotter_output table - ";
1390
+				}
1244 1391
 				if ($ICAOTypeCode != '') {
1245 1392
 					if ($globalDBdriver == 'mysql') {
1246 1393
 						$queryi = "UPDATE spotter_output SET registration = :Registration,aircraft_icao = :ICAOTypeCode WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
@@ -1251,8 +1398,7 @@  discard block
 block discarded – undo
1251 1398
 				} else {
1252 1399
 					if ($globalDBdriver == 'mysql') {
1253 1400
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
1254
-					}
1255
-					elseif ($globalDBdriver == 'pgsql') {
1401
+					} elseif ($globalDBdriver == 'pgsql') {
1256 1402
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
1257 1403
 					}
1258 1404
 					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
@@ -1261,14 +1407,20 @@  discard block
 block discarded – undo
1261 1407
 					$sthi = $this->db->prepare($queryi);
1262 1408
 					$sthi->execute($queryi_values);
1263 1409
 				} catch(PDOException $e) {
1264
-					if ($globalDebug) echo $e->getMessage();
1410
+					if ($globalDebug) {
1411
+						echo $e->getMessage();
1412
+					}
1265 1413
 					return "error : ".$e->getMessage();
1266 1414
 				}
1267 1415
 			}
1268 1416
 		} else {
1269
-			if ($globalDebug) echo " Can't find ModeS in spotter_output - ";
1417
+			if ($globalDebug) {
1418
+				echo " Can't find ModeS in spotter_output - ";
1419
+			}
1420
+		}
1421
+		if ($globalDebug) {
1422
+			echo "Done\n";
1270 1423
 		}
1271
-		if ($globalDebug) echo "Done\n";
1272 1424
 	}
1273 1425
 }
1274 1426
 ?>
Please login to merge, or discard this patch.
require/class.Accident.php 1 patch
Braces   +87 added lines, -31 removed lines patch added patch discarded remove patch
@@ -10,7 +10,9 @@  discard block
 block discarded – undo
10 10
 	public function __construct($dbc = null) {
11 11
 		$Connection = new Connection($dbc);
12 12
 		$this->db = $Connection->db();
13
-		if ($this->db === null) die('Error: No DB connection. (Accident)');
13
+		if ($this->db === null) {
14
+			die('Error: No DB connection. (Accident)');
15
+		}
14 16
 	}
15 17
 
16 18
 	public function get() {
@@ -109,8 +111,11 @@  discard block
 block discarded – undo
109 111
 				$data = array();
110 112
 				if ($row['registration'] != '') {
111 113
 					$image_array = $Image->getSpotterImage($row['registration']);
112
-					if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
113
-					else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
114
+					if (count($image_array) > 0) {
115
+						$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
116
+					} else {
117
+						$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
118
+					}
114 119
 					$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
115 120
 					$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
116 121
 					if (!empty($aircraft_info)) {
@@ -126,17 +131,30 @@  discard block
 block discarded – undo
126 131
 						$data['aircraft_base'] = $owner_data['base'];
127 132
 						$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
128 133
 					}
129
-				} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
130
-				if ($row['registration'] == '') $row['registration'] = 'NA';
131
-				if ($row['ident'] == '') $row['ident'] = 'NA';
134
+				} else {
135
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
136
+				}
137
+				if ($row['registration'] == '') {
138
+					$row['registration'] = 'NA';
139
+				}
140
+				if ($row['ident'] == '') {
141
+					$row['ident'] = 'NA';
142
+				}
132 143
 				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
133 144
 				if (isset($identicao[0])) {
134 145
 					if (substr($row['ident'],0,2) == 'AF') {
135
-						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
136
-						else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
137
-					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
146
+						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
147
+							$icao = $row['ident'];
148
+						} else {
149
+							$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
150
+						}
151
+					} else {
152
+						$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
153
+					}
138 154
 					$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
139
-				} else $icao = $row['ident'];
155
+				} else {
156
+					$icao = $row['ident'];
157
+				}
140 158
 				$icao = $Translation->checkTranslation($icao,false);
141 159
 				//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
142 160
 				if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
@@ -151,10 +169,14 @@  discard block
 block discarded – undo
151 169
 					//else echo 'No data...'."\n";
152 170
 				}
153 171
 				$data = array_merge($row,$data);
154
-				if ($data['ident'] == null) $data['ident'] = $icao;
172
+				if ($data['ident'] == null) {
173
+					$data['ident'] = $icao;
174
+				}
155 175
 				if ($data['title'] == null) {
156 176
 					$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
157
-				} else $data['message'] = strtolower($data['title']);
177
+				} else {
178
+					$data['message'] = strtolower($data['title']);
179
+				}
158 180
 				$ids = $Spotter->getAllIDByRegistration($data['registration'],true);
159 181
 				$date = $data['date'];
160 182
 				if (isset($ids[$date])) {
@@ -173,8 +195,9 @@  discard block
 block discarded – undo
173 195
 		if (isset($result)) {
174 196
 			$result[0]['query_number_rows'] = $i;
175 197
 			return $result;
198
+		} else {
199
+			return array();
176 200
 		}
177
-		else return array();
178 201
 	}
179 202
 
180 203
 	/*
@@ -219,7 +242,9 @@  discard block
 block discarded – undo
219 242
 	*/
220 243
 	public function import($file) {
221 244
 		global $globalTransaction, $globalDebug;
222
-		if ($globalDebug) echo 'Import '.$file."\n";
245
+		if ($globalDebug) {
246
+			echo 'Import '.$file."\n";
247
+		}
223 248
 		$result = array();
224 249
 		if (file_exists($file)) {
225 250
 			if (($handle = fopen($file,'r')) !== FALSE) {
@@ -230,8 +255,11 @@  discard block
 block discarded – undo
230 255
 				}
231 256
 				fclose($handle);
232 257
 			}
233
-			if (!empty($result)) $this->add($result,true);
234
-			elseif ($globalDebug) echo 'Nothing to import';
258
+			if (!empty($result)) {
259
+				$this->add($result,true);
260
+			} elseif ($globalDebug) {
261
+				echo 'Nothing to import';
262
+			}
235 263
 		}
236 264
 	}
237 265
 
@@ -267,14 +295,23 @@  discard block
 block discarded – undo
267 295
 					}
268 296
 				}
269 297
 				fclose($handle);
270
-			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
271
-		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
298
+			} elseif ($globalDebug) {
299
+				echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
300
+			}
301
+		} elseif ($globalDebug) {
302
+			echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
303
+		}
272 304
 		$result = $Common->arr_diff($all_md5_new,$all_md5);
273
-		if (empty($result) && $globalDebug) echo 'Nothing to update';
305
+		if (empty($result) && $globalDebug) {
306
+			echo 'Nothing to update';
307
+		}
274 308
 		foreach ($result as $file => $md5) {
275 309
 			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
276
-			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
277
-			elseif ($globalDebug) echo 'Download '.$file.' failed';
310
+			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) {
311
+				$this->import(dirname(__FILE__).'/../install/tmp/'.$file);
312
+			} elseif ($globalDebug) {
313
+				echo 'Download '.$file.' failed';
314
+			}
278 315
 		}
279 316
 	}
280 317
 
@@ -291,13 +328,17 @@  discard block
 block discarded – undo
291 328
 		$Image = new Image($this->db);
292 329
 		$Spotter = new Spotter($this->db);
293 330
 
294
-		if (empty($crash)) return false;
331
+		if (empty($crash)) {
332
+			return false;
333
+		}
295 334
 		if (!$new) {
296 335
 			$query_delete = 'DELETE FROM accidents WHERE source = :source';
297 336
 			$sthd = $Connection->db->prepare($query_delete);
298 337
 			$sthd->execute(array(':source' => $crash[0]['source']));
299 338
 		}
300
-		if ($globalTransaction) $Connection->db->beginTransaction();
339
+		if ($globalTransaction) {
340
+			$Connection->db->beginTransaction();
341
+		}
301 342
 		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
302 343
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
303 344
 		$sth_check = $Connection->db->prepare($query_check);
@@ -312,7 +353,9 @@  discard block
 block discarded – undo
312 353
 					return $value === "" ? NULL : $value;
313 354
 				}, $cr);
314 355
 				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
315
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
356
+					if (strpos($cr['registration'],'-') === FALSE) {
357
+						$cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
358
+					}
316 359
 					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
317 360
 					$sth_check->execute($query_check_values);
318 361
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
@@ -321,13 +364,19 @@  discard block
 block discarded – undo
321 364
 						$sth->execute($query_values);
322 365
 						if ($cr['date'] > time()-(30*86400)) {
323 366
 							if (empty($Image->getSpotterImage($cr['registration']))) {
324
-								if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...';
367
+								if ($globalDebug) {
368
+									echo "\t".'Get image for '.$cr['registration'].'...';
369
+								}
325 370
 								$Image->addSpotterImage($cr['registration']);
326
-								if ($globalDebug) echo "\t".'Done'."\n";
371
+								if ($globalDebug) {
372
+									echo "\t".'Done'."\n";
373
+								}
327 374
 							}
328 375
 							// elseif ($globalDebug) echo 'Image already in DB'."\n";
329 376
 						}
330
-						if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
377
+						if ($cr['title'] == '') {
378
+							$cr['title'] = $cr['registration'].' '.$cr['type'];
379
+						}
331 380
 						$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
332 381
 					}
333 382
 				}
@@ -336,9 +385,13 @@  discard block
 block discarded – undo
336 385
 					$Connection->db->beginTransaction();
337 386
 				}
338 387
 			}
339
-			if ($globalTransaction) $Connection->db->commit();
388
+			if ($globalTransaction) {
389
+				$Connection->db->commit();
390
+			}
340 391
 		} catch(PDOException $e) {
341
-			if ($globalTransaction) $Connection->db->rollBack();
392
+			if ($globalTransaction) {
393
+				$Connection->db->rollBack();
394
+			}
342 395
 			echo $e->getMessage();
343 396
 		}
344 397
 		$sth_check->closeCursor();
@@ -377,8 +430,11 @@  discard block
 block discarded – undo
377 430
 			return "error : ".$e->getMessage();
378 431
 		}
379 432
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
380
-		if ($row['nb'] > 0) return false;
381
-		else return true;
433
+		if ($row['nb'] > 0) {
434
+			return false;
435
+		} else {
436
+			return true;
437
+		}
382 438
 	}
383 439
 
384 440
 	public static function insert_last_accidents_update() {
Please login to merge, or discard this patch.
require/class.Source.php 1 patch
Braces   +15 added lines, -5 removed lines patch added patch discarded remove patch
@@ -7,7 +7,9 @@  discard block
 block discarded – undo
7 7
 	public function __construct($dbc = null) {
8 8
 		$Connection = new Connection($dbc);
9 9
 		$this->db = $Connection->db;
10
-		if ($this->db === null) die('Error: No DB connection. (Source)');
10
+		if ($this->db === null) {
11
+			die('Error: No DB connection. (Source)');
12
+		}
11 13
 	}
12 14
 
13 15
 	public function getAllLocationInfo() {
@@ -72,7 +74,9 @@  discard block
 block discarded – undo
72 74
 			$query .= " AND source_location.latitude BETWEEN ".$minlat." AND ".$maxlat." AND source_location.longitude BETWEEN ".$minlong." AND ".$maxlong." AND source_location.latitude <> 0 AND source_location.longitude <> 0";
73 75
 		}
74 76
 		$query .= " ORDER BY last_seen DESC";
75
-		if ($limit) $query .= " LIMIT 400";
77
+		if ($limit) {
78
+			$query .= " LIMIT 400";
79
+		}
76 80
 		$query_values = array(':type' => $type);
77 81
 		try {
78 82
 			$sth = $this->db->prepare($query);
@@ -111,7 +115,9 @@  discard block
 block discarded – undo
111 115
 	}
112 116
 
113 117
 	public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') {
114
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
118
+		if ($last_seen == '') {
119
+			$last_seen = date('Y-m-d H:i:s');
120
+		}
115 121
 		$query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)";
116 122
 		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
117 123
 		try {
@@ -123,7 +129,9 @@  discard block
 block discarded – undo
123 129
 	}
124 130
 
125 131
 	public function updateLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '',$description = '') {
126
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
132
+		if ($last_seen == '') {
133
+			$last_seen = date('Y-m-d H:i:s');
134
+		}
127 135
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, source_id = :source_id, last_seen = :last_seen,location_id = :location_id, description = :description WHERE name = :name AND source = :source";
128 136
 		$query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
129 137
 		try {
@@ -146,7 +154,9 @@  discard block
 block discarded – undo
146 154
 	}
147 155
 
148 156
 	public function updateLocationByLocationID($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0, $location_id,$last_seen = '',$description = '') {
149
-		if ($last_seen == '') $last_seen = date('Y-m-d H:i:s');
157
+		if ($last_seen == '') {
158
+			$last_seen = date('Y-m-d H:i:s');
159
+		}
150 160
 		$query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, last_seen = :last_seen, description = :description WHERE location_id = :location_id AND source = :source AND source_id = :source_id";
151 161
 		$query_values = array(':source_id' => $source_id,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description);
152 162
 		try {
Please login to merge, or discard this patch.
require/class.SpotterArchive.php 1 patch
Braces   +40 added lines, -14 removed lines patch added patch discarded remove patch
@@ -6,7 +6,9 @@  discard block
 block discarded – undo
6 6
 	public function __construct($dbc = null) {
7 7
 		$Connection = new Connection($dbc);
8 8
 		$this->db = $Connection->db;
9
-		if ($this->db === null) die('Error: No DB connection. (SpotterArchive)');
9
+		if ($this->db === null) {
10
+			die('Error: No DB connection. (SpotterArchive)');
11
+		}
10 12
 	}
11 13
 
12 14
 	/**
@@ -27,7 +29,9 @@  discard block
 block discarded – undo
27 29
 		if (isset($filter[0]['source'])) {
28 30
 			$filters = array_merge($filters,$filter);
29 31
 		}
30
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
32
+		if (is_array($globalFilter)) {
33
+			$filter = array_merge($filter,$globalFilter);
34
+		}
31 35
 		$filter_query_join = '';
32 36
 		$filter_query_where = '';
33 37
 		foreach($filters as $flt) {
@@ -116,8 +120,11 @@  discard block
 block discarded – undo
116 120
 			}
117 121
 			$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
118 122
 		}
119
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
120
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
123
+		if ($filter_query_where == '' && $where) {
124
+			$filter_query_where = ' WHERE';
125
+		} elseif ($filter_query_where != '' && $and) {
126
+			$filter_query_where .= ' AND';
127
+		}
121 128
 		if ($filter_query_where != '') {
122 129
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
123 130
 		}
@@ -131,10 +138,17 @@  discard block
 block discarded – undo
131 138
 		if ($over_country == '') {
132 139
 			$Spotter = new Spotter($this->db);
133 140
 			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
134
-			if (!empty($data_country)) $country = $data_country['iso2'];
135
-			else $country = '';
136
-		} else $country = $over_country;
137
-		if ($airline_type === NULL) $airline_type ='';
141
+			if (!empty($data_country)) {
142
+				$country = $data_country['iso2'];
143
+			} else {
144
+				$country = '';
145
+			}
146
+		} else {
147
+			$country = $over_country;
148
+		}
149
+		if ($airline_type === NULL) {
150
+			$airline_type ='';
151
+		}
138 152
 	
139 153
 		//if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n";
140 154
 		//else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n";
@@ -630,7 +644,9 @@  discard block
 block discarded – undo
630 644
 		    $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
631 645
 		    $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
632 646
 		    $translate = $Translation->ident2icao($q_item);
633
-		    if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
647
+		    if ($translate != $q_item) {
648
+		    	$additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
649
+		    }
634 650
 		    $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
635 651
 		    $additional_query .= ")";
636 652
 		}
@@ -846,7 +862,9 @@  discard block
 block discarded – undo
846 862
 			date_default_timezone_set($globalTimezone);
847 863
 			$datetime = new DateTime();
848 864
 			$offset = $datetime->format('P');
849
-		} else $offset = '+00:00';
865
+		} else {
866
+			$offset = '+00:00';
867
+		}
850 868
 		if ($date_array[1] != "")
851 869
 		{                
852 870
 			$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
@@ -1112,9 +1130,13 @@  discard block
 block discarded – undo
1112 1130
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1113 1131
 			}
1114 1132
 		}
1115
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
1133
+                if ($sincedate != '') {
1134
+                	$query .= "AND date > '".$sincedate."' ";
1135
+                }
1116 1136
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1117
-	if ($limit) $query .= " LIMIT 0,10";
1137
+	if ($limit) {
1138
+		$query .= " LIMIT 0,10";
1139
+	}
1118 1140
       
1119 1141
 	
1120 1142
 	$sth = $this->db->prepare($query);
@@ -1158,9 +1180,13 @@  discard block
 block discarded – undo
1158 1180
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1159 1181
 			}
1160 1182
 		}
1161
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
1183
+                if ($sincedate != '') {
1184
+                	$query .= "AND s.date > '".$sincedate."' ";
1185
+                }
1162 1186
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1163
-	if ($limit) $query .= " LIMIT 0,10";
1187
+	if ($limit) {
1188
+		$query .= " LIMIT 0,10";
1189
+	}
1164 1190
       
1165 1191
 	
1166 1192
 	$sth = $this->db->prepare($query);
Please login to merge, or discard this patch.
require/class.SpotterImport.php 3 patches
Indentation   +422 added lines, -422 removed lines patch added patch discarded remove patch
@@ -9,20 +9,20 @@  discard block
 block discarded – undo
9 9
 require_once(dirname(__FILE__).'/class.Source.php');
10 10
 require_once(dirname(__FILE__).'/class.GeoidHeight.php');
11 11
 if (isset($globalServerAPRS) && $globalServerAPRS) {
12
-    require_once(dirname(__FILE__).'/class.APRS.php');
12
+	require_once(dirname(__FILE__).'/class.APRS.php');
13 13
 }
14 14
 
15 15
 class SpotterImport {
16
-    private $all_flights = array();
17
-    private $last_delete_hourly = 0;
18
-    private $last_delete = 0;
19
-    private $stats = array();
20
-    private $tmd = 0;
21
-    private $source_location = array();
22
-    public $db = null;
23
-    public $nb = 0;
16
+	private $all_flights = array();
17
+	private $last_delete_hourly = 0;
18
+	private $last_delete = 0;
19
+	private $stats = array();
20
+	private $tmd = 0;
21
+	private $source_location = array();
22
+	public $db = null;
23
+	public $nb = 0;
24 24
 
25
-    public function __construct($dbc = null) {
25
+	public function __construct($dbc = null) {
26 26
 	global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB, $GeoidClass, $globalDebug, $globalGeoid;
27 27
 	if (!(isset($globalNoDB) && $globalNoDB)) {
28 28
 		$Connection = new Connection($dbc);
@@ -34,14 +34,14 @@  discard block
 block discarded – undo
34 34
 		$currentdate = date('Y-m-d');
35 35
 		$sourcestat = $Stats->getStatsSource($currentdate);
36 36
 		if (!empty($sourcestat)) {
37
-		    foreach($sourcestat as $srcst) {
38
-		    	$type = $srcst['stats_type'];
37
+			foreach($sourcestat as $srcst) {
38
+				$type = $srcst['stats_type'];
39 39
 			if ($type == 'polar' || $type == 'hist') {
40
-			    $source = $srcst['source_name'];
41
-			    $data = $srcst['source_data'];
42
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
43
-	    		}
44
-		    }
40
+				$source = $srcst['source_name'];
41
+				$data = $srcst['source_data'];
42
+				$this->stats[$currentdate][$source][$type] = json_decode($data,true);
43
+				}
44
+			}
45 45
 		}
46 46
 	}
47 47
 	if (isset($globalServerAPRS) && $globalServerAPRS) {
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
 			$GeoidClass = FALSE;
57 57
 		}
58 58
 	}
59
-    }
59
+	}
60 60
 
61
-    public function get_Schedule($id,$ident) {
61
+	public function get_Schedule($id,$ident) {
62 62
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
63 63
 	// Get schedule here, so it's done only one time
64 64
 	
@@ -78,42 +78,42 @@  discard block
 block discarded – undo
78 78
 	$operator = $Spotter->getOperator($ident);
79 79
 	$scheduleexist = false;
80 80
 	if ($Schedule->checkSchedule($operator) == 0) {
81
-	    $operator = $Translation->checkTranslation($ident);
82
-	    if ($Schedule->checkSchedule($operator) == 0) {
81
+		$operator = $Translation->checkTranslation($ident);
82
+		if ($Schedule->checkSchedule($operator) == 0) {
83 83
 		$schedule = $Schedule->fetchSchedule($operator);
84 84
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
85
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
86
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
87
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
88
-		    // Should also check if route schedule = route from DB
89
-		    if ($schedule['DepartureAirportIATA'] != '') {
85
+			if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
86
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
87
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
88
+			// Should also check if route schedule = route from DB
89
+			if ($schedule['DepartureAirportIATA'] != '') {
90 90
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
91
-			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
92
-			    if (trim($airport_icao) != '') {
91
+				$airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
92
+				if (trim($airport_icao) != '') {
93 93
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
94 94
 				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
95
-			    }
95
+				}
96
+			}
96 97
 			}
97
-		    }
98
-		    if ($schedule['ArrivalAirportIATA'] != '') {
98
+			if ($schedule['ArrivalAirportIATA'] != '') {
99 99
 			if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) {
100
-			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
101
-			    if (trim($airport_icao) != '') {
100
+				$airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
101
+				if (trim($airport_icao) != '') {
102 102
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
103 103
 				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
104
-			    }
104
+				}
105 105
 			}
106
-		    }
107
-		    $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']);
106
+			}
107
+			$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']);
108 108
 		}
109
-	    } else $scheduleexist = true;
109
+		} else $scheduleexist = true;
110 110
 	} else $scheduleexist = true;
111 111
 	// close connection, at least one way will work ?
112
-       if ($scheduleexist) {
112
+	   if ($scheduleexist) {
113 113
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
114
-    		$sch = $Schedule->getSchedule($operator);
114
+			$sch = $Schedule->getSchedule($operator);
115 115
 		$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']));
116
-       }
116
+	   }
117 117
 	$Spotter->db = null;
118 118
 	$Schedule->db = null;
119 119
 	$Translation->db = null;
@@ -128,78 +128,78 @@  discard block
 block discarded – undo
128 128
 	}
129 129
 	  */
130 130
 	}
131
-    }
131
+	}
132 132
 
133
-    public function checkAll() {
133
+	public function checkAll() {
134 134
 	global $globalDebug, $globalNoImport;
135 135
 	if ($globalDebug) echo "Update last seen flights data...\n";
136 136
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
137
-	    foreach ($this->all_flights as $key => $flight) {
137
+		foreach ($this->all_flights as $key => $flight) {
138 138
 		if (isset($this->all_flights[$key]['id'])) {
139
-		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
140
-    		    $Spotter = new Spotter($this->db);
141
-        	    $real_arrival = $this->arrival($key);
142
-        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $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']);
143
-        	}
144
-	    }
139
+			//echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
140
+				$Spotter = new Spotter($this->db);
141
+				$real_arrival = $this->arrival($key);
142
+				if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $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']);
143
+			}
144
+		}
145
+	}
145 146
 	}
146
-    }
147 147
 
148
-    public function arrival($key) {
148
+	public function arrival($key) {
149 149
 	global $globalClosestMinDist, $globalDebug;
150 150
 	if ($globalDebug) echo 'Update arrival...'."\n";
151 151
 	$Spotter = new Spotter($this->db);
152
-        $airport_icao = '';
153
-        $airport_time = '';
154
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
152
+		$airport_icao = '';
153
+		$airport_time = '';
154
+		if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
155 155
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
156
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
157
-    	    if (isset($closestAirports[0])) {
158
-        	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
159
-        	    $airport_icao = $closestAirports[0]['icao'];
160
-        	    $airport_time = $this->all_flights[$key]['datetime'];
161
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
162
-        	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
163
-        	    foreach ($closestAirports as $airport) {
164
-        		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
165
-        		    $airport_icao = $airport['icao'];
166
-        		    $airport_time = $this->all_flights[$key]['datetime'];
167
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
168
-        		    break;
169
-        		}
170
-        	    }
171
-        	} 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))) {
172
-        		$airport_icao = $closestAirports[0]['icao'];
173
-        		$airport_time = $this->all_flights[$key]['datetime'];
174
-        	} else {
175
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
176
-        	}
177
-    	    } else {
178
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
179
-    	    }
156
+		$closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
157
+			if (isset($closestAirports[0])) {
158
+			if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
159
+				$airport_icao = $closestAirports[0]['icao'];
160
+				$airport_time = $this->all_flights[$key]['datetime'];
161
+				if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
162
+			} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
163
+				foreach ($closestAirports as $airport) {
164
+				if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
165
+					$airport_icao = $airport['icao'];
166
+					$airport_time = $this->all_flights[$key]['datetime'];
167
+					if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
168
+					break;
169
+				}
170
+				}
171
+			} 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))) {
172
+				$airport_icao = $closestAirports[0]['icao'];
173
+				$airport_time = $this->all_flights[$key]['datetime'];
174
+			} else {
175
+				if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
176
+			}
177
+			} else {
178
+				if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
179
+			}
180 180
 
181
-        } else {
182
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
183
-        }
184
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
185
-    }
181
+		} else {
182
+			if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
183
+		}
184
+		return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
185
+	}
186 186
 
187 187
 
188 188
 
189
-    public function del() {
189
+	public function del() {
190 190
 	global $globalDebug, $globalNoImport, $globalNoDB;
191 191
 	// Delete old infos
192 192
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
193 193
 	foreach ($this->all_flights as $key => $flight) {
194
-	    if (isset($flight['lastupdate'])) {
194
+		if (isset($flight['lastupdate'])) {
195 195
 		if ($flight['lastupdate'] < (time()-5900)) {
196
-		    $this->delKey($key);
196
+			$this->delKey($key);
197 197
 		}
198
-	    }
198
+		}
199
+	}
199 200
 	}
200
-    }
201 201
 
202
-    public function delKey($key) {
202
+	public function delKey($key) {
203 203
 	global $globalDebug, $globalNoImport, $globalNoDB;
204 204
 	// Delete old infos
205 205
 	if (isset($this->all_flights[$key]['id'])) {
@@ -214,9 +214,9 @@  discard block
 block discarded – undo
214 214
 		}
215 215
 	}
216 216
 	unset($this->all_flights[$key]);
217
-    }
217
+	}
218 218
 
219
-    public function add($line) {
219
+	public function add($line) {
220 220
 	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, $globalVA, $globalAircraftMaxUpdate, $globalAircraftMinUpdate, $globalLiveInterval, $GeoidClass;
221 221
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
222 222
 	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.01';
@@ -242,20 +242,20 @@  discard block
 block discarded – undo
242 242
 	
243 243
 	// SBS format is CSV format
244 244
 	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
245
-	    //print_r($line);
246
-	    if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']);
247
-  	    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)) {
245
+		//print_r($line);
246
+		if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']);
247
+  		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)) {
248 248
 
249 249
 		// Increment message number
250 250
 		if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) {
251
-		    $current_date = date('Y-m-d');
252
-		    if (isset($line['source_name'])) $source = $line['source_name'];
253
-		    else $source = '';
254
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
255
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
256
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
257
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
258
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
251
+			$current_date = date('Y-m-d');
252
+			if (isset($line['source_name'])) $source = $line['source_name'];
253
+			else $source = '';
254
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
255
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
256
+				$this->stats[$current_date][$source]['msg']['date'] = time();
257
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
258
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
259 259
 		}
260 260
 		
261 261
 		/*
@@ -271,54 +271,54 @@  discard block
 block discarded – undo
271 271
 		//$this->db = $dbc;
272 272
 
273 273
 		//$hex = trim($line['hex']);
274
-	        if (!isset($line['id'])) $id = trim($line['hex']);
275
-	        else $id = trim($line['id']);
274
+			if (!isset($line['id'])) $id = trim($line['hex']);
275
+			else $id = trim($line['id']);
276 276
 		
277 277
 		if (!isset($this->all_flights[$id])) {
278
-		    if ($globalDebug) echo 'New flight...'."\n";
279
-		    $this->all_flights[$id] = array();
280
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
281
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', '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' => ''));
282
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
283
-		    if (!isset($line['id'])) {
278
+			if ($globalDebug) echo 'New flight...'."\n";
279
+			$this->all_flights[$id] = array();
280
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
281
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', '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' => ''));
282
+			if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
283
+			if (!isset($line['id'])) {
284 284
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
285 285
 //			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')));
286 286
 //			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')));
287 287
 			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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
288
-		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
289
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
290
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
288
+				//else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
289
+			 } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
290
+			if ($globalAllFlights !== FALSE) $dataFound = true;
291 291
 		}
292 292
 		if (isset($line['source_type']) && $line['source_type'] != '') {
293
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
293
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
294 294
 		}
295 295
 		
296 296
 		//print_r($this->all_flights);
297 297
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
298
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
299
-		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
298
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
299
+			//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
300 300
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
301
-		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
302
-		    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') {
301
+			//} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
302
+			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') {
303 303
 			$timeelapsed = microtime(true);
304 304
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
305
-			    $Spotter = new Spotter($this->db);
306
-			    if (isset($this->all_flights[$id]['source_type'])) {
305
+				$Spotter = new Spotter($this->db);
306
+				if (isset($this->all_flights[$id]['source_type'])) {
307 307
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
308
-			    } else {
308
+				} else {
309 309
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
310
-			    }
311
-			    $Spotter->db = null;
312
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
313
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
310
+				}
311
+				$Spotter->db = null;
312
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
313
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
314 314
 			}
315
-		    }
316
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
317
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
315
+			}
316
+			if ($globalAllFlights !== FALSE) $dataFound = true;
317
+			if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
318 318
 		}
319
-	        if (isset($line['id']) && !isset($line['hex'])) {
320
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
321
-	        }
319
+			if (isset($line['id']) && !isset($line['hex'])) {
320
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
321
+			}
322 322
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
323 323
 			$icao = $line['aircraft_icao'];
324 324
 			$Spotter = new Spotter($this->db);
@@ -347,9 +347,9 @@  discard block
 block discarded – undo
347 347
 		}
348 348
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
349 349
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
350
-		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
350
+			if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
351 351
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
352
-		    } else {
352
+			} else {
353 353
 				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";
354 354
 				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";
355 355
 				/*
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
 				print_r($line);
359 359
 				*/
360 360
 				return '';
361
-		    }
361
+			}
362 362
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
363 363
 			if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
364 364
 			return '';
@@ -374,21 +374,21 @@  discard block
 block discarded – undo
374 374
 		}
375 375
 
376 376
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
377
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
377
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
378 378
 		}
379 379
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
380
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
380
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
381 381
 		}
382 382
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
383
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
383
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
384 384
 		}
385 385
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
386
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
386
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
387 387
 		}
388 388
  
389 389
 		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'])) {
390 390
 
391
-		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
391
+			if ($this->all_flights[$id]['addedSpotter'] == 1) {
392 392
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
393 393
 				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
394 394
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
@@ -397,23 +397,23 @@  discard block
 block discarded – undo
397 397
 				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
398 398
 				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']));
399 399
 			} else {
400
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
401
-			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
400
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
401
+				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
402 402
 				$timeelapsed = microtime(true);
403
-            			$Spotter = new Spotter($this->db);
404
-            			$fromsource = NULL;
405
-            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
406
-            			elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
403
+						$Spotter = new Spotter($this->db);
404
+						$fromsource = NULL;
405
+						if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
406
+						elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
407 407
 				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
408 408
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
409 409
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
410
-            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
410
+						$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
411 411
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
412 412
 				$Spotter->db = null;
413 413
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
414
-			    }
414
+				}
415 415
 			}
416
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
416
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
417 417
 		    
418 418
 /*
419 419
 		    if (!isset($line['id'])) {
@@ -423,63 +423,63 @@  discard block
 block discarded – undo
423 423
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
424 424
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
425 425
   */
426
-		    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']));
426
+			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']));
427 427
 
428
-		    //$putinarchive = true;
429
-		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
428
+			//$putinarchive = true;
429
+			if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
430 430
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
431
-		    }
432
-		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
431
+			}
432
+			if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
433 433
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
434
-		    }
435
-		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
436
-		    		$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' => ''));
437
-		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
434
+			}
435
+			if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
436
+					$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' => ''));
437
+			} elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
438 438
 			$timeelapsed = microtime(true);
439 439
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
440 440
 				$Spotter = new Spotter($this->db);
441 441
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
442 442
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
443
-		    		$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' => ''));
443
+					$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' => ''));
444 444
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
445
-                        }
446
-		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
445
+						}
446
+			} elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
447 447
 			$timeelapsed = microtime(true);
448 448
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
449
-			    $Spotter = new Spotter($this->db);
450
-			    $route = $Spotter->getRouteInfo(trim($line['ident']));
451
-			    if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
449
+				$Spotter = new Spotter($this->db);
450
+				$route = $Spotter->getRouteInfo(trim($line['ident']));
451
+				if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) {
452 452
 				$Translation = new Translation($this->db);
453 453
 				$ident = $Translation->checkTranslation(trim($line['ident']));
454 454
 				$route = $Spotter->getRouteInfo($ident);
455 455
 				$Translation->db = null;
456
-			    }
457
-			    $Spotter->db = null;
458
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
459
-                    	}
456
+				}
457
+				$Spotter->db = null;
458
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
459
+						}
460 460
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
461
-			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
462
-			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
461
+				//if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
462
+				if ($route['fromairport_icao'] != $route['toairport_icao']) {
463 463
 				//    $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']));
464
-		    		$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']));
465
-		    	    }
464
+					$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']));
465
+					}
466 466
 			}
467 467
 			if (!isset($globalFork)) $globalFork = TRUE;
468 468
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
469 469
 				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
470 470
 			}
471
-		    }
471
+			}
472 472
 		}
473 473
 
474 474
 		if (isset($line['speed']) && $line['speed'] != '' && $line['speed'] != 0) {
475 475
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
476
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
477
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
478
-		    //$dataFound = true;
476
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
477
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
478
+			//$dataFound = true;
479 479
 		} 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'])) {
480
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
481
-		    if ($distance > 1000 && $distance < 10000) {
482
-		    // use datetime
480
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
481
+			if ($distance > 1000 && $distance < 10000) {
482
+			// use datetime
483 483
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
484 484
 			$speed = $speed*3.6;
485 485
 			if ($speed < 1000) {
@@ -488,48 +488,48 @@  discard block
 block discarded – undo
488 488
 	  		} else {
489 489
 	  			if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
490 490
 	  		}
491
-		    }
491
+			}
492 492
 		}
493 493
 
494 494
 
495 495
 
496
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
497
-	    	    if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) {
498
-	    	    	if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
499
-	    	    	return false;
500
-	    	    }
501
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
502
-	    	    else unset($timediff);
503
-	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
504
-	    	    else unset($timediff_archive);
505
-	    	    if ($this->tmd > 5
506
-	    	        || (isset($line['format_source']) 
507
-	    	    	    && $line['format_source'] == 'airwhere' 
508
-	    	    	    && ((!isset($this->all_flights[$id]['latitude']) 
509
-	    	    		|| !isset($this->all_flights[$id]['longitude'])) 
510
-	    	    		|| (isset($this->all_flights[$id]['latitude']) 
511
-	    	    		    && isset($this->all_flights[$id]['longitude']) 
512
-	    	    		    && $this->all_flights[$id]['latitude'] != $line['latitude'] 
513
-	    	    		    && $this->all_flights[$id]['longitude'] != $line['longitude']
514
-	    	    		)
515
-	    	    	    )
516
-	    	    	)
517
-	    		|| (isset($globalVA) && $globalVA) 
518
-	    	    	|| (isset($globalIVAO) && $globalIVAO)
519
-	    	    	|| (isset($globalVATSIM) && $globalVATSIM)
520
-	    	    	|| (isset($globalphpVMS) && $globalphpVMS)
521
-	    	    	|| (isset($globalVAM) && $globalVAM)
522
-	    	    	|| !isset($timediff)
523
-	    	    	|| $timediff > $globalLiveInterval
524
-	    	    	|| ($timediff > 30 
525
-	    	    	    && isset($this->all_flights[$id]['latitude']) 
526
-	    	    	    && isset($this->all_flights[$id]['longitude']) 
527
-	    	    	    && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'))
528
-	    	    	    )
529
-	    	    	) {
496
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
497
+				if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) {
498
+					if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
499
+					return false;
500
+				}
501
+				if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
502
+				else unset($timediff);
503
+				if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
504
+				else unset($timediff_archive);
505
+				if ($this->tmd > 5
506
+					|| (isset($line['format_source']) 
507
+						&& $line['format_source'] == 'airwhere' 
508
+						&& ((!isset($this->all_flights[$id]['latitude']) 
509
+						|| !isset($this->all_flights[$id]['longitude'])) 
510
+						|| (isset($this->all_flights[$id]['latitude']) 
511
+							&& isset($this->all_flights[$id]['longitude']) 
512
+							&& $this->all_flights[$id]['latitude'] != $line['latitude'] 
513
+							&& $this->all_flights[$id]['longitude'] != $line['longitude']
514
+						)
515
+						)
516
+					)
517
+				|| (isset($globalVA) && $globalVA) 
518
+					|| (isset($globalIVAO) && $globalIVAO)
519
+					|| (isset($globalVATSIM) && $globalVATSIM)
520
+					|| (isset($globalphpVMS) && $globalphpVMS)
521
+					|| (isset($globalVAM) && $globalVAM)
522
+					|| !isset($timediff)
523
+					|| $timediff > $globalLiveInterval
524
+					|| ($timediff > 30 
525
+						&& isset($this->all_flights[$id]['latitude']) 
526
+						&& isset($this->all_flights[$id]['longitude']) 
527
+						&& $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'))
528
+						)
529
+					) {
530 530
 
531 531
 			if ((isset($timediff) && !isset($timediff_archive)) || (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']))) {
532
-			    if ((isset($timediff_archive) && $timediff_archive > $globalAircraftMaxUpdate)
532
+				if ((isset($timediff_archive) && $timediff_archive > $globalAircraftMaxUpdate)
533 533
 				|| (isset($line['format_source']) && $line['format_source'] == 'airwhere') 
534 534
 				|| !$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'])) {
535 535
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
@@ -537,9 +537,9 @@  discard block
 block discarded – undo
537 537
 				$this->all_flights[$id]['putinarchive'] = true;
538 538
 				$this->tmd = 0;
539 539
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
540
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
541
-				    $timeelapsed = microtime(true);
542
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
540
+					if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
541
+					$timeelapsed = microtime(true);
542
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
543 543
 					$Spotter = new Spotter($this->db);
544 544
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
545 545
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
@@ -547,11 +547,11 @@  discard block
 block discarded – undo
547 547
 					$Spotter->db = null;
548 548
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
549 549
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
550
-				    }
550
+					}
551 551
 				}
552 552
 				$this->all_flights[$id]['time_last_archive_coord'] = time();
553
-			    } 
554
-			    /*
553
+				} 
554
+				/*
555 555
 			    else {
556 556
 				if (!isset($timediff)) echo 'NO TIMEDIFF';
557 557
 				else {
@@ -565,16 +565,16 @@  discard block
 block discarded – undo
565 565
 			}
566 566
 
567 567
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
568
-			    //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) {
568
+				//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) {
569 569
 				if (!isset($this->all_flights[$id]['archive_latitude'])) {
570 570
 					$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
571 571
 					$this->all_flights[$id]['time_last_coord'] = time();
572 572
 				}
573 573
 				//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' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) {
574 574
 				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) {
575
-				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
576
-				    $dataFound = true;
577
-				    $this->all_flights[$id]['time_last_coord'] = time();
575
+					$this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
576
+					$dataFound = true;
577
+					$this->all_flights[$id]['time_last_coord'] = time();
578 578
 				}
579 579
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
580 580
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
@@ -585,24 +585,24 @@  discard block
 block discarded – undo
585 585
 				    //$putinarchive = true;
586 586
 				}
587 587
 				*/
588
-			    /*
588
+				/*
589 589
 			    } elseif (isset($this->all_flights[$id]['latitude'])) {
590 590
 				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";
591 591
 			    }
592 592
 			    */
593 593
 			}
594 594
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
595
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
596
-			    //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) {
595
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
596
+				//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) {
597 597
 				if (!isset($this->all_flights[$id]['archive_longitude'])) {
598 598
 					$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
599 599
 					$this->all_flights[$id]['time_last_coord'] = time();
600 600
 				}
601 601
 				//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' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) {
602 602
 				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) {
603
-				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
604
-				    $dataFound = true;
605
-				    $this->all_flights[$id]['time_last_coord'] = time();
603
+					$this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
604
+					$dataFound = true;
605
+					$this->all_flights[$id]['time_last_coord'] = time();
606 606
 				}
607 607
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
608 608
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
@@ -620,67 +620,67 @@  discard block
 block discarded – undo
620 620
 			    */
621 621
 			}
622 622
 
623
-		    } else if ($globalDebug && $timediff > 30) {
623
+			} else if ($globalDebug && $timediff > 30) {
624 624
 			$this->tmd = $this->tmd + 1;
625 625
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
626 626
 			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
627 627
 			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
628 628
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
629
-		    }
629
+			}
630 630
 		}
631 631
 		if (isset($line['last_update']) && $line['last_update'] != '') {
632
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
633
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
632
+			if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
633
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
634 634
 		}
635 635
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
636
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
637
-		    //$dataFound = true;
636
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
637
+			//$dataFound = true;
638 638
 		}
639 639
 		if (isset($line['format_source']) && $line['format_source'] != '') {
640
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
640
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
641 641
 		}
642 642
 		if (isset($line['source_name']) && $line['source_name'] != '') {
643
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
643
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
644 644
 		}
645 645
 		if (isset($line['emergency']) && $line['emergency'] != '') {
646
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
647
-		    //$dataFound = true;
646
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
647
+			//$dataFound = true;
648 648
 		}
649 649
 		if (isset($line['ground']) && $line['ground'] != '') {
650
-		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
650
+			if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
651 651
 			// Here we force archive of flight because after ground it's a new one (or should be)
652 652
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
653 653
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
654 654
 			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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
655
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
655
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
656 656
 			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']));
657
-		    }
658
-		    if ($line['ground'] != 1) $line['ground'] = 0;
659
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
660
-		    //$dataFound = true;
657
+			}
658
+			if ($line['ground'] != 1) $line['ground'] = 0;
659
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
660
+			//$dataFound = true;
661 661
 		}
662 662
 		if (isset($line['squawk']) && $line['squawk'] != '') {
663
-		    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'])) {
664
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
665
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
666
-			    $highlight = '';
667
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
668
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
669
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
670
-			    if ($highlight != '') {
663
+			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'])) {
664
+				if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
665
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
666
+				$highlight = '';
667
+				if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
668
+				if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
669
+				if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
670
+				if ($highlight != '') {
671 671
 				$timeelapsed = microtime(true);
672 672
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
673
-				    $Spotter = new Spotter($this->db);
674
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
675
-				    $Spotter->db = null;
676
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
673
+					$Spotter = new Spotter($this->db);
674
+					$Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
675
+					$Spotter->db = null;
676
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
677 677
 				}
678 678
 				//$putinarchive = true;
679 679
 				//$highlight = '';
680
-			    }
680
+				}
681 681
 			    
682
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
683
-		    //$dataFound = true;
682
+			} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
683
+			//$dataFound = true;
684 684
 		}
685 685
 
686 686
 		if (isset($line['altitude']) && $line['altitude'] != '') {
@@ -691,13 +691,13 @@  discard block
 block discarded – undo
691 691
 					$line['altitude'] = $line['altitude'] - $geoid;
692 692
 				}
693 693
 			}
694
-		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
694
+			//if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
695 695
 			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;
696 696
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
697 697
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
698 698
 			//$dataFound = true;
699
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
700
-		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
699
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
700
+			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
701 701
 			if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
702 702
 				if ($globalDebug) echo '--- Reset because of altitude'."\n";
703 703
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
@@ -706,27 +706,27 @@  discard block
 block discarded – undo
706 706
 				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
707 707
 				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']));
708 708
 			}
709
-		    }
710
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
709
+			}
710
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
711 711
 		}
712 712
 
713 713
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
714
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
714
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
715 715
 		}
716 716
 		
717 717
 		if (isset($line['heading']) && $line['heading'] != '') {
718
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
719
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
720
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
721
-		    //$dataFound = true;
718
+			if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
719
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
720
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
721
+			//$dataFound = true;
722 722
   		} 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']) {
723
-  		    $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']);
724
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
725
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
726
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n";
723
+  			$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']);
724
+			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
725
+			if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
726
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n";
727 727
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
728
-  		    // If not enough messages and ACARS set heading to 0
729
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
728
+  			// If not enough messages and ACARS set heading to 0
729
+  			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
730 730
   		}
731 731
 		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
732 732
 		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
@@ -739,125 +739,125 @@  discard block
 block discarded – undo
739 739
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
740 740
 		//if ($dataFound === true && isset($this->all_flights[$id]['hex'])) {
741 741
 		if ($dataFound === true && isset($this->all_flights[$id]['id'])) {
742
-		    $this->all_flights[$id]['lastupdate'] = time();
743
-		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
744
-		        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'])) {
745
-			    //print_r($this->all_flights);
746
-			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
747
-			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
748
-			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
742
+			$this->all_flights[$id]['lastupdate'] = time();
743
+			if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
744
+				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'])) {
745
+				//print_r($this->all_flights);
746
+				//echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
747
+				//$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
748
+				if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
749 749
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
750
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
751
-				    $timeelapsed = microtime(true);
752
-				    $SpotterLive = new SpotterLive($this->db);
753
-				    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' || $line['format_source'] === 'famaprs')) {
750
+					if ($globalDebug) echo "Check if aircraft is already in DB...";
751
+					$timeelapsed = microtime(true);
752
+					$SpotterLive = new SpotterLive($this->db);
753
+					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' || $line['format_source'] === 'famaprs')) {
754 754
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
755 755
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
756
-				    } elseif (isset($line['id'])) {
756
+					} elseif (isset($line['id'])) {
757 757
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
758 758
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
759
-				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
759
+					} elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
760 760
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
761 761
 					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
762
-				    } else $recent_ident = '';
763
-				    $SpotterLive->db=null;
764
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
765
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
762
+					} else $recent_ident = '';
763
+					$SpotterLive->db=null;
764
+					if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
765
+					elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
766 766
 				} else $recent_ident = '';
767
-			    } else {
767
+				} else {
768 768
 				$recent_ident = '';
769 769
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
770
-			    }
771
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
772
-			    if($recent_ident == "")
773
-			    {
770
+				}
771
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
772
+				if($recent_ident == "")
773
+				{
774 774
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
775 775
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
776 776
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
777 777
 				//adds the spotter data for the archive
778 778
 				$ignoreImport = false;
779 779
 				foreach($globalAirportIgnore as $airportIgnore) {
780
-				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
780
+					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
781 781
 					$ignoreImport = true;
782
-				    }
782
+					}
783 783
 				}
784 784
 				if (count($globalAirportAccept) > 0) {
785
-				    $ignoreImport = true;
786
-				    foreach($globalAirportIgnore as $airportIgnore) {
785
+					$ignoreImport = true;
786
+					foreach($globalAirportIgnore as $airportIgnore) {
787 787
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
788
-					    $ignoreImport = false;
788
+						$ignoreImport = false;
789
+					}
789 790
 					}
790
-				    }
791 791
 				}
792 792
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
793
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
793
+					foreach($globalAirlineIgnore as $airlineIgnore) {
794 794
 					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)) {
795
-					    $ignoreImport = true;
795
+						$ignoreImport = true;
796
+					}
796 797
 					}
797
-				    }
798 798
 				}
799 799
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
800
-				    $ignoreImport = true;
801
-				    foreach($globalAirlineAccept as $airlineAccept) {
800
+					$ignoreImport = true;
801
+					foreach($globalAirlineAccept as $airlineAccept) {
802 802
 					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)) {
803
-					    $ignoreImport = false;
803
+						$ignoreImport = false;
804
+					}
804 805
 					}
805
-				    }
806 806
 				}
807 807
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
808
-				    $ignoreImport = true;
809
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
808
+					$ignoreImport = true;
809
+					foreach($globalPilotIdAccept as $pilotIdAccept) {
810 810
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
811
-					    $ignoreImport = false;
811
+						$ignoreImport = false;
812
+					}
812 813
 					}
813
-				    }
814 814
 				}
815 815
 				
816 816
 				if (!$ignoreImport) {
817
-				    $highlight = '';
818
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
819
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
820
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
821
-				    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')));
822
-				    $timeelapsed = microtime(true);
823
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
817
+					$highlight = '';
818
+					if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
819
+					if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
820
+					if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
821
+					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')));
822
+					$timeelapsed = microtime(true);
823
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
824 824
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
825
-					    $Spotter = new Spotter($this->db);
826
-					    $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']);
827
-					    $Spotter->db = null;
828
-					    if ($globalDebug && isset($result)) echo $result."\n";
825
+						$Spotter = new Spotter($this->db);
826
+						$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']);
827
+						$Spotter->db = null;
828
+						if ($globalDebug && isset($result)) echo $result."\n";
829 829
 					}
830
-				    }
831
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
832
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
830
+					}
831
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
832
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
833 833
 
834
-				    // Add source stat in DB
835
-				    $Stats = new Stats($this->db);
836
-				    if (!empty($this->stats)) {
834
+					// Add source stat in DB
835
+					$Stats = new Stats($this->db);
836
+					if (!empty($this->stats)) {
837 837
 					if ($globalDebug) echo 'Add source stats : ';
838
-				        foreach($this->stats as $date => $data) {
839
-					    foreach($data as $source => $sourced) {
840
-					        //print_r($sourced);
841
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
842
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
843
-				    		if (isset($sourced['msg'])) {
844
-				    		    if (time() - $sourced['msg']['date'] > 10) {
845
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
846
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
847
-			    			        unset($this->stats[$date][$source]['msg']);
848
-			    			    }
849
-			    			}
850
-			    		    }
851
-			    		    if ($date != date('Y-m-d')) {
852
-			    			unset($this->stats[$date]);
853
-			    		    }
854
-				    	}
855
-				    	if ($globalDebug) echo 'Done'."\n";
838
+						foreach($this->stats as $date => $data) {
839
+						foreach($data as $source => $sourced) {
840
+							//print_r($sourced);
841
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
842
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
843
+							if (isset($sourced['msg'])) {
844
+								if (time() - $sourced['msg']['date'] > 10) {
845
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
846
+									echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
847
+									unset($this->stats[$date][$source]['msg']);
848
+								}
849
+							}
850
+							}
851
+							if ($date != date('Y-m-d')) {
852
+							unset($this->stats[$date]);
853
+							}
854
+						}
855
+						if ($globalDebug) echo 'Done'."\n";
856 856
 
857
-				    }
858
-				    $Stats->db = null;
859
-				    }
860
-				    $this->del();
857
+					}
858
+					$Stats->db = null;
859
+					}
860
+					$this->del();
861 861
 				} elseif ($globalDebug) echo 'Ignore data'."\n";
862 862
 				//$ignoreImport = false;
863 863
 				$this->all_flights[$id]['addedSpotter'] = 1;
@@ -875,41 +875,41 @@  discard block
 block discarded – undo
875 875
 			*/
876 876
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
877 877
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
878
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
879
-				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
880
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
878
+					if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
879
+					//SpotterLive->deleteLiveSpotterDataNotUpdated();
880
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
881 881
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
882
-					    $SpotterLive = new SpotterLive($this->db);
883
-					    $SpotterLive->deleteLiveSpotterData();
884
-					    $SpotterLive->db=null;
882
+						$SpotterLive = new SpotterLive($this->db);
883
+						$SpotterLive->deleteLiveSpotterData();
884
+						$SpotterLive->db=null;
885 885
 					}
886
-				    }
887
-				    if ($globalDebug) echo " Done\n";
888
-				    $this->last_delete = time();
886
+					}
887
+					if ($globalDebug) echo " Done\n";
888
+					$this->last_delete = time();
889 889
 				}
890
-			    } else {
890
+				} else {
891 891
 				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'] === 'famaprs' || $line['format_source'] === 'airwhere')) {
892
-				    $this->all_flights[$id]['id'] = $recent_ident;
893
-				    $this->all_flights[$id]['addedSpotter'] = 1;
892
+					$this->all_flights[$id]['id'] = $recent_ident;
893
+					$this->all_flights[$id]['addedSpotter'] = 1;
894 894
 				}
895 895
 				if (isset($globalDaemon) && !$globalDaemon) {
896
-				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
896
+					if (!isset($globalNoImport) || $globalNoImport === FALSE) {
897 897
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
898
-					    $Spotter = new Spotter($this->db);
899
-					    $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']);
900
-					    $Spotter->db = null;
898
+						$Spotter = new Spotter($this->db);
899
+						$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']);
900
+						$Spotter->db = null;
901
+					}
901 902
 					}
902
-				    }
903 903
 				}
904 904
 				
905
-			    }
905
+				}
906 906
 			}
907
-		    }
908
-		    //adds the spotter LIVE data
909
-		    //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
910
-		    //echo "\nAdd in Live !! \n";
911
-		    //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";
912
-		    if ($globalDebug) {
907
+			}
908
+			//adds the spotter LIVE data
909
+			//SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed);
910
+			//echo "\nAdd in Live !! \n";
911
+			//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";
912
+			if ($globalDebug) {
913 913
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
914 914
 				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";
915 915
 				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";
@@ -917,60 +917,60 @@  discard block
 block discarded – undo
917 917
 				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";
918 918
 				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";
919 919
 			}
920
-		    }
921
-		    $ignoreImport = false;
922
-		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
923
-		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
920
+			}
921
+			$ignoreImport = false;
922
+			if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
923
+			if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
924 924
 
925
-		    foreach($globalAirportIgnore as $airportIgnore) {
926
-		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
927
-			    $ignoreImport = true;
925
+			foreach($globalAirportIgnore as $airportIgnore) {
926
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
927
+				$ignoreImport = true;
928
+			}
928 929
 			}
929
-		    }
930
-		    if (count($globalAirportAccept) > 0) {
931
-		        $ignoreImport = true;
932
-		        foreach($globalAirportIgnore as $airportIgnore) {
933
-			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
930
+			if (count($globalAirportAccept) > 0) {
931
+				$ignoreImport = true;
932
+				foreach($globalAirportIgnore as $airportIgnore) {
933
+				if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
934 934
 				$ignoreImport = false;
935
-			    }
935
+				}
936 936
 			}
937
-		    }
938
-		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
937
+			}
938
+			if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
939 939
 			foreach($globalAirlineIgnore as $airlineIgnore) {
940
-			    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)) {
940
+				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)) {
941 941
 				$ignoreImport = true;
942
-			    }
942
+				}
943 943
 			}
944
-		    }
945
-		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
944
+			}
945
+			if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
946 946
 			$ignoreImport = true;
947 947
 			foreach($globalAirlineAccept as $airlineAccept) {
948
-			    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)) {
948
+				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)) {
949 949
 				$ignoreImport = false;
950
-			    }
950
+				}
951
+			}
951 952
 			}
952
-		    }
953
-		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
953
+			if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
954 954
 			$ignoreImport = true;
955 955
 			foreach($globalPilotIdAccept as $pilotIdAccept) {
956
-			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
957
-			        $ignoreImport = false;
958
-			    }
956
+				if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
957
+					$ignoreImport = false;
958
+				}
959
+			}
959 960
 			}
960
-		    }
961 961
 
962
-		    if (!$ignoreImport) {
962
+			if (!$ignoreImport) {
963 963
 			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'])) {
964 964
 				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')));
965 965
 				$timeelapsed = microtime(true);
966 966
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
967
-				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
967
+					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
968 968
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
969 969
 					$SpotterLive = new SpotterLive($this->db);
970 970
 					$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']);
971 971
 					$SpotterLive->db = null;
972 972
 					if ($globalDebug) echo $result."\n";
973
-				    }
973
+					}
974 974
 				}
975 975
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
976 976
 					$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']);
@@ -982,7 +982,7 @@  discard block
 block discarded – undo
982 982
 				//if ($line['format_source'] != 'aprs') {
983 983
 				//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) {
984 984
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
985
-				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
985
+					if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
986 986
 					$source = $this->all_flights[$id]['source_name'];
987 987
 					if ($source == '') $source = $this->all_flights[$id]['format_source'];
988 988
 					if (!isset($this->source_location[$source])) {
@@ -1008,7 +1008,7 @@  discard block
 block discarded – undo
1008 1008
 					if ($stats_heading == 16) $stats_heading = 0;
1009 1009
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
1010 1010
 						for ($i=0;$i<=15;$i++) {
1011
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
1011
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
1012 1012
 						}
1013 1013
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
1014 1014
 					} else {
@@ -1021,17 +1021,17 @@  discard block
 block discarded – undo
1021 1021
 					//var_dump($this->stats);
1022 1022
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
1023 1023
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
1024
-						    end($this->stats[$current_date][$source]['hist']);
1025
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
1024
+							end($this->stats[$current_date][$source]['hist']);
1025
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
1026 1026
 						} else $mini = 0;
1027 1027
 						for ($i=$mini;$i<=$distance;$i+=10) {
1028
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
1028
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
1029 1029
 						}
1030 1030
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
1031 1031
 					} else {
1032 1032
 						$this->stats[$current_date][$source]['hist'][$distance] += 1;
1033 1033
 					}
1034
-				    }
1034
+					}
1035 1035
 				}
1036 1036
 
1037 1037
 				$this->all_flights[$id]['lastupdate'] = time();
@@ -1041,7 +1041,7 @@  discard block
 block discarded – undo
1041 1041
 			//$this->del();
1042 1042
 			
1043 1043
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
1044
-			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
1044
+				if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
1045 1045
 				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
1046 1046
 				$SpotterLive = new SpotterLive($this->db);
1047 1047
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
@@ -1049,19 +1049,19 @@  discard block
 block discarded – undo
1049 1049
 				//SpotterLive->deleteLiveSpotterData();
1050 1050
 				if ($globalDebug) echo " Done\n";
1051 1051
 				$this->last_delete_hourly = time();
1052
-			    } else {
1052
+				} else {
1053 1053
 				$this->del();
1054 1054
 				$this->last_delete_hourly = time();
1055
-			    }
1055
+				}
1056 1056
 			}
1057 1057
 			
1058
-		    }
1059
-		    //$ignoreImport = false;
1058
+			}
1059
+			//$ignoreImport = false;
1060 1060
 		}
1061 1061
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
1062 1062
 		if ($send) return $this->all_flights[$id];
1063
-	    }
1063
+		}
1064
+	}
1064 1065
 	}
1065
-    }
1066 1066
 }
1067 1067
 ?>
Please login to merge, or discard this patch.
Spacing   +153 added lines, -153 removed lines patch added patch discarded remove patch
@@ -34,12 +34,12 @@  discard block
 block discarded – undo
34 34
 		$currentdate = date('Y-m-d');
35 35
 		$sourcestat = $Stats->getStatsSource($currentdate);
36 36
 		if (!empty($sourcestat)) {
37
-		    foreach($sourcestat as $srcst) {
37
+		    foreach ($sourcestat as $srcst) {
38 38
 		    	$type = $srcst['stats_type'];
39 39
 			if ($type == 'polar' || $type == 'hist') {
40 40
 			    $source = $srcst['source_name'];
41 41
 			    $data = $srcst['source_data'];
42
-			    $this->stats[$currentdate][$source][$type] = json_decode($data,true);
42
+			    $this->stats[$currentdate][$source][$type] = json_decode($data, true);
43 43
 	    		}
44 44
 		    }
45 45
 		}
@@ -51,14 +51,14 @@  discard block
 block discarded – undo
51 51
 	if (isset($globalGeoid) && $globalGeoid) {
52 52
 		try {
53 53
 			$GeoidClass = new GeoidHeight();
54
-		} catch(Exception $e) {
54
+		} catch (Exception $e) {
55 55
 			if ($globalDebug) echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n";
56 56
 			$GeoidClass = FALSE;
57 57
 		}
58 58
 	}
59 59
     }
60 60
 
61
-    public function get_Schedule($id,$ident) {
61
+    public function get_Schedule($id, $ident) {
62 62
 	global $globalDebug, $globalFork, $globalSchedulesFetch;
63 63
 	// Get schedule here, so it's done only one time
64 64
 	
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
 		$schedule = $Schedule->fetchSchedule($operator);
84 84
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
85 85
 		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
86
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
87
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
86
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime']));
87
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime']));
88 88
 		    // Should also check if route schedule = route from DB
89 89
 		    if ($schedule['DepartureAirportIATA'] != '') {
90 90
 			if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) {
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 			    }
105 105
 			}
106 106
 		    }
107
-		    $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']);
107
+		    $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']);
108 108
 		}
109 109
 	    } else $scheduleexist = true;
110 110
 	} else $scheduleexist = true;
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
        if ($scheduleexist) {
113 113
 		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
114 114
     		$sch = $Schedule->getSchedule($operator);
115
-		$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']));
115
+		$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']));
116 116
        }
117 117
 	$Spotter->db = null;
118 118
 	$Schedule->db = null;
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
140 140
     		    $Spotter = new Spotter($this->db);
141 141
         	    $real_arrival = $this->arrival($key);
142
-        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $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']);
142
+        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $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']);
143 143
         	}
144 144
 	    }
145 145
 	}
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
         $airport_time = '';
154 154
         if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
155 155
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
156
-	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
156
+	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist);
157 157
     	    if (isset($closestAirports[0])) {
158 158
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
159 159
         	    $airport_icao = $closestAirports[0]['icao'];
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
         		    break;
169 169
         		}
170 170
         	    }
171
-        	} 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))) {
171
+        	} 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))) {
172 172
         		$airport_icao = $closestAirports[0]['icao'];
173 173
         		$airport_time = $this->all_flights[$key]['datetime'];
174 174
         	} else {
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
         } else {
182 182
         	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
183 183
         }
184
-        return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
184
+        return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time);
185 185
     }
186 186
 
187 187
 
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
193 193
 	foreach ($this->all_flights as $key => $flight) {
194 194
 	    if (isset($flight['lastupdate'])) {
195
-		if ($flight['lastupdate'] < (time()-5900)) {
195
+		if ($flight['lastupdate'] < (time() - 5900)) {
196 196
 		    $this->delKey($key);
197 197
 		}
198 198
 	    }
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 			$real_arrival = $this->arrival($key);
209 209
 			$Spotter = new Spotter($this->db);
210 210
 			if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
211
-				$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']);
211
+				$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']);
212 212
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
213 213
 			}
214 214
 		}
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 	$send = false;
242 242
 	
243 243
 	// SBS format is CSV format
244
-	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
244
+	if (is_array($line) && (isset($line['hex']) || isset($line['id']))) {
245 245
 	    //print_r($line);
246 246
 	    if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']);
247 247
   	    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)) {
@@ -277,25 +277,25 @@  discard block
 block discarded – undo
277 277
 		if (!isset($this->all_flights[$id])) {
278 278
 		    if ($globalDebug) echo 'New flight...'."\n";
279 279
 		    $this->all_flights[$id] = array();
280
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
281
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', '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' => ''));
282
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
280
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
281
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'altitude_previous' => '', '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' => ''));
282
+		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time()));
283 283
 		    if (!isset($line['id'])) {
284 284
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
285 285
 //			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')));
286 286
 //			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')));
287
-			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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
287
+			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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
288 288
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
289
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
289
+		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
290 290
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
291 291
 		}
292 292
 		if (isset($line['source_type']) && $line['source_type'] != '') {
293
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
293
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type']));
294 294
 		}
295 295
 		
296 296
 		//print_r($this->all_flights);
297 297
 		if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) {
298
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex'])));
298
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex'])));
299 299
 		    //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
300 300
 			//$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
301 301
 		    //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
@@ -304,27 +304,27 @@  discard block
 block discarded – undo
304 304
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
305 305
 			    $Spotter = new Spotter($this->db);
306 306
 			    if (isset($this->all_flights[$id]['source_type'])) {
307
-				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']);
307
+				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']);
308 308
 			    } else {
309 309
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
310 310
 			    }
311 311
 			    $Spotter->db = null;
312
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
313
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
312
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
313
+			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
314 314
 			}
315 315
 		    }
316 316
 		    if ($globalAllFlights !== FALSE) $dataFound = true;
317 317
 		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
318 318
 		}
319 319
 	        if (isset($line['id']) && !isset($line['hex'])) {
320
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
320
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => ''));
321 321
 	        }
322 322
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
323 323
 			$icao = $line['aircraft_icao'];
324 324
 			$Spotter = new Spotter($this->db);
325 325
 			if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao];
326 326
 			$Spotter->db = null;
327
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao));
327
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao));
328 328
 		}
329 329
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) {
330 330
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 				$Spotter = new Spotter($this->db);
333 333
 				$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
334 334
 				$Spotter->db = null;
335
-				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
335
+				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
336 336
 			}
337 337
 		}
338 338
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) {
@@ -340,15 +340,15 @@  discard block
 block discarded – undo
340 340
 			elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
341 341
 			elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
342 342
 			elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
343
-			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
343
+			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao));
344 344
 		}
345 345
 		if (!isset($this->all_flights[$id]['aircraft_icao'])) {
346
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
346
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA'));
347 347
 		}
348 348
 		//if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
349
-		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
349
+		if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) {
350 350
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
351
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
351
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime']));
352 352
 		    } else {
353 353
 				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";
354 354
 				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";
@@ -359,31 +359,31 @@  discard block
 block discarded – undo
359 359
 				*/
360 360
 				return '';
361 361
 		    }
362
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
362
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) {
363 363
 			if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
364 364
 			return '';
365
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
365
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) {
366 366
 			if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
367 367
 			return '';
368 368
 		} elseif (!isset($line['datetime'])) {
369 369
 			date_default_timezone_set('UTC');
370
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
370
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s')));
371 371
 		} else {
372 372
 			if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
373 373
 			return '';
374 374
 		}
375 375
 
376 376
 		if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') {
377
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration']));
377
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration']));
378 378
 		}
379 379
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
380
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints']));
380
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints']));
381 381
 		}
382 382
 		if (isset($line['pilot_id']) && $line['pilot_id'] != '') {
383
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id'])));
383
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => trim($line['pilot_id'])));
384 384
 		}
385 385
 		if (isset($line['pilot_name']) && $line['pilot_name'] != '') {
386
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name'])));
386
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => trim($line['pilot_name'])));
387 387
 		}
388 388
  
389 389
 		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'])) {
@@ -391,13 +391,13 @@  discard block
 block discarded – undo
391 391
 		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
392 392
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
393 393
 				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
394
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
395
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
396
-				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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
397
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
398
-				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']));
394
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
395
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
396
+				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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
397
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
398
+				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']));
399 399
 			} else {
400
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
400
+			    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident'])));
401 401
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
402 402
 				$timeelapsed = microtime(true);
403 403
             			$Spotter = new Spotter($this->db);
@@ -407,13 +407,13 @@  discard block
 block discarded – undo
407 407
 				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
408 408
 				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
409 409
 				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
410
-            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
410
+            			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource);
411 411
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
412 412
 				$Spotter->db = null;
413
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
413
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
414 414
 			    }
415 415
 			}
416
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
416
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident'])));
417 417
 		    
418 418
 /*
419 419
 		    if (!isset($line['id'])) {
@@ -423,25 +423,25 @@  discard block
 block discarded – undo
423 423
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
424 424
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
425 425
   */
426
-		    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']));
426
+		    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']));
427 427
 
428 428
 		    //$putinarchive = true;
429 429
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
430
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time']));
430
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time']));
431 431
 		    }
432 432
 		    if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) {
433
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time']));
433
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time']));
434 434
 		    }
435 435
 		    if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) {
436
-		    		$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' => ''));
436
+		    		$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' => ''));
437 437
 		    } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) {
438 438
 			$timeelapsed = microtime(true);
439 439
 			if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
440 440
 				$Spotter = new Spotter($this->db);
441 441
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
442 442
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
443
-		    		$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' => ''));
444
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
443
+		    		$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' => ''));
444
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
445 445
                         }
446 446
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
447 447
 			$timeelapsed = microtime(true);
@@ -455,35 +455,35 @@  discard block
 block discarded – undo
455 455
 				$Translation->db = null;
456 456
 			    }
457 457
 			    $Spotter->db = null;
458
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
458
+			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
459 459
                     	}
460 460
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
461 461
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
462 462
 			    if ($route['fromairport_icao'] != $route['toairport_icao']) {
463 463
 				//    $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']));
464
-		    		$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']));
464
+		    		$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']));
465 465
 		    	    }
466 466
 			}
467 467
 			if (!isset($globalFork)) $globalFork = TRUE;
468 468
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
469
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
469
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident']));
470 470
 			}
471 471
 		    }
472 472
 		}
473 473
 
474 474
 		if (isset($line['speed']) && $line['speed'] != '' && $line['speed'] != 0) {
475 475
 		//    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12]));
476
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed'])));
477
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true));
476
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed'])));
477
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true));
478 478
 		    //$dataFound = true;
479 479
 		} 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'])) {
480
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m');
480
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm');
481 481
 		    if ($distance > 1000 && $distance < 10000) {
482 482
 		    // use datetime
483 483
 			$speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']);
484 484
 			$speed = $speed*3.6;
485 485
 			if ($speed < 1000) {
486
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
486
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed)));
487 487
 	  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
488 488
 	  		} else {
489 489
 	  			if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
@@ -498,9 +498,9 @@  discard block
 block discarded – undo
498 498
 	    	    	if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
499 499
 	    	    	return false;
500 500
 	    	    }
501
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
501
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']);
502 502
 	    	    else unset($timediff);
503
-	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
503
+	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time() - $this->all_flights[$id]['time_last_archive_coord']);
504 504
 	    	    else unset($timediff_archive);
505 505
 	    	    if ($this->tmd > 5
506 506
 	    	        || (isset($line['format_source']) 
@@ -524,14 +524,14 @@  discard block
 block discarded – undo
524 524
 	    	    	|| ($timediff > 30 
525 525
 	    	    	    && isset($this->all_flights[$id]['latitude']) 
526 526
 	    	    	    && isset($this->all_flights[$id]['longitude']) 
527
-	    	    	    && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'))
527
+	    	    	    && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'))
528 528
 	    	    	    )
529 529
 	    	    	) {
530 530
 
531 531
 			if ((isset($timediff) && !isset($timediff_archive)) || (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']))) {
532 532
 			    if ((isset($timediff_archive) && $timediff_archive > $globalAircraftMaxUpdate)
533 533
 				|| (isset($line['format_source']) && $line['format_source'] == 'airwhere') 
534
-				|| !$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'])) {
534
+				|| !$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'])) {
535 535
 				$this->all_flights[$id]['archive_latitude'] = $line['latitude'];
536 536
 				$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
537 537
 				$this->all_flights[$id]['putinarchive'] = true;
@@ -541,11 +541,11 @@  discard block
 block discarded – undo
541 541
 				    $timeelapsed = microtime(true);
542 542
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
543 543
 					$Spotter = new Spotter($this->db);
544
-					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
544
+					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
545 545
 					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
546 546
 					else $this->all_flights[$id]['over_country'] = '';
547 547
 					$Spotter->db = null;
548
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
548
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
549 549
 					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
550 550
 				    }
551 551
 				}
@@ -571,13 +571,13 @@  discard block
 block discarded – undo
571 571
 					$this->all_flights[$id]['time_last_coord'] = time();
572 572
 				}
573 573
 				//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' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) {
574
-				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) {
574
+				if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > 0.0001)) {
575 575
 				    $this->all_flights[$id]['livedb_latitude'] = $line['latitude'];
576 576
 				    $dataFound = true;
577 577
 				    $this->all_flights[$id]['time_last_coord'] = time();
578 578
 				}
579 579
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
580
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude']));
580
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude']));
581 581
 				/*
582 582
 				if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) {
583 583
 				    $this->all_flights[$id]['archive_latitude'] = $line['latitude'];
@@ -599,13 +599,13 @@  discard block
 block discarded – undo
599 599
 					$this->all_flights[$id]['time_last_coord'] = time();
600 600
 				}
601 601
 				//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' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) {
602
-				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) {
602
+				if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > 0.0001)) {
603 603
 				    $this->all_flights[$id]['livedb_longitude'] = $line['longitude'];
604 604
 				    $dataFound = true;
605 605
 				    $this->all_flights[$id]['time_last_coord'] = time();
606 606
 				}
607 607
 				// elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n";
608
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude']));
608
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude']));
609 609
 				/*
610 610
 				if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) {
611 611
 				    $this->all_flights[$id]['archive_longitude'] = $line['longitude'];
@@ -623,46 +623,46 @@  discard block
 block discarded – undo
623 623
 		    } else if ($globalDebug && $timediff > 30) {
624 624
 			$this->tmd = $this->tmd + 1;
625 625
 			echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n";
626
-			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -";
627
-			echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
626
+			echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -";
627
+			echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
628 628
 			echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n";
629 629
 		    }
630 630
 		}
631 631
 		if (isset($line['last_update']) && $line['last_update'] != '') {
632 632
 		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
633
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
633
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update']));
634 634
 		}
635 635
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
636
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate']));
636
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate']));
637 637
 		    //$dataFound = true;
638 638
 		}
639 639
 		if (isset($line['format_source']) && $line['format_source'] != '') {
640
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source']));
640
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source']));
641 641
 		}
642 642
 		if (isset($line['source_name']) && $line['source_name'] != '') {
643
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name']));
643
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name']));
644 644
 		}
645 645
 		if (isset($line['emergency']) && $line['emergency'] != '') {
646
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency']));
646
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency']));
647 647
 		    //$dataFound = true;
648 648
 		}
649 649
 		if (isset($line['ground']) && $line['ground'] != '') {
650 650
 		    if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) {
651 651
 			// Here we force archive of flight because after ground it's a new one (or should be)
652
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
653
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
654
-			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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
655
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
656
-			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']));
652
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
653
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
654
+			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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
655
+		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
656
+			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']));
657 657
 		    }
658 658
 		    if ($line['ground'] != 1) $line['ground'] = 0;
659
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
659
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground']));
660 660
 		    //$dataFound = true;
661 661
 		}
662 662
 		if (isset($line['squawk']) && $line['squawk'] != '') {
663 663
 		    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'])) {
664 664
 			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
665
-			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
665
+			    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
666 666
 			    $highlight = '';
667 667
 			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
668 668
 			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
@@ -671,66 +671,66 @@  discard block
 block discarded – undo
671 671
 				$timeelapsed = microtime(true);
672 672
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
673 673
 				    $Spotter = new Spotter($this->db);
674
-				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
674
+				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight);
675 675
 				    $Spotter->db = null;
676
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
676
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
677 677
 				}
678 678
 				//$putinarchive = true;
679 679
 				//$highlight = '';
680 680
 			    }
681 681
 			    
682
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
682
+		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk']));
683 683
 		    //$dataFound = true;
684 684
 		}
685 685
 
686 686
 		if (isset($line['altitude']) && $line['altitude'] != '') {
687 687
 			if (isset($line['altitude_relative']) && isset($GeoidClass) && is_object($GeoidClass)) {
688 688
 				if ($line['altitude_relative'] == 'AMSL' || $line['altitude_relative'] == 'MSL') {
689
-					$geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'])*3.28084,2);
689
+					$geoid = round($GeoidClass->get($this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'])*3.28084, 2);
690 690
 					//if ($globalDebug) echo '=> Set altitude to WGS84 Ellipsoid, add '.$geoid.' to '.$line['altitude']."\n";
691 691
 					$line['altitude'] = $line['altitude'] - $geoid;
692 692
 				}
693 693
 			}
694 694
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
695
-			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;
696
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
697
-			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
695
+			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;
696
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100)));
697
+			$this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude']));
698 698
 			//$dataFound = true;
699 699
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
700 700
 		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
701 701
 			if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
702 702
 				if ($globalDebug) echo '--- Reset because of altitude'."\n";
703
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
704
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
705
-				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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
706
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
707
-				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']));
703
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0));
704
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1));
705
+				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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi')));
706
+				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id']));
707
+				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']));
708 708
 			}
709 709
 		    }
710
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
710
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_previous' => $line['altitude']));
711 711
 		}
712 712
 
713 713
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
714
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true));
714
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true));
715 715
 		}
716 716
 		
717 717
 		if (isset($line['heading']) && $line['heading'] != '') {
718
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
719
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
720
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
718
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
719
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading'])));
720
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true));
721 721
 		    //$dataFound = true;
722 722
   		} 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']) {
723
-  		    $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']);
724
-		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
725
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
723
+  		    $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']);
724
+		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading)));
725
+		    if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
726 726
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n";
727 727
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
728 728
   		    // If not enough messages and ACARS set heading to 0
729
-  		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
729
+  		    $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0));
730 730
   		}
731
-		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
732
-		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
733
-		elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinupdate) $dataFound = false;
731
+		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
732
+		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
733
+		elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalAircraftMinupdate) $dataFound = false;
734 734
 
735 735
 //		print_r($this->all_flights[$id]);
736 736
 		//gets the callsign from the last hour
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
741 741
 		if ($dataFound === true && isset($this->all_flights[$id]['id'])) {
742 742
 		    $this->all_flights[$id]['lastupdate'] = time();
743 743
 		    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) {
744
-		        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'])) {
744
+		        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'])) {
745 745
 			    //print_r($this->all_flights);
746 746
 			    //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n";
747 747
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
@@ -752,61 +752,61 @@  discard block
 block discarded – undo
752 752
 				    $SpotterLive = new SpotterLive($this->db);
753 753
 				    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' || $line['format_source'] === 'famaprs')) {
754 754
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
755
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
755
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
756 756
 				    } elseif (isset($line['id'])) {
757 757
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
758
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
758
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
759 759
 				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
760 760
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
761
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
761
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
762 762
 				    } else $recent_ident = '';
763
-				    $SpotterLive->db=null;
763
+				    $SpotterLive->db = null;
764 764
 				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
765 765
 				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
766 766
 				} else $recent_ident = '';
767 767
 			    } else {
768 768
 				$recent_ident = '';
769
-				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
769
+				$this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0));
770 770
 			    }
771 771
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
772
-			    if($recent_ident == "")
772
+			    if ($recent_ident == "")
773 773
 			    {
774 774
 				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
775 775
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
776 776
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
777 777
 				//adds the spotter data for the archive
778 778
 				$ignoreImport = false;
779
-				foreach($globalAirportIgnore as $airportIgnore) {
779
+				foreach ($globalAirportIgnore as $airportIgnore) {
780 780
 				    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
781 781
 					$ignoreImport = true;
782 782
 				    }
783 783
 				}
784 784
 				if (count($globalAirportAccept) > 0) {
785 785
 				    $ignoreImport = true;
786
-				    foreach($globalAirportIgnore as $airportIgnore) {
786
+				    foreach ($globalAirportIgnore as $airportIgnore) {
787 787
 					if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
788 788
 					    $ignoreImport = false;
789 789
 					}
790 790
 				    }
791 791
 				}
792 792
 				if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
793
-				    foreach($globalAirlineIgnore as $airlineIgnore) {
794
-					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)) {
793
+				    foreach ($globalAirlineIgnore as $airlineIgnore) {
794
+					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)) {
795 795
 					    $ignoreImport = true;
796 796
 					}
797 797
 				    }
798 798
 				}
799 799
 				if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
800 800
 				    $ignoreImport = true;
801
-				    foreach($globalAirlineAccept as $airlineAccept) {
802
-					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)) {
801
+				    foreach ($globalAirlineAccept as $airlineAccept) {
802
+					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)) {
803 803
 					    $ignoreImport = false;
804 804
 					}
805 805
 				    }
806 806
 				}
807 807
 				if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
808 808
 				    $ignoreImport = true;
809
-				    foreach($globalPilotIdAccept as $pilotIdAccept) {
809
+				    foreach ($globalPilotIdAccept as $pilotIdAccept) {
810 810
 					if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
811 811
 					    $ignoreImport = false;
812 812
 					}
@@ -818,32 +818,32 @@  discard block
 block discarded – undo
818 818
 				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
819 819
 				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
820 820
 				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
821
-				    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')));
821
+				    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')));
822 822
 				    $timeelapsed = microtime(true);
823 823
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
824 824
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
825 825
 					    $Spotter = new Spotter($this->db);
826
-					    $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']);
826
+					    $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']);
827 827
 					    $Spotter->db = null;
828 828
 					    if ($globalDebug && isset($result)) echo $result."\n";
829 829
 					}
830 830
 				    }
831
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
831
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
832 832
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
833 833
 
834 834
 				    // Add source stat in DB
835 835
 				    $Stats = new Stats($this->db);
836 836
 				    if (!empty($this->stats)) {
837 837
 					if ($globalDebug) echo 'Add source stats : ';
838
-				        foreach($this->stats as $date => $data) {
839
-					    foreach($data as $source => $sourced) {
838
+				        foreach ($this->stats as $date => $data) {
839
+					    foreach ($data as $source => $sourced) {
840 840
 					        //print_r($sourced);
841
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
842
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
841
+				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date);
842
+				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date);
843 843
 				    		if (isset($sourced['msg'])) {
844 844
 				    		    if (time() - $sourced['msg']['date'] > 10) {
845 845
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
846
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg',$date);
846
+				    		        echo $Stats->addStatSource($nbmsg, $source, 'msg', $date);
847 847
 			    			        unset($this->stats[$date][$source]['msg']);
848 848
 			    			    }
849 849
 			    			}
@@ -881,14 +881,14 @@  discard block
 block discarded – undo
881 881
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
882 882
 					    $SpotterLive = new SpotterLive($this->db);
883 883
 					    $SpotterLive->deleteLiveSpotterData();
884
-					    $SpotterLive->db=null;
884
+					    $SpotterLive->db = null;
885 885
 					}
886 886
 				    }
887 887
 				    if ($globalDebug) echo " Done\n";
888 888
 				    $this->last_delete = time();
889 889
 				}
890 890
 			    } else {
891
-				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'] === 'famaprs' || $line['format_source'] === 'airwhere')) {
891
+				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'] === 'famaprs' || $line['format_source'] === 'airwhere')) {
892 892
 				    $this->all_flights[$id]['id'] = $recent_ident;
893 893
 				    $this->all_flights[$id]['addedSpotter'] = 1;
894 894
 				}
@@ -896,7 +896,7 @@  discard block
 block discarded – undo
896 896
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
897 897
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
898 898
 					    $Spotter = new Spotter($this->db);
899
-					    $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']);
899
+					    $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']);
900 900
 					    $Spotter->db = null;
901 901
 					}
902 902
 				    }
@@ -922,37 +922,37 @@  discard block
 block discarded – undo
922 922
 		    if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
923 923
 		    if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
924 924
 
925
-		    foreach($globalAirportIgnore as $airportIgnore) {
925
+		    foreach ($globalAirportIgnore as $airportIgnore) {
926 926
 		        if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
927 927
 			    $ignoreImport = true;
928 928
 			}
929 929
 		    }
930 930
 		    if (count($globalAirportAccept) > 0) {
931 931
 		        $ignoreImport = true;
932
-		        foreach($globalAirportIgnore as $airportIgnore) {
932
+		        foreach ($globalAirportIgnore as $airportIgnore) {
933 933
 			    if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) {
934 934
 				$ignoreImport = false;
935 935
 			    }
936 936
 			}
937 937
 		    }
938 938
 		    if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) {
939
-			foreach($globalAirlineIgnore as $airlineIgnore) {
940
-			    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)) {
939
+			foreach ($globalAirlineIgnore as $airlineIgnore) {
940
+			    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)) {
941 941
 				$ignoreImport = true;
942 942
 			    }
943 943
 			}
944 944
 		    }
945 945
 		    if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) {
946 946
 			$ignoreImport = true;
947
-			foreach($globalAirlineAccept as $airlineAccept) {
948
-			    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)) {
947
+			foreach ($globalAirlineAccept as $airlineAccept) {
948
+			    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)) {
949 949
 				$ignoreImport = false;
950 950
 			    }
951 951
 			}
952 952
 		    }
953 953
 		    if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) {
954 954
 			$ignoreImport = true;
955
-			foreach($globalPilotIdAccept as $pilotIdAccept) {
955
+			foreach ($globalPilotIdAccept as $pilotIdAccept) {
956 956
 			    if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) {
957 957
 			        $ignoreImport = false;
958 958
 			    }
@@ -960,23 +960,23 @@  discard block
 block discarded – undo
960 960
 		    }
961 961
 
962 962
 		    if (!$ignoreImport) {
963
-			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'])) {
964
-				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')));
963
+			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'])) {
964
+				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')));
965 965
 				$timeelapsed = microtime(true);
966 966
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
967 967
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
968 968
 					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
969 969
 					$SpotterLive = new SpotterLive($this->db);
970
-					$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']);
970
+					$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']);
971 971
 					$SpotterLive->db = null;
972 972
 					if ($globalDebug) echo $result."\n";
973 973
 				    }
974 974
 				}
975 975
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
976
-					$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']);
976
+					$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']);
977 977
 				}
978 978
 				$this->all_flights[$id]['putinarchive'] = false;
979
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
979
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
980 980
 
981 981
 				// Put statistics in $this->stats variable
982 982
 				//if ($line['format_source'] != 'aprs') {
@@ -995,19 +995,19 @@  discard block
 block discarded – undo
995 995
 							$latitude = $globalCenterLatitude;
996 996
 							$longitude = $globalCenterLongitude;
997 997
 						}
998
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
998
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
999 999
 					} else {
1000 1000
 						$latitude = $this->source_location[$source]['latitude'];
1001 1001
 						$longitude = $this->source_location[$source]['longitude'];
1002 1002
 					}
1003
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
1003
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
1004 1004
 					//$stats_heading = $stats_heading%22.5;
1005 1005
 					$stats_heading = round($stats_heading/22.5);
1006
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
1006
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']);
1007 1007
 					$current_date = date('Y-m-d');
1008 1008
 					if ($stats_heading == 16) $stats_heading = 0;
1009 1009
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
1010
-						for ($i=0;$i<=15;$i++) {
1010
+						for ($i = 0; $i <= 15; $i++) {
1011 1011
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
1012 1012
 						}
1013 1013
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
@@ -1022,9 +1022,9 @@  discard block
 block discarded – undo
1022 1022
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
1023 1023
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
1024 1024
 						    end($this->stats[$current_date][$source]['hist']);
1025
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
1025
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
1026 1026
 						} else $mini = 0;
1027
-						for ($i=$mini;$i<=$distance;$i+=10) {
1027
+						for ($i = $mini; $i <= $distance; $i += 10) {
1028 1028
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
1029 1029
 						}
1030 1030
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
@@ -1037,7 +1037,7 @@  discard block
 block discarded – undo
1037 1037
 				$this->all_flights[$id]['lastupdate'] = time();
1038 1038
 				if ($this->all_flights[$id]['putinarchive']) $send = true;
1039 1039
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1040
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1040
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
1041 1041
 			//$this->del();
1042 1042
 			
1043 1043
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
Please login to merge, or discard this patch.
Braces   +401 added lines, -143 removed lines patch added patch discarded remove patch
@@ -52,7 +52,9 @@  discard block
 block discarded – undo
52 52
 		try {
53 53
 			$GeoidClass = new GeoidHeight();
54 54
 		} catch(Exception $e) {
55
-			if ($globalDebug) echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n";
55
+			if ($globalDebug) {
56
+				echo "Can't calculate geoid, check that you downloaded it via update_db.php (".$e.")\n";
57
+			}
56 58
 			$GeoidClass = FALSE;
57 59
 		}
58 60
 	}
@@ -71,7 +73,9 @@  discard block
 block discarded – undo
71 73
 	$dbc = $this->db;
72 74
 	$this->all_flights[$id]['schedule_check'] = true;
73 75
 	if ($globalSchedulesFetch) {
74
-	if ($globalDebug) echo 'Getting schedule info...'."\n";
76
+	if ($globalDebug) {
77
+		echo 'Getting schedule info...'."\n";
78
+	}
75 79
 	$Spotter = new Spotter($dbc);
76 80
 	$Schedule = new Schedule($dbc);
77 81
 	$Translation = new Translation($dbc);
@@ -82,7 +86,9 @@  discard block
 block discarded – undo
82 86
 	    if ($Schedule->checkSchedule($operator) == 0) {
83 87
 		$schedule = $Schedule->fetchSchedule($operator);
84 88
 		if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) {
85
-		    if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n";
89
+		    if ($globalDebug) {
90
+		    	echo "-> Schedule info for ".$operator." (".$ident.")\n";
91
+		    }
86 92
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime']));
87 93
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime']));
88 94
 		    // Should also check if route schedule = route from DB
@@ -91,7 +97,9 @@  discard block
 block discarded – undo
91 97
 			    $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']);
92 98
 			    if (trim($airport_icao) != '') {
93 99
 				$this->all_flights[$id]['departure_airport'] = $airport_icao;
94
-				if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
100
+				if ($globalDebug) {
101
+					echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n";
102
+				}
95 103
 			    }
96 104
 			}
97 105
 		    }
@@ -100,17 +108,25 @@  discard block
 block discarded – undo
100 108
 			    $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']);
101 109
 			    if (trim($airport_icao) != '') {
102 110
 				$this->all_flights[$id]['arrival_airport'] = $airport_icao;
103
-				if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
111
+				if ($globalDebug) {
112
+					echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n";
113
+				}
104 114
 			    }
105 115
 			}
106 116
 		    }
107 117
 		    $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']);
108 118
 		}
109
-	    } else $scheduleexist = true;
110
-	} else $scheduleexist = true;
119
+	    } else {
120
+	    	$scheduleexist = true;
121
+	    }
122
+	} else {
123
+		$scheduleexist = true;
124
+	}
111 125
 	// close connection, at least one way will work ?
112 126
        if ($scheduleexist) {
113
-		if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n";
127
+		if ($globalDebug) {
128
+			echo "-> get arrival/departure airport info for ".$ident."\n";
129
+		}
114 130
     		$sch = $Schedule->getSchedule($operator);
115 131
 		$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']));
116 132
        }
@@ -132,14 +148,18 @@  discard block
 block discarded – undo
132 148
 
133 149
     public function checkAll() {
134 150
 	global $globalDebug, $globalNoImport;
135
-	if ($globalDebug) echo "Update last seen flights data...\n";
151
+	if ($globalDebug) {
152
+		echo "Update last seen flights data...\n";
153
+	}
136 154
 	if (!isset($globalNoImport) || $globalNoImport === FALSE) {
137 155
 	    foreach ($this->all_flights as $key => $flight) {
138 156
 		if (isset($this->all_flights[$key]['id'])) {
139 157
 		    //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].'  '.$this->all_flights[$key]['longitude']."\n";
140 158
     		    $Spotter = new Spotter($this->db);
141 159
         	    $real_arrival = $this->arrival($key);
142
-        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $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']);
160
+        	    if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) {
161
+        	    	$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']);
162
+        	    }
143 163
         	}
144 164
 	    }
145 165
 	}
@@ -147,24 +167,32 @@  discard block
 block discarded – undo
147 167
 
148 168
     public function arrival($key) {
149 169
 	global $globalClosestMinDist, $globalDebug;
150
-	if ($globalDebug) echo 'Update arrival...'."\n";
170
+	if ($globalDebug) {
171
+		echo 'Update arrival...'."\n";
172
+	}
151 173
 	$Spotter = new Spotter($this->db);
152 174
         $airport_icao = '';
153 175
         $airport_time = '';
154
-        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50;
176
+        if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') {
177
+        	$globalClosestMinDist = 50;
178
+        }
155 179
 	if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
156 180
 	    $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist);
157 181
     	    if (isset($closestAirports[0])) {
158 182
         	if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) {
159 183
         	    $airport_icao = $closestAirports[0]['icao'];
160 184
         	    $airport_time = $this->all_flights[$key]['datetime'];
161
-        	    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
185
+        	    if ($globalDebug) {
186
+        	    	echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
187
+        	    }
162 188
         	} elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') {
163 189
         	    foreach ($closestAirports as $airport) {
164 190
         		if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) {
165 191
         		    $airport_icao = $airport['icao'];
166 192
         		    $airport_time = $this->all_flights[$key]['datetime'];
167
-        		    if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
193
+        		    if ($globalDebug) {
194
+        		    	echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n";
195
+        		    }
168 196
         		    break;
169 197
         		}
170 198
         	    }
@@ -172,14 +200,20 @@  discard block
 block discarded – undo
172 200
         		$airport_icao = $closestAirports[0]['icao'];
173 201
         		$airport_time = $this->all_flights[$key]['datetime'];
174 202
         	} else {
175
-        		if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
203
+        		if ($globalDebug) {
204
+        			echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n";
205
+        		}
176 206
         	}
177 207
     	    } else {
178
-    		    if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
208
+    		    if ($globalDebug) {
209
+    		    	echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n";
210
+    		    }
179 211
     	    }
180 212
 
181 213
         } else {
182
-        	if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
214
+        	if ($globalDebug) {
215
+        		echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n";
216
+        	}
183 217
         }
184 218
         return array('airport_icao' => $airport_icao,'airport_time' => $airport_time);
185 219
     }
@@ -189,7 +223,9 @@  discard block
 block discarded – undo
189 223
     public function del() {
190 224
 	global $globalDebug, $globalNoImport, $globalNoDB;
191 225
 	// Delete old infos
192
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
226
+	if ($globalDebug) {
227
+		echo 'Delete old values and update latest data...'."\n";
228
+	}
193 229
 	foreach ($this->all_flights as $key => $flight) {
194 230
 	    if (isset($flight['lastupdate'])) {
195 231
 		if ($flight['lastupdate'] < (time()-5900)) {
@@ -203,13 +239,17 @@  discard block
 block discarded – undo
203 239
 	global $globalDebug, $globalNoImport, $globalNoDB;
204 240
 	// Delete old infos
205 241
 	if (isset($this->all_flights[$key]['id'])) {
206
-		if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
242
+		if ($globalDebug) {
243
+			echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n";
244
+		}
207 245
 		if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
208 246
 			$real_arrival = $this->arrival($key);
209 247
 			$Spotter = new Spotter($this->db);
210 248
 			if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') {
211 249
 				$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']);
212
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
250
+				if ($globalDebug && $result != 'success') {
251
+					echo '!!! ERROR : '.$result."\n";
252
+				}
213 253
 			}
214 254
 		}
215 255
 	}
@@ -219,9 +259,13 @@  discard block
 block discarded – undo
219 259
     public function add($line) {
220 260
 	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, $globalVA, $globalAircraftMaxUpdate, $globalAircraftMinUpdate, $globalLiveInterval, $GeoidClass;
221 261
 	//if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE;
222
-	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.01';
223
-	if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') $globalAircraftMaxUpdate = 3000;
224
-/*
262
+	if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') {
263
+		$globalCoordMinChange = '0.01';
264
+	}
265
+	if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') {
266
+		$globalAircraftMaxUpdate = 3000;
267
+	}
268
+	/*
225 269
 	$Spotter = new Spotter();
226 270
 	$dbc = $Spotter->db;
227 271
 	$SpotterLive = new SpotterLive($dbc);
@@ -243,19 +287,28 @@  discard block
 block discarded – undo
243 287
 	// SBS format is CSV format
244 288
 	if(is_array($line) && (isset($line['hex']) || isset($line['id']))) {
245 289
 	    //print_r($line);
246
-	    if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']);
290
+	    if (isset($line['hex'])) {
291
+	    	$line['hex'] = strtoupper($line['hex']);
292
+	    }
247 293
   	    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)) {
248 294
 
249 295
 		// Increment message number
250 296
 		if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) {
251 297
 		    $current_date = date('Y-m-d');
252
-		    if (isset($line['source_name'])) $source = $line['source_name'];
253
-		    else $source = '';
254
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
298
+		    if (isset($line['source_name'])) {
299
+		    	$source = $line['source_name'];
300
+		    } else {
301
+		    	$source = '';
302
+		    }
303
+		    if ($source == '' || $line['format_source'] == 'aprs') {
304
+		    	$source = $line['format_source'];
305
+		    }
255 306
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
256 307
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
257 308
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
258
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
309
+		    } else {
310
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
311
+		    }
259 312
 		}
260 313
 		
261 314
 		/*
@@ -271,23 +324,38 @@  discard block
 block discarded – undo
271 324
 		//$this->db = $dbc;
272 325
 
273 326
 		//$hex = trim($line['hex']);
274
-	        if (!isset($line['id'])) $id = trim($line['hex']);
275
-	        else $id = trim($line['id']);
327
+	        if (!isset($line['id'])) {
328
+	        	$id = trim($line['hex']);
329
+	        } else {
330
+	        	$id = trim($line['id']);
331
+	        }
276 332
 		
277 333
 		if (!isset($this->all_flights[$id])) {
278
-		    if ($globalDebug) echo 'New flight...'."\n";
334
+		    if ($globalDebug) {
335
+		    	echo 'New flight...'."\n";
336
+		    }
279 337
 		    $this->all_flights[$id] = array();
280 338
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
281 339
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', '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' => ''));
282
-		    if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
340
+		    if (isset($globalDaemon) && $globalDaemon === FALSE) {
341
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time()));
342
+		    }
283 343
 		    if (!isset($line['id'])) {
284
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
285
-//			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')));
344
+			if (!isset($globalDaemon)) {
345
+				$globalDaemon = TRUE;
346
+			}
347
+			//			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')));
286 348
 //			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')));
287
-			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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
349
+			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' || $line['format_source'] === 'famaprs')) {
350
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
351
+			}
288 352
 		        //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
289
-		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
290
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
353
+		     } else {
354
+		     	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
355
+		     }
356
+		    if ($globalAllFlights !== FALSE) {
357
+		    	$dataFound = true;
358
+		    }
291 359
 		}
292 360
 		if (isset($line['source_type']) && $line['source_type'] != '') {
293 361
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type']));
@@ -309,12 +377,20 @@  discard block
 block discarded – undo
309 377
 				$aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']));
310 378
 			    }
311 379
 			    $Spotter->db = null;
312
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
313
-			    if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
380
+			    if ($globalDebugTimeElapsed) {
381
+			    	echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
382
+			    }
383
+			    if ($aircraft_icao != '') {
384
+			    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
385
+			    }
314 386
 			}
315 387
 		    }
316
-		    if ($globalAllFlights !== FALSE) $dataFound = true;
317
-		    if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
388
+		    if ($globalAllFlights !== FALSE) {
389
+		    	$dataFound = true;
390
+		    }
391
+		    if ($globalDebug) {
392
+		    	echo "*********** New aircraft hex : ".$line['hex']." ***********\n";
393
+		    }
318 394
 		}
319 395
 	        if (isset($line['id']) && !isset($line['hex'])) {
320 396
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => ''));
@@ -322,7 +398,9 @@  discard block
 block discarded – undo
322 398
 		if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') {
323 399
 			$icao = $line['aircraft_icao'];
324 400
 			$Spotter = new Spotter($this->db);
325
-			if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao];
401
+			if (isset($Spotter->aircraft_correct_icaotype[$icao])) {
402
+				$icao = $Spotter->aircraft_correct_icaotype[$icao];
403
+			}
326 404
 			$Spotter->db = null;
327 405
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao));
328 406
 		}
@@ -332,15 +410,24 @@  discard block
 block discarded – undo
332 410
 				$Spotter = new Spotter($this->db);
333 411
 				$aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']);
334 412
 				$Spotter->db = null;
335
-				if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
413
+				if ($aircraft_icao != '') {
414
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
415
+				}
336 416
 			}
337 417
 		}
338 418
 		if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) {
339
-			if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
340
-			elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
341
-			elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
342
-			elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
343
-			if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
419
+			if ($line['aircraft_type'] == 'PARA_GLIDER') {
420
+				$aircraft_icao = 'GLID';
421
+			} elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') {
422
+				$aircraft_icao = 'UHEL';
423
+			} elseif ($line['aircraft_type'] == 'TOW_PLANE') {
424
+				$aircraft_icao = 'TOWPLANE';
425
+			} elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') {
426
+				$aircraft_icao = 'POWAIRC';
427
+			}
428
+			if (isset($aircraft_icao)) {
429
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao));
430
+			}
344 431
 		}
345 432
 		if (!isset($this->all_flights[$id]['aircraft_icao'])) {
346 433
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA'));
@@ -350,8 +437,11 @@  discard block
 block discarded – undo
350 437
 		    if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) {
351 438
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime']));
352 439
 		    } else {
353
-				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";
354
-				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";
440
+				if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) {
441
+					echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
442
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) {
443
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n";
444
+				}
355 445
 				/*
356 446
 				echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']);
357 447
 				print_r($this->all_flights[$id]);
@@ -360,16 +450,22 @@  discard block
 block discarded – undo
360 450
 				return '';
361 451
 		    }
362 452
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
363
-			if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
453
+			if ($globalDebug) {
454
+				echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
455
+			}
364 456
 			return '';
365 457
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
366
-			if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
458
+			if ($globalDebug) {
459
+				echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!\n";
460
+			}
367 461
 			return '';
368 462
 		} elseif (!isset($line['datetime'])) {
369 463
 			date_default_timezone_set('UTC');
370 464
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s')));
371 465
 		} else {
372
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
466
+			if ($globalDebug) {
467
+				echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!";
468
+			}
373 469
 			return '';
374 470
 		}
375 471
 
@@ -390,30 +486,48 @@  discard block
 block discarded – undo
390 486
 
391 487
 		    if ($this->all_flights[$id]['addedSpotter'] == 1) {
392 488
 			if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
393
-				if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n";
489
+				if ($globalDebug) {
490
+					echo '---!!!! New ident, reset aircraft data...'."\n";
491
+				}
394 492
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
395 493
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
396
-				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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
397
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
398
-				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']));
494
+				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' || $line['format_source'] === 'famaprs')) {
495
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
496
+				} elseif (isset($line['id'])) {
497
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
498
+				} elseif (isset($this->all_flights[$id]['ident'])) {
499
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
500
+				}
399 501
 			} else {
400 502
 			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
401 503
 			    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
402 504
 				$timeelapsed = microtime(true);
403 505
             			$Spotter = new Spotter($this->db);
404 506
             			$fromsource = NULL;
405
-            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource;
406
-            			elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim';
407
-				elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao';
408
-				elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim';
409
-				elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao';
507
+            			if (isset($globalAirlinesSource) && $globalAirlinesSource != '') {
508
+            				$fromsource = $globalAirlinesSource;
509
+            			} elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') {
510
+            				$fromsource = 'vatsim';
511
+            			} elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') {
512
+					$fromsource = 'ivao';
513
+				} elseif (isset($globalVATSIM) && $globalVATSIM) {
514
+					$fromsource = 'vatsim';
515
+				} elseif (isset($globalIVAO) && $globalIVAO) {
516
+					$fromsource = 'ivao';
517
+				}
410 518
             			$result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource);
411
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
519
+				if ($globalDebug && $result != 'success') {
520
+					echo '!!! ERROR : '.$result."\n";
521
+				}
412 522
 				$Spotter->db = null;
413
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
523
+				if ($globalDebugTimeElapsed) {
524
+					echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
525
+				}
414 526
 			    }
415 527
 			}
416
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
528
+		    } else {
529
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident'])));
530
+		    }
417 531
 		    
418 532
 /*
419 533
 		    if (!isset($line['id'])) {
@@ -423,7 +537,9 @@  discard block
 block discarded – undo
423 537
 		        else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
424 538
 		     } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
425 539
   */
426
-		    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']));
540
+		    if (!isset($this->all_flights[$id]['id'])) {
541
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
542
+		    }
427 543
 
428 544
 		    //$putinarchive = true;
429 545
 		    if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) {
@@ -441,7 +557,9 @@  discard block
 block discarded – undo
441 557
 				$line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']);
442 558
 				$line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']);
443 559
 		    		$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' => ''));
444
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
560
+				if ($globalDebugTimeElapsed) {
561
+					echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
562
+				}
445 563
                         }
446 564
 		    } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') {
447 565
 			$timeelapsed = microtime(true);
@@ -455,7 +573,9 @@  discard block
 block discarded – undo
455 573
 				$Translation->db = null;
456 574
 			    }
457 575
 			    $Spotter->db = null;
458
-			    if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
576
+			    if ($globalDebugTimeElapsed) {
577
+			    	echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
578
+			    }
459 579
                     	}
460 580
 			if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) {
461 581
 			    //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) {
@@ -464,9 +584,13 @@  discard block
 block discarded – undo
464 584
 		    		$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']));
465 585
 		    	    }
466 586
 			}
467
-			if (!isset($globalFork)) $globalFork = TRUE;
587
+			if (!isset($globalFork)) {
588
+				$globalFork = TRUE;
589
+			}
468 590
 			if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) {
469
-				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident']));
591
+				if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) {
592
+					$this->get_Schedule($id,trim($line['ident']));
593
+				}
470 594
 			}
471 595
 		    }
472 596
 		}
@@ -484,9 +608,13 @@  discard block
 block discarded – undo
484 608
 			$speed = $speed*3.6;
485 609
 			if ($speed < 1000) {
486 610
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed)));
487
-	  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
611
+	  			if ($globalDebug) {
612
+	  				echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
613
+	  			}
488 614
 	  		} else {
489
-	  			if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
615
+	  			if ($globalDebug) {
616
+	  				echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n";
617
+	  			}
490 618
 	  		}
491 619
 		    }
492 620
 		}
@@ -495,13 +623,21 @@  discard block
 block discarded – undo
495 623
 
496 624
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
497 625
 	    	    if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) {
498
-	    	    	if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
626
+	    	    	if ($globalDebug) {
627
+	    	    		echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n";
628
+	    	    	}
499 629
 	    	    	return false;
500 630
 	    	    }
501
-	    	    if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
502
-	    	    else unset($timediff);
503
-	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
504
-	    	    else unset($timediff_archive);
631
+	    	    if (isset($this->all_flights[$id]['time_last_coord'])) {
632
+	    	    	$timediff = round(time()-$this->all_flights[$id]['time_last_coord']);
633
+	    	    } else {
634
+	    	    	unset($timediff);
635
+	    	    }
636
+	    	    if (isset($this->all_flights[$id]['time_last_archive_coord'])) {
637
+	    	    	$timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']);
638
+	    	    } else {
639
+	    	    	unset($timediff_archive);
640
+	    	    }
505 641
 	    	    if ($this->tmd > 5
506 642
 	    	        || (isset($line['format_source']) 
507 643
 	    	    	    && $line['format_source'] == 'airwhere' 
@@ -537,16 +673,25 @@  discard block
 block discarded – undo
537 673
 				$this->all_flights[$id]['putinarchive'] = true;
538 674
 				$this->tmd = 0;
539 675
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
540
-				    if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
676
+				    if ($globalDebug) {
677
+				    	echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
678
+				    }
541 679
 				    $timeelapsed = microtime(true);
542 680
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
543 681
 					$Spotter = new Spotter($this->db);
544 682
 					$all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
545
-					if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2'];
546
-					else $this->all_flights[$id]['over_country'] = '';
683
+					if (!empty($all_country)) {
684
+						$this->all_flights[$id]['over_country'] = $all_country['iso2'];
685
+					} else {
686
+						$this->all_flights[$id]['over_country'] = '';
687
+					}
547 688
 					$Spotter->db = null;
548
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
549
-					if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
689
+					if ($globalDebugTimeElapsed) {
690
+						echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
691
+					}
692
+					if ($globalDebug) {
693
+						echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n";
694
+					}
550 695
 				    }
551 696
 				}
552 697
 				$this->all_flights[$id]['time_last_archive_coord'] = time();
@@ -592,7 +737,9 @@  discard block
 block discarded – undo
592 737
 			    */
593 738
 			}
594 739
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
595
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
740
+			    if ($line['longitude'] > 180) {
741
+			    	$line['longitude'] = $line['longitude'] - 360;
742
+			    }
596 743
 			    //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) {
597 744
 				if (!isset($this->all_flights[$id]['archive_longitude'])) {
598 745
 					$this->all_flights[$id]['archive_longitude'] = $line['longitude'];
@@ -629,7 +776,9 @@  discard block
 block discarded – undo
629 776
 		    }
630 777
 		}
631 778
 		if (isset($line['last_update']) && $line['last_update'] != '') {
632
-		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true;
779
+		    if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) {
780
+		    	$dataFound = true;
781
+		    }
633 782
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update']));
634 783
 		}
635 784
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
@@ -651,35 +800,53 @@  discard block
 block discarded – undo
651 800
 			// Here we force archive of flight because after ground it's a new one (or should be)
652 801
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
653 802
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
654
-			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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
655
-		        elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
656
-			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']));
803
+			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' || $line['format_source'] === 'famaprs')) {
804
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
805
+			} elseif (isset($line['id'])) {
806
+		        	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
807
+		        } elseif (isset($this->all_flights[$id]['ident'])) {
808
+				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
809
+			}
810
+		    }
811
+		    if ($line['ground'] != 1) {
812
+		    	$line['ground'] = 0;
657 813
 		    }
658
-		    if ($line['ground'] != 1) $line['ground'] = 0;
659 814
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground']));
660 815
 		    //$dataFound = true;
661 816
 		}
662 817
 		if (isset($line['squawk']) && $line['squawk'] != '') {
663 818
 		    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'])) {
664
-			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true;
819
+			    if ($this->all_flights[$id]['squawk'] != $line['squawk']) {
820
+			    	$this->all_flights[$id]['putinarchive'] = true;
821
+			    }
665 822
 			    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
666 823
 			    $highlight = '';
667
-			    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
668
-			    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
669
-			    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
824
+			    if ($this->all_flights[$id]['squawk'] == '7500') {
825
+			    	$highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC';
826
+			    }
827
+			    if ($this->all_flights[$id]['squawk'] == '7600') {
828
+			    	$highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC';
829
+			    }
830
+			    if ($this->all_flights[$id]['squawk'] == '7700') {
831
+			    	$highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC';
832
+			    }
670 833
 			    if ($highlight != '') {
671 834
 				$timeelapsed = microtime(true);
672 835
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
673 836
 				    $Spotter = new Spotter($this->db);
674 837
 				    $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight);
675 838
 				    $Spotter->db = null;
676
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
839
+				    if ($globalDebugTimeElapsed) {
840
+				    	echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
841
+				    }
677 842
 				}
678 843
 				//$putinarchive = true;
679 844
 				//$highlight = '';
680 845
 			    }
681 846
 			    
682
-		    } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
847
+		    } else {
848
+		    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk']));
849
+		    }
683 850
 		    //$dataFound = true;
684 851
 		}
685 852
 
@@ -692,19 +859,27 @@  discard block
 block discarded – undo
692 859
 				}
693 860
 			}
694 861
 		    //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
695
-			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;
862
+			if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) {
863
+				$this->all_flights[$id]['putinarchive'] = true;
864
+			}
696 865
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100)));
697 866
 			$this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude']));
698 867
 			//$dataFound = true;
699 868
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
700 869
 		    if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) {
701 870
 			if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) {
702
-				if ($globalDebug) echo '--- Reset because of altitude'."\n";
871
+				if ($globalDebug) {
872
+					echo '--- Reset because of altitude'."\n";
873
+				}
703 874
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0));
704 875
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1));
705
-				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' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
706
-				elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
707
-				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']));
876
+				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' || $line['format_source'] === 'famaprs')) {
877
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi')));
878
+				} elseif (isset($line['id'])) {
879
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id']));
880
+				} elseif (isset($this->all_flights[$id]['ident'])) {
881
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident']));
882
+				}
708 883
 			}
709 884
 		    }
710 885
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude']));
@@ -715,22 +890,32 @@  discard block
 block discarded – undo
715 890
 		}
716 891
 		
717 892
 		if (isset($line['heading']) && $line['heading'] != '') {
718
-		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true;
893
+		    if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) {
894
+		    	$this->all_flights[$id]['putinarchive'] = true;
895
+		    }
719 896
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading'])));
720 897
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true));
721 898
 		    //$dataFound = true;
722 899
   		} 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']) {
723 900
   		    $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']);
724 901
 		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading)));
725
-		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true;
726
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n";
902
+		    if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) {
903
+		    	$this->all_flights[$id]['putinarchive'] = true;
904
+		    }
905
+  		    if ($globalDebug) {
906
+  		    	echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n";
907
+  		    }
727 908
   		} elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') {
728 909
   		    // If not enough messages and ACARS set heading to 0
729 910
   		    $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0));
730 911
   		}
731
-		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
732
-		elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false;
733
-		elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinupdate) $dataFound = false;
912
+		if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) {
913
+			$dataFound = false;
914
+		} elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) {
915
+			$dataFound = false;
916
+		} elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalAircraftMinupdate) {
917
+			$dataFound = false;
918
+		}
734 919
 
735 920
 //		print_r($this->all_flights[$id]);
736 921
 		//gets the callsign from the last hour
@@ -747,23 +932,38 @@  discard block
 block discarded – undo
747 932
 			    //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']);
748 933
 			    if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) {
749 934
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
750
-				    if ($globalDebug) echo "Check if aircraft is already in DB...";
935
+				    if ($globalDebug) {
936
+				    	echo "Check if aircraft is already in DB...";
937
+				    }
751 938
 				    $timeelapsed = microtime(true);
752 939
 				    $SpotterLive = new SpotterLive($this->db);
753 940
 				    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' || $line['format_source'] === 'famaprs')) {
754 941
 					$recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']);
755
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
942
+					if ($globalDebugTimeElapsed) {
943
+						echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
944
+					}
756 945
 				    } elseif (isset($line['id'])) {
757 946
 					$recent_ident = $SpotterLive->checkIdRecent($line['id']);
758
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
947
+					if ($globalDebugTimeElapsed) {
948
+						echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
949
+					}
759 950
 				    } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') {
760 951
 					$recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']);
761
-					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
762
-				    } else $recent_ident = '';
952
+					if ($globalDebugTimeElapsed) {
953
+						echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
954
+					}
955
+				    } else {
956
+				    	$recent_ident = '';
957
+				    }
763 958
 				    $SpotterLive->db=null;
764
-				    if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
765
-				    elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
766
-				} else $recent_ident = '';
959
+				    if ($globalDebug && $recent_ident == '') {
960
+				    	echo " Not in DB.\n";
961
+				    } elseif ($globalDebug && $recent_ident != '') {
962
+				    	echo " Already in DB.\n";
963
+				    }
964
+				} else {
965
+					$recent_ident = '';
966
+				}
767 967
 			    } else {
768 968
 				$recent_ident = '';
769 969
 				$this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0));
@@ -771,7 +971,9 @@  discard block
 block discarded – undo
771 971
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
772 972
 			    if($recent_ident == "")
773 973
 			    {
774
-				if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
974
+				if ($globalDebug) {
975
+					echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : ";
976
+				}
775 977
 				if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; }
776 978
 				if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; }
777 979
 				//adds the spotter data for the archive
@@ -815,31 +1017,49 @@  discard block
 block discarded – undo
815 1017
 				
816 1018
 				if (!$ignoreImport) {
817 1019
 				    $highlight = '';
818
-				    if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack';
819
-				    if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)';
820
-				    if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency';
821
-				    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')));
1020
+				    if ($this->all_flights[$id]['squawk'] == '7500') {
1021
+				    	$highlight = 'Squawk 7500 : Hijack';
1022
+				    }
1023
+				    if ($this->all_flights[$id]['squawk'] == '7600') {
1024
+				    	$highlight = 'Squawk 7600 : Lost Comm (radio failure)';
1025
+				    }
1026
+				    if ($this->all_flights[$id]['squawk'] == '7700') {
1027
+				    	$highlight = 'Squawk 7700 : Emergency';
1028
+				    }
1029
+				    if (!isset($this->all_flights[$id]['id'])) {
1030
+				    	$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
1031
+				    }
822 1032
 				    $timeelapsed = microtime(true);
823 1033
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
824 1034
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
825 1035
 					    $Spotter = new Spotter($this->db);
826 1036
 					    $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']);
827 1037
 					    $Spotter->db = null;
828
-					    if ($globalDebug && isset($result)) echo $result."\n";
1038
+					    if ($globalDebug && isset($result)) {
1039
+					    	echo $result."\n";
1040
+					    }
829 1041
 					}
830 1042
 				    }
831
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
1043
+				    if ($globalDebugTimeElapsed) {
1044
+				    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
1045
+				    }
832 1046
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
833 1047
 
834 1048
 				    // Add source stat in DB
835 1049
 				    $Stats = new Stats($this->db);
836 1050
 				    if (!empty($this->stats)) {
837
-					if ($globalDebug) echo 'Add source stats : ';
1051
+					if ($globalDebug) {
1052
+						echo 'Add source stats : ';
1053
+					}
838 1054
 				        foreach($this->stats as $date => $data) {
839 1055
 					    foreach($data as $source => $sourced) {
840 1056
 					        //print_r($sourced);
841
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
842
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
1057
+				    	        if (isset($sourced['polar'])) {
1058
+				    	        	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date);
1059
+				    	        }
1060
+				    	        if (isset($sourced['hist'])) {
1061
+				    	        	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date);
1062
+				    	        }
843 1063
 				    		if (isset($sourced['msg'])) {
844 1064
 				    		    if (time() - $sourced['msg']['date'] > 10) {
845 1065
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -852,13 +1072,17 @@  discard block
 block discarded – undo
852 1072
 			    			unset($this->stats[$date]);
853 1073
 			    		    }
854 1074
 				    	}
855
-				    	if ($globalDebug) echo 'Done'."\n";
1075
+				    	if ($globalDebug) {
1076
+				    		echo 'Done'."\n";
1077
+				    	}
856 1078
 
857 1079
 				    }
858 1080
 				    $Stats->db = null;
859 1081
 				    }
860 1082
 				    $this->del();
861
-				} elseif ($globalDebug) echo 'Ignore data'."\n";
1083
+				} elseif ($globalDebug) {
1084
+					echo 'Ignore data'."\n";
1085
+				}
862 1086
 				//$ignoreImport = false;
863 1087
 				$this->all_flights[$id]['addedSpotter'] = 1;
864 1088
 				//print_r($this->all_flights[$id]);
@@ -875,7 +1099,9 @@  discard block
 block discarded – undo
875 1099
 			*/
876 1100
 			//SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']);
877 1101
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
878
-				    if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours...";
1102
+				    if ($globalDebug) {
1103
+				    	echo "---- Deleting Live Spotter data older than 9 hours...";
1104
+				    }
879 1105
 				    //SpotterLive->deleteLiveSpotterDataNotUpdated();
880 1106
 				    if (!isset($globalNoImport) || $globalNoImport === FALSE) {
881 1107
 					if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
@@ -884,7 +1110,9 @@  discard block
 block discarded – undo
884 1110
 					    $SpotterLive->db=null;
885 1111
 					}
886 1112
 				    }
887
-				    if ($globalDebug) echo " Done\n";
1113
+				    if ($globalDebug) {
1114
+				    	echo " Done\n";
1115
+				    }
888 1116
 				    $this->last_delete = time();
889 1117
 				}
890 1118
 			    } else {
@@ -911,11 +1139,17 @@  discard block
 block discarded – undo
911 1139
 		    //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";
912 1140
 		    if ($globalDebug) {
913 1141
 			if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) {
914
-				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";
915
-				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";
1142
+				if (isset($this->all_flights[$id]['source_name'])) {
1143
+					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";
1144
+				} else {
1145
+					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";
1146
+				}
916 1147
 			} else {
917
-				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";
918
-				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";
1148
+				if (isset($this->all_flights[$id]['source_name'])) {
1149
+					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";
1150
+				} else {
1151
+					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";
1152
+				}
919 1153
 			}
920 1154
 		    }
921 1155
 		    $ignoreImport = false;
@@ -961,22 +1195,30 @@  discard block
 block discarded – undo
961 1195
 
962 1196
 		    if (!$ignoreImport) {
963 1197
 			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'])) {
964
-				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')));
1198
+				if (!isset($this->all_flights[$id]['id'])) {
1199
+					$this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi')));
1200
+				}
965 1201
 				$timeelapsed = microtime(true);
966 1202
 				if (!isset($globalNoImport) || $globalNoImport === FALSE) {
967 1203
 				    if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
968
-					if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
1204
+					if ($globalDebug) {
1205
+						echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : ";
1206
+					}
969 1207
 					$SpotterLive = new SpotterLive($this->db);
970 1208
 					$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']);
971 1209
 					$SpotterLive->db = null;
972
-					if ($globalDebug) echo $result."\n";
1210
+					if ($globalDebug) {
1211
+						echo $result."\n";
1212
+					}
973 1213
 				    }
974 1214
 				}
975 1215
 				if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) {
976 1216
 					$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']);
977 1217
 				}
978 1218
 				$this->all_flights[$id]['putinarchive'] = false;
979
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
1219
+				if ($globalDebugTimeElapsed) {
1220
+					echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
1221
+				}
980 1222
 
981 1223
 				// Put statistics in $this->stats variable
982 1224
 				//if ($line['format_source'] != 'aprs') {
@@ -984,7 +1226,9 @@  discard block
 block discarded – undo
984 1226
 				if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
985 1227
 				    if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') {
986 1228
 					$source = $this->all_flights[$id]['source_name'];
987
-					if ($source == '') $source = $this->all_flights[$id]['format_source'];
1229
+					if ($source == '') {
1230
+						$source = $this->all_flights[$id]['format_source'];
1231
+					}
988 1232
 					if (!isset($this->source_location[$source])) {
989 1233
 						$Location = new Source($this->db);
990 1234
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -1005,7 +1249,9 @@  discard block
 block discarded – undo
1005 1249
 					$stats_heading = round($stats_heading/22.5);
1006 1250
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']);
1007 1251
 					$current_date = date('Y-m-d');
1008
-					if ($stats_heading == 16) $stats_heading = 0;
1252
+					if ($stats_heading == 16) {
1253
+						$stats_heading = 0;
1254
+					}
1009 1255
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
1010 1256
 						for ($i=0;$i<=15;$i++) {
1011 1257
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -1023,7 +1269,9 @@  discard block
 block discarded – undo
1023 1269
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
1024 1270
 						    end($this->stats[$current_date][$source]['hist']);
1025 1271
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
1026
-						} else $mini = 0;
1272
+						} else {
1273
+							$mini = 0;
1274
+						}
1027 1275
 						for ($i=$mini;$i<=$distance;$i+=10) {
1028 1276
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
1029 1277
 						}
@@ -1035,19 +1283,27 @@  discard block
 block discarded – undo
1035 1283
 				}
1036 1284
 
1037 1285
 				$this->all_flights[$id]['lastupdate'] = time();
1038
-				if ($this->all_flights[$id]['putinarchive']) $send = true;
1286
+				if ($this->all_flights[$id]['putinarchive']) {
1287
+					$send = true;
1288
+				}
1039 1289
 				//if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1040
-			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1290
+			} elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
1291
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
1292
+			}
1041 1293
 			//$this->del();
1042 1294
 			
1043 1295
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
1044 1296
 			    if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) {
1045
-				if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour...";
1297
+				if ($globalDebug) {
1298
+					echo "---- Deleting Live Spotter data Not updated since 2 hour...";
1299
+				}
1046 1300
 				$SpotterLive = new SpotterLive($this->db);
1047 1301
 				$SpotterLive->deleteLiveSpotterDataNotUpdated();
1048 1302
 				$SpotterLive->db = null;
1049 1303
 				//SpotterLive->deleteLiveSpotterData();
1050
-				if ($globalDebug) echo " Done\n";
1304
+				if ($globalDebug) {
1305
+					echo " Done\n";
1306
+				}
1051 1307
 				$this->last_delete_hourly = time();
1052 1308
 			    } else {
1053 1309
 				$this->del();
@@ -1059,7 +1315,9 @@  discard block
 block discarded – undo
1059 1315
 		    //$ignoreImport = false;
1060 1316
 		}
1061 1317
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
1062
-		if ($send) return $this->all_flights[$id];
1318
+		if ($send) {
1319
+			return $this->all_flights[$id];
1320
+		}
1063 1321
 	    }
1064 1322
 	}
1065 1323
     }
Please login to merge, or discard this patch.
require/class.TrackerArchive.php 1 patch
Braces   +37 added lines, -13 removed lines patch added patch discarded remove patch
@@ -6,7 +6,9 @@  discard block
 block discarded – undo
6 6
 	public function __construct($dbc = null) {
7 7
 		$Connection = new Connection($dbc);
8 8
 		$this->db = $Connection->db;
9
-		if ($this->db === null) die('Error: No DB connection. (TrackerArchive)');
9
+		if ($this->db === null) {
10
+			die('Error: No DB connection. (TrackerArchive)');
11
+		}
10 12
 	}
11 13
 
12 14
 	/**
@@ -27,7 +29,9 @@  discard block
 block discarded – undo
27 29
 		if (isset($filter[0]['source'])) {
28 30
 			$filters = array_merge($filters,$filter);
29 31
 		}
30
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
32
+		if (is_array($globalFilter)) {
33
+			$filter = array_merge($filter,$globalFilter);
34
+		}
31 35
 		$filter_query_join = '';
32 36
 		$filter_query_where = '';
33 37
 		foreach($filters as $flt) {
@@ -73,8 +77,11 @@  discard block
 block discarded – undo
73 77
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
74 78
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
75 79
 		}
76
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
77
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
80
+		if ($filter_query_where == '' && $where) {
81
+			$filter_query_where = ' WHERE';
82
+		} elseif ($filter_query_where != '' && $and) {
83
+			$filter_query_where .= ' AND';
84
+		}
78 85
 		if ($filter_query_where != '') {
79 86
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
80 87
 		}
@@ -88,9 +95,14 @@  discard block
 block discarded – undo
88 95
 		if ($over_country == '') {
89 96
 			$Tracker = new Tracker($this->db);
90 97
 			$data_country = $Tracker->getCountryFromLatitudeLongitude($latitude,$longitude);
91
-			if (!empty($data_country)) $country = $data_country['iso2'];
92
-			else $country = '';
93
-		} else $country = $over_country;
98
+			if (!empty($data_country)) {
99
+				$country = $data_country['iso2'];
100
+			} else {
101
+				$country = '';
102
+			}
103
+		} else {
104
+			$country = $over_country;
105
+		}
94 106
 		// Route is not added in tracker_archive
95 107
 		$query  = 'INSERT INTO tracker_archive (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, over_country, comment, type) 
96 108
 		    VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:comment,:type)';
@@ -592,7 +604,9 @@  discard block
 block discarded – undo
592 604
 		    $additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR ";
593 605
 		    $additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR ";
594 606
 		    $translate = $Translation->ident2icao($q_item);
595
-		    if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
607
+		    if ($translate != $q_item) {
608
+		    	$additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
609
+		    }
596 610
 		    $additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')";
597 611
 		    $additional_query .= ")";
598 612
 		}
@@ -810,7 +824,9 @@  discard block
 block discarded – undo
810 824
 		date_default_timezone_set($globalTimezone);
811 825
 		$datetime = new DateTime();
812 826
 		$offset = $datetime->format('P');
813
-	    } else $offset = '+00:00';
827
+	    } else {
828
+	    	$offset = '+00:00';
829
+	    }
814 830
 
815 831
 
816 832
 	    if ($date_array[1] != "")
@@ -1086,9 +1102,13 @@  discard block
 block discarded – undo
1086 1102
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1087 1103
 			}
1088 1104
 		}
1089
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
1105
+                if ($sincedate != '') {
1106
+                	$query .= "AND date > '".$sincedate."' ";
1107
+                }
1090 1108
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1091
-	if ($limit) $query .= " LIMIT 0,10";
1109
+	if ($limit) {
1110
+		$query .= " LIMIT 0,10";
1111
+	}
1092 1112
       
1093 1113
 	
1094 1114
 	$sth = $this->db->prepare($query);
@@ -1132,9 +1152,13 @@  discard block
 block discarded – undo
1132 1152
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1133 1153
 			}
1134 1154
 		}
1135
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
1155
+                if ($sincedate != '') {
1156
+                	$query .= "AND s.date > '".$sincedate."' ";
1157
+                }
1136 1158
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1137
-	if ($limit) $query .= " LIMIT 0,10";
1159
+	if ($limit) {
1160
+		$query .= " LIMIT 0,10";
1161
+	}
1138 1162
       
1139 1163
 	
1140 1164
 	$sth = $this->db->prepare($query);
Please login to merge, or discard this patch.
require/class.MarineArchive.php 1 patch
Braces   +37 added lines, -13 removed lines patch added patch discarded remove patch
@@ -6,7 +6,9 @@  discard block
 block discarded – undo
6 6
 	public function __construct($dbc = null) {
7 7
 		$Connection = new Connection($dbc);
8 8
 		$this->db = $Connection->db;
9
-		if ($this->db === null) die('Error: No DB connection. (MarineArchive)');
9
+		if ($this->db === null) {
10
+			die('Error: No DB connection. (MarineArchive)');
11
+		}
10 12
 	}
11 13
 
12 14
 	/**
@@ -27,7 +29,9 @@  discard block
 block discarded – undo
27 29
 		if (isset($filter[0]['source'])) {
28 30
 			$filters = array_merge($filters,$filter);
29 31
 		}
30
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
32
+		if (is_array($globalFilter)) {
33
+			$filter = array_merge($filter,$globalFilter);
34
+		}
31 35
 		$filter_query_join = '';
32 36
 		$filter_query_where = '';
33 37
 		foreach($filters as $flt) {
@@ -73,8 +77,11 @@  discard block
 block discarded – undo
73 77
 		if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
74 78
 			$filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
75 79
 		}
76
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
77
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
80
+		if ($filter_query_where == '' && $where) {
81
+			$filter_query_where = ' WHERE';
82
+		} elseif ($filter_query_where != '' && $and) {
83
+			$filter_query_where .= ' AND';
84
+		}
78 85
 		if ($filter_query_where != '') {
79 86
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
80 87
 		}
@@ -88,9 +95,14 @@  discard block
 block discarded – undo
88 95
 		if ($over_country == '') {
89 96
 			$Marine = new Marine($this->db);
90 97
 			$data_country = $Marine->getCountryFromLatitudeLongitude($latitude,$longitude);
91
-			if (!empty($data_country)) $country = $data_country['iso2'];
92
-			else $country = '';
93
-		} else $country = $over_country;
98
+			if (!empty($data_country)) {
99
+				$country = $data_country['iso2'];
100
+			} else {
101
+				$country = '';
102
+			}
103
+		} else {
104
+			$country = $over_country;
105
+		}
94 106
 		
95 107
 		//$country = $over_country;
96 108
 		// Route is not added in marine_archive
@@ -598,7 +610,9 @@  discard block
 block discarded – undo
598 610
 		    $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR ";
599 611
 		    $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR ";
600 612
 		    $translate = $Translation->ident2icao($q_item);
601
-		    if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
613
+		    if ($translate != $q_item) {
614
+		    	$additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
615
+		    }
602 616
 		    $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')";
603 617
 		    $additional_query .= ")";
604 618
 		}
@@ -816,7 +830,9 @@  discard block
 block discarded – undo
816 830
 		date_default_timezone_set($globalTimezone);
817 831
 		$datetime = new DateTime();
818 832
 		$offset = $datetime->format('P');
819
-	    } else $offset = '+00:00';
833
+	    } else {
834
+	    	$offset = '+00:00';
835
+	    }
820 836
 
821 837
 
822 838
 	    if ($date_array[1] != "")
@@ -1092,9 +1108,13 @@  discard block
 block discarded – undo
1092 1108
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1093 1109
 			}
1094 1110
 		}
1095
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
1111
+                if ($sincedate != '') {
1112
+                	$query .= "AND date > '".$sincedate."' ";
1113
+                }
1096 1114
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1097
-	if ($limit) $query .= " LIMIT 0,10";
1115
+	if ($limit) {
1116
+		$query .= " LIMIT 0,10";
1117
+	}
1098 1118
       
1099 1119
 	
1100 1120
 	$sth = $this->db->prepare($query);
@@ -1138,9 +1158,13 @@  discard block
 block discarded – undo
1138 1158
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1139 1159
 			}
1140 1160
 		}
1141
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
1161
+                if ($sincedate != '') {
1162
+                	$query .= "AND s.date > '".$sincedate."' ";
1163
+                }
1142 1164
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1143
-	if ($limit) $query .= " LIMIT 0,10";
1165
+	if ($limit) {
1166
+		$query .= " LIMIT 0,10";
1167
+	}
1144 1168
       
1145 1169
 	
1146 1170
 	$sth = $this->db->prepare($query);
Please login to merge, or discard this patch.
require/class.ATC.php 1 patch
Braces   +20 added lines, -7 removed lines patch added patch discarded remove patch
@@ -7,7 +7,9 @@  discard block
 block discarded – undo
7 7
 	public function __construct($dbc = null) {
8 8
 		$Connection = new Connection($dbc);
9 9
 		$this->db = $Connection->db;
10
-		if ($this->db === null) die('Error: No DB connection. (ATC)');
10
+		if ($this->db === null) {
11
+			die('Error: No DB connection. (ATC)');
12
+		}
11 13
 	}
12 14
 
13 15
 	/**
@@ -20,20 +22,27 @@  discard block
 block discarded – undo
20 22
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
21 23
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
22 24
 				foreach($globalStatsFilters[$globalFilterName] as $source) {
23
-					if (isset($source['source'])) $filter['source'][] = $source['source'];
25
+					if (isset($source['source'])) {
26
+						$filter['source'][] = $source['source'];
27
+					}
24 28
 				}
25 29
 			} else {
26 30
 				$filter = $globalStatsFilters[$globalFilterName];
27 31
 			}
28 32
 		}
29
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
33
+		if (is_array($globalFilter)) {
34
+			$filter = array_merge($filter,$globalFilter);
35
+		}
30 36
 		$filter_query_join = '';
31 37
 		$filter_query_where = '';
32 38
 		if (isset($filter['source']) && !empty($filter['source'])) {
33 39
 			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
34 40
 		}
35
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
36
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
41
+		if ($filter_query_where == '' && $where) {
42
+			$filter_query_where = ' WHERE';
43
+		} elseif ($filter_query_where != '' && $and) {
44
+			$filter_query_where .= ' AND';
45
+		}
37 46
 		$filter_query = $filter_query_join.$filter_query_where;
38 47
 		return $filter_query;
39 48
 	}
@@ -90,7 +99,9 @@  discard block
 block discarded – undo
90 99
 		$info = str_replace('^','<br />',$info);
91 100
 		$info = str_replace('&amp;sect;','',$info);
92 101
 		$info = str_replace('"','',$info);
93
-		if ($type == '') $type = NULL;
102
+		if ($type == '') {
103
+			$type = NULL;
104
+		}
94 105
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
95 106
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
96 107
 		try {
@@ -106,7 +117,9 @@  discard block
 block discarded – undo
106 117
 		$info = str_replace('^','<br />',$info);
107 118
 		$info = str_replace('&amp;sect;','',$info);
108 119
 		$info = str_replace('"','',$info);
109
-		if ($type == '') $type = NULL;
120
+		if ($type == '') {
121
+			$type = NULL;
122
+		}
110 123
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
111 124
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
112 125
 		try {
Please login to merge, or discard this patch.