View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( db2756...3d0574 )
by Yannick
29:36
created
Status
Category
Toggle Patches
require/class.Stats.php 1 patch
Spacing   +643 added lines, -643 removed lines patch added patch discarded remove patch 
@@ -21,14 +21,14 @@  discard block
 
 block discarded – undo
21 21 
 		if ($this->db === null) die('Error: No DB connection. (Stats)');
22 22 
 	}
23 23
24 
-	public function addLastStatsUpdate($type,$stats_date) {
24 
+	public function addLastStatsUpdate($type, $stats_date) {
25 25 
 		$query = "DELETE FROM config WHERE name = :type;
26 26 
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
27 
-		$query_values = array('type' => $type,':stats_date' => $stats_date);
27 
+		$query_values = array('type' => $type, ':stats_date' => $stats_date);
28 28 
 		try {
29 29 
 			$sth = $this->db->prepare($query);
30 30 
 			$sth->execute($query_values);
31 
-		} catch(PDOException $e) {
31 
+		} catch (PDOException $e) {
32 32 
 			return "error : ".$e->getMessage();
33 33 
 		}
34 34 
 	}
 
@@ -38,7 +38,7 @@  discard block
 
 block discarded – undo
38 38 
 		try {
39 39 
 			$sth = $this->db->prepare($query);
40 40 
 			$sth->execute(array(':type' => $type));
41 
-		} catch(PDOException $e) {
41 
+		} catch (PDOException $e) {
42 42 
 			echo "error : ".$e->getMessage();
43 43 
 		}
44 44 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -59,7 +59,7 @@  discard block
 
 block discarded – undo
59 59 
 		try {
60 60 
 			$sth = $this->db->prepare($query);
61 61 
 			$sth->execute(array(':filter_name' => $filter_name));
62 
-		} catch(PDOException $e) {
62 
+		} catch (PDOException $e) {
63 63 
 			return "error : ".$e->getMessage();
64 64 
 		}
65 65 
 	}
 
@@ -72,14 +72,14 @@  discard block
 
 block discarded – undo
72 72 
 		try {
73 73 
 			$sth = $this->db->prepare($query);
74 74 
 			$sth->execute();
75 
-		} catch(PDOException $e) {
75 
+		} catch (PDOException $e) {
76 76 
 			return "error : ".$e->getMessage();
77 77 
 		}
78 78 
 		$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;";
79 79 
 		try {
80 80 
 			$sth = $this->db->prepare($query);
81 81 
 			$sth->execute(array(':filter_name' => $filter_name));
82 
-		} catch(PDOException $e) {
82 
+		} catch (PDOException $e) {
83 83 
 			return "error : ".$e->getMessage();
84 84 
 		}
85 85 
 	}
 
@@ -91,77 +91,77 @@  discard block
 
 block discarded – undo
91 91 
 		 try {
92 92 
 			$sth = $this->db->prepare($query);
93 93 
 			$sth->execute(array(':filter_name' => $filter_name));
94 
-		} catch(PDOException $e) {
94 
+		} catch (PDOException $e) {
95 95 
 			echo "error : ".$e->getMessage();
96 96 
 		}
97 97 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
98 98 
 		if (empty($all)) {
99 99 
 			$filters = array();
100 100 
 			if ($filter_name != '') {
101 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
101 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
102 102 
 			}
103 103 
 			$Spotter = new Spotter($this->db);
104 
-			$all = $Spotter->getAllAirlineNames('',NULL,$filters);
104 
+			$all = $Spotter->getAllAirlineNames('', NULL, $filters);
105 105 
 		}
106 106 
 		return $all;
107 107 
 	}
108 
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
108 
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
109 109 
 		if ($filter_name == '') $filter_name = $this->filter_name;
110 110 
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
111 111 
 		try {
112 112 
 			$sth = $this->db->prepare($query);
113 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
114 
-		} catch(PDOException $e) {
113 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
114 
+		} catch (PDOException $e) {
115 115 
 			echo "error : ".$e->getMessage();
116 116 
 		}
117 117 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
118 118 
 		return $all;
119 119 
 	}
120 
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
120 
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
121 121 
 		if ($filter_name == '') $filter_name = $this->filter_name;
122 122 
 		$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";
123 123 
 		try {
124 124 
 			$sth = $this->db->prepare($query);
125 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
126 
-		} catch(PDOException $e) {
125 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
126 
+		} catch (PDOException $e) {
127 127 
 			echo "error : ".$e->getMessage();
128 128 
 		}
129 129 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
130 130 
 		return $all;
131 131 
 	}
132 
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
132 
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
133 133 
 		if ($filter_name == '') $filter_name = $this->filter_name;
134 134 
 		$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";
135 135 
 		try {
136 136 
 			$sth = $this->db->prepare($query);
137 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
138 
-		} catch(PDOException $e) {
137 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
138 
+		} catch (PDOException $e) {
139 139 
 			echo "error : ".$e->getMessage();
140 140 
 		}
141 141 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
142 142 
 		return $all;
143 143 
 	}
144 144
145 
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
145 
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
146 146 
 		if ($filter_name == '') $filter_name = $this->filter_name;
147 147 
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
148 148 
 		try {
149 149 
 			$sth = $this->db->prepare($query);
150 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
151 
-		} catch(PDOException $e) {
150 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
151 
+		} catch (PDOException $e) {
152 152 
 			echo "error : ".$e->getMessage();
153 153 
 		}
154 154 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
155 155 
 		return $all;
156 156 
 	}
157 157
158 
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
158 
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
159 159 
 		if ($filter_name == '') $filter_name = $this->filter_name;
160 160 
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
161 161 
 		try {
162 162 
 			$sth = $this->db->prepare($query);
163 
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
164 
-		} catch(PDOException $e) {
163 
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
164 
+		} catch (PDOException $e) {
165 165 
 			echo "error : ".$e->getMessage();
166 166 
 		}
167 167 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -169,23 +169,23 @@  discard block
 
 block discarded – undo
169 169 
 	}
170 170
171 171
172 
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
172 
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
173 173 
 		global $globalStatsFilters;
174 174 
 		if ($filter_name == '') $filter_name = $this->filter_name;
175 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
175 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
176 176 
 			$Spotter = new Spotter($this->db);
177 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
177 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
178 178 
 			$alliance_airlines = array();
179 179 
 			foreach ($airlines as $airline) {
180 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
180 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
181 181 
 			}
182 182 
 			if ($year == '' && $month == '') {
183 
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
184 
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
183 
+				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
184 
+				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> ''  AND aircraft_icao <> 'NA' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
185 185 
 				try {
186 186 
 					$sth = $this->db->prepare($query);
187 187 
 					$sth->execute(array(':filter_name' => $filter_name));
188 
-				} catch(PDOException $e) {
188 
+				} catch (PDOException $e) {
189 189 
 					echo "error : ".$e->getMessage();
190 190 
 				}
191 191 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -196,29 +196,29 @@  discard block
 
 block discarded – undo
196 196 
 				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND aircraft_icao <> 'NA' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
197 197 
 				try {
198 198 
 					$sth = $this->db->prepare($query);
199 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
200 
-				} catch(PDOException $e) {
199 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
200 
+				} catch (PDOException $e) {
201 201 
 					echo "error : ".$e->getMessage();
202 202 
 				}
203 203 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
204 204 
 			} else $all = array();
205 205 
 		}
206 206 
 		if (empty($all)) {
207 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
208 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
207 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
208 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
209 209 
 			} else {
210 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
210 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
211 211 
 			}
212 212 
 			if ($filter_name != '') {
213 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
213 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
214 214 
 			}
215 215 
 			$Spotter = new Spotter($this->db);
216 216 
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
217 
-			$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
217 
+			$all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
218 218 
 		}
219 219 
 		return $all;
220 220 
 	}
221 
-	public function countAllMarineTypes($limit = true, $filter_name = '',$year = '', $month = '') {
221 
+	public function countAllMarineTypes($limit = true, $filter_name = '', $year = '', $month = '') {
222 222 
 		global $globalStatsFilters;
223 223 
 		if ($filter_name == '') $filter_name = $this->filter_name;
224 224 
 		if ($year == '' && $month == '') {
 
@@ -227,23 +227,23 @@  discard block
 
 block discarded – undo
227 227 
 			try {
228 228 
 				$sth = $this->db->prepare($query);
229 229 
 				$sth->execute(array(':filter_name' => $filter_name));
230 
-			} catch(PDOException $e) {
230 
+			} catch (PDOException $e) {
231 231 
 				echo "error : ".$e->getMessage();
232 232 
 			}
233 233 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
234 234 
 		} else $all = array();
235 235 
 		if (empty($all)) {
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 
 			$Marine = new Marine($this->db);
241 241 
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
242 
-			$all = $Marine->countAllMarineTypes($limit,0,'',$filters);
242 
+			$all = $Marine->countAllMarineTypes($limit, 0, '', $filters);
243 243 
 		}
244 244 
 		return $all;
245 245 
 	}
246 
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
246 
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
247 247 
 		global $globalStatsFilters;
248 248 
 		if ($filter_name == '') $filter_name = $this->filter_name;
249 249 
 		if ($year == '' && $month == '') {
 
@@ -252,7 +252,7 @@  discard block
 
 block discarded – undo
252 252 
 			try {
253 253 
 				$sth = $this->db->prepare($query);
254 254 
 				$sth->execute(array(':filter_name' => $filter_name));
255 
-			} catch(PDOException $e) {
255 
+			} catch (PDOException $e) {
256 256 
 				echo "error : ".$e->getMessage();
257 257 
 			}
258 258 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -260,32 +260,32 @@  discard block
 
 block discarded – undo
260 260 
 		if (empty($all)) {
261 261 
 			$Spotter = new Spotter($this->db);
262 262 
 			$filters = array();
263 
-			$filters = array('year' => $year,'month' => $month);
263 
+			$filters = array('year' => $year, 'month' => $month);
264 264 
 			if ($filter_name != '') {
265 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
265 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
266 266 
 			}
267 267 
 			//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
268 
-			$all = $Spotter->countAllAirlineCountries($limit,$filters);
268 
+			$all = $Spotter->countAllAirlineCountries($limit, $filters);
269 269 
 		}
270 270 
 		return $all;
271 271 
 	}
272 
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
272 
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
273 273 
 		global $globalStatsFilters;
274 274 
 		if ($filter_name == '') $filter_name = $this->filter_name;
275 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
275 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
276 276 
 			$Spotter = new Spotter($this->db);
277 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
277 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
278 278 
 			$alliance_airlines = array();
279 279 
 			foreach ($airlines as $airline) {
280 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
280 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
281 281 
 			}
282 282 
 			if ($year == '' && $month == '') {
283 
-				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";
284 
-				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";
283 
+				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";
284 
+				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";
285 285 
 				try {
286 286 
 					$sth = $this->db->prepare($query);
287 287 
 					$sth->execute(array(':filter_name' => $filter_name));
288 
-				} catch(PDOException $e) {
288 
+				} catch (PDOException $e) {
289 289 
 					echo "error : ".$e->getMessage();
290 290 
 				}
291 291 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -296,21 +296,21 @@  discard block
 
 block discarded – undo
296 296 
 				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";
297 297 
 				try {
298 298 
 					$sth = $this->db->prepare($query);
299 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
300 
-				} catch(PDOException $e) {
299 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
300 
+				} catch (PDOException $e) {
301 301 
 					echo "error : ".$e->getMessage();
302 302 
 				}
303 303 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
304 304 
 			} else $all = array();
305 305 
 		}
306 306 
 		if (empty($all)) {
307 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
308 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
307 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
308 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
309 309 
 			} else {
310 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
310 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
311 311 
 			}
312 312 
 			if ($filter_name != '') {
313 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
313 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
314 314 
 			}
315 315 
 			$Spotter = new Spotter($this->db);
316 316 
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
 
@@ -319,23 +319,23 @@  discard block
 
 block discarded – undo
319 319 
 		return $all;
320 320 
 	}
321 321
322 
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
322 
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
323 323 
 		global $globalStatsFilters;
324 324 
 		if ($filter_name == '') $filter_name = $this->filter_name;
325 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
325 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
326 326 
 			$Spotter = new Spotter($this->db);
327 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
327 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
328 328 
 			$alliance_airlines = array();
329 329 
 			foreach ($airlines as $airline) {
330 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
330 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
331 331 
 			}
332 332 
 			if ($year == '' && $month == '') {
333 
-				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";
334 
-				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";
333 
+				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";
334 
+				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";
335 335 
 				try {
336 336 
 					$sth = $this->db->prepare($query);
337 337 
 					$sth->execute(array(':filter_name' => $filter_name));
338 
-				} catch(PDOException $e) {
338 
+				} catch (PDOException $e) {
339 339 
 					echo "error : ".$e->getMessage();
340 340 
 				}
341 341 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -346,61 +346,61 @@  discard block
 
 block discarded – undo
346 346 
 				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";
347 347 
 				try {
348 348 
 					$sth = $this->db->prepare($query);
349 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
350 
-				} catch(PDOException $e) {
349 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
350 
+				} catch (PDOException $e) {
351 351 
 					echo "error : ".$e->getMessage();
352 352 
 				}
353 353 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
354 354 
 			} else $all = array();
355 355 
 		}
356 356 
 		if (empty($all)) {
357 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
358 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
357 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
358 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
359 359 
 			} else {
360 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
360 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
361 361 
 			}
362 362 
 			if ($filter_name != '') {
363 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
363 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
364 364 
 			}
365 365 
 			$Spotter = new Spotter($this->db);
366 366 
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
367 
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
367 
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
368 368 
 		}
369 369 
 		return $all;
370 370 
 	}
371 371 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
372 372 
 		global $globalStatsFilters;
373 373 
 		if ($filter_name == '') $filter_name = $this->filter_name;
374 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
374 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
375 375 
 			$Spotter = new Spotter($this->db);
376 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
376 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
377 377 
 			$alliance_airlines = array();
378 378 
 			foreach ($airlines as $airline) {
379 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
379 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
380 380 
 			}
381 
-			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";
382 
-			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";
381 
+			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";
382 
+			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";
383 383 
 			$query_values = array(':filter_name' => $filter_name);
384 384 
 		} else {
385 385 
 			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";
386 386 
 			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";
387 
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
387 
+			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
388 388 
 		}
389 389 
 		try {
390 390 
 			$sth = $this->db->prepare($query);
391 391 
 			$sth->execute($query_values);
392 
-		} catch(PDOException $e) {
392 
+		} catch (PDOException $e) {
393 393 
 			echo "error : ".$e->getMessage();
394 394 
 		}
395 395 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
396 396 
 		if (empty($all)) {
397 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
398 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
397 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
398 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
399 399 
 			} else {
400 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
400 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
401 401 
 			}
402 402 
 			if ($filter_name != '') {
403 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
403 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
404 404 
 			}
405 405 
 			$Spotter = new Spotter($this->db);
406 406 
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
 
@@ -409,7 +409,7 @@  discard block
 
 block discarded – undo
409 409 
 		return $all;
410 410 
 	}
411 411
412 
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
412 
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
413 413 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
414 414 
 		if ($filter_name == '') $filter_name = $this->filter_name;
415 415 
 		if ($year == '' && $month == '') {
 
@@ -418,7 +418,7 @@  discard block
 
 block discarded – undo
418 418 
 			if (isset($forsource)) {
419 419 
 				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";
420 420 
 				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";
421 
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
421 
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
422 422 
 			} else {
423 423 
 				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";
424 424 
 				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";
 
@@ -427,7 +427,7 @@  discard block
 
 block discarded – undo
427 427 
 			try {
428 428 
 				$sth = $this->db->prepare($query);
429 429 
 				$sth->execute($query_values);
430 
-			} catch(PDOException $e) {
430 
+			} catch (PDOException $e) {
431 431 
 				echo "error : ".$e->getMessage();
432 432 
 			}
433 433 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -435,32 +435,32 @@  discard block
 
 block discarded – undo
435 435 
                 if (empty($all)) {
436 436 
 	                $Spotter = new Spotter($this->db);
437 437 
             		$filters = array();
438 
-			$filters = array('year' => $year,'month' => $month);
438 
+			$filters = array('year' => $year, 'month' => $month);
439 439 
             		if ($filter_name != '') {
440 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
440 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
441 441 
 			}
442 442 
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
443 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
443 
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
444 444 
                 }
445 445 
                 return $all;
446 446 
 	}
447 
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
447 
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
448 448 
 		global $globalStatsFilters;
449 449 
 		if ($filter_name == '') $filter_name = $this->filter_name;
450 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
450 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
451 451 
 			$Spotter = new Spotter($this->db);
452 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
452 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
453 453 
 			$alliance_airlines = array();
454 454 
 			foreach ($airlines as $airline) {
455 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
455 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
456 456 
 			}
457 457 
 			if ($year == '' && $month == '') {
458 
-				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 registration_count DESC LIMIT 10 OFFSET 0";
459 
-				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 registration_count DESC";
458 
+				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 registration_count DESC LIMIT 10 OFFSET 0";
459 
+				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 registration_count DESC";
460 460 
 				try {
461 461 
 					$sth = $this->db->prepare($query);
462 462 
 					$sth->execute(array(':filter_name' => $filter_name));
463 
-				} catch(PDOException $e) {
463 
+				} catch (PDOException $e) {
464 464 
 					echo "error : ".$e->getMessage();
465 465 
 				}
466 466 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -471,45 +471,45 @@  discard block
 
 block discarded – undo
471 471 
 				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 registration_count DESC";
472 472 
 				try {
473 473 
 					$sth = $this->db->prepare($query);
474 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
475 
-				} catch(PDOException $e) {
474 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
475 
+				} catch (PDOException $e) {
476 476 
 					echo "error : ".$e->getMessage();
477 477 
 				}
478 478 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
479 479 
 			} else $all = array();
480 480 
 		}
481 481 
 		if (empty($all)) {
482 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
483 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
482 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
483 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
484 484 
 			} else {
485 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
485 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
486 486 
 			}
487 487 
 			if ($filter_name != '') {
488 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
488 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
489 489 
 			}
490 490 
 			$Spotter = new Spotter($this->db);
491 491 
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
492 
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
492 
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
493 493 
 		}
494 494 
 		return $all;
495 495 
 	}
496 
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
496 
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
497 497 
 		global $globalStatsFilters;
498 498 
 		if ($filter_name == '') $filter_name = $this->filter_name;
499 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
499 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
500 500 
 			$Spotter = new Spotter($this->db);
501 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
501 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
502 502 
 			$alliance_airlines = array();
503 503 
 			foreach ($airlines as $airline) {
504 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
504 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
505 505 
 			}
506 506 
 			if ($year == '' && $month == '') {
507 
-				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";
508 
-				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";
507 
+				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";
508 
+				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";
509 509 
 				 try {
510 510 
 					$sth = $this->db->prepare($query);
511 511 
 					$sth->execute(array(':filter_name' => $filter_name));
512 
-				} catch(PDOException $e) {
512 
+				} catch (PDOException $e) {
513 513 
 					echo "error : ".$e->getMessage();
514 514 
 				}
515 515 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -520,46 +520,46 @@  discard block
 
 block discarded – undo
520 520 
 				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";
521 521 
 				 try {
522 522 
 					$sth = $this->db->prepare($query);
523 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
524 
-				} catch(PDOException $e) {
523 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
524 
+				} catch (PDOException $e) {
525 525 
 					echo "error : ".$e->getMessage();
526 526 
 				}
527 527 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
528 528 
 			} else $all = array();
529 529 
 		}
530 530 
 		if (empty($all)) {
531 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
532 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
531 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
532 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
533 533 
 			} else {
534 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
534 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
535 535 
 			}
536 536 
 			if ($filter_name != '') {
537 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
537 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
538 538 
 			}
539 539 
 			$Spotter = new Spotter($this->db);
540 540 
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
541 
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
541 
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
542 542 
 		}
543 543 
 		return $all;
544 544 
 	}
545 
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
545 
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
546 546 
 		$Connection = new Connection($this->db);
547 547 
 		if ($filter_name == '') $filter_name = $this->filter_name;
548 548 
 		if ($Connection->tableExists('countries')) {
549 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
549 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
550 550 
 				$Spotter = new Spotter($this->db);
551 
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
551 
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
552 552 
 				if ($year == '' && $month == '') {
553 553 
 					$alliance_airlines = array();
554 554 
 					foreach ($airlines as $airline) {
555 
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
555 
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
556 556 
 					}
557 
-					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";
558 
-					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";
557 
+					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";
558 
+					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";
559 559 
 					 try {
560 560 
 						$sth = $this->db->prepare($query);
561 561 
 						$sth->execute(array(':filter_name' => $filter_name));
562 
-					} catch(PDOException $e) {
562 
+					} catch (PDOException $e) {
563 563 
 						echo "error : ".$e->getMessage();
564 564 
 					}
565 565 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -571,8 +571,8 @@  discard block
 
 block discarded – undo
571 571 
 					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";
572 572 
 					 try {
573 573 
 						$sth = $this->db->prepare($query);
574 
-						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
575 
-					} catch(PDOException $e) {
574 
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
575 
+					} catch (PDOException $e) {
576 576 
 						echo "error : ".$e->getMessage();
577 577 
 					}
578 578 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -583,7 +583,7 @@  discard block
 
 block discarded – undo
583 583 
 			return $Spotter->countAllFlightOverCountries($limit);
584 584 
 		} else return array();
585 585 
 	}
586 
-	public function countAllMarineOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
586 
+	public function countAllMarineOverCountries($limit = true, $filter_name = '', $year = '', $month = '') {
587 587 
 		$Connection = new Connection($this->db);
588 588 
 		if ($filter_name == '') $filter_name = $this->filter_name;
589 589 
 		if ($Connection->tableExists('countries')) {
 
@@ -594,7 +594,7 @@  discard block
 
 block discarded – undo
594 594 
 				 try {
595 595 
 					$sth = $this->db->prepare($query);
596 596 
 					$sth->execute(array(':filter_name' => $filter_name));
597 
-				} catch(PDOException $e) {
597 
+				} catch (PDOException $e) {
598 598 
 					echo "error : ".$e->getMessage();
599 599 
 				}
600 600 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -602,15 +602,15 @@  discard block
 
 block discarded – undo
602 602 
 			if (empty($all)) {
603 603 
 				$filters = array();
604 604 
 				if ($filter_name != '') {
605 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
605 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
606 606 
 				}
607 607 
 				$Marine = new Marine($this->db);
608 
-				$all = $Marine->countAllMarineOverCountries($limit,0,'',$filters);
608 
+				$all = $Marine->countAllMarineOverCountries($limit, 0, '', $filters);
609 609 
 			}
610 610 
 			return $all;
611 611 
 		} else return array();
612 612 
 	}
613 
-	public function countAllTrackerOverCountries($limit = true, $filter_name = '',$year = '',$month = '') {
613 
+	public function countAllTrackerOverCountries($limit = true, $filter_name = '', $year = '', $month = '') {
614 614 
 		global $globalStatsFilters;
615 615 
 		$Connection = new Connection($this->db);
616 616 
 		if ($filter_name == '') $filter_name = $this->filter_name;
 
@@ -622,7 +622,7 @@  discard block
 
 block discarded – undo
622 622 
 				 try {
623 623 
 					$sth = $this->db->prepare($query);
624 624 
 					$sth->execute(array(':filter_name' => $filter_name));
625 
-				} catch(PDOException $e) {
625 
+				} catch (PDOException $e) {
626 626 
 					echo "error : ".$e->getMessage();
627 627 
 				}
628 628 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -631,15 +631,15 @@  discard block
 
 block discarded – undo
631 631 
 			if (empty($all)) {
632 632 
 				$filters = array();
633 633 
 				if ($filter_name != '') {
634 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
634 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
635 635 
 				}
636 636 
 				$Tracker = new Tracker($this->db);
637 
-				$all = $Tracker->countAllTrackerOverCountries($limit,0,'',$filters);
637 
+				$all = $Tracker->countAllTrackerOverCountries($limit, 0, '', $filters);
638 638 
 			}
639 639 
 			return $all;
640 640 
 		} else return array();
641 641 
 	}
642 
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
642 
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
643 643 
 		global $globalStatsFilters;
644 644 
 		if ($filter_name == '') $filter_name = $this->filter_name;
645 645 
 		if ($year == '' && $month == '') {
 
@@ -647,41 +647,41 @@  discard block
 
 block discarded – undo
647 647 
 			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";
648 648 
 			try {
649 649 
 				$sth = $this->db->prepare($query);
650 
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
651 
-			} catch(PDOException $e) {
650 
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
651 
+			} catch (PDOException $e) {
652 652 
 				echo "error : ".$e->getMessage();
653 653 
 			}
654 654 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
655 655 
 		} else $all = array();
656 656 
 		if (empty($all)) {
657 
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
657 
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
658 658 
 			if ($filter_name != '') {
659 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
659 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
660 660 
 			}
661 661 
 			$Spotter = new Spotter($this->db);
662 662 
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
663 
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
663 
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
664 664 
 		}
665 665 
 		return $all;
666 666 
 	}
667 667
668 
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
668 
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
669 669 
 		global $globalStatsFilters;
670 670 
 		if ($filter_name == '') $filter_name = $this->filter_name;
671 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
671 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
672 672 
 			$Spotter = new Spotter($this->db);
673 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
673 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
674 674 
 			if ($year == '' && $month == '') {
675 675 
 				$alliance_airlines = array();
676 676 
 				foreach ($airlines as $airline) {
677 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
677 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
678 678 
 				}
679 
-				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";
680 
-				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";
679 
+				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";
680 
+				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";
681 681 
 				try {
682 682 
 					$sth = $this->db->prepare($query);
683 683 
 					$sth->execute(array(':filter_name' => $filter_name));
684 
-				} catch(PDOException $e) {
684 
+				} catch (PDOException $e) {
685 685 
 					echo "error : ".$e->getMessage();
686 686 
 				}
687 687 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -692,45 +692,45 @@  discard block
 
 block discarded – undo
692 692 
 				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";
693 693 
 				try {
694 694 
 					$sth = $this->db->prepare($query);
695 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
696 
-				} catch(PDOException $e) {
695 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
696 
+				} catch (PDOException $e) {
697 697 
 					echo "error : ".$e->getMessage();
698 698 
 				}
699 699 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
700 700 
 			} else $all = array();
701 701 
 		}
702 702 
 		if (empty($all)) {
703 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
704 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
703 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
704 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
705 705 
 			} else {
706 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
706 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
707 707 
 			}
708 708 
 			if ($filter_name != '') {
709 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
709 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
710 710 
 			}
711 711 
 			$Spotter = new Spotter($this->db);
712 712 
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
713 
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
713 
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
714 714 
 		}
715 715 
 		return $all;
716 716 
 	}
717 
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
717 
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
718 718 
 		global $globalStatsFilters;
719 719 
 		if ($filter_name == '') $filter_name = $this->filter_name;
720 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
720 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
721 721 
 			$Spotter = new Spotter($this->db);
722 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
722 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
723 723 
 			if ($year == '' && $month == '') {
724 724 
 				$alliance_airlines = array();
725 725 
 				foreach ($airlines as $airline) {
726 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
726 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
727 727 
 				}
728 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
729 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
728 
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
729 
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
730 730 
 				try {
731 731 
 					$sth = $this->db->prepare($query);
732 732 
 					$sth->execute(array(':filter_name' => $filter_name));
733 
-				} catch(PDOException $e) {
733 
+				} catch (PDOException $e) {
734 734 
 					echo "error : ".$e->getMessage();
735 735 
 				}
736 736 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -741,27 +741,27 @@  discard block
 
 block discarded – undo
741 741 
 				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport.name AS airport_departure_name,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";
742 742 
 				try {
743 743 
 					$sth = $this->db->prepare($query);
744 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
745 
-				} catch(PDOException $e) {
744 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
745 
+				} catch (PDOException $e) {
746 746 
 					echo "error : ".$e->getMessage();
747 747 
 				}
748 748 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
749 749 
 			} else $all = array();
750 750 
 		}
751 751 
 		if (empty($all)) {
752 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
753 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
752 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
753 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
754 754 
 			} else {
755 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
755 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
756 756 
 			}
757 757 
 			if ($filter_name != '') {
758 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
758 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
759 759 
 			}
760 760 
 			$Spotter = new Spotter($this->db);
761 761 
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
762 762 
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
763 
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
764 
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
763 
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
764 
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
765 765 
 			$all = array();
766 766 
 			foreach ($pall as $value) {
767 767 
 				$icao = $value['airport_departure_icao'];
 
@@ -777,27 +777,27 @@  discard block
 
 block discarded – undo
777 777 
 			foreach ($all as $key => $row) {
778 778 
 				$count[$key] = $row['airport_departure_icao_count'];
779 779 
 			}
780 
-			array_multisort($count,SORT_DESC,$all);
780 
+			array_multisort($count, SORT_DESC, $all);
781 781 
 		}
782 782 
 		return $all;
783 783 
 	}
784 
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
784 
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
785 785 
 		global $globalStatsFilters;
786 786 
 		if ($filter_name == '') $filter_name = $this->filter_name;
787 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
787 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
788 788 
 			$Spotter = new Spotter($this->db);
789 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
789 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
790 790 
 			if ($year == '' && $month == '') {
791 791 
 				$alliance_airlines = array();
792 792 
 				foreach ($airlines as $airline) {
793 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
793 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
794 794 
 				}
795 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
796 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
795 
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
796 
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
797 797 
 				try {
798 798 
 					$sth = $this->db->prepare($query);
799 799 
 					$sth->execute(array(':filter_name' => $filter_name));
800 
-				} catch(PDOException $e) {
800 
+				} catch (PDOException $e) {
801 801 
 					echo "error : ".$e->getMessage();
802 802 
 				}
803 803 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -808,27 +808,27 @@  discard block
 
 block discarded – undo
808 808 
 				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport.name AS airport_arrival_name, 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";
809 809 
 				try {
810 810 
 					$sth = $this->db->prepare($query);
811 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
812 
-				} catch(PDOException $e) {
811 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
812 
+				} catch (PDOException $e) {
813 813 
 					echo "error : ".$e->getMessage();
814 814 
 				}
815 815 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
816 816 
 			} else $all = array();
817 817 
 		}
818 818 
 		if (empty($all)) {
819 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
820 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
819 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
820 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
821 821 
 			} else {
822 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
822 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
823 823 
 			}
824 824 
 			if ($filter_name != '') {
825 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
825 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
826 826 
 			}
827 827 
 			$Spotter = new Spotter($this->db);
828 828 
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
829 829 
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
830 
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
831 
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
830 
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
831 
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
832 832 
 			$all = array();
833 833 
 			foreach ($pall as $value) {
834 834 
 				$icao = $value['airport_arrival_icao'];
 
@@ -844,26 +844,26 @@  discard block
 
 block discarded – undo
844 844 
 			foreach ($all as $key => $row) {
845 845 
 				$count[$key] = $row['airport_arrival_icao_count'];
846 846 
 			}
847 
-			array_multisort($count,SORT_DESC,$all);
847 
+			array_multisort($count, SORT_DESC, $all);
848 848 
 		}
849 849 
 		return $all;
850 850 
 	}
851 
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
851 
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
852 852 
 		global $globalDBdriver, $globalStatsFilters;
853 853 
 		if ($filter_name == '') $filter_name = $this->filter_name;
854 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
854 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
855 855 
 			$Spotter = new Spotter($this->db);
856 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
856 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
857 857 
 			$alliance_airlines = array();
858 858 
 			foreach ($airlines as $airline) {
859 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
859 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
860 860 
 			}
861 861 
 			if ($globalDBdriver == 'mysql') {
862 
-				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";
863 
-				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";
862 
+				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";
863 
+				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";
864 864 
 			} else {
865 
-				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";
866 
-				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";
865 
+				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";
866 
+				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";
867 867 
 			}
868 868 
 			$query_data = array(':filter_name' => $filter_name);
869 869 
 		} else {
 
@@ -874,23 +874,23 @@  discard block
 
 block discarded – undo
874 874 
 				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";
875 875 
 				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";
876 876 
 			}
877 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
877 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
878 878 
 		}
879 879 
 		try {
880 880 
 			$sth = $this->db->prepare($query);
881 881 
 			$sth->execute($query_data);
882 
-		} catch(PDOException $e) {
882 
+		} catch (PDOException $e) {
883 883 
 			echo "error : ".$e->getMessage();
884 884 
 		}
885 885 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
886 886 
 		if (empty($all)) {
887 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
888 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
887 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
888 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
889 889 
 			} else {
890 890 
 				$filters = array('airlines' => array($stats_airline));
891 891 
 			}
892 892 
 			if ($filter_name != '') {
893 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
893 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
894 894 
 			}
895 895 
 			$Spotter = new Spotter($this->db);
896 896 
 			$all = $Spotter->countAllMonthsLastYear($filters);
 
@@ -898,7 +898,7 @@  discard block
 
 block discarded – undo
898 898 
 		return $all;
899 899 
 	}
900 900
901 
-	public function countAllMarineMonthsLastYear($limit = true,$filter_name = '') {
901 
+	public function countAllMarineMonthsLastYear($limit = true, $filter_name = '') {
902 902 
 		global $globalDBdriver, $globalStatsFilters;
903 903 
 		if ($filter_name == '') $filter_name = $this->filter_name;
904 904 
 		if ($globalDBdriver == 'mysql') {
 
@@ -912,14 +912,14 @@  discard block
 
 block discarded – undo
912 912 
 		try {
913 913 
 			$sth = $this->db->prepare($query);
914 914 
 			$sth->execute($query_data);
915 
-		} catch(PDOException $e) {
915 
+		} catch (PDOException $e) {
916 916 
 			echo "error : ".$e->getMessage();
917 917 
 		}
918 918 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
919 919 
 		if (empty($all)) {
920 920 
 			$filters = array();
921 921 
 			if ($filter_name != '') {
922 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
922 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
923 923 
 			}
924 924 
 			$Marine = new Marine($this->db);
925 925 
 			$all = $Marine->countAllMonthsLastYear($filters);
 
@@ -927,7 +927,7 @@  discard block
 
 block discarded – undo
927 927 
 		return $all;
928 928 
 	}
929 929
930 
-	public function countAllTrackerMonthsLastYear($limit = true,$filter_name = '') {
930 
+	public function countAllTrackerMonthsLastYear($limit = true, $filter_name = '') {
931 931 
 		global $globalDBdriver, $globalStatsFilters;
932 932 
 		if ($filter_name == '') $filter_name = $this->filter_name;
933 933 
 		if ($globalDBdriver == 'mysql') {
 
@@ -941,14 +941,14 @@  discard block
 
 block discarded – undo
941 941 
 		try {
942 942 
 			$sth = $this->db->prepare($query);
943 943 
 			$sth->execute($query_data);
944 
-		} catch(PDOException $e) {
944 
+		} catch (PDOException $e) {
945 945 
 			echo "error : ".$e->getMessage();
946 946 
 		}
947 947 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
948 948 
 		if (empty($all)) {
949 949 
 			$filters = array();
950 950 
 			if ($filter_name != '') {
951 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
951 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
952 952 
 			}
953 953 
 			$Tracker = new Tracker($this->db);
954 954 
 			$all = $Tracker->countAllMonthsLastYear($filters);
 
@@ -956,37 +956,37 @@  discard block
 
 block discarded – undo
956 956 
 		return $all;
957 957 
 	}
958 958
959 
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
959 
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
960 960 
 		global $globalStatsFilters;
961 961 
 		if ($filter_name == '') $filter_name = $this->filter_name;
962 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
962 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
963 963 
 			$Spotter = new Spotter($this->db);
964 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
964 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
965 965 
 			$alliance_airlines = array();
966 966 
 			foreach ($airlines as $airline) {
967 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
967 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
968 968 
 			}
969 
-			$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";
969 
+			$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";
970 970 
 			$query_data = array(':filter_name' => $filter_name);
971 971 
 		} else {
972 972 
 			$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";
973 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
973 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
974 974 
 		}
975 975 
 		try {
976 976 
 			$sth = $this->db->prepare($query);
977 977 
 			$sth->execute($query_data);
978 
-		} catch(PDOException $e) {
978 
+		} catch (PDOException $e) {
979 979 
 			echo "error : ".$e->getMessage();
980 980 
 		}
981 981 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
982 982 
 		if (empty($all)) {
983 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
984 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
983 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
984 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
985 985 
 			} else {
986 986 
 				$filters = array('airlines' => array($stats_airline));
987 987 
 			}
988 988 
 			if ($filter_name != '') {
989 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
989 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
990 990 
 			}
991 991 
 			$Spotter = new Spotter($this->db);
992 992 
 			$all = $Spotter->countAllDatesLastMonth($filters);
 
@@ -1001,14 +1001,14 @@  discard block
 
 block discarded – undo
1001 1001 
 		try {
1002 1002 
 			$sth = $this->db->prepare($query);
1003 1003 
 			$sth->execute($query_data);
1004 
-		} catch(PDOException $e) {
1004 
+		} catch (PDOException $e) {
1005 1005 
 			echo "error : ".$e->getMessage();
1006 1006 
 		}
1007 1007 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1008 1008 
 		if (empty($all)) {
1009 1009 
 			$filters = array();
1010 1010 
 			if ($filter_name != '') {
1011 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1011 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1012 1012 
 			}
1013 1013 
 			$Marine = new Marine($this->db);
1014 1014 
 			$all = $Marine->countAllDatesLastMonth($filters);
 
@@ -1023,34 +1023,34 @@  discard block
 
 block discarded – undo
1023 1023 
 		try {
1024 1024 
 			$sth = $this->db->prepare($query);
1025 1025 
 			$sth->execute($query_data);
1026 
-		} catch(PDOException $e) {
1026 
+		} catch (PDOException $e) {
1027 1027 
 			echo "error : ".$e->getMessage();
1028 1028 
 		}
1029 1029 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1030 1030 
 		if (empty($all)) {
1031 1031 
 			$filters = array();
1032 1032 
 			if ($filter_name != '') {
1033 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1033 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1034 1034 
 			}
1035 1035 
 			$Tracker = new Tracker($this->db);
1036 1036 
 			$all = $Tracker->countAllDatesLastMonth($filters);
1037 1037 
 		}
1038 1038 
 		return $all;
1039 1039 
 	}
1040 
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
1040 
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
1041 1041 
 		global $globalDBdriver, $globalStatsFilters;
1042 1042 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1043 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1043 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1044 1044 
 			$Spotter = new Spotter($this->db);
1045 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1045 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1046 1046 
 			$alliance_airlines = array();
1047 1047 
 			foreach ($airlines as $airline) {
1048 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1048 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1049 1049 
 			}
1050 1050 
 			if ($globalDBdriver == 'mysql') {
1051 
-				$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";
1051 
+				$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";
1052 1052 
 			} else {
1053 
-				$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";
1053 
+				$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";
1054 1054 
 			}
1055 1055 
 			$query_data = array(':filter_name' => $filter_name);
1056 1056 
 		} else {
 
@@ -1059,23 +1059,23 @@  discard block
 
 block discarded – undo
1059 1059 
 			} else {
1060 1060 
 				$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";
1061 1061 
 			}
1062 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1062 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1063 1063 
 		}
1064 1064 
 		try {
1065 1065 
 			$sth = $this->db->prepare($query);
1066 1066 
 			$sth->execute($query_data);
1067 
-		} catch(PDOException $e) {
1067 
+		} catch (PDOException $e) {
1068 1068 
 			echo "error : ".$e->getMessage();
1069 1069 
 		}
1070 1070 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1071 1071 
 		if (empty($all)) {
1072 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1073 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1072 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1073 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1074 1074 
 			} else {
1075 1075 
 				$filters = array('airlines' => array($stats_airline));
1076 1076 
 			}
1077 1077 
 			if ($filter_name != '') {
1078 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1078 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1079 1079 
 			}
1080 1080 
 			$Spotter = new Spotter($this->db);
1081 1081 
 			$all = $Spotter->countAllDatesLast7Days($filters);
 
@@ -1094,14 +1094,14 @@  discard block
 
 block discarded – undo
1094 1094 
 		try {
1095 1095 
 			$sth = $this->db->prepare($query);
1096 1096 
 			$sth->execute($query_data);
1097 
-		} catch(PDOException $e) {
1097 
+		} catch (PDOException $e) {
1098 1098 
 			echo "error : ".$e->getMessage();
1099 1099 
 		}
1100 1100 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1101 1101 
 		if (empty($all)) {
1102 1102 
 			$filters = array();
1103 1103 
 			if ($filter_name != '') {
1104 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1104 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1105 1105 
 			}
1106 1106 
 			$Marine = new Marine($this->db);
1107 1107 
 			$all = $Marine->countAllDatesLast7Days($filters);
 
@@ -1120,51 +1120,51 @@  discard block
 
 block discarded – undo
1120 1120 
 		try {
1121 1121 
 			$sth = $this->db->prepare($query);
1122 1122 
 			$sth->execute($query_data);
1123 
-		} catch(PDOException $e) {
1123 
+		} catch (PDOException $e) {
1124 1124 
 			echo "error : ".$e->getMessage();
1125 1125 
 		}
1126 1126 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1127 1127 
 		if (empty($all)) {
1128 1128 
 			$filters = array();
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 
 			$Tracker = new Tracker($this->db);
1133 1133 
 			$all = $Tracker->countAllDatesLast7Days($filters);
1134 1134 
 		}
1135 1135 
 		return $all;
1136 1136 
 	}
1137 
-	public function countAllDates($stats_airline = '',$filter_name = '') {
1137 
+	public function countAllDates($stats_airline = '', $filter_name = '') {
1138 1138 
 		global $globalStatsFilters;
1139 1139 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1140 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1140 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1141 1141 
 			$Spotter = new Spotter($this->db);
1142 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1142 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1143 1143 
 			$alliance_airlines = array();
1144 1144 
 			foreach ($airlines as $airline) {
1145 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1145 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1146 1146 
 			}
1147 
-			$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";
1147 
+			$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";
1148 1148 
 			$query_data = array(':filter_name' => $filter_name);
1149 1149 
 		} else {
1150 1150 
 			$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";
1151 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1151 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1152 1152 
 		}
1153 1153 
 		try {
1154 1154 
 			$sth = $this->db->prepare($query);
1155 1155 
 			$sth->execute($query_data);
1156 
-		} catch(PDOException $e) {
1156 
+		} catch (PDOException $e) {
1157 1157 
 			echo "error : ".$e->getMessage();
1158 1158 
 		}
1159 1159 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1160 1160 
 		if (empty($all)) {
1161 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1162 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1161 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1162 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1163 1163 
 			} else {
1164 1164 
 				$filters = array('airlines' => array($stats_airline));
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->countAllDates($filters);
 
@@ -1179,7 +1179,7 @@  discard block
 
 block discarded – undo
1179 1179 
 		try {
1180 1180 
 			$sth = $this->db->prepare($query);
1181 1181 
 			$sth->execute($query_data);
1182 
-		} catch(PDOException $e) {
1182 
+		} catch (PDOException $e) {
1183 1183 
 			echo "error : ".$e->getMessage();
1184 1184 
 		}
1185 1185 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1201,7 +1201,7 @@  discard block
 
 block discarded – undo
1201 1201 
 		try {
1202 1202 
 			$sth = $this->db->prepare($query);
1203 1203 
 			$sth->execute($query_data);
1204 
-		} catch(PDOException $e) {
1204 
+		} catch (PDOException $e) {
1205 1205 
 			echo "error : ".$e->getMessage();
1206 1206 
 		}
1207 1207 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1223,34 +1223,34 @@  discard block
 
 block discarded – undo
1223 1223 
 		try {
1224 1224 
 			$sth = $this->db->prepare($query);
1225 1225 
 			$sth->execute($query_data);
1226 
-		} catch(PDOException $e) {
1226 
+		} catch (PDOException $e) {
1227 1227 
 			echo "error : ".$e->getMessage();
1228 1228 
 		}
1229 1229 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1230 1230 
 		if (empty($all)) {
1231 1231 
 			$filters = array();
1232 1232 
 			if ($filter_name != '') {
1233 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1233 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1234 1234 
 			}
1235 1235 
 			$Spotter = new Spotter($this->db);
1236 1236 
 			$all = $Spotter->countAllDatesByAirlines($filters);
1237 1237 
 		}
1238 1238 
 		return $all;
1239 1239 
 	}
1240 
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
1240 
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
1241 1241 
 		global $globalStatsFilters, $globalDBdriver;
1242 1242 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1243 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1243 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1244 1244 
 			$Spotter = new Spotter($this->db);
1245 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1245 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1246 1246 
 			$alliance_airlines = array();
1247 1247 
 			foreach ($airlines as $airline) {
1248 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1248 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1249 1249 
 			}
1250 1250 
 			if ($globalDBdriver == 'mysql') {
1251 
-				$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";
1251 
+				$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";
1252 1252 
 			} else {
1253 
-				$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";
1253 
+				$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";
1254 1254 
 			}
1255 1255 
 			$query_data = array(':filter_name' => $filter_name);
1256 1256 
 		} else {
 
@@ -1264,18 +1264,18 @@  discard block
 
 block discarded – undo
1264 1264 
 		try {
1265 1265 
 			$sth = $this->db->prepare($query);
1266 1266 
 			$sth->execute($query_data);
1267 
-		} catch(PDOException $e) {
1267 
+		} catch (PDOException $e) {
1268 1268 
 			echo "error : ".$e->getMessage();
1269 1269 
 		}
1270 1270 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1271 1271 
 		if (empty($all)) {
1272 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1273 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1272 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1273 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1274 1274 
 			} else {
1275 1275 
 				$filters = array('airlines' => array($stats_airline));
1276 1276 
 			}
1277 1277 
 			if ($filter_name != '') {
1278 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1278 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1279 1279 
 			}
1280 1280 
 			$Spotter = new Spotter($this->db);
1281 1281 
 			$all = $Spotter->countAllMonths($filters);
 
@@ -1292,7 +1292,7 @@  discard block
 
 block discarded – undo
1292 1292 
 		try {
1293 1293 
 			$sth = $this->db->prepare($query);
1294 1294 
 			$sth->execute();
1295 
-		} catch(PDOException $e) {
1295 
+		} catch (PDOException $e) {
1296 1296 
 			echo "error : ".$e->getMessage();
1297 1297 
 		}
1298 1298 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1312,7 +1312,7 @@  discard block
 
 block discarded – undo
1312 1312 
 		try {
1313 1313 
 			$sth = $this->db->prepare($query);
1314 1314 
 			$sth->execute();
1315 
-		} catch(PDOException $e) {
1315 
+		} catch (PDOException $e) {
1316 1316 
 			echo "error : ".$e->getMessage();
1317 1317 
 		}
1318 1318 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1329,32 +1329,32 @@  discard block
 
 block discarded – undo
1329 1329 
 		try {
1330 1330 
 			$sth = $this->db->prepare($query);
1331 1331 
 			$sth->execute(array(':filter_name' => $filter_name));
1332 
-		} catch(PDOException $e) {
1332 
+		} catch (PDOException $e) {
1333 1333 
 			echo "error : ".$e->getMessage();
1334 1334 
 		}
1335 1335 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1336 1336 
 		if (empty($all)) {
1337 1337 
 			$filters = array();
1338 1338 
 			if ($filter_name != '') {
1339 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1339 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1340 1340 
 			}
1341 1341 
 			$Spotter = new Spotter($this->db);
1342 1342 
 			$all = $Spotter->countAllMilitaryMonths($filters);
1343 1343 
 		}
1344 1344 
 		return $all;
1345 1345 
 	}
1346 
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1346 
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
1347 1347 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1348 1348 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1349 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1349 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1350 1350 
 			$Spotter = new Spotter($this->db);
1351 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1351 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1352 1352 
 			$alliance_airlines = array();
1353 1353 
 			foreach ($airlines as $airline) {
1354 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1354 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1355 1355 
 			}
1356 
-			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";
1357 
-			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";
1356 
+			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";
1357 
+			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";
1358 1358 
 			$query_data = array(':filter_name' => $filter_name);
1359 1359 
 		} else {
1360 1360 
 			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";
 
@@ -1372,25 +1372,25 @@  discard block
 
 block discarded – undo
1372 1372 
 		try {
1373 1373 
 			$sth = $this->db->prepare($query);
1374 1374 
 			$sth->execute($query_data);
1375 
-		} catch(PDOException $e) {
1375 
+		} catch (PDOException $e) {
1376 1376 
 			echo "error : ".$e->getMessage();
1377 1377 
 		}
1378 1378 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1379 1379 
 		if (empty($all)) {
1380 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1381 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1380 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1381 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1382 1382 
 			} else {
1383 1383 
 				$filters = array('airlines' => array($stats_airline));
1384 1384 
 			}
1385 1385 
 			if ($filter_name != '') {
1386 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1386 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1387 1387 
 			}
1388 1388 
 			$Spotter = new Spotter($this->db);
1389 
-			$all = $Spotter->countAllHours($orderby,$filters);
1389 
+			$all = $Spotter->countAllHours($orderby, $filters);
1390 1390 
 		}
1391 1391 
 		return $all;
1392 1392 
 	}
1393 
-	public function countAllMarineHours($orderby = 'hour',$limit = true,$filter_name = '') {
1393 
+	public function countAllMarineHours($orderby = 'hour', $limit = true, $filter_name = '') {
1394 1394 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1395 1395 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1396 1396 
 		if ($limit) $query = "SELECT marine_date as hour_name, cnt as hour_count FROM stats_marine WHERE stats_type = 'hour' AND filter_name = :filter_name";
 
@@ -1407,21 +1407,21 @@  discard block
 
 block discarded – undo
1407 1407 
 		try {
1408 1408 
 			$sth = $this->db->prepare($query);
1409 1409 
 			$sth->execute($query_data);
1410 
-		} catch(PDOException $e) {
1410 
+		} catch (PDOException $e) {
1411 1411 
 			echo "error : ".$e->getMessage();
1412 1412 
 		}
1413 1413 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1414 1414 
 		if (empty($all)) {
1415 1415 
 			$filters = array();
1416 1416 
 			if ($filter_name != '') {
1417 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1417 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1418 1418 
 			}
1419 1419 
 			$Marine = new Marine($this->db);
1420 
-			$all = $Marine->countAllHours($orderby,$filters);
1420 
+			$all = $Marine->countAllHours($orderby, $filters);
1421 1421 
 		}
1422 1422 
 		return $all;
1423 1423 
 	}
1424 
-	public function countAllTrackerHours($orderby = 'hour',$limit = true,$filter_name = '') {
1424 
+	public function countAllTrackerHours($orderby = 'hour', $limit = true, $filter_name = '') {
1425 1425 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1426 1426 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1427 1427 
 		if ($limit) $query = "SELECT tracker_date as hour_name, cnt as hour_count FROM stats_tracker WHERE stats_type = 'hour' AND filter_name = :filter_name";
 
@@ -1438,33 +1438,33 @@  discard block
 
 block discarded – undo
1438 1438 
 		try {
1439 1439 
 			$sth = $this->db->prepare($query);
1440 1440 
 			$sth->execute($query_data);
1441 
-		} catch(PDOException $e) {
1441 
+		} catch (PDOException $e) {
1442 1442 
 			echo "error : ".$e->getMessage();
1443 1443 
 		}
1444 1444 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1445 1445 
 		if (empty($all)) {
1446 1446 
 			$filters = array();
1447 1447 
 			if ($filter_name != '') {
1448 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1448 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1449 1449 
 			}
1450 1450 
 			$Tracker = new Tracker($this->db);
1451 
-			$all = $Tracker->countAllHours($orderby,$filters);
1451 
+			$all = $Tracker->countAllHours($orderby, $filters);
1452 1452 
 		}
1453 1453 
 		return $all;
1454 1454 
 	}
1455 
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1455 
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1456 1456 
 		global $globalStatsFilters;
1457 1457 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1458 1458 
 		if ($year == '') $year = date('Y');
1459 
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1459 
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
1460 1460 
 		if (empty($all)) {
1461 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1462 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1461 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1462 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1463 1463 
 			} else {
1464 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1464 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1465 1465 
 			}
1466 1466 
 			if ($filter_name != '') {
1467 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1467 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1468 1468 
 			}
1469 1469 
 			$Spotter = new Spotter($this->db);
1470 1470 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1472,15 +1472,15 @@  discard block
 
 block discarded – undo
1472 1472 
 		}
1473 1473 
 		return $all;
1474 1474 
 	}
1475 
-	public function countOverallMarine($filter_name = '',$year = '',$month = '') {
1475 
+	public function countOverallMarine($filter_name = '', $year = '', $month = '') {
1476 1476 
 		global $globalStatsFilters;
1477 1477 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1478 1478 
 		if ($year == '') $year = date('Y');
1479 
-		$all = $this->getSumStats('marine_bymonth',$year,'',$filter_name,$month);
1479 
+		$all = $this->getSumStats('marine_bymonth', $year, '', $filter_name, $month);
1480 1480 
 		if (empty($all)) {
1481 
-			$filters = array('year' => $year,'month' => $month);
1481 
+			$filters = array('year' => $year, 'month' => $month);
1482 1482 
 			if ($filter_name != '') {
1483 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1483 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1484 1484 
 			}
1485 1485 
 			$Marine = new Marine($this->db);
1486 1486 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1488,15 +1488,15 @@  discard block
 
 block discarded – undo
1488 1488 
 		}
1489 1489 
 		return $all;
1490 1490 
 	}
1491 
-	public function countOverallTracker($filter_name = '',$year = '',$month = '') {
1491 
+	public function countOverallTracker($filter_name = '', $year = '', $month = '') {
1492 1492 
 		global $globalStatsFilters;
1493 1493 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1494 1494 
 		if ($year == '') $year = date('Y');
1495 
-		$all = $this->getSumStats('tracker_bymonth',$year,'',$filter_name,$month);
1495 
+		$all = $this->getSumStats('tracker_bymonth', $year, '', $filter_name, $month);
1496 1496 
 		if (empty($all)) {
1497 
-			$filters = array('year' => $year,'month' => $month);
1497 
+			$filters = array('year' => $year, 'month' => $month);
1498 1498 
 			if ($filter_name != '') {
1499 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1499 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1500 1500 
 			}
1501 1501 
 			$Tracker = new Tracker($this->db);
1502 1502 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1504,16 +1504,16 @@  discard block
 
 block discarded – undo
1504 1504 
 		}
1505 1505 
 		return $all;
1506 1506 
 	}
1507 
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1507 
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
1508 1508 
 		global $globalStatsFilters;
1509 1509 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1510 1510 
 		if ($year == '') $year = date('Y');
1511 
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1511 
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
1512 1512 
 		if (empty($all)) {
1513 1513 
 			$filters = array();
1514 
-			$filters = array('year' => $year,'month' => $month);
1514 
+			$filters = array('year' => $year, 'month' => $month);
1515 1515 
 			if ($filter_name != '') {
1516 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1516 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1517 1517 
 			}
1518 1518 
 			$Spotter = new Spotter($this->db);
1519 1519 
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
 
@@ -1521,19 +1521,19 @@  discard block
 
 block discarded – undo
1521 1521 
 		}
1522 1522 
 		return $all;
1523 1523 
 	}
1524 
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1524 
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1525 1525 
 		global $globalStatsFilters;
1526 1526 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1527 1527 
 		if ($year == '') $year = date('Y');
1528 
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1528 
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
1529 1529 
 		if (empty($all)) {
1530 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1531 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1530 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1531 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1532 1532 
 			} else {
1533 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1533 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1534 1534 
 			}
1535 1535 
 			if ($filter_name != '') {
1536 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1536 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1537 1537 
 			}
1538 1538 
 			$Spotter = new Spotter($this->db);
1539 1539 
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
 
@@ -1541,48 +1541,48 @@  discard block
 
 block discarded – undo
1541 1541 
 		}
1542 1542 
 		return $all;
1543 1543 
 	}
1544 
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1544 
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1545 1545 
 		global $globalStatsFilters;
1546 1546 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1547 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1547 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1548 1548 
 			$Spotter = new Spotter($this->db);
1549 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1549 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1550 1550 
 			if ($year == '' && $month == '') {
1551 1551 
 				$alliance_airlines = array();
1552 1552 
 				foreach ($airlines as $airline) {
1553 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1553 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1554 1554 
 				}
1555 
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1555 
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1556 1556 
 				try {
1557 1557 
 					$sth = $this->db->prepare($query);
1558 1558 
 					$sth->execute(array(':filter_name' => $filter_name));
1559 
-				} catch(PDOException $e) {
1559 
+				} catch (PDOException $e) {
1560 1560 
 					echo "error : ".$e->getMessage();
1561 1561 
 				}
1562 1562 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1563 1563 
 				$all = $result[0]['nb'];
1564 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1564 
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1565 1565 
 		} else {
1566 1566 
 			if ($year == '' && $month == '') {
1567 1567 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1568 1568 
 				try {
1569 1569 
 					$sth = $this->db->prepare($query);
1570 
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
1571 
-				} catch(PDOException $e) {
1570 
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
1571 
+				} catch (PDOException $e) {
1572 1572 
 					echo "error : ".$e->getMessage();
1573 1573 
 				}
1574 1574 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1575 1575 
 				$all = $result[0]['nb'];
1576 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1576 
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1577 1577 
 		}
1578 1578 
 		if (empty($all)) {
1579 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1580 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1579 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1580 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1581 1581 
 			} else {
1582 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1582 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1583 1583 
 			}
1584 1584 
 			if ($filter_name != '') {
1585 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1585 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1586 1586 
 			}
1587 1587 
 			$Spotter = new Spotter($this->db);
1588 1588 
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
 
@@ -1590,7 +1590,7 @@  discard block
 
 block discarded – undo
1590 1590 
 		}
1591 1591 
 		return $all;
1592 1592 
 	}
1593 
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1593 
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
1594 1594 
 		global $globalStatsFilters;
1595 1595 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1596 1596 
 		if ($year == '' && $month == '') {
 
@@ -1598,17 +1598,17 @@  discard block
 
 block discarded – undo
1598 1598 
 			try {
1599 1599 
 				$sth = $this->db->prepare($query);
1600 1600 
 				$sth->execute(array(':filter_name' => $filter_name));
1601 
-			} catch(PDOException $e) {
1601 
+			} catch (PDOException $e) {
1602 1602 
 				echo "error : ".$e->getMessage();
1603 1603 
 			}
1604 1604 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1605 1605 
 			$all = $result[0]['nb_airline'];
1606 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1606 
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
1607 1607 
 		if (empty($all)) {
1608 1608 
 			$filters = array();
1609 
-			$filters = array('year' => $year,'month' => $month);
1609 
+			$filters = array('year' => $year, 'month' => $month);
1610 1610 
 			if ($filter_name != '') {
1611 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1611 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1612 1612 
 			}
1613 1613 
 			$Spotter = new Spotter($this->db);
1614 1614 
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
 
@@ -1616,7 +1616,7 @@  discard block
 
 block discarded – undo
1616 1616 
 		}
1617 1617 
 		return $all;
1618 1618 
 	}
1619 
-	public function countOverallMarineTypes($filter_name = '',$year = '',$month = '') {
1619 
+	public function countOverallMarineTypes($filter_name = '', $year = '', $month = '') {
1620 1620 
 		global $globalStatsFilters;
1621 1621 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1622 1622 
 		$all = array();
 
@@ -1625,7 +1625,7 @@  discard block
 
 block discarded – undo
1625 1625 
 			try {
1626 1626 
 				$sth = $this->db->prepare($query);
1627 1627 
 				$sth->execute(array(':filter_name' => $filter_name));
1628 
-			} catch(PDOException $e) {
1628 
+			} catch (PDOException $e) {
1629 1629 
 				echo "error : ".$e->getMessage();
1630 1630 
 			}
1631 1631 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1633,9 +1633,9 @@  discard block
 
 block discarded – undo
1633 1633 
 		}
1634 1634 
 		if (empty($all)) {
1635 1635 
 			$filters = array();
1636 
-			$filters = array('year' => $year,'month' => $month);
1636 
+			$filters = array('year' => $year, 'month' => $month);
1637 1637 
 			if ($filter_name != '') {
1638 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1638 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1639 1639 
 			}
1640 1640 
 			$Marine = new Marine($this->db);
1641 1641 
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
 
@@ -1643,29 +1643,29 @@  discard block
 
 block discarded – undo
1643 1643 
 		}
1644 1644 
 		return $all;
1645 1645 
 	}
1646 
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1646 
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1647 1647 
 		global $globalStatsFilters;
1648 1648 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1649 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1649 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1650 1650 
 			$Spotter = new Spotter($this->db);
1651 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1651 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1652 1652 
 			if ($year == '' && $month == '') {
1653 1653 
 				$alliance_airlines = array();
1654 1654 
 				foreach ($airlines as $airline) {
1655 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1655 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1656 1656 
 				}
1657 
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1657 
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1658 1658 
 				$query_values = array(':filter_name' => $filter_name);
1659 1659 
 				try {
1660 1660 
 					$sth = $this->db->prepare($query);
1661 1661 
 					$sth->execute($query_values);
1662 
-				} catch(PDOException $e) {
1662 
+				} catch (PDOException $e) {
1663 1663 
 					echo "error : ".$e->getMessage();
1664 1664 
 				}
1665 1665 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1666 1666 
 				$all = $result[0]['nb'];
1667 1667 
 			} else {
1668 
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1668 
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1669 1669 
 			}
1670 1670 
 		} else {
1671 1671 
 			if ($year == '' && $month == '') {
 
@@ -1674,23 +1674,23 @@  discard block
 
 block discarded – undo
1674 1674 
 				try {
1675 1675 
 					$sth = $this->db->prepare($query);
1676 1676 
 					$sth->execute($query_values);
1677 
-				} catch(PDOException $e) {
1677 
+				} catch (PDOException $e) {
1678 1678 
 					echo "error : ".$e->getMessage();
1679 1679 
 				}
1680 1680 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1681 1681 
 				$all = $result[0]['nb'];
1682 1682 
 			} else {
1683 
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1683 
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1684 1684 
 			}
1685 1685 
 		}
1686 1686 
 		if (empty($all)) {
1687 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1688 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1687 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1688 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1689 1689 
 			} else {
1690 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1690 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1691 1691 
 			}
1692 1692 
 			if ($filter_name != '') {
1693 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1693 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1694 1694 
 			}
1695 1695 
 			$Spotter = new Spotter($this->db);
1696 1696 
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
 
@@ -1698,7 +1698,7 @@  discard block
 
 block discarded – undo
1698 1698 
 		}
1699 1699 
 		return $all;
1700 1700 
 	}
1701 
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1701 
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1702 1702 
 		global $globalStatsFilters;
1703 1703 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1704 1704 
 		//if ($year == '') $year = date('Y');
 
@@ -1708,18 +1708,18 @@  discard block
 
 block discarded – undo
1708 1708 
 			try {
1709 1709 
 				$sth = $this->db->prepare($query);
1710 1710 
 				$sth->execute($query_values);
1711 
-			} catch(PDOException $e) {
1711 
+			} catch (PDOException $e) {
1712 1712 
 				echo "error : ".$e->getMessage();
1713 1713 
 			}
1714 1714 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1715 1715 
 			$all = $result[0]['nb'];
1716 1716 
 		} else {
1717 
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
1717 
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
1718 1718 
 		}
1719 1719 
 		if (empty($all)) {
1720 
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1720 
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1721 1721 
 			if ($filter_name != '') {
1722 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1722 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1723 1723 
 			}
1724 1724 
 			$Spotter = new Spotter($this->db);
1725 1725 
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
 
@@ -1728,104 +1728,104 @@  discard block
 
 block discarded – undo
1728 1728 
 		return $all;
1729 1729 
 	}
1730 1730
1731 
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1731 
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
1732 1732 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1733 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1733 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1734 1734 
 			$Spotter = new Spotter($this->db);
1735 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1735 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1736 1736 
 			$alliance_airlines = array();
1737 1737 
 			foreach ($airlines as $airline) {
1738 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1738 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1739 1739 
 			}
1740 
-			$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";
1741 
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
1740 
+			$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";
1741 
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
1742 1742 
 		} else {
1743 1743 
 			$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";
1744 
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1744 
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1745 1745 
 		}
1746 1746 
 		try {
1747 1747 
 			$sth = $this->db->prepare($query);
1748 1748 
 			$sth->execute($query_values);
1749 
-		} catch(PDOException $e) {
1749 
+		} catch (PDOException $e) {
1750 1750 
 			echo "error : ".$e->getMessage();
1751 1751 
 		}
1752 1752 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1753 1753 
 		return $all;
1754 1754 
 	}
1755 
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
1755 
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
1756 1756 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1757 1757 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1758 
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1758 
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1759 1759 
 		try {
1760 1760 
 			$sth = $this->db->prepare($query);
1761 1761 
 			$sth->execute($query_values);
1762 
-		} catch(PDOException $e) {
1762 
+		} catch (PDOException $e) {
1763 1763 
 			echo "error : ".$e->getMessage();
1764 1764 
 		}
1765 1765 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1766 1766 
 		return $all;
1767 1767 
 	}
1768 
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1768 
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
1769 1769 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1770 1770 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1771 
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1771 
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1772 1772 
 		try {
1773 1773 
 			$sth = $this->db->prepare($query);
1774 1774 
 			$sth->execute($query_values);
1775 
-		} catch(PDOException $e) {
1775 
+		} catch (PDOException $e) {
1776 1776 
 			echo "error : ".$e->getMessage();
1777 1777 
 		}
1778 1778 
 	}
1779 
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1779 
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
1780 1780 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1781 1781 
 		global $globalArchiveMonths, $globalDBdriver;
1782 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1782 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1783 1783 
 			$Spotter = new Spotter($this->db);
1784 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1784 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1785 1785 
 			$alliance_airlines = array();
1786 1786 
 			foreach ($airlines as $airline) {
1787 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1787 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1788 1788 
 			}
1789 1789 
 			if ($globalDBdriver == 'mysql') {
1790 1790 
 				if ($month == '') {
1791 
-					$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";
1791 
+					$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";
1792 1792 
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1793 1793 
 				} else {
1794 
-					$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";
1795 
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1794 
+					$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";
1795 
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1796 1796 
 				}
1797 1797 
 			} else {
1798 1798 
 				if ($month == '') {
1799 
-					$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";
1799 
+					$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";
1800 1800 
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1801 1801 
 				} else {
1802 
-					$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";
1803 
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1802 
+					$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";
1803 
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1804 1804 
 				}
1805 1805 
 			}
1806 1806 
 		} else {
1807 1807 
 			if ($globalDBdriver == 'mysql') {
1808 1808 
 				if ($month == '') {
1809 1809 
 					$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";
1810 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1810 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1811 1811 
 				} else {
1812 1812 
 					$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";
1813 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1813 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1814 1814 
 				}
1815 1815 
 			} else {
1816 1816 
 				if ($month == '') {
1817 1817 
 					$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";
1818 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1818 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1819 1819 
 				} else {
1820 1820 
 					$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";
1821 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1821 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1822 1822 
 				}
1823 1823 
 			}
1824 1824 
 		}
1825 1825 
 		try {
1826 1826 
 			$sth = $this->db->prepare($query);
1827 1827 
 			$sth->execute($query_values);
1828 
-		} catch(PDOException $e) {
1828 
+		} catch (PDOException $e) {
1829 1829 
 			echo "error : ".$e->getMessage();
1830 1830 
 		}
1831 1831 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1834,17 +1834,17 @@  discard block
 
 block discarded – undo
1834 1834 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1835 1835 
 		global $globalArchiveMonths, $globalDBdriver;
1836 1836 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1837 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1837 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1838 1838 
 			$Spotter = new Spotter($this->db);
1839 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1839 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1840 1840 
 			$alliance_airlines = array();
1841 1841 
 			foreach ($airlines as $airline) {
1842 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1842 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1843 1843 
 			}
1844 1844 
 			if ($globalDBdriver == 'mysql') {
1845 
-				$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";
1845 
+				$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";
1846 1846 
 			} else {
1847 
-				$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";
1847 
+				$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";
1848 1848 
 			}
1849 1849 
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
1850 1850 
 		} else {
 
@@ -1858,7 +1858,7 @@  discard block
 
 block discarded – undo
1858 1858 
 		try {
1859 1859 
 			$sth = $this->db->prepare($query);
1860 1860 
 			$sth->execute($query_values);
1861 
-		} catch(PDOException $e) {
1861 
+		} catch (PDOException $e) {
1862 1862 
 			echo "error : ".$e->getMessage();
1863 1863 
 		}
1864 1864 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1867,17 +1867,17 @@  discard block
 
 block discarded – undo
1867 1867 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1868 1868 
 		global $globalArchiveMonths, $globalDBdriver;
1869 1869 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1870 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1870 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1871 1871 
 			$Spotter = new Spotter($this->db);
1872 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1872 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1873 1873 
 			$alliance_airlines = array();
1874 1874 
 			foreach ($airlines as $airline) {
1875 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1875 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1876 1876 
 			}
1877 1877 
 			if ($globalDBdriver == 'mysql') {
1878 
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1878 
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1879 1879 
 			} else {
1880 
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1880 
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1881 1881 
 			}
1882 1882 
 		} else {
1883 1883 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1889,7 +1889,7 @@  discard block
 
 block discarded – undo
1889 1889 
 		try {
1890 1890 
 			$sth = $this->db->prepare($query);
1891 1891 
 			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1892 
-		} catch(PDOException $e) {
1892 
+		} catch (PDOException $e) {
1893 1893 
 			echo "error : ".$e->getMessage();
1894 1894 
 		}
1895 1895 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1906,7 +1906,7 @@  discard block
 
 block discarded – undo
1906 1906 
 		try {
1907 1907 
 			$sth = $this->db->prepare($query);
1908 1908 
 			$sth->execute(array(':filter_name' => $filter_name));
1909 
-		} catch(PDOException $e) {
1909 
+		} catch (PDOException $e) {
1910 1910 
 			echo "error : ".$e->getMessage();
1911 1911 
 		}
1912 1912 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1923,20 +1923,20 @@  discard block
 
 block discarded – undo
1923 1923 
 		try {
1924 1924 
 			$sth = $this->db->prepare($query);
1925 1925 
 			$sth->execute(array(':filter_name' => $filter_name));
1926 
-		} catch(PDOException $e) {
1926 
+		} catch (PDOException $e) {
1927 1927 
 			echo "error : ".$e->getMessage();
1928 1928 
 		}
1929 1929 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1930 1930 
 		return $all[0]['total'];
1931 1931 
 	}
1932 
-	public function getStatsOwner($owner_name,$filter_name = '') {
1932 
+	public function getStatsOwner($owner_name, $filter_name = '') {
1933 1933 
 		global $globalArchiveMonths, $globalDBdriver;
1934 1934 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1935 1935 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1936 1936 
 		try {
1937 1937 
 			$sth = $this->db->prepare($query);
1938 
-			$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1939 
-		} catch(PDOException $e) {
1938 
+			$sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
1939 
+		} catch (PDOException $e) {
1940 1940 
 			echo "error : ".$e->getMessage();
1941 1941 
 		}
1942 1942 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1954,20 +1954,20 @@  discard block
 
 block discarded – undo
1954 1954 
 		try {
1955 1955 
 			$sth = $this->db->prepare($query);
1956 1956 
 			$sth->execute(array(':filter_name' => $filter_name));
1957 
-		} catch(PDOException $e) {
1957 
+		} catch (PDOException $e) {
1958 1958 
 			echo "error : ".$e->getMessage();
1959 1959 
 		}
1960 1960 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1961 1961 
 		return $all[0]['total'];
1962 1962 
 	}
1963 
-	public function getStatsPilot($pilot,$filter_name = '') {
1963 
+	public function getStatsPilot($pilot, $filter_name = '') {
1964 1964 
 		global $globalArchiveMonths, $globalDBdriver;
1965 1965 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1966 1966 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1967 1967 
 		try {
1968 1968 
 			$sth = $this->db->prepare($query);
1969 
-			$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1970 
-		} catch(PDOException $e) {
1969 
+			$sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
1970 
+		} catch (PDOException $e) {
1971 1971 
 			echo "error : ".$e->getMessage();
1972 1972 
 		}
1973 1973 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1975,7 +1975,7 @@  discard block
 
 block discarded – undo
1975 1975 
 		else return 0;
1976 1976 
 	}
1977 1977
1978 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1978 
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1979 1979 
 		global $globalDBdriver;
1980 1980 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1981 1981 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1983,15 +1983,15 @@  discard block
 
 block discarded – undo
1983 1983 
 		} else {
1984 1984 
 			$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);";
1985 1985 
 		}
1986 
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1986 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1987 1987 
 		try {
1988 1988 
 			$sth = $this->db->prepare($query);
1989 1989 
 			$sth->execute($query_values);
1990 
-		} catch(PDOException $e) {
1990 
+		} catch (PDOException $e) {
1991 1991 
 			return "error : ".$e->getMessage();
1992 1992 
 		}
1993 1993 
 	}
1994 
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1994 
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1995 1995 
 		global $globalDBdriver;
1996 1996 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1997 1997 
 		if ($globalDBdriver == 'mysql') {
 
@@ -2000,11 +2000,11 @@  discard block
 
 block discarded – undo
2000 2000 
 			//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
2001 2001 
 			$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);";
2002 2002 
 		}
2003 
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
2003 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
2004 2004 
 		try {
2005 2005 
 			$sth = $this->db->prepare($query);
2006 2006 
 			$sth->execute($query_values);
2007 
-		} catch(PDOException $e) {
2007 
+		} catch (PDOException $e) {
2008 2008 
 			return "error : ".$e->getMessage();
2009 2009 
 		}
2010 2010 
 	}
 
@@ -2028,95 +2028,95 @@  discard block
 
 block discarded – undo
2028 2028 
         }
2029 2029 
         */
2030 2030
2031 
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
2031 
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
2032 2032 
 		global $globalDBdriver;
2033 2033 
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
2034 2034 
 		$query_values = array();
2035 2035 
 		if ($globalDBdriver == 'mysql') {
2036 2036 
 			if ($year != '') {
2037 2037 
 				$query .= ' AND YEAR(stats_date) = :year';
2038 
-				$query_values = array_merge($query_values,array(':year' => $year));
2038 
+				$query_values = array_merge($query_values, array(':year' => $year));
2039 2039 
 			}
2040 2040 
 			if ($month != '') {
2041 2041 
 				$query .= ' AND MONTH(stats_date) = :month';
2042 
-				$query_values = array_merge($query_values,array(':month' => $month));
2042 
+				$query_values = array_merge($query_values, array(':month' => $month));
2043 2043 
 			}
2044 2044 
 			if ($day != '') {
2045 2045 
 				$query .= ' AND DAY(stats_date) = :day';
2046 
-				$query_values = array_merge($query_values,array(':day' => $day));
2046 
+				$query_values = array_merge($query_values, array(':day' => $day));
2047 2047 
 			}
2048 2048 
 		} else {
2049 2049 
 			if ($year != '') {
2050 2050 
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
2051 
-				$query_values = array_merge($query_values,array(':year' => $year));
2051 
+				$query_values = array_merge($query_values, array(':year' => $year));
2052 2052 
 			}
2053 2053 
 			if ($month != '') {
2054 2054 
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
2055 
-				$query_values = array_merge($query_values,array(':month' => $month));
2055 
+				$query_values = array_merge($query_values, array(':month' => $month));
2056 2056 
 			}
2057 2057 
 			if ($day != '') {
2058 2058 
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
2059 
-				$query_values = array_merge($query_values,array(':day' => $day));
2059 
+				$query_values = array_merge($query_values, array(':day' => $day));
2060 2060 
 			}
2061 2061 
 		}
2062 2062 
 		$query .= " ORDER BY source_name";
2063 
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
2063 
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
2064 2064 
 		try {
2065 2065 
 			$sth = $this->db->prepare($query);
2066 2066 
 			$sth->execute($query_values);
2067 
-		} catch(PDOException $e) {
2067 
+		} catch (PDOException $e) {
2068 2068 
 			echo "error : ".$e->getMessage();
2069 2069 
 		}
2070 2070 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
2071 2071 
 		return $all;
2072 2072 
 	}
2073 2073
2074 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
2074 
+	public function addStatSource($data, $source_name, $stats_type, $date) {
2075 2075 
 		global $globalDBdriver;
2076 2076 
 		if ($globalDBdriver == 'mysql') {
2077 2077 
 			$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";
2078 2078 
 		} else {
2079 2079 
 			$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);";
2080 2080 
 		}
2081 
-		$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
2081 
+		$query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
2082 2082 
 		try {
2083 2083 
 			$sth = $this->db->prepare($query);
2084 2084 
 			$sth->execute($query_values);
2085 
-		} catch(PDOException $e) {
2085 
+		} catch (PDOException $e) {
2086 2086 
 			return "error : ".$e->getMessage();
2087 2087 
 		}
2088 2088 
 	}
2089 
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
2089 
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
2090 2090 
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
2091 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
2091 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
2092 2092 
 		try {
2093 2093 
 			$sth = $this->db->prepare($query);
2094 2094 
 			$sth->execute($query_values);
2095 
-		} catch(PDOException $e) {
2095 
+		} catch (PDOException $e) {
2096 2096 
 			return "error : ".$e->getMessage();
2097 2097 
 		}
2098 2098 
 	}
2099 
-	public function addStatMarine($type,$date_name,$cnt,$filter_name = '') {
2099 
+	public function addStatMarine($type, $date_name, $cnt, $filter_name = '') {
2100 2100 
 		$query = "INSERT INTO stats_marine (stats_type,marine_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
2101 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
2101 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2102 2102 
 		try {
2103 2103 
 			$sth = $this->db->prepare($query);
2104 2104 
 			$sth->execute($query_values);
2105 
-		} catch(PDOException $e) {
2105 
+		} catch (PDOException $e) {
2106 2106 
 			return "error : ".$e->getMessage();
2107 2107 
 		}
2108 2108 
 	}
2109 
-	public function addStatTracker($type,$date_name,$cnt,$filter_name = '') {
2109 
+	public function addStatTracker($type, $date_name, $cnt, $filter_name = '') {
2110 2110 
 		$query = "INSERT INTO stats_tracker (stats_type,tracker_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
2111 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
2111 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2112 2112 
 		try {
2113 2113 
 			$sth = $this->db->prepare($query);
2114 2114 
 			$sth->execute($query_values);
2115 
-		} catch(PDOException $e) {
2115 
+		} catch (PDOException $e) {
2116 2116 
 			return "error : ".$e->getMessage();
2117 2117 
 		}
2118 2118 
 	}
2119 
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
2119 
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
2120 2120 
 		global $globalDBdriver;
2121 2121 
 		if ($globalDBdriver == 'mysql') {
2122 2122 
 			if ($reset) {
 
@@ -2131,15 +2131,15 @@  discard block
 
 block discarded – undo
2131 2131 
 				$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);";
2132 2132 
 			}
2133 2133 
 		}
2134 
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2134 
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
2135 2135 
 		try {
2136 2136 
 			$sth = $this->db->prepare($query);
2137 2137 
 			$sth->execute($query_values);
2138 
-		} catch(PDOException $e) {
2138 
+		} catch (PDOException $e) {
2139 2139 
 			return "error : ".$e->getMessage();
2140 2140 
 		}
2141 2141 
 	}
2142 
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
2142 
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
2143 2143 
 		global $globalDBdriver;
2144 2144 
 		if ($globalDBdriver == 'mysql') {
2145 2145 
 			if ($reset) {
 
@@ -2154,15 +2154,15 @@  discard block
 
 block discarded – undo
2154 2154 
 				$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);";
2155 2155 
 			}
2156 2156 
 		}
2157 
-		$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
2157 
+		$query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
2158 2158 
 		try {
2159 2159 
 			$sth = $this->db->prepare($query);
2160 2160 
 			$sth->execute($query_values);
2161 
-		} catch(PDOException $e) {
2161 
+		} catch (PDOException $e) {
2162 2162 
 			return "error : ".$e->getMessage();
2163 2163 
 		}
2164 2164 
 	}
2165 
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
2165 
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
2166 2166 
 		global $globalDBdriver;
2167 2167 
 		if ($globalDBdriver == 'mysql') {
2168 2168 
 			if ($reset) {
 
@@ -2177,15 +2177,15 @@  discard block
 
 block discarded – undo
2177 2177 
 				$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);";
2178 2178 
 			}
2179 2179 
 		}
2180 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
2180 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
2181 2181 
 		try {
2182 2182 
 			$sth = $this->db->prepare($query);
2183 2183 
 			$sth->execute($query_values);
2184 
-		} catch(PDOException $e) {
2184 
+		} catch (PDOException $e) {
2185 2185 
 			return "error : ".$e->getMessage();
2186 2186 
 		}
2187 2187 
 	}
2188 
-	public function addStatCountryMarine($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
2188 
+	public function addStatCountryMarine($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
2189 2189 
 		global $globalDBdriver;
2190 2190 
 		if ($globalDBdriver == 'mysql') {
2191 2191 
 			if ($reset) {
 
@@ -2200,15 +2200,15 @@  discard block
 
 block discarded – undo
2200 2200 
 				$query = "UPDATE stats_marine_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_marine_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_marine_country WHERE iso2 = :iso2 AND filter_name = :filter_name);";
2201 2201 
 			}
2202 2202 
 		}
2203 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
2203 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2204 2204 
 		try {
2205 2205 
 			$sth = $this->db->prepare($query);
2206 2206 
 			$sth->execute($query_values);
2207 
-		} catch(PDOException $e) {
2207 
+		} catch (PDOException $e) {
2208 2208 
 			return "error : ".$e->getMessage();
2209 2209 
 		}
2210 2210 
 	}
2211 
-	public function addStatCountryTracker($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
2211 
+	public function addStatCountryTracker($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
2212 2212 
 		global $globalDBdriver;
2213 2213 
 		if ($globalDBdriver == 'mysql') {
2214 2214 
 			if ($reset) {
 
@@ -2223,15 +2223,15 @@  discard block
 
 block discarded – undo
2223 2223 
 				$query = "UPDATE stats_tracker_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_tracker_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_tracker_country WHERE iso2 = :iso2 AND filter_name = :filter_name);";
2224 2224 
 			}
2225 2225 
 		}
2226 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
2226 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2227 2227 
 		try {
2228 2228 
 			$sth = $this->db->prepare($query);
2229 2229 
 			$sth->execute($query_values);
2230 
-		} catch(PDOException $e) {
2230 
+		} catch (PDOException $e) {
2231 2231 
 			return "error : ".$e->getMessage();
2232 2232 
 		}
2233 2233 
 	}
2234 
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
2234 
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
2235 2235 
 		global $globalDBdriver;
2236 2236 
 		if ($globalDBdriver == 'mysql') {
2237 2237 
 			if ($reset) {
 
@@ -2246,15 +2246,15 @@  discard block
 
 block discarded – undo
2246 2246 
 				$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);";
2247 2247 
 			}
2248 2248 
 		}
2249 
-		$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);
2249 
+		$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);
2250 2250 
 		try {
2251 2251 
 			$sth = $this->db->prepare($query);
2252 2252 
 			$sth->execute($query_values);
2253 
-		} catch(PDOException $e) {
2253 
+		} catch (PDOException $e) {
2254 2254 
 			return "error : ".$e->getMessage();
2255 2255 
 		}
2256 2256 
 	}
2257 
-	public function addStatMarineType($type,$type_id,$cnt, $filter_name = '', $reset = false) {
2257 
+	public function addStatMarineType($type, $type_id, $cnt, $filter_name = '', $reset = false) {
2258 2258 
 		global $globalDBdriver;
2259 2259 
 		if ($globalDBdriver == 'mysql') {
2260 2260 
 			if ($reset) {
 
@@ -2269,15 +2269,15 @@  discard block
 
 block discarded – undo
2269 2269 
 				$query = "UPDATE stats_marine_type SET cnt = cnt+:cnt, type = :type, filter_name = :filter_name WHERE type_id = :type_id AND filter_name = :filter_name; INSERT INTO stats_marine_type (type,type_id,cnt,filter_name) SELECT :type,:type_id,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_marine_type WHERE type_id = :type_id AND filter_name = :filter_name);";
2270 2270 
 			}
2271 2271 
 		}
2272 
-		$query_values = array(':type' => $type,':type_id' => $type_id,':cnt' => $cnt, ':filter_name' => $filter_name);
2272 
+		$query_values = array(':type' => $type, ':type_id' => $type_id, ':cnt' => $cnt, ':filter_name' => $filter_name);
2273 2273 
 		try {
2274 2274 
 			$sth = $this->db->prepare($query);
2275 2275 
 			$sth->execute($query_values);
2276 
-		} catch(PDOException $e) {
2276 
+		} catch (PDOException $e) {
2277 2277 
 			return "error : ".$e->getMessage();
2278 2278 
 		}
2279 2279 
 	}
2280 
-	public function addStatTrackerType($type,$cnt, $filter_name = '', $reset = false) {
2280 
+	public function addStatTrackerType($type, $cnt, $filter_name = '', $reset = false) {
2281 2281 
 		global $globalDBdriver;
2282 2282 
 		if ($globalDBdriver == 'mysql') {
2283 2283 
 			if ($reset) {
 
@@ -2292,15 +2292,15 @@  discard block
 
 block discarded – undo
2292 2292 
 				$query = "UPDATE stats_tracker_type SET cnt = cnt+:cnt WHERE type = :type AND filter_name = :filter_name; INSERT INTO stats_tracker_type (type,cnt,filter_name) SELECT :type,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_tracker_type WHERE type = :type AND filter_name = :filter_name);";
2293 2293 
 			}
2294 2294 
 		}
2295 
-		$query_values = array(':type' => $type,':cnt' => $cnt, ':filter_name' => $filter_name);
2295 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':filter_name' => $filter_name);
2296 2296 
 		try {
2297 2297 
 			$sth = $this->db->prepare($query);
2298 2298 
 			$sth->execute($query_values);
2299 
-		} catch(PDOException $e) {
2299 
+		} catch (PDOException $e) {
2300 2300 
 			return "error : ".$e->getMessage();
2301 2301 
 		}
2302 2302 
 	}
2303 
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
2303 
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
2304 2304 
 		global $globalDBdriver;
2305 2305 
 		if ($globalDBdriver == 'mysql') {
2306 2306 
 			if ($reset) {
 
@@ -2315,15 +2315,15 @@  discard block
 
 block discarded – undo
2315 2315 
 				$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);";
2316 2316 
 			}
2317 2317 
 		}
2318 
-		$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
2318 
+		$query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
2319 2319 
 		try {
2320 2320 
 			$sth = $this->db->prepare($query);
2321 2321 
 			$sth->execute($query_values);
2322 
-		} catch(PDOException $e) {
2322 
+		} catch (PDOException $e) {
2323 2323 
 			return "error : ".$e->getMessage();
2324 2324 
 		}
2325 2325 
 	}
2326 
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
2326 
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
2327 2327 
 		global $globalDBdriver;
2328 2328 
 		if ($globalDBdriver == 'mysql') {
2329 2329 
 			if ($reset) {
 
@@ -2338,15 +2338,15 @@  discard block
 
 block discarded – undo
2338 2338 
 				$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);";
2339 2339 
 			}
2340 2340 
 		}
2341 
-		$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
2341 
+		$query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
2342 2342 
 		try {
2343 2343 
 			$sth = $this->db->prepare($query);
2344 2344 
 			$sth->execute($query_values);
2345 
-		} catch(PDOException $e) {
2345 
+		} catch (PDOException $e) {
2346 2346 
 			return "error : ".$e->getMessage();
2347 2347 
 		}
2348 2348 
 	}
2349 
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
2349 
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
2350 2350 
 		global $globalDBdriver;
2351 2351 
 		if ($globalDBdriver == 'mysql') {
2352 2352 
 			if ($reset) {
 
@@ -2361,15 +2361,15 @@  discard block
 
 block discarded – undo
2361 2361 
 				$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);";
2362 2362 
 			}
2363 2363 
 		}
2364 
-		$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);
2364 
+		$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);
2365 2365 
 		try {
2366 2366 
 			$sth = $this->db->prepare($query);
2367 2367 
 			$sth->execute($query_values);
2368 
-		} catch(PDOException $e) {
2368 
+		} catch (PDOException $e) {
2369 2369 
 			return "error : ".$e->getMessage();
2370 2370 
 		}
2371 2371 
 	}
2372 
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
2372 
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
2373 2373 
 		global $globalDBdriver;
2374 2374 
 		if ($airport_icao != '') {
2375 2375 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2385,16 +2385,16 @@  discard block
 
 block discarded – undo
2385 2385 
 					$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);";
2386 2386 
 				}
2387 2387 
 			}
2388 
-			$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);
2388 
+			$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);
2389 2389 
 			try {
2390 2390 
 				$sth = $this->db->prepare($query);
2391 2391 
 				$sth->execute($query_values);
2392 
-			} catch(PDOException $e) {
2392 
+			} catch (PDOException $e) {
2393 2393 
 				return "error : ".$e->getMessage();
2394 2394 
 			}
2395 2395 
 		}
2396 2396 
 	}
2397 
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
2397 
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
2398 2398 
 		global $globalDBdriver;
2399 2399 
 		if ($airport_icao != '') {
2400 2400 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2402,16 +2402,16 @@  discard block
 
 block discarded – undo
2402 2402 
 			} else {
2403 2403 
 				$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);";
2404 2404 
 			}
2405 
-			$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);
2405 
+			$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);
2406 2406 
 			 try {
2407 2407 
 				$sth = $this->db->prepare($query);
2408 2408 
 				$sth->execute($query_values);
2409 
-			} catch(PDOException $e) {
2409 
+			} catch (PDOException $e) {
2410 2410 
 				return "error : ".$e->getMessage();
2411 2411 
 			}
2412 2412 
 		}
2413 2413 
 	}
2414 
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
2414 
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
2415 2415 
 		global $globalDBdriver;
2416 2416 
 		if ($airport_icao != '') {
2417 2417 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2427,16 +2427,16 @@  discard block
 
 block discarded – undo
2427 2427 
 					$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);";
2428 2428 
 				}
2429 2429 
 			}
2430 
-			$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);
2430 
+			$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);
2431 2431 
 			try {
2432 2432 
 				$sth = $this->db->prepare($query);
2433 2433 
 				$sth->execute($query_values);
2434 
-			} catch(PDOException $e) {
2434 
+			} catch (PDOException $e) {
2435 2435 
 				return "error : ".$e->getMessage();
2436 2436 
 			}
2437 2437 
 		}
2438 2438 
 	}
2439 
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
2439 
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
2440 2440 
 		global $globalDBdriver;
2441 2441 
 		if ($airport_icao != '') {
2442 2442 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2444,11 +2444,11 @@  discard block
 
 block discarded – undo
2444 2444 
 			} else {
2445 2445 
 				$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);";
2446 2446 
 			}
2447 
-			$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);
2447 
+			$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);
2448 2448 
 			try {
2449 2449 
 				$sth = $this->db->prepare($query);
2450 2450 
 				$sth->execute($query_values);
2451 
-			} catch(PDOException $e) {
2451 
+			} catch (PDOException $e) {
2452 2452 
 				return "error : ".$e->getMessage();
2453 2453 
 			}
2454 2454 
 		}
 
@@ -2460,7 +2460,7 @@  discard block
 
 block discarded – undo
2460 2460 
 		try {
2461 2461 
 			$sth = $this->db->prepare($query);
2462 2462 
 			$sth->execute($query_values);
2463 
-		} catch(PDOException $e) {
2463 
+		} catch (PDOException $e) {
2464 2464 
 			return "error : ".$e->getMessage();
2465 2465 
 		}
2466 2466 
 	}
 
@@ -2470,7 +2470,7 @@  discard block
 
 block discarded – undo
2470 2470 
 		try {
2471 2471 
 			$sth = $this->db->prepare($query);
2472 2472 
 			$sth->execute($query_values);
2473 
-		} catch(PDOException $e) {
2473 
+		} catch (PDOException $e) {
2474 2474 
 			return "error : ".$e->getMessage();
2475 2475 
 		}
2476 2476 
 	}
 
@@ -2480,7 +2480,7 @@  discard block
 
 block discarded – undo
2480 2480 
 		try {
2481 2481 
 			$sth = $this->db->prepare($query);
2482 2482 
 			$sth->execute($query_values);
2483 
-		} catch(PDOException $e) {
2483 
+		} catch (PDOException $e) {
2484 2484 
 			return "error : ".$e->getMessage();
2485 2485 
 		}
2486 2486 
 	}
 
@@ -2490,7 +2490,7 @@  discard block
 
 block discarded – undo
2490 2490 
 		try {
2491 2491 
 			$sth = $this->db->prepare($query);
2492 2492 
 			$sth->execute($query_values);
2493 
-		} catch(PDOException $e) {
2493 
+		} catch (PDOException $e) {
2494 2494 
 			return "error : ".$e->getMessage();
2495 2495 
 		}
2496 2496 
 	}
 
@@ -2500,13 +2500,13 @@  discard block
 
 block discarded – undo
2500 2500 
 		try {
2501 2501 
 			$sth = $this->db->prepare($query);
2502 2502 
 			$sth->execute($query_values);
2503 
-		} catch(PDOException $e) {
2503 
+		} catch (PDOException $e) {
2504 2504 
 			return "error : ".$e->getMessage();
2505 2505 
 		}
2506 2506 
 	}
2507 2507
2508 2508 
 	public function addOldStats() {
2509 
-		global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
2509 
+		global $globalMasterServer, $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
2510 2510 
 		$Common = new Common();
2511 2511 
 		$Connection = new Connection($this->db);
2512 2512 
 		date_default_timezone_set('UTC');
 
@@ -2521,9 +2521,9 @@  discard block
 
 block discarded – undo
2521 2521 
 			$filtername = 'marine';
2522 2522 
 			if ($Connection->tableExists('countries')) {
2523 2523 
 				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
2524 
-				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
2524 
+				$alldata = $Marine->countAllMarineOverCountries(false, 0, $last_update_day);
2525 2525 
 				foreach ($alldata as $number) {
2526 
-					echo $this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
2526 
+					echo $this->addStatCountryMarine($number['marine_country_iso2'], $number['marine_country_iso3'], $number['marine_country'], $number['marine_count'], '', '', $reset);
2527 2527 
 				}
2528 2528 
 			}
2529 2529 
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
 
@@ -2533,44 +2533,44 @@  discard block
 
 block discarded – undo
2533 2533 
 			$lastyear = false;
2534 2534 
 			foreach ($alldata as $number) {
2535 2535 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2536 
-				$this->addStat('marine_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2536 
+				$this->addStat('marine_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2537 2537 
 			}
2538 2538 
 			echo 'Marine data...'."\n";
2539 2539 
 			$this->deleteStatMarine('month');
2540 2540 
 			echo '-> countAllDatesLastMonth...'."\n";
2541 2541 
 			$alldata = $Marine->countAllDatesLastMonth($filter_last_month);
2542 2542 
 			foreach ($alldata as $number) {
2543 
-				$this->addStatMarine('month',$number['date_name'],$number['date_count']);
2543 
+				$this->addStatMarine('month', $number['date_name'], $number['date_count']);
2544 2544 
 			}
2545 2545 
 			echo '-> countAllDates...'."\n";
2546 2546 
 			$previousdata = $this->countAllDatesMarine();
2547 2547 
 			$this->deleteStatMarine('date');
2548 
-			$alldata = $Common->array_merge_noappend($previousdata,$Marine->countAllDates($filter_last_month));
2548 
+			$alldata = $Common->array_merge_noappend($previousdata, $Marine->countAllDates($filter_last_month));
2549 2549 
 			$values = array();
2550 2550 
 			foreach ($alldata as $cnt) {
2551 2551 
 				$values[] = $cnt['date_count'];
2552 2552 
 			}
2553 
-			array_multisort($values,SORT_DESC,$alldata);
2554 
-			array_splice($alldata,11);
2553 
+			array_multisort($values, SORT_DESC, $alldata);
2554 
+			array_splice($alldata, 11);
2555 2555 
 			foreach ($alldata as $number) {
2556 
-				$this->addStatMarine('date',$number['date_name'],$number['date_count']);
2556 
+				$this->addStatMarine('date', $number['date_name'], $number['date_count']);
2557 2557 
 			}
2558 2558
2559 2559 
 			$this->deleteStatMarine('hour');
2560 2560 
 			echo '-> countAllHours...'."\n";
2561 
-			$alldata = $Marine->countAllHours('hour',$filter_last_month);
2561 
+			$alldata = $Marine->countAllHours('hour', $filter_last_month);
2562 2562 
 			foreach ($alldata as $number) {
2563 
-				$this->addStatMarine('hour',$number['hour_name'],$number['hour_count']);
2563 
+				$this->addStatMarine('hour', $number['hour_name'], $number['hour_count']);
2564 2564 
 			}
2565 2565 
 			if ($globalDebug) echo 'Count all types...'."\n";
2566 
-			$alldata = $Marine->countAllMarineTypes(false,0,$last_update_day);
2566 
+			$alldata = $Marine->countAllMarineTypes(false, 0, $last_update_day);
2567 2567 
 			foreach ($alldata as $number) {
2568 
-				$this->addStatMarineType($number['marine_type'],$number['marine_type_id'],$number['marine_type_count'],'',$reset);
2568 
+				$this->addStatMarineType($number['marine_type'], $number['marine_type_id'], $number['marine_type_count'], '', $reset);
2569 2569 
 			}
2570 2570
2571 2571 
 			echo 'Insert last stats update date...'."\n";
2572 2572 
 			date_default_timezone_set('UTC');
2573 
-			$this->addLastStatsUpdate('last_update_stats_marine',date('Y-m-d G:i:s'));
2573 
+			$this->addLastStatsUpdate('last_update_stats_marine', date('Y-m-d G:i:s'));
2574 2574 
 		}
2575 2575 
 		if ((isset($globalTracker) && $globalTracker) || (isset($globalMasterServer) && $globalMasterServer)) {
2576 2576 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
 
@@ -2582,9 +2582,9 @@  discard block
 
 block discarded – undo
2582 2582 
 			$Tracker = new Tracker($this->db);
2583 2583 
 			if ($Connection->tableExists('countries')) {
2584 2584 
 				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
2585 
-				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
2585 
+				$alldata = $Tracker->countAllTrackerOverCountries(false, 0, $last_update_day);
2586 2586 
 				foreach ($alldata as $number) {
2587 
-					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
2587 
+					$this->addStatCountryTracker($number['tracker_country_iso2'], $number['tracker_country_iso3'], $number['tracker_country'], $number['tracker_count'], '', '', $reset);
2588 2588 
 				}
2589 2589 
 			}
2590 2590 
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
 
@@ -2594,43 +2594,43 @@  discard block
 
 block discarded – undo
2594 2594 
 			$lastyear = false;
2595 2595 
 			foreach ($alldata as $number) {
2596 2596 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2597 
-				$this->addStat('tracker_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2597 
+				$this->addStat('tracker_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2598 2598 
 			}
2599 2599 
 			echo 'Tracker data...'."\n";
2600 2600 
 			$this->deleteStatTracker('month');
2601 2601 
 			echo '-> countAllDatesLastMonth...'."\n";
2602 2602 
 			$alldata = $Tracker->countAllDatesLastMonth($filter_last_month);
2603 2603 
 			foreach ($alldata as $number) {
2604 
-				$this->addStatTracker('month',$number['date_name'],$number['date_count']);
2604 
+				$this->addStatTracker('month', $number['date_name'], $number['date_count']);
2605 2605 
 			}
2606 2606 
 			echo '-> countAllDates...'."\n";
2607 2607 
 			$previousdata = $this->countAllDatesTracker();
2608 2608 
 			$this->deleteStatTracker('date');
2609 
-			$alldata = $Common->array_merge_noappend($previousdata,$Tracker->countAllDates($filter_last_month));
2609 
+			$alldata = $Common->array_merge_noappend($previousdata, $Tracker->countAllDates($filter_last_month));
2610 2610 
 			$values = array();
2611 2611 
 			foreach ($alldata as $cnt) {
2612 2612 
 				$values[] = $cnt['date_count'];
2613 2613 
 			}
2614 
-			array_multisort($values,SORT_DESC,$alldata);
2615 
-			array_splice($alldata,11);
2614 
+			array_multisort($values, SORT_DESC, $alldata);
2615 
+			array_splice($alldata, 11);
2616 2616 
 			foreach ($alldata as $number) {
2617 
-				$this->addStatTracker('date',$number['date_name'],$number['date_count']);
2617 
+				$this->addStatTracker('date', $number['date_name'], $number['date_count']);
2618 2618 
 			}
2619 2619
2620 2620 
 			$this->deleteStatTracker('hour');
2621 2621 
 			echo '-> countAllHours...'."\n";
2622 
-			$alldata = $Tracker->countAllHours('hour',$filter_last_month);
2622 
+			$alldata = $Tracker->countAllHours('hour', $filter_last_month);
2623 2623 
 			foreach ($alldata as $number) {
2624 
-				$this->addStatTracker('hour',$number['hour_name'],$number['hour_count']);
2624 
+				$this->addStatTracker('hour', $number['hour_name'], $number['hour_count']);
2625 2625 
 			}
2626 2626 
 			if ($globalDebug) echo 'Count all types...'."\n";
2627 
-			$alldata = $Tracker->countAllTrackerTypes(false,0,$last_update_day);
2627 
+			$alldata = $Tracker->countAllTrackerTypes(false, 0, $last_update_day);
2628 2628 
 			foreach ($alldata as $number) {
2629 
-				$this->addStatTrackerType($number['tracker_type'],$number['tracker_type_count'],'',$reset);
2629 
+				$this->addStatTrackerType($number['tracker_type'], $number['tracker_type_count'], '', $reset);
2630 2630 
 			}
2631 2631 
 			echo 'Insert last stats update date...'."\n";
2632 2632 
 			date_default_timezone_set('UTC');
2633 
-			$this->addLastStatsUpdate('last_update_stats_tracker',date('Y-m-d G:i:s'));
2633 
+			$this->addLastStatsUpdate('last_update_stats_tracker', date('Y-m-d G:i:s'));
2634 2634 
 		}
2635 2635
2636 2636 
 		if (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft) || (isset($globalMasterServer) && $globalMasterServer)) {
 
@@ -2648,41 +2648,41 @@  discard block
 
 block discarded – undo
2648 2648 
 			$Spotter = new Spotter($this->db);
2649 2649
2650 2650 
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
2651 
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2651 
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
2652 2652 
 			foreach ($alldata as $number) {
2653 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2653 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
2654 2654 
 			}
2655 2655 
 			if ($globalDebug) echo 'Count all airlines...'."\n";
2656 
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2656 
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
2657 2657 
 			foreach ($alldata as $number) {
2658 
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2658 
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
2659 2659 
 			}
2660 2660 
 			if ($globalDebug) echo 'Count all registrations...'."\n";
2661 
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2661 
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
2662 2662 
 			foreach ($alldata as $number) {
2663 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2663 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
2664 2664 
 			}
2665 2665 
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
2666 
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2666 
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
2667 2667 
 			foreach ($alldata as $number) {
2668 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2668 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2669 2669 
 			}
2670 2670 
 			if ($globalDebug) echo 'Count all owners...'."\n";
2671 
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2671 
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
2672 2672 
 			foreach ($alldata as $number) {
2673 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2673 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
2674 2674 
 			}
2675 2675 
 			if ($globalDebug) echo 'Count all pilots...'."\n";
2676 
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2676 
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
2677 2677 
 			foreach ($alldata as $number) {
2678 2678 
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2679 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2679 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
2680 2680 
 			}
2681 2681
2682 2682 
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
2683 
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2683 
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
2684 2684 
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2685 
-			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2685 
+			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
2686 2686 
 			if ($globalDebug) echo 'Order departure airports...'."\n";
2687 2687 
 			$alldata = array();
2688 2688 
 			foreach ($pall as $value) {
 
@@ -2699,14 +2699,14 @@  discard block
 
 block discarded – undo
2699 2699 
 			foreach ($alldata as $key => $row) {
2700 2700 
 				$count[$key] = $row['airport_departure_icao_count'];
2701 2701 
 			}
2702 
-			array_multisort($count,SORT_DESC,$alldata);
2702 
+			array_multisort($count, SORT_DESC, $alldata);
2703 2703 
 			foreach ($alldata as $number) {
2704 
-				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);
2704 
+				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);
2705 2705 
 			}
2706 2706 
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2707 
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2707 
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
2708 2708 
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2709 
-			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2709 
+			$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
2710 2710 
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
2711 2711 
 			$alldata = array();
2712 2712 
 			foreach ($pall as $value) {
 
@@ -2723,18 +2723,18 @@  discard block
 
 block discarded – undo
2723 2723 
 			foreach ($alldata as $key => $row) {
2724 2724 
 				$count[$key] = $row['airport_arrival_icao_count'];
2725 2725 
 			}
2726 
-			array_multisort($count,SORT_DESC,$alldata);
2726 
+			array_multisort($count, SORT_DESC, $alldata);
2727 2727 
 			foreach ($alldata as $number) {
2728 
-				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);
2728 
+				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);
2729 2729 
 			}
2730 2730 
 			if ($Connection->tableExists('countries')) {
2731 2731 
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2732 2732 
 				//$SpotterArchive = new SpotterArchive();
2733 2733 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2734 2734 
 				$Spotter = new Spotter($this->db);
2735 
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
2735 
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
2736 2736 
 				foreach ($alldata as $number) {
2737 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
2737 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
2738 2738 
 				}
2739 2739 
 			}
2740 2740 
 			
@@ -2744,12 +2744,12 @@  discard block
 
 block discarded – undo
2744 2744 
 				$this->deleteStatsByType('fatalities_byyear');
2745 2745 
 				$alldata = $Accident->countFatalitiesByYear();
2746 2746 
 				foreach ($alldata as $number) {
2747 
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
2747 
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
2748 2748 
 				}
2749 2749 
 				$this->deleteStatsByType('fatalities_bymonth');
2750 2750 
 				$alldata = $Accident->countFatalitiesLast12Months();
2751 2751 
 				foreach ($alldata as $number) {
2752 
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
2752 
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
2753 2753 
 				}
2754 2754 
 			}
2755 2755 
 
@@ -2763,37 +2763,37 @@  discard block
 
 block discarded – undo
2763 2763 
 			$lastyear = false;
2764 2764 
 			foreach ($alldata as $number) {
2765 2765 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2766 
-				$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'])));
2766 
+				$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'])));
2767 2767 
 			}
2768 2768 
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2769 2769 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2770 2770 
 			foreach ($alldata as $number) {
2771 
-				$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'])));
2771 
+				$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'])));
2772 2772 
 			}
2773 2773 
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
2774 2774 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2775 2775 
 			foreach ($alldata as $number) {
2776 
-				$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'])));
2776 
+				$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'])));
2777 2777 
 			}
2778 2778 
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2779 2779 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2780 2780 
 			foreach ($alldata as $number) {
2781 
-				$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'])));
2781 
+				$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'])));
2782 2782 
 			}
2783 2783 
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2784 2784 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2785 2785 
 			foreach ($alldata as $number) {
2786 
-				$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'])));
2786 
+				$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'])));
2787 2787 
 			}
2788 2788 
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2789 2789 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2790 2790 
 			foreach ($alldata as $number) {
2791 
-				$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'])));
2791 
+				$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'])));
2792 2792 
 			}
2793 2793 
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2794 2794 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2795 2795 
 			foreach ($alldata as $number) {
2796 
-				$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'])));
2796 
+				$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'])));
2797 2797 
 			}
2798 2798 
 			if ($globalDebug) echo 'Airports data...'."\n";
2799 2799 
 			if ($globalDebug) echo '...Departure'."\n";
 
@@ -2838,7 +2838,7 @@  discard block
 
 block discarded – undo
2838 2838 
 			}
2839 2839 
 			$alldata = $pall;
2840 2840 
 			foreach ($alldata as $number) {
2841 
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
2841 
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
2842 2842 
 			}
2843 2843 
 			echo '...Arrival'."\n";
2844 2844 
 			$pall = $Spotter->getLast7DaysAirportsArrival();
 
@@ -2879,7 +2879,7 @@  discard block
 
 block discarded – undo
2879 2879 
 			}
2880 2880 
 			$alldata = $pall;
2881 2881 
 			foreach ($alldata as $number) {
2882 
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
2882 
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
2883 2883 
 			}
2884 2884
2885 2885 
 			echo 'Flights data...'."\n";
 
@@ -2887,28 +2887,28 @@  discard block
 
 block discarded – undo
2887 2887 
 			echo '-> countAllDatesLastMonth...'."\n";
2888 2888 
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
2889 2889 
 			foreach ($alldata as $number) {
2890 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
2890 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
2891 2891 
 			}
2892 2892 
 			echo '-> countAllDates...'."\n";
2893 2893 
 			$previousdata = $this->countAllDates();
2894 2894 
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
2895 2895 
 			$this->deleteStatFlight('date');
2896 
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
2896 
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
2897 2897 
 			$values = array();
2898 2898 
 			foreach ($alldata as $cnt) {
2899 2899 
 				$values[] = $cnt['date_count'];
2900 2900 
 			}
2901 
-			array_multisort($values,SORT_DESC,$alldata);
2902 
-			array_splice($alldata,11);
2901 
+			array_multisort($values, SORT_DESC, $alldata);
2902 
+			array_splice($alldata, 11);
2903 2903 
 			foreach ($alldata as $number) {
2904 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
2904 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
2905 2905 
 			}
2906 2906
2907 2907 
 			$this->deleteStatFlight('hour');
2908 2908 
 			echo '-> countAllHours...'."\n";
2909 
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
2909 
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
2910 2910 
 			foreach ($alldata as $number) {
2911 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
2911 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
2912 2912 
 			}
2913 2913
2914 2914 
 			// Count by airlines
 
@@ -2917,42 +2917,42 @@  discard block
 
 block discarded – undo
2917 2917 
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2918 2918 
 				$SpotterArchive = new SpotterArchive($this->db);
2919 2919 
 				//$Spotter = new Spotter($this->db);
2920 
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2920 
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
2921 2921 
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2922 2922 
 				foreach ($alldata as $number) {
2923 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2923 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
2924 2924 
 				}
2925 2925 
 			}
2926 2926 
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2927 2927 
 			$Spotter = new Spotter($this->db);
2928 
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2928 
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
2929 2929 
 			foreach ($alldata as $number) {
2930 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2930 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
2931 2931 
 			}
2932 2932 
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2933 
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2933 
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
2934 2934 
 			foreach ($alldata as $number) {
2935 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2935 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
2936 2936 
 			}
2937 2937 
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2938 
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2938 
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
2939 2939 
 			foreach ($alldata as $number) {
2940 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2940 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2941 2941 
 			}
2942 2942 
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2943 
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2943 
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
2944 2944 
 			foreach ($alldata as $number) {
2945 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2945 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
2946 2946 
 			}
2947 2947 
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2948 
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2948 
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
2949 2949 
 			foreach ($alldata as $number) {
2950 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2950 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
2951 2951 
 			}
2952 2952 
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2953 
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2953 
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
2954 2954 
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2955 
-			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2955 
+			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
2956 2956 
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2957 2957 
 			//$alldata = array();
2958 2958 
 			foreach ($dall as $value) {
 
@@ -2972,12 +2972,12 @@  discard block
 
 block discarded – undo
2972 2972 
 			}
2973 2973 
 			$alldata = $pall;
2974 2974 
 			foreach ($alldata as $number) {
2975 
-				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);
2975 
+				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);
2976 2976 
 			}
2977 2977 
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2978 
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2978 
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
2979 2979 
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2980 
-			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2980 
+			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
2981 2981 
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2982 2982 
 			//$alldata = array();
2983 2983 
 			foreach ($dall as $value) {
 
@@ -2997,7 +2997,7 @@  discard block
 
 block discarded – undo
2997 2997 
 			}
2998 2998 
 			$alldata = $pall;
2999 2999 
 			foreach ($alldata as $number) {
3000 
-				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);
3000 
+				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);
3001 3001 
 			}
3002 3002 
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
3003 3003 
 			$Spotter = new Spotter($this->db);
 
@@ -3005,27 +3005,27 @@  discard block
 
 block discarded – undo
3005 3005 
 			$lastyear = false;
3006 3006 
 			foreach ($alldata as $number) {
3007 3007 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
3008 
-				$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']);
3008 
+				$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']);
3009 3009 
 			}
3010 3010 
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
3011 3011 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
3012 3012 
 			foreach ($alldata as $number) {
3013 
-				$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']);
3013 
+				$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']);
3014 3014 
 			}
3015 3015 
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
3016 3016 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
3017 3017 
 			foreach ($alldata as $number) {
3018 
-				$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']);
3018 
+				$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']);
3019 3019 
 			}
3020 3020 
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
3021 3021 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
3022 3022 
 			foreach ($alldata as $number) {
3023 
-				$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']);
3023 
+				$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']);
3024 3024 
 			}
3025 3025 
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
3026 3026 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
3027 3027 
 			foreach ($alldata as $number) {
3028 
-				$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']);
3028 
+				$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']);
3029 3029 
 			}
3030 3030 
 			if ($globalDebug) echo '...Departure'."\n";
3031 3031 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
 
@@ -3048,7 +3048,7 @@  discard block
 
 block discarded – undo
3048 3048 
 			}
3049 3049 
 			$alldata = $pall;
3050 3050 
 			foreach ($alldata as $number) {
3051 
-				$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']);
3051 
+				$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']);
3052 3052 
 			}
3053 3053 
 			if ($globalDebug) echo '...Arrival'."\n";
3054 3054 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
 
@@ -3071,32 +3071,32 @@  discard block
 
 block discarded – undo
3071 3071 
 			}
3072 3072 
 			$alldata = $pall;
3073 3073 
 			foreach ($alldata as $number) {
3074 
-				$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']);
3074 
+				$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']);
3075 3075 
 			}
3076 3076
3077 3077 
 			if ($globalDebug) echo 'Flights data...'."\n";
3078 3078 
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
3079 3079 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
3080 3080 
 			foreach ($alldata as $number) {
3081 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
3081 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
3082 3082 
 			}
3083 3083 
 			if ($globalDebug) echo '-> countAllDates...'."\n";
3084 3084 
 			//$previousdata = $this->countAllDatesByAirlines();
3085 
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
3085 
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
3086 3086 
 			$values = array();
3087 3087 
 			foreach ($alldata as $cnt) {
3088 3088 
 				$values[] = $cnt['date_count'];
3089 3089 
 			}
3090 
-			array_multisort($values,SORT_DESC,$alldata);
3091 
-			array_splice($alldata,11);
3090 
+			array_multisort($values, SORT_DESC, $alldata);
3091 
+			array_splice($alldata, 11);
3092 3092 
 			foreach ($alldata as $number) {
3093 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
3093 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
3094 3094 
 			}
3095 3095
3096 3096 
 			if ($globalDebug) echo '-> countAllHours...'."\n";
3097 
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
3097 
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
3098 3098 
 			foreach ($alldata as $number) {
3099 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
3099 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
3100 3100 
 			}
3101 3101
3102 3102 
 			// Stats by filters
 
@@ -3120,7 +3120,7 @@  discard block
 
 block discarded – undo
3120 3120 
 							$last_update_day = date('Y').'-01-01 00:00:00';
3121 3121 
 						}
3122 3122 
 					}
3123 
-					if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
3123 
+					if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
3124 3124 
 						$last_update_day = date('Y').'-01-01 00:00:00';
3125 3125 
 						$reset = true;
3126 3126 
 					}
 
@@ -3128,38 +3128,38 @@  discard block
 
 block discarded – undo
3128 3128 
 					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
3129 3129 
 					$Spotter = new Spotter($this->db);
3130 3130 
 					if ($globalDebug) echo 'Count all aircraft types...'."\n";
3131 
-					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
3131 
+					$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
3132 3132 
 					foreach ($alldata as $number) {
3133 
-						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
3133 
+						$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
3134 3134 
 					}
3135 3135 
 					if ($globalDebug) echo 'Count all airlines...'."\n";
3136 
-					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
3136 
+					$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
3137 3137 
 					foreach ($alldata as $number) {
3138 
-						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
3138 
+						$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
3139 3139 
 					}
3140 3140 
 					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
3141 
-					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
3141 
+					$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
3142 3142 
 					foreach ($alldata as $number) {
3143 
-						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
3143 
+						$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
3144 3144 
 					}
3145 3145 
 					if ($globalDebug) echo 'Count all callsigns...'."\n";
3146 
-					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
3146 
+					$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
3147 3147 
 					foreach ($alldata as $number) {
3148 
-						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
3148 
+						$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
3149 3149 
 					}
3150 3150 
 					if ($globalDebug) echo 'Count all owners...'."\n";
3151 
-					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
3151 
+					$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
3152 3152 
 					foreach ($alldata as $number) {
3153 
-						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
3153 
+						$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
3154 3154 
 					}
3155 3155 
 					if ($globalDebug) echo 'Count all pilots...'."\n";
3156 
-					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
3156 
+					$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
3157 3157 
 					foreach ($alldata as $number) {
3158 
-						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
3158 
+						$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
3159 3159 
 					}
3160 3160 
 					if ($globalDebug) echo 'Count departure airports...'."\n";
3161 
-					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
3162 
-					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
3161 
+					$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
3162 
+					$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
3163 3163 
 					$alldata = array();
3164 3164 
 					foreach ($pall as $value) {
3165 3165 
 						$icao = $value['airport_departure_icao'];
 
@@ -3175,13 +3175,13 @@  discard block
 
 block discarded – undo
3175 3175 
 					foreach ($alldata as $key => $row) {
3176 3176 
 						$count[$key] = $row['airport_departure_icao_count'];
3177 3177 
 					}
3178 
-					array_multisort($count,SORT_DESC,$alldata);
3178 
+					array_multisort($count, SORT_DESC, $alldata);
3179 3179 
 					foreach ($alldata as $number) {
3180 
-						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);
3180 
+						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);
3181 3181 
 					}
3182 3182 
 					if ($globalDebug) echo 'Count all arrival airports...'."\n";
3183 
-					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
3184 
-					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
3183 
+					$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
3184 
+					$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
3185 3185 
 					$alldata = array();
3186 3186 
 					foreach ($pall as $value) {
3187 3187 
 						$icao = $value['airport_arrival_icao'];
 
@@ -3197,9 +3197,9 @@  discard block
 
 block discarded – undo
3197 3197 
 					foreach ($alldata as $key => $row) {
3198 3198 
 						$count[$key] = $row['airport_arrival_icao_count'];
3199 3199 
 					}
3200 
-					array_multisort($count,SORT_DESC,$alldata);
3200 
+					array_multisort($count, SORT_DESC, $alldata);
3201 3201 
 					foreach ($alldata as $number) {
3202 
-						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);
3202 
+						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);
3203 3203 
 					}
3204 3204 
 					if ($globalDebug) echo 'Count all months...'."\n";
3205 3205 
 					$Spotter = new Spotter($this->db);
 
@@ -3207,36 +3207,36 @@  discard block
 
 block discarded – undo
3207 3207 
 					$lastyear = false;
3208 3208 
 					foreach ($alldata as $number) {
3209 3209 
 						if ($number['year_name'] != date('Y')) $lastyear = true;
3210 
-						$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);
3210 
+						$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);
3211 3211 
 					}
3212 3212 
 					if ($globalDebug) echo 'Count all owners by months...'."\n";
3213 3213 
 					$alldata = $Spotter->countAllMonthsOwners($filter);
3214 3214 
 					foreach ($alldata as $number) {
3215 
-						$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);
3215 
+						$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);
3216 3216 
 					}
3217 3217 
 					if ($globalDebug) echo 'Count all pilots by months...'."\n";
3218 3218 
 					$alldata = $Spotter->countAllMonthsPilots($filter);
3219 3219 
 					foreach ($alldata as $number) {
3220 
-						$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);
3220 
+						$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);
3221 3221 
 					}
3222 3222 
 					if ($globalDebug) echo 'Count all military by months...'."\n";
3223 3223 
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
3224 3224 
 					foreach ($alldata as $number) {
3225 
-						$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);
3225 
+						$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);
3226 3226 
 					}
3227 3227 
 					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
3228 3228 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
3229 3229 
 				    	foreach ($alldata as $number) {
3230 
-			    			$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);
3230 
+			    			$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);
3231 3231 
 					}
3232 3232 
 					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
3233 3233 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
3234 3234 
 					foreach ($alldata as $number) {
3235 
-						$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);
3235 
+						$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);
3236 3236 
 					}
3237 3237 
 					echo '...Departure'."\n";
3238 
-					$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
3239 
-					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
3238 
+					$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
3239 
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
3240 3240 
 					foreach ($dall as $value) {
3241 3241 
 						$icao = $value['departure_airport_icao'];
3242 3242 
 						$ddate = $value['date'];
 
@@ -3254,11 +3254,11 @@  discard block
 
 block discarded – undo
3254 3254 
 					}
3255 3255 
 					$alldata = $pall;
3256 3256 
 					foreach ($alldata as $number) {
3257 
-						$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);
3257 
+						$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);
3258 3258 
 					}
3259 3259 
 					echo '...Arrival'."\n";
3260 
-					$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
3261 
-					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
3260 
+					$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
3261 
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
3262 3262 
 					foreach ($dall as $value) {
3263 3263 
 						$icao = $value['arrival_airport_icao'];
3264 3264 
 						$ddate = $value['date'];
 
@@ -3276,39 +3276,39 @@  discard block
 
 block discarded – undo
3276 3276 
 					}
3277 3277 
 					$alldata = $pall;
3278 3278 
 					foreach ($alldata as $number) {
3279 
-						$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);
3279 
+						$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);
3280 3280 
 					}
3281 3281 
 					echo 'Flights data...'."\n";
3282 3282 
 					echo '-> countAllDatesLastMonth...'."\n";
3283 3283 
 					$alldata = $Spotter->countAllDatesLastMonth($filter);
3284 3284 
 					foreach ($alldata as $number) {
3285 
-						$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
3285 
+						$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
3286 3286 
 					}
3287 3287 
 					echo '-> countAllDates...'."\n";
3288 
-					$previousdata = $this->countAllDates('',$filter_name);
3289 
-					$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
3288 
+					$previousdata = $this->countAllDates('', $filter_name);
3289 
+					$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
3290 3290 
 					$values = array();
3291 3291 
 					foreach ($alldata as $cnt) {
3292 3292 
 						$values[] = $cnt['date_count'];
3293 3293 
 					}
3294 
-					array_multisort($values,SORT_DESC,$alldata);
3295 
-					array_splice($alldata,11);
3294 
+					array_multisort($values, SORT_DESC, $alldata);
3295 
+					array_splice($alldata, 11);
3296 3296 
 					foreach ($alldata as $number) {
3297 
-						$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
3297 
+						$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
3298 3298 
 					}
3299 3299
3300 3300 
 					echo '-> countAllHours...'."\n";
3301 
-					$alldata = $Spotter->countAllHours('hour',$filter);
3301 
+					$alldata = $Spotter->countAllHours('hour', $filter);
3302 3302 
 					foreach ($alldata as $number) {
3303 
-						$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
3303 
+						$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
3304 3304 
 					}
3305 3305 
 					echo 'Insert last stats update date...'."\n";
3306 3306 
 					date_default_timezone_set('UTC');
3307 
-					$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
3307 
+					$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
3308 3308 
 					if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
3309 
-						if (date('Y',strtotime($last_update_day)) != date('Y')) {
3309 
+						if (date('Y', strtotime($last_update_day)) != date('Y')) {
3310 3310 
 							$this->deleteOldStats($filter_name);
3311 
-							$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
3311 
+							$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
3312 3312 
 						}
3313 3313 
 					}
3314 3314 
 				}
 
@@ -3321,16 +3321,16 @@  discard block
 
 block discarded – undo
3321 3321 
 				// SUM all previous month to put as year
3322 3322 
 				$previous_year = date('Y');
3323 3323 
 				$previous_year--;
3324 
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3325 
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3326 
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3327 
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
3324 
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3325 
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3326 
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3327 
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
3328 3328 
 				$allairlines = $this->getAllAirlineNames();
3329 3329 
 				foreach ($allairlines as $data) {
3330 
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3331 
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3332 
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3333 
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
3330 
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3331 
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3332 
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3333 
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
3334 3334 
 				}
3335 3335
3336 3336 
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
 
@@ -3339,21 +3339,21 @@  discard block
 
 block discarded – undo
3339 3339 
 						try {
3340 3340 
 							$sth = $this->db->prepare($query);
3341 3341 
 							$sth->execute();
3342 
-						} catch(PDOException $e) {
3342 
+						} catch (PDOException $e) {
3343 3343 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
3344 3344 
 						}
3345 3345 
 						$query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'";
3346 3346 
 						try {
3347 3347 
 							$sth = $this->db->prepare($query);
3348 3348 
 							$sth->execute();
3349 
-						} catch(PDOException $e) {
3349 
+						} catch (PDOException $e) {
3350 3350 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
3351 3351 
 						}
3352 3352 
 						$query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'";
3353 3353 
 						try {
3354 3354 
 							$sth = $this->db->prepare($query);
3355 3355 
 							$sth->execute();
3356 
-						} catch(PDOException $e) {
3356 
+						} catch (PDOException $e) {
3357 3357 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
3358 3358 
 						}
3359 3359 
 					}
 
@@ -3366,7 +3366,7 @@  discard block
 
 block discarded – undo
3366 3366 
 					try {
3367 3367 
 						$sth = $this->db->prepare($query);
3368 3368 
 						$sth->execute();
3369 
-					} catch(PDOException $e) {
3369 
+					} catch (PDOException $e) {
3370 3370 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
3371 3371 
 					}
3372 3372 
 					if ($globalDBdriver == 'mysql') {
 
@@ -3377,7 +3377,7 @@  discard block
 
 block discarded – undo
3377 3377 
 					try {
3378 3378 
 						$sth = $this->db->prepare($query);
3379 3379 
 						$sth->execute();
3380 
-					} catch(PDOException $e) {
3380 
+					} catch (PDOException $e) {
3381 3381 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
3382 3382 
 					}
3383 3383 
 					if ($globalDBdriver == 'mysql') {
 
@@ -3388,15 +3388,15 @@  discard block
 
 block discarded – undo
3388 3388 
 					try {
3389 3389 
 						$sth = $this->db->prepare($query);
3390 3390 
 						$sth->execute();
3391 
-					} catch(PDOException $e) {
3391 
+					} catch (PDOException $e) {
3392 3392 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
3393 3393 
 					}
3394 3394 
 				}
3395 3395 
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
3396 3396 
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
3397 
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
3397 
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
3398 3398 
 						$this->deleteOldStats();
3399 
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
3399 
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
3400 3400 
 						$lastyearupdate = true;
3401 3401 
 					}
3402 3402 
 				}
 
@@ -3418,7 +3418,7 @@  discard block
 
 block discarded – undo
3418 3418 
 					try {
3419 3419 
 						$sth = $this->db->prepare($query);
3420 3420 
 						$sth->execute();
3421 
-					} catch(PDOException $e) {
3421 
+					} catch (PDOException $e) {
3422 3422 
 						return "error : ".$e->getMessage();
3423 3423 
 					}
3424 3424 
 					echo 'Archive old tracker data...'."\n";
 
@@ -3434,7 +3434,7 @@  discard block
 
 block discarded – undo
3434 3434 
 					try {
3435 3435 
 						$sth = $this->db->prepare($query);
3436 3436 
 						$sth->execute();
3437 
-					} catch(PDOException $e) {
3437 
+					} catch (PDOException $e) {
3438 3438 
 						return "error : ".$e->getMessage();
3439 3439 
 					}
3440 3440 
 					echo 'Archive old marine data...'."\n";
 
@@ -3450,7 +3450,7 @@  discard block
 
 block discarded – undo
3450 3450 
 					try {
3451 3451 
 						$sth = $this->db->prepare($query);
3452 3452 
 						$sth->execute();
3453 
-					} catch(PDOException $e) {
3453 
+					} catch (PDOException $e) {
3454 3454 
 						return "error : ".$e->getMessage();
3455 3455 
 					}
3456 3456 
 				}
 
@@ -3463,7 +3463,7 @@  discard block
 
 block discarded – undo
3463 3463 
 				try {
3464 3464 
 					$sth = $this->db->prepare($query);
3465 3465 
 					$sth->execute();
3466 
-				} catch(PDOException $e) {
3466 
+				} catch (PDOException $e) {
3467 3467 
 					return "error : ".$e->getMessage();
3468 3468 
 				}
3469 3469 
 				echo 'Deleting old tracker data...'."\n";
 
@@ -3475,7 +3475,7 @@  discard block
 
 block discarded – undo
3475 3475 
 				try {
3476 3476 
 					$sth = $this->db->prepare($query);
3477 3477 
 					$sth->execute();
3478 
-				} catch(PDOException $e) {
3478 
+				} catch (PDOException $e) {
3479 3479 
 					return "error : ".$e->getMessage();
3480 3480 
 				}
3481 3481 
 				echo 'Deleting old marine data...'."\n";
 
@@ -3487,14 +3487,14 @@  discard block
 
 block discarded – undo
3487 3487 
 				try {
3488 3488 
 					$sth = $this->db->prepare($query);
3489 3489 
 					$sth->execute();
3490 
-				} catch(PDOException $e) {
3490 
+				} catch (PDOException $e) {
3491 3491 
 					return "error : ".$e->getMessage();
3492 3492 
 				}
3493 3493 
 			}
3494 3494 
 			if (!isset($lastyearupdate)) {
3495 3495 
 				echo 'Insert last stats update date...'."\n";
3496 3496 
 				date_default_timezone_set('UTC');
3497 
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
3497 
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
3498 3498 
 			}
3499 3499 
 			if ($globalStatsResetYear) {
3500 3500 
 				require_once(dirname(__FILE__).'/../install/class.settings.php');
Please login to merge, or discard this patch.
getLatestData-tv.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -5,14 +5,14 @@
 
 block discarded – undo
5 5 
 require_once('require/class.Language.php');
6 6
7 7 
 header('Content-Type: text/javascript');
8 
-$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
8 
+$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
9 9 
 $SpotterLive = new SpotterLive();
10 10 
 $spotter_array = $SpotterLive->getRealTimeData($q);
11 11
12 12 
 $output = '{';
13 13 
 $output .= '"flights": [';
14 14 
 if (!empty($spotter_array)) {
15 
-	foreach($spotter_array as $spotter_item)
15 
+	foreach ($spotter_array as $spotter_item)
16 16 
 	{
17 17 
 		$output .= '{';
18 18 
 		$output .= '"flight_id": "'.$spotter_item['spotter_id'].'",';
Please login to merge, or discard this patch.
tv.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -29,7 +29,7 @@  discard block
 
 block discarded – undo
29 29 
 <?php
30 30 
 if (isset($_GET['q']))
31 31 
 {
32 
-	$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
32 
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
33 33 
 	$spotter_array = $Spotter->searchSpotterData($q, "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "0,10", "", "");
34 34 
 } else {
35 35 
 	$spotter_array = $Spotter->getLatestSpotterData("0,10", "");
 
@@ -148,18 +148,18 @@  discard block
 
 block discarded – undo
148 148
149 149 
 <?php
150 150 
 	if (isset($_GET['image']) && isset($_GET['q'])) {
151 
-		$image = filter_input(INPUT_GET,'image',FILTER_SANITIZE_STRING);
152 
-		$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
151 
+		$image = filter_input(INPUT_GET, 'image', FILTER_SANITIZE_STRING);
152 
+		$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
153 153 
 ?>
154 154 
    $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&image=<?php print $image; ?>&q=<?php print $q; ?>", function( data ) {
155 155 
 <?php
156 156 
 	} elseif (isset($_GET['image'])) {
157 
-		$image = filter_input(INPUT_GET,'image',FILTER_SANITIZE_STRING);
157 
+		$image = filter_input(INPUT_GET, 'image', FILTER_SANITIZE_STRING);
158 158 
 ?>
159 159 
    $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&image=<?php print $image; ?>", function( data ) {
160 160 
 <?php
161 161 
 	} elseif (isset($_GET['q'])) {
162 
-		$q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING);
162 
+		$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
163 163 
 ?>
164 164 
    $.getJSON( "<?php print $globalURL; ?>/getLatestData-tv.php?other_i="+other_i+"&q=<?php print $q; ?>", function( data ) {
165 165 
 <?php
Please login to merge, or discard this patch.
notam-geojson.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -10,24 +10,24 @@  discard block
 
 block discarded – undo
10 10
11 11 
 if (isset($_GET['coord']))
12 12 
 {
13 
-	$coords = explode(',',$_GET['coord']);
13 
+	$coords = explode(',', $_GET['coord']);
14 14 
 	if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] != '' && $_COOKIE['notamscope'] != 'All') {
15 
-		$scope = filter_var($_COOKIE['notamscope'],FILTER_SANITIZE_STRING);
16 
-		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
15 
+		$scope = filter_var($_COOKIE['notamscope'], FILTER_SANITIZE_STRING);
16 
+		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
17 17 
 	} elseif (isset($_GET['scope']) && $_GET['scope'] != '' && $_GET['scope'] != 'All') {
18 
-		$scope = filter_input(INPUT_GET,'scope',FILTER_SANITIZE_STRING);
19 
-		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
18 
+		$scope = filter_input(INPUT_GET, 'scope', FILTER_SANITIZE_STRING);
19 
+		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
20 20 
 	} else {
21 21 
 		$spotter_array = $NOTAM->getAllNOTAMbyCoord($coords);
22 22 
 	}
23 23 
 //	$spotter_array = $NOTAM->getAllNOTAM();
24 24 
 } else {
25 25 
 	if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] != '' && $_COOKIE['notamscope'] != 'All') {
26 
-		$scope = filter_var($_COOKIE['notamscope'],FILTER_SANITIZE_STRING);
26 
+		$scope = filter_var($_COOKIE['notamscope'], FILTER_SANITIZE_STRING);
27 27 
 		$spotter_array = $NOTAM->getAllNOTAMbyScope($scope);
28 28 
 	} elseif (isset($_GET['scope']) && $_GET['scope'] != '' && $_GET['scope'] != 'All') {
29 
-		$scope = filter_input(INPUT_GET,'scope',FILTER_SANITIZE_STRING);
30 
-		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords,$scope);
29 
+		$scope = filter_input(INPUT_GET, 'scope', FILTER_SANITIZE_STRING);
30 
+		$spotter_array = $NOTAM->getAllNOTAMbyCoordScope($coords, $scope);
31 31 
 	} else {
32 32 
 		$spotter_array = $NOTAM->getAllNOTAM();
33 33 
 	}
 
@@ -37,7 +37,7 @@  discard block
 
 block discarded – undo
37 37
38 38 
 if (!empty($spotter_array))
39 39 
 {
40 
-	foreach($spotter_array as $spotter_item)
40 
+	foreach ($spotter_array as $spotter_item)
41 41 
 	{
42 42 
 		date_default_timezone_set('UTC');
43 43 
 		//waypoint plotting
 
@@ -46,7 +46,7 @@  discard block
 
 block discarded – undo
46 46 
 			$output .= '"ref": "'.$spotter_item['ref'].'",';
47 47 
 			$output .= '"title": "'.$spotter_item['title'].'",';
48 48 
 			$output .= '"fir": "'.$spotter_item['fir'].'",';
49 
-			$output .= '"text": "'.str_replace(array("\r\n", "\r", "\n"),'<br />',str_replace(array('"',"\t"), '',$spotter_item['notam_text'])).'",';
49 
+			$output .= '"text": "'.str_replace(array("\r\n", "\r", "\n"), '<br />', str_replace(array('"', "\t"), '', $spotter_item['notam_text'])).'",';
50 50 
 			$output .= '"latitude": '.$spotter_item['center_latitude'].',';
51 51 
 			$output .= '"longitude": '.$spotter_item['center_longitude'].',';
52 52 
 			$output .= '"lower_limit": '.$spotter_item['lower_limit'].',';
 
@@ -85,7 +85,7 @@  discard block
 
 block discarded – undo
85 85 
 		    $output .= '}';
86 86 
 		$output .= '},';
87 87 
 	}
88 
-	$output  = substr($output, 0, -1);
88 
+	$output = substr($output, 0, -1);
89 89 
 }
90 90 
 $output .= ']}';
91 91
Please login to merge, or discard this patch.
require/libs/SimplePie.compiled.php 1 patch
Spacing   +250 added lines, -250 removed lines patch added patch discarded remove patch 
@@ -69,12 +69,12 @@  discard block
 
 block discarded – undo
69 69 
  * SimplePie Useragent
70 70 
  * @see SimplePie::set_useragent()
71 71 
  */
72 
-define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
72 
+define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME.'/'.SIMPLEPIE_VERSION.' (Feed Parser; '.SIMPLEPIE_URL.'; Allow like Gecko) Build/'.SIMPLEPIE_BUILD);
73 73
74 74 
 /**
75 75 
  * SimplePie Linkback
76 76 
  */
77 
-define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
77 
+define('SIMPLEPIE_LINKBACK', '<a href="'.SIMPLEPIE_URL.'" title="'.SIMPLEPIE_NAME.' '.SIMPLEPIE_VERSION.'">'.SIMPLEPIE_NAME.'</a>');
78 78
79 79 
 /**
80 80 
  * No Autodiscovery
 
@@ -785,7 +785,7 @@  discard block
 
 block discarded – undo
785 785 
 		{
786 786 
 			$this->feed_url = $file->url;
787 787 
 			$this->permanent_url = $this->feed_url;
788 
-			$this->file =& $file;
788 
+			$this->file = & $file;
789 789 
 			return true;
790 790 
 		}
791 791 
 		return false;
 
@@ -873,7 +873,7 @@  discard block
 
 block discarded – undo
873 873 
 	 */
874 874 
 	public function force_cache_fallback($enable = false)
875 875 
 	{
876 
-		$this->force_cache_fallback= (bool) $enable;
876 
+		$this->force_cache_fallback = (bool) $enable;
877 877 
 	}
878 878
879 879 
 	/**
 
@@ -1258,7 +1258,7 @@  discard block
 
 block discarded – undo
1258 1258 
 	{
1259 1259 
 		if ($page !== false)
1260 1260 
 		{
1261 
-			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
1261 
+			$this->sanitize->set_image_handler($page.'?'.$qs.'=');
1262 1262 
 		}
1263 1263 
 		else
1264 1264 
 		{
 
@@ -1389,7 +1389,7 @@  discard block
 
 block discarded – undo
1389 1389 
 		}
1390 1390
1391 1391 
 		// Empty response check
1392 
-		if(empty($this->raw_data)){
1392 
+		if (empty($this->raw_data)) {
1393 1393 
 			$this->error = "A feed could not be found at `$this->feed_url`. Empty body.";
1394 1394 
 			$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
1395 1395 
 			return false;
 
@@ -1455,7 +1455,7 @@  discard block
 
 block discarded – undo
1455 1455 
 				if ($parser->parse($utf8_data, 'UTF-8', $this->permanent_url))
1456 1456 
 				{
1457 1457 
 					$this->data = $parser->get_data();
1458 
-					if (!($this->get_type() & ~SIMPLEPIE_TYPE_NONE))
1458 
+					if (!($this->get_type()&~SIMPLEPIE_TYPE_NONE))
1459 1459 
 					{
1460 1460 
 						$this->error = "A feed could not be found at `$this->feed_url`. This does not appear to be a valid RSS or Atom feed.";
1461 1461 
 						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
 
@@ -1500,7 +1500,7 @@  discard block
 
 block discarded – undo
1500 1500 
 				if (!class_exists('\UConverter')) {
1501 1501 
 					$missingExtensions[] = 'intl (PHP 5.5+)';
1502 1502 
 				}
1503 
-				$this->error .= ' Try installing/enabling the ' . implode(' or ', $missingExtensions) . ' extension.';
1503 
+				$this->error .= ' Try installing/enabling the '.implode(' or ', $missingExtensions).' extension.';
1504 1504 
 			}
1505 1505 
 		}
1506 1506 
 
@@ -1591,7 +1591,7 @@  discard block
 
 block discarded – undo
1591 1591 
 						else
1592 1592 
 						{
1593 1593 
 							$this->check_modified = false;
1594 
-							if($this->force_cache_fallback)
1594 
+							if ($this->force_cache_fallback)
1595 1595 
 							{
1596 1596 
 								$cache->touch();
1597 1597 
 								return true;
 
@@ -1620,7 +1620,7 @@  discard block
 
 block discarded – undo
1620 1620 
 		{
1621 1621 
 			if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
1622 1622 
 			{
1623 
-				$file =& $this->file;
1623 
+				$file = & $this->file;
1624 1624 
 			}
1625 1625 
 			else
1626 1626 
 			{
 
@@ -1631,7 +1631,7 @@  discard block
 
 block discarded – undo
1631 1631 
 			}
1632 1632 
 		}
1633 1633 
 		// If the file connection has an error, set SimplePie::error to that and quit
1634 
-		if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
1634 
+		if (!$file->success && !($file->method&SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
1635 1635 
 		{
1636 1636 
 			$this->error = $file->error;
1637 1637 
 			return !empty($this->data);
 
@@ -1786,7 +1786,7 @@  discard block
 
 block discarded – undo
1786 1786 
 			$header = "Content-type: $mime;";
1787 1787 
 			if ($this->get_encoding())
1788 1788 
 			{
1789 
-				$header .= ' charset=' . $this->get_encoding();
1789 
+				$header .= ' charset='.$this->get_encoding();
1790 1790 
 			}
1791 1791 
 			else
1792 1792 
 			{
 
@@ -1978,28 +1978,28 @@  discard block
 
 block discarded – undo
1978 1978 
 	public function get_feed_tags($namespace, $tag)
1979 1979 
 	{
1980 1980 
 		$type = $this->get_type();
1981 
-		if ($type & SIMPLEPIE_TYPE_ATOM_10)
1981 
+		if ($type&SIMPLEPIE_TYPE_ATOM_10)
1982 1982 
 		{
1983 1983 
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag]))
1984 1984 
 			{
1985 1985 
 				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag];
1986 1986 
 			}
1987 1987 
 		}
1988 
-		if ($type & SIMPLEPIE_TYPE_ATOM_03)
1988 
+		if ($type&SIMPLEPIE_TYPE_ATOM_03)
1989 1989 
 		{
1990 1990 
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag]))
1991 1991 
 			{
1992 1992 
 				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag];
1993 1993 
 			}
1994 1994 
 		}
1995 
-		if ($type & SIMPLEPIE_TYPE_RSS_RDF)
1995 
+		if ($type&SIMPLEPIE_TYPE_RSS_RDF)
1996 1996 
 		{
1997 1997 
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag]))
1998 1998 
 			{
1999 1999 
 				return $this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag];
2000 2000 
 			}
2001 2001 
 		}
2002 
-		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
2002 
+		if ($type&SIMPLEPIE_TYPE_RSS_SYNDICATION)
2003 2003 
 		{
2004 2004 
 			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag]))
2005 2005 
 			{
 
@@ -2026,14 +2026,14 @@  discard block
 
 block discarded – undo
2026 2026 
 	public function get_channel_tags($namespace, $tag)
2027 2027 
 	{
2028 2028 
 		$type = $this->get_type();
2029 
-		if ($type & SIMPLEPIE_TYPE_ATOM_ALL)
2029 
+		if ($type&SIMPLEPIE_TYPE_ATOM_ALL)
2030 2030 
 		{
2031 2031 
 			if ($return = $this->get_feed_tags($namespace, $tag))
2032 2032 
 			{
2033 2033 
 				return $return;
2034 2034 
 			}
2035 2035 
 		}
2036 
-		if ($type & SIMPLEPIE_TYPE_RSS_10)
2036 
+		if ($type&SIMPLEPIE_TYPE_RSS_10)
2037 2037 
 		{
2038 2038 
 			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'channel'))
2039 2039 
 			{
 
@@ -2043,7 +2043,7 @@  discard block
 
 block discarded – undo
2043 2043 
 				}
2044 2044 
 			}
2045 2045 
 		}
2046 
-		if ($type & SIMPLEPIE_TYPE_RSS_090)
2046 
+		if ($type&SIMPLEPIE_TYPE_RSS_090)
2047 2047 
 		{
2048 2048 
 			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'channel'))
2049 2049 
 			{
 
@@ -2053,7 +2053,7 @@  discard block
 
 block discarded – undo
2053 2053 
 				}
2054 2054 
 			}
2055 2055 
 		}
2056 
-		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
2056 
+		if ($type&SIMPLEPIE_TYPE_RSS_SYNDICATION)
2057 2057 
 		{
2058 2058 
 			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'channel'))
2059 2059 
 			{
 
@@ -2083,7 +2083,7 @@  discard block
 
 block discarded – undo
2083 2083 
 	public function get_image_tags($namespace, $tag)
2084 2084 
 	{
2085 2085 
 		$type = $this->get_type();
2086 
-		if ($type & SIMPLEPIE_TYPE_RSS_10)
2086 
+		if ($type&SIMPLEPIE_TYPE_RSS_10)
2087 2087 
 		{
2088 2088 
 			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'image'))
2089 2089 
 			{
 
@@ -2093,7 +2093,7 @@  discard block
 
 block discarded – undo
2093 2093 
 				}
2094 2094 
 			}
2095 2095 
 		}
2096 
-		if ($type & SIMPLEPIE_TYPE_RSS_090)
2096 
+		if ($type&SIMPLEPIE_TYPE_RSS_090)
2097 2097 
 		{
2098 2098 
 			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'image'))
2099 2099 
 			{
 
@@ -2103,7 +2103,7 @@  discard block
 
 block discarded – undo
2103 2103 
 				}
2104 2104 
 			}
2105 2105 
 		}
2106 
-		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
2106 
+		if ($type&SIMPLEPIE_TYPE_RSS_SYNDICATION)
2107 2107 
 		{
2108 2108 
 			if ($image = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'image'))
2109 2109 
 			{
 
@@ -2130,7 +2130,7 @@  discard block
 
 block discarded – undo
2130 2130 
 	 */
2131 2131 
 	public function get_base($element = array())
2132 2132 
 	{
2133 
-		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
2133 
+		if (!($this->get_type()&SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
2134 2134 
 		{
2135 2135 
 			return $element['xml_base'];
2136 2136 
 		}
 
@@ -2578,19 +2578,19 @@  discard block
 
 block discarded – undo
2578 2578 
 			{
2579 2579 
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
2580 2580 
 				{
2581 
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
2581 
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
2582 2582 
 					{
2583 
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
2584 
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
2583 
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
2584 
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
2585 2585 
 					}
2586 2586 
 					else
2587 2587 
 					{
2588 
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
2588 
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
2589 2589 
 					}
2590 2590 
 				}
2591 2591 
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
2592 2592 
 				{
2593 
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
2593 
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
2594 2594 
 				}
2595 2595 
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
2596 2596 
 			}
 
@@ -2938,7 +2938,7 @@  discard block
 
 block discarded – undo
2938 2938 
 		{
2939 2939 
 			return round($return[0]['data']);
2940 2940 
 		}
2941 
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
2941 
+		elseif ($this->get_type()&SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
2942 2942 
 		{
2943 2943 
 			return 88.0;
2944 2944 
 		}
 
@@ -2964,7 +2964,7 @@  discard block
 
 block discarded – undo
2964 2964 
 		{
2965 2965 
 			return round($return[0]['data']);
2966 2966 
 		}
2967 
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
2967 
+		elseif ($this->get_type()&SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
2968 2968 
 		{
2969 2969 
 			return 31.0;
2970 2970 
 		}
 
@@ -3144,7 +3144,7 @@  discard block
 
 block discarded – undo
3144 3144
3145 3145 
 		if (($url = $this->get_link()) !== null)
3146 3146 
 		{
3147 
-			return 'https://www.google.com/s2/favicons?domain=' . urlencode($url);
3147 
+			return 'https://www.google.com/s2/favicons?domain='.urlencode($url);
3148 3148 
 		}
3149 3149
3150 3150 
 		return false;
 
@@ -3606,19 +3606,19 @@  discard block
 
 block discarded – undo
3606 3606
3607 3607 
 			if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
3608 3608 
 			{
3609 
-				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
3609 
+				$channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
3610 3610 
 			}
3611 3611 
 			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
3612 3612 
 			{
3613 
-				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
3613 
+				$channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
3614 3614 
 			}
3615 3615 
 			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
3616 3616 
 			{
3617 
-				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
3617 
+				$channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
3618 3618 
 			}
3619 3619 
 			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
3620 3620 
 			{
3621 
-				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
3621 
+				$channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
3622 3622 
 			}
3623 3623 
 			else
3624 3624 
 			{
 
@@ -3838,7 +3838,7 @@  discard block
 
 block discarded – undo
3838 3838 
 		);
3839 3839 
 		$this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
3840 3840
3841 
-		$this->name = $this->options['extras']['prefix'] . md5("$name:$type");
3841 
+		$this->name = $this->options['extras']['prefix'].md5("$name:$type");
3842 3842
3843 3843 
 		$this->cache = new Memcache();
3844 3844 
 		$this->cache->addServer($this->options['host'], (int) $this->options['port']);
 
@@ -3972,10 +3972,10 @@  discard block
 
 block discarded – undo
3972 3972 
         );
3973 3973 
         $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
3974 3974
3975 
-        $this->name = $this->options['extras']['prefix'] . md5("$name:$type");
3975 
+        $this->name = $this->options['extras']['prefix'].md5("$name:$type");
3976 3976
3977 3977 
         $this->cache = new Memcached();
3978 
-        $this->cache->addServer($this->options['host'], (int)$this->options['port']);
3978 
+        $this->cache->addServer($this->options['host'], (int) $this->options['port']);
3979 3979 
     }
3980 3980
3981 3981 
     /**
 
@@ -4009,7 +4009,7 @@  discard block
 
 block discarded – undo
4009 4009 
      * @return int Timestamp
4010 4010 
      */
4011 4011 
     public function mtime() {
4012 
-        $data = $this->cache->get($this->name . '_mtime');
4012 
+        $data = $this->cache->get($this->name.'_mtime');
4013 4013 
         return (int) $data;
4014 4014 
     }
4015 4015 
 
@@ -4037,8 +4037,8 @@  discard block
 
 block discarded – undo
4037 4037 
     private function setData($data) {
4038 4038
4039 4039 
         if ($data !== false) {
4040 
-            $this->cache->set($this->name . '_mtime', time(), (int)$this->options['extras']['timeout']);
4041 
-            return $this->cache->set($this->name, $data, (int)$this->options['extras']['timeout']);
4040 
+            $this->cache->set($this->name.'_mtime', time(), (int) $this->options['extras']['timeout']);
4041 
+            return $this->cache->set($this->name, $data, (int) $this->options['extras']['timeout']);
4042 4042 
         }
4043 4043
4044 4044 
         return false;
 
@@ -4116,7 +4116,7 @@  discard block
 
 block discarded – undo
4116 4116 
 			return;
4117 4117 
 		}
4118 4118
4119 
-		$this->id = $name . $type;
4119 
+		$this->id = $name.$type;
4120 4120
4121 4121 
 		if (!$query = $this->mysql->query('SHOW TABLES'))
4122 4122 
 		{
 
@@ -4130,23 +4130,23 @@  discard block
 
 block discarded – undo
4130 4130 
 			$db[] = $row;
4131 4131 
 		}
4132 4132
4133 
-		if (!in_array($this->options['extras']['prefix'] . 'cache_data', $db))
4133 
+		if (!in_array($this->options['extras']['prefix'].'cache_data', $db))
4134 4134 
 		{
4135 
-			$query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
4135 
+			$query = $this->mysql->exec('CREATE TABLE `'.$this->options['extras']['prefix'].'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
4136 4136 
 			if ($query === false)
4137 4137 
 			{
4138 
-				trigger_error("Can't create " . $this->options['extras']['prefix'] . "cache_data table, check permissions", E_USER_WARNING);
4138 
+				trigger_error("Can't create ".$this->options['extras']['prefix']."cache_data table, check permissions", E_USER_WARNING);
4139 4139 
 				$this->mysql = null;
4140 4140 
 				return;
4141 4141 
 			}
4142 4142 
 		}
4143 4143
4144 
-		if (!in_array($this->options['extras']['prefix'] . 'items', $db))
4144 
+		if (!in_array($this->options['extras']['prefix'].'items', $db))
4145 4145 
 		{
4146 
-			$query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` MEDIUMBLOB NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
4146 
+			$query = $this->mysql->exec('CREATE TABLE `'.$this->options['extras']['prefix'].'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` MEDIUMBLOB NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
4147 4147 
 			if ($query === false)
4148 4148 
 			{
4149 
-				trigger_error("Can't create " . $this->options['extras']['prefix'] . "items table, check permissions", E_USER_WARNING);
4149 
+				trigger_error("Can't create ".$this->options['extras']['prefix']."items table, check permissions", E_USER_WARNING);
4150 4150 
 				$this->mysql = null;
4151 4151 
 				return;
4152 4152 
 			}
 
@@ -4166,9 +4166,9 @@  discard block
 
 block discarded – undo
4166 4166 
 			return false;
4167 4167 
 		}
4168 4168
4169 
-		$query = $this->mysql->prepare('DELETE i, cd FROM `' . $this->options['extras']['prefix'] . 'cache_data` cd, ' .
4170 
-			'`' . $this->options['extras']['prefix'] . 'items` i ' .
4171 
-			'WHERE cd.id = i.feed_id ' .
4169 
+		$query = $this->mysql->prepare('DELETE i, cd FROM `'.$this->options['extras']['prefix'].'cache_data` cd, '.
4170 
+			'`'.$this->options['extras']['prefix'].'items` i '.
4171 
+			'WHERE cd.id = i.feed_id '.
4172 4172 
 			'AND cd.mtime < (unix_timestamp() - :purge_time)');
4173 4173 
 		$query->bindValue(':purge_time', $this->options['extras']['cache_purge_time']);
4174 4174 
 
@@ -4183,7 +4183,7 @@  discard block
 
 block discarded – undo
4183 4183
4184 4184 
 			$prepared = self::prepare_simplepie_object_for_cache($data);
4185 4185
4186 
-			$query = $this->mysql->prepare('SELECT COUNT(*) FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
4186 
+			$query = $this->mysql->prepare('SELECT COUNT(*) FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed');
4187 4187 
 			$query->bindValue(':feed', $this->id);
4188 4188 
 			if ($query->execute())
4189 4189 
 			{
 
@@ -4192,13 +4192,13 @@  discard block
 
 block discarded – undo
4192 4192 
 					$items = count($prepared[1]);
4193 4193 
 					if ($items)
4194 4194 
 					{
4195 
-						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
4195 
+						$sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
4196 4196 
 						$query = $this->mysql->prepare($sql);
4197 4197 
 						$query->bindValue(':items', $items);
4198 4198 
 					}
4199 4199 
 					else
4200 4200 
 					{
4201 
-						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
4201 
+						$sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
4202 4202 
 						$query = $this->mysql->prepare($sql);
4203 4203 
 					}
4204 4204 
 
@@ -4212,7 +4212,7 @@  discard block
 
 block discarded – undo
4212 4212 
 				}
4213 4213 
 				else
4214 4214 
 				{
4215 
-					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
4215 
+					$query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
4216 4216 
 					$query->bindValue(':feed', $this->id);
4217 4217 
 					$query->bindValue(':count', count($prepared[1]));
4218 4218 
 					$query->bindValue(':data', $prepared[0]);
 
@@ -4231,7 +4231,7 @@  discard block
 
 block discarded – undo
4231 4231 
 						$database_ids[] = $this->mysql->quote($id);
4232 4232 
 					}
4233 4233
4234 
-					$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `id` = ' . implode(' OR `id` = ', $database_ids) . ' AND `feed_id` = :feed');
4234 
+					$query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'items` WHERE `id` = '.implode(' OR `id` = ', $database_ids).' AND `feed_id` = :feed');
4235 4235 
 					$query->bindValue(':feed', $this->id);
4236 4236
4237 4237 
 					if ($query->execute())
 
@@ -4251,7 +4251,7 @@  discard block
 
 block discarded – undo
4251 4251 
 								$date = time();
4252 4252 
 							}
4253 4253
4254 
-							$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
4254 
+							$query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
4255 4255 
 							$query->bindValue(':feed', $this->id);
4256 4256 
 							$query->bindValue(':id', $new_id);
4257 4257 
 							$query->bindValue(':data', serialize($prepared[1][$new_id]->data));
 
@@ -4272,13 +4272,13 @@  discard block
 
 block discarded – undo
4272 4272 
 		}
4273 4273 
 		else
4274 4274 
 		{
4275 
-			$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
4275 
+			$query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed');
4276 4276 
 			$query->bindValue(':feed', $this->id);
4277 4277 
 			if ($query->execute())
4278 4278 
 			{
4279 4279 
 				if ($query->rowCount() > 0)
4280 4280 
 				{
4281 
-					$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
4281 
+					$query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
4282 4282 
 					$query->bindValue(':data', serialize($data));
4283 4283 
 					$query->bindValue(':time', time());
4284 4284 
 					$query->bindValue(':feed', $this->id);
 
@@ -4289,7 +4289,7 @@  discard block
 
 block discarded – undo
4289 4289 
 				}
4290 4290 
 				else
4291 4291 
 				{
4292 
-					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
4292 
+					$query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
4293 4293 
 					$query->bindValue(':id', $this->id);
4294 4294 
 					$query->bindValue(':data', serialize($data));
4295 4295 
 					$query->bindValue(':time', time());
 
@@ -4315,7 +4315,7 @@  discard block
 
 block discarded – undo
4315 4315 
 			return false;
4316 4316 
 		}
4317 4317
4318 
-		$query = $this->mysql->prepare('SELECT `items`, `data` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
4318 
+		$query = $this->mysql->prepare('SELECT `items`, `data` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
4319 4319 
 		$query->bindValue(':id', $this->id);
4320 4320 
 		if ($query->execute() && ($row = $query->fetch()))
4321 4321 
 		{
 
@@ -4334,19 +4334,19 @@  discard block
 
 block discarded – undo
4334 4334 
 			{
4335 4335 
 				if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
4336 4336 
 				{
4337 
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
4337 
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
4338 4338 
 				}
4339 4339 
 				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
4340 4340 
 				{
4341 
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
4341 
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
4342 4342 
 				}
4343 4343 
 				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
4344 4344 
 				{
4345 
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
4345 
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
4346 4346 
 				}
4347 4347 
 				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
4348 4348 
 				{
4349 
-					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
4349 
+					$feed = & $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
4350 4350 
 				}
4351 4351 
 				else
4352 4352 
 				{
 
@@ -4355,10 +4355,10 @@  discard block
 
 block discarded – undo
4355 4355
4356 4356 
 				if ($feed !== null)
4357 4357 
 				{
4358 
-					$sql = 'SELECT `data` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
4358 
+					$sql = 'SELECT `data` FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
4359 4359 
 					if ($items > 0)
4360 4360 
 					{
4361 
-						$sql .= ' LIMIT ' . $items;
4361 
+						$sql .= ' LIMIT '.$items;
4362 4362 
 					}
4363 4363
4364 4364 
 					$query = $this->mysql->prepare($sql);
 
@@ -4393,7 +4393,7 @@  discard block
 
 block discarded – undo
4393 4393 
 			return false;
4394 4394 
 		}
4395 4395
4396 
-		$query = $this->mysql->prepare('SELECT `mtime` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
4396 
+		$query = $this->mysql->prepare('SELECT `mtime` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
4397 4397 
 		$query->bindValue(':id', $this->id);
4398 4398 
 		if ($query->execute() && ($time = $query->fetchColumn()))
4399 4399 
 		{
 
@@ -4417,7 +4417,7 @@  discard block
 
 block discarded – undo
4417 4417 
 			return false;
4418 4418 
 		}
4419 4419
4420 
-		$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id');
4420 
+		$query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `mtime` = :time WHERE `id` = :id');
4421 4421 
 		$query->bindValue(':time', time());
4422 4422 
 		$query->bindValue(':id', $this->id);
4423 4423 
 		if ($query->execute() && $query->rowCount() > 0)
 
@@ -4442,9 +4442,9 @@  discard block
 
 block discarded – undo
4442 4442 
 			return false;
4443 4443 
 		}
4444 4444
4445 
-		$query = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
4445 
+		$query = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
4446 4446 
 		$query->bindValue(':id', $this->id);
4447 
-		$query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id');
4447 
+		$query2 = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :id');
4448 4448 
 		$query2->bindValue(':id', $this->id);
4449 4449 
 		if ($query->execute() && $query2->execute())
4450 4450 
 		{
 
@@ -4516,13 +4516,13 @@  discard block
 
 block discarded – undo
4516 4516 
         if (!is_null($options) && is_array($options)) {
4517 4517 
             $this->options = $options;
4518 4518 
         } else {
4519 
-            $this->options = array (
4519 
+            $this->options = array(
4520 4520 
                 'prefix' => 'rss:simple_primary:',
4521 4521 
                 'expire' => 0,
4522 4522 
             );
4523 4523 
         }
4524 4524
4525 
-        $this->name = $this->options['prefix'] . $name;
4525 
+        $this->name = $this->options['prefix'].$name;
4526 4526 
     }
4527 4527
4528 4528 
     /**
 
@@ -6841,7 +6841,7 @@  discard block
 
 block discarded – undo
6841 6841 
 	 * @param array|string $options See first paramter to {@see embed}
6842 6842 
 	 * @return string HTML string to output
6843 6843 
 	 */
6844 
-	public function native_embed($options='')
6844 
+	public function native_embed($options = '')
6845 6845 
 	{
6846 6846 
 		return $this->embed($options, true);
6847 6847 
 	}
 
@@ -6915,7 +6915,7 @@  discard block
 
 block discarded – undo
6915 6915 
 		else
6916 6916 
 		{
6917 6917 
 			$options = explode(',', $options);
6918 
-			foreach($options as $option)
6918 
+			foreach ($options as $option)
6919 6919 
 			{
6920 6920 
 				$opt = explode(':', $option, 2);
6921 6921 
 				if (isset($opt[0], $opt[1]))
 
@@ -7050,11 +7050,11 @@  discard block
 
 block discarded – undo
7050 7050 
 		{
7051 7051 
 			if ($native)
7052 7052 
 			{
7053 
-				$embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
7053 
+				$embed .= "<embed src=\"".$this->get_link()."\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
7054 7054 
 			}
7055 7055 
 			else
7056 7056 
 			{
7057 
-				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
7057 
+				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '".$this->get_link()."', '$loop', '$type');</script>";
7058 7058 
 			}
7059 7059 
 		}
7060 7060 
 
@@ -7065,11 +7065,11 @@  discard block
 
 block discarded – undo
7065 7065 
 			$height += 20;
7066 7066 
 			if ($native)
7067 7067 
 			{
7068 
-				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
7068 
+				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=".rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension())."&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
7069 7069 
 			}
7070 7070 
 			else
7071 7071 
 			{
7072 
-				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
7072 
+				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '".rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension())."', '$placeholder', '$loop', '$mediaplayer');</script>";
7073 7073 
 			}
7074 7074 
 		}
7075 7075 
 
@@ -7082,16 +7082,16 @@  discard block
 
 block discarded – undo
7082 7082 
 			{
7083 7083 
 				if ($placeholder !== '')
7084 7084 
 				{
7085 
-					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
7085 
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"".$this->get_link()."\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
7086 7086 
 				}
7087 7087 
 				else
7088 7088 
 				{
7089 
-					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
7089 
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"".$this->get_link()."\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
7090 7090 
 				}
7091 7091 
 			}
7092 7092 
 			else
7093 7093 
 			{
7094 
-				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
7094 
+				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '".$this->get_link()."', '$placeholder', '$loop');</script>";
7095 7095 
 			}
7096 7096 
 		}
7097 7097 
 
@@ -7101,16 +7101,16 @@  discard block
 
 block discarded – undo
7101 7101 
 			$height += 45;
7102 7102 
 			if ($native)
7103 7103 
 			{
7104 
-				$embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
7104 
+				$embed .= "<embed type=\"application/x-mplayer2\" src=\"".$this->get_link()."\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
7105 7105 
 			}
7106 7106 
 			else
7107 7107 
 			{
7108 
-				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
7108 
+				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '".$this->get_link()."');</script>";
7109 7109 
 			}
7110 7110 
 		}
7111 7111
7112 7112 
 		// Everything else
7113 
-		else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
7113 
+		else $embed .= '<a href="'.$this->get_link().'" class="'.$altclass.'">'.$alt.'</a>';
7114 7114
7115 7115 
 		return $embed;
7116 7116 
 	}
 
@@ -7130,7 +7130,7 @@  discard block
 
 block discarded – undo
7130 7130 
 	{
7131 7131 
 		// Mime-types by handler.
7132 7132 
 		$types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash
7133 
-		$types_fmedia = array('video/flv', 'video/x-flv','flv-application/octet-stream'); // Flash Media Player
7133 
+		$types_fmedia = array('video/flv', 'video/x-flv', 'flv-application/octet-stream'); // Flash Media Player
7134 7134 
 		$types_quicktime = array('audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video'); // QuickTime
7135 7135 
 		$types_wmedia = array('application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx'); // Windows Media
7136 7136 
 		$types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3
 
@@ -7359,7 +7359,7 @@  discard block
 
 block discarded – undo
7359 7359 
 			}
7360 7360 
 			if (!$force_fsockopen && function_exists('curl_exec'))
7361 7361 
 			{
7362 
-				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_CURL;
7362 
+				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE|SIMPLEPIE_FILE_SOURCE_CURL;
7363 7363 
 				$fp = curl_init();
7364 7364 
 				$headers2 = array();
7365 7365 
 				foreach ($headers as $key => $value)
 
@@ -7396,7 +7396,7 @@  discard block
 
 block discarded – undo
7396 7396 
 				}
7397 7397 
 				if (curl_errno($fp))
7398 7398 
 				{
7399 
-					$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
7399 
+					$this->error = 'cURL error '.curl_errno($fp).': '.curl_error($fp);
7400 7400 
 					$this->success = false;
7401 7401 
 				}
7402 7402 
 				else
 
@@ -7427,7 +7427,7 @@  discard block
 
 block discarded – undo
7427 7427 
 			}
7428 7428 
 			else
7429 7429 
 			{
7430 
-				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
7430 
+				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE|SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
7431 7431 
 				$url_parts = parse_url($url);
7432 7432 
 				$socket_host = $url_parts['host'];
7433 7433 
 				if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https')
 
@@ -7442,7 +7442,7 @@  discard block
 
 block discarded – undo
7442 7442 
 				$fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout);
7443 7443 
 				if (!$fp)
7444 7444 
 				{
7445 
-					$this->error = 'fsockopen error: ' . $errstr;
7445 
+					$this->error = 'fsockopen error: '.$errstr;
7446 7446 
 					$this->success = false;
7447 7447 
 				}
7448 7448 
 				else
 
@@ -7473,7 +7473,7 @@  discard block
 
 block discarded – undo
7473 7473
7474 7474 
 					if (isset($url_parts['user']) && isset($url_parts['pass']))
7475 7475 
 					{
7476 
-						$out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n";
7476 
+						$out .= "Authorization: Basic ".base64_encode("$url_parts[user]:$url_parts[pass]")."\r\n";
7477 7477 
 					}
7478 7478 
 					foreach ($headers as $key => $value)
7479 7479 
 					{
 
@@ -7564,7 +7564,7 @@  discard block
 
 block discarded – undo
7564 7564 
 		}
7565 7565 
 		else
7566 7566 
 		{
7567 
-			$this->method = SIMPLEPIE_FILE_SOURCE_LOCAL | SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
7567 
+			$this->method = SIMPLEPIE_FILE_SOURCE_LOCAL|SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
7568 7568 
 			if (empty($url) || !($this->body = trim(file_get_contents($url))))
7569 7569 
 			{
7570 7570 
 				$this->error = 'file_get_contents could not read the file';
 
@@ -7789,7 +7789,7 @@  discard block
 
 block discarded – undo
7789 7789 
 			// We should only use the last Content-Type header. c.f. issue #1
7790 7790 
 			if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
7791 7791 
 			{
7792 
-				$this->headers[$this->name] .= ', ' . $this->value;
7792 
+				$this->headers[$this->name] .= ', '.$this->value;
7793 7793 
 			}
7794 7794 
 			else
7795 7795 
 			{
 
@@ -7999,7 +7999,7 @@  discard block
 
 block discarded – undo
7999 7999
8000 8000 
 		while (true)
8001 8001 
 		{
8002 
-			$is_chunked = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches );
8002 
+			$is_chunked = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches);
8003 8003 
 			if (!$is_chunked)
8004 8004 
 			{
8005 8005 
 				// Looks like it's not chunked after all
 
@@ -8154,9 +8154,9 @@  discard block
 
 block discarded – undo
8154 8154 
 	 */
8155 8155 
 	public function __set($name, $value)
8156 8156 
 	{
8157 
-		if (method_exists($this, 'set_' . $name))
8157 
+		if (method_exists($this, 'set_'.$name))
8158 8158 
 		{
8159 
-			call_user_func(array($this, 'set_' . $name), $value);
8159 
+			call_user_func(array($this, 'set_'.$name), $value);
8160 8160 
 		}
8161 8161 
 		elseif (
8162 8162 
 			   $name === 'iauthority'
 
@@ -8167,7 +8167,7 @@  discard block
 
 block discarded – undo
8167 8167 
 			|| $name === 'ifragment'
8168 8168 
 		)
8169 8169 
 		{
8170 
-			call_user_func(array($this, 'set_' . substr($name, 1)), $value);
8170 
+			call_user_func(array($this, 'set_'.substr($name, 1)), $value);
8171 8171 
 		}
8172 8172 
 	}
8173 8173 
 
@@ -8197,7 +8197,7 @@  discard block
 
 block discarded – undo
8197 8197 
 			$return = $this->$name;
8198 8198 
 		}
8199 8199 
 		// host -> ihost
8200 
-		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props))
8200 
+		elseif (($prop = 'i'.$name) && array_key_exists($prop, $props))
8201 8201 
 		{
8202 8202 
 			$name = $prop;
8203 8203 
 			$return = $this->$prop;
 
@@ -8210,7 +8210,7 @@  discard block
 
 block discarded – undo
8210 8210 
 		}
8211 8211 
 		else
8212 8212 
 		{
8213 
-			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
8213 
+			trigger_error('Undefined property: '.get_class($this).'::'.$name, E_USER_NOTICE);
8214 8214 
 			$return = null;
8215 8215 
 		}
8216 8216 
 
@@ -8232,7 +8232,7 @@  discard block
 
 block discarded – undo
8232 8232 
 	 */
8233 8233 
 	public function __isset($name)
8234 8234 
 	{
8235 
-		if (method_exists($this, 'get_' . $name) || isset($this->$name))
8235 
+		if (method_exists($this, 'get_'.$name) || isset($this->$name))
8236 8236 
 		{
8237 8237 
 			return true;
8238 8238 
 		}
 
@@ -8249,9 +8249,9 @@  discard block
 
 block discarded – undo
8249 8249 
 	 */
8250 8250 
 	public function __unset($name)
8251 8251 
 	{
8252 
-		if (method_exists($this, 'set_' . $name))
8252 
+		if (method_exists($this, 'set_'.$name))
8253 8253 
 		{
8254 
-			call_user_func(array($this, 'set_' . $name), '');
8254 
+			call_user_func(array($this, 'set_'.$name), '');
8255 8255 
 		}
8256 8256 
 	}
8257 8257 
 
@@ -8327,11 +8327,11 @@  discard block
 
 block discarded – undo
8327 8327 
 							}
8328 8328 
 							elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
8329 8329 
 							{
8330 
-								$target->ipath = '/' . $relative->ipath;
8330 
+								$target->ipath = '/'.$relative->ipath;
8331 8331 
 							}
8332 8332 
 							elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
8333 8333 
 							{
8334 
-								$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
8334 
+								$target->ipath = substr($base->ipath, 0, $last_segment + 1).$relative->ipath;
8335 8335 
 							}
8336 8336 
 							else
8337 8337 
 							{
 
@@ -8467,7 +8467,7 @@  discard block
 
 block discarded – undo
8467 8467 
 				$input = '';
8468 8468 
 			}
8469 8469 
 		}
8470 
-		return $output . $input;
8470 
+		return $output.$input;
8471 8471 
 	}
8472 8472
8473 8473 
 	/**
 
@@ -8506,23 +8506,23 @@  discard block
 
 block discarded – undo
8506 8506
8507 8507 
 			// No one byte sequences are valid due to the while.
8508 8508 
 			// Two byte sequence:
8509 
-			if (($value & 0xE0) === 0xC0)
8509 
+			if (($value&0xE0) === 0xC0)
8510 8510 
 			{
8511 
-				$character = ($value & 0x1F) << 6;
8511 
+				$character = ($value&0x1F) << 6;
8512 8512 
 				$length = 2;
8513 8513 
 				$remaining = 1;
8514 8514 
 			}
8515 8515 
 			// Three byte sequence:
8516 
-			elseif (($value & 0xF0) === 0xE0)
8516 
+			elseif (($value&0xF0) === 0xE0)
8517 8517 
 			{
8518 
-				$character = ($value & 0x0F) << 12;
8518 
+				$character = ($value&0x0F) << 12;
8519 8519 
 				$length = 3;
8520 8520 
 				$remaining = 2;
8521 8521 
 			}
8522 8522 
 			// Four byte sequence:
8523 
-			elseif (($value & 0xF8) === 0xF0)
8523 
+			elseif (($value&0xF8) === 0xF0)
8524 8524 
 			{
8525 
-				$character = ($value & 0x07) << 18;
8525 
+				$character = ($value&0x07) << 18;
8526 8526 
 				$length = 4;
8527 8527 
 				$remaining = 3;
8528 8528 
 			}
 
@@ -8543,9 +8543,9 @@  discard block
 
 block discarded – undo
8543 8543 
 						$value = ord($string[$position]);
8544 8544
8545 8545 
 						// Check that the byte is valid, then add it to the character:
8546 
-						if (($value & 0xC0) === 0x80)
8546 
+						if (($value&0xC0) === 0x80)
8547 8547 
 						{
8548 
-							$character |= ($value & 0x3F) << (--$remaining * 6);
8548 
+							$character |= ($value&0x3F) << (--$remaining*6);
8549 8549 
 						}
8550 8550 
 						// If it is invalid, count the sequence as invalid and reprocess the current byte:
8551 8551 
 						else
 
@@ -8573,7 +8573,7 @@  discard block
 
 block discarded – undo
8573 8573 
 				|| $length > 3 && $character <= 0xFFFF
8574 8574 
 				// Outside of range of ucschar codepoints
8575 8575 
 				// Noncharacters
8576 
-				|| ($character & 0xFFFE) === 0xFFFE
8576 
+				|| ($character&0xFFFE) === 0xFFFE
8577 8577 
 				|| $character >= 0xFDD0 && $character <= 0xFDEF
8578 8578 
 				|| (
8579 8579 
 					// Everything else not in ucschar
 
@@ -8648,23 +8648,23 @@  discard block
 
 block discarded – undo
8648 8648 
 					$length = 1;
8649 8649 
 				}
8650 8650 
 				// Two byte sequence:
8651 
-				elseif (($value & 0xE0) === 0xC0)
8651 
+				elseif (($value&0xE0) === 0xC0)
8652 8652 
 				{
8653 
-					$character = ($value & 0x1F) << 6;
8653 
+					$character = ($value&0x1F) << 6;
8654 8654 
 					$length = 2;
8655 8655 
 					$remaining = 1;
8656 8656 
 				}
8657 8657 
 				// Three byte sequence:
8658 
-				elseif (($value & 0xF0) === 0xE0)
8658 
+				elseif (($value&0xF0) === 0xE0)
8659 8659 
 				{
8660 
-					$character = ($value & 0x0F) << 12;
8660 
+					$character = ($value&0x0F) << 12;
8661 8661 
 					$length = 3;
8662 8662 
 					$remaining = 2;
8663 8663 
 				}
8664 8664 
 				// Four byte sequence:
8665 
-				elseif (($value & 0xF8) === 0xF0)
8665 
+				elseif (($value&0xF8) === 0xF0)
8666 8666 
 				{
8667 
-					$character = ($value & 0x07) << 18;
8667 
+					$character = ($value&0x07) << 18;
8668 8668 
 					$length = 4;
8669 8669 
 					$remaining = 3;
8670 8670 
 				}
 
@@ -8679,10 +8679,10 @@  discard block
 
 block discarded – undo
8679 8679 
 			else
8680 8680 
 			{
8681 8681 
 				// Check that the byte is valid, then add it to the character:
8682 
-				if (($value & 0xC0) === 0x80)
8682 
+				if (($value&0xC0) === 0x80)
8683 8683 
 				{
8684 8684 
 					$remaining--;
8685 
-					$character |= ($value & 0x3F) << ($remaining * 6);
8685 
+					$character |= ($value&0x3F) << ($remaining*6);
8686 8686 
 				}
8687 8687 
 				// If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
8688 8688 
 				else
 
@@ -8708,7 +8708,7 @@  discard block
 
 block discarded – undo
8708 8708 
 					|| $character < 0x2D
8709 8709 
 					|| $character > 0xEFFFD
8710 8710 
 					// Noncharacters
8711 
-					|| ($character & 0xFFFE) === 0xFFFE
8711 
+					|| ($character&0xFFFE) === 0xFFFE
8712 8712 
 					|| $character >= 0xFDD0 && $character <= 0xFDEF
8713 8713 
 					// Everything else not in iunreserved (this is all BMP)
8714 8714 
 					|| $character === 0x2F
 
@@ -8721,7 +8721,7 @@  discard block
 
 block discarded – undo
8721 8721 
 				{
8722 8722 
 					for ($j = $start; $j <= $i; $j++)
8723 8723 
 					{
8724 
-						$string .= '%' . strtoupper($bytes[$j]);
8724 
+						$string .= '%'.strtoupper($bytes[$j]);
8725 8725 
 					}
8726 8726 
 				}
8727 8727 
 				else
 
@@ -8740,7 +8740,7 @@  discard block
 
 block discarded – undo
8740 8740 
 		{
8741 8741 
 			for ($j = $start; $j < $len; $j++)
8742 8742 
 			{
8743 
-				$string .= '%' . strtoupper($bytes[$j]);
8743 
+				$string .= '%'.strtoupper($bytes[$j]);
8744 8744 
 			}
8745 8745 
 		}
8746 8746 
 
@@ -8999,7 +8999,7 @@  discard block
 
 block discarded – undo
8999 8999 
 		{
9000 9000 
 			if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
9001 9001 
 			{
9002 
-				$this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
9002 
+				$this->ihost = '['.SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)).']';
9003 9003 
 			}
9004 9004 
 			else
9005 9005 
 			{
 
@@ -9095,7 +9095,7 @@  discard block
 
 block discarded – undo
9095 9095 
 			$removed = $this->remove_dot_segments($valid);
9096 9096
9097 9097 
 			$cache[$ipath] = array($valid, $removed);
9098 
-			$this->ipath =  ($this->scheme !== null) ? $removed : $valid;
9098 
+			$this->ipath = ($this->scheme !== null) ? $removed : $valid;
9099 9099 
 		}
9100 9100
9101 9101 
 		$this->scheme_normalization();
 
@@ -9182,11 +9182,11 @@  discard block
 
 block discarded – undo
9182 9182 
 		$iri = '';
9183 9183 
 		if ($this->scheme !== null)
9184 9184 
 		{
9185 
-			$iri .= $this->scheme . ':';
9185 
+			$iri .= $this->scheme.':';
9186 9186 
 		}
9187 9187 
 		if (($iauthority = $this->get_iauthority()) !== null)
9188 9188 
 		{
9189 
-			$iri .= '//' . $iauthority;
9189 
+			$iri .= '//'.$iauthority;
9190 9190 
 		}
9191 9191 
 		if ($this->ipath !== '')
9192 9192 
 		{
 
@@ -9198,11 +9198,11 @@  discard block
 
 block discarded – undo
9198 9198 
 		}
9199 9199 
 		if ($this->iquery !== null)
9200 9200 
 		{
9201 
-			$iri .= '?' . $this->iquery;
9201 
+			$iri .= '?'.$this->iquery;
9202 9202 
 		}
9203 9203 
 		if ($this->ifragment !== null)
9204 9204 
 		{
9205 
-			$iri .= '#' . $this->ifragment;
9205 
+			$iri .= '#'.$this->ifragment;
9206 9206 
 		}
9207 9207
9208 9208 
 		return $iri;
 
@@ -9230,7 +9230,7 @@  discard block
 
 block discarded – undo
9230 9230 
 			$iauthority = '';
9231 9231 
 			if ($this->iuserinfo !== null)
9232 9232 
 			{
9233 
-				$iauthority .= $this->iuserinfo . '@';
9233 
+				$iauthority .= $this->iuserinfo.'@';
9234 9234 
 			}
9235 9235 
 			if ($this->ihost !== null)
9236 9236 
 			{
 
@@ -9238,7 +9238,7 @@  discard block
 
 block discarded – undo
9238 9238 
 			}
9239 9239 
 			if ($this->port !== null)
9240 9240 
 			{
9241 
-				$iauthority .= ':' . $this->port;
9241 
+				$iauthority .= ':'.$this->port;
9242 9242 
 			}
9243 9243 
 			return $iauthority;
9244 9244 
 		}
 
@@ -10273,19 +10273,19 @@  discard block
 
 block discarded – undo
10273 10273 
 			{
10274 10274 
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
10275 10275 
 				{
10276 
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
10276 
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
10277 10277 
 					{
10278 
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
10279 
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
10278 
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
10279 
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
10280 10280 
 					}
10281 10281 
 					else
10282 10282 
 					{
10283 
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
10283 
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
10284 10284 
 					}
10285 10285 
 				}
10286 10286 
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
10287 10287 
 				{
10288 
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
10288 
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
10289 10289 
 				}
10290 10290 
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
10291 10291 
 			}
 
@@ -10626,12 +10626,12 @@  discard block
 
 block discarded – undo
10626 10626 
 					if (sizeof($temp) > 0)
10627 10627 
 					{
10628 10628 
 						$minutes = (int) array_pop($temp);
10629 
-						$seconds += $minutes * 60;
10629 
+						$seconds += $minutes*60;
10630 10630 
 					}
10631 10631 
 					if (sizeof($temp) > 0)
10632 10632 
 					{
10633 10633 
 						$hours = (int) array_pop($temp);
10634 
-						$seconds += $hours * 3600;
10634 
+						$seconds += $hours*3600;
10635 10635 
 					}
10636 10636 
 					unset($temp);
10637 10637 
 					$duration_parent = $seconds;
 
@@ -10986,7 +10986,7 @@  discard block
 
 block discarded – undo
10986 10986 
 			// If we have media:group tags, loop through them.
10987 10987 
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group)
10988 10988 
 			{
10989 
-				if(isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
10989 
+				if (isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
10990 10990 
 				{
10991 10991 
 					// If we have media:content tags, loop through them.
10992 10992 
 					foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
 
@@ -12284,7 +12284,7 @@  discard block
 
 block discarded – undo
12284 12284 
 			return $this->file;
12285 12285 
 		}
12286 12286
12287 
-		if ($this->file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
12287 
+		if ($this->file->method&SIMPLEPIE_FILE_SOURCE_REMOTE)
12288 12288 
 		{
12289 12289 
 			$sniffer = $this->registry->create('Content_Type_Sniffer', array($this->file));
12290 12290 
 			if ($sniffer->get_type() !== 'text/html')
 
@@ -12293,34 +12293,34 @@  discard block
 
 block discarded – undo
12293 12293 
 			}
12294 12294 
 		}
12295 12295
12296 
-		if ($type & ~SIMPLEPIE_LOCATOR_NONE)
12296 
+		if ($type&~SIMPLEPIE_LOCATOR_NONE)
12297 12297 
 		{
12298 12298 
 			$this->get_base();
12299 12299 
 		}
12300 12300
12301 
-		if ($type & SIMPLEPIE_LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery())
12301 
+		if ($type&SIMPLEPIE_LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery())
12302 12302 
 		{
12303 12303 
 			return $working[0];
12304 12304 
 		}
12305 12305
12306 
-		if ($type & (SIMPLEPIE_LOCATOR_LOCAL_EXTENSION | SIMPLEPIE_LOCATOR_LOCAL_BODY | SIMPLEPIE_LOCATOR_REMOTE_EXTENSION | SIMPLEPIE_LOCATOR_REMOTE_BODY) && $this->get_links())
12306 
+		if ($type&(SIMPLEPIE_LOCATOR_LOCAL_EXTENSION|SIMPLEPIE_LOCATOR_LOCAL_BODY|SIMPLEPIE_LOCATOR_REMOTE_EXTENSION|SIMPLEPIE_LOCATOR_REMOTE_BODY) && $this->get_links())
12307 12307 
 		{
12308 
-			if ($type & SIMPLEPIE_LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local))
12308 
+			if ($type&SIMPLEPIE_LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local))
12309 12309 
 			{
12310 12310 
 				return $working[0];
12311 12311 
 			}
12312 12312
12313 
-			if ($type & SIMPLEPIE_LOCATOR_LOCAL_BODY && $working = $this->body($this->local))
12313 
+			if ($type&SIMPLEPIE_LOCATOR_LOCAL_BODY && $working = $this->body($this->local))
12314 12314 
 			{
12315 12315 
 				return $working[0];
12316 12316 
 			}
12317 12317
12318 
-			if ($type & SIMPLEPIE_LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere))
12318 
+			if ($type&SIMPLEPIE_LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere))
12319 12319 
 			{
12320 12320 
 				return $working[0];
12321 12321 
 			}
12322 12322
12323 
-			if ($type & SIMPLEPIE_LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere))
12323 
+			if ($type&SIMPLEPIE_LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere))
12324 12324 
 			{
12325 12325 
 				return $working[0];
12326 12326 
 			}
 
@@ -12330,7 +12330,7 @@  discard block
 
 block discarded – undo
12330 12330
12331 12331 
 	public function is_feed($file, $check_html = false)
12332 12332 
 	{
12333 
-		if ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
12333 
+		if ($file->method&SIMPLEPIE_FILE_SOURCE_REMOTE)
12334 12334 
 		{
12335 12335 
 			$sniffer = $this->registry->create('Content_Type_Sniffer', array($file));
12336 12336 
 			$sniffed = $sniffer->get_type();
 
@@ -12350,7 +12350,7 @@  discard block
 
 block discarded – undo
12350 12350 
 				return false;
12351 12351 
 			}
12352 12352 
 		}
12353 
-		elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
12353 
+		elseif ($file->method&SIMPLEPIE_FILE_SOURCE_LOCAL)
12354 12354 
 		{
12355 12355 
 			return true;
12356 12356 
 		}
 
@@ -12442,7 +12442,7 @@  discard block
 
 block discarded – undo
12442 12442 
 						'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
12443 12443 
 					);
12444 12444 
 					$feed = $this->registry->create('File', array($href, $this->timeout, 5, $headers, $this->useragent));
12445 
-					if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed, true))
12445 
+					if ($feed->success && ($feed->method&SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed, true))
12446 12446 
 					{
12447 12447 
 						$feeds[$href] = $feed;
12448 12448 
 					}
 
@@ -12572,7 +12572,7 @@  discard block
 
 block discarded – undo
12572 12572 
 					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
12573 12573 
 				);
12574 12574 
 				$feed = $this->registry->create('File', array($value, $this->timeout, 5, $headers, $this->useragent));
12575 
-				if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
12575 
+				if ($feed->success && ($feed->method&SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
12576 12576 
 				{
12577 12577 
 					return array($feed);
12578 12578 
 				}
 
@@ -12600,7 +12600,7 @@  discard block
 
 block discarded – undo
12600 12600 
 					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
12601 12601 
 				);
12602 12602 
 				$feed = $this->registry->create('File', array($value, $this->timeout, 5, null, $this->useragent));
12603 
-				if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
12603 
+				if ($feed->success && ($feed->method&SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
12604 12604 
 				{
12605 12605 
 					return array($feed);
12606 12606 
 				}
 
@@ -12625,22 +12625,22 @@  discard block
 
 block discarded – undo
12625 12625 
 	{
12626 12626 
 		$time = '';
12627 12627
12628 
-		$hours = floor($seconds / 3600);
12629 
-		$remainder = $seconds % 3600;
12628 
+		$hours = floor($seconds/3600);
12629 
+		$remainder = $seconds%3600;
12630 12630 
 		if ($hours > 0)
12631 12631 
 		{
12632 12632 
 			$time .= $hours.':';
12633 12633 
 		}
12634 12634
12635 
-		$minutes = floor($remainder / 60);
12636 
-		$seconds = $remainder % 60;
12635 
+		$minutes = floor($remainder/60);
12636 
+		$seconds = $remainder%60;
12637 12637 
 		if ($minutes < 10 && $hours > 0)
12638 12638 
 		{
12639 
-			$minutes = '0' . $minutes;
12639 
+			$minutes = '0'.$minutes;
12640 12640 
 		}
12641 12641 
 		if ($seconds < 10)
12642 12642 
 		{
12643 
-			$seconds = '0' . $seconds;
12643 
+			$seconds = '0'.$seconds;
12644 12644 
 		}
12645 12645
12646 12646 
 		$time .= $minutes.':';
 
@@ -12671,7 +12671,7 @@  discard block
 
 block discarded – undo
12671 12671 
 	{
12672 12672 
 		$return = array();
12673 12673 
 		$name = preg_quote($realname, '/');
12674 
-		if (preg_match_all("/<($name)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
12674 
+		if (preg_match_all("/<($name)".SIMPLEPIE_PCRE_HTML_ATTRIBUTE."(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE))
12675 12675 
 		{
12676 12676 
 			for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++)
12677 12677 
 			{
 
@@ -12688,7 +12688,7 @@  discard block
 
 block discarded – undo
12688 12688 
 					$return[$i]['content'] = $matches[$i][4][0];
12689 12689 
 				}
12690 12690 
 				$return[$i]['attribs'] = array();
12691 
-				if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' ' . $matches[$i][2][0] . ' ', $attribs, PREG_SET_ORDER))
12691 
+				if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' '.$matches[$i][2][0].' ', $attribs, PREG_SET_ORDER))
12692 12692 
 				{
12693 12693 
 					for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++)
12694 12694 
 					{
 
@@ -12710,7 +12710,7 @@  discard block
 
 block discarded – undo
12710 12710 
 		foreach ($element['attribs'] as $key => $value)
12711 12711 
 		{
12712 12712 
 			$key = strtolower($key);
12713 
-			$full .= " $key=\"" . htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8') . '"';
12713 
+			$full .= " $key=\"".htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8').'"';
12714 12714 
 		}
12715 12715 
 		if ($element['self_closing'])
12716 12716 
 		{
 
@@ -12725,7 +12725,7 @@  discard block
 
 block discarded – undo
12725 12725
12726 12726 
 	public static function error($message, $level, $file, $line)
12727 12727 
 	{
12728 
-		if ((ini_get('error_reporting') & $level) > 0)
12728 
+		if ((ini_get('error_reporting')&$level) > 0)
12729 12729 
 		{
12730 12730 
 			switch ($level)
12731 12731 
 			{
 
@@ -14343,7 +14343,7 @@  discard block
 
 block discarded – undo
14343 14343 
 				$data = '';
14344 14344 
 			}
14345 14345 
 		}
14346 
-		return $output . $data;
14346 
+		return $output.$data;
14347 14347 
 	}
14348 14348
14349 14349 
 	public static function parse_date($dt)
 
@@ -14453,23 +14453,23 @@  discard block
 
 block discarded – undo
14453 14453 
 			{
14454 14454 
 				case 'text':
14455 14455 
 				case 'text/plain':
14456 
-					return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
14456 
+					return SIMPLEPIE_CONSTRUCT_TEXT|$mode;
14457 14457
14458 14458 
 				case 'html':
14459 14459 
 				case 'text/html':
14460 
-					return SIMPLEPIE_CONSTRUCT_HTML | $mode;
14460 
+					return SIMPLEPIE_CONSTRUCT_HTML|$mode;
14461 14461
14462 14462 
 				case 'xhtml':
14463 14463 
 				case 'application/xhtml+xml':
14464 
-					return SIMPLEPIE_CONSTRUCT_XHTML | $mode;
14464 
+					return SIMPLEPIE_CONSTRUCT_XHTML|$mode;
14465 14465
14466 14466 
 				default:
14467 
-					return SIMPLEPIE_CONSTRUCT_NONE | $mode;
14467 
+					return SIMPLEPIE_CONSTRUCT_NONE|$mode;
14468 14468 
 			}
14469 14469 
 		}
14470 14470 
 		else
14471 14471 
 		{
14472 
-			return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
14472 
+			return SIMPLEPIE_CONSTRUCT_TEXT|$mode;
14473 14473 
 		}
14474 14474 
 	}
14475 14475 
 
@@ -14570,15 +14570,15 @@  discard block
 
 block discarded – undo
14570 14570 
 		}
14571 14571 
 		else if ($codepoint <= 0x7ff)
14572 14572 
 		{
14573 
-			return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
14573 
+			return chr(0xc0|($codepoint >> 6)).chr(0x80|($codepoint&0x3f));
14574 14574 
 		}
14575 14575 
 		else if ($codepoint <= 0xffff)
14576 14576 
 		{
14577 
-			return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
14577 
+			return chr(0xe0|($codepoint >> 12)).chr(0x80|(($codepoint >> 6)&0x3f)).chr(0x80|($codepoint&0x3f));
14578 14578 
 		}
14579 14579 
 		else if ($codepoint <= 0x10ffff)
14580 14580 
 		{
14581 
-			return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
14581 
+			return chr(0xf0|($codepoint >> 18)).chr(0x80|(($codepoint >> 12)&0x3f)).chr(0x80|(($codepoint >> 6)&0x3f)).chr(0x80|($codepoint&0x3f));
14582 14582 
 		}
14583 14583 
 		else
14584 14584 
 		{
 
@@ -14734,7 +14734,7 @@  discard block
 
 block discarded – undo
14734 14734 
 		}
14735 14735 
 		header('Content-type: text/javascript; charset: UTF-8');
14736 14736 
 		header('Cache-Control: must-revalidate');
14737 
-		header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
14737 
+		header('Expires: '.gmdate('D, d M Y H:i:s', time() + 604800).' GMT'); // 7 days
14738 14738 
 		?>
14739 14739 
 function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
14740 14740 
 	if (placeholder != '') {
 
@@ -14768,14 +14768,14 @@  discard block
 
 block discarded – undo
14768 14768 
 	public static function get_build()
14769 14769 
 	{
14770 14770 
 		$root = dirname(dirname(__FILE__));
14771 
-		if (file_exists($root . '/.git/index'))
14771 
+		if (file_exists($root.'/.git/index'))
14772 14772 
 		{
14773 
-			return filemtime($root . '/.git/index');
14773 
+			return filemtime($root.'/.git/index');
14774 14774 
 		}
14775 
-		elseif (file_exists($root . '/SimplePie'))
14775 
+		elseif (file_exists($root.'/SimplePie'))
14776 14776 
 		{
14777 14777 
 			$time = 0;
14778 
-			foreach (glob($root . '/SimplePie/*.php') as $file)
14778 
+			foreach (glob($root.'/SimplePie/*.php') as $file)
14779 14779 
 			{
14780 14780 
 				if (($mtime = filemtime($file)) > $time)
14781 14781 
 				{
 
@@ -14784,9 +14784,9 @@  discard block
 
 block discarded – undo
14784 14784 
 			}
14785 14785 
 			return $time;
14786 14786 
 		}
14787 
-		elseif (file_exists(dirname(__FILE__) . '/Core.php'))
14787 
+		elseif (file_exists(dirname(__FILE__).'/Core.php'))
14788 14788 
 		{
14789 
-			return filemtime(dirname(__FILE__) . '/Core.php');
14789 
+			return filemtime(dirname(__FILE__).'/Core.php');
14790 14790 
 		}
14791 14791 
 		else
14792 14792 
 		{
 
@@ -14799,11 +14799,11 @@  discard block
 
 block discarded – undo
14799 14799 
 	 */
14800 14800 
 	public static function debug(&$sp)
14801 14801 
 	{
14802 
-		$info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n";
14803 
-		$info .= 'PHP ' . PHP_VERSION . "\n";
14802 
+		$info = 'SimplePie '.SIMPLEPIE_VERSION.' Build '.SIMPLEPIE_BUILD."\n";
14803 
+		$info .= 'PHP '.PHP_VERSION."\n";
14804 14804 
 		if ($sp->error() !== null)
14805 14805 
 		{
14806 
-			$info .= 'Error occurred: ' . $sp->error() . "\n";
14806 
+			$info .= 'Error occurred: '.$sp->error()."\n";
14807 14807 
 		}
14808 14808 
 		else
14809 14809 
 		{
 
@@ -14819,20 +14819,20 @@  discard block
 
 block discarded – undo
14819 14819 
 				switch ($ext)
14820 14820 
 				{
14821 14821 
 					case 'pcre':
14822 
-						$info .= '      Version ' . PCRE_VERSION . "\n";
14822 
+						$info .= '      Version '.PCRE_VERSION."\n";
14823 14823 
 						break;
14824 14824 
 					case 'curl':
14825 14825 
 						$version = curl_version();
14826 
-						$info .= '      Version ' . $version['version'] . "\n";
14826 
+						$info .= '      Version '.$version['version']."\n";
14827 14827 
 						break;
14828 14828 
 					case 'mbstring':
14829 
-						$info .= '      Overloading: ' . mb_get_info('func_overload') . "\n";
14829 
+						$info .= '      Overloading: '.mb_get_info('func_overload')."\n";
14830 14830 
 						break;
14831 14831 
 					case 'iconv':
14832 
-						$info .= '      Version ' . ICONV_VERSION . "\n";
14832 
+						$info .= '      Version '.ICONV_VERSION."\n";
14833 14833 
 						break;
14834 14834 
 					case 'xml':
14835 
-						$info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
14835 
+						$info .= '      Version '.LIBXML_DOTTED_VERSION."\n";
14836 14836 
 						break;
14837 14837 
 				}
14838 14838 
 			}
 
@@ -14930,7 +14930,7 @@  discard block
 
 block discarded – undo
14930 14930 
 			// xxx::xxx
14931 14931 
 			else
14932 14932 
 			{
14933 
-				$fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
14933 
+				$fill = ':'.str_repeat('0:', 6 - $c2 - $c1);
14934 14934 
 				$ip = str_replace('::', $fill, $ip);
14935 14935 
 			}
14936 14936 
 		}
 
@@ -15581,8 +15581,8 @@  discard block
 
 block discarded – undo
15581 15581 
 	 */
15582 15582 
 	public function __construct()
15583 15583 
 	{
15584 
-		$this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')';
15585 
-		$this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')';
15584 
+		$this->day_pcre = '('.implode(array_keys($this->day), '|').')';
15585 
+		$this->month_pcre = '('.implode(array_keys($this->month), '|').')';
15586 15586
15587 15587 
 		static $cache;
15588 15588 
 		if (!isset($cache[get_class($this)]))
 
@@ -15684,7 +15684,7 @@  discard block
 
 block discarded – undo
15684 15684 
 			$month = $day = $hour = $minute = $second = '([0-9]{2})';
15685 15685 
 			$decimal = '([0-9]*)';
15686 15686 
 			$zone = '(?:(Z)|([+\-])([0-9]{1,2}):?([0-9]{1,2}))';
15687 
-			$pcre = '/^' . $year . '(?:-?' . $month . '(?:-?' . $day . '(?:[Tt\x09\x20]+' . $hour . '(?::?' . $minute . '(?::?' . $second . '(?:.' . $decimal . ')?)?)?' . $zone . ')?)?)?$/';
15687 
+			$pcre = '/^'.$year.'(?:-?'.$month.'(?:-?'.$day.'(?:[Tt\x09\x20]+'.$hour.'(?::?'.$minute.'(?::?'.$second.'(?:.'.$decimal.')?)?)?'.$zone.')?)?)?$/';
15688 15688 
 		}
15689 15689 
 		if (preg_match($pcre, $date, $match))
15690 15690 
 		{
 
@@ -15717,8 +15717,8 @@  discard block
 
 block discarded – undo
15717 15717 
 			// Numeric timezone
15718 15718 
 			if (isset($match[9]) && $match[9] !== '')
15719 15719 
 			{
15720 
-				$timezone = $match[10] * 3600;
15721 
-				$timezone += $match[11] * 60;
15720 
+				$timezone = $match[10]*3600;
15721 
+				$timezone += $match[11]*60;
15722 15722 
 				if ($match[9] === '-')
15723 15723 
 				{
15724 15724 
 					$timezone = 0 - $timezone;
 
@@ -15730,7 +15730,7 @@  discard block
 
 block discarded – undo
15730 15730 
 			}
15731 15731
15732 15732 
 			// Convert the number of seconds to an integer, taking decimals into account
15733 
-			$second = round((int)$match[6] + (int)$match[7] / pow(10, strlen($match[7])));
15733 
+			$second = round((int) $match[6] + (int) $match[7]/pow(10, strlen($match[7])));
15734 15734
15735 15735 
 			return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone;
15736 15736 
 		}
 
@@ -15813,8 +15813,8 @@  discard block
 
 block discarded – undo
15813 15813 
 		if (!$pcre)
15814 15814 
 		{
15815 15815 
 			$wsp = '[\x09\x20]';
15816 
-			$fws = '(?:' . $wsp . '+|' . $wsp . '*(?:\x0D\x0A' . $wsp . '+)+)';
15817 
-			$optional_fws = $fws . '?';
15816 
+			$fws = '(?:'.$wsp.'+|'.$wsp.'*(?:\x0D\x0A'.$wsp.'+)+)';
15817 
+			$optional_fws = $fws.'?';
15818 15818 
 			$day_name = $this->day_pcre;
15819 15819 
 			$month = $this->month_pcre;
15820 15820 
 			$day = '([0-9]{1,2})';
 
@@ -15822,8 +15822,8 @@  discard block
 
 block discarded – undo
15822 15822 
 			$year = '([0-9]{2,4})';
15823 15823 
 			$num_zone = '([+\-])([0-9]{2})([0-9]{2})';
15824 15824 
 			$character_zone = '([A-Z]{1,5})';
15825 
-			$zone = '(?:' . $num_zone . '|' . $character_zone . ')';
15826 
-			$pcre = '/(?:' . $optional_fws . $day_name . $optional_fws . ',)?' . $optional_fws . $day . $fws . $month . $fws . $year . $fws . $hour . $optional_fws . ':' . $optional_fws . $minute . '(?:' . $optional_fws . ':' . $optional_fws . $second . ')?' . $fws . $zone . '/i';
15825 
+			$zone = '(?:'.$num_zone.'|'.$character_zone.')';
15826 
+			$pcre = '/(?:'.$optional_fws.$day_name.$optional_fws.',)?'.$optional_fws.$day.$fws.$month.$fws.$year.$fws.$hour.$optional_fws.':'.$optional_fws.$minute.'(?:'.$optional_fws.':'.$optional_fws.$second.')?'.$fws.$zone.'/i';
15827 15827 
 		}
15828 15828 
 		if (preg_match($pcre, $this->remove_rfc2822_comments($date), $match))
15829 15829 
 		{
 
@@ -15848,8 +15848,8 @@  discard block
 
 block discarded – undo
15848 15848 
 			// Numeric timezone
15849 15849 
 			if ($match[8] !== '')
15850 15850 
 			{
15851 
-				$timezone = $match[9] * 3600;
15852 
-				$timezone += $match[10] * 60;
15851 
+				$timezone = $match[9]*3600;
15852 
+				$timezone += $match[10]*60;
15853 15853 
 				if ($match[8] === '-')
15854 15854 
 				{
15855 15855 
 					$timezone = 0 - $timezone;
 
@@ -15911,7 +15911,7 @@  discard block
 
 block discarded – undo
15911 15911 
 			$day = '([0-9]{1,2})';
15912 15912 
 			$year = $hour = $minute = $second = '([0-9]{2})';
15913 15913 
 			$zone = '([A-Z]{1,5})';
15914 
-			$pcre = '/^' . $day_name . ',' . $space . $day . '-' . $month . '-' . $year . $space . $hour . ':' . $minute . ':' . $second . $space . $zone . '$/i';
15914 
+			$pcre = '/^'.$day_name.','.$space.$day.'-'.$month.'-'.$year.$space.$hour.':'.$minute.':'.$second.$space.$zone.'$/i';
15915 15915 
 		}
15916 15916 
 		if (preg_match($pcre, $date, $match))
15917 15917 
 		{
 
@@ -15977,7 +15977,7 @@  discard block
 
 block discarded – undo
15977 15977 
 			$hour = $sec = $min = '([0-9]{2})';
15978 15978 
 			$year = '([0-9]{4})';
15979 15979 
 			$terminator = '\x0A?\x00?';
15980 
-			$pcre = '/^' . $wday_name . $space . $mon_name . $space . $day . $space . $hour . ':' . $min . ':' . $sec . $space . $year . $terminator . '$/i';
15980 
+			$pcre = '/^'.$wday_name.$space.$mon_name.$space.$day.$space.$hour.':'.$min.':'.$sec.$space.$year.$terminator.'$/i';
15981 15981 
 		}
15982 15982 
 		if (preg_match($pcre, $date, $match))
15983 15983 
 		{
 
@@ -16113,7 +16113,7 @@  discard block
 
 block discarded – undo
16113 16113 
 			if ($declaration->parse())
16114 16114 
 			{
16115 16115 
 				$data = substr($data, $pos + 2);
16116 
-				$data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' ."\n". $this->declare_html_entities() . $data;
16116 
+				$data = '<?xml version="'.$declaration->version.'" encoding="'.$encoding.'" standalone="'.(($declaration->standalone) ? 'yes' : 'no').'"?>'."\n".$this->declare_html_entities().$data;
16117 16117 
 			}
16118 16118 
 			else
16119 16119 
 			{
 
@@ -16169,7 +16169,7 @@  discard block
 
 block discarded – undo
16169 16169 
 					case constant('XMLReader::END_ELEMENT'):
16170 16170 
 						if ($xml->namespaceURI !== '')
16171 16171 
 						{
16172 
-							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
16172 
+							$tagName = $xml->namespaceURI.$this->separator.$xml->localName;
16173 16173 
 						}
16174 16174 
 						else
16175 16175 
 						{
 
@@ -16181,7 +16181,7 @@  discard block
 
 block discarded – undo
16181 16181 
 						$empty = $xml->isEmptyElement;
16182 16182 
 						if ($xml->namespaceURI !== '')
16183 16183 
 						{
16184 
-							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
16184 
+							$tagName = $xml->namespaceURI.$this->separator.$xml->localName;
16185 16185 
 						}
16186 16186 
 						else
16187 16187 
 						{
 
@@ -16192,7 +16192,7 @@  discard block
 
 block discarded – undo
16192 16192 
 						{
16193 16193 
 							if ($xml->namespaceURI !== '')
16194 16194 
 							{
16195 
-								$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
16195 
+								$attrName = $xml->namespaceURI.$this->separator.$xml->localName;
16196 16196 
 							}
16197 16197 
 							else
16198 16198 
 							{
 
@@ -16298,12 +16298,12 @@  discard block
 
 block discarded – undo
16298 16298 
 			$this->current_xhtml_construct++;
16299 16299 
 			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML)
16300 16300 
 			{
16301 
-				$this->data['data'] .= '<' . end($this->element);
16301 
+				$this->data['data'] .= '<'.end($this->element);
16302 16302 
 				if (isset($attribs['']))
16303 16303 
 				{
16304 16304 
 					foreach ($attribs[''] as $name => $value)
16305 16305 
 					{
16306 
-						$this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
16306 
+						$this->data['data'] .= ' '.$name.'="'.htmlspecialchars($value, ENT_COMPAT, $this->encoding).'"';
16307 16307 
 					}
16308 16308 
 				}
16309 16309 
 				$this->data['data'] .= '>';
 
@@ -16311,8 +16311,8 @@  discard block
 
 block discarded – undo
16311 16311 
 		}
16312 16312 
 		else
16313 16313 
 		{
16314 
-			$this->datas[] =& $this->data;
16315 
-			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
16314 
+			$this->datas[] = & $this->data;
16315 
+			$this->data = & $this->data['child'][end($this->namespace)][end($this->element)][];
16316 16316 
 			$this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang));
16317 16317 
 			if ((end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml')
16318 16318 
 			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml')
 
@@ -16344,12 +16344,12 @@  discard block
 
 block discarded – undo
16344 16344 
 			$this->current_xhtml_construct--;
16345 16345 
 			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
16346 16346 
 			{
16347 
-				$this->data['data'] .= '</' . end($this->element) . '>';
16347 
+				$this->data['data'] .= '</'.end($this->element).'>';
16348 16348 
 			}
16349 16349 
 		}
16350 16350 
 		if ($this->current_xhtml_construct === -1)
16351 16351 
 		{
16352 
-			$this->data =& $this->datas[count($this->datas) - 1];
16352 
+			$this->data = & $this->datas[count($this->datas) - 1];
16353 16353 
 			array_pop($this->datas);
16354 16354 
 		}
16355 16355 
 
@@ -16384,7 +16384,7 @@  discard block
 
 block discarded – undo
16384 16384 
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2 ||
16385 16385 
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3 ||
16386 16386 
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4 ||
16387 
-					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5 )
16387 
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5)
16388 16388 
 				{
16389 16389 
 					$namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
16390 16390 
 				}
 
@@ -17227,11 +17227,11 @@  discard block
 
 block discarded – undo
17227 17227 
 	public function sanitize($data, $type, $base = '')
17228 17228 
 	{
17229 17229 
 		$data = trim($data);
17230 
-		if ($data !== '' || $type & SIMPLEPIE_CONSTRUCT_IRI)
17230 
+		if ($data !== '' || $type&SIMPLEPIE_CONSTRUCT_IRI)
17231 17231 
 		{
17232 
-			if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
17232 
+			if ($type&SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
17233 17233 
 			{
17234 
-				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
17234 
+				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*'.SIMPLEPIE_PCRE_HTML_ATTRIBUTE.'>)/', $data))
17235 17235 
 				{
17236 17236 
 					$type |= SIMPLEPIE_CONSTRUCT_HTML;
17237 17237 
 				}
 
@@ -17241,12 +17241,12 @@  discard block
 
 block discarded – undo
17241 17241 
 				}
17242 17242 
 			}
17243 17243
17244 
-			if ($type & SIMPLEPIE_CONSTRUCT_BASE64)
17244 
+			if ($type&SIMPLEPIE_CONSTRUCT_BASE64)
17245 17245 
 			{
17246 17246 
 				$data = base64_decode($data);
17247 17247 
 			}
17248 17248
17249 
-			if ($type & (SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML))
17249 
+			if ($type&(SIMPLEPIE_CONSTRUCT_HTML|SIMPLEPIE_CONSTRUCT_XHTML))
17250 17250 
 			{
17251 17251
17252 17252 
 				if (!class_exists('DOMDocument'))
 
@@ -17322,18 +17322,18 @@  discard block
 
 block discarded – undo
17322 17322
17323 17323 
 							if ($cache->load())
17324 17324 
 							{
17325 
-								$img->setAttribute('src', $this->image_handler . $image_url);
17325 
+								$img->setAttribute('src', $this->image_handler.$image_url);
17326 17326 
 							}
17327 17327 
 							else
17328 17328 
 							{
17329 17329 
 								$file = $this->registry->create('File', array($img->getAttribute('src'), $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen));
17330 17330 
 								$headers = $file->headers;
17331 17331
17332 
-								if ($file->success && ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
17332 
+								if ($file->success && ($file->method&SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
17333 17333 
 								{
17334 17334 
 									if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
17335 17335 
 									{
17336 
-										$img->setAttribute('src', $this->image_handler . $image_url);
17336 
+										$img->setAttribute('src', $this->image_handler.$image_url);
17337 17337 
 									}
17338 17338 
 									else
17339 17339 
 									{
 
@@ -17359,16 +17359,16 @@  discard block
 
 block discarded – undo
17359 17359
17360 17360 
 				if ($this->remove_div)
17361 17361 
 				{
17362 
-					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
17362 
+					$data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '', $data);
17363 17363 
 					$data = preg_replace('/<\/div>$/', '', $data);
17364 17364 
 				}
17365 17365 
 				else
17366 17366 
 				{
17367 
-					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
17367 
+					$data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '<div>', $data);
17368 17368 
 				}
17369 17369 
 			}
17370 17370
17371 
-			if ($type & SIMPLEPIE_CONSTRUCT_IRI)
17371 
+			if ($type&SIMPLEPIE_CONSTRUCT_IRI)
17372 17372 
 			{
17373 17373 
 				$absolute = $this->registry->call('Misc', 'absolutize_url', array($data, $base));
17374 17374 
 				if ($absolute !== false)
 
@@ -17377,7 +17377,7 @@  discard block
 
 block discarded – undo
17377 17377 
 				}
17378 17378 
 			}
17379 17379
17380 
-			if ($type & (SIMPLEPIE_CONSTRUCT_TEXT | SIMPLEPIE_CONSTRUCT_IRI))
17380 
+			if ($type&(SIMPLEPIE_CONSTRUCT_TEXT|SIMPLEPIE_CONSTRUCT_IRI))
17381 17381 
 			{
17382 17382 
 				$data = htmlspecialchars($data, ENT_COMPAT, 'UTF-8');
17383 17383 
 			}
 
@@ -17394,11 +17394,11 @@  discard block
 
 block discarded – undo
17394 17394 
 	{
17395 17395 
 		$ret = '';
17396 17396 
 		$html = preg_replace('%</?(?:html|body)[^>]*?'.'>%is', '', $html);
17397 
-		if ($type & ~SIMPLEPIE_CONSTRUCT_XHTML)
17397 
+		if ($type&~SIMPLEPIE_CONSTRUCT_XHTML)
17398 17398 
 		{
17399 17399 
 			// Atom XHTML constructs are wrapped with a div by default
17400 17400 
 			// Note: No protection if $html contains a stray </div>!
17401 
-			$html = '<div>' . $html . '</div>';
17401 
+			$html = '<div>'.$html.'</div>';
17402 17402 
 			$ret .= '<!DOCTYPE html>';
17403 17403 
 			$content_type = 'text/html';
17404 17404 
 		}
 
@@ -17409,8 +17409,8 @@  discard block
 
 block discarded – undo
17409 17409 
 		}
17410 17410
17411 17411 
 		$ret .= '<html><head>';
17412 
-		$ret .= '<meta http-equiv="Content-Type" content="' . $content_type . '; charset=utf-8" />';
17413 
-		$ret .= '</head><body>' . $html . '</body></html>';
17412 
+		$ret .= '<meta http-equiv="Content-Type" content="'.$content_type.'; charset=utf-8" />';
17413 
+		$ret .= '</head><body>'.$html.'</body></html>';
17414 17414 
 		return $ret;
17415 17415 
 	}
17416 17416 
 
@@ -17468,7 +17468,7 @@  discard block
 
 block discarded – undo
17468 17468
17469 17469 
 	protected function strip_tag($tag, $document, $xpath, $type)
17470 17470 
 	{
17471 
-		$elements = $xpath->query('body//' . $tag);
17471 
+		$elements = $xpath->query('body//'.$tag);
17472 17472 
 		if ($this->encode_instead_of_strip)
17473 17473 
 		{
17474 17474 
 			foreach ($elements as $element)
 
@@ -17478,7 +17478,7 @@  discard block
 
 block discarded – undo
17478 17478 
 				// For elements which aren't script or style, include the tag itself
17479 17479 
 				if (!in_array($tag, array('script', 'style')))
17480 17480 
 				{
17481 
-					$text = '<' . $tag;
17481 
+					$text = '<'.$tag;
17482 17482 
 					if ($element->hasAttributes())
17483 17483 
 					{
17484 17484 
 						$attrs = array();
 
@@ -17487,21 +17487,21 @@  discard block
 
 block discarded – undo
17487 17487 
 							$value = $attr->value;
17488 17488
17489 17489 
 							// In XHTML, empty values should never exist, so we repeat the value
17490 
-							if (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_XHTML))
17490 
+							if (empty($value) && ($type&SIMPLEPIE_CONSTRUCT_XHTML))
17491 17491 
 							{
17492 17492 
 								$value = $name;
17493 17493 
 							}
17494 17494 
 							// For HTML, empty is fine
17495 
-							elseif (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_HTML))
17495 
+							elseif (empty($value) && ($type&SIMPLEPIE_CONSTRUCT_HTML))
17496 17496 
 							{
17497 17497 
 								$attrs[] = $name;
17498 17498 
 								continue;
17499 17499 
 							}
17500 17500
17501 17501 
 							// Standard attribute text
17502 
-							$attrs[] = $name . '="' . $attr->value . '"';
17502 
+							$attrs[] = $name.'="'.$attr->value.'"';
17503 17503 
 						}
17504 
-						$text .= ' ' . implode(' ', $attrs);
17504 
+						$text .= ' '.implode(' ', $attrs);
17505 17505 
 					}
17506 17506 
 					$text .= '>';
17507 17507 
 					$fragment->appendChild(new DOMText($text));
 
@@ -17516,7 +17516,7 @@  discard block
 
 block discarded – undo
17516 17516
17517 17517 
 				if (!in_array($tag, array('script', 'style')))
17518 17518 
 				{
17519 
-					$fragment->appendChild(new DOMText('</' . $tag . '>'));
17519 
+					$fragment->appendChild(new DOMText('</'.$tag.'>'));
17520 17520 
 				}
17521 17521
17522 17522 
 				$element->parentNode->replaceChild($fragment, $element);
 
@@ -17552,7 +17552,7 @@  discard block
 
 block discarded – undo
17552 17552
17553 17553 
 	protected function strip_attr($attrib, $xpath)
17554 17554 
 	{
17555 
-		$elements = $xpath->query('//*[@' . $attrib . ']');
17555 
+		$elements = $xpath->query('//*[@'.$attrib.']');
17556 17556
17557 17557 
 		foreach ($elements as $element)
17558 17558 
 		{
 
@@ -17959,19 +17959,19 @@  discard block
 
 block discarded – undo
17959 17959 
 			{
17960 17960 
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
17961 17961 
 				{
17962 
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
17962 
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
17963 17963 
 					{
17964 
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
17965 
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
17964 
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
17965 
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
17966 17966 
 					}
17967 17967 
 					else
17968 17968 
 					{
17969 
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
17969 
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
17970 17970 
 					}
17971 17971 
 				}
17972 17972 
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
17973 17973 
 				{
17974 
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
17974 
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
17975 17975 
 				}
17976 17976 
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
17977 17977 
 			}
 
@@ -18653,7 +18653,7 @@  discard block
 
 block discarded – undo
18653 18653 
 			$this->OS = ord($this->compressed_data[$this->position++]);
18654 18654
18655 18655 
 			// Parse the FEXTRA
18656 
-			if ($this->flags & 4)
18656 
+			if ($this->flags&4)
18657 18657 
 			{
18658 18658 
 				// Read subfield IDs
18659 18659 
 				$this->SI1 = $this->compressed_data[$this->position++];
 
@@ -18684,7 +18684,7 @@  discard block
 
 block discarded – undo
18684 18684 
 			}
18685 18685
18686 18686 
 			// Parse the FNAME
18687 
-			if ($this->flags & 8)
18687 
+			if ($this->flags&8)
18688 18688 
 			{
18689 18689 
 				// Get the length of the filename
18690 18690 
 				$len = strcspn($this->compressed_data, "\x00", $this->position);
 
@@ -18704,7 +18704,7 @@  discard block
 
 block discarded – undo
18704 18704 
 			}
18705 18705
18706 18706 
 			// Parse the FCOMMENT
18707 
-			if ($this->flags & 16)
18707 
+			if ($this->flags&16)
18708 18708 
 			{
18709 18709 
 				// Get the length of the comment
18710 18710 
 				$len = strcspn($this->compressed_data, "\x00", $this->position);
 
@@ -18724,7 +18724,7 @@  discard block
 
 block discarded – undo
18724 18724 
 			}
18725 18725
18726 18726 
 			// Parse the FHCRC
18727 
-			if ($this->flags & 2)
18727 
+			if ($this->flags&2)
18728 18728 
 			{
18729 18729 
 				// Check the length of the string is still valid
18730 18730 
 				$this->min_compressed_size += $len + 2;
 
@@ -18734,7 +18734,7 @@  discard block
 
 block discarded – undo
18734 18734 
 					$crc = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
18735 18735
18736 18736 
 					// Check the CRC matches
18737 
-					if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc)
18737 
+					if ((crc32(substr($this->compressed_data, 0, $this->position))&0xFFFF) === $crc)
18738 18738 
 					{
18739 18739 
 						$this->position += 2;
18740 18740 
 					}
 
@@ -18770,7 +18770,7 @@  discard block
 
 block discarded – undo
18770 18770 
 			// Check ISIZE of data
18771 18771 
 			$isize = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
18772 18772 
 			$this->position += 4;
18773 
-			if (sprintf('%u', strlen($this->data) & 0xFFFFFFFF) !== sprintf('%u', $isize))
18773 
+			if (sprintf('%u', strlen($this->data)&0xFFFFFFFF) !== sprintf('%u', $isize))
18774 18774 
 			{
18775 18775 
 				return false;
18776 18776 
 			}
Please login to merge, or discard this patch.
marine-type-detailed.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -5,16 +5,16 @@  discard block
 
 block discarded – undo
5 5 
 require_once('require/class.Language.php');
6 6 
 $Marine = new Marine();
7 7 
 $type = 'marine';
8 
-if (!isset($_GET['type'])){
8 
+if (!isset($_GET['type'])) {
9 9 
 	header('Location: '.$globalURL.'/');
10 10 
 } else {
11 11 
 	//calculuation for the pagination
12 
-	if(!isset($_GET['limit']) || count(explode(",", $_GET['limit'])) < 2)
12 
+	if (!isset($_GET['limit']) || count(explode(",", $_GET['limit'])) < 2)
13 13 
 	{
14 14 
 		$limit_start = 0;
15 15 
 		$limit_end = 25;
16 16 
 		$absolute_difference = 25;
17 
-	}  else {
17 
+	} else {
18 18 
 		$limit_explode = explode(",", $_GET['limit']);
19 19 
 		$limit_start = $limit_explode[0];
20 20 
 		$limit_end = $limit_explode[1];
 
@@ -28,14 +28,14 @@  discard block
 
 block discarded – undo
28 28 
 	$limit_previous_1 = $limit_start - $absolute_difference;
29 29 
 	$limit_previous_2 = $limit_end - $absolute_difference;
30 30
31 
-	$marine_type = filter_input(INPUT_GET,'type',FILTER_SANITIZE_STRING);
31 
+	$marine_type = filter_input(INPUT_GET, 'type', FILTER_SANITIZE_STRING);
32 32 
 	$page_url = $globalURL.'/marine/type/'.$marine_type;
33 
-	$sort = htmlspecialchars(filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING));
34 
-	$spotter_array = $Marine->getMarineDataByType($marine_type,$limit_start.",".$absolute_difference, $sort);
33 
+	$sort = htmlspecialchars(filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING));
34 
+	$spotter_array = $Marine->getMarineDataByType($marine_type, $limit_start.",".$absolute_difference, $sort);
35 35
36 36 
 	if (!empty($spotter_array))
37 37 
 	{
38 
-		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['type']);
38 
+		$title = sprintf(_("Detailed View for %s"), $spotter_array[0]['type']);
39 39 
 		require_once('header.php');
40 40
41 41 
 		print '<div class="info column">';
 
@@ -44,7 +44,7 @@  discard block
 
 block discarded – undo
44 44
45 45 
 		//include('aircraft-sub-menu.php');
46 46 
 		print '<div class="table column">';
47 
-		print '<p>'.sprintf(_("The table below shows the detailed information of all marine of type <strong>%s</strong>."),$spotter_array[0]['type']).'</p>';
47 
+		print '<p>'.sprintf(_("The table below shows the detailed information of all marine of type <strong>%s</strong>."), $spotter_array[0]['type']).'</p>';
48 48
49 49 
 		include('table-output.php');
50 50
Please login to merge, or discard this patch.
newest.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -6,7 +6,7 @@  discard block
 
 block discarded – undo
6 6
7 7 
 if (isset($_POST['category']))
8 8 
 {
9 
-	$category = filter_input(INPUT_POST,'category',FILTER_SANITIZE_STRING);
9 
+	$category = filter_input(INPUT_POST, 'category', FILTER_SANITIZE_STRING);
10 10 
 	header('Location: '.$globalURL.'/newest/'.$category);
11 11 
 }
12 12 
 
@@ -14,18 +14,18 @@  discard block
 
 block discarded – undo
14 14 
 require_once('header.php');
15 15
16 16 
 //calculuation for the pagination
17 
-if(!isset($_GET['limit']))
17 
+if (!isset($_GET['limit']))
18 18 
 {
19 19 
   $limit_start = 0;
20 20 
   $limit_end = 25;
21 21 
   $absolute_difference = 25;
22 
-}  else {
22 
+} else {
23 23 
 	$limit_explode = explode(",", $_GET['limit']);
24 24 
 	$limit_start = $limit_explode[0];
25 25 
 	$limit_end = $limit_explode[1];
26 26 
 }
27 27
28 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
28 
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
29 29
30 30 
 $absolute_difference = abs($limit_start - $limit_end);
31 31 
 $limit_next = $limit_end + $absolute_difference;
 
@@ -36,7 +36,7 @@  discard block
 
 block discarded – undo
36 36 
 {
37 37 
 	$category = "aircraft";
38 38 
 } else {
39 
-	$category = filter_input(INPUT_GET,'category',FILTER_SANITIZE_STRING);
39 
+	$category = filter_input(INPUT_GET, 'category', FILTER_SANITIZE_STRING);
40 40 
 }
41 41
42 42 
 $page_url = $globalURL.'/newest/'.$category;
Please login to merge, or discard this patch.
news.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -14,18 +14,18 @@  discard block
 
 block discarded – undo
14 14 
 else $type = 'global';
15 15
16 16 
 //calculuation for the pagination
17 
-if(!isset($_GET['limit']))
17 
+if (!isset($_GET['limit']))
18 18 
 {
19 19 
   $limit_start = 0;
20 20 
   $limit_end = 25;
21 21 
   $absolute_difference = 25;
22 
-}  else {
22 
+} else {
23 23 
 	$limit_explode = explode(",", $_GET['limit']);
24 24 
 	$limit_start = $limit_explode[0];
25 25 
 	$limit_end = $limit_explode[1];
26 26 
 }
27 27
28 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
28 
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
29 29
30 30 
 $absolute_difference = abs($limit_start - $limit_end);
31 31 
 $limit_next = $limit_end + $absolute_difference;
 
@@ -59,7 +59,7 @@  discard block
 
 block discarded – undo
59 59 
 if (!empty($anews))
60 60 
 {
61 61 
 	$j = 0;
62 
-	foreach($anews as $news) {
62 
+	foreach ($anews as $news) {
63 63 
 		if ($j > 10) break;
64 64 
 		$j++;
65 65 
 		print '<div class="news">';
Please login to merge, or discard this patch.
live-czml.php 1 patch
Spacing   +65 added lines, -65 removed lines patch added patch discarded remove patch 
@@ -56,11 +56,11 @@  discard block
 
 block discarded – undo
56 56 
     $s3 = sin($bank/2);
57 57 
     $c1c2 = $c1*$c2;
58 58 
     $s1s2 = $s1*$s2;
59 
-    $w =$c1c2*$c3 - $s1s2*$s3;
60 
-    $x =$c1c2*$s3 + $s1s2*$c3;
61 
-    $y =$s1*$c2*$c3 + $c1*$s2*$s3;
62 
-    $z =$c1*$s2*$c3 - $s1*$c2*$s3;
63 
-    return array('x' => $x,'y' => $y,'z' => $z,'w' => $w);
59 
+    $w = $c1c2*$c3 - $s1s2*$s3;
60 
+    $x = $c1c2*$s3 + $s1s2*$c3;
61 
+    $y = $s1*$c2*$c3 + $c1*$s2*$s3;
62 
+    $z = $c1*$s2*$c3 - $s1*$c2*$s3;
63 
+    return array('x' => $x, 'y' => $y, 'z' => $z, 'w' => $w);
64 64 
 //    return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365');
65 65
66 66 
 }
 
@@ -81,17 +81,17 @@  discard block
 
 block discarded – undo
81 81 
 $min = false;
82 82 
 $allhistory = false;
83 83 
 $filter['source'] = array();
84 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
85 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
86 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
87 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
88 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
89 
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
90 
-if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
91 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
92 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
93 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
94 
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
84 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'], array('vatsimtxt'));
85 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'], array('whazzup'));
86 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'], array('phpvmacars'));
87 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'], array('sbs', 'famaprs'));
88 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'], array('aprs'));
89 
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'], FILTER_SANITIZE_STRING);
90 
+if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'], FILTER_SANITIZE_STRING);
91 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',', $_COOKIE['filter_Airlines']), FILTER_SANITIZE_STRING);
92 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',', $_COOKIE['filter_Sources']), FILTER_SANITIZE_STRING);
93 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'], FILTER_SANITIZE_STRING);
94 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'], FILTER_SANITIZE_STRING);
95 95 
 /*
96 96 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
97 97 
 	$min = true;
 
@@ -138,12 +138,12 @@  discard block
 
 block discarded – undo
138 138 
 	$from_archive = true;
139 139 
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
140 140 
 //	$enddate = filter_input(INPUT_GET,'enddate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
141 
-	$begindate = filter_input(INPUT_GET,'begindate',FILTER_SANITIZE_NUMBER_INT);
142 
-	$enddate = filter_input(INPUT_GET,'enddate',FILTER_SANITIZE_NUMBER_INT);
143 
-	$archivespeed = filter_input(INPUT_GET,'speed',FILTER_SANITIZE_NUMBER_INT);
144 
-	$begindate = date('Y-m-d H:i:s',$begindate);
145 
-	$enddate = date('Y-m-d H:i:s',$enddate);
146 
-	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate,$enddate,$filter);
141 
+	$begindate = filter_input(INPUT_GET, 'begindate', FILTER_SANITIZE_NUMBER_INT);
142 
+	$enddate = filter_input(INPUT_GET, 'enddate', FILTER_SANITIZE_NUMBER_INT);
143 
+	$archivespeed = filter_input(INPUT_GET, 'speed', FILTER_SANITIZE_NUMBER_INT);
144 
+	$begindate = date('Y-m-d H:i:s', $begindate);
145 
+	$enddate = date('Y-m-d H:i:s', $enddate);
146 
+	$spotter_array = $SpotterArchive->getMinLiveSpotterDataPlayback($begindate, $enddate, $filter);
147 147 
 } elseif (isset($_COOKIE['archive']) && isset($_COOKIE['archive_begin']) && isset($_COOKIE['archive_end']) && isset($_COOKIE['archive_speed'])) {
148 148 
 	$from_archive = true;
149 149 
 //	$begindate = filter_input(INPUT_GET,'begindate',FILTER_VALIDATE_REGEXP,array("options"=>array("regexp"=>'~^\d{4}/\d{2}/\d{2}$~')));
 
@@ -153,46 +153,46 @@  discard block
 
 block discarded – undo
153 153 
 	$begindate = $_COOKIE['archive_begin'];
154 154 
 	$enddate = $_COOKIE['archive_end'];
155 155
156 
-	$archivespeed = filter_var($_COOKIE['archive_speed'],FILTER_SANITIZE_NUMBER_INT);
157 
-	$begindate = date('Y-m-d H:i:s',$begindate);
158 
-	$enddate = date('Y-m-d H:i:s',$enddate);
156 
+	$archivespeed = filter_var($_COOKIE['archive_speed'], FILTER_SANITIZE_NUMBER_INT);
157 
+	$begindate = date('Y-m-d H:i:s', $begindate);
158 
+	$enddate = date('Y-m-d H:i:s', $enddate);
159 159 
 //	echo 'Begin : '.$begindate.' - End : '.$enddate."\n";
160 
-	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate,$enddate,$filter);
160 
+	$spotter_array = $SpotterArchive->getMinLiveSpotterData($begindate, $enddate, $filter);
161 161 
 } elseif ($tracker) {
162 162 
 	$coord = array();
163 163 
 	if (isset($_GET['coord']) && $_GET['coord'] != '') {
164 
-		$coord = explode(',',$_GET['coord']);
165 
-		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
164 
+		$coord = explode(',', $_GET['coord']);
165 
+		if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT)
166 166 
 		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
167 167 
 			$coord = array();
168 168 
 		}
169 169 
 	}
170 
-	$spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord,$filter,true);
170 
+	$spotter_array = $TrackerLive->getMinLastLiveTrackerData($coord, $filter, true);
171 171 
 } elseif ($marine) {
172 172 
 	$coord = array();
173 173 
 	if (isset($_GET['coord']) && $_GET['coord'] != '') {
174 
-		$coord = explode(',',$_GET['coord']);
175 
-		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
174 
+		$coord = explode(',', $_GET['coord']);
175 
+		if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT)
176 176 
 		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
177 177 
 			$coord = array();
178 178 
 		}
179 179 
 	}
180 
-	$spotter_array = $MarineLive->getMinLastLiveMarineData($coord,$filter,true);
180 
+	$spotter_array = $MarineLive->getMinLastLiveMarineData($coord, $filter, true);
181 181 
 } else {
182 182 
 	$coord = array();
183 183 
 	if (isset($_GET['coord']) && $_GET['coord'] != '') {
184 
-		$coord = explode(',',$_GET['coord']);
185 
-		if (!(filter_var($coord[0],FILTER_VALIDATE_FLOAT) && filter_var($coord[1],FILTER_VALIDATE_FLOAT) && filter_var($coord[2],FILTER_VALIDATE_FLOAT) && filter_var($coord[3],FILTER_VALIDATE_FLOAT)
184 
+		$coord = explode(',', $_GET['coord']);
185 
+		if (!(filter_var($coord[0], FILTER_VALIDATE_FLOAT) && filter_var($coord[1], FILTER_VALIDATE_FLOAT) && filter_var($coord[2], FILTER_VALIDATE_FLOAT) && filter_var($coord[3], FILTER_VALIDATE_FLOAT)
186 186 
 		    && $coord[0] > -180.0 && $coord[0] < 180.0 && $coord[1] > -90.0 && $coord[1] < 90.0 && $coord[2] > -180.0 && $coord[2] < 180.0 && $coord[3] > -90.0 && $coord[3] < 90.0)) {
187 187 
 			$coord = array();
188 188 
 		}
189 189 
 	}
190 
-	$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord,$filter,true);
190 
+	$spotter_array = $SpotterLive->getMinLastLiveSpotterData($coord, $filter, true);
191 191 
 }
192 192 
 //print_r($spotter_array);
193 193 
 if (!empty($spotter_array) && isset($coord)) {
194 194 
 	if (isset($_GET['archive'])) {
195 
-		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
195 
+		$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate, $enddate, $filter);
196 196 
 	} elseif ($tracker) {
197 197 
 		$flightcnt = $TrackerLive->getLiveTrackerCount($filter);
198 198 
 	} elseif ($marine) {
 
@@ -203,15 +203,15 @@  discard block
 
 block discarded – undo
203 203 
 	if ($flightcnt == '') $flightcnt = 0;
204 204 
 } else $flightcnt = 0;
205 205
206 
-$sqltime = round(microtime(true)-$begintime,2);
206 
+$sqltime = round(microtime(true) - $begintime, 2);
207 207 
 $minitime = time();
208 208 
 $maxitime = 0;
209 
-$lastupdate = filter_input(INPUT_GET,'update',FILTER_SANITIZE_NUMBER_INT);
209 
+$lastupdate = filter_input(INPUT_GET, 'update', FILTER_SANITIZE_NUMBER_INT);
210 210 
 $modelsdb = array();
211 211 
 if (file_exists(dirname(__FILE__).'/models/modelsdb')) {
212 
-	if (($handle = fopen(dirname(__FILE__).'/models/modelsdb','r')) !== FALSE) {
213 
-		while (($row = fgetcsv($handle,1000)) !== FALSE) {
214 
-			if (isset($row[1]) ){
212 
+	if (($handle = fopen(dirname(__FILE__).'/models/modelsdb', 'r')) !== FALSE) {
213 
+		while (($row = fgetcsv($handle, 1000)) !== FALSE) {
214 
+			if (isset($row[1])) {
215 215 
 				$model = $row[0];
216 216 
 				$modelsdb[$model] = $row[1];
217 217 
 			}
 
@@ -221,9 +221,9 @@  discard block
 
 block discarded – undo
221 221 
 }
222 222 
 $modelsdb2 = array();
223 223 
 if (file_exists(dirname(__FILE__).'/models/gltf2/modelsdb')) {
224 
-	if (($handle = fopen(dirname(__FILE__).'/models/gltf2/modelsdb','r')) !== FALSE) {
225 
-		while (($row = fgetcsv($handle,1000)) !== FALSE) {
226 
-			if (isset($row[1]) ){
224 
+	if (($handle = fopen(dirname(__FILE__).'/models/gltf2/modelsdb', 'r')) !== FALSE) {
225 
+		while (($row = fgetcsv($handle, 1000)) !== FALSE) {
226 
+			if (isset($row[1])) {
227 227 
 				$model = $row[0];
228 228 
 				$modelsdb2[$model] = $row[1];
229 229 
 			}
 
@@ -261,7 +261,7 @@  discard block
 
 block discarded – undo
261 261 
 if (!empty($spotter_array) && is_array($spotter_array))
262 262 
 {
263 263 
 	$nblatlong = 0;
264 
-	foreach($spotter_array as $spotter_item)
264 
+	foreach ($spotter_array as $spotter_item)
265 265 
 	{
266 266 
 		$j++;
267 267 
 		//if (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'airwhere') $heightrelative = 'RELATIVE_TO_GROUND';
 
@@ -303,9 +303,9 @@  discard block
 
 block discarded – undo
303 303 
 			$output .= '"lastupdate": "'.$lastupdate.'",';
304 304 
 			if (isset($spotter_item['format_source'])) $output .= '"format": "'.$spotter_item['format_source'].'",';
305 305 
 			if ($tracker) {
306 
-				$output.= '"type": "tracker"';
306 
+				$output .= '"type": "tracker"';
307 307 
 			} elseif ($marine) {
308 
-				$output.= '"type": "marine"';
308 
+				$output .= '"type": "marine"';
309 309 
 			} else {
310 310 
 				if (isset($globalMap3DLiveries) && $globalMap3DLiveries) {
311 311 
 					$aircraft_icao = $spotter_item['aircraft_icao'];
 
@@ -319,14 +319,14 @@  discard block
 
 block discarded – undo
319 319 
 						if (isset($airline_icao)) {
320 320 
 							$imagefile = $aircraft_icao.'-'.$airline_icao.'.png';
321 321 
 							if (file_exists(dirname(__FILE__).'/models/gltf2/liveries/'.$imagefile)) {
322 
-								$output.= '"liveries": "'.$globalURL.'/models/gltf2/liveries/'.$imagefile.'",';
322 
+								$output .= '"liveries": "'.$globalURL.'/models/gltf2/liveries/'.$imagefile.'",';
323 323 
 							}
324 324 
 						}
325 325 
 					}
326 
-					if ($ident != '') $output.= '"ident": "'.$ident.'",';
326 
+					if ($ident != '') $output .= '"ident": "'.$ident.'",';
327 327 
 				}
328 
-				$output.= '"gltf2": %gltf2%,';
329 
-				$output.= '"type": "flight"';
328 
+				$output .= '"gltf2": %gltf2%,';
329 
+				$output .= '"type": "flight"';
330 330 
 			}
331 331 
 			$output .= '},';
332 332 
 
@@ -679,8 +679,8 @@  discard block
 
 block discarded – undo
679 679 
 					$output .= '},';
680 680 
 				}
681 681 
 			}
682 
-			if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output);
683 
-			else $output = str_replace('%onground%','false',$output);
682 
+			if (isset($onground) && $onground) $output = str_replace('%onground%', 'true', $output);
683 
+			else $output = str_replace('%onground%', 'false', $output);
684 684
685 685 
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
686 686 
 			//$output .= '"heightReference": "'.$heightrelative.'",';
 
@@ -695,7 +695,7 @@  discard block
 
 block discarded – undo
695 695 
 			$output .= '"cartographicDegrees": [';
696 696 
 			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
697 697 
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
698 
-			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
698 
+			$output .= '"'.date("c", strtotime($spotter_item['date'])).'", ';
699 699 
 			$output .= $spotter_item['longitude'].', ';
700 700 
 			$output .= $spotter_item['latitude'];
701 701 
 			$prevlong = $spotter_item['longitude'];
 
@@ -723,8 +723,8 @@  discard block
 
 block discarded – undo
723 723 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
724 724 
 			//$orientation .= '"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
725 725 
 		} else {
726 
-			$nblatlong = $nblatlong+1;
727 
-			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
726 
+			$nblatlong = $nblatlong + 1;
727 
+			$output .= ',"'.date("c", strtotime($spotter_item['date'])).'", ';
728 728 
 			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
729 729 
 			if ($spotter_item['ground_speed'] == 0) {
730 730 
 				$output .= $prevlong.', ';
 
@@ -764,17 +764,17 @@  discard block
 
 block discarded – undo
764 764 
 }
765 765 
 $output .= ']';
766 766 
 if (isset($globalArchive) && $globalArchive === TRUE) {
767 
-	if ((time()-$globalLiveInterval) > $minitime) {
768 
-		if (time()-$globalLiveInterval > $maxitime) {
769 
-			$output = str_replace('%minitime%',date("c",$maxitime),$output);
767 
+	if ((time() - $globalLiveInterval) > $minitime) {
768 
+		if (time() - $globalLiveInterval > $maxitime) {
769 
+			$output = str_replace('%minitime%', date("c", $maxitime), $output);
770 770 
 		} else {
771 
-			$output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
771 
+			$output = str_replace('%minitime%', date("c", time() - $globalLiveInterval), $output);
772 772 
 		}
773 773 
 	}
774 
-	else $output = str_replace('%minitime%',date("c",$minitime),$output);
775 
-} else $output = str_replace('%minitime%',date("c",$minitime),$output);
776 
-$output = str_replace('%maxitime%',date("c",$maxitime),$output);
777 
-if ($gltf2) $output = str_replace('%gltf2%','true',$output);
778 
-else $output = str_replace('%gltf2%','false',$output);
774 
+	else $output = str_replace('%minitime%', date("c", $minitime), $output);
775 
+} else $output = str_replace('%minitime%', date("c", $minitime), $output);
776 
+$output = str_replace('%maxitime%', date("c", $maxitime), $output);
777 
+if ($gltf2) $output = str_replace('%gltf2%', 'true', $output);
778 
+else $output = str_replace('%gltf2%', 'false', $output);
779 779 
 print $output;
780 780 
 ?>
Please login to merge, or discard this patch.