View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( b49092...cf2135 )
by Yannick
30:03
created
Status
Category
Toggle Patches
install/class.update_schema.php 2 patches
Spacing   +235 added lines, -235 removed lines patch added patch discarded remove patch 
@@ -14,11 +14,11 @@  discard block
 
 block discarded – undo
14 14 
             try {
15 15 
             	$sth = $Connection->db->prepare($query);
16 16 
 		$sth->execute();
17 
-    	    } catch(PDOException $e) {
17 
+    	    } catch (PDOException $e) {
18 18 
 		return "error : ".$e->getMessage()."\n";
19 19 
     	    }
20 20 
     	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
21 
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
21 
+    		$Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']);
22 22 
     	    }
23 23
24 24 
 	}
 
@@ -50,7 +50,7 @@  discard block
 
 block discarded – undo
50 50 
         	try {
51 51 
             	    $sth = $Connection->db->prepare($query);
52 52 
 		    $sth->execute();
53 
-    		} catch(PDOException $e) {
53 
+    		} catch (PDOException $e) {
54 54 
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
55 55 
     		}
56 56 
     		// Copy schedules data to routes table
 
@@ -60,7 +60,7 @@  discard block
 
 block discarded – undo
60 60 
         	try {
61 61 
             	    $sth = $Connection->db->prepare($query);
62 62 
 		    $sth->execute();
63 
-    		} catch(PDOException $e) {
63 
+    		} catch (PDOException $e) {
64 64 
 		    return "error (delete schedule table) : ".$e->getMessage()."\n";
65 65 
     		}
66 66 
     		// Add source column
 
@@ -68,7 +68,7 @@  discard block
 
 block discarded – undo
68 68 
     		try {
69 69 
             	    $sth = $Connection->db->prepare($query);
70 70 
 		    $sth->execute();
71 
-    		} catch(PDOException $e) {
71 
+    		} catch (PDOException $e) {
72 72 
 		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
73 73 
     		}
74 74 
 		// Delete unused column
 
@@ -76,7 +76,7 @@  discard block
 
 block discarded – undo
76 76 
     		try {
77 77 
             	    $sth = $Connection->db->prepare($query);
78 78 
 		    $sth->execute();
79 
-    		} catch(PDOException $e) {
79 
+    		} catch (PDOException $e) {
80 80 
 		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
81 81 
     		}
82 82 
 		// Add ModeS column
 
@@ -84,14 +84,14 @@  discard block
 
 block discarded – undo
84 84 
     		try {
85 85 
             	    $sth = $Connection->db->prepare($query);
86 86 
 		    $sth->execute();
87 
-    		} catch(PDOException $e) {
87 
+    		} catch (PDOException $e) {
88 88 
 		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
89 89 
     		}
90 90 
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
91 91 
     		try {
92 92 
             	    $sth = $Connection->db->prepare($query);
93 93 
 		    $sth->execute();
94 
-    		} catch(PDOException $e) {
94 
+    		} catch (PDOException $e) {
95 95 
 		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
96 96 
     		}
97 97 
     		// Add auto_increment for aircraft_modes
 
@@ -99,7 +99,7 @@  discard block
 
 block discarded – undo
99 99 
     		try {
100 100 
             	    $sth = $Connection->db->prepare($query);
101 101 
 		    $sth->execute();
102 
-    		} catch(PDOException $e) {
102 
+    		} catch (PDOException $e) {
103 103 
 		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
104 104 
     		}
105 105 
     		$error = '';
 
@@ -110,7 +110,7 @@  discard block
 
 block discarded – undo
110 110 
         	try {
111 111 
             	    $sth = $Connection->db->prepare($query);
112 112 
 		    $sth->execute();
113 
-    		} catch(PDOException $e) {
113 
+    		} catch (PDOException $e) {
114 114 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
115 115 
     		}
116 116 
 		return $error;
 
@@ -123,7 +123,7 @@  discard block
 
 block discarded – undo
123 123 
         	try {
124 124 
             	    $sth = $Connection->db->prepare($query);
125 125 
 		    $sth->execute();
126 
-    		} catch(PDOException $e) {
126 
+    		} catch (PDOException $e) {
127 127 
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
128 128 
     		}
129 129 
     		$error = '';
 
@@ -134,7 +134,7 @@  discard block
 
 block discarded – undo
134 134 
         	try {
135 135 
             	    $sth = $Connection->db->prepare($query);
136 136 
 		    $sth->execute();
137 
-    		} catch(PDOException $e) {
137 
+    		} catch (PDOException $e) {
138 138 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
139 139 
     		}
140 140 
 		return $error;
 
@@ -147,7 +147,7 @@  discard block
 
 block discarded – undo
147 147 
         	try {
148 148 
             	    $sth = $Connection->db->prepare($query);
149 149 
 		    $sth->execute();
150 
-    		} catch(PDOException $e) {
150 
+    		} catch (PDOException $e) {
151 151 
 		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
152 152 
     		}
153 153 
     		// Add image_source_website column to spotter_image
 
@@ -155,7 +155,7 @@  discard block
 
 block discarded – undo
155 155 
         	try {
156 156 
             	    $sth = $Connection->db->prepare($query);
157 157 
 		    $sth->execute();
158 
-    		} catch(PDOException $e) {
158 
+    		} catch (PDOException $e) {
159 159 
 		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
160 160 
     		}
161 161 
     		$error = '';
 
@@ -164,7 +164,7 @@  discard block
 
 block discarded – undo
164 164 
         	try {
165 165 
             	    $sth = $Connection->db->prepare($query);
166 166 
 		    $sth->execute();
167 
-    		} catch(PDOException $e) {
167 
+    		} catch (PDOException $e) {
168 168 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
169 169 
     		}
170 170 
 		return $error;
 
@@ -182,7 +182,7 @@  discard block
 
 block discarded – undo
182 182 
         	    try {
183 183 
             		$sth = $Connection->db->prepare($query);
184 184 
 			$sth->execute();
185 
-    		    } catch(PDOException $e) {
185 
+    		    } catch (PDOException $e) {
186 186 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
187 187 
     		    }
188 188 
     		}
 
@@ -196,7 +196,7 @@  discard block
 
 block discarded – undo
196 196 
         	try {
197 197 
             	    $sth = $Connection->db->prepare($query);
198 198 
 		    $sth->execute();
199 
-    		} catch(PDOException $e) {
199 
+    		} catch (PDOException $e) {
200 200 
 		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
201 201 
     		}
202 202 
     		// Add aircraft_shadow column to aircraft
 
@@ -204,7 +204,7 @@  discard block
 
 block discarded – undo
204 204 
         	try {
205 205 
             	    $sth = $Connection->db->prepare($query);
206 206 
 		    $sth->execute();
207 
-    		} catch(PDOException $e) {
207 
+    		} catch (PDOException $e) {
208 208 
 		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
209 209 
     		}
210 210 
     		// Add aircraft_shadow column to spotter_live
 
@@ -212,7 +212,7 @@  discard block
 
 block discarded – undo
212 212 
         	try {
213 213 
             	    $sth = $Connection->db->prepare($query);
214 214 
 		    $sth->execute();
215 
-    		} catch(PDOException $e) {
215 
+    		} catch (PDOException $e) {
216 216 
 		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
217 217 
     		}
218 218 
     		$error = '';
 
@@ -225,7 +225,7 @@  discard block
 
 block discarded – undo
225 225 
         	try {
226 226 
             	    $sth = $Connection->db->prepare($query);
227 227 
 		    $sth->execute();
228 
-    		} catch(PDOException $e) {
228 
+    		} catch (PDOException $e) {
229 229 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
230 230 
     		}
231 231 
 		return $error;
 
@@ -233,7 +233,7 @@  discard block
 
 block discarded – undo
233 233
234 234 
 	private static function update_from_6() {
235 235 
     		$Connection = new Connection();
236 
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
236 
+    		if (!$Connection->indexExists('spotter_output', 'flightaware_id')) {
237 237 
     		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
238 238 
 			ALTER TABLE spotter_output ADD INDEX(date);
239 239 
 			ALTER TABLE spotter_output ADD INDEX(ident);
 
@@ -250,7 +250,7 @@  discard block
 
 block discarded – undo
250 250 
         	    try {
251 251 
             		$sth = $Connection->db->prepare($query);
252 252 
 			$sth->execute();
253 
-    		    } catch(PDOException $e) {
253 
+    		    } catch (PDOException $e) {
254 254 
 			return "error (add some indexes) : ".$e->getMessage()."\n";
255 255 
     		    }
256 256 
     		}
 
@@ -265,7 +265,7 @@  discard block
 
 block discarded – undo
265 265 
         	try {
266 266 
             	    $sth = $Connection->db->prepare($query);
267 267 
 		    $sth->execute();
268 
-    		} catch(PDOException $e) {
268 
+    		} catch (PDOException $e) {
269 269 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
270 270 
     		}
271 271 
 		return $error;
 
@@ -274,12 +274,12 @@  discard block
 
 block discarded – undo
274 274 
 	private static function update_from_7() {
275 275 
 		global $globalDBname, $globalDBdriver;
276 276 
     		$Connection = new Connection();
277 
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
277 
+    		$query = "ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
278 278 
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
279 279 
         	try {
280 280 
             	    $sth = $Connection->db->prepare($query);
281 281 
 		    $sth->execute();
282 
-    		} catch(PDOException $e) {
282 
+    		} catch (PDOException $e) {
283 283 
 		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
284 284 
     		}
285 285 
     		if ($globalDBdriver == 'mysql') {
 
@@ -287,7 +287,7 @@  discard block
 
 block discarded – undo
287 287 
 		    try {
288 288 
             		$sth = $Connection->db->prepare($query);
289 289 
 			$sth->execute();
290 
-    		    } catch(PDOException $e) {
290 
+    		    } catch (PDOException $e) {
291 291 
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
292 292 
     		    }
293 293 
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -299,15 +299,15 @@  discard block
 
 block discarded – undo
299 299 
 				DROP TABLE spotter_archive;
300 300 
 				RENAME TABLE copy TO spotter_archive;";
301 301 
             	    } else {
302 
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
302 
+    			$query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
303 303 
             	    }
304 304 
                 } else {
305 
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
305 
+    		    $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
306 306 
                 }
307 307 
         	try {
308 308 
             	    $sth = $Connection->db->prepare($query);
309 309 
 		    $sth->execute();
310 
-    		} catch(PDOException $e) {
310 
+    		} catch (PDOException $e) {
311 311 
 		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
312 312 
     		}
313 313 
 
@@ -320,7 +320,7 @@  discard block
 
 block discarded – undo
320 320 
         	try {
321 321 
             	    $sth = $Connection->db->prepare($query);
322 322 
 		    $sth->execute();
323 
-    		} catch(PDOException $e) {
323 
+    		} catch (PDOException $e) {
324 324 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
325 325 
     		}
326 326 
 		return $error;
 
@@ -339,14 +339,14 @@  discard block
 
 block discarded – undo
339 339 
         	try {
340 340 
             	    $sth = $Connection->db->prepare($query);
341 341 
 		    $sth->execute();
342 
-    		} catch(PDOException $e) {
342 
+    		} catch (PDOException $e) {
343 343 
 		    return "error (insert last_update values) : ".$e->getMessage()."\n";
344 344 
     		}
345 345 
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
346 346 
         	try {
347 347 
             	    $sth = $Connection->db->prepare($query);
348 348 
 		    $sth->execute();
349 
-    		} catch(PDOException $e) {
349 
+    		} catch (PDOException $e) {
350 350 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
351 351 
     		}
352 352 
 		return $error;
 
@@ -354,12 +354,12 @@  discard block
 
 block discarded – undo
354 354
355 355 
 	private static function update_from_9() {
356 356 
     		$Connection = new Connection();
357 
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
357 
+    		$query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
358 358 
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
359 359 
         	try {
360 360 
             	    $sth = $Connection->db->prepare($query);
361 361 
 		    $sth->execute();
362 
-    		} catch(PDOException $e) {
362 
+    		} catch (PDOException $e) {
363 363 
 		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
364 364 
     		}
365 365 
 		$error = '';
 
@@ -371,7 +371,7 @@  discard block
 
 block discarded – undo
371 371 
         	try {
372 372 
             	    $sth = $Connection->db->prepare($query);
373 373 
 		    $sth->execute();
374 
-    		} catch(PDOException $e) {
374 
+    		} catch (PDOException $e) {
375 375 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
376 376 
     		}
377 377 
 		return $error;
 
@@ -379,11 +379,11 @@  discard block
 
 block discarded – undo
379 379
380 380 
 	private static function update_from_10() {
381 381 
     		$Connection = new Connection();
382 
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
382 
+    		$query = "ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
383 383 
         	try {
384 384 
             	    $sth = $Connection->db->prepare($query);
385 385 
 		    $sth->execute();
386 
-    		} catch(PDOException $e) {
386 
+    		} catch (PDOException $e) {
387 387 
 		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
388 388 
     		}
389 389 
 		$error = '';
 
@@ -401,7 +401,7 @@  discard block
 
 block discarded – undo
401 401 
         	try {
402 402 
             	    $sth = $Connection->db->prepare($query);
403 403 
 		    $sth->execute();
404 
-    		} catch(PDOException $e) {
404 
+    		} catch (PDOException $e) {
405 405 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
406 406 
     		}
407 407 
 		return $error;
 
@@ -410,18 +410,18 @@  discard block
 
 block discarded – undo
410 410 
 	private static function update_from_11() {
411 411 
 		global $globalDBdriver, $globalDBname;
412 412 
     		$Connection = new Connection();
413 
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
413 
+    		$query = "ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
414 414 
         	try {
415 415 
             	    $sth = $Connection->db->prepare($query);
416 416 
 		    $sth->execute();
417 
-    		} catch(PDOException $e) {
417 
+    		} catch (PDOException $e) {
418 418 
 		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
419 419 
     		}
420 
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
420 
+    		$query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
421 421 
         	try {
422 422 
             	    $sth = $Connection->db->prepare($query);
423 423 
 		    $sth->execute();
424 
-    		} catch(PDOException $e) {
424 
+    		} catch (PDOException $e) {
425 425 
 		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
426 426 
     		}
427 427 
     		if ($globalDBdriver == 'mysql') {
 
@@ -429,7 +429,7 @@  discard block
 
 block discarded – undo
429 429 
 		    try {
430 430 
             		$sth = $Connection->db->prepare($query);
431 431 
 			$sth->execute();
432 
-    		    } catch(PDOException $e) {
432 
+    		    } catch (PDOException $e) {
433 433 
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
434 434 
     		    }
435 435 
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -441,15 +441,15 @@  discard block
 
 block discarded – undo
441 441 
 				DROP TABLE spotter_archive;
442 442 
 				RENAME TABLE copy TO spotter_archive;";
443 443 
             	    } else {
444 
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
444 
+    			$query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
445 445 
             	    }
446 446 
                 } else {
447 
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
447 
+    		    $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
448 448 
                 }
449 449 
         	try {
450 450 
             	    $sth = $Connection->db->prepare($query);
451 451 
 		    $sth->execute();
452 
-    		} catch(PDOException $e) {
452 
+    		} catch (PDOException $e) {
453 453 
 		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
454 454 
     		}
455 455 
 
@@ -459,7 +459,7 @@  discard block
 
 block discarded – undo
459 459 
         	try {
460 460 
             	    $sth = $Connection->db->prepare($query);
461 461 
 		    $sth->execute();
462 
-    		} catch(PDOException $e) {
462 
+    		} catch (PDOException $e) {
463 463 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
464 464 
     		}
465 465 
 		return $error;
 
@@ -487,7 +487,7 @@  discard block
 
 block discarded – undo
487 487 
         	try {
488 488 
             	    $sth = $Connection->db->prepare($query);
489 489 
 		    $sth->execute();
490 
-    		} catch(PDOException $e) {
490 
+    		} catch (PDOException $e) {
491 491 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
492 492 
     		}
493 493 
 		return $error;
 
@@ -495,12 +495,12 @@  discard block
 
 block discarded – undo
495 495
496 496 
 	private static function update_from_13() {
497 497 
     		$Connection = new Connection();
498 
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
499 
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
498 
+    		if (!$Connection->checkColumnName('spotter_archive_output', 'real_departure_airport_icao')) {
499 
+    			$query = "ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
500 500 
 			try {
501 501 
 				$sth = $Connection->db->prepare($query);
502 502 
 				$sth->execute();
503 
-	    		} catch(PDOException $e) {
503 
+	    		} catch (PDOException $e) {
504 504 
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
505 505 
     			}
506 506 
 		}
 
@@ -509,7 +509,7 @@  discard block
 
 block discarded – undo
509 509 
         	try {
510 510 
             	    $sth = $Connection->db->prepare($query);
511 511 
 		    $sth->execute();
512 
-    		} catch(PDOException $e) {
512 
+    		} catch (PDOException $e) {
513 513 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
514 514 
     		}
515 515 
 		return $error;
 
@@ -527,7 +527,7 @@  discard block
 
 block discarded – undo
527 527 
         	try {
528 528 
             	    $sth = $Connection->db->prepare($query);
529 529 
 		    $sth->execute();
530 
-    		} catch(PDOException $e) {
530 
+    		} catch (PDOException $e) {
531 531 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
532 532 
     		}
533 533 
 		return $error;
 
@@ -538,11 +538,11 @@  discard block
 
 block discarded – undo
538 538 
     		$Connection = new Connection();
539 539 
 		$error = '';
540 540 
     		// Add tables
541 
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
541 
+    		$query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
542 542 
         	try {
543 543 
             	    $sth = $Connection->db->prepare($query);
544 544 
 		    $sth->execute();
545 
-    		} catch(PDOException $e) {
545 
+    		} catch (PDOException $e) {
546 546 
 		    return "error (update stats) : ".$e->getMessage()."\n";
547 547 
     		}
548 548 
 		if ($error != '') return $error;
 
@@ -550,7 +550,7 @@  discard block
 
 block discarded – undo
550 550 
         	try {
551 551 
             	    $sth = $Connection->db->prepare($query);
552 552 
 		    $sth->execute();
553 
-    		} catch(PDOException $e) {
553 
+    		} catch (PDOException $e) {
554 554 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
555 555 
     		}
556 556 
 		return $error;
 
@@ -571,7 +571,7 @@  discard block
 
 block discarded – undo
571 571 
         	try {
572 572 
             	    $sth = $Connection->db->prepare($query);
573 573 
 		    $sth->execute();
574 
-    		} catch(PDOException $e) {
574 
+    		} catch (PDOException $e) {
575 575 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
576 576 
     		}
577 577 
 		return $error;
 
@@ -589,7 +589,7 @@  discard block
 
 block discarded – undo
589 589 
         	try {
590 590 
             	    $sth = $Connection->db->prepare($query);
591 591 
 		    $sth->execute();
592 
-    		} catch(PDOException $e) {
592 
+    		} catch (PDOException $e) {
593 593 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
594 594 
     		}
595 595 
 		return $error;
 
@@ -598,12 +598,12 @@  discard block
 
 block discarded – undo
598 598 
     		$Connection = new Connection();
599 599 
 		$error = '';
600 600 
     		// Modify stats_airport table
601 
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
601 
+    		if (!$Connection->checkColumnName('stats_airport', 'airport_name')) {
602 602 
     			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
603 603 
     	        	try {
604 604 
 	            	    $sth = $Connection->db->prepare($query);
605 605 
 			    $sth->execute();
606 
-    			} catch(PDOException $e) {
606 
+    			} catch (PDOException $e) {
607 607 
 			    return "error (update stats) : ".$e->getMessage()."\n";
608 608 
     			}
609 609 
     		}
 
@@ -612,7 +612,7 @@  discard block
 
 block discarded – undo
612 612 
         	try {
613 613 
             	    $sth = $Connection->db->prepare($query);
614 614 
 		    $sth->execute();
615 
-    		} catch(PDOException $e) {
615 
+    		} catch (PDOException $e) {
616 616 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
617 617 
     		}
618 618 
 		return $error;
 
@@ -629,73 +629,73 @@  discard block
 
 block discarded – undo
629 629 
         	try {
630 630 
             	    $sth = $Connection->db->prepare($query);
631 631 
 		    $sth->execute();
632 
-    		} catch(PDOException $e) {
632 
+    		} catch (PDOException $e) {
633 633 
 		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
634 634 
     		}
635 635 
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
636 636 
         	try {
637 637 
             	    $sth = $Connection->db->prepare($query);
638 638 
 		    $sth->execute();
639 
-    		} catch(PDOException $e) {
639 
+    		} catch (PDOException $e) {
640 640 
 		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
641 641 
     		}
642 
-		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
642 
+		if (!$Connection->checkColumnName('spotter_archive', 'over_country')) {
643 643 
 			// Add column over_country
644 644 
     			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
645 645 
 			try {
646 646 
             			$sth = $Connection->db->prepare($query);
647 647 
 				$sth->execute();
648 
-			} catch(PDOException $e) {
648 
+			} catch (PDOException $e) {
649 649 
 				return "error (add over_country) : ".$e->getMessage()."\n";
650 650 
 			}
651 651 
 		}
652 
-		if (!$Connection->checkColumnName('spotter_live','over_country')) {
652 
+		if (!$Connection->checkColumnName('spotter_live', 'over_country')) {
653 653 
 			// Add column over_country
654 654 
     			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
655 655 
 			try {
656 656 
             			$sth = $Connection->db->prepare($query);
657 657 
 				$sth->execute();
658 
-			} catch(PDOException $e) {
658 
+			} catch (PDOException $e) {
659 659 
 				return "error (add over_country) : ".$e->getMessage()."\n";
660 660 
 			}
661 661 
 		}
662 
-		if (!$Connection->checkColumnName('spotter_output','source_name')) {
662 
+		if (!$Connection->checkColumnName('spotter_output', 'source_name')) {
663 663 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
664 664 
     			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
665 665 
 			try {
666 666 
 				$sth = $Connection->db->prepare($query);
667 667 
 				$sth->execute();
668 
-			} catch(PDOException $e) {
668 
+			} catch (PDOException $e) {
669 669 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
670 670 
     			}
671 671 
     		}
672 
-		if (!$Connection->checkColumnName('spotter_live','source_name')) {
672 
+		if (!$Connection->checkColumnName('spotter_live', 'source_name')) {
673 673 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
674 674 
     			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
675 675 
 			try {
676 676 
 				$sth = $Connection->db->prepare($query);
677 677 
 				$sth->execute();
678 
-			} catch(PDOException $e) {
678 
+			} catch (PDOException $e) {
679 679 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
680 680 
     			}
681 681 
     		}
682 
-		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
682 
+		if (!$Connection->checkColumnName('spotter_archive_output', 'source_name')) {
683 683 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
684 684 
     			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
685 685 
 			try {
686 686 
 				$sth = $Connection->db->prepare($query);
687 687 
 				$sth->execute();
688 
-			} catch(PDOException $e) {
688 
+			} catch (PDOException $e) {
689 689 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
690 690 
     			}
691 691 
     		}
692 
-		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
692 
+		if (!$Connection->checkColumnName('spotter_archive', 'source_name')) {
693 693 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
694 694 
     			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
695 695 
 			try {
696 696 
 				$sth = $Connection->db->prepare($query);
697 697 
 				$sth->execute();
698 
-			} catch(PDOException $e) {
698 
+			} catch (PDOException $e) {
699 699 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
700 700 
     			}
701 701 
     		}
 
@@ -704,7 +704,7 @@  discard block
 
 block discarded – undo
704 704 
         	try {
705 705 
             	    $sth = $Connection->db->prepare($query);
706 706 
 		    $sth->execute();
707 
-    		} catch(PDOException $e) {
707 
+    		} catch (PDOException $e) {
708 708 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
709 709 
     		}
710 710 
 		return $error;
 
@@ -719,13 +719,13 @@  discard block
 
 block discarded – undo
719 719 
 			$error .= create_db::import_file('../db/airlines.sql');
720 720 
 			if ($error != '') return 'Import airlines.sql : '.$error;
721 721 
 		}
722 
-		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
722 
+		if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) {
723 723 
 			// Add column over_country
724 724 
     			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
725 725 
         		try {
726 726 
 				$sth = $Connection->db->prepare($query);
727 727 
 				$sth->execute();
728 
-			} catch(PDOException $e) {
728 
+			} catch (PDOException $e) {
729 729 
 				return "error (add over_country) : ".$e->getMessage()."\n";
730 730 
     			}
731 731 
     		}
 
@@ -741,7 +741,7 @@  discard block
 
 block discarded – undo
741 741 
         	try {
742 742 
             	    $sth = $Connection->db->prepare($query);
743 743 
 		    $sth->execute();
744 
-    		} catch(PDOException $e) {
744 
+    		} catch (PDOException $e) {
745 745 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
746 746 
     		}
747 747 
 		return $error;
 
@@ -750,13 +750,13 @@  discard block
 
 block discarded – undo
750 750 
 	private static function update_from_21() {
751 751 
 		$Connection = new Connection();
752 752 
 		$error = '';
753 
-		if (!$Connection->checkColumnName('stats_airport','stats_type')) {
753 
+		if (!$Connection->checkColumnName('stats_airport', 'stats_type')) {
754 754 
 			// Rename type to stats_type
755 755 
 			$query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);";
756 756 
 			try {
757 757 
 				$sth = $Connection->db->prepare($query);
758 758 
 				$sth->execute();
759 
-			} catch(PDOException $e) {
759 
+			} catch (PDOException $e) {
760 760 
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
761 761 
 			}
762 762 
 			if ($error != '') return $error;
 
@@ -765,7 +765,7 @@  discard block
 
 block discarded – undo
765 765 
         	try {
766 766 
             	    $sth = $Connection->db->prepare($query);
767 767 
 		    $sth->execute();
768 
-    		} catch(PDOException $e) {
768 
+    		} catch (PDOException $e) {
769 769 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
770 770 
     		}
771 771 
 		return $error;
 
@@ -788,7 +788,7 @@  discard block
 
 block discarded – undo
788 788 
         	try {
789 789 
             	    $sth = $Connection->db->prepare($query);
790 790 
 		    $sth->execute();
791 
-    		} catch(PDOException $e) {
791 
+    		} catch (PDOException $e) {
792 792 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
793 793 
     		}
794 794 
 		return $error;
 
@@ -814,17 +814,17 @@  discard block
 
 block discarded – undo
814 814 
 			try {
815 815 
 				$sth = $Connection->db->prepare($query);
816 816 
 				$sth->execute();
817 
-			} catch(PDOException $e) {
817 
+			} catch (PDOException $e) {
818 818 
 				return "error (create index on spotter_archive) : ".$e->getMessage()."\n";
819 819 
 			}
820 820 
 		}
821 
-		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
821 
+		if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) {
822 822 
 			// Add aircraft_manufacturer to stats_aircraft
823 823 
     			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
824 824 
 			try {
825 825 
 				$sth = $Connection->db->prepare($query);
826 826 
 				$sth->execute();
827 
-			} catch(PDOException $e) {
827 
+			} catch (PDOException $e) {
828 828 
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
829 829 
     			}
830 830 
     		}
 
@@ -833,7 +833,7 @@  discard block
 
 block discarded – undo
833 833 
 		try {
834 834 
 			$sth = $Connection->db->prepare($query);
835 835 
 			$sth->execute();
836 
-		} catch(PDOException $e) {
836 
+		} catch (PDOException $e) {
837 837 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
838 838 
 		}
839 839 
 		return $error;
 
@@ -849,23 +849,23 @@  discard block
 
 block discarded – undo
849 849 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
850 850 
 		}
851 851 
 		if ($error != '') return 'Import airlines.sql : '.$error;
852 
-		if (!$Connection->checkColumnName('airlines','forsource')) {
852 
+		if (!$Connection->checkColumnName('airlines', 'forsource')) {
853 853 
 			// Add forsource to airlines
854 854 
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
855 855 
 			try {
856 856 
 				$sth = $Connection->db->prepare($query);
857 857 
 				$sth->execute();
858 
-			} catch(PDOException $e) {
858 
+			} catch (PDOException $e) {
859 859 
 				return "error (add forsource column) : ".$e->getMessage()."\n";
860 860 
 			}
861 861 
 		}
862 
-		if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) {
862 
+		if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) {
863 863 
 			// Add forsource to airlines
864 864 
 			$query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
865 865 
 			try {
866 866 
 				$sth = $Connection->db->prepare($query);
867 867 
 				$sth->execute();
868 
-			} catch(PDOException $e) {
868 
+			} catch (PDOException $e) {
869 869 
 				return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n";
870 870 
 			}
871 871 
 			// Add unique key
 
@@ -877,17 +877,17 @@  discard block
 
 block discarded – undo
877 877 
 			try {
878 878 
 				$sth = $Connection->db->prepare($query);
879 879 
 				$sth->execute();
880 
-			} catch(PDOException $e) {
880 
+			} catch (PDOException $e) {
881 881 
 				return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n";
882 882 
 			}
883 883 
 		}
884 
-		if (!$Connection->checkColumnName('stats_airport','stats_airline')) {
884 
+		if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) {
885 885 
 			// Add forsource to airlines
886 886 
 			$query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
887 887 
 			try {
888 888 
 				$sth = $Connection->db->prepare($query);
889 889 
 				$sth->execute();
890 
-			} catch(PDOException $e) {
890 
+			} catch (PDOException $e) {
891 891 
 				return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n";
892 892 
 			}
893 893 
 			// Add unique key
 
@@ -899,17 +899,17 @@  discard block
 
 block discarded – undo
899 899 
 			try {
900 900 
 				$sth = $Connection->db->prepare($query);
901 901 
 				$sth->execute();
902 
-			} catch(PDOException $e) {
902 
+			} catch (PDOException $e) {
903 903 
 				return "error (add unique key in stats_airport) : ".$e->getMessage()."\n";
904 904 
 			}
905 905 
 		}
906 
-		if (!$Connection->checkColumnName('stats_country','stats_airline')) {
906 
+		if (!$Connection->checkColumnName('stats_country', 'stats_airline')) {
907 907 
 			// Add forsource to airlines
908 908 
 			$query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
909 909 
 			try {
910 910 
 				$sth = $Connection->db->prepare($query);
911 911 
 				$sth->execute();
912 
-			} catch(PDOException $e) {
912 
+			} catch (PDOException $e) {
913 913 
 				return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n";
914 914 
 			}
915 915 
 			// Add unique key
 
@@ -921,36 +921,36 @@  discard block
 
 block discarded – undo
921 921 
 			try {
922 922 
 				$sth = $Connection->db->prepare($query);
923 923 
 				$sth->execute();
924 
-			} catch(PDOException $e) {
924 
+			} catch (PDOException $e) {
925 925 
 				return "error (add unique key in stats_airline) : ".$e->getMessage()."\n";
926 926 
 			}
927 927 
 		}
928 
-		if (!$Connection->checkColumnName('stats_flight','stats_airline')) {
928 
+		if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) {
929 929 
 			// Add forsource to airlines
930 930 
 			$query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
931 931 
 			try {
932 932 
 				$sth = $Connection->db->prepare($query);
933 933 
 				$sth->execute();
934 
-			} catch(PDOException $e) {
934 
+			} catch (PDOException $e) {
935 935 
 				return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n";
936 936 
 			}
937 937 
 		}
938 
-		if (!$Connection->checkColumnName('stats','stats_airline')) {
938 
+		if (!$Connection->checkColumnName('stats', 'stats_airline')) {
939 939 
 			// Add forsource to airlines
940 940 
 			$query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
941 941 
 			try {
942 942 
 				$sth = $Connection->db->prepare($query);
943 943 
 				$sth->execute();
944 
-			} catch(PDOException $e) {
944 
+			} catch (PDOException $e) {
945 945 
 				return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n";
946 946 
 			}
947 
-			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) {
947 
+			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) {
948 948 
 				// Add unique key
949 949 
 				$query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);";
950 950 
 				try {
951 951 
 					$sth = $Connection->db->prepare($query);
952 952 
 					$sth->execute();
953 
-				} catch(PDOException $e) {
953 
+				} catch (PDOException $e) {
954 954 
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
955 955 
 				}
956 956 
 			} else {
 
@@ -963,18 +963,18 @@  discard block
 
 block discarded – undo
963 963 
 				try {
964 964 
 					$sth = $Connection->db->prepare($query);
965 965 
 					$sth->execute();
966 
-				} catch(PDOException $e) {
966 
+				} catch (PDOException $e) {
967 967 
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
968 968 
 				}
969 969 
 			}
970 970 
 		}
971 
-		if (!$Connection->checkColumnName('stats_registration','stats_airline')) {
971 
+		if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) {
972 972 
 			// Add forsource to airlines
973 973 
 			$query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
974 974 
 			try {
975 975 
 				$sth = $Connection->db->prepare($query);
976 976 
 				$sth->execute();
977 
-			} catch(PDOException $e) {
977 
+			} catch (PDOException $e) {
978 978 
 				return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n";
979 979 
 			}
980 980 
 			// Add unique key
 
@@ -986,17 +986,17 @@  discard block
 
 block discarded – undo
986 986 
 			try {
987 987 
 				$sth = $Connection->db->prepare($query);
988 988 
 				$sth->execute();
989 
-			} catch(PDOException $e) {
989 
+			} catch (PDOException $e) {
990 990 
 				return "error (add unique key in stats_registration) : ".$e->getMessage()."\n";
991 991 
 			}
992 992 
 		}
993 
-		if (!$Connection->checkColumnName('stats_callsign','filter_name')) {
993 
+		if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) {
994 994 
 			// Add forsource to airlines
995 995 
 			$query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''";
996 996 
 			try {
997 997 
 				$sth = $Connection->db->prepare($query);
998 998 
 				$sth->execute();
999 
-			} catch(PDOException $e) {
999 
+			} catch (PDOException $e) {
1000 1000 
 				return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n";
1001 1001 
 			}
1002 1002 
 			// Add unique key
 
@@ -1008,17 +1008,17 @@  discard block
 
 block discarded – undo
1008 1008 
 			try {
1009 1009 
 				$sth = $Connection->db->prepare($query);
1010 1010 
 				$sth->execute();
1011 
-			} catch(PDOException $e) {
1011 
+			} catch (PDOException $e) {
1012 1012 
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
1013 1013 
 			}
1014 1014 
 		}
1015 
-		if (!$Connection->checkColumnName('stats_airline','filter_name')) {
1015 
+		if (!$Connection->checkColumnName('stats_airline', 'filter_name')) {
1016 1016 
 			// Add forsource to airlines
1017 1017 
 			$query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''";
1018 1018 
 			try {
1019 1019 
 				$sth = $Connection->db->prepare($query);
1020 1020 
 				$sth->execute();
1021 
-			} catch(PDOException $e) {
1021 
+			} catch (PDOException $e) {
1022 1022 
 				return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n";
1023 1023 
 			}
1024 1024 
 			// Add unique key
 
@@ -1030,7 +1030,7 @@  discard block
 
 block discarded – undo
1030 1030 
 			try {
1031 1031 
 				$sth = $Connection->db->prepare($query);
1032 1032 
 				$sth->execute();
1033 
-			} catch(PDOException $e) {
1033 
+			} catch (PDOException $e) {
1034 1034 
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
1035 1035 
 			}
1036 1036 
 		}
 
@@ -1039,7 +1039,7 @@  discard block
 
 block discarded – undo
1039 1039 
 		try {
1040 1040 
 			$sth = $Connection->db->prepare($query);
1041 1041 
 			$sth->execute();
1042 
-		} catch(PDOException $e) {
1042 
+		} catch (PDOException $e) {
1043 1043 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1044 1044 
 		}
1045 1045 
 		return $error;
 
@@ -1049,13 +1049,13 @@  discard block
 
 block discarded – undo
1049 1049 
 		global $globalDBdriver;
1050 1050 
 		$Connection = new Connection();
1051 1051 
 		$error = '';
1052 
-		if (!$Connection->checkColumnName('stats_owner','stats_airline')) {
1052 
+		if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) {
1053 1053 
 			// Add forsource to airlines
1054 1054 
 			$query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
1055 1055 
 			try {
1056 1056 
 				$sth = $Connection->db->prepare($query);
1057 1057 
 				$sth->execute();
1058 
-			} catch(PDOException $e) {
1058 
+			} catch (PDOException $e) {
1059 1059 
 				return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n";
1060 1060 
 			}
1061 1061 
 			// Add unique key
 
@@ -1067,17 +1067,17 @@  discard block
 
 block discarded – undo
1067 1067 
 			try {
1068 1068 
 				$sth = $Connection->db->prepare($query);
1069 1069 
 				$sth->execute();
1070 
-			} catch(PDOException $e) {
1070 
+			} catch (PDOException $e) {
1071 1071 
 				return "error (add unique key in stats_owner) : ".$e->getMessage()."\n";
1072 1072 
 			}
1073 1073 
 		}
1074 
-		if (!$Connection->checkColumnName('stats_pilot','stats_airline')) {
1074 
+		if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) {
1075 1075 
 			// Add forsource to airlines
1076 1076 
 			$query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
1077 1077 
 			try {
1078 1078 
 				$sth = $Connection->db->prepare($query);
1079 1079 
 				$sth->execute();
1080 
-			} catch(PDOException $e) {
1080 
+			} catch (PDOException $e) {
1081 1081 
 				return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n";
1082 1082 
 			}
1083 1083 
 			// Add unique key
 
@@ -1089,7 +1089,7 @@  discard block
 
 block discarded – undo
1089 1089 
 			try {
1090 1090 
 				$sth = $Connection->db->prepare($query);
1091 1091 
 				$sth->execute();
1092 
-			} catch(PDOException $e) {
1092 
+			} catch (PDOException $e) {
1093 1093 
 				return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n";
1094 1094 
 			}
1095 1095 
 		}
 
@@ -1097,7 +1097,7 @@  discard block
 
 block discarded – undo
1097 1097 
 		try {
1098 1098 
 			$sth = $Connection->db->prepare($query);
1099 1099 
 			$sth->execute();
1100 
-		} catch(PDOException $e) {
1100 
+		} catch (PDOException $e) {
1101 1101 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1102 1102 
 		}
1103 1103 
 		return $error;
 
@@ -1107,12 +1107,12 @@  discard block
 
 block discarded – undo
1107 1107 
 		global $globalDBdriver;
1108 1108 
 		$Connection = new Connection();
1109 1109 
 		$error = '';
1110 
-		if (!$Connection->checkColumnName('atc','format_source')) {
1110 
+		if (!$Connection->checkColumnName('atc', 'format_source')) {
1111 1111 
 			$query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL";
1112 1112 
 			try {
1113 1113 
 				$sth = $Connection->db->prepare($query);
1114 1114 
 				$sth->execute();
1115 
-			} catch(PDOException $e) {
1115 
+			} catch (PDOException $e) {
1116 1116 
 				return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n";
1117 1117 
 			}
1118 1118 
 		}
 
@@ -1120,7 +1120,7 @@  discard block
 
 block discarded – undo
1120 1120 
 		try {
1121 1121 
 			$sth = $Connection->db->prepare($query);
1122 1122 
 			$sth->execute();
1123 
-		} catch(PDOException $e) {
1123 
+		} catch (PDOException $e) {
1124 1124 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1125 1125 
 		}
1126 1126 
 		return $error;
 
@@ -1130,13 +1130,13 @@  discard block
 
 block discarded – undo
1130 1130 
 		global $globalDBdriver;
1131 1131 
 		$Connection = new Connection();
1132 1132 
 		$error = '';
1133 
-		if (!$Connection->checkColumnName('stats_pilot','format_source')) {
1133 
+		if (!$Connection->checkColumnName('stats_pilot', 'format_source')) {
1134 1134 
 			// Add forsource to airlines
1135 1135 
 			$query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''";
1136 1136 
 			try {
1137 1137 
 				$sth = $Connection->db->prepare($query);
1138 1138 
 				$sth->execute();
1139 
-			} catch(PDOException $e) {
1139 
+			} catch (PDOException $e) {
1140 1140 
 				return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n";
1141 1141 
 			}
1142 1142 
 			// Add unique key
 
@@ -1148,7 +1148,7 @@  discard block
 
 block discarded – undo
1148 1148 
 			try {
1149 1149 
 				$sth = $Connection->db->prepare($query);
1150 1150 
 				$sth->execute();
1151 
-			} catch(PDOException $e) {
1151 
+			} catch (PDOException $e) {
1152 1152 
 				return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n";
1153 1153 
 			}
1154 1154 
 		}
 
@@ -1156,7 +1156,7 @@  discard block
 
 block discarded – undo
1156 1156 
 		try {
1157 1157 
 			$sth = $Connection->db->prepare($query);
1158 1158 
 			$sth->execute();
1159 
-		} catch(PDOException $e) {
1159 
+		} catch (PDOException $e) {
1160 1160 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1161 1161 
 		}
1162 1162 
 		return $error;
 
@@ -1166,23 +1166,23 @@  discard block
 
 block discarded – undo
1166 1166 
 		global $globalDBdriver;
1167 1167 
 		$Connection = new Connection();
1168 1168 
 		$error = '';
1169 
-		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) {
1169 
+		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) {
1170 1170 
 			// Add unique key
1171 1171 
 			$query = "alter table spotter_live add index(latitude,longitude)";
1172 1172 
 			try {
1173 1173 
 				$sth = $Connection->db->prepare($query);
1174 1174 
 				$sth->execute();
1175 
-			} catch(PDOException $e) {
1175 
+			} catch (PDOException $e) {
1176 1176 
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
1177 1177 
 			}
1178 1178 
                 }
1179 
-		if (!$Connection->checkColumnName('aircraft','mfr')) {
1179 
+		if (!$Connection->checkColumnName('aircraft', 'mfr')) {
1180 1180 
 			// Add mfr to aircraft
1181 1181 
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
1182 1182 
 			try {
1183 1183 
 				$sth = $Connection->db->prepare($query);
1184 1184 
 				$sth->execute();
1185 
-			} catch(PDOException $e) {
1185 
+			} catch (PDOException $e) {
1186 1186 
 				return "error (add mfr column in aircraft) : ".$e->getMessage()."\n";
1187 1187 
 			}
1188 1188 
 		}
 
@@ -1198,7 +1198,7 @@  discard block
 
 block discarded – undo
1198 1198 
 		try {
1199 1199 
 			$sth = $Connection->db->prepare($query);
1200 1200 
 			$sth->execute();
1201 
-		} catch(PDOException $e) {
1201 
+		} catch (PDOException $e) {
1202 1202 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1203 1203 
 		}
1204 1204 
 		return $error;
 
@@ -1208,13 +1208,13 @@  discard block
 
 block discarded – undo
1208 1208 
 		global $globalDBdriver;
1209 1209 
 		$Connection = new Connection();
1210 1210 
 		$error = '';
1211 
-		if ($Connection->checkColumnName('aircraft','mfr')) {
1211 
+		if ($Connection->checkColumnName('aircraft', 'mfr')) {
1212 1212 
 			// drop mfr to aircraft
1213 1213 
 			$query = "ALTER TABLE aircraft DROP COLUMN mfr";
1214 1214 
 			try {
1215 1215 
 				$sth = $Connection->db->prepare($query);
1216 1216 
 				$sth->execute();
1217 
-			} catch(PDOException $e) {
1217 
+			} catch (PDOException $e) {
1218 1218 
 				return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n";
1219 1219 
 			}
1220 1220 
 		}
 
@@ -1230,7 +1230,7 @@  discard block
 
 block discarded – undo
1230 1230 
 		try {
1231 1231 
 			$sth = $Connection->db->prepare($query);
1232 1232 
 			$sth->execute();
1233 
-		} catch(PDOException $e) {
1233 
+		} catch (PDOException $e) {
1234 1234 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1235 1235 
 		}
1236 1236 
 		return $error;
 
@@ -1240,33 +1240,33 @@  discard block
 
 block discarded – undo
1240 1240 
 		global $globalDBdriver;
1241 1241 
 		$Connection = new Connection();
1242 1242 
 		$error = '';
1243 
-		if (!$Connection->indexExists('notam','ref_idx')) {
1243 
+		if (!$Connection->indexExists('notam', 'ref_idx')) {
1244 1244 
 			// Add index key
1245 1245 
 			$query = "create index ref_idx on notam (ref)";
1246 1246 
 			try {
1247 1247 
 				$sth = $Connection->db->prepare($query);
1248 1248 
 				$sth->execute();
1249 
-			} catch(PDOException $e) {
1249 
+			} catch (PDOException $e) {
1250 1250 
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
1251 1251 
 			}
1252 1252 
                 }
1253 
-		if (!$Connection->indexExists('accidents','registration_idx')) {
1253 
+		if (!$Connection->indexExists('accidents', 'registration_idx')) {
1254 1254 
 			// Add index key
1255 1255 
 			$query = "create index registration_idx on accidents (registration)";
1256 1256 
 			try {
1257 1257 
 				$sth = $Connection->db->prepare($query);
1258 1258 
 				$sth->execute();
1259 
-			} catch(PDOException $e) {
1259 
+			} catch (PDOException $e) {
1260 1260 
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
1261 1261 
 			}
1262 1262 
                 }
1263 
-		if (!$Connection->indexExists('accidents','rdts')) {
1263 
+		if (!$Connection->indexExists('accidents', 'rdts')) {
1264 1264 
 			// Add index key
1265 1265 
 			$query = "create index rdts on accidents (registration,date,type,source)";
1266 1266 
 			try {
1267 1267 
 				$sth = $Connection->db->prepare($query);
1268 1268 
 				$sth->execute();
1269 
-			} catch(PDOException $e) {
1269 
+			} catch (PDOException $e) {
1270 1270 
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
1271 1271 
 			}
1272 1272 
                 }
 
@@ -1275,7 +1275,7 @@  discard block
 
 block discarded – undo
1275 1275 
 		try {
1276 1276 
 			$sth = $Connection->db->prepare($query);
1277 1277 
 			$sth->execute();
1278 
-		} catch(PDOException $e) {
1278 
+		} catch (PDOException $e) {
1279 1279 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1280 1280 
 		}
1281 1281 
 		return $error;
 
@@ -1285,23 +1285,23 @@  discard block
 
 block discarded – undo
1285 1285 
 		global $globalDBdriver;
1286 1286 
 		$Connection = new Connection();
1287 1287 
 		$error = '';
1288 
-		if (!$Connection->checkColumnName('accidents','airline_name')) {
1288 
+		if (!$Connection->checkColumnName('accidents', 'airline_name')) {
1289 1289 
 			// Add airline_name to accidents
1290 1290 
 			$query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL";
1291 1291 
 			try {
1292 1292 
 				$sth = $Connection->db->prepare($query);
1293 1293 
 				$sth->execute();
1294 
-			} catch(PDOException $e) {
1294 
+			} catch (PDOException $e) {
1295 1295 
 				return "error (add airline_name column in accidents) : ".$e->getMessage()."\n";
1296 1296 
 			}
1297 1297 
 		}
1298 
-		if (!$Connection->checkColumnName('accidents','airline_icao')) {
1298 
+		if (!$Connection->checkColumnName('accidents', 'airline_icao')) {
1299 1299 
 			// Add airline_icao to accidents
1300 1300 
 			$query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL";
1301 1301 
 			try {
1302 1302 
 				$sth = $Connection->db->prepare($query);
1303 1303 
 				$sth->execute();
1304 
-			} catch(PDOException $e) {
1304 
+			} catch (PDOException $e) {
1305 1305 
 				return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n";
1306 1306 
 			}
1307 1307 
 		}
 
@@ -1309,7 +1309,7 @@  discard block
 
 block discarded – undo
1309 1309 
 		try {
1310 1310 
 			$sth = $Connection->db->prepare($query);
1311 1311 
 			$sth->execute();
1312 
-		} catch(PDOException $e) {
1312 
+		} catch (PDOException $e) {
1313 1313 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1314 1314 
 		}
1315 1315 
 		return $error;
 
@@ -1319,13 +1319,13 @@  discard block
 
 block discarded – undo
1319 1319 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
1320 1320 
 		$Connection = new Connection();
1321 1321 
 		$error = '';
1322 
-		if (!$Connection->checkColumnName('airlines','alliance')) {
1322 
+		if (!$Connection->checkColumnName('airlines', 'alliance')) {
1323 1323 
 			// Add alliance to airlines
1324 1324 
 			$query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL";
1325 1325 
 			try {
1326 1326 
 				$sth = $Connection->db->prepare($query);
1327 1327 
 				$sth->execute();
1328 
-			} catch(PDOException $e) {
1328 
+			} catch (PDOException $e) {
1329 1329 
 				return "error (add alliance column in airlines) : ".$e->getMessage()."\n";
1330 1330 
 			}
1331 1331 
 		}
 
@@ -1352,7 +1352,7 @@  discard block
 
 block discarded – undo
1352 1352 
 		try {
1353 1353 
 			$sth = $Connection->db->prepare($query);
1354 1354 
 			$sth->execute();
1355 
-		} catch(PDOException $e) {
1355 
+		} catch (PDOException $e) {
1356 1356 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1357 1357 
 		}
1358 1358 
 		return $error;
 
@@ -1362,13 +1362,13 @@  discard block
 
 block discarded – undo
1362 1362 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
1363 1363 
 		$Connection = new Connection();
1364 1364 
 		$error = '';
1365 
-		if (!$Connection->checkColumnName('airlines','ban_eu')) {
1365 
+		if (!$Connection->checkColumnName('airlines', 'ban_eu')) {
1366 1366 
 			// Add ban_eu to airlines
1367 1367 
 			$query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'";
1368 1368 
 			try {
1369 1369 
 				$sth = $Connection->db->prepare($query);
1370 1370 
 				$sth->execute();
1371 
-			} catch(PDOException $e) {
1371 
+			} catch (PDOException $e) {
1372 1372 
 				return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n";
1373 1373 
 			}
1374 1374 
 		}
 
@@ -1376,7 +1376,7 @@  discard block
 
 block discarded – undo
1376 1376 
 		try {
1377 1377 
 			$sth = $Connection->db->prepare($query);
1378 1378 
 			$sth->execute();
1379 
-		} catch(PDOException $e) {
1379 
+		} catch (PDOException $e) {
1380 1380 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1381 1381 
 		}
1382 1382 
 		return $error;
 
@@ -1387,19 +1387,19 @@  discard block
 
 block discarded – undo
1387 1387 
 		$Connection = new Connection();
1388 1388 
 		$error = '';
1389 1389 
 		if ($globalDBdriver == 'mysql') {
1390 
-			if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') {
1390 
+			if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') {
1391 1391 
 				$query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL";
1392 1392 
 				try {
1393 1393 
 					$sth = $Connection->db->prepare($query);
1394 1394 
 					$sth->execute();
1395 
-				} catch(PDOException $e) {
1395 
+				} catch (PDOException $e) {
1396 1396 
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
1397 1397 
 				}
1398 1398 
 				$query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()";
1399 1399 
 				try {
1400 1400 
 					$sth = $Connection->db->prepare($query);
1401 1401 
 					$sth->execute();
1402 
-				} catch(PDOException $e) {
1402 
+				} catch (PDOException $e) {
1403 1403 
 					return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n";
1404 1404 
 				}
1405 1405 
 				
@@ -1407,7 +1407,7 @@  discard block
 
 block discarded – undo
1407 1407 
 				try {
1408 1408 
 					$sth = $Connection->db->prepare($query);
1409 1409 
 					$sth->execute();
1410 
-				} catch(PDOException $e) {
1410 
+				} catch (PDOException $e) {
1411 1411 
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
1412 1412 
 				}
1413 1413 
 				/*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150";
 
@@ -1458,7 +1458,7 @@  discard block
 
 block discarded – undo
1458 1458 
 				try {
1459 1459 
 					$sth = $Connection->db->prepare($query);
1460 1460 
 					$sth->execute();
1461 
-				} catch(PDOException $e) {
1461 
+				} catch (PDOException $e) {
1462 1462 
 					return "error (fix date) : ".$e->getMessage()."\n";
1463 1463 
 				}
1464 1464 
 			}
 
@@ -1543,7 +1543,7 @@  discard block
 
 block discarded – undo
1543 1543 
 		try {
1544 1544 
 			$sth = $Connection->db->prepare($query);
1545 1545 
 			$sth->execute();
1546 
-		} catch(PDOException $e) {
1546 
+		} catch (PDOException $e) {
1547 1547 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1548 1548 
 		}
1549 1549 
 		return $error;
 
@@ -1552,13 +1552,13 @@  discard block
 
 block discarded – undo
1552 1552 
 		global $globalDBdriver;
1553 1553 
 		$Connection = new Connection();
1554 1554 
 		$error = '';
1555 
-		if (!$Connection->indexExists('accidents','type')) {
1555 
+		if (!$Connection->indexExists('accidents', 'type')) {
1556 1556 
 			// Add index key
1557 1557 
 			$query = "create index type on accidents (type,date)";
1558 1558 
 			try {
1559 1559 
 				$sth = $Connection->db->prepare($query);
1560 1560 
 				$sth->execute();
1561 
-			} catch(PDOException $e) {
1561 
+			} catch (PDOException $e) {
1562 1562 
 				return "error (add index type on accidents) : ".$e->getMessage()."\n";
1563 1563 
 			}
1564 1564 
                 }
 
@@ -1566,7 +1566,7 @@  discard block
 
 block discarded – undo
1566 1566 
 		try {
1567 1567 
 			$sth = $Connection->db->prepare($query);
1568 1568 
 			$sth->execute();
1569 
-		} catch(PDOException $e) {
1569 
+		} catch (PDOException $e) {
1570 1570 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1571 1571 
 		}
1572 1572 
 		return $error;
 
@@ -1576,12 +1576,12 @@  discard block
 
 block discarded – undo
1576 1576 
 		global $globalDBdriver;
1577 1577 
 		$Connection = new Connection();
1578 1578 
 		$error = '';
1579 
-		if (!$Connection->checkColumnName('aircraft_modes','source_type')) {
1579 
+		if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) {
1580 1580 
 			$query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'";
1581 1581 
 			try {
1582 1582 
 				$sth = $Connection->db->prepare($query);
1583 1583 
 				$sth->execute();
1584 
-			} catch(PDOException $e) {
1584 
+			} catch (PDOException $e) {
1585 1585 
 				return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n";
1586 1586 
 			}
1587 1587 
 		}
 
@@ -1647,7 +1647,7 @@  discard block
 
 block discarded – undo
1647 1647 
 		try {
1648 1648 
 			$sth = $Connection->db->prepare($query);
1649 1649 
 			$sth->execute();
1650 
-		} catch(PDOException $e) {
1650 
+		} catch (PDOException $e) {
1651 1651 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1652 1652 
 		}
1653 1653 
 		return $error;
 
@@ -1699,7 +1699,7 @@  discard block
 
 block discarded – undo
1699 1699 
 			try {
1700 1700 
 				$sth = $Connection->db->prepare($query);
1701 1701 
 				$sth->execute();
1702 
-			} catch(PDOException $e) {
1702 
+			} catch (PDOException $e) {
1703 1703 
 				return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
1704 1704 
 			}
1705 1705 
 			$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -1708,18 +1708,18 @@  discard block
 
 block discarded – undo
1708 1708 
 				try {
1709 1709 
 					$sth = $Connection->db->prepare($query);
1710 1710 
 					$sth->execute();
1711 
-				} catch(PDOException $e) {
1711 
+				} catch (PDOException $e) {
1712 1712 
 					return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n";
1713 1713 
 				}
1714 1714 
 			}
1715 1715 
 		}
1716 
-		if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) {
1716 
+		if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) {
1717 1717 
 			// Add index key
1718 1718 
 			$query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)";
1719 1719 
 			try {
1720 1720 
 				$sth = $Connection->db->prepare($query);
1721 1721 
 				$sth->execute();
1722 
-			} catch(PDOException $e) {
1722 
+			} catch (PDOException $e) {
1723 1723 
 				return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n";
1724 1724 
 			}
1725 1725 
                 }
 
@@ -1727,7 +1727,7 @@  discard block
 
 block discarded – undo
1727 1727 
 		try {
1728 1728 
 			$sth = $Connection->db->prepare($query);
1729 1729 
 			$sth->execute();
1730 
-		} catch(PDOException $e) {
1730 
+		} catch (PDOException $e) {
1731 1731 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1732 1732 
 		}
1733 1733 
 		return $error;
 
@@ -1738,148 +1738,148 @@  discard block
 
 block discarded – undo
1738 1738 
 		$Connection = new Connection();
1739 1739 
 		$error = '';
1740 1740 
 		if ($globalDBdriver == 'mysql') {
1741 
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
1741 
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
1742 1742 
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL";
1743 1743 
 				try {
1744 1744 
 					$sth = $Connection->db->prepare($query);
1745 1745 
 					$sth->execute();
1746 
-				} catch(PDOException $e) {
1746 
+				} catch (PDOException $e) {
1747 1747 
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
1748 1748 
 				}
1749 1749 
 			}
1750 
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
1750 
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
1751 1751 
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL";
1752 1752 
 				try {
1753 1753 
 					$sth = $Connection->db->prepare($query);
1754 1754 
 					$sth->execute();
1755 
-				} catch(PDOException $e) {
1755 
+				} catch (PDOException $e) {
1756 1756 
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
1757 1757 
 				}
1758 1758 
 			}
1759 
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
1759 
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
1760 1760 
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL";
1761 1761 
 				try {
1762 1762 
 					$sth = $Connection->db->prepare($query);
1763 1763 
 					$sth->execute();
1764 
-				} catch(PDOException $e) {
1764 
+				} catch (PDOException $e) {
1765 1765 
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
1766 1766 
 				}
1767 1767 
 			}
1768 
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
1768 
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
1769 1769 
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL";
1770 1770 
 				try {
1771 1771 
 					$sth = $Connection->db->prepare($query);
1772 1772 
 					$sth->execute();
1773 
-				} catch(PDOException $e) {
1773 
+				} catch (PDOException $e) {
1774 1774 
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
1775 1775 
 				}
1776 1776 
 			}
1777 
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
1777 
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
1778 1778 
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL";
1779 1779 
 				try {
1780 1780 
 					$sth = $Connection->db->prepare($query);
1781 1781 
 					$sth->execute();
1782 
-				} catch(PDOException $e) {
1782 
+				} catch (PDOException $e) {
1783 1783 
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
1784 1784 
 				}
1785 1785 
 			}
1786 
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
1786 
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
1787 1787 
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL";
1788 1788 
 				try {
1789 1789 
 					$sth = $Connection->db->prepare($query);
1790 1790 
 					$sth->execute();
1791 
-				} catch(PDOException $e) {
1791 
+				} catch (PDOException $e) {
1792 1792 
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
1793 1793 
 				}
1794 1794 
 			}
1795 
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
1795 
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
1796 1796 
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL";
1797 1797 
 				try {
1798 1798 
 					$sth = $Connection->db->prepare($query);
1799 1799 
 					$sth->execute();
1800 
-				} catch(PDOException $e) {
1800 
+				} catch (PDOException $e) {
1801 1801 
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
1802 1802 
 				}
1803 1803 
 			}
1804 
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
1804 
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
1805 1805 
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL";
1806 1806 
 				try {
1807 1807 
 					$sth = $Connection->db->prepare($query);
1808 1808 
 					$sth->execute();
1809 
-				} catch(PDOException $e) {
1809 
+				} catch (PDOException $e) {
1810 1810 
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
1811 1811 
 				}
1812 1812 
 			}
1813 1813 
 		} else {
1814 
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
1814 
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
1815 1815 
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL";
1816 1816 
 				try {
1817 1817 
 					$sth = $Connection->db->prepare($query);
1818 1818 
 					$sth->execute();
1819 
-				} catch(PDOException $e) {
1819 
+				} catch (PDOException $e) {
1820 1820 
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
1821 1821 
 				}
1822 1822 
 			}
1823 
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
1823 
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
1824 1824 
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL";
1825 1825 
 				try {
1826 1826 
 					$sth = $Connection->db->prepare($query);
1827 1827 
 					$sth->execute();
1828 
-				} catch(PDOException $e) {
1828 
+				} catch (PDOException $e) {
1829 1829 
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
1830 1830 
 				}
1831 1831 
 			}
1832 
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
1832 
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
1833 1833 
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL";
1834 1834 
 				try {
1835 1835 
 					$sth = $Connection->db->prepare($query);
1836 1836 
 					$sth->execute();
1837 
-				} catch(PDOException $e) {
1837 
+				} catch (PDOException $e) {
1838 1838 
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
1839 1839 
 				}
1840 1840 
 			}
1841 
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
1841 
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
1842 1842 
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL";
1843 1843 
 				try {
1844 1844 
 					$sth = $Connection->db->prepare($query);
1845 1845 
 					$sth->execute();
1846 
-				} catch(PDOException $e) {
1846 
+				} catch (PDOException $e) {
1847 1847 
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
1848 1848 
 				}
1849 1849 
 			}
1850 
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
1850 
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
1851 1851 
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL";
1852 1852 
 				try {
1853 1853 
 					$sth = $Connection->db->prepare($query);
1854 1854 
 					$sth->execute();
1855 
-				} catch(PDOException $e) {
1855 
+				} catch (PDOException $e) {
1856 1856 
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
1857 1857 
 				}
1858 1858 
 			}
1859 
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
1859 
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
1860 1860 
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL";
1861 1861 
 				try {
1862 1862 
 					$sth = $Connection->db->prepare($query);
1863 1863 
 					$sth->execute();
1864 
-				} catch(PDOException $e) {
1864 
+				} catch (PDOException $e) {
1865 1865 
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
1866 1866 
 				}
1867 1867 
 			}
1868 
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
1868 
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
1869 1869 
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL";
1870 1870 
 				try {
1871 1871 
 					$sth = $Connection->db->prepare($query);
1872 1872 
 					$sth->execute();
1873 
-				} catch(PDOException $e) {
1873 
+				} catch (PDOException $e) {
1874 1874 
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
1875 1875 
 				}
1876 1876 
 			}
1877 
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
1877 
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
1878 1878 
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL";
1879 1879 
 				try {
1880 1880 
 					$sth = $Connection->db->prepare($query);
1881 1881 
 					$sth->execute();
1882 
-				} catch(PDOException $e) {
1882 
+				} catch (PDOException $e) {
1883 1883 
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
1884 1884 
 				}
1885 1885 
 			}
 
@@ -1888,7 +1888,7 @@  discard block
 
 block discarded – undo
1888 1888 
 		try {
1889 1889 
 			$sth = $Connection->db->prepare($query);
1890 1890 
 			$sth->execute();
1891 
-		} catch(PDOException $e) {
1891 
+		} catch (PDOException $e) {
1892 1892 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1893 1893 
 		}
1894 1894 
 		return $error;
 
@@ -1903,14 +1903,14 @@  discard block
 
 block discarded – undo
1903 1903 
 			try {
1904 1904 
 				$sth = $Connection->db->prepare($query);
1905 1905 
 				$sth->execute();
1906 
-			} catch(PDOException $e) {
1906 
+			} catch (PDOException $e) {
1907 1907 
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
1908 1908 
 			}
1909 1909 
 			$query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL";
1910 1910 
 			try {
1911 1911 
 				$sth = $Connection->db->prepare($query);
1912 1912 
 				$sth->execute();
1913 
-			} catch(PDOException $e) {
1913 
+			} catch (PDOException $e) {
1914 1914 
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
1915 1915 
 			}
1916 1916 
 		} else {
 
@@ -1918,14 +1918,14 @@  discard block
 
 block discarded – undo
1918 1918 
 			try {
1919 1919 
 				$sth = $Connection->db->prepare($query);
1920 1920 
 				$sth->execute();
1921 
-			} catch(PDOException $e) {
1921 
+			} catch (PDOException $e) {
1922 1922 
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
1923 1923 
 			}
1924 1924 
 			$query = "alter table marine_identity alter column mmsi type varchar(255)";
1925 1925 
 			try {
1926 1926 
 				$sth = $Connection->db->prepare($query);
1927 1927 
 				$sth->execute();
1928 
-			} catch(PDOException $e) {
1928 
+			} catch (PDOException $e) {
1929 1929 
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
1930 1930 
 			}
1931 1931 
 		}
 
@@ -1933,7 +1933,7 @@  discard block
 
 block discarded – undo
1933 1933 
 		try {
1934 1934 
 			$sth = $Connection->db->prepare($query);
1935 1935 
 			$sth->execute();
1936 
-		} catch(PDOException $e) {
1936 
+		} catch (PDOException $e) {
1937 1937 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1938 1938 
 		}
1939 1939 
 		return $error;
 
@@ -1943,32 +1943,32 @@  discard block
 
 block discarded – undo
1943 1943 
 		global $globalDBdriver;
1944 1944 
 		$Connection = new Connection();
1945 1945 
 		$error = '';
1946 
-		if (!$Connection->checkColumnName('source_location','last_seen')) {
1946 
+		if (!$Connection->checkColumnName('source_location', 'last_seen')) {
1947 1947 
 			$query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL";
1948 1948 
 			try {
1949 1949 
 				$sth = $Connection->db->prepare($query);
1950 1950 
 				$sth->execute();
1951 
-			} catch(PDOException $e) {
1951 
+			} catch (PDOException $e) {
1952 1952 
 				return "error (add column last_seen in source_location) : ".$e->getMessage()."\n";
1953 1953 
 			}
1954 1954 
 		}
1955 1955 
 		if ($globalDBdriver == 'mysql') {
1956 
-			if (!$Connection->checkColumnName('source_location','location_id')) {
1956 
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
1957 1957 
 				$query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL";
1958 1958 
 				try {
1959 1959 
 					$sth = $Connection->db->prepare($query);
1960 1960 
 					$sth->execute();
1961 
-				} catch(PDOException $e) {
1961 
+				} catch (PDOException $e) {
1962 1962 
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
1963 1963 
 				}
1964 1964 
 			}
1965 1965 
 		} else {
1966 
-			if (!$Connection->checkColumnName('source_location','location_id')) {
1966 
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
1967 1967 
 				$query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL";
1968 1968 
 				try {
1969 1969 
 					$sth = $Connection->db->prepare($query);
1970 1970 
 					$sth->execute();
1971 
-				} catch(PDOException $e) {
1971 
+				} catch (PDOException $e) {
1972 1972 
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
1973 1973 
 				}
1974 1974 
 			}
 
@@ -1977,7 +1977,7 @@  discard block
 
 block discarded – undo
1977 1977 
 		try {
1978 1978 
 			$sth = $Connection->db->prepare($query);
1979 1979 
 			$sth->execute();
1980 
-		} catch(PDOException $e) {
1980 
+		} catch (PDOException $e) {
1981 1981 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1982 1982 
 		}
1983 1983 
 		return $error;
 
@@ -1987,12 +1987,12 @@  discard block
 
 block discarded – undo
1987 1987 
 		global $globalDBdriver;
1988 1988 
 		$Connection = new Connection();
1989 1989 
 		$error = '';
1990 
-		if (!$Connection->checkColumnName('source_location','description')) {
1990 
+		if (!$Connection->checkColumnName('source_location', 'description')) {
1991 1991 
 			$query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL";
1992 1992 
 			try {
1993 1993 
 				$sth = $Connection->db->prepare($query);
1994 1994 
 				$sth->execute();
1995 
-			} catch(PDOException $e) {
1995 
+			} catch (PDOException $e) {
1996 1996 
 				return "error (add column description in source_location) : ".$e->getMessage()."\n";
1997 1997 
 			}
1998 1998 
 		}
 
@@ -2000,7 +2000,7 @@  discard block
 
 block discarded – undo
2000 2000 
 		try {
2001 2001 
 			$sth = $Connection->db->prepare($query);
2002 2002 
 			$sth->execute();
2003 
-		} catch(PDOException $e) {
2003 
+		} catch (PDOException $e) {
2004 2004 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2005 2005 
 		}
2006 2006 
 		return $error;
 
@@ -2010,39 +2010,39 @@  discard block
 
 block discarded – undo
2010 2010 
 		global $globalDBdriver;
2011 2011 
 		$Connection = new Connection();
2012 2012 
 		$error = '';
2013 
-		if (!$Connection->checkColumnName('spotter_live','real_altitude')) {
2013 
+		if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) {
2014 2014 
 			$query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL";
2015 2015 
 			try {
2016 2016 
 				$sth = $Connection->db->prepare($query);
2017 2017 
 				$sth->execute();
2018 
-			} catch(PDOException $e) {
2018 
+			} catch (PDOException $e) {
2019 2019 
 				return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n";
2020 2020 
 			}
2021 2021 
 		}
2022 
-		if (!$Connection->checkColumnName('spotter_output','real_altitude')) {
2022 
+		if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) {
2023 2023 
 			$query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL";
2024 2024 
 			try {
2025 2025 
 				$sth = $Connection->db->prepare($query);
2026 2026 
 				$sth->execute();
2027 
-			} catch(PDOException $e) {
2027 
+			} catch (PDOException $e) {
2028 2028 
 				return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n";
2029 2029 
 			}
2030 2030 
 		}
2031 
-		if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) {
2031 
+		if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) {
2032 2032 
 			$query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL";
2033 2033 
 			try {
2034 2034 
 				$sth = $Connection->db->prepare($query);
2035 2035 
 				$sth->execute();
2036 
-			} catch(PDOException $e) {
2036 
+			} catch (PDOException $e) {
2037 2037 
 				return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n";
2038 2038 
 			}
2039 2039 
 		}
2040 
-		if (!$Connection->checkColumnName('spotter_archive','real_altitude')) {
2040 
+		if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) {
2041 2041 
 			$query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL";
2042 2042 
 			try {
2043 2043 
 				$sth = $Connection->db->prepare($query);
2044 2044 
 				$sth->execute();
2045 
-			} catch(PDOException $e) {
2045 
+			} catch (PDOException $e) {
2046 2046 
 				return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n";
2047 2047 
 			}
2048 2048 
 		}
 
@@ -2050,7 +2050,7 @@  discard block
 
 block discarded – undo
2050 2050 
 		try {
2051 2051 
 			$sth = $Connection->db->prepare($query);
2052 2052 
 			$sth->execute();
2053 
-		} catch(PDOException $e) {
2053 
+		} catch (PDOException $e) {
2054 2054 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2055 2055 
 		}
2056 2056 
 		return $error;
 
@@ -2072,14 +2072,14 @@  discard block
 
 block discarded – undo
2072 2072 
 		try {
2073 2073 
 			$sth = $Connection->db->prepare($query);
2074 2074 
 			$sth->execute();
2075 
-		} catch(PDOException $e) {
2075 
+		} catch (PDOException $e) {
2076 2076 
 			return "error (modify column altitude in tracker_*) : ".$e->getMessage()."\n";
2077 2077 
 		}
2078 2078 
 		$query = "UPDATE config SET value = '44' WHERE name = 'schema_version'";
2079 2079 
 		try {
2080 2080 
 			$sth = $Connection->db->prepare($query);
2081 2081 
 			$sth->execute();
2082 
-		} catch(PDOException $e) {
2082 
+		} catch (PDOException $e) {
2083 2083 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2084 2084 
 		}
2085 2085 
 		return $error;
 
@@ -2120,7 +2120,7 @@  discard block
 
 block discarded – undo
2120 2120 
 		try {
2121 2121 
 			$sth = $Connection->db->prepare($query);
2122 2122 
 			$sth->execute();
2123 
-		} catch(PDOException $e) {
2123 
+		} catch (PDOException $e) {
2124 2124 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2125 2125 
 		}
2126 2126 
 		return $error;
 
@@ -2143,7 +2143,7 @@  discard block
 
 block discarded – undo
2143 2143 
 		try {
2144 2144 
 			$sth = $Connection->db->prepare($query);
2145 2145 
 			$sth->execute();
2146 
-		} catch(PDOException $e) {
2146 
+		} catch (PDOException $e) {
2147 2147 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2148 2148 
 		}
2149 2149 
 		return $error;
 
@@ -2193,7 +2193,7 @@  discard block
 
 block discarded – undo
2193 2193 
 		try {
2194 2194 
 			$sth = $Connection->db->prepare($query);
2195 2195 
 			$sth->execute();
2196 
-		} catch(PDOException $e) {
2196 
+		} catch (PDOException $e) {
2197 2197 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2198 2198 
 		}
2199 2199 
 		return $error;
 
@@ -2216,7 +2216,7 @@  discard block
 
 block discarded – undo
2216 2216 
 					try {
2217 2217 
 						$sth = $Connection->db->prepare($query);
2218 2218 
 						$sth->execute();
2219 
-					} catch(PDOException $e) {
2219 
+					} catch (PDOException $e) {
2220 2220 
 						return "error (check_version): ".$e->getMessage()."\n";
2221 2221 
 					}
2222 2222 
 					$result = $sth->fetch(PDO::FETCH_ASSOC);
Please login to merge, or discard this patch.
Braces   +457 added lines, -168 removed lines patch added patch discarded remove patch 
@@ -258,7 +258,9 @@  discard block
 
 block discarded – undo
258 258 
     		// Update table countries
259 259 
     		if ($Connection->tableExists('airspace')) {
260 260 
     		    $error .= update_db::update_countries();
261 
-		    if ($error != '') return $error;
261 
+		    if ($error != '') {
262 
+		    	return $error;
263 
+		    }
262 264 
 		}
263 265 
 		// Update schema_version to 7
264 266 
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
 
@@ -314,7 +316,9 @@  discard block
 
 block discarded – undo
314 316 
     		$error = '';
315 317 
     		// Update table aircraft
316 318 
 		$error .= create_db::import_file('../db/source_location.sql');
317 
-		if ($error != '') return $error;
319 
+		if ($error != '') {
320 
+			return $error;
321 
+		}
318 322 
 		// Update schema_version to 6
319 323 
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
320 324 
         	try {
 
@@ -331,7 +335,9 @@  discard block
 
 block discarded – undo
331 335 
     		$error = '';
332 336 
     		// Update table aircraft
333 337 
 		$error .= create_db::import_file('../db/notam.sql');
334 
-		if ($error != '') return $error;
338 
+		if ($error != '') {
339 
+			return $error;
340 
+		}
335 341 
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
336 342 
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
337 343 
                         DELETE FROM config WHERE name = 'last_update_notam_db';
 
@@ -365,7 +371,9 @@  discard block
 
 block discarded – undo
365 371 
 		$error = '';
366 372 
     		// Update table atc
367 373 
 		$error .= create_db::import_file('../db/atc.sql');
368 
-		if ($error != '') return $error;
374 
+		if ($error != '') {
375 
+			return $error;
376 
+		}
369 377
370 378 
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
371 379 
         	try {
 
@@ -389,13 +397,21 @@  discard block
 
 block discarded – undo
389 397 
 		$error = '';
390 398 
     		// Add tables
391 399 
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
392 
-		if ($error != '') return $error;
400 
+		if ($error != '') {
401 
+			return $error;
402 
+		}
393 403 
 		$error .= create_db::import_file('../db/metar.sql');
394 
-		if ($error != '') return $error;
404 
+		if ($error != '') {
405 
+			return $error;
406 
+		}
395 407 
 		$error .= create_db::import_file('../db/taf.sql');
396 
-		if ($error != '') return $error;
408 
+		if ($error != '') {
409 
+			return $error;
410 
+		}
397 411 
 		$error .= create_db::import_file('../db/airport.sql');
398 
-		if ($error != '') return $error;
412 
+		if ($error != '') {
413 
+			return $error;
414 
+		}
399 415
400 416 
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
401 417 
         	try {
 
@@ -469,19 +485,33 @@  discard block
 
 block discarded – undo
469 485 
 		$error = '';
470 486 
     		// Add tables
471 487 
 		$error .= create_db::import_file('../db/stats.sql');
472 
-		if ($error != '') return $error;
488 
+		if ($error != '') {
489 
+			return $error;
490 
+		}
473 491 
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
474 
-		if ($error != '') return $error;
492 
+		if ($error != '') {
493 
+			return $error;
494 
+		}
475 495 
 		$error .= create_db::import_file('../db/stats_airline.sql');
476 
-		if ($error != '') return $error;
496 
+		if ($error != '') {
497 
+			return $error;
498 
+		}
477 499 
 		$error .= create_db::import_file('../db/stats_airport.sql');
478 
-		if ($error != '') return $error;
500 
+		if ($error != '') {
501 
+			return $error;
502 
+		}
479 503 
 		$error .= create_db::import_file('../db/stats_owner.sql');
480 
-		if ($error != '') return $error;
504 
+		if ($error != '') {
505 
+			return $error;
506 
+		}
481 507 
 		$error .= create_db::import_file('../db/stats_pilot.sql');
482 
-		if ($error != '') return $error;
508 
+		if ($error != '') {
509 
+			return $error;
510 
+		}
483 511 
 		$error .= create_db::import_file('../db/spotter_archive_output.sql');
484 
-		if ($error != '') return $error;
512 
+		if ($error != '') {
513 
+			return $error;
514 
+		}
485 515
486 516 
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
487 517 
         	try {
 
@@ -521,7 +551,9 @@  discard block
 
 block discarded – undo
521 551 
     		// Add tables
522 552 
     		if (!$Connection->tableExists('stats_flight')) {
523 553 
 			$error .= create_db::import_file('../db/stats_flight.sql');
524 
-			if ($error != '') return $error;
554 
+			if ($error != '') {
555 
+				return $error;
556 
+			}
525 557 
 		}
526 558 
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
527 559 
         	try {
 
@@ -545,7 +577,9 @@  discard block
 
 block discarded – undo
545 577 
     		} catch(PDOException $e) {
546 578 
 		    return "error (update stats) : ".$e->getMessage()."\n";
547 579 
     		}
548 
-		if ($error != '') return $error;
580 
+		if ($error != '') {
581 
+			return $error;
582 
+		}
549 583 
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
550 584 
         	try {
551 585 
             	    $sth = $Connection->db->prepare($query);
 
@@ -566,7 +600,9 @@  discard block
 
 block discarded – undo
566 600 
     		if (!$Connection->tableExists('stats_callsign')) {
567 601 
 			$error .= create_db::import_file('../db/stats_callsign.sql');
568 602 
 		}
569 
-		if ($error != '') return $error;
603 
+		if ($error != '') {
604 
+			return $error;
605 
+		}
570 606 
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
571 607 
         	try {
572 608 
             	    $sth = $Connection->db->prepare($query);
 
@@ -584,7 +620,9 @@  discard block
 
 block discarded – undo
584 620 
     		if (!$Connection->tableExists('stats_country')) {
585 621 
 			$error .= create_db::import_file('../db/stats_country.sql');
586 622 
 		}
587 
-		if ($error != '') return $error;
623 
+		if ($error != '') {
624 
+			return $error;
625 
+		}
588 626 
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
589 627 
         	try {
590 628 
             	    $sth = $Connection->db->prepare($query);
 
@@ -607,7 +645,9 @@  discard block
 
 block discarded – undo
607 645 
 			    return "error (update stats) : ".$e->getMessage()."\n";
608 646 
     			}
609 647 
     		}
610 
-		if ($error != '') return $error;
648 
+		if ($error != '') {
649 
+			return $error;
650 
+		}
611 651 
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
612 652 
         	try {
613 653 
             	    $sth = $Connection->db->prepare($query);
 
@@ -623,7 +663,9 @@  discard block
 
 block discarded – undo
623 663 
 		$error = '';
624 664 
     		// Update airport table
625 665 
 		$error .= create_db::import_file('../db/airport.sql');
626 
-		if ($error != '') return 'Import airport.sql : '.$error;
666 
+		if ($error != '') {
667 
+			return 'Import airport.sql : '.$error;
668 
+		}
627 669 
 		// Remove primary key on Spotter_Archive
628 670 
 		$query = "alter table spotter_archive drop spotter_archive_id";
629 671 
         	try {
 
@@ -699,7 +741,9 @@  discard block
 
 block discarded – undo
699 741 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
700 742 
     			}
701 743 
     		}
702 
-		if ($error != '') return $error;
744 
+		if ($error != '') {
745 
+			return $error;
746 
+		}
703 747 
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
704 748 
         	try {
705 749 
             	    $sth = $Connection->db->prepare($query);
 
@@ -717,7 +761,9 @@  discard block
 
 block discarded – undo
717 761 
     		// Update airline table
718 762 
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
719 763 
 			$error .= create_db::import_file('../db/airlines.sql');
720 
-			if ($error != '') return 'Import airlines.sql : '.$error;
764 
+			if ($error != '') {
765 
+				return 'Import airlines.sql : '.$error;
766 
+			}
721 767 
 		}
722 768 
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
723 769 
 			// Add column over_country
 
@@ -729,7 +775,9 @@  discard block
 
 block discarded – undo
729 775 
 				return "error (add over_country) : ".$e->getMessage()."\n";
730 776 
     			}
731 777 
     		}
732 
-		if ($error != '') return $error;
778 
+		if ($error != '') {
779 
+			return $error;
780 
+		}
733 781 
 		/*
734 782 
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
735 783 
 			// Force update ModeS (this will put type_flight data
 
@@ -759,7 +807,9 @@  discard block
 
 block discarded – undo
759 807 
 			} catch(PDOException $e) {
760 808 
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
761 809 
 			}
762 
-			if ($error != '') return $error;
810 
+			if ($error != '') {
811 
+				return $error;
812 
+			}
763 813 
 		}
764 814 
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
765 815 
         	try {
 
@@ -782,7 +832,9 @@  discard block
 
 block discarded – undo
782 832 
 			} else {
783 833 
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
784 834 
 			}
785 
-			if ($error != '') return $error;
835 
+			if ($error != '') {
836 
+				return $error;
837 
+			}
786 838 
 		}
787 839 
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
788 840 
         	try {
 
@@ -803,12 +855,16 @@  discard block
 
 block discarded – undo
803 855 
 		if ($globalDBdriver == 'mysql') {
804 856 
 			if (!$Connection->tableExists('tle')) {
805 857 
 				$error .= create_db::import_file('../db/tle.sql');
806 
-				if ($error != '') return $error;
858 
+				if ($error != '') {
859 
+					return $error;
860 
+				}
807 861 
 			}
808 862 
 		} else {
809 863 
 			if (!$Connection->tableExists('tle')) {
810 864 
 				$error .= create_db::import_file('../db/pgsql/tle.sql');
811 
-				if ($error != '') return $error;
865 
+				if ($error != '') {
866 
+					return $error;
867 
+				}
812 868 
 			}
813 869 
 			$query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)";
814 870 
 			try {
 
@@ -848,7 +904,9 @@  discard block
 
 block discarded – undo
848 904 
 		} else {
849 905 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
850 906 
 		}
851 
-		if ($error != '') return 'Import airlines.sql : '.$error;
907 
+		if ($error != '') {
908 
+			return 'Import airlines.sql : '.$error;
909 
+		}
852 910 
 		if (!$Connection->checkColumnName('airlines','forsource')) {
853 911 
 			// Add forsource to airlines
854 912 
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
 
@@ -1331,20 +1389,28 @@  discard block
 
 block discarded – undo
1331 1389 
 		}
1332 1390 
 		if ($globalDBdriver == 'mysql') {
1333 1391 
 			$error .= create_db::import_file('../db/airlines.sql');
1334 
-			if ($error != '') return $error;
1392 
+			if ($error != '') {
1393 
+				return $error;
1394 
+			}
1335 1395 
 		} else {
1336 1396 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
1337 
-			if ($error != '') return $error;
1397 
+			if ($error != '') {
1398 
+				return $error;
1399 
+			}
1338 1400 
 		}
1339 1401 
 		if ((isset($globalVATSIM) && $globalVATSIM) || (isset($globalIVAO) && $globalIVAO)) {
1340 1402 
 			include_once(dirname(__FILE__).'/class.update_db.php');
1341 1403 
 			if (isset($globalVATSIM) && $globalVATSIM) {
1342 1404 
 				$error .= update_db::update_vatsim();
1343 
-				if ($error != '') return $error;
1405 
+				if ($error != '') {
1406 
+					return $error;
1407 
+				}
1344 1408 
 			}
1345 1409 
 			if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) {
1346 1410 
 				$error .= update_db::update_IVAO();
1347 
-				if ($error != '') return $error;
1411 
+				if ($error != '') {
1412 
+					return $error;
1413 
+				}
1348 1414 
 			}
1349 1415 
 		}
1350 1416 
 
@@ -1607,41 +1673,65 @@  discard block
 
 block discarded – undo
1607 1673 
 		if ($globalDBdriver == 'mysql') {
1608 1674 
 			if (!$Connection->tableExists('tracker_output')) {
1609 1675 
 				$error .= create_db::import_file('../db/tracker_output.sql');
1610 
-				if ($error != '') return $error;
1676 
+				if ($error != '') {
1677 
+					return $error;
1678 
+				}
1611 1679 
 			}
1612 1680 
 			if (!$Connection->tableExists('tracker_live')) {
1613 1681 
 				$error .= create_db::import_file('../db/tracker_live.sql');
1614 
-				if ($error != '') return $error;
1682 
+				if ($error != '') {
1683 
+					return $error;
1684 
+				}
1615 1685 
 			}
1616 1686 
 			if (!$Connection->tableExists('marine_output')) {
1617 1687 
 				$error .= create_db::import_file('../db/marine_output.sql');
1618 
-				if ($error != '') return $error;
1688 
+				if ($error != '') {
1689 
+					return $error;
1690 
+				}
1619 1691 
 			}
1620 1692 
 			if (!$Connection->tableExists('marine_live')) {
1621 1693 
 				$error .= create_db::import_file('../db/marine_live.sql');
1622 
-				if ($error != '') return $error;
1694 
+				if ($error != '') {
1695 
+					return $error;
1696 
+				}
1623 1697 
 			}
1624 1698 
 			if (!$Connection->tableExists('marine_identity')) {
1625 1699 
 				$error .= create_db::import_file('../db/marine_identity.sql');
1626 
-				if ($error != '') return $error;
1700 
+				if ($error != '') {
1701 
+					return $error;
1702 
+				}
1627 1703 
 			}
1628 1704 
 			if (!$Connection->tableExists('marine_mid')) {
1629 1705 
 				$error .= create_db::import_file('../db/marine_mid.sql');
1630 
-				if ($error != '') return $error;
1706 
+				if ($error != '') {
1707 
+					return $error;
1708 
+				}
1631 1709 
 			}
1632 1710 
 		} else {
1633 1711 
 			$error .= create_db::import_file('../db/pgsql/tracker_output.sql');
1634 
-			if ($error != '') return $error;
1712 
+			if ($error != '') {
1713 
+				return $error;
1714 
+			}
1635 1715 
 			$error .= create_db::import_file('../db/pgsql/tracker_live.sql');
1636 
-			if ($error != '') return $error;
1716 
+			if ($error != '') {
1717 
+				return $error;
1718 
+			}
1637 1719 
 			$error .= create_db::import_file('../db/pgsql/marine_output.sql');
1638 
-			if ($error != '') return $error;
1720 
+			if ($error != '') {
1721 
+				return $error;
1722 
+			}
1639 1723 
 			$error .= create_db::import_file('../db/pgsql/marine_live.sql');
1640 
-			if ($error != '') return $error;
1724 
+			if ($error != '') {
1725 
+				return $error;
1726 
+			}
1641 1727 
 			$error .= create_db::import_file('../db/pgsql/marine_identity.sql');
1642 
-			if ($error != '') return $error;
1728 
+			if ($error != '') {
1729 
+				return $error;
1730 
+			}
1643 1731 
 			$error .= create_db::import_file('../db/pgsql/marine_mid.sql');
1644 
-			if ($error != '') return $error;
1732 
+			if ($error != '') {
1733 
+				return $error;
1734 
+			}
1645 1735 
 		}
1646 1736 
 		$query = "UPDATE config SET value = '37' WHERE name = 'schema_version'";
1647 1737 
 		try {
 
@@ -1660,39 +1750,61 @@  discard block
 
 block discarded – undo
1660 1750 
 		if ($globalDBdriver == 'mysql') {
1661 1751 
 			if (!$Connection->tableExists('marine_image')) {
1662 1752 
 				$error .= create_db::import_file('../db/marine_image.sql');
1663 
-				if ($error != '') return $error;
1753 
+				if ($error != '') {
1754 
+					return $error;
1755 
+				}
1664 1756 
 			}
1665 1757 
 			if (!$Connection->tableExists('marine_archive')) {
1666 1758 
 				$error .= create_db::import_file('../db/marine_archive.sql');
1667 
-				if ($error != '') return $error;
1759 
+				if ($error != '') {
1760 
+					return $error;
1761 
+				}
1668 1762 
 			}
1669 1763 
 			if (!$Connection->tableExists('marine_archive_output')) {
1670 1764 
 				$error .= create_db::import_file('../db/marine_archive_output.sql');
1671 
-				if ($error != '') return $error;
1765 
+				if ($error != '') {
1766 
+					return $error;
1767 
+				}
1672 1768 
 			}
1673 1769 
 			if (!$Connection->tableExists('tracker_archive')) {
1674 1770 
 				$error .= create_db::import_file('../db/tracker_archive.sql');
1675 
-				if ($error != '') return $error;
1771 
+				if ($error != '') {
1772 
+					return $error;
1773 
+				}
1676 1774 
 			}
1677 1775 
 			if (!$Connection->tableExists('tracker_archive_output')) {
1678 1776 
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
1679 
-				if ($error != '') return $error;
1777 
+				if ($error != '') {
1778 
+					return $error;
1779 
+				}
1680 1780 
 			}
1681 1781 
 			if (!$Connection->tableExists('marine_archive_output')) {
1682 1782 
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
1683 
-				if ($error != '') return $error;
1783 
+				if ($error != '') {
1784 
+					return $error;
1785 
+				}
1684 1786 
 			}
1685 1787 
 		} else {
1686 1788 
 			$error .= create_db::import_file('../db/pgsql/marine_image.sql');
1687 
-			if ($error != '') return $error;
1789 
+			if ($error != '') {
1790 
+				return $error;
1791 
+			}
1688 1792 
 			$error .= create_db::import_file('../db/pgsql/marine_archive.sql');
1689 
-			if ($error != '') return $error;
1793 
+			if ($error != '') {
1794 
+				return $error;
1795 
+			}
1690 1796 
 			$error .= create_db::import_file('../db/pgsql/marine_archive_output.sql');
1691 
-			if ($error != '') return $error;
1797 
+			if ($error != '') {
1798 
+				return $error;
1799 
+			}
1692 1800 
 			$error .= create_db::import_file('../db/pgsql/tracker_archive.sql');
1693 
-			if ($error != '') return $error;
1801 
+			if ($error != '') {
1802 
+				return $error;
1803 
+			}
1694 1804 
 			$error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql');
1695 
-			if ($error != '') return $error;
1805 
+			if ($error != '') {
1806 
+				return $error;
1807 
+			}
1696 1808 
 		}
1697 1809 
 		if ($globalDBdriver == 'mysql') {
1698 1810 
 			$query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'";
 
@@ -2063,7 +2175,9 @@  discard block
 
 block discarded – undo
2063 2175 
 		if ($globalDBdriver == 'mysql') {
2064 2176 
 			if (!$Connection->tableExists('tracker_archive_output')) {
2065 2177 
 				$error .= create_db::import_file('../db/tracker_archive_output.sql');
2066 
-				if ($error != '') return $error;
2178 
+				if ($error != '') {
2179 
+					return $error;
2180 
+				}
2067 2181 
 			}
2068 2182 
 			$query = "ALTER TABLE tracker_live MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;";
2069 2183 
 		} else {
 
@@ -2091,14 +2205,22 @@  discard block
 
 block discarded – undo
2091 2205 
 		$error = '';
2092 2206 
 		if ($globalDBdriver == 'mysql') {
2093 2207 
 			$error .= create_db::import_file('../db/airport.sql');
2094 
-			if ($error != '') return $error;
2208 
+			if ($error != '') {
2209 
+				return $error;
2210 
+			}
2095 2211 
 			$error .= create_db::import_file('../db/airlines.sql');
2096 
-			if ($error != '') return $error;
2212 
+			if ($error != '') {
2213 
+				return $error;
2214 
+			}
2097 2215 
 		} else {
2098 2216 
 			$error .= create_db::import_file('../db/pgsql/airport.sql');
2099 
-			if ($error != '') return $error;
2217 
+			if ($error != '') {
2218 
+				return $error;
2219 
+			}
2100 2220 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
2101 
-			if ($error != '') return $error;
2221 
+			if ($error != '') {
2222 
+				return $error;
2223 
+			}
2102 2224 
 		}
2103 2225 
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
2104 2226 
 			if (file_exists('tmp/ivae_feb2013.zip')) {
 
@@ -2115,7 +2237,9 @@  discard block
 
 block discarded – undo
2115 2237 
 				$error .= update_db::update_vatsim();
2116 2238 
 			}
2117 2239 
 		}
2118 
-		if ($error != '') return $error;
2240 
+		if ($error != '') {
2241 
+			return $error;
2242 
+		}
2119 2243 
 		$query = "UPDATE config SET value = '45' WHERE name = 'schema_version'";
2120 2244 
 		try {
2121 2245 
 			$sth = $Connection->db->prepare($query);
 
@@ -2133,10 +2257,14 @@  discard block
 
 block discarded – undo
2133 2257 
 		if (!$Connection->tableExists('satellite')) {
2134 2258 
 			if ($globalDBdriver == 'mysql') {
2135 2259 
 				$error .= create_db::import_file('../db/satellite.sql');
2136 
-				if ($error != '') return $error;
2260 
+				if ($error != '') {
2261 
+					return $error;
2262 
+				}
2137 2263 
 			} else {
2138 2264 
 				$error .= create_db::import_file('../db/pgsql/satellite.sql');
2139 
-				if ($error != '') return $error;
2265 
+				if ($error != '') {
2266 
+					return $error;
2267 
+				}
2140 2268 
 			}
2141 2269 
 		}
2142 2270 
 		$query = "UPDATE config SET value = '46' WHERE name = 'schema_version'";
 
@@ -2156,37 +2284,53 @@  discard block
 
 block discarded – undo
2156 2284 
 		if (!$Connection->tableExists('stats_marine')) {
2157 2285 
 			if ($globalDBdriver == 'mysql') {
2158 2286 
 				$error .= create_db::import_file('../db/stats_marine.sql');
2159 
-				if ($error != '') return $error;
2287 
+				if ($error != '') {
2288 
+					return $error;
2289 
+				}
2160 2290 
 			} else {
2161 2291 
 				$error .= create_db::import_file('../db/pgsql/stats_marine.sql');
2162 
-				if ($error != '') return $error;
2292 
+				if ($error != '') {
2293 
+					return $error;
2294 
+				}
2163 2295 
 			}
2164 2296 
 		}
2165 2297 
 		if (!$Connection->tableExists('stats_marine_country')) {
2166 2298 
 			if ($globalDBdriver == 'mysql') {
2167 2299 
 				$error .= create_db::import_file('../db/stats_marine_country.sql');
2168 
-				if ($error != '') return $error;
2300 
+				if ($error != '') {
2301 
+					return $error;
2302 
+				}
2169 2303 
 			} else {
2170 2304 
 				$error .= create_db::import_file('../db/pgsql/stats_marine_country.sql');
2171 
-				if ($error != '') return $error;
2305 
+				if ($error != '') {
2306 
+					return $error;
2307 
+				}
2172 2308 
 			}
2173 2309 
 		}
2174 2310 
 		if (!$Connection->tableExists('stats_tracker')) {
2175 2311 
 			if ($globalDBdriver == 'mysql') {
2176 2312 
 				$error .= create_db::import_file('../db/stats_tracker.sql');
2177 
-				if ($error != '') return $error;
2313 
+				if ($error != '') {
2314 
+					return $error;
2315 
+				}
2178 2316 
 			} else {
2179 2317 
 				$error .= create_db::import_file('../db/pgsql/stats_tracker.sql');
2180 
-				if ($error != '') return $error;
2318 
+				if ($error != '') {
2319 
+					return $error;
2320 
+				}
2181 2321 
 			}
2182 2322 
 		}
2183 2323 
 		if (!$Connection->tableExists('stats_tracker_country')) {
2184 2324 
 			if ($globalDBdriver == 'mysql') {
2185 2325 
 				$error .= create_db::import_file('../db/stats_tracker_country.sql');
2186 
-				if ($error != '') return $error;
2326 
+				if ($error != '') {
2327 
+					return $error;
2328 
+				}
2187 2329 
 			} else {
2188 2330 
 				$error .= create_db::import_file('../db/pgsql/stats_tracker_country.sql');
2189 
-				if ($error != '') return $error;
2331 
+				if ($error != '') {
2332 
+					return $error;
2333 
+				}
2190 2334 
 			}
2191 2335 
 		}
2192 2336 
 		$query = "UPDATE config SET value = '47' WHERE name = 'schema_version'";
 
@@ -2209,8 +2353,11 @@  discard block
 
 block discarded – undo
2209 2353 
 			if ($Connection->tableExists('aircraft')) {
2210 2354 
 				if (!$Connection->tableExists('config')) {
2211 2355 
 					$version = '1';
2212 
-					if ($update) return self::update_from_1();
2213 
-					else return $version;
2356 
+					if ($update) {
2357 
+						return self::update_from_1();
2358 
+					} else {
2359 
+						return $version;
2360 
+					}
2214 2361 
 				} else {
2215 2362 
 					$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
2216 2363 
 					try {
 
@@ -2223,191 +2370,333 @@  discard block
 
 block discarded – undo
2223 2370 
 					if ($update) {
2224 2371 
 						if ($result['value'] == '2') {
2225 2372 
 							$error = self::update_from_2();
2226 
-							if ($error != '') return $error;
2227 
-							else return self::check_version(true);
2373 
+							if ($error != '') {
2374 
+								return $error;
2375 
+							} else {
2376 
+								return self::check_version(true);
2377 
+							}
2228 2378 
 						} elseif ($result['value'] == '3') {
2229 2379 
 							$error = self::update_from_3();
2230 
-							if ($error != '') return $error;
2231 
-							else return self::check_version(true);
2380 
+							if ($error != '') {
2381 
+								return $error;
2382 
+							} else {
2383 
+								return self::check_version(true);
2384 
+							}
2232 2385 
 						} elseif ($result['value'] == '4') {
2233 2386 
 							$error = self::update_from_4();
2234 
-							if ($error != '') return $error;
2235 
-							else return self::check_version(true);
2387 
+							if ($error != '') {
2388 
+								return $error;
2389 
+							} else {
2390 
+								return self::check_version(true);
2391 
+							}
2236 2392 
 						} elseif ($result['value'] == '5') {
2237 2393 
 							$error = self::update_from_5();
2238 
-							if ($error != '') return $error;
2239 
-							else return self::check_version(true);
2394 
+							if ($error != '') {
2395 
+								return $error;
2396 
+							} else {
2397 
+								return self::check_version(true);
2398 
+							}
2240 2399 
 						} elseif ($result['value'] == '6') {
2241 2400 
 							$error = self::update_from_6();
2242 
-							if ($error != '') return $error;
2243 
-							else return self::check_version(true);
2401 
+							if ($error != '') {
2402 
+								return $error;
2403 
+							} else {
2404 
+								return self::check_version(true);
2405 
+							}
2244 2406 
 						} elseif ($result['value'] == '7') {
2245 2407 
 							$error = self::update_from_7();
2246 
-							if ($error != '') return $error;
2247 
-							else return self::check_version(true);
2408 
+							if ($error != '') {
2409 
+								return $error;
2410 
+							} else {
2411 
+								return self::check_version(true);
2412 
+							}
2248 2413 
 						} elseif ($result['value'] == '8') {
2249 2414 
 							$error = self::update_from_8();
2250 
-							if ($error != '') return $error;
2251 
-							else return self::check_version(true);
2415 
+							if ($error != '') {
2416 
+								return $error;
2417 
+							} else {
2418 
+								return self::check_version(true);
2419 
+							}
2252 2420 
 						} elseif ($result['value'] == '9') {
2253 2421 
 							$error = self::update_from_9();
2254 
-							if ($error != '') return $error;
2255 
-							else return self::check_version(true);
2422 
+							if ($error != '') {
2423 
+								return $error;
2424 
+							} else {
2425 
+								return self::check_version(true);
2426 
+							}
2256 2427 
 						} elseif ($result['value'] == '10') {
2257 2428 
 							$error = self::update_from_10();
2258 
-							if ($error != '') return $error;
2259 
-							else return self::check_version(true);
2429 
+							if ($error != '') {
2430 
+								return $error;
2431 
+							} else {
2432 
+								return self::check_version(true);
2433 
+							}
2260 2434 
 						} elseif ($result['value'] == '11') {
2261 2435 
 							$error = self::update_from_11();
2262 
-							if ($error != '') return $error;
2263 
-							else return self::check_version(true);
2436 
+							if ($error != '') {
2437 
+								return $error;
2438 
+							} else {
2439 
+								return self::check_version(true);
2440 
+							}
2264 2441 
 						} elseif ($result['value'] == '12') {
2265 2442 
 							$error = self::update_from_12();
2266 
-							if ($error != '') return $error;
2267 
-							else return self::check_version(true);
2443 
+							if ($error != '') {
2444 
+								return $error;
2445 
+							} else {
2446 
+								return self::check_version(true);
2447 
+							}
2268 2448 
 						} elseif ($result['value'] == '13') {
2269 2449 
 							$error = self::update_from_13();
2270 
-							if ($error != '') return $error;
2271 
-							else return self::check_version(true);
2450 
+							if ($error != '') {
2451 
+								return $error;
2452 
+							} else {
2453 
+								return self::check_version(true);
2454 
+							}
2272 2455 
 						} elseif ($result['value'] == '14') {
2273 2456 
 							$error = self::update_from_14();
2274 
-							if ($error != '') return $error;
2275 
-							else return self::check_version(true);
2457 
+							if ($error != '') {
2458 
+								return $error;
2459 
+							} else {
2460 
+								return self::check_version(true);
2461 
+							}
2276 2462 
 						} elseif ($result['value'] == '15') {
2277 2463 
 							$error = self::update_from_15();
2278 
-							if ($error != '') return $error;
2279 
-							else return self::check_version(true);
2464 
+							if ($error != '') {
2465 
+								return $error;
2466 
+							} else {
2467 
+								return self::check_version(true);
2468 
+							}
2280 2469 
 						} elseif ($result['value'] == '16') {
2281 2470 
 							$error = self::update_from_16();
2282 
-							if ($error != '') return $error;
2283 
-							else return self::check_version(true);
2471 
+							if ($error != '') {
2472 
+								return $error;
2473 
+							} else {
2474 
+								return self::check_version(true);
2475 
+							}
2284 2476 
 						} elseif ($result['value'] == '17') {
2285 2477 
 							$error = self::update_from_17();
2286 
-							if ($error != '') return $error;
2287 
-							else return self::check_version(true);
2478 
+							if ($error != '') {
2479 
+								return $error;
2480 
+							} else {
2481 
+								return self::check_version(true);
2482 
+							}
2288 2483 
 						} elseif ($result['value'] == '18') {
2289 2484 
 							$error = self::update_from_18();
2290 
-							if ($error != '') return $error;
2291 
-							else return self::check_version(true);
2485 
+							if ($error != '') {
2486 
+								return $error;
2487 
+							} else {
2488 
+								return self::check_version(true);
2489 
+							}
2292 2490 
 						} elseif ($result['value'] == '19') {
2293 2491 
 							$error = self::update_from_19();
2294 
-							if ($error != '') return $error;
2295 
-							else return self::check_version(true);
2492 
+							if ($error != '') {
2493 
+								return $error;
2494 
+							} else {
2495 
+								return self::check_version(true);
2496 
+							}
2296 2497 
 						} elseif ($result['value'] == '20') {
2297 2498 
 							$error = self::update_from_20();
2298 
-							if ($error != '') return $error;
2299 
-							else return self::check_version(true);
2499 
+							if ($error != '') {
2500 
+								return $error;
2501 
+							} else {
2502 
+								return self::check_version(true);
2503 
+							}
2300 2504 
 						} elseif ($result['value'] == '21') {
2301 2505 
 							$error = self::update_from_21();
2302 
-							if ($error != '') return $error;
2303 
-							else return self::check_version(true);
2506 
+							if ($error != '') {
2507 
+								return $error;
2508 
+							} else {
2509 
+								return self::check_version(true);
2510 
+							}
2304 2511 
 						} elseif ($result['value'] == '22') {
2305 2512 
 							$error = self::update_from_22();
2306 
-							if ($error != '') return $error;
2307 
-							else return self::check_version(true);
2513 
+							if ($error != '') {
2514 
+								return $error;
2515 
+							} else {
2516 
+								return self::check_version(true);
2517 
+							}
2308 2518 
 						} elseif ($result['value'] == '23') {
2309 2519 
 							$error = self::update_from_23();
2310 
-							if ($error != '') return $error;
2311 
-							else return self::check_version(true);
2520 
+							if ($error != '') {
2521 
+								return $error;
2522 
+							} else {
2523 
+								return self::check_version(true);
2524 
+							}
2312 2525 
 						} elseif ($result['value'] == '24') {
2313 2526 
 							$error = self::update_from_24();
2314 
-							if ($error != '') return $error;
2315 
-							else return self::check_version(true);
2527 
+							if ($error != '') {
2528 
+								return $error;
2529 
+							} else {
2530 
+								return self::check_version(true);
2531 
+							}
2316 2532 
 						} elseif ($result['value'] == '25') {
2317 2533 
 							$error = self::update_from_25();
2318 
-							if ($error != '') return $error;
2319 
-							else return self::check_version(true);
2534 
+							if ($error != '') {
2535 
+								return $error;
2536 
+							} else {
2537 
+								return self::check_version(true);
2538 
+							}
2320 2539 
 						} elseif ($result['value'] == '26') {
2321 2540 
 							$error = self::update_from_26();
2322 
-							if ($error != '') return $error;
2323 
-							else return self::check_version(true);
2541 
+							if ($error != '') {
2542 
+								return $error;
2543 
+							} else {
2544 
+								return self::check_version(true);
2545 
+							}
2324 2546 
 						} elseif ($result['value'] == '27') {
2325 2547 
 							$error = self::update_from_27();
2326 
-							if ($error != '') return $error;
2327 
-							else return self::check_version(true);
2548 
+							if ($error != '') {
2549 
+								return $error;
2550 
+							} else {
2551 
+								return self::check_version(true);
2552 
+							}
2328 2553 
 						} elseif ($result['value'] == '28') {
2329 2554 
 							$error = self::update_from_28();
2330 
-							if ($error != '') return $error;
2331 
-							else return self::check_version(true);
2555 
+							if ($error != '') {
2556 
+								return $error;
2557 
+							} else {
2558 
+								return self::check_version(true);
2559 
+							}
2332 2560 
 						} elseif ($result['value'] == '29') {
2333 2561 
 							$error = self::update_from_29();
2334 
-							if ($error != '') return $error;
2335 
-							else return self::check_version(true);
2562 
+							if ($error != '') {
2563 
+								return $error;
2564 
+							} else {
2565 
+								return self::check_version(true);
2566 
+							}
2336 2567 
 						} elseif ($result['value'] == '30') {
2337 2568 
 							$error = self::update_from_30();
2338 
-							if ($error != '') return $error;
2339 
-							else return self::check_version(true);
2569 
+							if ($error != '') {
2570 
+								return $error;
2571 
+							} else {
2572 
+								return self::check_version(true);
2573 
+							}
2340 2574 
 						} elseif ($result['value'] == '31') {
2341 2575 
 							$error = self::update_from_31();
2342 
-							if ($error != '') return $error;
2343 
-							else return self::check_version(true);
2576 
+							if ($error != '') {
2577 
+								return $error;
2578 
+							} else {
2579 
+								return self::check_version(true);
2580 
+							}
2344 2581 
 						} elseif ($result['value'] == '32') {
2345 2582 
 							$error = self::update_from_32();
2346 
-							if ($error != '') return $error;
2347 
-							else return self::check_version(true);
2583 
+							if ($error != '') {
2584 
+								return $error;
2585 
+							} else {
2586 
+								return self::check_version(true);
2587 
+							}
2348 2588 
 						} elseif ($result['value'] == '33') {
2349 2589 
 							$error = self::update_from_33();
2350 
-							if ($error != '') return $error;
2351 
-							else return self::check_version(true);
2590 
+							if ($error != '') {
2591 
+								return $error;
2592 
+							} else {
2593 
+								return self::check_version(true);
2594 
+							}
2352 2595 
 						} elseif ($result['value'] == '34') {
2353 2596 
 							$error = self::update_from_34();
2354 
-							if ($error != '') return $error;
2355 
-							else return self::check_version(true);
2597 
+							if ($error != '') {
2598 
+								return $error;
2599 
+							} else {
2600 
+								return self::check_version(true);
2601 
+							}
2356 2602 
 						} elseif ($result['value'] == '35') {
2357 2603 
 							$error = self::update_from_35();
2358 
-							if ($error != '') return $error;
2359 
-							else return self::check_version(true);
2604 
+							if ($error != '') {
2605 
+								return $error;
2606 
+							} else {
2607 
+								return self::check_version(true);
2608 
+							}
2360 2609 
 						} elseif ($result['value'] == '36') {
2361 2610 
 							$error = self::update_from_36();
2362 
-							if ($error != '') return $error;
2363 
-							else return self::check_version(true);
2611 
+							if ($error != '') {
2612 
+								return $error;
2613 
+							} else {
2614 
+								return self::check_version(true);
2615 
+							}
2364 2616 
 						} elseif ($result['value'] == '37') {
2365 2617 
 							$error = self::update_from_37();
2366 
-							if ($error != '') return $error;
2367 
-							else return self::check_version(true);
2618 
+							if ($error != '') {
2619 
+								return $error;
2620 
+							} else {
2621 
+								return self::check_version(true);
2622 
+							}
2368 2623 
 						} elseif ($result['value'] == '38') {
2369 2624 
 							$error = self::update_from_38();
2370 
-							if ($error != '') return $error;
2371 
-							else return self::check_version(true);
2625 
+							if ($error != '') {
2626 
+								return $error;
2627 
+							} else {
2628 
+								return self::check_version(true);
2629 
+							}
2372 2630 
 						} elseif ($result['value'] == '39') {
2373 2631 
 							$error = self::update_from_39();
2374 
-							if ($error != '') return $error;
2375 
-							else return self::check_version(true);
2632 
+							if ($error != '') {
2633 
+								return $error;
2634 
+							} else {
2635 
+								return self::check_version(true);
2636 
+							}
2376 2637 
 						} elseif ($result['value'] == '40') {
2377 2638 
 							$error = self::update_from_40();
2378 
-							if ($error != '') return $error;
2379 
-							else return self::check_version(true);
2639 
+							if ($error != '') {
2640 
+								return $error;
2641 
+							} else {
2642 
+								return self::check_version(true);
2643 
+							}
2380 2644 
 						} elseif ($result['value'] == '41') {
2381 2645 
 							$error = self::update_from_41();
2382 
-							if ($error != '') return $error;
2383 
-							else return self::check_version(true);
2646 
+							if ($error != '') {
2647 
+								return $error;
2648 
+							} else {
2649 
+								return self::check_version(true);
2650 
+							}
2384 2651 
 						} elseif ($result['value'] == '42') {
2385 2652 
 							$error = self::update_from_42();
2386 
-							if ($error != '') return $error;
2387 
-							else return self::check_version(true);
2653 
+							if ($error != '') {
2654 
+								return $error;
2655 
+							} else {
2656 
+								return self::check_version(true);
2657 
+							}
2388 2658 
 						} elseif ($result['value'] == '43') {
2389 2659 
 							$error = self::update_from_43();
2390 
-							if ($error != '') return $error;
2391 
-							else return self::check_version(true);
2660 
+							if ($error != '') {
2661 
+								return $error;
2662 
+							} else {
2663 
+								return self::check_version(true);
2664 
+							}
2392 2665 
 						} elseif ($result['value'] == '44') {
2393 2666 
 							$error = self::update_from_44();
2394 
-							if ($error != '') return $error;
2395 
-							else return self::check_version(true);
2667 
+							if ($error != '') {
2668 
+								return $error;
2669 
+							} else {
2670 
+								return self::check_version(true);
2671 
+							}
2396 2672 
 						} elseif ($result['value'] == '45') {
2397 2673 
 							$error = self::update_from_45();
2398 
-							if ($error != '') return $error;
2399 
-							else return self::check_version(true);
2674 
+							if ($error != '') {
2675 
+								return $error;
2676 
+							} else {
2677 
+								return self::check_version(true);
2678 
+							}
2400 2679 
 						} elseif ($result['value'] == '46') {
2401 2680 
 							$error = self::update_from_46();
2402 
-							if ($error != '') return $error;
2403 
-							else return self::check_version(true);
2404 
-						} else return '';
2681 
+							if ($error != '') {
2682 
+								return $error;
2683 
+							} else {
2684 
+								return self::check_version(true);
2685 
+							}
2686 
+						} else {
2687 
+							return '';
2688 
+						}
2405 2689 
 					} else {
2406 
-						if (isset($result['value']) && $result['value'] != '') return $result['value'];
2407 
-						else return 0;
2690 
+						if (isset($result['value']) && $result['value'] != '') {
2691 
+							return $result['value'];
2692 
+						} else {
2693 
+							return 0;
2694 
+						}
2408 2695 
 					}
2409 2696 
 				}
2410 
-			} else return $version;
2697 
+			} else {
2698 
+				return $version;
2699 
+			}
2411 2700 
 		}
2412 2701 
 	}
2413 2702 
 }
Please login to merge, or discard this patch.
search.php 2 patches
Spacing   +102 added lines, -102 removed lines patch added patch discarded remove patch 
@@ -26,24 +26,24 @@  discard block
 
 block discarded – undo
26 26 
 $sql_date = '';
27 27 
 if (isset($_GET['start_date'])) {
28 28 
 	//for the date manipulation into the query
29 
-	if($_GET['start_date'] != "" && $_GET['end_date'] != ""){
29 
+	if ($_GET['start_date'] != "" && $_GET['end_date'] != "") {
30 30 
 		if (strtotime($_GET['start_date']) !== false && strtotime($_GET['end_date']) !== false) {
31 31 
 			//$start_date = $_GET['start_date']." 00:00:00";
32 
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
32 
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
33 33 
 			//$end_date = $_GET['end_date']." 00:00:00";
34 
-			$end_date = date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
34 
+			$end_date = date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
35 35 
 			$sql_date = $start_date.",".$end_date;
36 36 
 		}
37 
-	} else if($_GET['start_date'] != ""){
37 
+	} else if ($_GET['start_date'] != "") {
38 38 
 		if (strtotime($_GET['start_date']) !== false) {
39 39 
 			//$start_date = $_GET['start_date']." 00:00:00";
40 
-			$start_date = date("Y-m-d",strtotime($_GET['start_date']))." 00:00:00";
40 
+			$start_date = date("Y-m-d", strtotime($_GET['start_date']))." 00:00:00";
41 41 
 			$sql_date = $start_date;
42 42 
 		}
43 
-	} else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){
43 
+	} else if ($_GET['start_date'] == "" && $_GET['end_date'] != "") {
44 44 
 		if (strtotime($_GET['end_date']) !== false) {
45 45 
 			//$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date']." 00:00:00";
46 
-			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
46 
+			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d", strtotime($_GET['end_date']))." 00:00:00";
47 47 
 			$sql_date = $end_date;
48 48 
 		}
49 49 
 	} else $sql_date = '';
 
@@ -51,21 +51,21 @@  discard block
 
 block discarded – undo
51 51
52 52 
 if (isset($_GET['highest_altitude'])) {
53 53 
 	//for altitude manipulation
54 
-	if($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != ""){
55 
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
56 
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT);
54 
+	if ($_GET['highest_altitude'] != "" && $_GET['lowest_altitude'] != "") {
55 
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
56 
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT);
57 57 
 		$sql_altitude = $start_altitude.",".$end_altitude;
58 
-	} else if($_GET['highest_altitude'] != ""){
59 
-		$end_altitude = filter_input(INPUT_GET,'highest_altitude',FILTER_SANITIZE_NUMBER_INT);
58 
+	} else if ($_GET['highest_altitude'] != "") {
59 
+		$end_altitude = filter_input(INPUT_GET, 'highest_altitude', FILTER_SANITIZE_NUMBER_INT);
60 60 
 		$sql_altitude = $end_altitude;
61 
-	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
62 
-		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
61 
+	} else if ($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != "") {
62 
+		$start_altitude = filter_input(INPUT_GET, 'lowest_altitude', FILTER_SANITIZE_NUMBER_INT).",60000";
63 63 
 		$sql_altitude = $start_altitude;
64 64 
 	} else $sql_altitude = '';
65 65 
 } else $sql_altitude = '';
66 66
67 67 
 //calculuation for the pagination
68 
-if(!isset($_GET['limit']))
68 
+if (!isset($_GET['limit']))
69 69 
 {
70 70 
 	if (!isset($_GET['number_results']))
71 71 
 	{
 
@@ -73,17 +73,17 @@  discard block
 
 block discarded – undo
73 73 
 		$limit_end = 25;
74 74 
 		$absolute_difference = 25;
75 75 
 	} else {
76 
-		if ($_GET['number_results'] > 1000){
76 
+		if ($_GET['number_results'] > 1000) {
77 77 
 			$_GET['number_results'] = 1000;
78 78 
 		}
79 79 
 		$limit_start = 0;
80 
-		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
81 
-		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
80 
+		$limit_end = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
81 
+		$absolute_difference = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
82 82 
 	}
83 
-}  else {
83 
+} else {
84 84 
 	$limit_explode = explode(",", $_GET['limit']);
85 
-	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
86 
-	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
85 
+	$limit_start = filter_var($limit_explode[0], FILTER_SANITIZE_NUMBER_INT);
86 
+	$limit_end = filter_var($limit_explode[1], FILTER_SANITIZE_NUMBER_INT);
87 87 
 }
88 88 
 $absolute_difference = abs($limit_start - $limit_end);
89 89 
 $limit_next = $limit_end + $absolute_difference;
 
@@ -112,31 +112,31 @@  discard block
 
 block discarded – undo
112 112 
     ((isset($_GET['origlat']) && $_GET['origlat'] != '') &&
113 113 
     (isset($_GET['origlon']) && $_GET['origlon'] != '') &&
114 114 
     (isset($_GET['dist']) && $_GET['dist'] != ''))
115 
-    ){
116 
-	$q = filter_input(INPUT_GET, 'q',FILTER_SANITIZE_STRING);
117 
-	$registration = filter_input(INPUT_GET, 'registration',FILTER_SANITIZE_STRING);
118 
-	$aircraft = filter_input(INPUT_GET, 'aircraft',FILTER_SANITIZE_STRING);
119 
-	$manufacturer = filter_input(INPUT_GET, 'manufacturer',FILTER_SANITIZE_STRING);
120 
-	$highlights = filter_input(INPUT_GET, 'highlights',FILTER_SANITIZE_STRING);
121 
-	$airline = filter_input(INPUT_GET, 'airline',FILTER_SANITIZE_STRING);
122 
-	$airline_country = filter_input(INPUT_GET, 'airline_country',FILTER_SANITIZE_STRING);
123 
-	$airline_type = filter_input(INPUT_GET, 'airline_type',FILTER_SANITIZE_STRING);
124 
-	$airport = filter_input(INPUT_GET, 'airport',FILTER_SANITIZE_STRING);
125 
-	$airport_country = filter_input(INPUT_GET, 'airport_country',FILTER_SANITIZE_STRING);
126 
-	$callsign = filter_input(INPUT_GET, 'callsign',FILTER_SANITIZE_STRING);
127 
-	$owner = filter_input(INPUT_GET, 'owner',FILTER_SANITIZE_STRING);
128 
-	$pilot_name = filter_input(INPUT_GET, 'pilot_name',FILTER_SANITIZE_STRING);
129 
-	$pilot_id = filter_input(INPUT_GET, 'pilot_id',FILTER_SANITIZE_STRING);
130 
-	$mmsi = filter_input(INPUT_GET, 'mmsi',FILTER_SANITIZE_NUMBER_INT);
131 
-	$imo = filter_input(INPUT_GET, 'imo',FILTER_SANITIZE_NUMBER_INT);
132 
-	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route',FILTER_SANITIZE_STRING);
133 
-	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route',FILTER_SANITIZE_STRING);
134 
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
135 
-	$archive = filter_input(INPUT_GET,'archive',FILTER_SANITIZE_NUMBER_INT);
136 
-	$origlat = filter_input(INPUT_GET,'origlat',FILTER_SANITIZE_NUMBER_FLOAT);
137 
-	$origlon = filter_input(INPUT_GET,'origlon',FILTER_SANITIZE_NUMBER_FLOAT);
138 
-	$dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT);
139 
-	$number_results = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
115 
+    ) {
116 
+	$q = filter_input(INPUT_GET, 'q', FILTER_SANITIZE_STRING);
117 
+	$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
118 
+	$aircraft = filter_input(INPUT_GET, 'aircraft', FILTER_SANITIZE_STRING);
119 
+	$manufacturer = filter_input(INPUT_GET, 'manufacturer', FILTER_SANITIZE_STRING);
120 
+	$highlights = filter_input(INPUT_GET, 'highlights', FILTER_SANITIZE_STRING);
121 
+	$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
122 
+	$airline_country = filter_input(INPUT_GET, 'airline_country', FILTER_SANITIZE_STRING);
123 
+	$airline_type = filter_input(INPUT_GET, 'airline_type', FILTER_SANITIZE_STRING);
124 
+	$airport = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
125 
+	$airport_country = filter_input(INPUT_GET, 'airport_country', FILTER_SANITIZE_STRING);
126 
+	$callsign = filter_input(INPUT_GET, 'callsign', FILTER_SANITIZE_STRING);
127 
+	$owner = filter_input(INPUT_GET, 'owner', FILTER_SANITIZE_STRING);
128 
+	$pilot_name = filter_input(INPUT_GET, 'pilot_name', FILTER_SANITIZE_STRING);
129 
+	$pilot_id = filter_input(INPUT_GET, 'pilot_id', FILTER_SANITIZE_STRING);
130 
+	$mmsi = filter_input(INPUT_GET, 'mmsi', FILTER_SANITIZE_NUMBER_INT);
131 
+	$imo = filter_input(INPUT_GET, 'imo', FILTER_SANITIZE_NUMBER_INT);
132 
+	$departure_airport_route = filter_input(INPUT_GET, 'departure_airport_route', FILTER_SANITIZE_STRING);
133 
+	$arrival_airport_route = filter_input(INPUT_GET, 'arrival_airport_route', FILTER_SANITIZE_STRING);
134 
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
135 
+	$archive = filter_input(INPUT_GET, 'archive', FILTER_SANITIZE_NUMBER_INT);
136 
+	$origlat = filter_input(INPUT_GET, 'origlat', FILTER_SANITIZE_NUMBER_FLOAT);
137 
+	$origlon = filter_input(INPUT_GET, 'origlon', FILTER_SANITIZE_NUMBER_FLOAT);
138 
+	$dist = filter_input(INPUT_GET, 'dist', FILTER_SANITIZE_NUMBER_INT);
139 
+	$number_results = filter_input(INPUT_GET, 'number_results', FILTER_SANITIZE_NUMBER_INT);
140 140 
 	if ($dist != '') {
141 141 
 		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934;
142 142 
 		elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852;
 
@@ -145,15 +145,15 @@  discard block
 
 block discarded – undo
145 145 
 	if ($archive == 1) {
146 146 
 		if ($type == 'aircraft') {
147 147 
 			$SpotterArchive = new SpotterArchive();
148 
-			$spotter_array = $SpotterArchive->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
148 
+			$spotter_array = $SpotterArchive->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
149 149 
 		}
150 150 
 	} else {
151 151 
 		if ($type == 'aircraft') {
152 
-			$spotter_array = $Spotter->searchSpotterData($q,$registration,$aircraft,strtolower(str_replace("-", " ", $manufacturer)),$highlights,$airline,$airline_country,$airline_type,$airport,$airport_country,$callsign,$departure_airport_route,$arrival_airport_route,$owner,$pilot_id,$pilot_name,$sql_altitude,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
152 
+			$spotter_array = $Spotter->searchSpotterData($q, $registration, $aircraft, strtolower(str_replace("-", " ", $manufacturer)), $highlights, $airline, $airline_country, $airline_type, $airport, $airport_country, $callsign, $departure_airport_route, $arrival_airport_route, $owner, $pilot_id, $pilot_name, $sql_altitude, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
153 153 
 		} elseif ($type == 'tracker') {
154 
-			$spotter_array = $Tracker->searchTrackerData($q,$callsign,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
154 
+			$spotter_array = $Tracker->searchTrackerData($q, $callsign, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
155 155 
 		} elseif ($type == 'marine') {
156 
-			$spotter_array = $Marine->searchMarineData($q,$callsign,$mmsi,$imo,$sql_date,$limit_start.",".$absolute_difference,$sort,'',$origlat,$origlon,$dist);
156 
+			$spotter_array = $Marine->searchMarineData($q, $callsign, $mmsi, $imo, $sql_date, $limit_start.",".$absolute_difference, $sort, '', $origlat, $origlon, $dist);
157 157 
 		}
158 158 
 	}
159 159 
 	 
@@ -189,12 +189,12 @@  discard block
 
 block discarded – undo
189 189 
 	//remove 3D=true parameter
190 190 
 	$no3D = str_replace("&3D=true", "", $_SERVER['QUERY_STRING']);
191 191 
 	$kmlURL = str_replace("http://", "kml://", $globalURL);
192 
-	if (!isset($_GET['3D'])){
192 
+	if (!isset($_GET['3D'])) {
193 193 
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'" class="active"><i class="fa fa-table"></i> '._("Table").'</a></li>';
194 194 
 	} else {
195 195 
 		print '<li><span class="notablet"><a href="'.$globalURL.'/search?'.$no3D.'"><i class="fa fa-table"></i> '._("Table").'</a></span></li>';
196 196 
 	}
197 
-	if (isset($_GET['3D'])){
197 
+	if (isset($_GET['3D'])) {
198 198 
 		print '<li><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="active"><i class="fa fa-globe"></i> '._("3D Map").'</a></li>';
199 199 
 	} else {
200 200 
 		print '<li ><a href="'.$globalURL.'/search?'.$no3D.'&3D=true" class="notablet nomobile"><i class="fa fa-globe"></i> '._("3D Map").'</a><a href="'.$kmlURL.'/search/kml?'.htmlentities($_SERVER['QUERY_STRING']).'" class="tablet mobile"><i class="fa fa-globe"></i> 3D Map</a></li>';
 
@@ -215,32 +215,32 @@  discard block
 
 block discarded – undo
215 215 
 		print '<div class="column">';
216 216 
 		print '<div class="info">';
217 217 
 		print '<h1>'._("Search Results for").' ';
218 
-		if (isset($_GET['q']) && $_GET['q'] != ""){ print _("Keyword:").' <span>'.$q.'</span> '; }
219 
-		if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
220 
-		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
221 
-		if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$registration.'</span> '; }
222 
-		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; }
223 
-		if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$airline.'</span> '; }
224 
-		if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$airline_country.'</span> '; }
225 
-		if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$airline_type.'</span> '; }
226 
-		if (isset($_GET['airport']) && $_GET['airport'] != ""){ print _("Airport:").' <span>'.$airport.'</span> '; }
227 
-		if (isset($_GET['airport_country']) && $_GET['airport_country'] != ""){ print _("Airport country:").' <span>'.$airport_country.'</span> '; }
228 
-		if (isset($_GET['callsign']) && $_GET['callsign'] != ""){ print _("Callsign:").' <span>'.$callsign.'</span> '; }
229 
-		if (isset($_GET['owner']) && $_GET['owner'] != ""){ print _("Owner:").' <span>'.$owner.'</span> '; }
230 
-		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != ""){ print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
231 
-		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != ""){ print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
232 
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")){ print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
233 
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
234 
-		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != ""){ print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
235 
-		if (isset($_GET['mmsi']) && $_GET['mmsi'] != ""){ print _("MMSI:").' <span>'.$mmsi.'</span> '; }
236 
-		if (isset($_GET['imo']) && $_GET['imo'] != ""){ print _("IMO:").' <span>'.$imo.'</span> '; }
237 
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == ""){ print _("Date starting at:").' <span>'.$start_date.'</span> '; }
238 
-		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date ending at:").' <span>'.$end_date.'</span> '; }
239 
-		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != ""){ print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
240 
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == ""){ print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
241 
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
242 
-		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != ""){ print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
243 
-		if (isset($_GET['number_results']) && $_GET['number_results'] != ""){ print _("limit per page:").' <span>'.$number_results.'</span> '; }
218 
+		if (isset($_GET['q']) && $_GET['q'] != "") { print _("Keyword:").' <span>'.$q.'</span> '; }
219 
+		if (isset($_GET['aircraft']) && $_GET['aircraft'] != "") { print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
220 
+		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != "") { print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
221 
+		if (isset($_GET['registration']) && $_GET['registration'] != "") { print _("Registration:").' <span>'.$registration.'</span> '; }
222 
+		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print _("Highlights:").' <span>'.$highlights.'</span> '; }
223 
+		if (isset($_GET['airline']) && $_GET['airline'] != "") { print _("Airline:").' <span>'.$airline.'</span> '; }
224 
+		if (isset($_GET['airline_country']) && $_GET['airline_country'] != "") { print _("Airline country:").' <span>'.$airline_country.'</span> '; }
225 
+		if (isset($_GET['airline_type']) && $_GET['airline_type'] != "") { print _("Airline type:").' <span>'.$airline_type.'</span> '; }
226 
+		if (isset($_GET['airport']) && $_GET['airport'] != "") { print _("Airport:").' <span>'.$airport.'</span> '; }
227 
+		if (isset($_GET['airport_country']) && $_GET['airport_country'] != "") { print _("Airport country:").' <span>'.$airport_country.'</span> '; }
228 
+		if (isset($_GET['callsign']) && $_GET['callsign'] != "") { print _("Callsign:").' <span>'.$callsign.'</span> '; }
229 
+		if (isset($_GET['owner']) && $_GET['owner'] != "") { print _("Owner:").' <span>'.$owner.'</span> '; }
230 
+		if (isset($_GET['pilot_id']) && $_GET['pilot_id'] != "") { print _("Pilot id:").' <span>'.$pilot_id.'</span> '; }
231 
+		if (isset($_GET['pilot_name']) && $_GET['pilot_name'] != "") { print _("Pilot name:").' <span>'.$pilot_name.'</span> '; }
232 
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && (!isset($_GET['arrival_airport_route']) || $_GET['arrival_airport_route'] == "")) { print _("Route out of:").' <span>'.$departure_airport_route.'</span> '; }
233 
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] == "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route into:").' <span>'.$arrival_airport_route.'</span> '; }
234 
+		if (isset($_GET['departure_airport_route']) && $_GET['departure_airport_route'] != "" && isset($_GET['arrival_airport_route']) && $_GET['arrival_airport_route'] != "") { print _("Route between:").' <span>'.$departure_airport_route.'</span> and <span>'.$_GET['arrival_airport_route'].'</span> '; }
235 
+		if (isset($_GET['mmsi']) && $_GET['mmsi'] != "") { print _("MMSI:").' <span>'.$mmsi.'</span> '; }
236 
+		if (isset($_GET['imo']) && $_GET['imo'] != "") { print _("IMO:").' <span>'.$imo.'</span> '; }
237 
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] == "") { print _("Date starting at:").' <span>'.$start_date.'</span> '; }
238 
+		if (isset($_GET['start_date']) && $_GET['start_date'] == "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date ending at:").' <span>'.$end_date.'</span> '; }
239 
+		if (isset($_GET['start_date']) && $_GET['start_date'] != "" && isset($_GET['end_date']) && $_GET['end_date'] != "") { print _("Date between:").' <span>'.$start_date.'</span> and <span>'.$end_date.'</span> '; }
240 
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == "") { print _("Altitude starting at:").' <span>'.number_format($lowest_altitude).' feet</span> '; }
241 
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude ending at:").' <span>'.number_format($highest_altitude).' feet</span> '; }
242 
+		if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] != "" && isset($_GET['highest_altitude']) && $_GET['highest_altitude'] != "") { print _("Altitude between:").' <span>'.number_format($lowest_altitude).' feet</span> '._("and").' <span>'.number_format($highest_altitude).' feet</span> '; }
243 
+		if (isset($_GET['number_results']) && $_GET['number_results'] != "") { print _("limit per page:").' <span>'.$number_results.'</span> '; }
244 244 
 		print '</h1>';
245 245 
 		print '</div>';
246 246 
 
@@ -374,7 +374,7 @@  discard block
 
 block discarded – undo
374 374 
 					    </select>
375 375 
 					</div>
376 376 
 				</div>
377 
-				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
377 
+				<script type="text/javascript">getSelect('manufacturer','<?php if (isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
378 378 
 				<div class="form-group">
379 379 
 					<label class="control-label col-sm-2"><?php echo _("Type"); ?></label>
380 380 
 						<div class="col-sm-10">
 
@@ -383,7 +383,7 @@  discard block
 
 block discarded – undo
383 383 
 							</select>
384 384 
 						</div>
385 385 
 				</div>
386 
-				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
386 
+				<script type="text/javascript">getSelect('aircrafttypes','<?php if (isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
387 387 
 				<div class="form-group">
388 388 
 					<label class="control-label col-sm-2"><?php echo _("Registration"); ?></label>
389 389 
 					<div class="col-sm-10">
 
@@ -406,7 +406,7 @@  discard block
 
 block discarded – undo
406 406 
 					</div>
407 407 
 				</div>
408 408 
 <?php
409 
-	}else {
409 
+	} else {
410 410 
 ?>
411 411 
 				<div class="form-group">
412 412 
 					<label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label> 
@@ -419,8 +419,8 @@  discard block
 
 block discarded – undo
419 419 
 ?>
420 420 
 				<div class="form-group">
421 421 
 					<div class="col-sm-offset-2 col-sm-10">
422 
-					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
423 
-					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
422 
+					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
423 
+					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true") { print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
424 424 
 					</div>
425 425 
 				</div>
426 426 
 			</fieldset>
 
@@ -434,7 +434,7 @@  discard block
 
 block discarded – undo
434 434 
 						</select>
435 435 
 					</div>
436 436 
 				</div>
437 
-				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $airline; ?>');</script>
437 
+				<script type="text/javascript">getSelect('airlinenames','<?php if (isset($_GET['airline'])) print $airline; ?>');</script>
438 438 
 				<div class="form-group">
439 439 
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label>
440 440 
 					<div class="col-sm-10">
 
@@ -443,7 +443,7 @@  discard block
 
 block discarded – undo
443 443 
 						</select>
444 444 
 					</div>
445 445 
 				</div>
446 
-				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $airline_country; ?>');</script>
446 
+				<script type="text/javascript">getSelect('airlinecountries','<?php if (isset($_GET['airline_country'])) print $airline_country; ?>');</script>
447 447 
 				<div class="form-group">
448 448 
 					<label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label>
449 449 
 					<div class="col-sm-10">
 
@@ -452,10 +452,10 @@  discard block
 
 block discarded – undo
452 452 
 				</div>
453 453 
 				<div class="form-group">
454 454 
 					<div class="col-sm-offset-2 col-sm-10">
455 
-						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
456 
-						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
457 
-						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
458 
-						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
455 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all") { print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
456 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger") { print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
457 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "cargo") { print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
458 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "military") { print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
459 459 
 					</div>
460 460 
 				</div>
461 461 
 			</fieldset>
 
@@ -469,7 +469,7 @@  discard block
 
 block discarded – undo
469 469 
 						</select>
470 470 
 					</div>
471 471 
 				</div>
472 
-				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
472 
+				<script type="text/javascript">getSelect('airportnames','<?php if (isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
473 473 
 				<div class="form-group">
474 474 
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label>
475 475 
 					<div class="col-sm-10">
 
@@ -478,7 +478,7 @@  discard block
 
 block discarded – undo
478 478 
 						</select>
479 479 
 					</div>
480 480 
 				</div>
481 
-				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $airport_country; ?>');</script>
481 
+				<script type="text/javascript">getSelect('airportcountries','<?php if (isset($_GET['airport_country'])) print $airport_country; ?>');</script>
482 482 
 			</fieldset>
483 483 
 			<fieldset>
484 484 
 				<legend><?php echo _("Route"); ?></legend>
 
@@ -490,7 +490,7 @@  discard block
 
 block discarded – undo
490 490 
 						</select>
491 491 
 					</div>
492 492 
 				</div>
493 
-				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
493 
+				<script type="text/javascript">getSelect('departureairportnames','<?php if (isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
494 494 
 				<div class="form-group">
495 495 
 					<label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label>
496 496 
 					<div class="col-sm-10">
 
@@ -499,7 +499,7 @@  discard block
 
 block discarded – undo
499 499 
 						</select>
500 500 
 					</div>
501 501 
 				</div>
502 
-				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
502 
+				<script type="text/javascript">getSelect('arrivalairportnames','<?php if (isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
503 503 
 			</fieldset>
504 504 
 			<fieldset>
505 505 
 				<legend>Altitude</legend>
 
@@ -510,9 +510,9 @@  discard block
 
 block discarded – undo
510 510 
 							<option></option>
511 511 
 <?php
512 512 
 $altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
513 
-foreach($altitude_array as $altitude)
513 
+foreach ($altitude_array as $altitude)
514 514 
 {
515 
-	if(isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
515 
+	if (isset($_GET['lowest_altitude']) && $_GET['lowest_altitude'] == $altitude)
516 516 
 	{
517 517 
 		print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
518 518 
 	} else {
 
@@ -530,9 +530,9 @@  discard block
 
 block discarded – undo
530 530 
 							<option></option>
531 531 
 <?php
532 532 
 	$altitude_array = Array(1000, 5000, 10000, 15000, 20000, 25000, 30000, 35000, 40000, 45000, 50000);
533 
-	foreach($altitude_array as $altitude)
533 
+	foreach ($altitude_array as $altitude)
534 534 
 	{
535 
-		if(isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
535 
+		if (isset($_GET['highest_altitude']) && $_GET['highest_altitude'] == $altitude)
536 536 
 		{
537 537 
 			print '<option value="'.$altitude.'" selected="selected">'.number_format($altitude).' feet</option>';
538 538 
 		} else {
 
@@ -655,10 +655,10 @@  discard block
 
 block discarded – undo
655 655 
 				<div class="col-sm-10">
656 656 
 					<select class="form-control" name="number_results">
657 657 
 <?php
658 
-$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500,  600, 700, 800, 900, 1000);
659 
-foreach($number_results_array as $number)
658 
+$number_results_array = Array(25, 50, 100, 150, 200, 250, 300, 400, 500, 600, 700, 800, 900, 1000);
659 
+foreach ($number_results_array as $number)
660 660 
 {
661 
-	if(isset($_GET['number_results']) && $_GET['number_results'] == $number)
661 
+	if (isset($_GET['number_results']) && $_GET['number_results'] == $number)
662 662 
 	{
663 663 
 		print '<option value="'.$number.'" selected="selected">'.$number.'</option>';
664 664 
 	} else {
 
@@ -677,7 +677,7 @@  discard block
 
 block discarded – undo
677 677 
 		<fieldset>
678 678 
 			<div class="form-group">
679 679 
 				<div class="col-sm-offset-2 col-sm-10">
680 
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
680 
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" disabled /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
681 681 
 					<p class="help-block">Disabled in demo</p>
682 682 
 				</div>
683 683 
 			</div>
 
@@ -688,7 +688,7 @@  discard block
 
 block discarded – undo
688 688 
 		<fieldset>
689 689 
 			<div class="form-group">
690 690 
 				<div class="col-sm-offset-2 col-sm-10">
691 
-					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"),$globalArchiveKeepMonths); ?></label>
691 
+					<label class="checkbox-inline"><input type="checkbox" name="archive" value="1" /><?php echo sprintf(_("Search in archive (older than %s months)"), $globalArchiveKeepMonths); ?></label>
692 692 
 				</div>
693 693 
 			</div>
694 694 
 		</fieldset>
Please login to merge, or discard this patch.
Braces   +142 added lines, -39 removed lines patch added patch discarded remove patch 
@@ -46,8 +46,10 @@  discard block
 
 block discarded – undo
46 46 
 			$end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".date("Y-m-d",strtotime($_GET['end_date']))." 00:00:00";
47 47 
 			$sql_date = $end_date;
48 48 
 		}
49 
-	} else $sql_date = '';
50 
-}
49 
+	} else {
50 
+		$sql_date = '';
51 
+	}
52 
+	}
51 53
52 54 
 if (isset($_GET['highest_altitude'])) {
53 55 
 	//for altitude manipulation
 
@@ -61,8 +63,12 @@  discard block
 
 block discarded – undo
61 63 
 	} else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){
62 64 
 		$start_altitude = filter_input(INPUT_GET,'lowest_altitude',FILTER_SANITIZE_NUMBER_INT).",60000";
63 65 
 		$sql_altitude = $start_altitude;
64 
-	} else $sql_altitude = '';
65 
-} else $sql_altitude = '';
66 
+	} else {
67 
+		$sql_altitude = '';
68 
+	}
69 
+	} else {
70 
+	$sql_altitude = '';
71 
+}
66 72
67 73 
 //calculuation for the pagination
68 74 
 if(!isset($_GET['limit']))
 
@@ -80,7 +86,7 @@  discard block
 
 block discarded – undo
80 86 
 		$limit_end = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
81 87 
 		$absolute_difference = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
82 88 
 	}
83 
-}  else {
89 
+} else {
84 90 
 	$limit_explode = explode(",", $_GET['limit']);
85 91 
 	$limit_start = filter_var($limit_explode[0],FILTER_SANITIZE_NUMBER_INT);
86 92 
 	$limit_end = filter_var($limit_explode[1],FILTER_SANITIZE_NUMBER_INT);
 
@@ -138,10 +144,15 @@  discard block
 
 block discarded – undo
138 144 
 	$dist = filter_input(INPUT_GET,'dist',FILTER_SANITIZE_NUMBER_INT);
139 145 
 	$number_results = filter_input(INPUT_GET,'number_results',FILTER_SANITIZE_NUMBER_INT);
140 146 
 	if ($dist != '') {
141 
-		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') $dist = $dist*1.60934;
142 
-		elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') $dist = $dist*1.852;
147 
+		if (isset($globalDistanceUnit) && $globalDistanceUnit == 'mi') {
148 
+			$dist = $dist*1.60934;
149 
+		} elseif (isset($globalDistanceUnit) && $globalDistanceUnit == 'nm') {
150 
+			$dist = $dist*1.852;
151 
+		}
152 
+	}
153 
+	if (!isset($sql_date)) {
154 
+		$sql_date = '';
143 155 
 	}
144 
-	if (!isset($sql_date)) $sql_date = '';
145 156 
 	if ($archive == 1) {
146 157 
 		if ($type == 'aircraft') {
147 158 
 			$SpotterArchive = new SpotterArchive();
 
@@ -219,7 +230,10 @@  discard block
 
 block discarded – undo
219 230 
 		if (isset($_GET['aircraft']) && $_GET['aircraft'] != ""){ print _("Aircraft:").' <span>'.$aircraft.'</span> '; }
220 231 
 		if (isset($_GET['manufacturer']) && $_GET['manufacturer'] != ""){ print _("Manufacturer:").' <span>'.$manufacturer.'</span> '; }
221 232 
 		if (isset($_GET['registration']) && $_GET['registration'] != ""){ print _("Registration:").' <span>'.$registration.'</span> '; }
222 
-		if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> '; }
233 
+		if (isset($_GET['highlights'])) {
234 
+			if ($_GET['highlights'] == "true"){ print _("Highlights:").' <span>'.$highlights.'</span> ';
235 
+		}
236 
+		}
223 237 
 		if (isset($_GET['airline']) && $_GET['airline'] != ""){ print _("Airline:").' <span>'.$airline.'</span> '; }
224 238 
 		if (isset($_GET['airline_country']) && $_GET['airline_country'] != ""){ print _("Airline country:").' <span>'.$airline_country.'</span> '; }
225 239 
 		if (isset($_GET['airline_type']) && $_GET['airline_type'] != ""){ print _("Airline type:").' <span>'.$airline_type.'</span> '; }
 
@@ -355,7 +369,10 @@  discard block
 
 block discarded – undo
355 369 
 			<div class="form-group">
356 370 
 				<label class="control-label col-sm-2"><?php echo _("Keywords"); ?></label>
357 371 
 				<div class="col-sm-10">
358 
-					<input type="text" class="form-control" id="q" name="q" value="<?php if (isset($_GET['q'])) print $q; ?>" size="10" placeholder="<?php echo _("Keywords"); ?>" />
372 
+					<input type="text" class="form-control" id="q" name="q" value="<?php if (isset($_GET['q'])) {
373 
+	print $q;
374 
+}
375 
+?>" size="10" placeholder="<?php echo _("Keywords"); ?>" />
359 376 
 				</div>
360 377 
 			</div>
361 378 
 		</fieldset>
 
@@ -374,7 +391,10 @@  discard block
 
 block discarded – undo
374 391 
 					    </select>
375 392 
 					</div>
376 393 
 				</div>
377 
-				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) print $manufacturer; ?>')</script>
394 
+				<script type="text/javascript">getSelect('manufacturer','<?php if(isset($_GET['manufacturer'])) {
395 
+	print $manufacturer;
396 
+}
397 
+?>')</script>
378 398 
 				<div class="form-group">
379 399 
 					<label class="control-label col-sm-2"><?php echo _("Type"); ?></label>
380 400 
 						<div class="col-sm-10">
 
@@ -383,11 +403,17 @@  discard block
 
 block discarded – undo
383 403 
 							</select>
384 404 
 						</div>
385 405 
 				</div>
386 
-				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) print $aircraft_icao; ?>');</script>
406 
+				<script type="text/javascript">getSelect('aircrafttypes','<?php if(isset($_GET['aircraft_icao'])) {
407 
+	print $aircraft_icao;
408 
+}
409 
+?>');</script>
387 410 
 				<div class="form-group">
388 411 
 					<label class="control-label col-sm-2"><?php echo _("Registration"); ?></label>
389 412 
 					<div class="col-sm-10">
390 
-						<input type="text" class="form-control" name="registration" value="<?php if (isset($_GET['registration'])) print $registration; ?>" size="8" placeholder="<?php echo _("Registration"); ?>" />
413 
+						<input type="text" class="form-control" name="registration" value="<?php if (isset($_GET['registration'])) {
414 
+	print $registration;
415 
+}
416 
+?>" size="8" placeholder="<?php echo _("Registration"); ?>" />
391 417 
 					</div>
392 418 
 				</div>
393 419 
 <?php
 
@@ -396,22 +422,31 @@  discard block
 
 block discarded – undo
396 422 
 				<div class="form-group">
397 423 
 					<label class="control-label col-sm-2"><?php echo _("Pilot id"); ?></label>
398 424 
 					<div class="col-sm-10">
399 
-						<input type="text" class="form-control" name="pilot_id" value="<?php if (isset($_GET['pilot_id'])) print $pilot_id; ?>" size="15" placeholder="<?php echo _("Pilot id"); ?>" />
425 
+						<input type="text" class="form-control" name="pilot_id" value="<?php if (isset($_GET['pilot_id'])) {
426 
+	print $pilot_id;
427 
+}
428 
+?>" size="15" placeholder="<?php echo _("Pilot id"); ?>" />
400 429 
 					</div>
401 430 
 				</div>
402 431 
 				<div class="form-group">
403 432 
 					<label class="control-label col-sm-2"><?php echo _("Pilot name"); ?></label>
404 433 
 					<div class="col-sm-10">
405 
-						<input type="text" class="form-control" name="pilot_name" value="<?php if (isset($_GET['pilot_name'])) print $pilot_name; ?>" size="15" placeholder="<?php echo _("Pilot name"); ?>" />
434 
+						<input type="text" class="form-control" name="pilot_name" value="<?php if (isset($_GET['pilot_name'])) {
435 
+	print $pilot_name;
436 
+}
437 
+?>" size="15" placeholder="<?php echo _("Pilot name"); ?>" />
406 438 
 					</div>
407 439 
 				</div>
408 440 
 <?php
409 
-	}else {
441 
+	} else {
410 442 
 ?>
411 443 
 				<div class="form-group">
412 444 
 					<label class="control-label col-sm-2"><?php echo _("Owner name"); ?></label>
413 445 
 					<div class="col-sm-10">
414 
-						<input type="text" class="form-control" name="owner" value="<?php if (isset($_GET['owner'])) print $owner; ?>" size="15" placeholder="<?php echo _("Owner name"); ?>" />
446 
+						<input type="text" class="form-control" name="owner" value="<?php if (isset($_GET['owner'])) {
447 
+	print $owner;
448 
+}
449 
+?>" size="15" placeholder="<?php echo _("Owner name"); ?>" />
415 450 
 					</div>
416 451 
 				</div>
417 452 
 <?php
 
@@ -419,8 +454,14 @@  discard block
 
 block discarded – undo
419 454 
 ?>
420 455 
 				<div class="form-group">
421 456 
 					<div class="col-sm-offset-2 col-sm-10">
422 
-					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
423 
-					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) if ($_GET['highlights'] == "true"){ print 'checked="checked"'; } ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
457 
+					<!--<div><input type="checkbox" class="form-control" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) {
458 
+	if ($_GET['highlights'] == "true"){ print 'checked="checked"';
459 
+}
460 
+} ?>> <label for="highlights"><?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label></div>-->
461 
+					<label class="checkbox-inline"><input type="checkbox" name="highlights" value="true" id="highlights" <?php if (isset($_GET['highlights'])) {
462 
+	if ($_GET['highlights'] == "true"){ print 'checked="checked"';
463 
+}
464 
+} ?>> <?php echo _("Include only aircrafts with special highlights (unique liveries, destinations etc.)"); ?></label>
424 465 
 					</div>
425 466 
 				</div>
426 467 
 			</fieldset>
 
@@ -434,7 +475,10 @@  discard block
 
 block discarded – undo
434 475 
 						</select>
435 476 
 					</div>
436 477 
 				</div>
437 
-				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) print $airline; ?>');</script>
478 
+				<script type="text/javascript">getSelect('airlinenames','<?php if(isset($_GET['airline'])) {
479 
+	print $airline;
480 
+}
481 
+?>');</script>
438 482 
 				<div class="form-group">
439 483 
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label>
440 484 
 					<div class="col-sm-10">
 
@@ -443,19 +487,34 @@  discard block
 
 block discarded – undo
443 487 
 						</select>
444 488 
 					</div>
445 489 
 				</div>
446 
-				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) print $airline_country; ?>');</script>
490 
+				<script type="text/javascript">getSelect('airlinecountries','<?php if(isset($_GET['airline_country'])) {
491 
+	print $airline_country;
492 
+}
493 
+?>');</script>
447 494 
 				<div class="form-group">
448 495 
 					<label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label>
449 496 
 					<div class="col-sm-10">
450 
-						<input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) print $callsign; ?>" size="8" placeholder="<?php echo _("Callsign"); ?>" />
497 
+						<input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) {
498 
+	print $callsign;
499 
+}
500 
+?>" size="8" placeholder="<?php echo _("Callsign"); ?>" />
451 501 
 					</div>
452 502 
 				</div>
453 503 
 				<div class="form-group">
454 504 
 					<div class="col-sm-offset-2 col-sm-10">
455 505 
 						<label class="radio-inline"><input type="radio" name="airline_type" value="all" id="airline_type_all" <?php if (!isset($_GET['airline_type']) || $_GET['airline_type'] == "all"){ print 'checked="checked"'; } ?>> <?php echo _("All airlines types"); ?></label>
456 
-						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"'; } ?>> <?php echo _("Only Passenger airlines"); ?></label>
457 
-						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"'; } ?>> <?php echo _("Only Cargo airlines"); ?></label>
458 
-						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) if ( $_GET['airline_type'] == "military"){ print 'checked="checked"'; } ?>> <?php echo _("Only Military airlines"); ?></label>
506 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="passenger" id="airline_type_passenger" <?php if (isset($_GET['airline_type'])) {
507 
+	if ($_GET['airline_type'] == "passenger"){ print 'checked="checked"';
508 
+}
509 
+} ?>> <?php echo _("Only Passenger airlines"); ?></label>
510 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="cargo" id="airline_type_cargo" <?php if (isset($_GET['airline_type'])) {
511 
+	if ( $_GET['airline_type'] == "cargo"){ print 'checked="checked"';
512 
+}
513 
+} ?>> <?php echo _("Only Cargo airlines"); ?></label>
514 
+						<label class="radio-inline"><input type="radio" name="airline_type" value="military" id="airline_type_military" <?php if (isset($_GET['airline_type'])) {
515 
+	if ( $_GET['airline_type'] == "military"){ print 'checked="checked"';
516 
+}
517 
+} ?>> <?php echo _("Only Military airlines"); ?></label>
459 518 
 					</div>
460 519 
 				</div>
461 520 
 			</fieldset>
 
@@ -469,7 +528,10 @@  discard block
 
 block discarded – undo
469 528 
 						</select>
470 529 
 					</div>
471 530 
 				</div>
472 
-				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) print $airport_icao; ?>');</script>
531 
+				<script type="text/javascript">getSelect('airportnames','<?php if(isset($_GET['airport_icao'])) {
532 
+	print $airport_icao;
533 
+}
534 
+?>');</script>
473 535 
 				<div class="form-group">
474 536 
 					<label class="control-label col-sm-2"><?php echo _("Country"); ?></label>
475 537 
 					<div class="col-sm-10">
 
@@ -478,7 +540,10 @@  discard block
 
 block discarded – undo
478 540 
 						</select>
479 541 
 					</div>
480 542 
 				</div>
481 
-				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) print $airport_country; ?>');</script>
543 
+				<script type="text/javascript">getSelect('airportcountries','<?php if(isset($_GET['airport_country'])) {
544 
+	print $airport_country;
545 
+}
546 
+?>');</script>
482 547 
 			</fieldset>
483 548 
 			<fieldset>
484 549 
 				<legend><?php echo _("Route"); ?></legend>
 
@@ -490,7 +555,10 @@  discard block
 
 block discarded – undo
490 555 
 						</select>
491 556 
 					</div>
492 557 
 				</div>
493 
-				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) print $departure_airport_route; ?>');</script>
558 
+				<script type="text/javascript">getSelect('departureairportnames','<?php if(isset($_GET['departure_airport_route'])) {
559 
+	print $departure_airport_route;
560 
+}
561 
+?>');</script>
494 562 
 				<div class="form-group">
495 563 
 					<label class="control-label col-sm-2"><?php echo _("Arrival Airport"); ?></label>
496 564 
 					<div class="col-sm-10">
 
@@ -499,7 +567,10 @@  discard block
 
 block discarded – undo
499 567 
 						</select>
500 568 
 					</div>
501 569 
 				</div>
502 
-				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) print $arrival_airport_route; ?>');</script>
570 
+				<script type="text/javascript">getSelect('arrivalairportnames','<?php if(isset($_GET['arrival_airport_route'])) {
571 
+	print $arrival_airport_route;
572 
+}
573 
+?>');</script>
503 574 
 			</fieldset>
504 575 
 			<fieldset>
505 576 
 				<legend>Altitude</legend>
 
@@ -549,19 +620,33 @@  discard block
 
 block discarded – undo
549 620 
 				<div class="form-group">
550 621 
 					<label class="control-label col-sm-2"><?php echo _("Latitude"); ?></label>
551 622 
 					<div class="col-sm-10">
552 
-						<input type="text" name="origlat" class="form-control" placeholder="<?php echo _("Center point latitude"); ?>" value="<?php if (isset($_GET['origlat'])) print $origlat; ?>" />
623 
+						<input type="text" name="origlat" class="form-control" placeholder="<?php echo _("Center point latitude"); ?>" value="<?php if (isset($_GET['origlat'])) {
624 
+	print $origlat;
625 
+}
626 
+?>" />
553 627 
 					</div>
554 628 
 				</div>
555 629 
 				<div class="form-group">
556 630 
 					<label class="control-label col-sm-2"><?php echo _("Longitude"); ?></label>
557 631 
 					<div class="col-sm-10">
558 
-						<input type="text" name="origlon" class="form-control" placeholder="<?php echo _("Center point longitude"); ?>" value="<?php if (isset($_GET['origlon'])) print $origlon; ?>" />
632 
+						<input type="text" name="origlon" class="form-control" placeholder="<?php echo _("Center point longitude"); ?>" value="<?php if (isset($_GET['origlon'])) {
633 
+	print $origlon;
634 
+}
635 
+?>" />
559 636 
 					</div>
560 637 
 				</div>
561 638 
 				<div class="form-group">
562 
-					<label class="control-label col-sm-2"><?php echo _("Distance").' ('; if (isset($globalDistanceUnit)) print $globalDistanceUnit; else print 'km'; print ')'; ?></label>
639 
+					<label class="control-label col-sm-2"><?php echo _("Distance").' ('; if (isset($globalDistanceUnit)) {
640 
+	print $globalDistanceUnit;
641 
+} else {
642 
+	print 'km';
643 
+}
644 
+print ')'; ?></label>
563 645 
 					<div class="col-sm-10">
564 
-						<input type="text" name="dist" class="form-control" placeholder="<?php echo _("Distance from center point"); ?>" value="<?php if (isset($_GET['distance'])) print $distance; ?>" />
646 
+						<input type="text" name="dist" class="form-control" placeholder="<?php echo _("Distance from center point"); ?>" value="<?php if (isset($_GET['distance'])) {
647 
+	print $distance;
648 
+}
649 
+?>" />
565 650 
 					</div>
566 651 
 				</div>
567 652 
 			</fieldset>
 
@@ -572,7 +657,10 @@  discard block
 
 block discarded – undo
572 657 
 				<div class="form-group">
573 658 
 					<label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label>
574 659 
 					<div class="col-sm-10">
575 
-						<input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) print $callsign; ?>" size="8" placeholder="<?php echo _("Callsign"); ?>" />
660 
+						<input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) {
661 
+	print $callsign;
662 
+}
663 
+?>" size="8" placeholder="<?php echo _("Callsign"); ?>" />
576 664 
 					</div>
577 665 
 				</div>
578 666 
 			</fieldset>
 
@@ -583,7 +671,10 @@  discard block
 
 block discarded – undo
583 671 
 				<div class="form-group">
584 672 
 					<label class="control-label col-sm-2"><?php echo _("Callsign"); ?></label>
585 673 
 					<div class="col-sm-10">
586 
-						<input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) print $callsign; ?>" size="8" placeholder="<?php echo _("Callsign"); ?>" />
674 
+						<input type="text" name="callsign" class="form-control" value="<?php if (isset($_GET['callsign'])) {
675 
+	print $callsign;
676 
+}
677 
+?>" size="8" placeholder="<?php echo _("Callsign"); ?>" />
587 678 
 					</div>
588 679 
 				</div>
589 680 
 			</fieldset>
 
@@ -591,7 +682,10 @@  discard block
 
 block discarded – undo
591 682 
 				<div class="form-group">
592 683 
 					<label class="control-label col-sm-2"><?php echo _("MMSI"); ?></label>
593 684 
 					<div class="col-sm-10">
594 
-						<input type="text" name="mmsi" class="form-control" value="<?php if (isset($_GET['mmsi'])) print $mmsi; ?>" size="8" placeholder="<?php echo _("MMSI"); ?>" />
685 
+						<input type="text" name="mmsi" class="form-control" value="<?php if (isset($_GET['mmsi'])) {
686 
+	print $mmsi;
687 
+}
688 
+?>" size="8" placeholder="<?php echo _("MMSI"); ?>" />
595 689 
 					</div>
596 690 
 				</div>
597 691 
 			</fieldset>
 
@@ -599,7 +693,10 @@  discard block
 
 block discarded – undo
599 693 
 				<div class="form-group">
600 694 
 					<label class="control-label col-sm-2"><?php echo _("IMO"); ?></label>
601 695 
 					<div class="col-sm-10">
602 
-						<input type="text" name="imo" class="form-control" value="<?php if (isset($_GET['imo'])) print $imo; ?>" size="8" placeholder="<?php echo _("IMO"); ?>" />
696 
+						<input type="text" name="imo" class="form-control" value="<?php if (isset($_GET['imo'])) {
697 
+	print $imo;
698 
+}
699 
+?>" size="8" placeholder="<?php echo _("IMO"); ?>" />
603 700 
 					</div>
604 701 
 				</div>
605 702 
 			</fieldset>
 
@@ -612,7 +709,10 @@  discard block
 
 block discarded – undo
612 709 
 					<label class="control-label col-sm-2"><?php echo _("Start Date"); ?></label>
613 710 
 					<div class="col-sm-10">
614 711 
 						<div class='input-group date' id='datetimepicker1'>
615 
-							<input type='text' name="start_date" class="form-control" value="<?php if (isset($_GET['start_date']) && $_GET['start_date'] != '') print $start_date; ?>" placeholder="<?php echo _("Start Date/Time"); ?>" />
712 
+							<input type='text' name="start_date" class="form-control" value="<?php if (isset($_GET['start_date']) && $_GET['start_date'] != '') {
713 
+	print $start_date;
714 
+}
715 
+?>" placeholder="<?php echo _("Start Date/Time"); ?>" />
616 716 
 							<span class="input-group-addon">
617 717 
 								<span class="glyphicon glyphicon-calendar"></span>
618 718 
 							</span>
 
@@ -623,7 +723,10 @@  discard block
 
 block discarded – undo
623 723 
 					<label class="control-label col-sm-2"><?php echo _("End Date"); ?></label>
624 724 
 					<div class="col-sm-10">
625 725 
 						<div class='input-group date' id='datetimepicker2'>
626 
-						<input type='text' name="end_date" class="form-control" value="<?php if (isset($_GET['end_date']) && $_GET['end_date'] != '') print $end_date; ?>" placeholder="<?php echo _("End Date/Time"); ?>" />
726 
+						<input type='text' name="end_date" class="form-control" value="<?php if (isset($_GET['end_date']) && $_GET['end_date'] != '') {
727 
+	print $end_date;
728 
+}
729 
+?>" placeholder="<?php echo _("End Date/Time"); ?>" />
627 730 
 						<span class="input-group-addon">
628 731 
 							<span class="glyphicon glyphicon-calendar"></span>
629 732 
 						</span>
Please login to merge, or discard this patch.
statistics.php 2 patches
Spacing   +148 added lines, -148 removed lines patch added patch discarded remove patch 
@@ -23,7 +23,7 @@  discard block
 
 block discarded – undo
23 23 
 }
24 24
25 25 
 if (!isset($filter_name)) $filter_name = '';
26 
-$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
26 
+$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING);
27 27 
 if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) {
28 28 
 	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
29 29 
 }
 
@@ -32,7 +32,7 @@  discard block
 
 block discarded – undo
32 32 
 	$airline_info = $Spotter->getAllAirlineInfo($airline_icao);
33 33 
 	if (isset($airline_info[0]['name'])) {
34 34 
 		$airline_name = $airline_info[0]['name'];
35 
-	} elseif (strpos($airline_icao,'alliance_') !== FALSE) {
35 
+	} elseif (strpos($airline_icao, 'alliance_') !== FALSE) {
36 36 
 		$alliance_name = $airline_icao;
37 37 
 	}
38 38 
 }
 
@@ -42,8 +42,8 @@  discard block
 
 block discarded – undo
42 42 
 	$title = _("Statistics");
43 43 
 }
44 44
45 
-$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
46 
-$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
45 
+$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
46 
+$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
47 47
48 48 
 require_once('header.php');
49 49 
 
@@ -74,7 +74,7 @@  discard block
 
 block discarded – undo
74 74 
 	date_default_timezone_set('UTC');
75 75 
 	$lastupdate = strtotime($last_update[0]['value']);
76 76 
 	if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
77 
-	print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
77 
+	print '<i>Last update: '.date('Y-m-d G:i:s', $lastupdate).'</i>';
78 78 
 }
79 79
80 80 
 ?>
 
@@ -86,31 +86,31 @@  discard block
 
 block discarded – undo
86 86 
 <?php
87 87 
 if ($type == 'aircraft') {
88 88 
 ?>
89 
-        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Flights"); ?></span>
90 
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
91 
-        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
92 
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
89 
+        <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Flights"); ?></span>
90 
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
91 
+        <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Arrivals seen"); ?></span>
92 
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
93 93 
 <?php
94 94 
 	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
95 95 
 ?>
96 
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span>
97 
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
96 
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Pilots"); ?></span>
97 
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
98 98 
 <?php
99 99 
 	}
100 100 
 	if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) {
101 101 
 ?>
102 
-    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span>
103 
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
102 
+    	    <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Owners"); ?></span>
103 
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
104 104 
 <?php
105 105 
 	}
106 106 
 ?>
107 
-        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span>
108 
-        <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
107 
+        <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Aircrafts types"); ?></span>
108 
+        <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
109 109 
 <?php
110 110 
 	if ($airline_icao == '') {
111 111 
 ?>
112 
-        <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span>
113 
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
112 
+        <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name, $year, $month)); ?></span> <?php echo _("Airlines"); ?></span>
113 
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
114 114 
 <?php
115 115 
 	}
116 116 
 ?>
 
@@ -118,8 +118,8 @@  discard block
 
 block discarded – undo
118 118 
 	if (!(isset($globalVA) && $globalVA) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS) && !(isset($globalVAM) && $globalVAM)) {
119 119 
 		if ($airline_icao == '' || $airline_icao == 'all') {
120 120 
 ?>
121 
-        <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name,$year,$month)); ?></span> <?php echo _("Military"); ?></span>
122 
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
121 
+        <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name, $year, $month)); ?></span> <?php echo _("Military"); ?></span>
122 
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
123 123 
 <?php
124 124 
 		}
125 125 
 	}
 
@@ -127,22 +127,22 @@  discard block
 
 block discarded – undo
127 127 
 <?php
128 128 
 } elseif ($type == 'marine') {
129 129 
 ?>
130 
-	<span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(),$year,$month)); ?></span> <?php echo _("Vessels"); ?></span>
131 
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
132 
-	<span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span>
133 
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
130 
+	<span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(), $year, $month)); ?></span> <?php echo _("Vessels"); ?></span>
131 
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
132 
+	<span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span>
133 
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
134 134 
 <?php
135 135 
 } elseif ($type == 'tracker') {
136 136 
 ?>
137 
-	<span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(),$year,$month)); ?></span> <?php echo _("Trackers"); ?></span>
138 
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
139 
-	<span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span>
140 
-	<!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
137 
+	<span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(), $year, $month)); ?></span> <?php echo _("Trackers"); ?></span>
138 
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
139 
+	<span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span>
140 
+	<!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
141 141 
 <?php
142 142 
 }
143 143 
 ?>
144 144 
     </p>
145 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
145 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
146 146 
     <div class="specific-stats">
147 147 
 <?php
148 148 
 if ($type == 'aircraft') {
 
@@ -151,13 +151,13 @@  discard block
 
 block discarded – undo
151 151 
             <div class="col-md-6">
152 152 
                 <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2>
153 153 
 <?php
154 
-	$aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month);
154 
+	$aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month);
155 155 
 	if (count($aircraft_array) == 0) {
156 156 
 		print _("No data available");
157 157 
 	} else {
158 158 
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
159 159 
 		$aircraft_data = '';
160 
-		foreach($aircraft_array as $aircraft_item) {
160 
+		foreach ($aircraft_array as $aircraft_item) {
161 161 
 			if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
162 162 
 			else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
163 163 
 		}
 
@@ -186,16 +186,16 @@  discard block
 
 block discarded – undo
186 186 
 ?>
187 187 
                 </div>
188 188 
             </div>
189 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
189 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
190 190 
 <?php
191 191 
 	if ($airline_icao == '' || $airline_icao == 'all') {
192 
-		$airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month);
192 
+		$airline_array = $Stats->countAllAirlines(true, $filter_name, $year, $month);
193 193 
 		if (count($airline_array) > 0) {
194 194 
 			print '<div class="col-md-6">';
195 195 
 			print '<h2>'._("Top 10 Most Common Airline").'</h2>';
196 196 
 			print '<div id="chart2" class="chart" width="100%"></div><script>';
197 197 
 			$airline_data = '';
198 
-			foreach($airline_array as $airline_item) {
198 
+			foreach ($airline_array as $airline_item) {
199 199 
 				$airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],';
200 200 
 			}
201 201 
 			$airline_data = substr($airline_data, 0, -1);
 
@@ -220,7 +220,7 @@  discard block
 
 block discarded – undo
220 220 
 		}
221 221 
 ?>
222 222 
         </div>
223 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
223 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
224 224 
 <?php
225 225 
 	}
226 226 
 }
 
@@ -232,12 +232,12 @@  discard block
 
 block discarded – undo
232 232 
             <div class="col-md-6">
233 233 
                 <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2>
234 234 
 <?php
235 
-	$marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month);
235 
+	$marine_array = $Marine->countAllMarineTypes(true, 0, '', array(), $year, $month);
236 236 
 	if (count($marine_array) == 0) print _("No data available");
237 237 
 	else {
238 238 
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
239 239 
 		$marine_data = '';
240 
-		foreach($marine_array as $marine_item) {
240 
+		foreach ($marine_array as $marine_item) {
241 241 
 			$marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],';
242 242 
 		}
243 243 
 		$marine_data = substr($marine_data, 0, -1);
 
@@ -267,7 +267,7 @@  discard block
 
 block discarded – undo
267 267 
             	    ?>
268 268 
                 </div>
269 269 
             </div>
270 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
270 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
271 271 
 <!--	</div>-->
272 272 
 <?php
273 273 
 }
 
@@ -277,12 +277,12 @@  discard block
 
 block discarded – undo
277 277 
             <div class="col-md-6">
278 278 
                 <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2>
279 279 
 <?php
280 
-	$tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month);
280 
+	$tracker_array = $Tracker->countAllTrackerTypes(true, 0, '', array(), $year, $month);
281 281 
 	if (count($tracker_array) == 0) print _("No data available");
282 282 
 	else {
283 283 
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
284 284 
 		$tracker_data = '';
285 
-		foreach($tracker_array as $tracker_item) {
285 
+		foreach ($tracker_array as $tracker_item) {
286 286 
 			$tracker_data .= '["'.$tracker_item['tracker_type'].'",'.$tracker_item['tracker_type_count'].'],';
287 287 
 		}
288 288 
 		$tracker_data = substr($tracker_data, 0, -1);
 
@@ -312,7 +312,7 @@  discard block
 
 block discarded – undo
312 312 
             	    ?>
313 313 
                 </div>
314 314 
             </div>
315 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
315 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
316 316 
 <!--	</div>-->
317 317 
 <?php
318 318 
 }
 
@@ -327,7 +327,7 @@  discard block
 
 block discarded – undo
327 327 
 		else {
328 328 
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
329 329 
 			$owner_data = '';
330 
-			foreach($owner_array as $owner_item) {
330 
+			foreach ($owner_array as $owner_item) {
331 331 
 				$owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
332 332 
 			}
333 333 
 			$owner_data = substr($owner_data, 0, -1);
 
@@ -347,7 +347,7 @@  discard block
 
 block discarded – undo
347 347 
                 </div>
348 348 
                 -->
349 349 
             </div>
350 
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
350 
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
351 351 
             <div class="col-md-6">
352 352 
                 <h2><?php echo _("Top 10 Most Common Countries Owners"); ?></h2>
353 353 
 <?php
 
@@ -356,7 +356,7 @@  discard block
 
 block discarded – undo
356 356 
 		else {
357 357 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
358 358 
 			$owner_data = '';
359 
-			foreach($countries_array as $owner_item) {
359 
+			foreach ($countries_array as $owner_item) {
360 360 
 				$owner_data .= '["'.$owner_item['country_name'].'",'.$owner_item['country_count'].'],';
361 361 
 			}
362 362 
 			$owner_data = substr($owner_data, 0, -1);
 
@@ -377,7 +377,7 @@  discard block
 
 block discarded – undo
377 377 
                 -->
378 378 
             </div>
379 379
380 
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
380 
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
381 381 
 ²	</div>
382 382 
         <div class="row column">
383 383 
             <div class="col-md-6">
 
@@ -388,7 +388,7 @@  discard block
 
 block discarded – undo
388 388 
 		else {
389 389 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
390 390 
 			$launch_site_data = '';
391 
-			foreach($launch_site_array as $launch_site_item) {
391 
+			foreach ($launch_site_array as $launch_site_item) {
392 392 
 				$launch_site_data .= '["'.$launch_site_item['launch_site'].'",'.$launch_site_item['launch_site_count'].'],';
393 393 
 			}
394 394 
 			$launch_site_data = substr($launch_site_data, 0, -1);
 
@@ -415,7 +415,7 @@  discard block
 
 block discarded – undo
415 415 
 ?>
416 416 
         <div class="row column">
417 417 
 <?php
418 
-	$flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month);
418 
+	$flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name, $year, $month);
419 419 
 	//if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) {
420 420 
 	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
421 421 
 		if (empty($flightover_array)) {
 
@@ -426,12 +426,12 @@  discard block
 
 block discarded – undo
426 426 
 ?>
427 427 
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
428 428 
 <?php
429 
-		$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
429 
+		$pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month);
430 430 
 		if (count($pilot_array) == 0) print _("No data available");
431 431 
 		else {
432 432 
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
433 433 
 			$pilot_data = '';
434 
-			foreach($pilot_array as $pilot_item) {
434 
+			foreach ($pilot_array as $pilot_item) {
435 435 
 				$pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],';
436 436 
 			}
437 437 
 			$pilot_data = substr($pilot_data, 0, -1);
 
@@ -452,7 +452,7 @@  discard block
 
 block discarded – undo
452 452 
 ?>
453 453 
             </div>
454 454
455 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
455 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
456 456 
 <?php
457 457 
 	}
458 458 
 	// else {
 
@@ -461,12 +461,12 @@  discard block
 
 block discarded – undo
461 461 
             <div class="col-md-6">
462 462 
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
463 463 
 <?php
464 
-		$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
464 
+		$owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name, $year, $month);
465 465 
 		if (count($owner_array) == 0) print _("No data available");
466 466 
 		else {
467 467 
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
468 468 
 			$owner_data = '';
469 
-			foreach($owner_array as $owner_item) {
469 
+			foreach ($owner_array as $owner_item) {
470 470 
 				$owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],';
471 471 
 			}
472 472 
 			$owner_data = substr($owner_data, 0, -1);
 
@@ -485,7 +485,7 @@  discard block
 
 block discarded – undo
485 485 
                 </div>
486 486 
             </div>
487 487
488 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
488 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
489 489 
 <?php
490 490 
 	}
491 491 
 	if (!empty($flightover_array)) {
 
@@ -499,7 +499,7 @@  discard block
 
 block discarded – undo
499 499 
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
500 500 
 			print 'var series = [';
501 501 
 			$flightover_data = '';
502 
-			foreach($flightover_array as $flightover_item) {
502 
+			foreach ($flightover_array as $flightover_item) {
503 503 
 				$flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],';
504 504 
 			}
505 505 
 			$flightover_data = substr($flightover_data, 0, -1);
 
@@ -544,7 +544,7 @@  discard block
 
 block discarded – undo
544 544 
 	}
545 545 
 ?>
546 546 
         </div>
547 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
547 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
548 548 
         </div>
549 549 
 <?php
550 550 
 }
 
@@ -560,7 +560,7 @@  discard block
 
 block discarded – undo
560 560 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
561 561 
 		print 'var series = [';
562 562 
 		$flightover_data = '';
563 
-		foreach($flightover_array as $flightover_item) {
563 
+		foreach ($flightover_array as $flightover_item) {
564 564 
 			$flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],';
565 565 
 		}
566 566 
 		$flightover_data = substr($flightover_data, 0, -1);
 
@@ -617,7 +617,7 @@  discard block
 
 block discarded – undo
617 617 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
618 618 
 		print 'var series = [';
619 619 
 		$flightover_data = '';
620 
-		foreach($flightover_array as $flightover_item) {
620 
+		foreach ($flightover_array as $flightover_item) {
621 621 
 			$flightover_data .= '[ "'.$flightover_item['tracker_country_iso3'].'",'.$flightover_item['tracker_count'].'],';
622 622 
 		}
623 623 
 		$flightover_data = substr($flightover_data, 0, -1);
 
@@ -667,14 +667,14 @@  discard block
 
 block discarded – undo
667 667 
         <div class="row column">
668 668 
             <div class="col-md-6">
669 669 
 <?php
670 
-	$airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month);
670 
+	$airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name, $year, $month);
671 671 
 	if (count($airport_airport_array) > 0) {
672 672 
 		print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>';
673 673 
 		print '<div id="chart3" class="chart" width="100%"></div><script>';
674 674 
 		print "\n";
675 675 
 		print 'var series = [';
676 676 
 		$airport_data = '';
677 
-		foreach($airport_airport_array as $airport_item) {
677 
+		foreach ($airport_airport_array as $airport_item) {
678 678 
 			$airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],';
679 679 
 		}
680 680 
 		$airport_data = substr($airport_data, 0, -1);
 
@@ -724,18 +724,18 @@  discard block
 
 block discarded – undo
724 724 
 	}
725 725 
 ?>
726 726 
             </div>
727 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
727 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
728 728
729 729 
             <div class="col-md-6">
730 730 
 <?php
731 
-	$airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month);
731 
+	$airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name, $year, $month);
732 732 
 	if (count($airport_airport_array2) > 0) {
733 733 
 		print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>';
734 734 
 		print '<div id="chart4" class="chart" width="100%"></div><script>';
735 735 
 		print "\n";
736 736 
 		print 'var series = [';
737 737 
 		$airport_data = '';
738 
-		foreach($airport_airport_array2 as $airport_item)
738 
+		foreach ($airport_airport_array2 as $airport_item)
739 739 
 		{
740 740 
 			$airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],';
741 741 
 		}
 
@@ -787,7 +787,7 @@  discard block
 
 block discarded – undo
787 787 
 ?>
788 788 
             </div>
789 789 
         </div>
790 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
790 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
791 791 
 <?php
792 792 
 }
793 793 
 if ($type == 'aircraft') {
 
@@ -799,18 +799,18 @@  discard block
 
 block discarded – undo
799 799 
             <div class="col-md-6">
800 800 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
801 801 
 <?php
802 
-		$year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
802 
+		$year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name);
803 803 
 		if (count($year_array) == 0) print _("No data available");
804 804 
 		else {
805 805 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
806 806 
 			$year_data = '';
807 807 
 			$year_cnt = '';
808 
-			foreach($year_array as $year_item) {
808 
+			foreach ($year_array as $year_item) {
809 809 
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
810 810 
 				$year_cnt .= $year_item['date_count'].',';
811 811 
 			}
812 812 
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
813 
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
813 
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
814 814 
 			print 'c3.generate({
815 815 
 			    bindto: "#chart8",
816 816 
 			    data: { x: "x",
 
@@ -823,22 +823,22 @@  discard block
 
 block discarded – undo
823 823 
                     <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
824 824 
                 </div>
825 825 
             </div>
826 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
826 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
827 827 
             <div class="col-md-6">
828 828 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
829 829 
 <?php
830 
-		$month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
830 
+		$month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name);
831 831 
 		if (count($month_array) == 0) print _("No data available");
832 832 
 		else {
833 833 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
834 834 
 			$month_data = '';
835 835 
 			$month_cnt = '';
836 
-			foreach($month_array as $month_item) {
836 
+			foreach ($month_array as $month_item) {
837 837 
 				$month_data .= '"'.$month_item['date_name'].'",';
838 838 
 				$month_cnt .= $month_item['date_count'].',';
839 839 
 			}
840 840 
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
841 
-			$month_cnt = "['flights',".substr($month_cnt,0,-1)."]";
841 
+			$month_cnt = "['flights',".substr($month_cnt, 0, -1)."]";
842 842 
 			print 'c3.generate({
843 843 
 			    bindto: "#chart9",
844 844 
 			    data: { x: "x",
 
@@ -851,23 +851,23 @@  discard block
 
 block discarded – undo
851 851 
                     <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
852 852 
                 </div>
853 853 
             </div>
854 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
854 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
855 855
856 856 
             <div class="col-md-6">
857 857 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
858 858 
 <?php
859 
-		$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
859 
+		$date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name);
860 860 
 		if (empty($date_array)) print _("No data available");
861 861 
 		else {
862 862 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
863 863 
 			$date_data = '';
864 864 
 			$date_cnt = '';
865 
-			foreach($date_array as $date_item) {
865 
+			foreach ($date_array as $date_item) {
866 866 
 				$date_data .= '"'.$date_item['date_name'].'",';
867 867 
 				$date_cnt .= $date_item['date_count'].',';
868 868 
 			}
869 869 
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
870 
-			$date_cnt = "['flights',".substr($date_cnt,0,-1)."]";
870 
+			$date_cnt = "['flights',".substr($date_cnt, 0, -1)."]";
871 871 
 			print 'c3.generate({
872 872 
 			    bindto: "#chart5",
873 873 
 			    data: { x: "x",
 
@@ -880,22 +880,22 @@  discard block
 
 block discarded – undo
880 880 
                     <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
881 881 
                 </div>
882 882 
             </div>
883 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
883 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
884 884 
             <div class="col-md-6">
885 885 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
886 886 
 <?php
887 
-		$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
887 
+		$hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name);
888 888 
 		if (empty($hour_array)) print _("No data available");
889 889 
 		else {
890 890 
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
891 891 
 			$hour_data = '';
892 892 
 			$hour_cnt = '';
893 
-			foreach($hour_array as $hour_item) {
893 
+			foreach ($hour_array as $hour_item) {
894 894 
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
895 895 
 				$hour_cnt .= $hour_item['hour_count'].',';
896 896 
 			}
897 897 
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
898 
-			$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]";
898 
+			$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]";
899 899 
 			print 'c3.generate({
900 900 
 			    bindto: "#chart6",
901 901 
 			    data: {
 
@@ -908,7 +908,7 @@  discard block
 
 block discarded – undo
908 908 
                     <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
909 909 
                 </div>
910 910 
             </div>
911 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
911 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
912 912 
         </div>
913 913 
 <?php
914 914 
 	}
 
@@ -924,18 +924,18 @@  discard block
 
 block discarded – undo
924 924 
             <div class="col-md-6">
925 925 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
926 926 
 <?php
927 
-		$year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name);
927 
+		$year_array = $Marine->countAllMonthsLastYear(true, $airline_icao, $filter_name);
928 928 
 		if (count($year_array) == 0) print _("No data available");
929 929 
 		else {
930 930 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
931 931 
 			$year_data = '';
932 932 
 			$year_cnt = '';
933 
-			foreach($year_array as $year_item) {
933 
+			foreach ($year_array as $year_item) {
934 934 
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
935 935 
 				$year_cnt .= $year_item['date_count'].',';
936 936 
 			}
937 937 
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
938 
-			$year_cnt = "['vessels',".substr($year_cnt,0,-1)."]";
938 
+			$year_cnt = "['vessels',".substr($year_cnt, 0, -1)."]";
939 939 
 			print 'c3.generate({
940 940 
 			    bindto: "#chart8",
941 941 
 			    data: { x: "x",
 
@@ -949,22 +949,22 @@  discard block
 
 block discarded – undo
949 949 
                 </div>
950 950 
             </div>
951 951
952 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
952 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
953 953 
             <div class="col-md-6">
954 954 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
955 955 
 <?php
956 
-		$month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name);
956 
+		$month_array = $Marine->countAllDatesLastMonth($airline_icao, $filter_name);
957 957 
 		if (count($month_array) == 0) print _("No data available");
958 958 
 		else {
959 959 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
960 960 
 			$month_data = '';
961 961 
 			$month_cnt = '';
962 
-			foreach($month_array as $month_item) {
962 
+			foreach ($month_array as $month_item) {
963 963 
 				$month_data .= '"'.$month_item['date_name'].'",';
964 964 
 				$month_cnt .= $month_item['date_count'].',';
965 965 
 			}
966 966 
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
967 
-			$month_cnt = "['vessels',".substr($month_cnt,0,-1)."]";
967 
+			$month_cnt = "['vessels',".substr($month_cnt, 0, -1)."]";
968 968 
 			print 'c3.generate({
969 969 
 			    bindto: "#chart9",
970 970 
 			    data: { x: "x",
 
@@ -977,23 +977,23 @@  discard block
 
 block discarded – undo
977 977 
                     <a href="<?php print $globalURL; ?>/marine/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
978 978 
                 </div>
979 979 
             </div>
980 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
980 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
981 981
982 982 
             <div class="col-md-6">
983 983 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
984 984 
 <?php
985 
-		$date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name);
985 
+		$date_array = $Marine->countAllDatesLast7Days($airline_icao, $filter_name);
986 986 
 		if (empty($date_array)) print _("No data available");
987 987 
 		else {
988 988 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
989 989 
 			$date_data = '';
990 990 
 			$date_cnt = '';
991 
-			foreach($date_array as $date_item) {
991 
+			foreach ($date_array as $date_item) {
992 992 
 				$date_data .= '"'.$date_item['date_name'].'",';
993 993 
 				$date_cnt .= $date_item['date_count'].',';
994 994 
 			}
995 995 
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
996 
-			$date_cnt = "['vessels',".substr($date_cnt,0,-1)."]";
996 
+			$date_cnt = "['vessels',".substr($date_cnt, 0, -1)."]";
997 997 
 			print 'c3.generate({
998 998 
 			    bindto: "#chart5",
999 999 
 			    data: { x: "x",
 
@@ -1006,22 +1006,22 @@  discard block
 
 block discarded – undo
1006 1006 
                     <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
1007 1007 
                 </div>
1008 1008 
             </div>
1009 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1009 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1010 1010 
             <div class="col-md-6">
1011 1011 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
1012 1012 
 <?php
1013 
-		$hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name);
1013 
+		$hour_array = $Marine->countAllHours('hour', true, $airline_icao, $filter_name);
1014 1014 
 		if (empty($hour_array)) print _("No data available");
1015 1015 
 		else {
1016 1016 
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
1017 1017 
 			$hour_data = '';
1018 1018 
 			$hour_cnt = '';
1019 
-			foreach($hour_array as $hour_item) {
1019 
+			foreach ($hour_array as $hour_item) {
1020 1020 
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
1021 1021 
 				$hour_cnt .= $hour_item['hour_count'].',';
1022 1022 
 			}
1023 1023 
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
1024 
-			$hour_cnt = "['vessels',".substr($hour_cnt,0,-1)."]";
1024 
+			$hour_cnt = "['vessels',".substr($hour_cnt, 0, -1)."]";
1025 1025 
 			print 'c3.generate({
1026 1026 
 			    bindto: "#chart6",
1027 1027 
 			    data: {
 
@@ -1034,7 +1034,7 @@  discard block
 
 block discarded – undo
1034 1034 
                     <a href="<?php print $globalURL; ?>/marine/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
1035 1035 
                 </div>
1036 1036 
             </div>
1037 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1037 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1038 1038 
         </div>
1039 1039 
 <?php
1040 1040 
 	}
 
@@ -1056,12 +1056,12 @@  discard block
 
 block discarded – undo
1056 1056 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
1057 1057 
 			$year_data = '';
1058 1058 
 			$year_cnt = '';
1059 
-			foreach($year_array as $year_item) {
1059 
+			foreach ($year_array as $year_item) {
1060 1060 
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
1061 1061 
 				$year_cnt .= $year_item['date_count'].',';
1062 1062 
 			}
1063 1063 
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
1064 
-			$year_cnt = "['trackers',".substr($year_cnt,0,-1)."]";
1064 
+			$year_cnt = "['trackers',".substr($year_cnt, 0, -1)."]";
1065 1065 
 			print 'c3.generate({
1066 1066 
 			    bindto: "#chart8",
1067 1067 
 			    data: { x: "x",
 
@@ -1075,7 +1075,7 @@  discard block
 
 block discarded – undo
1075 1075 
                 </div>
1076 1076 
             </div>
1077 1077
1078 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1078 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1079 1079 
             <div class="col-md-6">
1080 1080 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
1081 1081 
 <?php
 
@@ -1085,12 +1085,12 @@  discard block
 
 block discarded – undo
1085 1085 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
1086 1086 
 			$month_data = '';
1087 1087 
 			$month_cnt = '';
1088 
-			foreach($month_array as $month_item) {
1088 
+			foreach ($month_array as $month_item) {
1089 1089 
 				$month_data .= '"'.$month_item['date_name'].'",';
1090 1090 
 				$month_cnt .= $month_item['date_count'].',';
1091 1091 
 			}
1092 1092 
 			$month_data = "['x',".substr($month_data, 0, -1)."]";
1093 
-			$month_cnt = "['trackers',".substr($month_cnt,0,-1)."]";
1093 
+			$month_cnt = "['trackers',".substr($month_cnt, 0, -1)."]";
1094 1094 
 			print 'c3.generate({
1095 1095 
 			    bindto: "#chart9",
1096 1096 
 			    data: { x: "x",
 
@@ -1103,7 +1103,7 @@  discard block
 
 block discarded – undo
1103 1103 
                     <a href="<?php print $globalURL; ?>/tracker/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
1104 1104 
                 </div>
1105 1105 
             </div>
1106 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1106 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1107 1107
1108 1108 
             <div class="col-md-6">
1109 1109 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
 
@@ -1114,12 +1114,12 @@  discard block
 
 block discarded – undo
1114 1114 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
1115 1115 
 			$date_data = '';
1116 1116 
 			$date_cnt = '';
1117 
-			foreach($date_array as $date_item) {
1117 
+			foreach ($date_array as $date_item) {
1118 1118 
 				$date_data .= '"'.$date_item['date_name'].'",';
1119 1119 
 				$date_cnt .= $date_item['date_count'].',';
1120 1120 
 			}
1121 1121 
 			$date_data = "['x',".substr($date_data, 0, -1)."]";
1122 
-			$date_cnt = "['trackers',".substr($date_cnt,0,-1)."]";
1122 
+			$date_cnt = "['trackers',".substr($date_cnt, 0, -1)."]";
1123 1123 
 			print 'c3.generate({
1124 1124 
 			    bindto: "#chart5",
1125 1125 
 			    data: { x: "x",
 
@@ -1132,22 +1132,22 @@  discard block
 
 block discarded – undo
1132 1132 
                     <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
1133 1133 
                 </div>
1134 1134 
             </div>
1135 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1135 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1136 1136 
             <div class="col-md-6">
1137 1137 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
1138 1138 
 <?php
1139 
-		$hour_array = $Tracker->countAllHours('hour',true);
1139 
+		$hour_array = $Tracker->countAllHours('hour', true);
1140 1140 
 		if (empty($hour_array)) print _("No data available");
1141 1141 
 		else {
1142 1142 
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
1143 1143 
 			$hour_data = '';
1144 1144 
 			$hour_cnt = '';
1145 
-			foreach($hour_array as $hour_item) {
1145 
+			foreach ($hour_array as $hour_item) {
1146 1146 
 				$hour_data .= '"'.$hour_item['hour_name'].':00",';
1147 1147 
 				$hour_cnt .= $hour_item['hour_count'].',';
1148 1148 
 			}
1149 1149 
 			$hour_data = "[".substr($hour_data, 0, -1)."]";
1150 
-			$hour_cnt = "['trackers',".substr($hour_cnt,0,-1)."]";
1150 
+			$hour_cnt = "['trackers',".substr($hour_cnt, 0, -1)."]";
1151 1151 
 			print 'c3.generate({
1152 1152 
 			    bindto: "#chart6",
1153 1153 
 			    data: {
 
@@ -1160,7 +1160,7 @@  discard block
 
 block discarded – undo
1160 1160 
                     <a href="<?php print $globalURL; ?>/tracker/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
1161 1161 
                 </div>
1162 1162 
             </div>
1163 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1163 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1164 1164 
         </div>
1165 1165 
 <?php
1166 1166 
 	}
 
@@ -1182,12 +1182,12 @@  discard block
 
 block discarded – undo
1182 1182 
 			print '<div id="chart21" class="chart" width="100%"></div><script>';
1183 1183 
 			$year_data = '';
1184 1184 
 			$year_cnt = '';
1185 
-			foreach($year_array as $year_item) {
1185 
+			foreach ($year_array as $year_item) {
1186 1186 
 				$year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",';
1187 1187 
 				$year_cnt .= $year_item['date_count'].',';
1188 1188 
 			}
1189 1189 
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
1190 
-			$year_cnt = "['satellite',".substr($year_cnt,0,-1)."]";
1190 
+			$year_cnt = "['satellite',".substr($year_cnt, 0, -1)."]";
1191 1191 
 			print 'c3.generate({
1192 1192 
 			    bindto: "#chart21",
1193 1193 
 			    data: { x: "x",
 
@@ -1203,7 +1203,7 @@  discard block
 
 block discarded – undo
1203 1203 
             -->
1204 1204 
             </div>
1205 1205
1206 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1206 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1207 1207 
             <div class="col-md-6">
1208 1208 
                 <h2><?php echo _("Busiest Launch Years of the last 10 Years"); ?></h2>
1209 1209 
 <?php
 
@@ -1213,12 +1213,12 @@  discard block
 
 block discarded – undo
1213 1213 
 			print '<div id="chart22" class="chart" width="100%"></div><script>';
1214 1214 
 			$year_data = '';
1215 1215 
 			$year_cnt = '';
1216 
-			foreach($year_array as $year_item) {
1216 
+			foreach ($year_array as $year_item) {
1217 1217 
 				$year_data .= '"'.$year_item['year_name'].'-01-01'.'",';
1218 1218 
 				$year_cnt .= $year_item['date_count'].',';
1219 1219 
 			}
1220 1220 
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
1221 
-			$year_cnt = "['satellite',".substr($year_cnt,0,-1)."]";
1221 
+			$year_cnt = "['satellite',".substr($year_cnt, 0, -1)."]";
1222 1222 
 			print 'c3.generate({
1223 1223 
 			    bindto: "#chart22",
1224 1224 
 			    data: { x: "x",
 
@@ -1234,7 +1234,7 @@  discard block
 
 block discarded – undo
1234 1234 
             -->
1235 1235 
             </div>
1236 1236
1237 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1237 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1238 1238 
         </div>
1239 1239 
 <?php
1240 1240 
 	}
 
@@ -1256,12 +1256,12 @@  discard block
 
 block discarded – undo
1256 1256 
 			print '<div id="chart32" class="chart" width="100%"></div><script>';
1257 1257 
 			$year_data = '';
1258 1258 
 			$year_cnt = '';
1259 
-			foreach($year_array as $year_item) {
1259 
+			foreach ($year_array as $year_item) {
1260 1260 
 				$year_data .= '"'.$year_item['year'].'-01-01",';
1261 1261 
 				$year_cnt .= $year_item['count'].',';
1262 1262 
 			}
1263 1263 
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
1264 
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
1264 
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
1265 1265 
 			print 'c3.generate({
1266 1266 
 			    bindto: "#chart32",
1267 1267 
 			    data: { x: "x",
 
@@ -1274,7 +1274,7 @@  discard block
 
 block discarded – undo
1274 1274 
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
1275 1275 
                 </div>
1276 1276 
             </div>
1277 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1277 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1278 1278
1279 1279 
         <div class="row column">
1280 1280 
             <div class="col-md-6">
 
@@ -1286,12 +1286,12 @@  discard block
 
 block discarded – undo
1286 1286 
 			print '<div id="chart33" class="chart" width="100%"></div><script>';
1287 1287 
 			$year_data = '';
1288 1288 
 			$year_cnt = '';
1289 
-			foreach($year_array as $year_item) {
1289 
+			foreach ($year_array as $year_item) {
1290 1290 
 				$year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",';
1291 1291 
 				$year_cnt .= $year_item['count'].',';
1292 1292 
 			}
1293 1293 
 			$year_data = "['x',".substr($year_data, 0, -1)."]";
1294 
-			$year_cnt = "['flights',".substr($year_cnt,0,-1)."]";
1294 
+			$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]";
1295 1295 
 			print 'c3.generate({
1296 1296 
 			    bindto: "#chart33",
1297 1297 
 			    data: { x: "x",
 
@@ -1304,7 +1304,7 @@  discard block
 
 block discarded – undo
1304 1304 
                     <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
1305 1305 
                 </div>
1306 1306 
             </div>
1307 
-    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1307 
+    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1308 1308 
 <br/>
1309 1309 
 <?php
1310 1310 
 	}
 
@@ -1318,19 +1318,19 @@  discard block
 
 block discarded – undo
1318 1318 
 	//$polar = $Stats->getStatsSource(date('Y-m-d'),'polar');
1319 1319 
 	if ($year == '' && $month == '') {
1320 1320 
 		if ($type == 'aircraft') {
1321 
-			$polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d'));
1321 
+			$polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d'));
1322 1322 
 		} elseif ($type == 'marine') {
1323 
-			$polar = $Stats->getStatsSource('polar_marine',date('Y'),date('m'),date('d'));
1323 
+			$polar = $Stats->getStatsSource('polar_marine', date('Y'), date('m'), date('d'));
1324 1324 
 		} elseif ($type == 'tracker') {
1325 
-			$polar = $Stats->getStatsSource('polar_tracker',date('Y'),date('m'),date('d'));
1325 
+			$polar = $Stats->getStatsSource('polar_tracker', date('Y'), date('m'), date('d'));
1326 1326 
 		}
1327 1327 
 	} else {
1328 1328 
 		if ($type == 'aircraft') {
1329 
-			$polar = $Stats->getStatsSource('polar',$year,$month);
1329 
+			$polar = $Stats->getStatsSource('polar', $year, $month);
1330 1330 
 		} elseif ($type == 'marine') {
1331 
-			$polar = $Stats->getStatsSource('polar_marine',$year,$month);
1331 
+			$polar = $Stats->getStatsSource('polar_marine', $year, $month);
1332 1332 
 		} elseif ($type == 'tracker') {
1333 
-			$polar = $Stats->getStatsSource('polar_tracker',$year,$month);
1333 
+			$polar = $Stats->getStatsSource('polar_tracker', $year, $month);
1334 1334 
 		}
1335 1335 
 	}
1336 1336 
 	if (!empty($polar)) {
 
@@ -1339,7 +1339,7 @@  discard block
 
 block discarded – undo
1339 1339 
 			unset($polar_data);
1340 1340 
 			$Spotter = new Spotter();
1341 1341 
 			$data = json_decode($eachpolar['source_data']);
1342 
-			foreach($data as $value => $key) {
1342 
+			foreach ($data as $value => $key) {
1343 1343 
 				$direction = $Spotter->parseDirection(($value*22.5));
1344 1344 
 				$distance = $key;
1345 1345 
 				$unit = 'km';
 
@@ -1359,7 +1359,7 @@  discard block
 
 block discarded – undo
1359 1359 
 ?>
1360 1360 
             <div class="col-md-6">
1361 1361 
                 <h4><?php print $eachpolar['source_name']; ?></h4>
1362 
-        	<div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
1362 
+        	<div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div>
1363 1363 
         	<script>
1364 1364 
         	    (function() {
1365 1365 
         	    var margin = {top: 100, right: 100, bottom: 100, left: 100},
 
@@ -1383,7 +1383,7 @@  discard block
 
 block discarded – undo
1383 1383 
 		      color: color,
1384 1384 
 		      unit: '<?php echo $unit; ?>'
1385 1385 
 		    };
1386 
-		    RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
1386 
+		    RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions);
1387 1387 
 		    })();
1388 1388 
 		</script>
1389 1389 
             </div>
 
@@ -1398,19 +1398,19 @@  discard block
 
 block discarded – undo
1398 1398 
 	//$msg = $Stats->getStatsSource(date('Y-m-d'),'msg');
1399 1399 
 	if ($year == '' && $month == '') {
1400 1400 
 		if ($type == 'aircraft') {
1401 
-			$msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d'));
1401 
+			$msg = $Stats->getStatsSource('msg', date('Y'), date('m'), date('d'));
1402 1402 
 		} elseif ($type == 'marine') {
1403 
-			$msg = $Stats->getStatsSource('msg_marine',date('Y'),date('m'),date('d'));
1403 
+			$msg = $Stats->getStatsSource('msg_marine', date('Y'), date('m'), date('d'));
1404 1404 
 		} elseif ($type == 'tracker') {
1405 
-			$msg = $Stats->getStatsSource('msg_tracker',date('Y'),date('m'),date('d'));
1405 
+			$msg = $Stats->getStatsSource('msg_tracker', date('Y'), date('m'), date('d'));
1406 1406 
 		}
1407 1407 
 	} else {
1408 1408 
 		if ($type == 'aircraft') {
1409 
-			$msg = $Stats->getStatsSource('msg',$year,$month);
1409 
+			$msg = $Stats->getStatsSource('msg', $year, $month);
1410 1410 
 		} elseif ($type == 'marine') {
1411 
-			$msg = $Stats->getStatsSource('msg_marine',$year,$month);
1411 
+			$msg = $Stats->getStatsSource('msg_marine', $year, $month);
1412 1412 
 		} elseif ($type == 'tracker') {
1413 
-			$msg = $Stats->getStatsSource('msg_tracker',$year,$month);
1413 
+			$msg = $Stats->getStatsSource('msg_tracker', $year, $month);
1414 1414 
 		}
1415 1415 
 	}
1416 1416 
 	if (!empty($msg)) {
 
@@ -1418,13 +1418,13 @@  discard block
 
 block discarded – undo
1418 1418 
 		foreach ($msg as $eachmsg) {
1419 1419 
 			//$eachmsg = $msg[0];
1420 1420 
 			$data = $eachmsg['source_data'];
1421 
-			if ($data > 500) $max = (round(($data+100)/100))*100;
1421 
+			if ($data > 500) $max = (round(($data + 100)/100))*100;
1422 1422 
 			else $max = 500;
1423 1423 
 ?>
1424 
-        	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
1424 
+        	<div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
1425 1425 
         	<script>
1426 1426 
 		      var g = new JustGage({
1427 
-			    id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>",
1427 
+			    id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>",
1428 1428 
 			    value: <?php echo $data; ?>,
1429 1429 
 			    min: 0,
1430 1430 
 			    max: <?php print $max; ?>,
 
@@ -1446,19 +1446,19 @@  discard block
 
 block discarded – undo
1446 1446 
 	//$hist = $Stats->getStatsSource(date('Y-m-d'),'hist');
1447 1447 
 	if ($year == '' && $month == '') {
1448 1448 
 		if ($type == 'aircraft') {
1449 
-			$hist = $Stats->getStatsSource('hist',date('Y'),date('m'),date('d'));
1449 
+			$hist = $Stats->getStatsSource('hist', date('Y'), date('m'), date('d'));
1450 1450 
 		} elseif ($type == 'marine') {
1451 
-			$hist = $Stats->getStatsSource('hist_marine',date('Y'),date('m'),date('d'));
1451 
+			$hist = $Stats->getStatsSource('hist_marine', date('Y'), date('m'), date('d'));
1452 1452 
 		} elseif ($type == 'tracker') {
1453 
-			$hist = $Stats->getStatsSource('hist_tracker',date('Y'),date('m'),date('d'));
1453 
+			$hist = $Stats->getStatsSource('hist_tracker', date('Y'), date('m'), date('d'));
1454 1454 
 		}
1455 1455 
 	} else {
1456 1456 
 		if ($type == 'aircraft') {
1457 
-			$hist = $Stats->getStatsSource('hist',$year,$month);
1457 
+			$hist = $Stats->getStatsSource('hist', $year, $month);
1458 1458 
 		} elseif ($type == 'marine') {
1459 
-			$hist = $Stats->getStatsSource('hist_marine',$year,$month);
1459 
+			$hist = $Stats->getStatsSource('hist_marine', $year, $month);
1460 1460 
 		} elseif ($type == 'tracker') {
1461 
-			$hist = $Stats->getStatsSource('hist_tracker',$year,$month);
1461 
+			$hist = $Stats->getStatsSource('hist_tracker', $year, $month);
1462 1462 
 		}
1463 1463 
 	}
1464 1464 
 	foreach ($hist as $hists) {
 
@@ -1468,7 +1468,7 @@  discard block
 
 block discarded – undo
1468 1468 
 		$source = $hists['source_name'];
1469 1469 
 		$hist_array = json_decode($hists['source_data']);
1470 1470 
 		$unit = 'km';
1471 
-		foreach($hist_array as $distance => $nb) {
1471 
+		foreach ($hist_array as $distance => $nb) {
1472 1472 
 			if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
1473 1473 
 				$distance = round($distance*0.539957);
1474 1474 
 				$unit = 'nm';
 
@@ -1488,18 +1488,18 @@  discard block
 
 block discarded – undo
1488 1488 
 		$nb_data = "['flights',".substr($nb_data, 0, -1)."]";
1489 1489 
 ?>
1490 1490 
             <div class="col-md-6">
1491 
-                <h2><?php echo sprintf(_("Distance for %s"),$source); ?></h2>
1491 
+                <h2><?php echo sprintf(_("Distance for %s"), $source); ?></h2>
1492 1492 
 <?php
1493 
-		print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>';
1493 
+		print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div><script>';
1494 1494 
 		print 'c3.generate({
1495 
-		    bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'",
1495 
+		    bindto: "#charthist-'.str_replace(' ', '_', strtolower($source)).'",
1496 1496 
 		    data: { x: "x",
1497 1497 
 		    columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}},
1498 1498 
 		    axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});';
1499 1499 
 		print '</script>';
1500 1500 
 ?>
1501 1501 
     	    </div>
1502 
-	    <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
1502 
+	    <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> -->
1503 1503 
 <?php
1504 1504 
 	}
1505 1505 
 ?>
Please login to merge, or discard this patch.
Braces   +169 added lines, -80 removed lines patch added patch discarded remove patch 
@@ -22,11 +22,15 @@  discard block
 
 block discarded – undo
22 22 
 	require_once('require/class.Spotter.php');
23 23 
 }
24 24
25 
-if (!isset($filter_name)) $filter_name = '';
25 
+if (!isset($filter_name)) {
26 
+	$filter_name = '';
27 
+}
26 28 
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
27 29 
 if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) {
28 
-	if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
29 
-}
30 
+	if (isset($globalFilter['airline'])) {
31 
+		$airline_icao = $globalFilter['airline'][0];
32 
+	}
33 
+	}
30 34 
 if ($type == 'aircraft' && $airline_icao != '' && $airline_icao != 'all') {
31 35 
 	$Spotter = new Spotter();
32 36 
 	$airline_info = $Spotter->getAllAirlineInfo($airline_icao);
 
@@ -61,7 +65,12 @@  discard block
 
 block discarded – undo
61 65 
 <script type="text/javascript" src="<?php echo $globalURL; ?>/js/datamaps.world.min.js"></script>
62 66 
 <div class="column">
63 67 
     <div class="info">
64 
-            <h1><?php if (isset($airline_name)) echo _("Statistics for ").$airline_name; else echo _("Statistics"); ?></h1>
68 
+            <h1><?php if (isset($airline_name)) {
69 
+	echo _("Statistics for ").$airline_name;
70 
+} else {
71 
+	echo _("Statistics");
72 
+}
73 
+?></h1>
65 74 
 <?php
66 75 
 if ($type == 'aircraft') {
67 76 
 	$last_update = $Stats->getLastStatsUpdate();
 
@@ -73,7 +82,9 @@  discard block
 
 block discarded – undo
73 82 
 if (isset($last_update[0]['value'])) {
74 83 
 	date_default_timezone_set('UTC');
75 84 
 	$lastupdate = strtotime($last_update[0]['value']);
76 
-	if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone);
85 
+	if (isset($globalTimezone) && $globalTimezone != '') {
86 
+		date_default_timezone_set($globalTimezone);
87 
+	}
77 88 
 	print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>';
78 89 
 }
79 90 
 
@@ -158,8 +169,11 @@  discard block
 
 block discarded – undo
158 169 
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
159 170 
 		$aircraft_data = '';
160 171 
 		foreach($aircraft_array as $aircraft_item) {
161 
-			if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
162 
-			else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
172 
+			if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') {
173 
+				$aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
174 
+			} else {
175 
+				$aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],';
176 
+			}
163 177 
 		}
164 178 
 		$aircraft_data = substr($aircraft_data, 0, -1);
165 179 
 		print 'var series = ['.$aircraft_data.'];';
 
@@ -176,11 +190,17 @@  discard block
 
 block discarded – undo
176 190 
 <?php
177 191 
 	if ($year != '' && $month != '') {
178 192 
 ?>
179 
-            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
193 
+            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
194 
+	echo '/'.$airline_icao;
195 
+}
196 
+?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
180 197 
 <?php
181 198 
 	} else {
182 199 
 ?>
183 
-            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
200 
+            	    <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
201 
+	echo '/'.$airline_icao;
202 
+}
203 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
184 204 
 <?php
185 205 
 	}
186 206 
 ?>
 
@@ -209,11 +229,15 @@  discard block
 
 block discarded – undo
209 229 
 			print '</script>';
210 230 
 			if ($year != '' && $month != '') {
211 231 
 				print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
212 
-				if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
232 
+				if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
233 
+					echo '/'.$airline_icao;
234 
+				}
213 235 
 				print '/'.$year.'/'.$month.'/" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
214 236 
 			} else {
215 237 
 				print '<div class="more"><a href="'.$globalURL.'/statistics/airline';
216 
-				if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
238 
+				if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
239 
+					echo '/'.$airline_icao;
240 
+				}
217 241 
 				print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
218 242 
 			}
219 243 
 			print '</div>';
 
@@ -233,8 +257,9 @@  discard block
 
 block discarded – undo
233 257 
                 <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2>
234 258 
 <?php
235 259 
 	$marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month);
236 
-	if (count($marine_array) == 0) print _("No data available");
237 
-	else {
260 
+	if (count($marine_array) == 0) {
261 
+		print _("No data available");
262 
+	} else {
238 263 
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
239 264 
 		$marine_data = '';
240 265 
 		foreach($marine_array as $marine_item) {
 
@@ -278,8 +303,9 @@  discard block
 
 block discarded – undo
278 303 
                 <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2>
279 304 
 <?php
280 305 
 	$tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month);
281 
-	if (count($tracker_array) == 0) print _("No data available");
282 
-	else {
306 
+	if (count($tracker_array) == 0) {
307 
+		print _("No data available");
308 
+	} else {
283 309 
 		print '<div id="chart1" class="chart" width="100%"></div><script>';
284 310 
 		$tracker_data = '';
285 311 
 		foreach($tracker_array as $tracker_item) {
 
@@ -323,8 +349,9 @@  discard block
 
 block discarded – undo
323 349 
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
324 350 
 <?php
325 351 
 		$owner_array = $Satellite->countAllOwners(true);
326 
-		if (count($owner_array) == 0) print _("No data available");
327 
-		else {
352 
+		if (count($owner_array) == 0) {
353 
+			print _("No data available");
354 
+		} else {
328 355 
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
329 356 
 			$owner_data = '';
330 357 
 			foreach($owner_array as $owner_item) {
 
@@ -343,7 +370,10 @@  discard block
 
 block discarded – undo
343 370 
 ?>
344 371 
                <!--
345 372 
                 <div class="more">
346 
-                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
373 
+                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
374 
+	echo '/'.$airline_icao;
375 
+}
376 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
347 377 
                 </div>
348 378 
                 -->
349 379 
             </div>
 
@@ -352,8 +382,9 @@  discard block
 
 block discarded – undo
352 382 
                 <h2><?php echo _("Top 10 Most Common Countries Owners"); ?></h2>
353 383 
 <?php
354 384 
 		$countries_array = $Satellite->countAllCountriesOwners(true);
355 
-		if (count($countries_array) == 0) print _("No data available");
356 
-		else {
385 
+		if (count($countries_array) == 0) {
386 
+			print _("No data available");
387 
+		} else {
357 388 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
358 389 
 			$owner_data = '';
359 390 
 			foreach($countries_array as $owner_item) {
 
@@ -372,7 +403,10 @@  discard block
 
 block discarded – undo
372 403 
 ?>
373 404 
 	    <!--
374 405 
                 <div class="more">
375 
-                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
406 
+                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
407 
+	echo '/'.$airline_icao;
408 
+}
409 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
376 410 
                 </div>
377 411 
                 -->
378 412 
             </div>
 
@@ -384,8 +418,9 @@  discard block
 
 block discarded – undo
384 418 
                 <h2><?php echo _("Top 10 Most Common Launch Sites"); ?></h2>
385 419 
 <?php
386 420 
 		$launch_site_array = $Satellite->countAllLaunchSite(true);
387 
-		if (count($launch_site_array) == 0) print _("No data available");
388 
-		else {
421 
+		if (count($launch_site_array) == 0) {
422 
+			print _("No data available");
423 
+		} else {
389 424 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
390 425 
 			$launch_site_data = '';
391 426 
 			foreach($launch_site_array as $launch_site_item) {
 
@@ -404,7 +439,10 @@  discard block
 
 block discarded – undo
404 439 
 ?>
405 440 
                <!--
406 441 
                 <div class="more">
407 
-                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
442 
+                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
443 
+	echo '/'.$airline_icao;
444 
+}
445 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
408 446 
                 </div>
409 447 
                 -->
410 448 
             </div>
 
@@ -427,8 +465,9 @@  discard block
 
 block discarded – undo
427 465 
                 <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2>
428 466 
 <?php
429 467 
 		$pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month);
430 
-		if (count($pilot_array) == 0) print _("No data available");
431 
-		else {
468 
+		if (count($pilot_array) == 0) {
469 
+			print _("No data available");
470 
+		} else {
432 471 
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
433 472 
 			$pilot_data = '';
434 473 
 			foreach($pilot_array as $pilot_item) {
 
@@ -446,7 +485,9 @@  discard block
 
 block discarded – undo
446 485 
 		}
447 486 
 		print '<div class="more">';
448 487 
 		print '<a href="'.$globalURL.'/statistics/pilot';
449 
-		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
488 
+		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
489 
+			echo '/'.$airline_icao;
490 
+		}
450 491 
 		print'" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a>';
451 492 
 		print '</div>';
452 493 
 ?>
 
@@ -462,8 +503,9 @@  discard block
 
 block discarded – undo
462 503 
                 <h2><?php echo _("Top 10 Most Common Owners"); ?></h2>
463 504 
 <?php
464 505 
 		$owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month);
465 
-		if (count($owner_array) == 0) print _("No data available");
466 
-		else {
506 
+		if (count($owner_array) == 0) {
507 
+			print _("No data available");
508 
+		} else {
467 509 
 			print '<div id="chart7" class="chart" width="100%"></div><script>';
468 510 
 			$owner_data = '';
469 511 
 			foreach($owner_array as $owner_item) {
 
@@ -481,7 +523,10 @@  discard block
 
 block discarded – undo
481 523 
 		}
482 524 
 ?>
483 525 
                 <div class="more">
484 
-                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
526 
+                    <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
527 
+	echo '/'.$airline_icao;
528 
+}
529 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
485 530 
                 </div>
486 531 
             </div>
487 532 
         
@@ -494,8 +539,9 @@  discard block
 
 block discarded – undo
494 539 
                 <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2>
495 540 
 <?php
496 541 
 	 //$flightover_array = $Stats->countAllFlightOverCountries();
497 
-		if (count($flightover_array) == 0) print _("No data available");
498 
-		else {
542 
+		if (count($flightover_array) == 0) {
543 
+			print _("No data available");
544 
+		} else {
499 545 
 			print '<div id="chart10" class="chart" width="100%"></div><script>';
500 546 
 			print 'var series = [';
501 547 
 			$flightover_data = '';
 
@@ -537,7 +583,10 @@  discard block
 
 block discarded – undo
537 583 
 		}
538 584 
 ?>
539 585 
                 <div class="more">
540 
-                    <a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
586 
+                    <a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
587 
+	echo '/'.$airline_icao;
588 
+}
589 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
541 590 
                 </div>
542 591 
             </div>
543 592 
 <?php
 
@@ -555,8 +604,9 @@  discard block
 
 block discarded – undo
555 604 
 	<div class="col-md-6">
556 605 
             <h2><?php echo _("Top 20 Most Common Country a Vessel was inside"); ?></h2>
557 606 
 <?php
558 
-	if (count($flightover_array) == 0) print _("No data available");
559 
-	else {
607 
+	if (count($flightover_array) == 0) {
608 
+		print _("No data available");
609 
+	} else {
560 610 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
561 611 
 		print 'var series = [';
562 612 
 		$flightover_data = '';
 
@@ -612,8 +662,9 @@  discard block
 
 block discarded – undo
612 662 
 	<div class="col-md-6">
613 663 
             <h2><?php echo _("Top 20 Most Common Country a Tracker was inside"); ?></h2>
614 664 
 <?php
615 
-	if (count($flightover_array) == 0) print _("No data available");
616 
-	else {
665 
+	if (count($flightover_array) == 0) {
666 
+		print _("No data available");
667 
+	} else {
617 668 
 		print '<div id="chart10" class="chart" width="100%"></div><script>';
618 669 
 		print 'var series = [';
619 670 
 		$flightover_data = '';
 
@@ -719,7 +770,9 @@  discard block
 
 block discarded – undo
719 770 
 		});";
720 771 
 		print '</script>';
721 772 
 		print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure';
722 
-		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
773 
+		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
774 
+			echo '/'.$airline_icao;
775 
+		}
723 776 
 		print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
724 777 
 	}
725 778 
 ?>
 
@@ -781,7 +834,9 @@  discard block
 
 block discarded – undo
781 834 
 		});";
782 835 
 		print '</script>';
783 836 
 		print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival';
784 
-		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao;
837 
+		if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
838 
+			echo '/'.$airline_icao;
839 
+		}
785 840 
 		print '" class="btn btn-default btn" role="button">'._("See full statistic").'&raquo;</a></div>';
786 841 
 	}
787 842 
 ?>
 
@@ -800,8 +855,9 @@  discard block
 
 block discarded – undo
800 855 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
801 856 
 <?php
802 857 
 		$year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name);
803 
-		if (count($year_array) == 0) print _("No data available");
804 
-		else {
858 
+		if (count($year_array) == 0) {
859 
+			print _("No data available");
860 
+		} else {
805 861 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
806 862 
 			$year_data = '';
807 863 
 			$year_cnt = '';
 
@@ -820,7 +876,10 @@  discard block
 
 block discarded – undo
820 876 
 		}
821 877 
 ?>
822 878 
                 <div class="more">
823 
-                    <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
879 
+                    <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
880 
+	echo '/'.$airline_icao;
881 
+}
882 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
824 883 
                 </div>
825 884 
             </div>
826 885 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 
@@ -828,8 +887,9 @@  discard block
 
 block discarded – undo
828 887 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
829 888 
 <?php
830 889 
 		$month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name);
831 
-		if (count($month_array) == 0) print _("No data available");
832 
-		else {
890 
+		if (count($month_array) == 0) {
891 
+			print _("No data available");
892 
+		} else {
833 893 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
834 894 
 			$month_data = '';
835 895 
 			$month_cnt = '';
 
@@ -848,7 +908,10 @@  discard block
 
 block discarded – undo
848 908 
 		}
849 909 
 ?>
850 910 
                 <div class="more">
851 
-                    <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
911 
+                    <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
912 
+	echo '/'.$airline_icao;
913 
+}
914 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
852 915 
                 </div>
853 916 
             </div>
854 917 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 
@@ -857,8 +920,9 @@  discard block
 
 block discarded – undo
857 920 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
858 921 
 <?php
859 922 
 		$date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name);
860 
-		if (empty($date_array)) print _("No data available");
861 
-		else {
923 
+		if (empty($date_array)) {
924 
+			print _("No data available");
925 
+		} else {
862 926 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
863 927 
 			$date_data = '';
864 928 
 			$date_cnt = '';
 
@@ -877,7 +941,10 @@  discard block
 
 block discarded – undo
877 941 
 		}
878 942 
 ?>
879 943 
                 <div class="more">
880 
-                    <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
944 
+                    <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
945 
+	echo '/'.$airline_icao;
946 
+}
947 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
881 948 
                 </div>
882 949 
             </div>
883 950 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 
@@ -885,8 +952,9 @@  discard block
 
 block discarded – undo
885 952 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
886 953 
 <?php
887 954 
 		$hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name);
888 
-		if (empty($hour_array)) print _("No data available");
889 
-		else {
955 
+		if (empty($hour_array)) {
956 
+			print _("No data available");
957 
+		} else {
890 958 
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
891 959 
 			$hour_data = '';
892 960 
 			$hour_cnt = '';
 
@@ -905,7 +973,10 @@  discard block
 
 block discarded – undo
905 973 
 		}
906 974 
 ?>
907 975 
                 <div class="more">
908 
-                    <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
976 
+                    <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
977 
+	echo '/'.$airline_icao;
978 
+}
979 
+?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>&raquo;</a>
909 980 
                 </div>
910 981 
             </div>
911 982 
     <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> -->
 
@@ -925,8 +996,9 @@  discard block
 
 block discarded – undo
925 996 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
926 997 
 <?php
927 998 
 		$year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name);
928 
-		if (count($year_array) == 0) print _("No data available");
929 
-		else {
999 
+		if (count($year_array) == 0) {
1000 
+			print _("No data available");
1001 
+		} else {
930 1002 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
931 1003 
 			$year_data = '';
932 1004 
 			$year_cnt = '';
 
@@ -954,8 +1026,9 @@  discard block
 
 block discarded – undo
954 1026 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
955 1027 
 <?php
956 1028 
 		$month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name);
957 
-		if (count($month_array) == 0) print _("No data available");
958 
-		else {
1029 
+		if (count($month_array) == 0) {
1030 
+			print _("No data available");
1031 
+		} else {
959 1032 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
960 1033 
 			$month_data = '';
961 1034 
 			$month_cnt = '';
 
@@ -983,8 +1056,9 @@  discard block
 
 block discarded – undo
983 1056 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
984 1057 
 <?php
985 1058 
 		$date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name);
986 
-		if (empty($date_array)) print _("No data available");
987 
-		else {
1059 
+		if (empty($date_array)) {
1060 
+			print _("No data available");
1061 
+		} else {
988 1062 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
989 1063 
 			$date_data = '';
990 1064 
 			$date_cnt = '';
 
@@ -1011,8 +1085,9 @@  discard block
 
 block discarded – undo
1011 1085 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
1012 1086 
 <?php
1013 1087 
 		$hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name);
1014 
-		if (empty($hour_array)) print _("No data available");
1015 
-		else {
1088 
+		if (empty($hour_array)) {
1089 
+			print _("No data available");
1090 
+		} else {
1016 1091 
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
1017 1092 
 			$hour_data = '';
1018 1093 
 			$hour_cnt = '';
 
@@ -1051,8 +1126,9 @@  discard block
 
 block discarded – undo
1051 1126 
                 <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2>
1052 1127 
 <?php
1053 1128 
 		$year_array = $Tracker->countAllMonthsLastYear(true);
1054 
-		if (count($year_array) == 0) print _("No data available");
1055 
-		else {
1129 
+		if (count($year_array) == 0) {
1130 
+			print _("No data available");
1131 
+		} else {
1056 1132 
 			print '<div id="chart8" class="chart" width="100%"></div><script>';
1057 1133 
 			$year_data = '';
1058 1134 
 			$year_cnt = '';
 
@@ -1080,8 +1156,9 @@  discard block
 
 block discarded – undo
1080 1156 
                 <h2><?php echo _("Busiest Day in the last Month"); ?></h2>
1081 1157 
 <?php
1082 1158 
 		$month_array = $Tracker->countAllDatesLastMonth();
1083 
-		if (count($month_array) == 0) print _("No data available");
1084 
-		else {
1159 
+		if (count($month_array) == 0) {
1160 
+			print _("No data available");
1161 
+		} else {
1085 1162 
 			print '<div id="chart9" class="chart" width="100%"></div><script>';
1086 1163 
 			$month_data = '';
1087 1164 
 			$month_cnt = '';
 
@@ -1109,8 +1186,9 @@  discard block
 
 block discarded – undo
1109 1186 
                 <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2>
1110 1187 
 <?php
1111 1188 
 		$date_array = $Tracker->countAllDatesLast7Days();
1112 
-		if (empty($date_array)) print _("No data available");
1113 
-		else {
1189 
+		if (empty($date_array)) {
1190 
+			print _("No data available");
1191 
+		} else {
1114 1192 
 			print '<div id="chart5" class="chart" width="100%"></div><script>';
1115 1193 
 			$date_data = '';
1116 1194 
 			$date_cnt = '';
 
@@ -1137,8 +1215,9 @@  discard block
 
 block discarded – undo
1137 1215 
                 <h2><?php echo _("Busiest Time of the Day"); ?></h2>
1138 1216 
 <?php
1139 1217 
 		$hour_array = $Tracker->countAllHours('hour',true);
1140 
-		if (empty($hour_array)) print _("No data available");
1141 
-		else {
1218 
+		if (empty($hour_array)) {
1219 
+			print _("No data available");
1220 
+		} else {
1142 1221 
 			print '<div id="chart6" class="chart" width="100%"></div><script>';
1143 1222 
 			$hour_data = '';
1144 1223 
 			$hour_cnt = '';
 
@@ -1177,8 +1256,9 @@  discard block
 
 block discarded – undo
1177 1256 
                 <h2><?php echo _("Busiest Launch Months of the last 12 Months"); ?></h2>
1178 1257 
 <?php
1179 1258 
 		$year_array = $Satellite->countAllMonthsLastYear();
1180 
-		if (count($year_array) == 0) print _("No data available");
1181 
-		else {
1259 
+		if (count($year_array) == 0) {
1260 
+			print _("No data available");
1261 
+		} else {
1182 1262 
 			print '<div id="chart21" class="chart" width="100%"></div><script>';
1183 1263 
 			$year_data = '';
1184 1264 
 			$year_cnt = '';
 
@@ -1208,8 +1288,9 @@  discard block
 
 block discarded – undo
1208 1288 
                 <h2><?php echo _("Busiest Launch Years of the last 10 Years"); ?></h2>
1209 1289 
 <?php
1210 1290 
 		$year_array = $Satellite->countAllYears();
1211 
-		if (count($year_array) == 0) print _("No data available");
1212 
-		else {
1291 
+		if (count($year_array) == 0) {
1292 
+			print _("No data available");
1293 
+		} else {
1213 1294 
 			print '<div id="chart22" class="chart" width="100%"></div><script>';
1214 1295 
 			$year_data = '';
1215 1296 
 			$year_cnt = '';
 
@@ -1251,8 +1332,9 @@  discard block
 
 block discarded – undo
1251 1332 
                 <h2><?php echo _("Fatalities by Years"); ?></h2>
1252 1333 
 <?php
1253 1334 
 		$year_array = $Stats->countFatalitiesByYear();
1254 
-		if (count($year_array) == 0) print _("No data available");
1255 
-		else {
1335 
+		if (count($year_array) == 0) {
1336 
+			print _("No data available");
1337 
+		} else {
1256 1338 
 			print '<div id="chart32" class="chart" width="100%"></div><script>';
1257 1339 
 			$year_data = '';
1258 1340 
 			$year_cnt = '';
 
@@ -1281,8 +1363,9 @@  discard block
 
 block discarded – undo
1281 1363 
                 <h2><?php echo _("Fatalities last 12 Months"); ?></h2>
1282 1364 
 <?php
1283 1365 
 		$year_array = $Stats->countFatalitiesLast12Months();
1284 
-		if (count($year_array) == 0) print _("No data available");
1285 
-		else {
1366 
+		if (count($year_array) == 0) {
1367 
+			print _("No data available");
1368 
+		} else {
1286 1369 
 			print '<div id="chart33" class="chart" width="100%"></div><script>';
1287 1370 
 			$year_data = '';
1288 1371 
 			$year_cnt = '';
 
@@ -1353,8 +1436,11 @@  discard block
 
 block discarded – undo
1353 1436 
 					$distance = $distance;
1354 1437 
 					$unit = 'km';
1355 1438 
 				}
1356 
-				if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
1357 
-				else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
1439 
+				if (!isset($polar_data)) {
1440 
+					$polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
1441 
+				} else {
1442 
+					$polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}';
1443 
+				}
1358 1444 
 			}
1359 1445 
 ?>
1360 1446 
             <div class="col-md-6">
 
@@ -1418,9 +1504,12 @@  discard block
 
 block discarded – undo
1418 1504 
 		foreach ($msg as $eachmsg) {
1419 1505 
 			//$eachmsg = $msg[0];
1420 1506 
 			$data = $eachmsg['source_data'];
1421 
-			if ($data > 500) $max = (round(($data+100)/100))*100;
1422 
-			else $max = 500;
1423 
-?>
1507 
+			if ($data > 500) {
1508 
+				$max = (round(($data+100)/100))*100;
1509 
+			} else {
1510 
+				$max = 500;
1511 
+			}
1512 
+			?>
1424 1513 
         	<div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div>
1425 1514 
         	<script>
1426 1515 
 		      var g = new JustGage({
Please login to merge, or discard this patch.
scripts/update_db.php 1 patch
Braces   +30 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -9,7 +9,9 @@  discard block
 
 block discarded – undo
9 9 
 if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') {
10 10 
 	exec("ps ux", $output, $result);
11 11 
 	$j = 0;
12 
-	foreach ($output as $line) if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++;
12 
+	foreach ($output as $line) {
13 
+		if(strpos($line, dirname(__FILE__)."/update_db.php") && !strpos($line, "sh ")) $j++;
14 
+	}
13 15 
 	if ($j > 1) {
14 16 
 		echo "Script is already runnning...";
15 17 
 		die();
 
@@ -29,14 +31,18 @@  discard block
 
 block discarded – undo
29 31 
 			$update_db->update_notam();
30 32 
 		}
31 33 
 		$update_db->insert_last_notam_update();
32 
-	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) echo "NOTAM are only updated once a day.\n";
34 
+	} elseif (isset($globalDebug) && $globalDebug && isset($globalNOTAM) && $globalNOTAM) {
35 
+		echo "NOTAM are only updated once a day.\n";
36 
+	}
33 37 
 	if ($update_db->check_last_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
34 38 
 		$update_db->update_all();
35 39 
 	//	require_once(dirname(__FILE__).'/../require/class.Spotter.php');
36 40 
 	//	$Spotter = new Spotter();
37 41 
 	//	$Spotter->updateFieldsFromOtherTables();
38 42 
 		$update_db->insert_last_update();
39 
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
43 
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM)) {
44 
+		echo "DB are populated with external data only every 15 days ! Files are not updated more often.\n";
45 
+	}
40 46 
 	if (isset($globalWaypoints) && $globalWaypoints && $update_db->check_last_airspace_update()) {
41 47 
 		echo "Check if new airspace version exist...";
42 48 
 		echo $update_db->update_airspace_fam();
 
@@ -45,8 +51,11 @@  discard block
 
 block discarded – undo
45 51 
 	if (isset($globalGeoid) && $globalGeoid && $update_db->check_last_geoid_update()) {
46 52 
 		echo "Check if new geoid version exist...";
47 53 
 		$error = $update_db->update_geoid_fam();
48 
-		if ($error == '') $update_db->insert_last_geoid_update();
49 
-		else echo $error;
54 
+		if ($error == '') {
55 
+			$update_db->insert_last_geoid_update();
56 
+		} else {
57 
+			echo $error;
58 
+		}
50 59 
 	}
51 60 
 	if (isset($globalMarine) && $globalMarine && $update_db->check_last_marine_identity_update()) {
52 61 
 		echo "Check if new marine identity version exist...";
 
@@ -64,13 +73,17 @@  discard block
 
 block discarded – undo
64 73 
 			//echo "Done";
65 74 
 		}
66 75 
 		$update_db->insert_last_owner_update();
67 
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Owner are only updated every 15 days.\n";
76 
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
77 
+		echo "Owner are only updated every 15 days.\n";
78 
+	}
68 79
69 80 
 	if ($update_db->check_last_airlines_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
70 81 
 		echo "Updating airlines...\n";
71 82 
 		echo $update_db->update_airlines_fam();
72 83 
 		$update_db->insert_last_airlines_update();
73 
-	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Airlines are only updated every 15 days.\n";
84 
+	} elseif (isset($globalDebug) && $globalDebug && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
85 
+		echo "Airlines are only updated every 15 days.\n";
86 
+	}
74 87
75 88 
 	if (isset($globalAccidents) && $globalAccidents && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
76 89 
 		require_once(dirname(__FILE__).'/../require/class.Accident.php');
 
@@ -79,7 +92,9 @@  discard block
 
 block discarded – undo
79 92 
 		if ($Accident->check_last_accidents_update()) {
80 93 
 			$Accident->download_update();
81 94 
 			$Accident->insert_last_accidents_update();
82 
-		} else echo "Accidents are updated once a day.\n";
95 
+		} else {
96 
+			echo "Accidents are updated once a day.\n";
97 
+		}
83 98 
 	}
84 99
85 100 
 }
 
@@ -92,15 +107,19 @@  discard block
 
 block discarded – undo
92 107 
 	if ($METAR->check_last_update()) {
93 108 
 		$METAR->addMETARCycle();
94 109 
 		$METAR->insert_last_update();
95 
-	} else echo "METAR are only updated every 30 minutes.\n";
96 
-}
110 
+	} else {
111 
+		echo "METAR are only updated every 30 minutes.\n";
112 
+	}
113 
+	}
97 114
98 115 
 if (isset($globalSchedules) && $globalSchedules && $update_db->check_last_schedules_update() && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
99 116 
 	echo "Updating schedules...";
100 117 
 	//$update_db->update_oneworld();
101 118 
 	$update_db->update_skyteam();
102 119 
 	$update_db->insert_last_schedules_update();
103 
-} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) echo "Schedules are only updated every 15 days.\n";
120 
+} elseif (isset($globalDebug) && $globalDebug && isset($globalOwner) && $globalOwner && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS)) {
121 
+	echo "Schedules are only updated every 15 days.\n";
122 
+}
104 123
105 124 
 if (isset($globalArchiveMonths) && $globalArchiveMonths > 0) {
106 125 
 	echo "Updating statistics and archive old data...\n";
Please login to merge, or discard this patch.
require/class.Stats.php 2 patches
Spacing   +586 added lines, -586 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 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 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 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 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 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 countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
221 
+	public function countAllAirlineCountries($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,7 +227,7 @@  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);
 
@@ -235,32 +235,32 @@  discard block
 
 block discarded – undo
235 235 
 		if (empty($all)) {
236 236 
 			$Spotter = new Spotter($this->db);
237 237 
 			$filters = array();
238 
-			$filters = array('year' => $year,'month' => $month);
238 
+			$filters = array('year' => $year, 'month' => $month);
239 239 
 			if ($filter_name != '') {
240 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
240 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
241 241 
 			}
242 242 
 			//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
243 
-			$all = $Spotter->countAllAirlineCountries($limit,$filters);
243 
+			$all = $Spotter->countAllAirlineCountries($limit, $filters);
244 244 
 		}
245 245 
 		return $all;
246 246 
 	}
247 
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
247 
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
248 248 
 		global $globalStatsFilters;
249 249 
 		if ($filter_name == '') $filter_name = $this->filter_name;
250 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
250 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
251 251 
 			$Spotter = new Spotter($this->db);
252 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
252 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
253 253 
 			$alliance_airlines = array();
254 254 
 			foreach ($airlines as $airline) {
255 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
255 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
256 256 
 			}
257 257 
 			if ($year == '' && $month == '') {
258 
-				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";
259 
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
258 
+				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";
259 
+				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";
260 260 
 				try {
261 261 
 					$sth = $this->db->prepare($query);
262 262 
 					$sth->execute(array(':filter_name' => $filter_name));
263 
-				} catch(PDOException $e) {
263 
+				} catch (PDOException $e) {
264 264 
 					echo "error : ".$e->getMessage();
265 265 
 				}
266 266 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -271,21 +271,21 @@  discard block
 
 block discarded – undo
271 271 
 				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";
272 272 
 				try {
273 273 
 					$sth = $this->db->prepare($query);
274 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
275 
-				} catch(PDOException $e) {
274 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
275 
+				} catch (PDOException $e) {
276 276 
 					echo "error : ".$e->getMessage();
277 277 
 				}
278 278 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
279 279 
 			} else $all = array();
280 280 
 		}
281 281 
 		if (empty($all)) {
282 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
283 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
282 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
283 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
284 284 
 			} else {
285 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
285 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
286 286 
 			}
287 287 
 			if ($filter_name != '') {
288 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
288 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
289 289 
 			}
290 290 
 			$Spotter = new Spotter($this->db);
291 291 
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
 
@@ -294,23 +294,23 @@  discard block
 
 block discarded – undo
294 294 
 		return $all;
295 295 
 	}
296 296
297 
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
297 
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
298 298 
 		global $globalStatsFilters;
299 299 
 		if ($filter_name == '') $filter_name = $this->filter_name;
300 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
300 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
301 301 
 			$Spotter = new Spotter($this->db);
302 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
302 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
303 303 
 			$alliance_airlines = array();
304 304 
 			foreach ($airlines as $airline) {
305 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
305 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
306 306 
 			}
307 307 
 			if ($year == '' && $month == '') {
308 
-				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";
309 
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
308 
+				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";
309 
+				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";
310 310 
 				try {
311 311 
 					$sth = $this->db->prepare($query);
312 312 
 					$sth->execute(array(':filter_name' => $filter_name));
313 
-				} catch(PDOException $e) {
313 
+				} catch (PDOException $e) {
314 314 
 					echo "error : ".$e->getMessage();
315 315 
 				}
316 316 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -321,61 +321,61 @@  discard block
 
 block discarded – undo
321 321 
 				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";
322 322 
 				try {
323 323 
 					$sth = $this->db->prepare($query);
324 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
325 
-				} catch(PDOException $e) {
324 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
325 
+				} catch (PDOException $e) {
326 326 
 					echo "error : ".$e->getMessage();
327 327 
 				}
328 328 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
329 329 
 			} else $all = array();
330 330 
 		}
331 331 
 		if (empty($all)) {
332 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
333 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
332 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
333 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
334 334 
 			} else {
335 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
335 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
336 336 
 			}
337 337 
 			if ($filter_name != '') {
338 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
338 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
339 339 
 			}
340 340 
 			$Spotter = new Spotter($this->db);
341 341 
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
342 
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
342 
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
343 343 
 		}
344 344 
 		return $all;
345 345 
 	}
346 346 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
347 347 
 		global $globalStatsFilters;
348 348 
 		if ($filter_name == '') $filter_name = $this->filter_name;
349 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
349 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
350 350 
 			$Spotter = new Spotter($this->db);
351 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
351 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
352 352 
 			$alliance_airlines = array();
353 353 
 			foreach ($airlines as $airline) {
354 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
354 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
355 355 
 			}
356 
-			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";
357 
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
356 
+			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";
357 
+			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";
358 358 
 			$query_values = array(':filter_name' => $filter_name);
359 359 
 		} else {
360 360 
 			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";
361 361 
 			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";
362 
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
362 
+			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
363 363 
 		}
364 364 
 		try {
365 365 
 			$sth = $this->db->prepare($query);
366 366 
 			$sth->execute($query_values);
367 
-		} catch(PDOException $e) {
367 
+		} catch (PDOException $e) {
368 368 
 			echo "error : ".$e->getMessage();
369 369 
 		}
370 370 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
371 371 
 		if (empty($all)) {
372 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
373 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
372 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
373 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
374 374 
 			} else {
375 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
375 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
376 376 
 			}
377 377 
 			if ($filter_name != '') {
378 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
378 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
379 379 
 			}
380 380 
 			$Spotter = new Spotter($this->db);
381 381 
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
 
@@ -384,7 +384,7 @@  discard block
 
 block discarded – undo
384 384 
 		return $all;
385 385 
 	}
386 386
387 
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
387 
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
388 388 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
389 389 
 		if ($filter_name == '') $filter_name = $this->filter_name;
390 390 
 		if ($year == '' && $month == '') {
 
@@ -393,7 +393,7 @@  discard block
 
 block discarded – undo
393 393 
 			if (isset($forsource)) {
394 394 
 				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";
395 395 
 				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";
396 
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
396 
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
397 397 
 			} else {
398 398 
 				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";
399 399 
 				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";
 
@@ -402,7 +402,7 @@  discard block
 
 block discarded – undo
402 402 
 			try {
403 403 
 				$sth = $this->db->prepare($query);
404 404 
 				$sth->execute($query_values);
405 
-			} catch(PDOException $e) {
405 
+			} catch (PDOException $e) {
406 406 
 				echo "error : ".$e->getMessage();
407 407 
 			}
408 408 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -410,32 +410,32 @@  discard block
 
 block discarded – undo
410 410 
                 if (empty($all)) {
411 411 
 	                $Spotter = new Spotter($this->db);
412 412 
             		$filters = array();
413 
-			$filters = array('year' => $year,'month' => $month);
413 
+			$filters = array('year' => $year, 'month' => $month);
414 414 
             		if ($filter_name != '') {
415 
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
415 
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
416 416 
 			}
417 417 
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
418 
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
418 
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
419 419 
                 }
420 420 
                 return $all;
421 421 
 	}
422 
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
422 
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
423 423 
 		global $globalStatsFilters;
424 424 
 		if ($filter_name == '') $filter_name = $this->filter_name;
425 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
425 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
426 426 
 			$Spotter = new Spotter($this->db);
427 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
427 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
428 428 
 			$alliance_airlines = array();
429 429 
 			foreach ($airlines as $airline) {
430 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
430 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
431 431 
 			}
432 432 
 			if ($year == '' && $month == '') {
433 
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
434 
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
433 
+				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
434 
+				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
435 435 
 				try {
436 436 
 					$sth = $this->db->prepare($query);
437 437 
 					$sth->execute(array(':filter_name' => $filter_name));
438 
-				} catch(PDOException $e) {
438 
+				} catch (PDOException $e) {
439 439 
 					echo "error : ".$e->getMessage();
440 440 
 				}
441 441 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -446,45 +446,45 @@  discard block
 
 block discarded – undo
446 446 
 				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
447 447 
 				try {
448 448 
 					$sth = $this->db->prepare($query);
449 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
450 
-				} catch(PDOException $e) {
449 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
450 
+				} catch (PDOException $e) {
451 451 
 					echo "error : ".$e->getMessage();
452 452 
 				}
453 453 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
454 454 
 			} else $all = array();
455 455 
 		}
456 456 
 		if (empty($all)) {
457 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
458 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
457 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
458 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
459 459 
 			} else {
460 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
460 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
461 461 
 			}
462 462 
 			if ($filter_name != '') {
463 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
463 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
464 464 
 			}
465 465 
 			$Spotter = new Spotter($this->db);
466 466 
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
467 
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
467 
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
468 468 
 		}
469 469 
 		return $all;
470 470 
 	}
471 
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
471 
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
472 472 
 		global $globalStatsFilters;
473 473 
 		if ($filter_name == '') $filter_name = $this->filter_name;
474 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
474 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
475 475 
 			$Spotter = new Spotter($this->db);
476 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
476 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
477 477 
 			$alliance_airlines = array();
478 478 
 			foreach ($airlines as $airline) {
479 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
479 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
480 480 
 			}
481 481 
 			if ($year == '' && $month == '') {
482 
-				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";
483 
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
482 
+				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";
483 
+				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";
484 484 
 				 try {
485 485 
 					$sth = $this->db->prepare($query);
486 486 
 					$sth->execute(array(':filter_name' => $filter_name));
487 
-				} catch(PDOException $e) {
487 
+				} catch (PDOException $e) {
488 488 
 					echo "error : ".$e->getMessage();
489 489 
 				}
490 490 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -495,46 +495,46 @@  discard block
 
 block discarded – undo
495 495 
 				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";
496 496 
 				 try {
497 497 
 					$sth = $this->db->prepare($query);
498 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
499 
-				} catch(PDOException $e) {
498 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
499 
+				} catch (PDOException $e) {
500 500 
 					echo "error : ".$e->getMessage();
501 501 
 				}
502 502 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
503 503 
 			} else $all = array();
504 504 
 		}
505 505 
 		if (empty($all)) {
506 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
507 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
506 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
507 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
508 508 
 			} else {
509 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
509 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
510 510 
 			}
511 511 
 			if ($filter_name != '') {
512 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
512 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
513 513 
 			}
514 514 
 			$Spotter = new Spotter($this->db);
515 515 
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
516 
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
516 
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
517 517 
 		}
518 518 
 		return $all;
519 519 
 	}
520 
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
520 
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
521 521 
 		$Connection = new Connection($this->db);
522 522 
 		if ($filter_name == '') $filter_name = $this->filter_name;
523 523 
 		if ($Connection->tableExists('countries')) {
524 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
524 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
525 525 
 				$Spotter = new Spotter($this->db);
526 
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
526 
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
527 527 
 				if ($year == '' && $month == '') {
528 528 
 					$alliance_airlines = array();
529 529 
 					foreach ($airlines as $airline) {
530 
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
530 
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
531 531 
 					}
532 
-					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";
533 
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
532 
+					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";
533 
+					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";
534 534 
 					 try {
535 535 
 						$sth = $this->db->prepare($query);
536 536 
 						$sth->execute(array(':filter_name' => $filter_name));
537 
-					} catch(PDOException $e) {
537 
+					} catch (PDOException $e) {
538 538 
 						echo "error : ".$e->getMessage();
539 539 
 					}
540 540 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -546,8 +546,8 @@  discard block
 
 block discarded – undo
546 546 
 					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";
547 547 
 					 try {
548 548 
 						$sth = $this->db->prepare($query);
549 
-						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
550 
-					} catch(PDOException $e) {
549 
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
550 
+					} catch (PDOException $e) {
551 551 
 						echo "error : ".$e->getMessage();
552 552 
 					}
553 553 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -564,7 +564,7 @@  discard block
 
 block discarded – undo
564 564 
 			return array();
565 565 
 		}
566 566 
 	}
567 
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
567 
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
568 568 
 		global $globalStatsFilters;
569 569 
 		if ($filter_name == '') $filter_name = $this->filter_name;
570 570 
 		if ($year == '' && $month == '') {
 
@@ -572,41 +572,41 @@  discard block
 
 block discarded – undo
572 572 
 			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";
573 573 
 			try {
574 574 
 				$sth = $this->db->prepare($query);
575 
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
576 
-			} catch(PDOException $e) {
575 
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
576 
+			} catch (PDOException $e) {
577 577 
 				echo "error : ".$e->getMessage();
578 578 
 			}
579 579 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
580 580 
 		} else $all = array();
581 581 
 		if (empty($all)) {
582 
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
582 
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
583 583 
 			if ($filter_name != '') {
584 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
584 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
585 585 
 			}
586 586 
 			$Spotter = new Spotter($this->db);
587 587 
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
588 
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
588 
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
589 589 
 		}
590 590 
 		return $all;
591 591 
 	}
592 592
593 
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
593 
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
594 594 
 		global $globalStatsFilters;
595 595 
 		if ($filter_name == '') $filter_name = $this->filter_name;
596 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
596 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
597 597 
 			$Spotter = new Spotter($this->db);
598 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
598 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
599 599 
 			if ($year == '' && $month == '') {
600 600 
 				$alliance_airlines = array();
601 601 
 				foreach ($airlines as $airline) {
602 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
602 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
603 603 
 				}
604 
-				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";
605 
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
604 
+				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";
605 
+				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";
606 606 
 				try {
607 607 
 					$sth = $this->db->prepare($query);
608 608 
 					$sth->execute(array(':filter_name' => $filter_name));
609 
-				} catch(PDOException $e) {
609 
+				} catch (PDOException $e) {
610 610 
 					echo "error : ".$e->getMessage();
611 611 
 				}
612 612 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -617,45 +617,45 @@  discard block
 
 block discarded – undo
617 617 
 				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";
618 618 
 				try {
619 619 
 					$sth = $this->db->prepare($query);
620 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
621 
-				} catch(PDOException $e) {
620 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
621 
+				} catch (PDOException $e) {
622 622 
 					echo "error : ".$e->getMessage();
623 623 
 				}
624 624 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
625 625 
 			} else $all = array();
626 626 
 		}
627 627 
 		if (empty($all)) {
628 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
629 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
628 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
629 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
630 630 
 			} else {
631 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
631 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
632 632 
 			}
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 
 			$Spotter = new Spotter($this->db);
637 637 
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
638 
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
638 
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
639 639 
 		}
640 640 
 		return $all;
641 641 
 	}
642 
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
642 
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
643 643 
 		global $globalStatsFilters;
644 644 
 		if ($filter_name == '') $filter_name = $this->filter_name;
645 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
645 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
646 646 
 			$Spotter = new Spotter($this->db);
647 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
647 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
648 648 
 			if ($year == '' && $month == '') {
649 649 
 				$alliance_airlines = array();
650 650 
 				foreach ($airlines as $airline) {
651 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
651 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
652 652 
 				}
653 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
654 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
653 
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
654 
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
655 655 
 				try {
656 656 
 					$sth = $this->db->prepare($query);
657 657 
 					$sth->execute(array(':filter_name' => $filter_name));
658 
-				} catch(PDOException $e) {
658 
+				} catch (PDOException $e) {
659 659 
 					echo "error : ".$e->getMessage();
660 660 
 				}
661 661 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -666,27 +666,27 @@  discard block
 
 block discarded – undo
666 666 
 				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
667 667 
 				try {
668 668 
 					$sth = $this->db->prepare($query);
669 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
670 
-				} catch(PDOException $e) {
669 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
670 
+				} catch (PDOException $e) {
671 671 
 					echo "error : ".$e->getMessage();
672 672 
 				}
673 673 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
674 674 
 			} else $all = array();
675 675 
 		}
676 676 
 		if (empty($all)) {
677 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
678 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
677 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
678 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
679 679 
 			} else {
680 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
680 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
681 681 
 			}
682 682 
 			if ($filter_name != '') {
683 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
683 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
684 684 
 			}
685 685 
 			$Spotter = new Spotter($this->db);
686 686 
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
687 687 
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
688 
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
689 
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
688 
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
689 
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
690 690 
 			$all = array();
691 691 
 			foreach ($pall as $value) {
692 692 
 				$icao = $value['airport_departure_icao'];
 
@@ -702,27 +702,27 @@  discard block
 
 block discarded – undo
702 702 
 			foreach ($all as $key => $row) {
703 703 
 				$count[$key] = $row['airport_departure_icao_count'];
704 704 
 			}
705 
-			array_multisort($count,SORT_DESC,$all);
705 
+			array_multisort($count, SORT_DESC, $all);
706 706 
 		}
707 707 
 		return $all;
708 708 
 	}
709 
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
709 
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
710 710 
 		global $globalStatsFilters;
711 711 
 		if ($filter_name == '') $filter_name = $this->filter_name;
712 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
712 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
713 713 
 			$Spotter = new Spotter($this->db);
714 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
714 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
715 715 
 			if ($year == '' && $month == '') {
716 716 
 				$alliance_airlines = array();
717 717 
 				foreach ($airlines as $airline) {
718 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
718 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
719 719 
 				}
720 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
721 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
720 
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
721 
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
722 722 
 				try {
723 723 
 					$sth = $this->db->prepare($query);
724 724 
 					$sth->execute(array(':filter_name' => $filter_name));
725 
-				} catch(PDOException $e) {
725 
+				} catch (PDOException $e) {
726 726 
 					echo "error : ".$e->getMessage();
727 727 
 				}
728 728 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -733,27 +733,27 @@  discard block
 
 block discarded – undo
733 733 
 				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
734 734 
 				try {
735 735 
 					$sth = $this->db->prepare($query);
736 
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
737 
-				} catch(PDOException $e) {
736 
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
737 
+				} catch (PDOException $e) {
738 738 
 					echo "error : ".$e->getMessage();
739 739 
 				}
740 740 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
741 741 
 			} else $all = array();
742 742 
 		}
743 743 
 		if (empty($all)) {
744 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
745 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
744 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
745 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
746 746 
 			} else {
747 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
747 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
748 748 
 			}
749 749 
 			if ($filter_name != '') {
750 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
750 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
751 751 
 			}
752 752 
 			$Spotter = new Spotter($this->db);
753 753 
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
754 754 
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
755 
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
756 
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
755 
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
756 
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
757 757 
 			$all = array();
758 758 
 			foreach ($pall as $value) {
759 759 
 				$icao = $value['airport_arrival_icao'];
 
@@ -769,26 +769,26 @@  discard block
 
 block discarded – undo
769 769 
 			foreach ($all as $key => $row) {
770 770 
 				$count[$key] = $row['airport_arrival_icao_count'];
771 771 
 			}
772 
-			array_multisort($count,SORT_DESC,$all);
772 
+			array_multisort($count, SORT_DESC, $all);
773 773 
 		}
774 774 
 		return $all;
775 775 
 	}
776 
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
776 
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
777 777 
 		global $globalDBdriver, $globalStatsFilters;
778 778 
 		if ($filter_name == '') $filter_name = $this->filter_name;
779 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
779 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
780 780 
 			$Spotter = new Spotter($this->db);
781 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
781 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
782 782 
 			$alliance_airlines = array();
783 783 
 			foreach ($airlines as $airline) {
784 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
784 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
785 785 
 			}
786 786 
 			if ($globalDBdriver == 'mysql') {
787 
-				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";
788 
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
787 
+				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";
788 
+				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";
789 789 
 			} else {
790 
-				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";
791 
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
790 
+				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";
791 
+				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";
792 792 
 			}
793 793 
 			$query_data = array(':filter_name' => $filter_name);
794 794 
 		} else {
 
@@ -799,23 +799,23 @@  discard block
 
 block discarded – undo
799 799 
 				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";
800 800 
 				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";
801 801 
 			}
802 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
802 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
803 803 
 		}
804 804 
 		try {
805 805 
 			$sth = $this->db->prepare($query);
806 806 
 			$sth->execute($query_data);
807 
-		} catch(PDOException $e) {
807 
+		} catch (PDOException $e) {
808 808 
 			echo "error : ".$e->getMessage();
809 809 
 		}
810 810 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
811 811 
 		if (empty($all)) {
812 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
813 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
812 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
813 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
814 814 
 			} else {
815 815 
 				$filters = array('airlines' => array($stats_airline));
816 816 
 			}
817 817 
 			if ($filter_name != '') {
818 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
818 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
819 819 
 			}
820 820 
 			$Spotter = new Spotter($this->db);
821 821 
 			$all = $Spotter->countAllMonthsLastYear($filters);
 
@@ -823,57 +823,57 @@  discard block
 
 block discarded – undo
823 823 
 		return $all;
824 824 
 	}
825 825
826 
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
826 
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
827 827 
 		global $globalStatsFilters;
828 828 
 		if ($filter_name == '') $filter_name = $this->filter_name;
829 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
829 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
830 830 
 			$Spotter = new Spotter($this->db);
831 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
831 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
832 832 
 			$alliance_airlines = array();
833 833 
 			foreach ($airlines as $airline) {
834 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
834 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
835 835 
 			}
836 
-			$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";
836 
+			$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";
837 837 
 			$query_data = array(':filter_name' => $filter_name);
838 838 
 		} else {
839 839 
 			$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";
840 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
840 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
841 841 
 		}
842 842 
 		try {
843 843 
 			$sth = $this->db->prepare($query);
844 844 
 			$sth->execute($query_data);
845 
-		} catch(PDOException $e) {
845 
+		} catch (PDOException $e) {
846 846 
 			echo "error : ".$e->getMessage();
847 847 
 		}
848 848 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
849 849 
 		if (empty($all)) {
850 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
851 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
850 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
851 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
852 852 
 			} else {
853 853 
 				$filters = array('airlines' => array($stats_airline));
854 854 
 			}
855 855 
 			if ($filter_name != '') {
856 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
856 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
857 857 
 			}
858 858 
 			$Spotter = new Spotter($this->db);
859 859 
 			$all = $Spotter->countAllDatesLastMonth($filters);
860 860 
 		}
861 861 
 		return $all;
862 862 
 	}
863 
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
863 
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
864 864 
 		global $globalDBdriver, $globalStatsFilters;
865 865 
 		if ($filter_name == '') $filter_name = $this->filter_name;
866 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
866 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
867 867 
 			$Spotter = new Spotter($this->db);
868 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
868 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
869 869 
 			$alliance_airlines = array();
870 870 
 			foreach ($airlines as $airline) {
871 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
871 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
872 872 
 			}
873 873 
 			if ($globalDBdriver == 'mysql') {
874 
-				$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";
874 
+				$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";
875 875 
 			} else {
876 
-				$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";
876 
+				$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";
877 877 
 			}
878 878 
 			$query_data = array(':filter_name' => $filter_name);
879 879 
 		} else {
 
@@ -882,60 +882,60 @@  discard block
 
 block discarded – undo
882 882 
 			} else {
883 883 
 				$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";
884 884 
 			}
885 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
885 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
886 886 
 		}
887 887 
 		try {
888 888 
 			$sth = $this->db->prepare($query);
889 889 
 			$sth->execute($query_data);
890 
-		} catch(PDOException $e) {
890 
+		} catch (PDOException $e) {
891 891 
 			echo "error : ".$e->getMessage();
892 892 
 		}
893 893 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
894 894 
 		if (empty($all)) {
895 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
896 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
895 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
896 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
897 897 
 			} else {
898 898 
 				$filters = array('airlines' => array($stats_airline));
899 899 
 			}
900 900 
 			if ($filter_name != '') {
901 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
901 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
902 902 
 			}
903 903 
 			$Spotter = new Spotter($this->db);
904 904 
 			$all = $Spotter->countAllDatesLast7Days($filters);
905 905 
 		}
906 906 
 		return $all;
907 907 
 	}
908 
-	public function countAllDates($stats_airline = '',$filter_name = '') {
908 
+	public function countAllDates($stats_airline = '', $filter_name = '') {
909 909 
 		global $globalStatsFilters;
910 910 
 		if ($filter_name == '') $filter_name = $this->filter_name;
911 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
911 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
912 912 
 			$Spotter = new Spotter($this->db);
913 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
913 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
914 914 
 			$alliance_airlines = array();
915 915 
 			foreach ($airlines as $airline) {
916 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
916 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
917 917 
 			}
918 
-			$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";
918 
+			$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";
919 919 
 			$query_data = array(':filter_name' => $filter_name);
920 920 
 		} else {
921 921 
 			$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";
922 
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
922 
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
923 923 
 		}
924 924 
 		try {
925 925 
 			$sth = $this->db->prepare($query);
926 926 
 			$sth->execute($query_data);
927 
-		} catch(PDOException $e) {
927 
+		} catch (PDOException $e) {
928 928 
 			echo "error : ".$e->getMessage();
929 929 
 		}
930 930 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
931 931 
 		if (empty($all)) {
932 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
933 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
932 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
933 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
934 934 
 			} else {
935 935 
 				$filters = array('airlines' => array($stats_airline));
936 936 
 			}
937 937 
 			if ($filter_name != '') {
938 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
938 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
939 939 
 			}
940 940 
 			$Spotter = new Spotter($this->db);
941 941 
 			$all = $Spotter->countAllDates($filters);
 
@@ -950,7 +950,7 @@  discard block
 
 block discarded – undo
950 950 
 		try {
951 951 
 			$sth = $this->db->prepare($query);
952 952 
 			$sth->execute($query_data);
953 
-		} catch(PDOException $e) {
953 
+		} catch (PDOException $e) {
954 954 
 			echo "error : ".$e->getMessage();
955 955 
 		}
956 956 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -972,7 +972,7 @@  discard block
 
 block discarded – undo
972 972 
 		try {
973 973 
 			$sth = $this->db->prepare($query);
974 974 
 			$sth->execute($query_data);
975 
-		} catch(PDOException $e) {
975 
+		} catch (PDOException $e) {
976 976 
 			echo "error : ".$e->getMessage();
977 977 
 		}
978 978 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -994,34 +994,34 @@  discard block
 
 block discarded – undo
994 994 
 		try {
995 995 
 			$sth = $this->db->prepare($query);
996 996 
 			$sth->execute($query_data);
997 
-		} catch(PDOException $e) {
997 
+		} catch (PDOException $e) {
998 998 
 			echo "error : ".$e->getMessage();
999 999 
 		}
1000 1000 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1001 1001 
 		if (empty($all)) {
1002 1002 
 			$filters = array();
1003 1003 
 			if ($filter_name != '') {
1004 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1004 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1005 1005 
 			}
1006 1006 
 			$Spotter = new Spotter($this->db);
1007 1007 
 			$all = $Spotter->countAllDatesByAirlines($filters);
1008 1008 
 		}
1009 1009 
 		return $all;
1010 1010 
 	}
1011 
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
1011 
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
1012 1012 
 		global $globalStatsFilters, $globalDBdriver;
1013 1013 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1014 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1014 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1015 1015 
 			$Spotter = new Spotter($this->db);
1016 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1016 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1017 1017 
 			$alliance_airlines = array();
1018 1018 
 			foreach ($airlines as $airline) {
1019 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1019 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1020 1020 
 			}
1021 1021 
 			if ($globalDBdriver == 'mysql') {
1022 
-				$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";
1022 
+				$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";
1023 1023 
 			} else {
1024 
-				$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";
1024 
+				$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";
1025 1025 
 			}
1026 1026 
 			$query_data = array(':filter_name' => $filter_name);
1027 1027 
 		} else {
 
@@ -1035,18 +1035,18 @@  discard block
 
 block discarded – undo
1035 1035 
 		try {
1036 1036 
 			$sth = $this->db->prepare($query);
1037 1037 
 			$sth->execute($query_data);
1038 
-		} catch(PDOException $e) {
1038 
+		} catch (PDOException $e) {
1039 1039 
 			echo "error : ".$e->getMessage();
1040 1040 
 		}
1041 1041 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1042 1042 
 		if (empty($all)) {
1043 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1044 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1043 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1044 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1045 1045 
 			} else {
1046 1046 
 				$filters = array('airlines' => array($stats_airline));
1047 1047 
 			}
1048 1048 
 			if ($filter_name != '') {
1049 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1049 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1050 1050 
 			}
1051 1051 
 			$Spotter = new Spotter($this->db);
1052 1052 
 			$all = $Spotter->countAllMonths($filters);
 
@@ -1063,7 +1063,7 @@  discard block
 
 block discarded – undo
1063 1063 
 		try {
1064 1064 
 			$sth = $this->db->prepare($query);
1065 1065 
 			$sth->execute();
1066 
-		} catch(PDOException $e) {
1066 
+		} catch (PDOException $e) {
1067 1067 
 			echo "error : ".$e->getMessage();
1068 1068 
 		}
1069 1069 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1083,7 +1083,7 @@  discard block
 
 block discarded – undo
1083 1083 
 		try {
1084 1084 
 			$sth = $this->db->prepare($query);
1085 1085 
 			$sth->execute();
1086 
-		} catch(PDOException $e) {
1086 
+		} catch (PDOException $e) {
1087 1087 
 			echo "error : ".$e->getMessage();
1088 1088 
 		}
1089 1089 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1100,32 +1100,32 @@  discard block
 
 block discarded – undo
1100 1100 
 		try {
1101 1101 
 			$sth = $this->db->prepare($query);
1102 1102 
 			$sth->execute(array(':filter_name' => $filter_name));
1103 
-		} catch(PDOException $e) {
1103 
+		} catch (PDOException $e) {
1104 1104 
 			echo "error : ".$e->getMessage();
1105 1105 
 		}
1106 1106 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1107 1107 
 		if (empty($all)) {
1108 1108 
 			$filters = array();
1109 1109 
 			if ($filter_name != '') {
1110 
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1110 
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1111 1111 
 			}
1112 1112 
 			$Spotter = new Spotter($this->db);
1113 1113 
 			$all = $Spotter->countAllMilitaryMonths($filters);
1114 1114 
 		}
1115 1115 
 		return $all;
1116 1116 
 	}
1117 
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1117 
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
1118 1118 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1119 1119 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1120 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1120 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1121 1121 
 			$Spotter = new Spotter($this->db);
1122 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1122 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1123 1123 
 			$alliance_airlines = array();
1124 1124 
 			foreach ($airlines as $airline) {
1125 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1125 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1126 1126 
 			}
1127 
-			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";
1128 
-			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";
1127 
+			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";
1128 
+			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";
1129 1129 
 			$query_data = array(':filter_name' => $filter_name);
1130 1130 
 		} else {
1131 1131 
 			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";
 
@@ -1143,37 +1143,37 @@  discard block
 
 block discarded – undo
1143 1143 
 		try {
1144 1144 
 			$sth = $this->db->prepare($query);
1145 1145 
 			$sth->execute($query_data);
1146 
-		} catch(PDOException $e) {
1146 
+		} catch (PDOException $e) {
1147 1147 
 			echo "error : ".$e->getMessage();
1148 1148 
 		}
1149 1149 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1150 1150 
 		if (empty($all)) {
1151 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1152 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1151 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1152 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1153 1153 
 			} else {
1154 1154 
 				$filters = array('airlines' => array($stats_airline));
1155 1155 
 			}
1156 1156 
 			if ($filter_name != '') {
1157 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1157 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1158 1158 
 			}
1159 1159 
 			$Spotter = new Spotter($this->db);
1160 
-			$all = $Spotter->countAllHours($orderby,$filters);
1160 
+			$all = $Spotter->countAllHours($orderby, $filters);
1161 1161 
 		}
1162 1162 
 		return $all;
1163 1163 
 	}
1164 
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1164 
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1165 1165 
 		global $globalStatsFilters;
1166 1166 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1167 1167 
 		if ($year == '') $year = date('Y');
1168 
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1168 
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
1169 1169 
 		if (empty($all)) {
1170 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1171 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1170 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1171 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1172 1172 
 			} else {
1173 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1173 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1174 1174 
 			}
1175 1175 
 			if ($filter_name != '') {
1176 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1176 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1177 1177 
 			}
1178 1178 
 			$Spotter = new Spotter($this->db);
1179 1179 
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
 
@@ -1181,16 +1181,16 @@  discard block
 
 block discarded – undo
1181 1181 
 		}
1182 1182 
 		return $all;
1183 1183 
 	}
1184 
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1184 
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
1185 1185 
 		global $globalStatsFilters;
1186 1186 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1187 1187 
 		if ($year == '') $year = date('Y');
1188 
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1188 
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
1189 1189 
 		if (empty($all)) {
1190 1190 
 			$filters = array();
1191 
-			$filters = array('year' => $year,'month' => $month);
1191 
+			$filters = array('year' => $year, 'month' => $month);
1192 1192 
 			if ($filter_name != '') {
1193 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1193 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1194 1194 
 			}
1195 1195 
 			$Spotter = new Spotter($this->db);
1196 1196 
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
 
@@ -1198,19 +1198,19 @@  discard block
 
 block discarded – undo
1198 1198 
 		}
1199 1199 
 		return $all;
1200 1200 
 	}
1201 
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1201 
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1202 1202 
 		global $globalStatsFilters;
1203 1203 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1204 1204 
 		if ($year == '') $year = date('Y');
1205 
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1205 
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
1206 1206 
 		if (empty($all)) {
1207 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1208 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1207 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1208 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1209 1209 
 			} else {
1210 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1210 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1211 1211 
 			}
1212 1212 
 			if ($filter_name != '') {
1213 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1213 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1214 1214 
 			}
1215 1215 
 			$Spotter = new Spotter($this->db);
1216 1216 
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
 
@@ -1218,48 +1218,48 @@  discard block
 
 block discarded – undo
1218 1218 
 		}
1219 1219 
 		return $all;
1220 1220 
 	}
1221 
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1221 
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1222 1222 
 		global $globalStatsFilters;
1223 1223 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1224 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1224 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1225 1225 
 			$Spotter = new Spotter($this->db);
1226 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1226 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1227 1227 
 			if ($year == '' && $month == '') {
1228 1228 
 				$alliance_airlines = array();
1229 1229 
 				foreach ($airlines as $airline) {
1230 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1230 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1231 1231 
 				}
1232 
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1232 
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1233 1233 
 				try {
1234 1234 
 					$sth = $this->db->prepare($query);
1235 1235 
 					$sth->execute(array(':filter_name' => $filter_name));
1236 
-				} catch(PDOException $e) {
1236 
+				} catch (PDOException $e) {
1237 1237 
 					echo "error : ".$e->getMessage();
1238 1238 
 				}
1239 1239 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1240 1240 
 				$all = $result[0]['nb'];
1241 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1241 
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1242 1242 
 		} else {
1243 1243 
 			if ($year == '' && $month == '') {
1244 1244 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1245 1245 
 				try {
1246 1246 
 					$sth = $this->db->prepare($query);
1247 
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
1248 
-				} catch(PDOException $e) {
1247 
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
1248 
+				} catch (PDOException $e) {
1249 1249 
 					echo "error : ".$e->getMessage();
1250 1250 
 				}
1251 1251 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1252 1252 
 				$all = $result[0]['nb'];
1253 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1253 
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1254 1254 
 		}
1255 1255 
 		if (empty($all)) {
1256 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1257 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1256 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1257 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1258 1258 
 			} else {
1259 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1259 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1260 1260 
 			}
1261 1261 
 			if ($filter_name != '') {
1262 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1262 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1263 1263 
 			}
1264 1264 
 			$Spotter = new Spotter($this->db);
1265 1265 
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
 
@@ -1267,7 +1267,7 @@  discard block
 
 block discarded – undo
1267 1267 
 		}
1268 1268 
 		return $all;
1269 1269 
 	}
1270 
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1270 
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
1271 1271 
 		global $globalStatsFilters;
1272 1272 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1273 1273 
 		if ($year == '' && $month == '') {
 
@@ -1275,17 +1275,17 @@  discard block
 
 block discarded – undo
1275 1275 
 			try {
1276 1276 
 				$sth = $this->db->prepare($query);
1277 1277 
 				$sth->execute(array(':filter_name' => $filter_name));
1278 
-			} catch(PDOException $e) {
1278 
+			} catch (PDOException $e) {
1279 1279 
 				echo "error : ".$e->getMessage();
1280 1280 
 			}
1281 1281 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1282 1282 
 			$all = $result[0]['nb_airline'];
1283 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1283 
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
1284 1284 
 		if (empty($all)) {
1285 1285 
 			$filters = array();
1286 
-			$filters = array('year' => $year,'month' => $month);
1286 
+			$filters = array('year' => $year, 'month' => $month);
1287 1287 
 			if ($filter_name != '') {
1288 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1288 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1289 1289 
 			}
1290 1290 
 			$Spotter = new Spotter($this->db);
1291 1291 
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
 
@@ -1293,29 +1293,29 @@  discard block
 
 block discarded – undo
1293 1293 
 		}
1294 1294 
 		return $all;
1295 1295 
 	}
1296 
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1296 
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1297 1297 
 		global $globalStatsFilters;
1298 1298 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1299 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1299 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1300 1300 
 			$Spotter = new Spotter($this->db);
1301 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1301 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1302 1302 
 			if ($year == '' && $month == '') {
1303 1303 
 				$alliance_airlines = array();
1304 1304 
 				foreach ($airlines as $airline) {
1305 
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1305 
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1306 1306 
 				}
1307 
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1307 
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1308 1308 
 				$query_values = array(':filter_name' => $filter_name);
1309 1309 
 				try {
1310 1310 
 					$sth = $this->db->prepare($query);
1311 1311 
 					$sth->execute($query_values);
1312 
-				} catch(PDOException $e) {
1312 
+				} catch (PDOException $e) {
1313 1313 
 					echo "error : ".$e->getMessage();
1314 1314 
 				}
1315 1315 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1316 1316 
 				$all = $result[0]['nb'];
1317 1317 
 			} else {
1318 
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1318 
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1319 1319 
 			}
1320 1320 
 		} else {
1321 1321 
 			if ($year == '' && $month == '') {
 
@@ -1324,23 +1324,23 @@  discard block
 
 block discarded – undo
1324 1324 
 				try {
1325 1325 
 					$sth = $this->db->prepare($query);
1326 1326 
 					$sth->execute($query_values);
1327 
-				} catch(PDOException $e) {
1327 
+				} catch (PDOException $e) {
1328 1328 
 					echo "error : ".$e->getMessage();
1329 1329 
 				}
1330 1330 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1331 1331 
 				$all = $result[0]['nb'];
1332 1332 
 			} else {
1333 
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1333 
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1334 1334 
 			}
1335 1335 
 		}
1336 1336 
 		if (empty($all)) {
1337 
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1338 
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1337 
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1338 
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1339 1339 
 			} else {
1340 
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1340 
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1341 1341 
 			}
1342 1342 
 			if ($filter_name != '') {
1343 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1343 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1344 1344 
 			}
1345 1345 
 			$Spotter = new Spotter($this->db);
1346 1346 
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
 
@@ -1348,7 +1348,7 @@  discard block
 
 block discarded – undo
1348 1348 
 		}
1349 1349 
 		return $all;
1350 1350 
 	}
1351 
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1351 
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1352 1352 
 		global $globalStatsFilters;
1353 1353 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1354 1354 
 		//if ($year == '') $year = date('Y');
 
@@ -1358,18 +1358,18 @@  discard block
 
 block discarded – undo
1358 1358 
 			try {
1359 1359 
 				$sth = $this->db->prepare($query);
1360 1360 
 				$sth->execute($query_values);
1361 
-			} catch(PDOException $e) {
1361 
+			} catch (PDOException $e) {
1362 1362 
 				echo "error : ".$e->getMessage();
1363 1363 
 			}
1364 1364 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1365 1365 
 			$all = $result[0]['nb'];
1366 1366 
 		} else {
1367 
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
1367 
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
1368 1368 
 		}
1369 1369 
 		if (empty($all)) {
1370 
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1370 
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1371 1371 
 			if ($filter_name != '') {
1372 
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1372 
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1373 1373 
 			}
1374 1374 
 			$Spotter = new Spotter($this->db);
1375 1375 
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
 
@@ -1378,104 +1378,104 @@  discard block
 
 block discarded – undo
1378 1378 
 		return $all;
1379 1379 
 	}
1380 1380
1381 
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1381 
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
1382 1382 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1383 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1383 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1384 1384 
 			$Spotter = new Spotter($this->db);
1385 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1385 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1386 1386 
 			$alliance_airlines = array();
1387 1387 
 			foreach ($airlines as $airline) {
1388 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1388 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1389 1389 
 			}
1390 
-			$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";
1391 
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
1390 
+			$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";
1391 
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
1392 1392 
 		} else {
1393 1393 
 			$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";
1394 
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1394 
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1395 1395 
 		}
1396 1396 
 		try {
1397 1397 
 			$sth = $this->db->prepare($query);
1398 1398 
 			$sth->execute($query_values);
1399 
-		} catch(PDOException $e) {
1399 
+		} catch (PDOException $e) {
1400 1400 
 			echo "error : ".$e->getMessage();
1401 1401 
 		}
1402 1402 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1403 1403 
 		return $all;
1404 1404 
 	}
1405 
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
1405 
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
1406 1406 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1407 1407 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1408 
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1408 
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1409 1409 
 		try {
1410 1410 
 			$sth = $this->db->prepare($query);
1411 1411 
 			$sth->execute($query_values);
1412 
-		} catch(PDOException $e) {
1412 
+		} catch (PDOException $e) {
1413 1413 
 			echo "error : ".$e->getMessage();
1414 1414 
 		}
1415 1415 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1416 1416 
 		return $all;
1417 1417 
 	}
1418 
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1418 
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
1419 1419 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1420 1420 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1421 
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1421 
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1422 1422 
 		try {
1423 1423 
 			$sth = $this->db->prepare($query);
1424 1424 
 			$sth->execute($query_values);
1425 
-		} catch(PDOException $e) {
1425 
+		} catch (PDOException $e) {
1426 1426 
 			echo "error : ".$e->getMessage();
1427 1427 
 		}
1428 1428 
 	}
1429 
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1429 
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
1430 1430 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1431 1431 
 		global $globalArchiveMonths, $globalDBdriver;
1432 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1432 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1433 1433 
 			$Spotter = new Spotter($this->db);
1434 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1434 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1435 1435 
 			$alliance_airlines = array();
1436 1436 
 			foreach ($airlines as $airline) {
1437 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1437 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1438 1438 
 			}
1439 1439 
 			if ($globalDBdriver == 'mysql') {
1440 1440 
 				if ($month == '') {
1441 
-					$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";
1441 
+					$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";
1442 1442 
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1443 1443 
 				} else {
1444 
-					$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";
1445 
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1444 
+					$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";
1445 
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1446 1446 
 				}
1447 1447 
 			} else {
1448 1448 
 				if ($month == '') {
1449 
-					$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";
1449 
+					$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";
1450 1450 
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1451 1451 
 				} else {
1452 
-					$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";
1453 
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1452 
+					$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";
1453 
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1454 1454 
 				}
1455 1455 
 			}
1456 1456 
 		} else {
1457 1457 
 			if ($globalDBdriver == 'mysql') {
1458 1458 
 				if ($month == '') {
1459 1459 
 					$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";
1460 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1460 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1461 1461 
 				} else {
1462 1462 
 					$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";
1463 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1463 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1464 1464 
 				}
1465 1465 
 			} else {
1466 1466 
 				if ($month == '') {
1467 1467 
 					$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";
1468 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1468 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1469 1469 
 				} else {
1470 1470 
 					$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";
1471 
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1471 
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1472 1472 
 				}
1473 1473 
 			}
1474 1474 
 		}
1475 1475 
 		try {
1476 1476 
 			$sth = $this->db->prepare($query);
1477 1477 
 			$sth->execute($query_values);
1478 
-		} catch(PDOException $e) {
1478 
+		} catch (PDOException $e) {
1479 1479 
 			echo "error : ".$e->getMessage();
1480 1480 
 		}
1481 1481 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1484,17 +1484,17 @@  discard block
 
 block discarded – undo
1484 1484 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1485 1485 
 		global $globalArchiveMonths, $globalDBdriver;
1486 1486 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1487 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1487 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1488 1488 
 			$Spotter = new Spotter($this->db);
1489 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1489 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1490 1490 
 			$alliance_airlines = array();
1491 1491 
 			foreach ($airlines as $airline) {
1492 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1492 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1493 1493 
 			}
1494 1494 
 			if ($globalDBdriver == 'mysql') {
1495 
-				$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";
1495 
+				$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";
1496 1496 
 			} else {
1497 
-				$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";
1497 
+				$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";
1498 1498 
 			}
1499 1499 
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
1500 1500 
 		} else {
 
@@ -1508,7 +1508,7 @@  discard block
 
 block discarded – undo
1508 1508 
 		try {
1509 1509 
 			$sth = $this->db->prepare($query);
1510 1510 
 			$sth->execute($query_values);
1511 
-		} catch(PDOException $e) {
1511 
+		} catch (PDOException $e) {
1512 1512 
 			echo "error : ".$e->getMessage();
1513 1513 
 		}
1514 1514 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1517,17 +1517,17 @@  discard block
 
 block discarded – undo
1517 1517 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1518 1518 
 		global $globalArchiveMonths, $globalDBdriver;
1519 1519 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1520 
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1520 
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1521 1521 
 			$Spotter = new Spotter($this->db);
1522 
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1522 
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1523 1523 
 			$alliance_airlines = array();
1524 1524 
 			foreach ($airlines as $airline) {
1525 
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1525 
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1526 1526 
 			}
1527 1527 
 			if ($globalDBdriver == 'mysql') {
1528 
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1528 
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1529 1529 
 			} else {
1530 
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1530 
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1531 1531 
 			}
1532 1532 
 		} else {
1533 1533 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1539,7 +1539,7 @@  discard block
 
 block discarded – undo
1539 1539 
 		try {
1540 1540 
 			$sth = $this->db->prepare($query);
1541 1541 
 			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1542 
-		} catch(PDOException $e) {
1542 
+		} catch (PDOException $e) {
1543 1543 
 			echo "error : ".$e->getMessage();
1544 1544 
 		}
1545 1545 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1556,7 +1556,7 @@  discard block
 
 block discarded – undo
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 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1573,20 +1573,20 @@  discard block
 
 block discarded – undo
1573 1573 
 		try {
1574 1574 
 			$sth = $this->db->prepare($query);
1575 1575 
 			$sth->execute(array(':filter_name' => $filter_name));
1576 
-		} catch(PDOException $e) {
1576 
+		} catch (PDOException $e) {
1577 1577 
 			echo "error : ".$e->getMessage();
1578 1578 
 		}
1579 1579 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1580 1580 
 		return $all[0]['total'];
1581 1581 
 	}
1582 
-	public function getStatsOwner($owner_name,$filter_name = '') {
1582 
+	public function getStatsOwner($owner_name, $filter_name = '') {
1583 1583 
 		global $globalArchiveMonths, $globalDBdriver;
1584 1584 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1585 1585 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1586 1586 
 		try {
1587 1587 
 			$sth = $this->db->prepare($query);
1588 
-			$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1589 
-		} catch(PDOException $e) {
1588 
+			$sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
1589 
+		} catch (PDOException $e) {
1590 1590 
 			echo "error : ".$e->getMessage();
1591 1591 
 		}
1592 1592 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1604,20 +1604,20 @@  discard block
 
 block discarded – undo
1604 1604 
 		try {
1605 1605 
 			$sth = $this->db->prepare($query);
1606 1606 
 			$sth->execute(array(':filter_name' => $filter_name));
1607 
-		} catch(PDOException $e) {
1607 
+		} catch (PDOException $e) {
1608 1608 
 			echo "error : ".$e->getMessage();
1609 1609 
 		}
1610 1610 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1611 1611 
 		return $all[0]['total'];
1612 1612 
 	}
1613 
-	public function getStatsPilot($pilot,$filter_name = '') {
1613 
+	public function getStatsPilot($pilot, $filter_name = '') {
1614 1614 
 		global $globalArchiveMonths, $globalDBdriver;
1615 1615 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1616 1616 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1617 1617 
 		try {
1618 1618 
 			$sth = $this->db->prepare($query);
1619 
-			$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1620 
-		} catch(PDOException $e) {
1619 
+			$sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
1620 
+		} catch (PDOException $e) {
1621 1621 
 			echo "error : ".$e->getMessage();
1622 1622 
 		}
1623 1623 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -1625,7 +1625,7 @@  discard block
 
 block discarded – undo
1625 1625 
 		else return 0;
1626 1626 
 	}
1627 1627
1628 
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1628 
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1629 1629 
 		global $globalDBdriver;
1630 1630 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1631 1631 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1633,15 +1633,15 @@  discard block
 
 block discarded – undo
1633 1633 
 		} else {
1634 1634 
 			$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);";
1635 1635 
 		}
1636 
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1636 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1637 1637 
 		try {
1638 1638 
 			$sth = $this->db->prepare($query);
1639 1639 
 			$sth->execute($query_values);
1640 
-		} catch(PDOException $e) {
1640 
+		} catch (PDOException $e) {
1641 1641 
 			return "error : ".$e->getMessage();
1642 1642 
 		}
1643 1643 
 	}
1644 
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1644 
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1645 1645 
 		global $globalDBdriver;
1646 1646 
 		if ($filter_name == '') $filter_name = $this->filter_name;
1647 1647 
 		if ($globalDBdriver == 'mysql') {
 
@@ -1650,11 +1650,11 @@  discard block
 
 block discarded – undo
1650 1650 
 			//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1651 1651 
 			$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);";
1652 1652 
 		}
1653 
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1653 
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1654 1654 
 		try {
1655 1655 
 			$sth = $this->db->prepare($query);
1656 1656 
 			$sth->execute($query_values);
1657 
-		} catch(PDOException $e) {
1657 
+		} catch (PDOException $e) {
1658 1658 
 			return "error : ".$e->getMessage();
1659 1659 
 		}
1660 1660 
 	}
 
@@ -1678,95 +1678,95 @@  discard block
 
 block discarded – undo
1678 1678 
         }
1679 1679 
         */
1680 1680
1681 
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
1681 
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
1682 1682 
 		global $globalDBdriver;
1683 1683 
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
1684 1684 
 		$query_values = array();
1685 1685 
 		if ($globalDBdriver == 'mysql') {
1686 1686 
 			if ($year != '') {
1687 1687 
 				$query .= ' AND YEAR(stats_date) = :year';
1688 
-				$query_values = array_merge($query_values,array(':year' => $year));
1688 
+				$query_values = array_merge($query_values, array(':year' => $year));
1689 1689 
 			}
1690 1690 
 			if ($month != '') {
1691 1691 
 				$query .= ' AND MONTH(stats_date) = :month';
1692 
-				$query_values = array_merge($query_values,array(':month' => $month));
1692 
+				$query_values = array_merge($query_values, array(':month' => $month));
1693 1693 
 			}
1694 1694 
 			if ($day != '') {
1695 1695 
 				$query .= ' AND DAY(stats_date) = :day';
1696 
-				$query_values = array_merge($query_values,array(':day' => $day));
1696 
+				$query_values = array_merge($query_values, array(':day' => $day));
1697 1697 
 			}
1698 1698 
 		} else {
1699 1699 
 			if ($year != '') {
1700 1700 
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
1701 
-				$query_values = array_merge($query_values,array(':year' => $year));
1701 
+				$query_values = array_merge($query_values, array(':year' => $year));
1702 1702 
 			}
1703 1703 
 			if ($month != '') {
1704 1704 
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
1705 
-				$query_values = array_merge($query_values,array(':month' => $month));
1705 
+				$query_values = array_merge($query_values, array(':month' => $month));
1706 1706 
 			}
1707 1707 
 			if ($day != '') {
1708 1708 
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
1709 
-				$query_values = array_merge($query_values,array(':day' => $day));
1709 
+				$query_values = array_merge($query_values, array(':day' => $day));
1710 1710 
 			}
1711 1711 
 		}
1712 1712 
 		$query .= " ORDER BY source_name";
1713 
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
1713 
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
1714 1714 
 		try {
1715 1715 
 			$sth = $this->db->prepare($query);
1716 1716 
 			$sth->execute($query_values);
1717 
-		} catch(PDOException $e) {
1717 
+		} catch (PDOException $e) {
1718 1718 
 			echo "error : ".$e->getMessage();
1719 1719 
 		}
1720 1720 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1721 1721 
 		return $all;
1722 1722 
 	}
1723 1723
1724 
-	public function addStatSource($data,$source_name,$stats_type,$date) {
1724 
+	public function addStatSource($data, $source_name, $stats_type, $date) {
1725 1725 
 		global $globalDBdriver;
1726 1726 
 		if ($globalDBdriver == 'mysql') {
1727 1727 
 			$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";
1728 1728 
 		} else {
1729 1729 
 			$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);";
1730 1730 
 		}
1731 
-		$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1731 
+		$query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
1732 1732 
 		try {
1733 1733 
 			$sth = $this->db->prepare($query);
1734 1734 
 			$sth->execute($query_values);
1735 
-		} catch(PDOException $e) {
1735 
+		} catch (PDOException $e) {
1736 1736 
 			return "error : ".$e->getMessage();
1737 1737 
 		}
1738 1738 
 	}
1739 
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1739 
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
1740 1740 
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1741 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1741 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1742 1742 
 		try {
1743 1743 
 			$sth = $this->db->prepare($query);
1744 1744 
 			$sth->execute($query_values);
1745 
-		} catch(PDOException $e) {
1745 
+		} catch (PDOException $e) {
1746 1746 
 			return "error : ".$e->getMessage();
1747 1747 
 		}
1748 1748 
 	}
1749 
-	public function addStatMarine($type,$date_name,$cnt,$filter_name = '') {
1749 
+	public function addStatMarine($type, $date_name, $cnt, $filter_name = '') {
1750 1750 
 		$query = "INSERT INTO stats_marine (stats_type,marine_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
1751 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
1751 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1752 1752 
 		try {
1753 1753 
 			$sth = $this->db->prepare($query);
1754 1754 
 			$sth->execute($query_values);
1755 
-		} catch(PDOException $e) {
1755 
+		} catch (PDOException $e) {
1756 1756 
 			return "error : ".$e->getMessage();
1757 1757 
 		}
1758 1758 
 	}
1759 
-	public function addStatTracker($type,$date_name,$cnt,$filter_name = '') {
1759 
+	public function addStatTracker($type, $date_name, $cnt, $filter_name = '') {
1760 1760 
 		$query = "INSERT INTO stats_tracker (stats_type,tracker_date,cnt,filter_name) VALUES (:type,:flight_date,:cnt,:filter_name)";
1761 
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt,':filter_name' => $filter_name);
1761 
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1762 1762 
 		try {
1763 1763 
 			$sth = $this->db->prepare($query);
1764 1764 
 			$sth->execute($query_values);
1765 
-		} catch(PDOException $e) {
1765 
+		} catch (PDOException $e) {
1766 1766 
 			return "error : ".$e->getMessage();
1767 1767 
 		}
1768 1768 
 	}
1769 
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
1769 
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
1770 1770 
 		global $globalDBdriver;
1771 1771 
 		if ($globalDBdriver == 'mysql') {
1772 1772 
 			if ($reset) {
 
@@ -1781,15 +1781,15 @@  discard block
 
 block discarded – undo
1781 1781 
 				$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);";
1782 1782 
 			}
1783 1783 
 		}
1784 
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1784 
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1785 1785 
 		try {
1786 1786 
 			$sth = $this->db->prepare($query);
1787 1787 
 			$sth->execute($query_values);
1788 
-		} catch(PDOException $e) {
1788 
+		} catch (PDOException $e) {
1789 1789 
 			return "error : ".$e->getMessage();
1790 1790 
 		}
1791 1791 
 	}
1792 
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
1792 
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1793 1793 
 		global $globalDBdriver;
1794 1794 
 		if ($globalDBdriver == 'mysql') {
1795 1795 
 			if ($reset) {
 
@@ -1804,15 +1804,15 @@  discard block
 
 block discarded – undo
1804 1804 
 				$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);";
1805 1805 
 			}
1806 1806 
 		}
1807 
-		$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1807 
+		$query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
1808 1808 
 		try {
1809 1809 
 			$sth = $this->db->prepare($query);
1810 1810 
 			$sth->execute($query_values);
1811 
-		} catch(PDOException $e) {
1811 
+		} catch (PDOException $e) {
1812 1812 
 			return "error : ".$e->getMessage();
1813 1813 
 		}
1814 1814 
 	}
1815 
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
1815 
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1816 1816 
 		global $globalDBdriver;
1817 1817 
 		if ($globalDBdriver == 'mysql') {
1818 1818 
 			if ($reset) {
 
@@ -1827,15 +1827,15 @@  discard block
 
 block discarded – undo
1827 1827 
 				$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);";
1828 1828 
 			}
1829 1829 
 		}
1830 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1830 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
1831 1831 
 		try {
1832 1832 
 			$sth = $this->db->prepare($query);
1833 1833 
 			$sth->execute($query_values);
1834 
-		} catch(PDOException $e) {
1834 
+		} catch (PDOException $e) {
1835 1835 
 			return "error : ".$e->getMessage();
1836 1836 
 		}
1837 1837 
 	}
1838 
-	public function addStatCountryMarine($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
1838 
+	public function addStatCountryMarine($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
1839 1839 
 		global $globalDBdriver;
1840 1840 
 		if ($globalDBdriver == 'mysql') {
1841 1841 
 			if ($reset) {
 
@@ -1850,15 +1850,15 @@  discard block
 
 block discarded – undo
1850 1850 
 				$query = "UPDATE stats_marine_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);";
1851 1851 
 			}
1852 1852 
 		}
1853 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
1853 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1854 1854 
 		try {
1855 1855 
 			$sth = $this->db->prepare($query);
1856 1856 
 			$sth->execute($query_values);
1857 
-		} catch(PDOException $e) {
1857 
+		} catch (PDOException $e) {
1858 1858 
 			return "error : ".$e->getMessage();
1859 1859 
 		}
1860 1860 
 	}
1861 
-	public function addStatCountryTracker($iso2,$iso3,$name,$cnt,$filter_name = '',$reset = false) {
1861 
+	public function addStatCountryTracker($iso2, $iso3, $name, $cnt, $filter_name = '', $reset = false) {
1862 1862 
 		global $globalDBdriver;
1863 1863 
 		if ($globalDBdriver == 'mysql') {
1864 1864 
 			if ($reset) {
 
@@ -1873,15 +1873,15 @@  discard block
 
 block discarded – undo
1873 1873 
 				$query = "UPDATE stats_tracker_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name; INSERT INTO stats_country (iso2,iso3,name,cnt,filter_name) SELECT :iso2,:iso3,:name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name);";
1874 1874 
 			}
1875 1875 
 		}
1876 
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name);
1876 
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1877 1877 
 		try {
1878 1878 
 			$sth = $this->db->prepare($query);
1879 1879 
 			$sth->execute($query_values);
1880 
-		} catch(PDOException $e) {
1880 
+		} catch (PDOException $e) {
1881 1881 
 			return "error : ".$e->getMessage();
1882 1882 
 		}
1883 1883 
 	}
1884 
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1884 
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1885 1885 
 		global $globalDBdriver;
1886 1886 
 		if ($globalDBdriver == 'mysql') {
1887 1887 
 			if ($reset) {
 
@@ -1896,15 +1896,15 @@  discard block
 
 block discarded – undo
1896 1896 
 				$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);";
1897 1897 
 			}
1898 1898 
 		}
1899 
-		$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);
1899 
+		$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);
1900 1900 
 		try {
1901 1901 
 			$sth = $this->db->prepare($query);
1902 1902 
 			$sth->execute($query_values);
1903 
-		} catch(PDOException $e) {
1903 
+		} catch (PDOException $e) {
1904 1904 
 			return "error : ".$e->getMessage();
1905 1905 
 		}
1906 1906 
 	}
1907 
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
1907 
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
1908 1908 
 		global $globalDBdriver;
1909 1909 
 		if ($globalDBdriver == 'mysql') {
1910 1910 
 			if ($reset) {
 
@@ -1919,15 +1919,15 @@  discard block
 
 block discarded – undo
1919 1919 
 				$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);";
1920 1920 
 			}
1921 1921 
 		}
1922 
-		$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1922 
+		$query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1923 1923 
 		try {
1924 1924 
 			$sth = $this->db->prepare($query);
1925 1925 
 			$sth->execute($query_values);
1926 
-		} catch(PDOException $e) {
1926 
+		} catch (PDOException $e) {
1927 1927 
 			return "error : ".$e->getMessage();
1928 1928 
 		}
1929 1929 
 	}
1930 
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
1930 
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
1931 1931 
 		global $globalDBdriver;
1932 1932 
 		if ($globalDBdriver == 'mysql') {
1933 1933 
 			if ($reset) {
 
@@ -1942,15 +1942,15 @@  discard block
 
 block discarded – undo
1942 1942 
 				$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);";
1943 1943 
 			}
1944 1944 
 		}
1945 
-		$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1945 
+		$query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1946 1946 
 		try {
1947 1947 
 			$sth = $this->db->prepare($query);
1948 1948 
 			$sth->execute($query_values);
1949 
-		} catch(PDOException $e) {
1949 
+		} catch (PDOException $e) {
1950 1950 
 			return "error : ".$e->getMessage();
1951 1951 
 		}
1952 1952 
 	}
1953 
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
1953 
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
1954 1954 
 		global $globalDBdriver;
1955 1955 
 		if ($globalDBdriver == 'mysql') {
1956 1956 
 			if ($reset) {
 
@@ -1965,15 +1965,15 @@  discard block
 
 block discarded – undo
1965 1965 
 				$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);";
1966 1966 
 			}
1967 1967 
 		}
1968 
-		$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);
1968 
+		$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);
1969 1969 
 		try {
1970 1970 
 			$sth = $this->db->prepare($query);
1971 1971 
 			$sth->execute($query_values);
1972 
-		} catch(PDOException $e) {
1972 
+		} catch (PDOException $e) {
1973 1973 
 			return "error : ".$e->getMessage();
1974 1974 
 		}
1975 1975 
 	}
1976 
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
1976 
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
1977 1977 
 		global $globalDBdriver;
1978 1978 
 		if ($airport_icao != '') {
1979 1979 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1989,16 +1989,16 @@  discard block
 
 block discarded – undo
1989 1989 
 					$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);";
1990 1990 
 				}
1991 1991 
 			}
1992 
-			$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);
1992 
+			$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);
1993 1993 
 			try {
1994 1994 
 				$sth = $this->db->prepare($query);
1995 1995 
 				$sth->execute($query_values);
1996 
-			} catch(PDOException $e) {
1996 
+			} catch (PDOException $e) {
1997 1997 
 				return "error : ".$e->getMessage();
1998 1998 
 			}
1999 1999 
 		}
2000 2000 
 	}
2001 
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
2001 
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
2002 2002 
 		global $globalDBdriver;
2003 2003 
 		if ($airport_icao != '') {
2004 2004 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2006,16 +2006,16 @@  discard block
 
 block discarded – undo
2006 2006 
 			} else {
2007 2007 
 				$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);";
2008 2008 
 			}
2009 
-			$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);
2009 
+			$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);
2010 2010 
 			 try {
2011 2011 
 				$sth = $this->db->prepare($query);
2012 2012 
 				$sth->execute($query_values);
2013 
-			} catch(PDOException $e) {
2013 
+			} catch (PDOException $e) {
2014 2014 
 				return "error : ".$e->getMessage();
2015 2015 
 			}
2016 2016 
 		}
2017 2017 
 	}
2018 
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
2018 
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
2019 2019 
 		global $globalDBdriver;
2020 2020 
 		if ($airport_icao != '') {
2021 2021 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2031,16 +2031,16 @@  discard block
 
 block discarded – undo
2031 2031 
 					$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);";
2032 2032 
 				}
2033 2033 
 			}
2034 
-			$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);
2034 
+			$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);
2035 2035 
 			try {
2036 2036 
 				$sth = $this->db->prepare($query);
2037 2037 
 				$sth->execute($query_values);
2038 
-			} catch(PDOException $e) {
2038 
+			} catch (PDOException $e) {
2039 2039 
 				return "error : ".$e->getMessage();
2040 2040 
 			}
2041 2041 
 		}
2042 2042 
 	}
2043 
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
2043 
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
2044 2044 
 		global $globalDBdriver;
2045 2045 
 		if ($airport_icao != '') {
2046 2046 
 			if ($globalDBdriver == 'mysql') {
 
@@ -2048,11 +2048,11 @@  discard block
 
 block discarded – undo
2048 2048 
 			} else {
2049 2049 
 				$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);";
2050 2050 
 			}
2051 
-			$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);
2051 
+			$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);
2052 2052 
 			try {
2053 2053 
 				$sth = $this->db->prepare($query);
2054 2054 
 				$sth->execute($query_values);
2055 
-			} catch(PDOException $e) {
2055 
+			} catch (PDOException $e) {
2056 2056 
 				return "error : ".$e->getMessage();
2057 2057 
 			}
2058 2058 
 		}
 
@@ -2064,7 +2064,7 @@  discard block
 
 block discarded – undo
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 
 			return "error : ".$e->getMessage();
2069 2069 
 		}
2070 2070 
 	}
 
@@ -2074,7 +2074,7 @@  discard block
 
 block discarded – undo
2074 2074 
 		try {
2075 2075 
 			$sth = $this->db->prepare($query);
2076 2076 
 			$sth->execute($query_values);
2077 
-		} catch(PDOException $e) {
2077 
+		} catch (PDOException $e) {
2078 2078 
 			return "error : ".$e->getMessage();
2079 2079 
 		}
2080 2080 
 	}
 
@@ -2084,7 +2084,7 @@  discard block
 
 block discarded – undo
2084 2084 
 		try {
2085 2085 
 			$sth = $this->db->prepare($query);
2086 2086 
 			$sth->execute($query_values);
2087 
-		} catch(PDOException $e) {
2087 
+		} catch (PDOException $e) {
2088 2088 
 			return "error : ".$e->getMessage();
2089 2089 
 		}
2090 2090 
 	}
 
@@ -2094,7 +2094,7 @@  discard block
 
 block discarded – undo
2094 2094 
 		try {
2095 2095 
 			$sth = $this->db->prepare($query);
2096 2096 
 			$sth->execute($query_values);
2097 
-		} catch(PDOException $e) {
2097 
+		} catch (PDOException $e) {
2098 2098 
 			return "error : ".$e->getMessage();
2099 2099 
 		}
2100 2100 
 	}
 
@@ -2104,13 +2104,13 @@  discard block
 
 block discarded – undo
2104 2104 
 		try {
2105 2105 
 			$sth = $this->db->prepare($query);
2106 2106 
 			$sth->execute($query_values);
2107 
-		} catch(PDOException $e) {
2107 
+		} catch (PDOException $e) {
2108 2108 
 			return "error : ".$e->getMessage();
2109 2109 
 		}
2110 2110 
 	}
2111 2111
2112 2112 
 	public function addOldStats() {
2113 
-		global $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
2113 
+		global $globalAircraft, $globalMarine, $globalTracker, $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
2114 2114 
 		$Common = new Common();
2115 2115 
 		$Connection = new Connection($this->db);
2116 2116 
 		date_default_timezone_set('UTC');
 
@@ -2125,9 +2125,9 @@  discard block
 
 block discarded – undo
2125 2125 
 			$filtername = 'marine';
2126 2126 
 			if ($Connection->tableExists('countries')) {
2127 2127 
 				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
2128 
-				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
2128 
+				$alldata = $Marine->countAllMarineOverCountries(false, 0, $last_update_day);
2129 2129 
 				foreach ($alldata as $number) {
2130 
-					$this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
2130 
+					$this->addStatCountryMarine($number['marine_country_iso2'], $number['marine_country_iso3'], $number['marine_country'], $number['marine_count'], '', '', $reset);
2131 2131 
 				}
2132 2132 
 			}
2133 2133 
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
 
@@ -2137,38 +2137,38 @@  discard block
 
 block discarded – undo
2137 2137 
 			$lastyear = false;
2138 2138 
 			foreach ($alldata as $number) {
2139 2139 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2140 
-				$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'])));
2140 
+				$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'])));
2141 2141 
 			}
2142 2142 
 			echo 'Marine data...'."\n";
2143 2143 
 			$this->deleteStatMarine('month');
2144 2144 
 			echo '-> countAllDatesLastMonth...'."\n";
2145 2145 
 			$alldata = $Marine->countAllDatesLastMonth($filter_last_month);
2146 2146 
 			foreach ($alldata as $number) {
2147 
-				$this->addStatMarine('month',$number['date_name'],$number['date_count']);
2147 
+				$this->addStatMarine('month', $number['date_name'], $number['date_count']);
2148 2148 
 			}
2149 2149 
 			echo '-> countAllDates...'."\n";
2150 2150 
 			$previousdata = $this->countAllDatesMarine();
2151 2151 
 			$this->deleteStatMarine('date');
2152 
-			$alldata = $Common->array_merge_noappend($previousdata,$Marine->countAllDates($filter_last_month));
2152 
+			$alldata = $Common->array_merge_noappend($previousdata, $Marine->countAllDates($filter_last_month));
2153 2153 
 			$values = array();
2154 2154 
 			foreach ($alldata as $cnt) {
2155 2155 
 				$values[] = $cnt['date_count'];
2156 2156 
 			}
2157 
-			array_multisort($values,SORT_DESC,$alldata);
2158 
-			array_splice($alldata,11);
2157 
+			array_multisort($values, SORT_DESC, $alldata);
2158 
+			array_splice($alldata, 11);
2159 2159 
 			foreach ($alldata as $number) {
2160 
-				$this->addStatMarine('date',$number['date_name'],$number['date_count']);
2160 
+				$this->addStatMarine('date', $number['date_name'], $number['date_count']);
2161 2161 
 			}
2162 2162
2163 2163 
 			$this->deleteStatMarine('hour');
2164 2164 
 			echo '-> countAllHours...'."\n";
2165 
-			$alldata = $Marine->countAllHours('hour',$filter_last_month);
2165 
+			$alldata = $Marine->countAllHours('hour', $filter_last_month);
2166 2166 
 			foreach ($alldata as $number) {
2167 
-				$this->addStatMarine('hour',$number['hour_name'],$number['hour_count']);
2167 
+				$this->addStatMarine('hour', $number['hour_name'], $number['hour_count']);
2168 2168 
 			}
2169 2169 
 			echo 'Insert last stats update date...'."\n";
2170 2170 
 			date_default_timezone_set('UTC');
2171 
-			$this->addLastStatsUpdate('last_update_stats_marine',date('Y-m-d G:i:s'));
2171 
+			$this->addLastStatsUpdate('last_update_stats_marine', date('Y-m-d G:i:s'));
2172 2172 
 		}
2173 2173 
 		if (isset($globalTracker) && $globalTracker) {
2174 2174 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
 
@@ -2180,9 +2180,9 @@  discard block
 
 block discarded – undo
2180 2180 
 			$Tracker = new Tracker($this->db);
2181 2181 
 			if ($Connection->tableExists('countries')) {
2182 2182 
 				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
2183 
-				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
2183 
+				$alldata = $Tracker->countAllTrackerOverCountries(false, 0, $last_update_day);
2184 2184 
 				foreach ($alldata as $number) {
2185 
-					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
2185 
+					$this->addStatCountryTracker($number['tracker_country_iso2'], $number['tracker_country_iso3'], $number['tracker_country'], $number['tracker_count'], '', '', $reset);
2186 2186 
 				}
2187 2187 
 			}
2188 2188 
 			if ($globalDebug) echo 'Count all vessels by months...'."\n";
 
@@ -2192,38 +2192,38 @@  discard block
 
 block discarded – undo
2192 2192 
 			$lastyear = false;
2193 2193 
 			foreach ($alldata as $number) {
2194 2194 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2195 
-				$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'])));
2195 
+				$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'])));
2196 2196 
 			}
2197 2197 
 			echo 'Tracker data...'."\n";
2198 2198 
 			$this->deleteStatTracker('month');
2199 2199 
 			echo '-> countAllDatesLastMonth...'."\n";
2200 2200 
 			$alldata = $Tracker->countAllDatesLastMonth($filter_last_month);
2201 2201 
 			foreach ($alldata as $number) {
2202 
-				$this->addStatTracker('month',$number['date_name'],$number['date_count']);
2202 
+				$this->addStatTracker('month', $number['date_name'], $number['date_count']);
2203 2203 
 			}
2204 2204 
 			echo '-> countAllDates...'."\n";
2205 2205 
 			$previousdata = $this->countAllDatesTracker();
2206 2206 
 			$this->deleteStatTracker('date');
2207 
-			$alldata = $Common->array_merge_noappend($previousdata,$Tracker->countAllDates($filter_last_month));
2207 
+			$alldata = $Common->array_merge_noappend($previousdata, $Tracker->countAllDates($filter_last_month));
2208 2208 
 			$values = array();
2209 2209 
 			foreach ($alldata as $cnt) {
2210 2210 
 				$values[] = $cnt['date_count'];
2211 2211 
 			}
2212 
-			array_multisort($values,SORT_DESC,$alldata);
2213 
-			array_splice($alldata,11);
2212 
+			array_multisort($values, SORT_DESC, $alldata);
2213 
+			array_splice($alldata, 11);
2214 2214 
 			foreach ($alldata as $number) {
2215 
-				$this->addStatTracker('date',$number['date_name'],$number['date_count']);
2215 
+				$this->addStatTracker('date', $number['date_name'], $number['date_count']);
2216 2216 
 			}
2217 2217
2218 2218 
 			$this->deleteStatTracker('hour');
2219 2219 
 			echo '-> countAllHours...'."\n";
2220 
-			$alldata = $Tracker->countAllHours('hour',$filter_last_month);
2220 
+			$alldata = $Tracker->countAllHours('hour', $filter_last_month);
2221 2221 
 			foreach ($alldata as $number) {
2222 
-				$this->addStatTracker('hour',$number['hour_name'],$number['hour_count']);
2222 
+				$this->addStatTracker('hour', $number['hour_name'], $number['hour_count']);
2223 2223 
 			}
2224 2224 
 			echo 'Insert last stats update date...'."\n";
2225 2225 
 			date_default_timezone_set('UTC');
2226 
-			$this->addLastStatsUpdate('last_update_stats_tracker',date('Y-m-d G:i:s'));
2226 
+			$this->addLastStatsUpdate('last_update_stats_tracker', date('Y-m-d G:i:s'));
2227 2227 
 		}
2228 2228
2229 2229 
 		if (isset($globalAircraft) && $globalAircraft) {
 
@@ -2241,41 +2241,41 @@  discard block
 
 block discarded – undo
2241 2241 
 			$Spotter = new Spotter($this->db);
2242 2242
2243 2243 
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
2244 
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2244 
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
2245 2245 
 			foreach ($alldata as $number) {
2246 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2246 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
2247 2247 
 			}
2248 2248 
 			if ($globalDebug) echo 'Count all airlines...'."\n";
2249 
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2249 
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
2250 2250 
 			foreach ($alldata as $number) {
2251 
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2251 
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
2252 2252 
 			}
2253 2253 
 			if ($globalDebug) echo 'Count all registrations...'."\n";
2254 
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2254 
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
2255 2255 
 			foreach ($alldata as $number) {
2256 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2256 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
2257 2257 
 			}
2258 2258 
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
2259 
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2259 
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
2260 2260 
 			foreach ($alldata as $number) {
2261 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2261 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2262 2262 
 			}
2263 2263 
 			if ($globalDebug) echo 'Count all owners...'."\n";
2264 
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2264 
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
2265 2265 
 			foreach ($alldata as $number) {
2266 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2266 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
2267 2267 
 			}
2268 2268 
 			if ($globalDebug) echo 'Count all pilots...'."\n";
2269 
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2269 
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
2270 2270 
 			foreach ($alldata as $number) {
2271 2271 
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2272 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2272 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
2273 2273 
 			}
2274 2274
2275 2275 
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
2276 
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2276 
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
2277 2277 
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2278 
-			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2278 
+			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
2279 2279 
 			if ($globalDebug) echo 'Order departure airports...'."\n";
2280 2280 
 			$alldata = array();
2281 2281 
 			foreach ($pall as $value) {
 
@@ -2292,14 +2292,14 @@  discard block
 
 block discarded – undo
2292 2292 
 			foreach ($alldata as $key => $row) {
2293 2293 
 				$count[$key] = $row['airport_departure_icao_count'];
2294 2294 
 			}
2295 
-			array_multisort($count,SORT_DESC,$alldata);
2295 
+			array_multisort($count, SORT_DESC, $alldata);
2296 2296 
 			foreach ($alldata as $number) {
2297 
-				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);
2297 
+				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);
2298 2298 
 			}
2299 2299 
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2300 
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2300 
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
2301 2301 
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2302 
-			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2302 
+			$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
2303 2303 
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
2304 2304 
 			$alldata = array();
2305 2305 
 			foreach ($pall as $value) {
 
@@ -2316,18 +2316,18 @@  discard block
 
 block discarded – undo
2316 2316 
 			foreach ($alldata as $key => $row) {
2317 2317 
 				$count[$key] = $row['airport_arrival_icao_count'];
2318 2318 
 			}
2319 
-			array_multisort($count,SORT_DESC,$alldata);
2319 
+			array_multisort($count, SORT_DESC, $alldata);
2320 2320 
 			foreach ($alldata as $number) {
2321 
-				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);
2321 
+				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);
2322 2322 
 			}
2323 2323 
 			if ($Connection->tableExists('countries')) {
2324 2324 
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2325 2325 
 				//$SpotterArchive = new SpotterArchive();
2326 2326 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2327 2327 
 				$Spotter = new Spotter($this->db);
2328 
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
2328 
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
2329 2329 
 				foreach ($alldata as $number) {
2330 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
2330 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
2331 2331 
 				}
2332 2332 
 			}
2333 2333 
 			
@@ -2337,12 +2337,12 @@  discard block
 
 block discarded – undo
2337 2337 
 				$this->deleteStatsByType('fatalities_byyear');
2338 2338 
 				$alldata = $Accident->countFatalitiesByYear();
2339 2339 
 				foreach ($alldata as $number) {
2340 
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
2340 
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
2341 2341 
 				}
2342 2342 
 				$this->deleteStatsByType('fatalities_bymonth');
2343 2343 
 				$alldata = $Accident->countFatalitiesLast12Months();
2344 2344 
 				foreach ($alldata as $number) {
2345 
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
2345 
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
2346 2346 
 				}
2347 2347 
 			}
2348 2348 
 
@@ -2356,37 +2356,37 @@  discard block
 
 block discarded – undo
2356 2356 
 			$lastyear = false;
2357 2357 
 			foreach ($alldata as $number) {
2358 2358 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2359 
-				$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'])));
2359 
+				$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'])));
2360 2360 
 			}
2361 2361 
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2362 2362 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2363 2363 
 			foreach ($alldata as $number) {
2364 
-				$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'])));
2364 
+				$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'])));
2365 2365 
 			}
2366 2366 
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
2367 2367 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2368 2368 
 			foreach ($alldata as $number) {
2369 
-				$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'])));
2369 
+				$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'])));
2370 2370 
 			}
2371 2371 
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2372 2372 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2373 2373 
 			foreach ($alldata as $number) {
2374 
-				$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'])));
2374 
+				$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'])));
2375 2375 
 			}
2376 2376 
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2377 2377 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2378 2378 
 			foreach ($alldata as $number) {
2379 
-				$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'])));
2379 
+				$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'])));
2380 2380 
 			}
2381 2381 
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2382 2382 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2383 2383 
 			foreach ($alldata as $number) {
2384 
-				$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'])));
2384 
+				$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'])));
2385 2385 
 			}
2386 2386 
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2387 2387 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2388 2388 
 			foreach ($alldata as $number) {
2389 
-				$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'])));
2389 
+				$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'])));
2390 2390 
 			}
2391 2391 
 			if ($globalDebug) echo 'Airports data...'."\n";
2392 2392 
 			if ($globalDebug) echo '...Departure'."\n";
 
@@ -2431,7 +2431,7 @@  discard block
 
 block discarded – undo
2431 2431 
 			}
2432 2432 
 			$alldata = $pall;
2433 2433 
 			foreach ($alldata as $number) {
2434 
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
2434 
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
2435 2435 
 			}
2436 2436 
 			echo '...Arrival'."\n";
2437 2437 
 			$pall = $Spotter->getLast7DaysAirportsArrival();
 
@@ -2472,7 +2472,7 @@  discard block
 
 block discarded – undo
2472 2472 
 			}
2473 2473 
 			$alldata = $pall;
2474 2474 
 			foreach ($alldata as $number) {
2475 
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
2475 
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
2476 2476 
 			}
2477 2477
2478 2478 
 			echo 'Flights data...'."\n";
 
@@ -2480,28 +2480,28 @@  discard block
 
 block discarded – undo
2480 2480 
 			echo '-> countAllDatesLastMonth...'."\n";
2481 2481 
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
2482 2482 
 			foreach ($alldata as $number) {
2483 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
2483 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
2484 2484 
 			}
2485 2485 
 			echo '-> countAllDates...'."\n";
2486 2486 
 			$previousdata = $this->countAllDates();
2487 2487 
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
2488 2488 
 			$this->deleteStatFlight('date');
2489 
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
2489 
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
2490 2490 
 			$values = array();
2491 2491 
 			foreach ($alldata as $cnt) {
2492 2492 
 				$values[] = $cnt['date_count'];
2493 2493 
 			}
2494 
-			array_multisort($values,SORT_DESC,$alldata);
2495 
-			array_splice($alldata,11);
2494 
+			array_multisort($values, SORT_DESC, $alldata);
2495 
+			array_splice($alldata, 11);
2496 2496 
 			foreach ($alldata as $number) {
2497 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
2497 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
2498 2498 
 			}
2499 2499
2500 2500 
 			$this->deleteStatFlight('hour');
2501 2501 
 			echo '-> countAllHours...'."\n";
2502 
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
2502 
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
2503 2503 
 			foreach ($alldata as $number) {
2504 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
2504 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
2505 2505 
 			}
2506 2506
2507 2507 
 			// Count by airlines
 
@@ -2510,42 +2510,42 @@  discard block
 
 block discarded – undo
2510 2510 
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2511 2511 
 				$SpotterArchive = new SpotterArchive($this->db);
2512 2512 
 				//$Spotter = new Spotter($this->db);
2513 
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2513 
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
2514 2514 
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2515 2515 
 				foreach ($alldata as $number) {
2516 
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2516 
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
2517 2517 
 				}
2518 2518 
 			}
2519 2519 
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2520 2520 
 			$Spotter = new Spotter($this->db);
2521 
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2521 
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
2522 2522 
 			foreach ($alldata as $number) {
2523 
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2523 
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
2524 2524 
 			}
2525 2525 
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2526 
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2526 
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
2527 2527 
 			foreach ($alldata as $number) {
2528 
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2528 
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
2529 2529 
 			}
2530 2530 
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2531 
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2531 
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
2532 2532 
 			foreach ($alldata as $number) {
2533 
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2533 
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2534 2534 
 			}
2535 2535 
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2536 
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2536 
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
2537 2537 
 			foreach ($alldata as $number) {
2538 
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2538 
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
2539 2539 
 			}
2540 2540 
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2541 
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2541 
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
2542 2542 
 			foreach ($alldata as $number) {
2543 
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2543 
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
2544 2544 
 			}
2545 2545 
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2546 
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2546 
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
2547 2547 
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2548 
-			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2548 
+			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
2549 2549 
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2550 2550 
 			//$alldata = array();
2551 2551 
 			foreach ($dall as $value) {
 
@@ -2565,12 +2565,12 @@  discard block
 
 block discarded – undo
2565 2565 
 			}
2566 2566 
 			$alldata = $pall;
2567 2567 
 			foreach ($alldata as $number) {
2568 
-				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);
2568 
+				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);
2569 2569 
 			}
2570 2570 
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2571 
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2571 
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
2572 2572 
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2573 
-			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2573 
+			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
2574 2574 
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2575 2575 
 			//$alldata = array();
2576 2576 
 			foreach ($dall as $value) {
 
@@ -2590,7 +2590,7 @@  discard block
 
 block discarded – undo
2590 2590 
 			}
2591 2591 
 			$alldata = $pall;
2592 2592 
 			foreach ($alldata as $number) {
2593 
-				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);
2593 
+				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);
2594 2594 
 			}
2595 2595 
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2596 2596 
 			$Spotter = new Spotter($this->db);
 
@@ -2598,27 +2598,27 @@  discard block
 
 block discarded – undo
2598 2598 
 			$lastyear = false;
2599 2599 
 			foreach ($alldata as $number) {
2600 2600 
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2601 
-				$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']);
2601 
+				$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']);
2602 2602 
 			}
2603 2603 
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2604 2604 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2605 2605 
 			foreach ($alldata as $number) {
2606 
-				$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']);
2606 
+				$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']);
2607 2607 
 			}
2608 2608 
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2609 2609 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2610 2610 
 			foreach ($alldata as $number) {
2611 
-				$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']);
2611 
+				$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']);
2612 2612 
 			}
2613 2613 
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2614 2614 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2615 2615 
 			foreach ($alldata as $number) {
2616 
-				$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']);
2616 
+				$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']);
2617 2617 
 			}
2618 2618 
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2619 2619 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2620 2620 
 			foreach ($alldata as $number) {
2621 
-				$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']);
2621 
+				$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']);
2622 2622 
 			}
2623 2623 
 			if ($globalDebug) echo '...Departure'."\n";
2624 2624 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
 
@@ -2641,7 +2641,7 @@  discard block
 
 block discarded – undo
2641 2641 
 			}
2642 2642 
 			$alldata = $pall;
2643 2643 
 			foreach ($alldata as $number) {
2644 
-				$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']);
2644 
+				$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']);
2645 2645 
 			}
2646 2646 
 			if ($globalDebug) echo '...Arrival'."\n";
2647 2647 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
 
@@ -2664,32 +2664,32 @@  discard block
 
 block discarded – undo
2664 2664 
 			}
2665 2665 
 			$alldata = $pall;
2666 2666 
 			foreach ($alldata as $number) {
2667 
-				$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']);
2667 
+				$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']);
2668 2668 
 			}
2669 2669
2670 2670 
 			if ($globalDebug) echo 'Flights data...'."\n";
2671 2671 
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2672 2672 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2673 2673 
 			foreach ($alldata as $number) {
2674 
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2674 
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
2675 2675 
 			}
2676 2676 
 			if ($globalDebug) echo '-> countAllDates...'."\n";
2677 2677 
 			//$previousdata = $this->countAllDatesByAirlines();
2678 
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2678 
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
2679 2679 
 			$values = array();
2680 2680 
 			foreach ($alldata as $cnt) {
2681 2681 
 				$values[] = $cnt['date_count'];
2682 2682 
 			}
2683 
-			array_multisort($values,SORT_DESC,$alldata);
2684 
-			array_splice($alldata,11);
2683 
+			array_multisort($values, SORT_DESC, $alldata);
2684 
+			array_splice($alldata, 11);
2685 2685 
 			foreach ($alldata as $number) {
2686 
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2686 
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
2687 2687 
 			}
2688 2688
2689 2689 
 			if ($globalDebug) echo '-> countAllHours...'."\n";
2690 
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2690 
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
2691 2691 
 			foreach ($alldata as $number) {
2692 
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2692 
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
2693 2693 
 			}
2694 2694
2695 2695 
 			// Stats by filters
 
@@ -2713,7 +2713,7 @@  discard block
 
 block discarded – undo
2713 2713 
 							$last_update_day = date('Y').'-01-01 00:00:00';
2714 2714 
 						}
2715 2715 
 					}
2716 
-					if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
2716 
+					if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
2717 2717 
 						$last_update_day = date('Y').'-01-01 00:00:00';
2718 2718 
 						$reset = true;
2719 2719 
 					}
 
@@ -2721,38 +2721,38 @@  discard block
 
 block discarded – undo
2721 2721 
 					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2722 2722 
 					$Spotter = new Spotter($this->db);
2723 2723 
 					if ($globalDebug) echo 'Count all aircraft types...'."\n";
2724 
-					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2724 
+					$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
2725 2725 
 					foreach ($alldata as $number) {
2726 
-						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
2726 
+						$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
2727 2727 
 					}
2728 2728 
 					if ($globalDebug) echo 'Count all airlines...'."\n";
2729 
-					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
2729 
+					$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
2730 2730 
 					foreach ($alldata as $number) {
2731 
-						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
2731 
+						$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
2732 2732 
 					}
2733 2733 
 					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
2734 
-					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
2734 
+					$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
2735 2735 
 					foreach ($alldata as $number) {
2736 
-						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
2736 
+						$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
2737 2737 
 					}
2738 2738 
 					if ($globalDebug) echo 'Count all callsigns...'."\n";
2739 
-					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
2739 
+					$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
2740 2740 
 					foreach ($alldata as $number) {
2741 
-						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
2741 
+						$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
2742 2742 
 					}
2743 2743 
 					if ($globalDebug) echo 'Count all owners...'."\n";
2744 
-					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
2744 
+					$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
2745 2745 
 					foreach ($alldata as $number) {
2746 
-						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
2746 
+						$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
2747 2747 
 					}
2748 2748 
 					if ($globalDebug) echo 'Count all pilots...'."\n";
2749 
-					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
2749 
+					$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
2750 2750 
 					foreach ($alldata as $number) {
2751 
-						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2751 
+						$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
2752 2752 
 					}
2753 2753 
 					if ($globalDebug) echo 'Count departure airports...'."\n";
2754 
-					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2755 
-					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2754 
+					$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
2755 
+					$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
2756 2756 
 					$alldata = array();
2757 2757 
 					foreach ($pall as $value) {
2758 2758 
 						$icao = $value['airport_departure_icao'];
 
@@ -2768,13 +2768,13 @@  discard block
 
 block discarded – undo
2768 2768 
 					foreach ($alldata as $key => $row) {
2769 2769 
 						$count[$key] = $row['airport_departure_icao_count'];
2770 2770 
 					}
2771 
-					array_multisort($count,SORT_DESC,$alldata);
2771 
+					array_multisort($count, SORT_DESC, $alldata);
2772 2772 
 					foreach ($alldata as $number) {
2773 
-						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);
2773 
+						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);
2774 2774 
 					}
2775 2775 
 					if ($globalDebug) echo 'Count all arrival airports...'."\n";
2776 
-					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2777 
-					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2776 
+					$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
2777 
+					$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
2778 2778 
 					$alldata = array();
2779 2779 
 					foreach ($pall as $value) {
2780 2780 
 						$icao = $value['airport_arrival_icao'];
 
@@ -2790,9 +2790,9 @@  discard block
 
 block discarded – undo
2790 2790 
 					foreach ($alldata as $key => $row) {
2791 2791 
 						$count[$key] = $row['airport_arrival_icao_count'];
2792 2792 
 					}
2793 
-					array_multisort($count,SORT_DESC,$alldata);
2793 
+					array_multisort($count, SORT_DESC, $alldata);
2794 2794 
 					foreach ($alldata as $number) {
2795 
-						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);
2795 
+						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);
2796 2796 
 					}
2797 2797 
 					if ($globalDebug) echo 'Count all months...'."\n";
2798 2798 
 					$Spotter = new Spotter($this->db);
 
@@ -2800,36 +2800,36 @@  discard block
 
 block discarded – undo
2800 2800 
 					$lastyear = false;
2801 2801 
 					foreach ($alldata as $number) {
2802 2802 
 						if ($number['year_name'] != date('Y')) $lastyear = true;
2803 
-						$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);
2803 
+						$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);
2804 2804 
 					}
2805 2805 
 					if ($globalDebug) echo 'Count all owners by months...'."\n";
2806 2806 
 					$alldata = $Spotter->countAllMonthsOwners($filter);
2807 2807 
 					foreach ($alldata as $number) {
2808 
-						$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);
2808 
+						$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);
2809 2809 
 					}
2810 2810 
 					if ($globalDebug) echo 'Count all pilots by months...'."\n";
2811 2811 
 					$alldata = $Spotter->countAllMonthsPilots($filter);
2812 2812 
 					foreach ($alldata as $number) {
2813 
-						$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);
2813 
+						$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);
2814 2814 
 					}
2815 2815 
 					if ($globalDebug) echo 'Count all military by months...'."\n";
2816 2816 
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
2817 2817 
 					foreach ($alldata as $number) {
2818 
-						$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);
2818 
+						$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);
2819 2819 
 					}
2820 2820 
 					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2821 2821 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
2822 2822 
 				    	foreach ($alldata as $number) {
2823 
-			    			$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);
2823 
+			    			$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);
2824 2824 
 					}
2825 2825 
 					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2826 2826 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2827 2827 
 					foreach ($alldata as $number) {
2828 
-						$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);
2828 
+						$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);
2829 2829 
 					}
2830 2830 
 					echo '...Departure'."\n";
2831 
-					$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
2832 
-					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2831 
+					$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
2832 
+					$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
2833 2833 
 					foreach ($dall as $value) {
2834 2834 
 						$icao = $value['departure_airport_icao'];
2835 2835 
 						$ddate = $value['date'];
 
@@ -2847,11 +2847,11 @@  discard block
 
 block discarded – undo
2847 2847 
 					}
2848 2848 
 					$alldata = $pall;
2849 2849 
 					foreach ($alldata as $number) {
2850 
-						$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);
2850 
+						$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);
2851 2851 
 					}
2852 2852 
 					echo '...Arrival'."\n";
2853 
-					$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
2854 
-					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2853 
+					$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
2854 
+					$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
2855 2855 
 					foreach ($dall as $value) {
2856 2856 
 						$icao = $value['arrival_airport_icao'];
2857 2857 
 						$ddate = $value['date'];
 
@@ -2869,39 +2869,39 @@  discard block
 
 block discarded – undo
2869 2869 
 					}
2870 2870 
 					$alldata = $pall;
2871 2871 
 					foreach ($alldata as $number) {
2872 
-						$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);
2872 
+						$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);
2873 2873 
 					}
2874 2874 
 					echo 'Flights data...'."\n";
2875 2875 
 					echo '-> countAllDatesLastMonth...'."\n";
2876 2876 
 					$alldata = $Spotter->countAllDatesLastMonth($filter);
2877 2877 
 					foreach ($alldata as $number) {
2878 
-						$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
2878 
+						$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
2879 2879 
 					}
2880 2880 
 					echo '-> countAllDates...'."\n";
2881 
-					$previousdata = $this->countAllDates('',$filter_name);
2882 
-					$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
2881 
+					$previousdata = $this->countAllDates('', $filter_name);
2882 
+					$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
2883 2883 
 					$values = array();
2884 2884 
 					foreach ($alldata as $cnt) {
2885 2885 
 						$values[] = $cnt['date_count'];
2886 2886 
 					}
2887 
-					array_multisort($values,SORT_DESC,$alldata);
2888 
-					array_splice($alldata,11);
2887 
+					array_multisort($values, SORT_DESC, $alldata);
2888 
+					array_splice($alldata, 11);
2889 2889 
 					foreach ($alldata as $number) {
2890 
-						$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
2890 
+						$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
2891 2891 
 					}
2892 2892
2893 2893 
 					echo '-> countAllHours...'."\n";
2894 
-					$alldata = $Spotter->countAllHours('hour',$filter);
2894 
+					$alldata = $Spotter->countAllHours('hour', $filter);
2895 2895 
 					foreach ($alldata as $number) {
2896 
-						$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
2896 
+						$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
2897 2897 
 					}
2898 2898 
 					echo 'Insert last stats update date...'."\n";
2899 2899 
 					date_default_timezone_set('UTC');
2900 
-					$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
2900 
+					$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
2901 2901 
 					if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
2902 
-						if (date('Y',strtotime($last_update_day)) != date('Y')) {
2902 
+						if (date('Y', strtotime($last_update_day)) != date('Y')) {
2903 2903 
 							$this->deleteOldStats($filter_name);
2904 
-							$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
2904 
+							$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
2905 2905 
 						}
2906 2906 
 					}
2907 2907 
 				}
 
@@ -2914,16 +2914,16 @@  discard block
 
 block discarded – undo
2914 2914 
 				// SUM all previous month to put as year
2915 2915 
 				$previous_year = date('Y');
2916 2916 
 				$previous_year--;
2917 
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2918 
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2919 
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2920 
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2917 
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2918 
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2919 
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2920 
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2921 2921 
 				$allairlines = $this->getAllAirlineNames();
2922 2922 
 				foreach ($allairlines as $data) {
2923 
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2924 
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2925 
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2926 
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2923 
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2924 
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2925 
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2926 
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2927 2927 
 				}
2928 2928
2929 2929 
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
 
@@ -2932,21 +2932,21 @@  discard block
 
 block discarded – undo
2932 2932 
 						try {
2933 2933 
 							$sth = $this->db->prepare($query);
2934 2934 
 							$sth->execute();
2935 
-						} catch(PDOException $e) {
2935 
+						} catch (PDOException $e) {
2936 2936 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2937 2937 
 						}
2938 2938 
 						$query = "INSERT INTO tracker_archive_output SELECT * FROM tracker_output WHERE tracker_output.date < '".date('Y')."-01-01 00:00:00'";
2939 2939 
 						try {
2940 2940 
 							$sth = $this->db->prepare($query);
2941 2941 
 							$sth->execute();
2942 
-						} catch(PDOException $e) {
2942 
+						} catch (PDOException $e) {
2943 2943 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2944 2944 
 						}
2945 2945 
 						$query = "INSERT INTO marine_archive_output SELECT * FROM marine_output WHERE marine_output.date < '".date('Y')."-01-01 00:00:00'";
2946 2946 
 						try {
2947 2947 
 							$sth = $this->db->prepare($query);
2948 2948 
 							$sth->execute();
2949 
-						} catch(PDOException $e) {
2949 
+						} catch (PDOException $e) {
2950 2950 
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2951 2951 
 						}
2952 2952 
 					}
 
@@ -2959,7 +2959,7 @@  discard block
 
 block discarded – undo
2959 2959 
 					try {
2960 2960 
 						$sth = $this->db->prepare($query);
2961 2961 
 						$sth->execute();
2962 
-					} catch(PDOException $e) {
2962 
+					} catch (PDOException $e) {
2963 2963 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2964 2964 
 					}
2965 2965 
 					if ($globalDBdriver == 'mysql') {
 
@@ -2970,7 +2970,7 @@  discard block
 
 block discarded – undo
2970 2970 
 					try {
2971 2971 
 						$sth = $this->db->prepare($query);
2972 2972 
 						$sth->execute();
2973 
-					} catch(PDOException $e) {
2973 
+					} catch (PDOException $e) {
2974 2974 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2975 2975 
 					}
2976 2976 
 					if ($globalDBdriver == 'mysql') {
 
@@ -2981,15 +2981,15 @@  discard block
 
 block discarded – undo
2981 2981 
 					try {
2982 2982 
 						$sth = $this->db->prepare($query);
2983 2983 
 						$sth->execute();
2984 
-					} catch(PDOException $e) {
2984 
+					} catch (PDOException $e) {
2985 2985 
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2986 2986 
 					}
2987 2987 
 				}
2988 2988 
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
2989 2989 
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
2990 
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
2990 
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
2991 2991 
 						$this->deleteOldStats();
2992 
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
2992 
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
2993 2993 
 						$lastyearupdate = true;
2994 2994 
 					}
2995 2995 
 				}
 
@@ -3011,7 +3011,7 @@  discard block
 
 block discarded – undo
3011 3011 
 					try {
3012 3012 
 						$sth = $this->db->prepare($query);
3013 3013 
 						$sth->execute();
3014 
-					} catch(PDOException $e) {
3014 
+					} catch (PDOException $e) {
3015 3015 
 						return "error : ".$e->getMessage();
3016 3016 
 					}
3017 3017 
 					echo 'Archive old tracker data...'."\n";
 
@@ -3027,7 +3027,7 @@  discard block
 
 block discarded – undo
3027 3027 
 					try {
3028 3028 
 						$sth = $this->db->prepare($query);
3029 3029 
 						$sth->execute();
3030 
-					} catch(PDOException $e) {
3030 
+					} catch (PDOException $e) {
3031 3031 
 						return "error : ".$e->getMessage();
3032 3032 
 					}
3033 3033 
 					echo 'Archive old marine data...'."\n";
 
@@ -3043,7 +3043,7 @@  discard block
 
 block discarded – undo
3043 3043 
 					try {
3044 3044 
 						$sth = $this->db->prepare($query);
3045 3045 
 						$sth->execute();
3046 
-					} catch(PDOException $e) {
3046 
+					} catch (PDOException $e) {
3047 3047 
 						return "error : ".$e->getMessage();
3048 3048 
 					}
3049 3049 
 				}
 
@@ -3056,7 +3056,7 @@  discard block
 
 block discarded – undo
3056 3056 
 				try {
3057 3057 
 					$sth = $this->db->prepare($query);
3058 3058 
 					$sth->execute();
3059 
-				} catch(PDOException $e) {
3059 
+				} catch (PDOException $e) {
3060 3060 
 					return "error : ".$e->getMessage();
3061 3061 
 				}
3062 3062 
 				echo 'Deleting old tracker data...'."\n";
 
@@ -3068,7 +3068,7 @@  discard block
 
 block discarded – undo
3068 3068 
 				try {
3069 3069 
 					$sth = $this->db->prepare($query);
3070 3070 
 					$sth->execute();
3071 
-				} catch(PDOException $e) {
3071 
+				} catch (PDOException $e) {
3072 3072 
 					return "error : ".$e->getMessage();
3073 3073 
 				}
3074 3074 
 				echo 'Deleting old marine data...'."\n";
 
@@ -3080,14 +3080,14 @@  discard block
 
 block discarded – undo
3080 3080 
 				try {
3081 3081 
 					$sth = $this->db->prepare($query);
3082 3082 
 					$sth->execute();
3083 
-				} catch(PDOException $e) {
3083 
+				} catch (PDOException $e) {
3084 3084 
 					return "error : ".$e->getMessage();
3085 3085 
 				}
3086 3086 
 			}
3087 3087 
 			if (!isset($lastyearupdate)) {
3088 3088 
 				echo 'Insert last stats update date...'."\n";
3089 3089 
 				date_default_timezone_set('UTC');
3090 
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
3090 
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
3091 3091 
 			}
3092 3092 
 			if ($globalStatsResetYear) {
3093 3093 
 				require_once(dirname(__FILE__).'/../install/class.settings.php');
Please login to merge, or discard this patch.
Braces   +661 added lines, -231 removed lines patch added patch discarded remove patch 
@@ -15,10 +15,14 @@  discard block
 
 block discarded – undo
15 15
16 16 
 	public function __construct($dbc = null) {
17 17 
 		global $globalFilterName;
18 
-		if (isset($globalFilterName)) $this->filter_name = $globalFilterName;
18 
+		if (isset($globalFilterName)) {
19 
+			$this->filter_name = $globalFilterName;
20 
+		}
19 21 
 		$Connection = new Connection($dbc);
20 22 
 		$this->db = $Connection->db();
21 
-		if ($this->db === null) die('Error: No DB connection. (Stats)');
23 
+		if ($this->db === null) {
24 
+			die('Error: No DB connection. (Stats)');
25 
+		}
22 26 
 	}
23 27
24 28 
 	public function addLastStatsUpdate($type,$stats_date) {
 
@@ -86,7 +90,9 @@  discard block
 
 block discarded – undo
86 90
87 91 
 	public function getAllAirlineNames($filter_name = '') {
88 92 
 		global $globalStatsFilters;
89 
-		if ($filter_name == '') $filter_name = $this->filter_name;
93 
+		if ($filter_name == '') {
94 
+			$filter_name = $this->filter_name;
95 
+		}
90 96 
 		$query = "SELECT * FROM stats_airline WHERE filter_name = :filter_name ORDER BY airline_name ASC";
91 97 
 		 try {
92 98 
 			$sth = $this->db->prepare($query);
 
@@ -106,7 +112,9 @@  discard block
 
 block discarded – undo
106 112 
 		return $all;
107 113 
 	}
108 114 
 	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
109 
-		if ($filter_name == '') $filter_name = $this->filter_name;
115 
+		if ($filter_name == '') {
116 
+			$filter_name = $this->filter_name;
117 
+		}
110 118 
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
111 119 
 		try {
112 120 
 			$sth = $this->db->prepare($query);
 
@@ -118,7 +126,9 @@  discard block
 
 block discarded – undo
118 126 
 		return $all;
119 127 
 	}
120 128 
 	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
121 
-		if ($filter_name == '') $filter_name = $this->filter_name;
129 
+		if ($filter_name == '') {
130 
+			$filter_name = $this->filter_name;
131 
+		}
122 132 
 		$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 133 
 		try {
124 134 
 			$sth = $this->db->prepare($query);
 
@@ -130,7 +140,9 @@  discard block
 
 block discarded – undo
130 140 
 		return $all;
131 141 
 	}
132 142 
 	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
133 
-		if ($filter_name == '') $filter_name = $this->filter_name;
143 
+		if ($filter_name == '') {
144 
+			$filter_name = $this->filter_name;
145 
+		}
134 146 
 		$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 147 
 		try {
136 148 
 			$sth = $this->db->prepare($query);
 
@@ -143,7 +155,9 @@  discard block
 
 block discarded – undo
143 155 
 	}
144 156
145 157 
 	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
146 
-		if ($filter_name == '') $filter_name = $this->filter_name;
158 
+		if ($filter_name == '') {
159 
+			$filter_name = $this->filter_name;
160 
+		}
147 161 
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
148 162 
 		try {
149 163 
 			$sth = $this->db->prepare($query);
 
@@ -156,7 +170,9 @@  discard block
 
 block discarded – undo
156 170 
 	}
157 171
158 172 
 	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
159 
-		if ($filter_name == '') $filter_name = $this->filter_name;
173 
+		if ($filter_name == '') {
174 
+			$filter_name = $this->filter_name;
175 
+		}
160 176 
 		$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 177 
 		try {
162 178 
 			$sth = $this->db->prepare($query);
 
@@ -171,7 +187,9 @@  discard block
 
 block discarded – undo
171 187
172 188 
 	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
173 189 
 		global $globalStatsFilters;
174 
-		if ($filter_name == '') $filter_name = $this->filter_name;
190 
+		if ($filter_name == '') {
191 
+			$filter_name = $this->filter_name;
192 
+		}
175 193 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
176 194 
 			$Spotter = new Spotter($this->db);
177 195 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -180,8 +198,11 @@  discard block
 
 block discarded – undo
180 198 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
181 199 
 			}
182 200 
 			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 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 stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
201 
+				if ($limit) {
202 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
203 
+				} else {
204 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
205 
+				}
185 206 
 				try {
186 207 
 					$sth = $this->db->prepare($query);
187 208 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -189,11 +210,16 @@  discard block
 
 block discarded – undo
189 210 
 					echo "error : ".$e->getMessage();
190 211 
 				}
191 212 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
192 
-			} else $all = array();
213 
+			} else {
214 
+				$all = array();
215 
+			}
193 216 
 		} else {
194 217 
 			if ($year == '' && $month == '') {
195 
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
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 stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
218 
+				if ($limit) {
219 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
220 
+				} else {
221 
+					$query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
222 
+				}
197 223 
 				try {
198 224 
 					$sth = $this->db->prepare($query);
199 225 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -201,7 +227,9 @@  discard block
 
 block discarded – undo
201 227 
 					echo "error : ".$e->getMessage();
202 228 
 				}
203 229 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
204 
-			} else $all = array();
230 
+			} else {
231 
+				$all = array();
232 
+			}
205 233 
 		}
206 234 
 		if (empty($all)) {
207 235 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -220,10 +248,15 @@  discard block
 
 block discarded – undo
220 248 
 	}
221 249 
 	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
222 250 
 		global $globalStatsFilters;
223 
-		if ($filter_name == '') $filter_name = $this->filter_name;
251 
+		if ($filter_name == '') {
252 
+			$filter_name = $this->filter_name;
253 
+		}
224 254 
 		if ($year == '' && $month == '') {
225 
-			if ($limit) $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
226 
-			else $query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
255 
+			if ($limit) {
256 
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC LIMIT 10 OFFSET 0";
257 
+			} else {
258 
+				$query = "SELECT airlines.country AS airline_country, SUM(stats_airline.cnt) as airline_country_count, countries.iso3 AS airline_country_iso3 FROM stats_airline,airlines,countries WHERE countries.name = airlines.country AND stats_airline.airline_icao=airlines.icao AND filter_name = :filter_name GROUP BY airline_country, countries.iso3 ORDER BY airline_country_count DESC";
259 
+			}
227 260 
 			try {
228 261 
 				$sth = $this->db->prepare($query);
229 262 
 				$sth->execute(array(':filter_name' => $filter_name));
 
@@ -231,7 +264,9 @@  discard block
 
 block discarded – undo
231 264 
 				echo "error : ".$e->getMessage();
232 265 
 			}
233 266 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
234 
-		} else $all = array();
267 
+		} else {
268 
+			$all = array();
269 
+		}
235 270 
 		if (empty($all)) {
236 271 
 			$Spotter = new Spotter($this->db);
237 272 
 			$filters = array();
 
@@ -246,7 +281,9 @@  discard block
 
 block discarded – undo
246 281 
 	}
247 282 
 	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
248 283 
 		global $globalStatsFilters;
249 
-		if ($filter_name == '') $filter_name = $this->filter_name;
284 
+		if ($filter_name == '') {
285 
+			$filter_name = $this->filter_name;
286 
+		}
250 287 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
251 288 
 			$Spotter = new Spotter($this->db);
252 289 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -255,8 +292,11 @@  discard block
 
 block discarded – undo
255 292 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
256 293 
 			}
257 294 
 			if ($year == '' && $month == '') {
258 
-				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";
259 
-				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";
295 
+				if ($limit) {
296 
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
297 
+				} else {
298 
+					$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";
299 
+				}
260 300 
 				try {
261 301 
 					$sth = $this->db->prepare($query);
262 302 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -264,11 +304,16 @@  discard block
 
 block discarded – undo
264 304 
 					echo "error : ".$e->getMessage();
265 305 
 				}
266 306 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
267 
-			} else $all = array();
307 
+			} else {
308 
+				$all = array();
309 
+			}
268 310 
 		} else {
269 311 
 			if ($year == '' && $month == '') {
270 
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
271 
-				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";
312 
+				if ($limit) {
313 
+					$query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
314 
+				} else {
315 
+					$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";
316 
+				}
272 317 
 				try {
273 318 
 					$sth = $this->db->prepare($query);
274 319 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -276,7 +321,9 @@  discard block
 
 block discarded – undo
276 321 
 					echo "error : ".$e->getMessage();
277 322 
 				}
278 323 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
279 
-			} else $all = array();
324 
+			} else {
325 
+				$all = array();
326 
+			}
280 327 
 		}
281 328 
 		if (empty($all)) {
282 329 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -296,7 +343,9 @@  discard block
 
 block discarded – undo
296 343
297 344 
 	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
298 345 
 		global $globalStatsFilters;
299 
-		if ($filter_name == '') $filter_name = $this->filter_name;
346 
+		if ($filter_name == '') {
347 
+			$filter_name = $this->filter_name;
348 
+		}
300 349 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
301 350 
 			$Spotter = new Spotter($this->db);
302 351 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -305,8 +354,11 @@  discard block
 
 block discarded – undo
305 354 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
306 355 
 			}
307 356 
 			if ($year == '' && $month == '') {
308 
-				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";
309 
-				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";
357 
+				if ($limit) {
358 
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_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";
359 
+				} else {
360 
+					$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";
361 
+				}
310 362 
 				try {
311 363 
 					$sth = $this->db->prepare($query);
312 364 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -314,11 +366,16 @@  discard block
 
 block discarded – undo
314 366 
 					echo "error : ".$e->getMessage();
315 367 
 				}
316 368 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
317 
-			} else $all = array();
369 
+			} else {
370 
+				$all = array();
371 
+			}
318 372 
 		} else {
319 373 
 			if ($year == '' && $month == '') {
320 
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
321 
-				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";
374 
+				if ($limit) {
375 
+					$query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
376 
+				} else {
377 
+					$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";
378 
+				}
322 379 
 				try {
323 380 
 					$sth = $this->db->prepare($query);
324 381 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -326,7 +383,9 @@  discard block
 
 block discarded – undo
326 383 
 					echo "error : ".$e->getMessage();
327 384 
 				}
328 385 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
329 
-			} else $all = array();
386 
+			} else {
387 
+				$all = array();
388 
+			}
330 389 
 		}
331 390 
 		if (empty($all)) {
332 391 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -345,7 +404,9 @@  discard block
 
 block discarded – undo
345 404 
 	}
346 405 
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
347 406 
 		global $globalStatsFilters;
348 
-		if ($filter_name == '') $filter_name = $this->filter_name;
407 
+		if ($filter_name == '') {
408 
+			$filter_name = $this->filter_name;
409 
+		}
349 410 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
350 411 
 			$Spotter = new Spotter($this->db);
351 412 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -353,12 +414,18 @@  discard block
 
 block discarded – undo
353 414 
 			foreach ($airlines as $airline) {
354 415 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
355 416 
 			}
356 
-			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";
357 
-			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";
417 
+			if ($limit) {
418 
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.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";
419 
+			} else {
420 
+				$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";
421 
+			}
358 422 
 			$query_values = array(':filter_name' => $filter_name);
359 423 
 		} else {
360 
-			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";
361 
-			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";
424 
+			if ($limit) {
425 
+				$query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.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";
426 
+			} else {
427 
+				$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";
428 
+			}
362 429 
 			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
363 430 
 		}
364 431 
 		try {
 
@@ -386,17 +453,29 @@  discard block
 
 block discarded – undo
386 453
387 454 
 	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
388 455 
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
389 
-		if ($filter_name == '') $filter_name = $this->filter_name;
456 
+		if ($filter_name == '') {
457 
+			$filter_name = $this->filter_name;
458 
+		}
390 459 
 		if ($year == '' && $month == '') {
391 
-			if ($globalVATSIM) $forsource = 'vatsim';
392 
-			if ($globalIVAO) $forsource = 'ivao';
460 
+			if ($globalVATSIM) {
461 
+				$forsource = 'vatsim';
462 
+			}
463 
+			if ($globalIVAO) {
464 
+				$forsource = 'ivao';
465 
+			}
393 466 
 			if (isset($forsource)) {
394 
-				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";
395 
-				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";
467 
+				if ($limit) {
468 
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
469 
+				} else {
470 
+					$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";
471 
+				}
396 472 
 				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
397 473 
 			} else {
398 
-				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";
399 
-				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";
474 
+				if ($limit) {
475 
+					$query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
476 
+				} else {
477 
+					$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";
478 
+				}
400 479 
 				$query_values = array(':filter_name' => $filter_name);
401 480 
 			}
402 481 
 			try {
 
@@ -406,7 +485,9 @@  discard block
 
 block discarded – undo
406 485 
 				echo "error : ".$e->getMessage();
407 486 
 			}
408 487 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
409 
-		} else $all = array();
488 
+		} else {
489 
+			$all = array();
490 
+		}
410 491 
                 if (empty($all)) {
411 492 
 	                $Spotter = new Spotter($this->db);
412 493 
             		$filters = array();
 
@@ -421,7 +502,9 @@  discard block
 
 block discarded – undo
421 502 
 	}
422 503 
 	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
423 504 
 		global $globalStatsFilters;
424 
-		if ($filter_name == '') $filter_name = $this->filter_name;
505 
+		if ($filter_name == '') {
506 
+			$filter_name = $this->filter_name;
507 
+		}
425 508 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
426 509 
 			$Spotter = new Spotter($this->db);
427 510 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -430,8 +513,11 @@  discard block
 
 block discarded – undo
430 513 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
431 514 
 			}
432 515 
 			if ($year == '' && $month == '') {
433 
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
434 
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
516 
+				if ($limit) {
517 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
518 
+				} else {
519 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
520 
+				}
435 521 
 				try {
436 522 
 					$sth = $this->db->prepare($query);
437 523 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -439,11 +525,16 @@  discard block
 
 block discarded – undo
439 525 
 					echo "error : ".$e->getMessage();
440 526 
 				}
441 527 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
442 
-			} else $all = array();
528 
+			} else {
529 
+				$all = array();
530 
+			}
443 531 
 		} else {
444 532 
 			if ($year == '' && $month == '') {
445 
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
446 
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
533 
+				if ($limit) {
534 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
535 
+				} else {
536 
+					$query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
537 
+				}
447 538 
 				try {
448 539 
 					$sth = $this->db->prepare($query);
449 540 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -451,7 +542,9 @@  discard block
 
 block discarded – undo
451 542 
 					echo "error : ".$e->getMessage();
452 543 
 				}
453 544 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
454 
-			} else $all = array();
545 
+			} else {
546 
+				$all = array();
547 
+			}
455 548 
 		}
456 549 
 		if (empty($all)) {
457 550 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -470,7 +563,9 @@  discard block
 
 block discarded – undo
470 563 
 	}
471 564 
 	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
472 565 
 		global $globalStatsFilters;
473 
-		if ($filter_name == '') $filter_name = $this->filter_name;
566 
+		if ($filter_name == '') {
567 
+			$filter_name = $this->filter_name;
568 
+		}
474 569 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
475 570 
 			$Spotter = new Spotter($this->db);
476 571 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -479,8 +574,11 @@  discard block
 
 block discarded – undo
479 574 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
480 575 
 			}
481 576 
 			if ($year == '' && $month == '') {
482 
-				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";
483 
-				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";
577 
+				if ($limit) {
578 
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
579 
+				} else {
580 
+					$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";
581 
+				}
484 582 
 				 try {
485 583 
 					$sth = $this->db->prepare($query);
486 584 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -488,11 +586,16 @@  discard block
 
 block discarded – undo
488 586 
 					echo "error : ".$e->getMessage();
489 587 
 				}
490 588 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
491 
-			} else $all = array();
589 
+			} else {
590 
+				$all = array();
591 
+			}
492 592 
 		} else {
493 593 
 			if ($year == '' && $month == '') {
494 
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
495 
-				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";
594 
+				if ($limit) {
595 
+					$query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
596 
+				} else {
597 
+					$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";
598 
+				}
496 599 
 				 try {
497 600 
 					$sth = $this->db->prepare($query);
498 601 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -500,7 +603,9 @@  discard block
 
 block discarded – undo
500 603 
 					echo "error : ".$e->getMessage();
501 604 
 				}
502 605 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
503 
-			} else $all = array();
606 
+			} else {
607 
+				$all = array();
608 
+			}
504 609 
 		}
505 610 
 		if (empty($all)) {
506 611 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -519,7 +624,9 @@  discard block
 
 block discarded – undo
519 624 
 	}
520 625 
 	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
521 626 
 		$Connection = new Connection($this->db);
522 
-		if ($filter_name == '') $filter_name = $this->filter_name;
627 
+		if ($filter_name == '') {
628 
+			$filter_name = $this->filter_name;
629 
+		}
523 630 
 		if ($Connection->tableExists('countries')) {
524 631 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
525 632 
 				$Spotter = new Spotter($this->db);
 
@@ -529,8 +636,11 @@  discard block
 
 block discarded – undo
529 636 
 					foreach ($airlines as $airline) {
530 637 
 						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
531 638 
 					}
532 
-					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";
533 
-					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";
639 
+					if ($limit) {
640 
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
641 
+					} else {
642 
+						$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";
643 
+					}
534 644 
 					 try {
535 645 
 						$sth = $this->db->prepare($query);
536 646 
 						$sth->execute(array(':filter_name' => $filter_name));
 
@@ -539,11 +649,16 @@  discard block
 
 block discarded – undo
539 649 
 					}
540 650 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
541 651 
 					return $all;
542 
-				} else return array();
652 
+				} else {
653 
+					return array();
654 
+				}
543 655 
 			} else {
544 656 
 				if ($year == '' && $month == '') {
545 
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
546 
-					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";
657 
+					if ($limit) {
658 
+						$query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
659 
+					} else {
660 
+						$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";
661 
+					}
547 662 
 					 try {
548 663 
 						$sth = $this->db->prepare($query);
549 664 
 						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -552,7 +667,9 @@  discard block
 
 block discarded – undo
552 667 
 					}
553 668 
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
554 669 
 					return $all;
555 
-				} else return array();
670 
+				} else {
671 
+					return array();
672 
+				}
556 673 
 			}
557 674 
 		} else {
558 675 
 			/*
 
@@ -566,10 +683,15 @@  discard block
 
 block discarded – undo
566 683 
 	}
567 684 
 	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
568 685 
 		global $globalStatsFilters;
569 
-		if ($filter_name == '') $filter_name = $this->filter_name;
686 
+		if ($filter_name == '') {
687 
+			$filter_name = $this->filter_name;
688 
+		}
570 689 
 		if ($year == '' && $month == '') {
571 
-			if ($limit) $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
572 
-			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";
690 
+			if ($limit) {
691 
+				$query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC LIMIT 10 OFFSET 0";
692 
+			} else {
693 
+				$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";
694 
+			}
573 695 
 			try {
574 696 
 				$sth = $this->db->prepare($query);
575 697 
 				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -577,7 +699,9 @@  discard block
 
 block discarded – undo
577 699 
 				echo "error : ".$e->getMessage();
578 700 
 			}
579 701 
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
580 
-		} else $all = array();
702 
+		} else {
703 
+			$all = array();
704 
+		}
581 705 
 		if (empty($all)) {
582 706 
 			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
583 707 
 			if ($filter_name != '') {
 
@@ -592,7 +716,9 @@  discard block
 
 block discarded – undo
592 716
593 717 
 	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
594 718 
 		global $globalStatsFilters;
595 
-		if ($filter_name == '') $filter_name = $this->filter_name;
719 
+		if ($filter_name == '') {
720 
+			$filter_name = $this->filter_name;
721 
+		}
596 722 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
597 723 
 			$Spotter = new Spotter($this->db);
598 724 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -601,8 +727,11 @@  discard block
 
 block discarded – undo
601 727 
 				foreach ($airlines as $airline) {
602 728 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
603 729 
 				}
604 
-				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";
605 
-				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";
730 
+				if ($limit) {
731 
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
732 
+				} else {
733 
+					$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";
734 
+				}
606 735 
 				try {
607 736 
 					$sth = $this->db->prepare($query);
608 737 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -610,11 +739,16 @@  discard block
 
 block discarded – undo
610 739 
 					echo "error : ".$e->getMessage();
611 740 
 				}
612 741 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
613 
-			} else $all = array();
742 
+			} else {
743 
+				$all = array();
744 
+			}
614 745 
 		} else {
615 746 
 			if ($year == '' && $month == '') {
616 
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
617 
-				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";
747 
+				if ($limit) {
748 
+					$query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
749 
+				} else {
750 
+					$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";
751 
+				}
618 752 
 				try {
619 753 
 					$sth = $this->db->prepare($query);
620 754 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -622,7 +756,9 @@  discard block
 
 block discarded – undo
622 756 
 					echo "error : ".$e->getMessage();
623 757 
 				}
624 758 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
625 
-			} else $all = array();
759 
+			} else {
760 
+				$all = array();
761 
+			}
626 762 
 		}
627 763 
 		if (empty($all)) {
628 764 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -641,7 +777,9 @@  discard block
 
 block discarded – undo
641 777 
 	}
642 778 
 	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
643 779 
 		global $globalStatsFilters;
644 
-		if ($filter_name == '') $filter_name = $this->filter_name;
780 
+		if ($filter_name == '') {
781 
+			$filter_name = $this->filter_name;
782 
+		}
645 783 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
646 784 
 			$Spotter = new Spotter($this->db);
647 785 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -650,8 +788,11 @@  discard block
 
 block discarded – undo
650 788 
 				foreach ($airlines as $airline) {
651 789 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
652 790 
 				}
653 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
654 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
791 
+				if ($limit) {
792 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
793 
+				} else {
794 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
795 
+				}
655 796 
 				try {
656 797 
 					$sth = $this->db->prepare($query);
657 798 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -659,11 +800,16 @@  discard block
 
 block discarded – undo
659 800 
 					echo "error : ".$e->getMessage();
660 801 
 				}
661 802 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
662 
-			} else $all = array();
803 
+			} else {
804 
+				$all = array();
805 
+			}
663 806 
 		} else {
664 807 
 			if ($year == '' && $month == '') {
665 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
666 
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
808 
+				if ($limit) {
809 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
810 
+				} else {
811 
+					$query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
812 
+				}
667 813 
 				try {
668 814 
 					$sth = $this->db->prepare($query);
669 815 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -671,7 +817,9 @@  discard block
 
 block discarded – undo
671 817 
 					echo "error : ".$e->getMessage();
672 818 
 				}
673 819 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
674 
-			} else $all = array();
820 
+			} else {
821 
+				$all = array();
822 
+			}
675 823 
 		}
676 824 
 		if (empty($all)) {
677 825 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -696,7 +844,9 @@  discard block
 
 block discarded – undo
696 844 
 				$icao = $value['airport_departure_icao'];
697 845 
 				if (isset($all[$icao])) {
698 846 
 					$all[$icao]['airport_departure_icao_count'] = $all[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
699 
-				} else $all[$icao] = $value;
847 
+				} else {
848 
+					$all[$icao] = $value;
849 
+				}
700 850 
 			}
701 851 
 			$count = array();
702 852 
 			foreach ($all as $key => $row) {
 
@@ -708,7 +858,9 @@  discard block
 
 block discarded – undo
708 858 
 	}
709 859 
 	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
710 860 
 		global $globalStatsFilters;
711 
-		if ($filter_name == '') $filter_name = $this->filter_name;
861 
+		if ($filter_name == '') {
862 
+			$filter_name = $this->filter_name;
863 
+		}
712 864 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
713 865 
 			$Spotter = new Spotter($this->db);
714 866 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -717,8 +869,11 @@  discard block
 
 block discarded – undo
717 869 
 				foreach ($airlines as $airline) {
718 870 
 					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
719 871 
 				}
720 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
721 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
872 
+				if ($limit) {
873 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
874 
+				} else {
875 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
876 
+				}
722 877 
 				try {
723 878 
 					$sth = $this->db->prepare($query);
724 879 
 					$sth->execute(array(':filter_name' => $filter_name));
 
@@ -726,11 +881,16 @@  discard block
 
 block discarded – undo
726 881 
 					echo "error : ".$e->getMessage();
727 882 
 				}
728 883 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
729 
-			} else $all = array();
884 
+			} else {
885 
+				$all = array();
886 
+			}
730 887 
 		} else {
731 888 
 			if ($year == '' && $month == '') {
732 
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
733 
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
889 
+				if ($limit) {
890 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
891 
+				} else {
892 
+					$query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
893 
+				}
734 894 
 				try {
735 895 
 					$sth = $this->db->prepare($query);
736 896 
 					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
 
@@ -738,7 +898,9 @@  discard block
 
 block discarded – undo
738 898 
 					echo "error : ".$e->getMessage();
739 899 
 				}
740 900 
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
741 
-			} else $all = array();
901 
+			} else {
902 
+				$all = array();
903 
+			}
742 904 
 		}
743 905 
 		if (empty($all)) {
744 906 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -763,7 +925,9 @@  discard block
 
 block discarded – undo
763 925 
 				$icao = $value['airport_arrival_icao'];
764 926 
 				if (isset($all[$icao])) {
765 927 
 					$all[$icao]['airport_arrival_icao_count'] = $all[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
766 
-				} else $all[$icao] = $value;
928 
+				} else {
929 
+					$all[$icao] = $value;
930 
+				}
767 931 
 			}
768 932 
 			$count = array();
769 933 
 			foreach ($all as $key => $row) {
 
@@ -775,7 +939,9 @@  discard block
 
 block discarded – undo
775 939 
 	}
776 940 
 	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
777 941 
 		global $globalDBdriver, $globalStatsFilters;
778 
-		if ($filter_name == '') $filter_name = $this->filter_name;
942 
+		if ($filter_name == '') {
943 
+			$filter_name = $this->filter_name;
944 
+		}
779 945 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
780 946 
 			$Spotter = new Spotter($this->db);
781 947 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -784,20 +950,32 @@  discard block
 
 block discarded – undo
784 950 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
785 951 
 			}
786 952 
 			if ($globalDBdriver == 'mysql') {
787 
-				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";
788 
-				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";
953 
+				if ($limit) {
954 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
955 
+				} else {
956 
+					$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";
957 
+				}
789 958 
 			} else {
790 
-				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";
791 
-				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";
959 
+				if ($limit) {
960 
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_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";
961 
+				} else {
962 
+					$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";
963 
+				}
792 964 
 			}
793 965 
 			$query_data = array(':filter_name' => $filter_name);
794 966 
 		} else {
795 967 
 			if ($globalDBdriver == 'mysql') {
796 
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
797 
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
968 
+				if ($limit) {
969 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline = :stats_airline AND filter_name = :filter_name";
970 
+				} else {
971 
+					$query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
972 
+				}
798 973 
 			} else {
799 
-				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";
800 
-				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";
974 
+				if ($limit) {
975 
+					$query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
976 
+				} else {
977 
+					$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";
978 
+				}
801 979 
 			}
802 980 
 			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
803 981 
 		}
 
@@ -825,7 +1003,9 @@  discard block
 
 block discarded – undo
825 1003
826 1004 
 	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
827 1005 
 		global $globalStatsFilters;
828 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1006 
+		if ($filter_name == '') {
1007 
+			$filter_name = $this->filter_name;
1008 
+		}
829 1009 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
830 1010 
 			$Spotter = new Spotter($this->db);
831 1011 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -862,7 +1042,9 @@  discard block
 
 block discarded – undo
862 1042 
 	}
863 1043 
 	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
864 1044 
 		global $globalDBdriver, $globalStatsFilters;
865 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1045 
+		if ($filter_name == '') {
1046 
+			$filter_name = $this->filter_name;
1047 
+		}
866 1048 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
867 1049 
 			$Spotter = new Spotter($this->db);
868 1050 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -907,7 +1089,9 @@  discard block
 
 block discarded – undo
907 1089 
 	}
908 1090 
 	public function countAllDates($stats_airline = '',$filter_name = '') {
909 1091 
 		global $globalStatsFilters;
910 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1092 
+		if ($filter_name == '') {
1093 
+			$filter_name = $this->filter_name;
1094 
+		}
911 1095 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
912 1096 
 			$Spotter = new Spotter($this->db);
913 1097 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -944,7 +1128,9 @@  discard block
 
 block discarded – undo
944 1128 
 	}
945 1129 
 	public function countAllDatesMarine($filter_name = '') {
946 1130 
 		global $globalStatsFilters;
947 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1131 
+		if ($filter_name == '') {
1132 
+			$filter_name = $this->filter_name;
1133 
+		}
948 1134 
 		$query = "SELECT marine_date as date_name, cnt as date_count FROM stats_marine WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC";
949 1135 
 		$query_data = array(':filter_name' => $filter_name);
950 1136 
 		try {
 
@@ -966,7 +1152,9 @@  discard block
 
 block discarded – undo
966 1152 
 	}
967 1153 
 	public function countAllDatesTracker($filter_name = '') {
968 1154 
 		global $globalStatsFilters;
969 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1155 
+		if ($filter_name == '') {
1156 
+			$filter_name = $this->filter_name;
1157 
+		}
970 1158 
 		$query = "SELECT tracker_date as date_name, cnt as date_count FROM stats_tracker WHERE stats_type = 'date' AND filter_name = :filter_name ORDER BY date_count DESC";
971 1159 
 		$query_data = array(':filter_name' => $filter_name);
972 1160 
 		try {
 
@@ -988,7 +1176,9 @@  discard block
 
 block discarded – undo
988 1176 
 	}
989 1177 
 	public function countAllDatesByAirlines($filter_name = '') {
990 1178 
 		global $globalStatsFilters;
991 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1179 
+		if ($filter_name == '') {
1180 
+			$filter_name = $this->filter_name;
1181 
+		}
992 1182 
 		$query = "SELECT stats_airline as airline_icao, flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND filter_name = :filter_name";
993 1183 
 		$query_data = array('filter_name' => $filter_name);
994 1184 
 		try {
 
@@ -1010,7 +1200,9 @@  discard block
 
 block discarded – undo
1010 1200 
 	}
1011 1201 
 	public function countAllMonths($stats_airline = '',$filter_name = '') {
1012 1202 
 		global $globalStatsFilters, $globalDBdriver;
1013 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1203 
+		if ($filter_name == '') {
1204 
+			$filter_name = $this->filter_name;
1205 
+		}
1014 1206 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1015 1207 
 			$Spotter = new Spotter($this->db);
1016 1208 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1095,7 +1287,9 @@  discard block
 
 block discarded – undo
1095 1287 
 	}
1096 1288 
 	public function countAllMilitaryMonths($filter_name = '') {
1097 1289 
 		global $globalStatsFilters;
1098 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1290 
+		if ($filter_name == '') {
1291 
+			$filter_name = $this->filter_name;
1292 
+		}
1099 1293 
 		$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, cnt as date_count FROM stats WHERE stats_type = 'military_flights_bymonth' AND filter_name = :filter_name";
1100 1294 
 		try {
1101 1295 
 			$sth = $this->db->prepare($query);
 
@@ -1116,7 +1310,9 @@  discard block
 
 block discarded – undo
1116 1310 
 	}
1117 1311 
 	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1118 1312 
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1119 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1313 
+		if ($filter_name == '') {
1314 
+			$filter_name = $this->filter_name;
1315 
+		}
1120 1316 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1121 1317 
 			$Spotter = new Spotter($this->db);
1122 1318 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1124,12 +1320,18 @@  discard block
 
 block discarded – undo
1124 1320 
 			foreach ($airlines as $airline) {
1125 1321 
 				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1126 1322 
 			}
1127 
-			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";
1128 
-			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";
1323 
+			if ($limit) {
1324 
+				$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";
1325 
+			} else {
1326 
+				$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";
1327 
+			}
1129 1328 
 			$query_data = array(':filter_name' => $filter_name);
1130 1329 
 		} else {
1131 
-			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";
1132 
-			else $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
1330 
+			if ($limit) {
1331 
+				$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";
1332 
+			} else {
1333 
+				$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";
1334 
+			}
1133 1335 
 			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1134 1336 
 		}
1135 1337 
 		if ($orderby == 'hour') {
 
@@ -1139,7 +1341,9 @@  discard block
 
 block discarded – undo
1139 1341 
 				$query .= " ORDER BY CAST(flight_date AS integer) ASC";
1140 1342 
 			}
1141 1343 
 		}
1142 
-		if ($orderby == 'count') $query .= " ORDER BY hour_count DESC";
1344 
+		if ($orderby == 'count') {
1345 
+			$query .= " ORDER BY hour_count DESC";
1346 
+		}
1143 1347 
 		try {
1144 1348 
 			$sth = $this->db->prepare($query);
1145 1349 
 			$sth->execute($query_data);
 
@@ -1163,8 +1367,12 @@  discard block
 
 block discarded – undo
1163 1367 
 	}
1164 1368 
 	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1165 1369 
 		global $globalStatsFilters;
1166 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1167 
-		if ($year == '') $year = date('Y');
1370 
+		if ($filter_name == '') {
1371 
+			$filter_name = $this->filter_name;
1372 
+		}
1373 
+		if ($year == '') {
1374 
+			$year = date('Y');
1375 
+		}
1168 1376 
 		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1169 1377 
 		if (empty($all)) {
1170 1378 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1183,8 +1391,12 @@  discard block
 
 block discarded – undo
1183 1391 
 	}
1184 1392 
 	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1185 1393 
 		global $globalStatsFilters;
1186 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1187 
-		if ($year == '') $year = date('Y');
1394 
+		if ($filter_name == '') {
1395 
+			$filter_name = $this->filter_name;
1396 
+		}
1397 
+		if ($year == '') {
1398 
+			$year = date('Y');
1399 
+		}
1188 1400 
 		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1189 1401 
 		if (empty($all)) {
1190 1402 
 			$filters = array();
 
@@ -1200,8 +1412,12 @@  discard block
 
 block discarded – undo
1200 1412 
 	}
1201 1413 
 	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1202 1414 
 		global $globalStatsFilters;
1203 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1204 
-		if ($year == '') $year = date('Y');
1415 
+		if ($filter_name == '') {
1416 
+			$filter_name = $this->filter_name;
1417 
+		}
1418 
+		if ($year == '') {
1419 
+			$year = date('Y');
1420 
+		}
1205 1421 
 		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1206 1422 
 		if (empty($all)) {
1207 1423 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1220,7 +1436,9 @@  discard block
 
 block discarded – undo
1220 1436 
 	}
1221 1437 
 	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1222 1438 
 		global $globalStatsFilters;
1223 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1439 
+		if ($filter_name == '') {
1440 
+			$filter_name = $this->filter_name;
1441 
+		}
1224 1442 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1225 1443 
 			$Spotter = new Spotter($this->db);
1226 1444 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1238,7 +1456,9 @@  discard block
 
 block discarded – undo
1238 1456 
 				}
1239 1457 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1240 1458 
 				$all = $result[0]['nb'];
1241 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1459 
+			} else {
1460 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1461 
+			}
1242 1462 
 		} else {
1243 1463 
 			if ($year == '' && $month == '') {
1244 1464 
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1250,7 +1470,9 @@  discard block
 
 block discarded – undo
1250 1470 
 				}
1251 1471 
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1252 1472 
 				$all = $result[0]['nb'];
1253 
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1473 
+			} else {
1474 
+				$all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1475 
+			}
1254 1476 
 		}
1255 1477 
 		if (empty($all)) {
1256 1478 
 			if (strpos($stats_airline,'alliance_') !== FALSE) {
 
@@ -1269,7 +1491,9 @@  discard block
 
 block discarded – undo
1269 1491 
 	}
1270 1492 
 	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1271 1493 
 		global $globalStatsFilters;
1272 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1494 
+		if ($filter_name == '') {
1495 
+			$filter_name = $this->filter_name;
1496 
+		}
1273 1497 
 		if ($year == '' && $month == '') {
1274 1498 
 			$query = "SELECT COUNT(*) AS nb_airline FROM stats_airline WHERE filter_name = :filter_name";
1275 1499 
 			try {
 
@@ -1280,7 +1504,9 @@  discard block
 
 block discarded – undo
1280 1504 
 			}
1281 1505 
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1282 1506 
 			$all = $result[0]['nb_airline'];
1283 
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1507 
+		} else {
1508 
+			$all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1509 
+		}
1284 1510 
 		if (empty($all)) {
1285 1511 
 			$filters = array();
1286 1512 
 			$filters = array('year' => $year,'month' => $month);
 
@@ -1295,7 +1521,9 @@  discard block
 
 block discarded – undo
1295 1521 
 	}
1296 1522 
 	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1297 1523 
 		global $globalStatsFilters;
1298 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1524 
+		if ($filter_name == '') {
1525 
+			$filter_name = $this->filter_name;
1526 
+		}
1299 1527 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1300 1528 
 			$Spotter = new Spotter($this->db);
1301 1529 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1350,7 +1578,9 @@  discard block
 
 block discarded – undo
1350 1578 
 	}
1351 1579 
 	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1352 1580 
 		global $globalStatsFilters;
1353 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1581 
+		if ($filter_name == '') {
1582 
+			$filter_name = $this->filter_name;
1583 
+		}
1354 1584 
 		//if ($year == '') $year = date('Y');
1355 1585 
 		if ($year == '' && $month == '') {
1356 1586 
 			$query = "SELECT count(*) as nb FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
 
@@ -1379,7 +1609,9 @@  discard block
 
 block discarded – undo
1379 1609 
 	}
1380 1610
1381 1611 
 	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1382 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1612 
+		if ($filter_name == '') {
1613 
+			$filter_name = $this->filter_name;
1614 
+		}
1383 1615 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1384 1616 
 			$Spotter = new Spotter($this->db);
1385 1617 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1403,7 +1635,9 @@  discard block
 
 block discarded – undo
1403 1635 
 		return $all;
1404 1636 
 	}
1405 1637 
 	public function getStats($type,$stats_airline = '', $filter_name = '') {
1406 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1638 
+		if ($filter_name == '') {
1639 
+			$filter_name = $this->filter_name;
1640 
+		}
1407 1641 
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1408 1642 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1409 1643 
 		try {
 
@@ -1416,7 +1650,9 @@  discard block
 
 block discarded – undo
1416 1650 
 		return $all;
1417 1651 
 	}
1418 1652 
 	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1419 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1653 
+		if ($filter_name == '') {
1654 
+			$filter_name = $this->filter_name;
1655 
+		}
1420 1656 
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1421 1657 
 		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1422 1658 
 		try {
 
@@ -1427,7 +1663,9 @@  discard block
 
 block discarded – undo
1427 1663 
 		}
1428 1664 
 	}
1429 1665 
 	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1430 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1666 
+		if ($filter_name == '') {
1667 
+			$filter_name = $this->filter_name;
1668 
+		}
1431 1669 
 		global $globalArchiveMonths, $globalDBdriver;
1432 1670 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1433 1671 
 			$Spotter = new Spotter($this->db);
 
@@ -1483,7 +1721,9 @@  discard block
 
 block discarded – undo
1483 1721 
 	}
1484 1722 
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1485 1723 
 		global $globalArchiveMonths, $globalDBdriver;
1486 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1724 
+		if ($filter_name == '') {
1725 
+			$filter_name = $this->filter_name;
1726 
+		}
1487 1727 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1488 1728 
 			$Spotter = new Spotter($this->db);
1489 1729 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1516,7 +1756,9 @@  discard block
 
 block discarded – undo
1516 1756 
 	}
1517 1757 
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1518 1758 
 		global $globalArchiveMonths, $globalDBdriver;
1519 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1759 
+		if ($filter_name == '') {
1760 
+			$filter_name = $this->filter_name;
1761 
+		}
1520 1762 
 		if (strpos($stats_airline,'alliance_') !== FALSE) {
1521 1763 
 			$Spotter = new Spotter($this->db);
1522 1764 
 			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
 
@@ -1547,7 +1789,9 @@  discard block
 
 block discarded – undo
1547 1789 
 	}
1548 1790 
 	public function getStatsAirlineTotal($filter_name = '') {
1549 1791 
 		global $globalArchiveMonths, $globalDBdriver;
1550 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1792 
+		if ($filter_name == '') {
1793 
+			$filter_name = $this->filter_name;
1794 
+		}
1551 1795 
 		if ($globalDBdriver == 'mysql') {
1552 1796 
 			$query = "SELECT SUM(cnt) as total FROM stats_airline WHERE filter_name = :filter_name";
1553 1797 
 		} else {
 
@@ -1564,7 +1808,9 @@  discard block
 
 block discarded – undo
1564 1808 
 	}
1565 1809 
 	public function getStatsOwnerTotal($filter_name = '') {
1566 1810 
 		global $globalArchiveMonths, $globalDBdriver;
1567 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1811 
+		if ($filter_name == '') {
1812 
+			$filter_name = $this->filter_name;
1813 
+		}
1568 1814 
 		if ($globalDBdriver == 'mysql') {
1569 1815 
 			$query = "SELECT SUM(cnt) as total FROM stats_owner WHERE filter_name = :filter_name";
1570 1816 
 		} else {
 
@@ -1581,7 +1827,9 @@  discard block
 
 block discarded – undo
1581 1827 
 	}
1582 1828 
 	public function getStatsOwner($owner_name,$filter_name = '') {
1583 1829 
 		global $globalArchiveMonths, $globalDBdriver;
1584 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1830 
+		if ($filter_name == '') {
1831 
+			$filter_name = $this->filter_name;
1832 
+		}
1585 1833 
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1586 1834 
 		try {
1587 1835 
 			$sth = $this->db->prepare($query);
 
@@ -1590,12 +1838,17 @@  discard block
 
 block discarded – undo
1590 1838 
 			echo "error : ".$e->getMessage();
1591 1839 
 		}
1592 1840 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1593 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1594 
-		else return 0;
1841 
+		if (isset($all[0]['cnt'])) {
1842 
+			return $all[0]['cnt'];
1843 
+		} else {
1844 
+			return 0;
1845 
+		}
1595 1846 
 	}
1596 1847 
 	public function getStatsPilotTotal($filter_name = '') {
1597 1848 
 		global $globalArchiveMonths, $globalDBdriver;
1598 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1849 
+		if ($filter_name == '') {
1850 
+			$filter_name = $this->filter_name;
1851 
+		}
1599 1852 
 		if ($globalDBdriver == 'mysql') {
1600 1853 
 			$query = "SELECT SUM(cnt) as total FROM stats_pilot WHERE filter_name = :filter_name";
1601 1854 
 		} else {
 
@@ -1612,7 +1865,9 @@  discard block
 
 block discarded – undo
1612 1865 
 	}
1613 1866 
 	public function getStatsPilot($pilot,$filter_name = '') {
1614 1867 
 		global $globalArchiveMonths, $globalDBdriver;
1615 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1868 
+		if ($filter_name == '') {
1869 
+			$filter_name = $this->filter_name;
1870 
+		}
1616 1871 
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1617 1872 
 		try {
1618 1873 
 			$sth = $this->db->prepare($query);
 
@@ -1621,13 +1876,18 @@  discard block
 
 block discarded – undo
1621 1876 
 			echo "error : ".$e->getMessage();
1622 1877 
 		}
1623 1878 
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1624 
-		if (isset($all[0]['cnt'])) return $all[0]['cnt'];
1625 
-		else return 0;
1879 
+		if (isset($all[0]['cnt'])) {
1880 
+			return $all[0]['cnt'];
1881 
+		} else {
1882 
+			return 0;
1883 
+		}
1626 1884 
 	}
1627 1885
1628 1886 
 	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1629 1887 
 		global $globalDBdriver;
1630 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1888 
+		if ($filter_name == '') {
1889 
+			$filter_name = $this->filter_name;
1890 
+		}
1631 1891 
 		if ($globalDBdriver == 'mysql') {
1632 1892 
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = :cnt";
1633 1893 
 		} else {
 
@@ -1643,7 +1903,9 @@  discard block
 
 block discarded – undo
1643 1903 
 	}
1644 1904 
 	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1645 1905 
 		global $globalDBdriver;
1646 
-		if ($filter_name == '') $filter_name = $this->filter_name;
1906 
+		if ($filter_name == '') {
1907 
+			$filter_name = $this->filter_name;
1908 
+		}
1647 1909 
 		if ($globalDBdriver == 'mysql') {
1648 1910 
 			$query = "INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) VALUES (:type,:cnt,:stats_date,:stats_airline,:filter_name) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1649 1911 
 		} else {
 
@@ -2116,27 +2378,37 @@  discard block
 
 block discarded – undo
2116 2378 
 		date_default_timezone_set('UTC');
2117 2379 
 		if (isset($globalMarine) && $globalMarine) {
2118 2380 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_marine');
2119 
-			if ($globalDebug) echo '!!! Update Marine stats !!!'."\n";
2381 
+			if ($globalDebug) {
2382 
+				echo '!!! Update Marine stats !!!'."\n";
2383 
+			}
2120 2384 
 			if (isset($last_update[0]['value'])) {
2121 2385 
 				$last_update_day = $last_update[0]['value'];
2122 
-			} else $last_update_day = '2012-12-12 12:12:12';
2386 
+			} else {
2387 
+				$last_update_day = '2012-12-12 12:12:12';
2388 
+			}
2123 2389 
 			$reset = false;
2124 2390 
 			$Marine = new Marine($this->db);
2125 2391 
 			$filtername = 'marine';
2126 2392 
 			if ($Connection->tableExists('countries')) {
2127 
-				if ($globalDebug) echo 'Count all vessels by countries...'."\n";
2393 
+				if ($globalDebug) {
2394 
+					echo 'Count all vessels by countries...'."\n";
2395 
+				}
2128 2396 
 				$alldata = $Marine->countAllMarineOverCountries(false,0,$last_update_day);
2129 2397 
 				foreach ($alldata as $number) {
2130 2398 
 					$this->addStatCountryMarine($number['marine_country_iso2'],$number['marine_country_iso3'],$number['marine_country'],$number['marine_count'],'','',$reset);
2131 2399 
 				}
2132 2400 
 			}
2133 
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
2401 
+			if ($globalDebug) {
2402 
+				echo 'Count all vessels by months...'."\n";
2403 
+			}
2134 2404 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2135 2405 
 			$filter_last_month = array('since_date' => $last_month);
2136 2406 
 			$alldata = $Marine->countAllMonths($filter_last_month);
2137 2407 
 			$lastyear = false;
2138 2408 
 			foreach ($alldata as $number) {
2139 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2409 
+				if ($number['year_name'] != date('Y')) {
2410 
+					$lastyear = true;
2411 
+				}
2140 2412 
 				$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'])));
2141 2413 
 			}
2142 2414 
 			echo 'Marine data...'."\n";
 
@@ -2172,26 +2444,36 @@  discard block
 
 block discarded – undo
2172 2444 
 		}
2173 2445 
 		if (isset($globalTracker) && $globalTracker) {
2174 2446 
 			$last_update = $this->getLastStatsUpdate('last_update_stats_tracker');
2175 
-			if ($globalDebug) echo '!!! Update tracker stats !!!'."\n";
2447 
+			if ($globalDebug) {
2448 
+				echo '!!! Update tracker stats !!!'."\n";
2449 
+			}
2176 2450 
 			if (isset($last_update[0]['value'])) {
2177 2451 
 				$last_update_day = $last_update[0]['value'];
2178 
-			} else $last_update_day = '2012-12-12 12:12:12';
2452 
+			} else {
2453 
+				$last_update_day = '2012-12-12 12:12:12';
2454 
+			}
2179 2455 
 			$reset = false;
2180 2456 
 			$Tracker = new Tracker($this->db);
2181 2457 
 			if ($Connection->tableExists('countries')) {
2182 
-				if ($globalDebug) echo 'Count all trackers by countries...'."\n";
2458 
+				if ($globalDebug) {
2459 
+					echo 'Count all trackers by countries...'."\n";
2460 
+				}
2183 2461 
 				$alldata = $Tracker->countAllTrackerOverCountries(false,0,$last_update_day);
2184 2462 
 				foreach ($alldata as $number) {
2185 2463 
 					$this->addStatCountryTracker($number['tracker_country_iso2'],$number['tracker_country_iso3'],$number['tracker_country'],$number['tracker_count'],'','',$reset);
2186 2464 
 				}
2187 2465 
 			}
2188 
-			if ($globalDebug) echo 'Count all vessels by months...'."\n";
2466 
+			if ($globalDebug) {
2467 
+				echo 'Count all vessels by months...'."\n";
2468 
+			}
2189 2469 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2190 2470 
 			$filter_last_month = array('since_date' => $last_month);
2191 2471 
 			$alldata = $Tracker->countAllMonths($filter_last_month);
2192 2472 
 			$lastyear = false;
2193 2473 
 			foreach ($alldata as $number) {
2194 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2474 
+				if ($number['year_name'] != date('Y')) {
2475 
+					$lastyear = true;
2476 
+				}
2195 2477 
 				$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'])));
2196 2478 
 			}
2197 2479 
 			echo 'Tracker data...'."\n";
 
@@ -2228,10 +2510,14 @@  discard block
 
 block discarded – undo
2228 2510
2229 2511 
 		if (isset($globalAircraft) && $globalAircraft) {
2230 2512 
 			$last_update = $this->getLastStatsUpdate('last_update_stats');
2231 
-			if ($globalDebug) echo '!!! Update aicraft stats !!!'."\n";
2513 
+			if ($globalDebug) {
2514 
+				echo '!!! Update aicraft stats !!!'."\n";
2515 
+			}
2232 2516 
 			if (isset($last_update[0]['value'])) {
2233 2517 
 				$last_update_day = $last_update[0]['value'];
2234 
-			} else $last_update_day = '2012-12-12 12:12:12';
2518 
+			} else {
2519 
+				$last_update_day = '2012-12-12 12:12:12';
2520 
+			}
2235 2521 
 			$reset = false;
2236 2522 
 			//if ($globalStatsResetYear && date('Y',strtotime($last_update_day)) != date('Y')) {
2237 2523 
 			if ($globalStatsResetYear) {
 
@@ -2240,43 +2526,63 @@  discard block
 
 block discarded – undo
2240 2526 
 			}
2241 2527 
 			$Spotter = new Spotter($this->db);
2242 2528
2243 
-			if ($globalDebug) echo 'Count all aircraft types...'."\n";
2529 
+			if ($globalDebug) {
2530 
+				echo 'Count all aircraft types...'."\n";
2531 
+			}
2244 2532 
 			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
2245 2533 
 			foreach ($alldata as $number) {
2246 2534 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2247 2535 
 			}
2248 
-			if ($globalDebug) echo 'Count all airlines...'."\n";
2536 
+			if ($globalDebug) {
2537 
+				echo 'Count all airlines...'."\n";
2538 
+			}
2249 2539 
 			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2250 2540 
 			foreach ($alldata as $number) {
2251 2541 
 				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2252 2542 
 			}
2253 
-			if ($globalDebug) echo 'Count all registrations...'."\n";
2543 
+			if ($globalDebug) {
2544 
+				echo 'Count all registrations...'."\n";
2545 
+			}
2254 2546 
 			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2255 2547 
 			foreach ($alldata as $number) {
2256 2548 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2257 2549 
 			}
2258 
-			if ($globalDebug) echo 'Count all callsigns...'."\n";
2550 
+			if ($globalDebug) {
2551 
+				echo 'Count all callsigns...'."\n";
2552 
+			}
2259 2553 
 			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2260 2554 
 			foreach ($alldata as $number) {
2261 2555 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2262 2556 
 			}
2263 
-			if ($globalDebug) echo 'Count all owners...'."\n";
2557 
+			if ($globalDebug) {
2558 
+				echo 'Count all owners...'."\n";
2559 
+			}
2264 2560 
 			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2265 2561 
 			foreach ($alldata as $number) {
2266 2562 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2267 2563 
 			}
2268 
-			if ($globalDebug) echo 'Count all pilots...'."\n";
2564 
+			if ($globalDebug) {
2565 
+				echo 'Count all pilots...'."\n";
2566 
+			}
2269 2567 
 			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2270 2568 
 			foreach ($alldata as $number) {
2271 
-				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2569 
+				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') {
2570 
+					$number['pilot_id'] = $number['pilot_name'];
2571 
+				}
2272 2572 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2273 2573 
 			}
2274 2574
2275 
-			if ($globalDebug) echo 'Count all departure airports...'."\n";
2575 
+			if ($globalDebug) {
2576 
+				echo 'Count all departure airports...'."\n";
2577 
+			}
2276 2578 
 			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2277 
-			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2579 
+			if ($globalDebug) {
2580 
+				echo 'Count all detected departure airports...'."\n";
2581 
+			}
2278 2582 
 			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2279 
-			if ($globalDebug) echo 'Order departure airports...'."\n";
2583 
+			if ($globalDebug) {
2584 
+				echo 'Order departure airports...'."\n";
2585 
+			}
2280 2586 
 			$alldata = array();
2281 2587 
 			foreach ($pall as $value) {
2282 2588 
 				$icao = $value['airport_departure_icao'];
 
@@ -2286,7 +2592,9 @@  discard block
 
 block discarded – undo
2286 2592 
 				$icao = $value['airport_departure_icao'];
2287 2593 
 				if (isset($alldata[$icao])) {
2288 2594 
 					$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2289 
-				} else $alldata[$icao] = $value;
2595 
+				} else {
2596 
+					$alldata[$icao] = $value;
2597 
+				}
2290 2598 
 			}
2291 2599 
 			$count = array();
2292 2600 
 			foreach ($alldata as $key => $row) {
 
@@ -2296,11 +2604,17 @@  discard block
 
 block discarded – undo
2296 2604 
 			foreach ($alldata as $number) {
2297 2605 
 				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);
2298 2606 
 			}
2299 
-			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2607 
+			if ($globalDebug) {
2608 
+				echo 'Count all arrival airports...'."\n";
2609 
+			}
2300 2610 
 			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2301 
-			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2611 
+			if ($globalDebug) {
2612 
+				echo 'Count all detected arrival airports...'."\n";
2613 
+			}
2302 2614 
 			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2303 
-			if ($globalDebug) echo 'Order arrival airports...'."\n";
2615 
+			if ($globalDebug) {
2616 
+				echo 'Order arrival airports...'."\n";
2617 
+			}
2304 2618 
 			$alldata = array();
2305 2619 
 			foreach ($pall as $value) {
2306 2620 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2310,7 +2624,9 @@  discard block
 
 block discarded – undo
2310 2624 
 				$icao = $value['airport_arrival_icao'];
2311 2625 
 				if (isset($alldata[$icao])) {
2312 2626 
 					$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2313 
-				} else $alldata[$icao] = $value;
2627 
+				} else {
2628 
+					$alldata[$icao] = $value;
2629 
+				}
2314 2630 
 			}
2315 2631 
 			$count = array();
2316 2632 
 			foreach ($alldata as $key => $row) {
 
@@ -2321,7 +2637,9 @@  discard block
 
 block discarded – undo
2321 2637 
 				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);
2322 2638 
 			}
2323 2639 
 			if ($Connection->tableExists('countries')) {
2324 
-				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2640 
+				if ($globalDebug) {
2641 
+					echo 'Count all flights by countries...'."\n";
2642 
+				}
2325 2643 
 				//$SpotterArchive = new SpotterArchive();
2326 2644 
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2327 2645 
 				$Spotter = new Spotter($this->db);
 
@@ -2332,7 +2650,9 @@  discard block
 
 block discarded – undo
2332 2650 
 			}
2333 2651
2334 2652 
 			if (isset($globalAccidents) && $globalAccidents) {
2335 
-				if ($globalDebug) echo 'Count fatalities stats...'."\n";
2653 
+				if ($globalDebug) {
2654 
+					echo 'Count fatalities stats...'."\n";
2655 
+				}
2336 2656 
 				$Accident = new Accident($this->db);
2337 2657 
 				$this->deleteStatsByType('fatalities_byyear');
2338 2658 
 				$alldata = $Accident->countFatalitiesByYear();
 
@@ -2348,48 +2668,68 @@  discard block
 
 block discarded – undo
2348 2668
2349 2669 
 			// Add by month using getstat if month finish...
2350 2670 
 			//if (date('m',strtotime($last_update_day)) != date('m')) {
2351 
-			if ($globalDebug) echo 'Count all flights by months...'."\n";
2671 
+			if ($globalDebug) {
2672 
+				echo 'Count all flights by months...'."\n";
2673 
+			}
2352 2674 
 			$last_month = date('Y-m-01 00:00:00', strtotime('-1 month', strtotime($last_update_day)));
2353 2675 
 			$filter_last_month = array('since_date' => $last_month);
2354 2676 
 			$Spotter = new Spotter($this->db);
2355 2677 
 			$alldata = $Spotter->countAllMonths($filter_last_month);
2356 2678 
 			$lastyear = false;
2357 2679 
 			foreach ($alldata as $number) {
2358 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2680 
+				if ($number['year_name'] != date('Y')) {
2681 
+					$lastyear = true;
2682 
+				}
2359 2683 
 				$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'])));
2360 2684 
 			}
2361 
-			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2685 
+			if ($globalDebug) {
2686 
+				echo 'Count all military flights by months...'."\n";
2687 
+			}
2362 2688 
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2363 2689 
 			foreach ($alldata as $number) {
2364 2690 
 				$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'])));
2365 2691 
 			}
2366 
-			if ($globalDebug) echo 'Count all owners by months...'."\n";
2692 
+			if ($globalDebug) {
2693 
+				echo 'Count all owners by months...'."\n";
2694 
+			}
2367 2695 
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2368 2696 
 			foreach ($alldata as $number) {
2369 2697 
 				$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'])));
2370 2698 
 			}
2371 
-			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2699 
+			if ($globalDebug) {
2700 
+				echo 'Count all pilots by months...'."\n";
2701 
+			}
2372 2702 
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2373 2703 
 			foreach ($alldata as $number) {
2374 2704 
 				$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'])));
2375 2705 
 			}
2376 
-			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2706 
+			if ($globalDebug) {
2707 
+				echo 'Count all airlines by months...'."\n";
2708 
+			}
2377 2709 
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2378 2710 
 			foreach ($alldata as $number) {
2379 2711 
 				$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'])));
2380 2712 
 			}
2381 
-			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2713 
+			if ($globalDebug) {
2714 
+				echo 'Count all aircrafts by months...'."\n";
2715 
+			}
2382 2716 
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2383 2717 
 			foreach ($alldata as $number) {
2384 2718 
 				$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'])));
2385 2719 
 			}
2386 
-			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2720 
+			if ($globalDebug) {
2721 
+				echo 'Count all real arrivals by months...'."\n";
2722 
+			}
2387 2723 
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2388 2724 
 			foreach ($alldata as $number) {
2389 2725 
 				$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'])));
2390 2726 
 			}
2391 
-			if ($globalDebug) echo 'Airports data...'."\n";
2392 
-			if ($globalDebug) echo '...Departure'."\n";
2727 
+			if ($globalDebug) {
2728 
+				echo 'Airports data...'."\n";
2729 
+			}
2730 
+			if ($globalDebug) {
2731 
+				echo '...Departure'."\n";
2732 
+			}
2393 2733 
 			$this->deleteStatAirport('daily');
2394 2734 
 //			$pall = $Spotter->getLast7DaysAirportsDeparture();
2395 2735 
   //      		$dall = $Spotter->getLast7DaysDetectedAirportsDeparture();
 
@@ -2507,7 +2847,9 @@  discard block
 
 block discarded – undo
2507 2847 
 			// Count by airlines
2508 2848 
 			echo '--- Stats by airlines ---'."\n";
2509 2849 
 			if ($Connection->tableExists('countries')) {
2510 
-				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2850 
+				if ($globalDebug) {
2851 
+					echo 'Count all flights by countries by airlines...'."\n";
2852 
+				}
2511 2853 
 				$SpotterArchive = new SpotterArchive($this->db);
2512 2854 
 				//$Spotter = new Spotter($this->db);
2513 2855 
 				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
 
@@ -2516,37 +2858,53 @@  discard block
 
 block discarded – undo
2516 2858 
 					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2517 2859 
 				}
2518 2860 
 			}
2519 
-			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2861 
+			if ($globalDebug) {
2862 
+				echo 'Count all aircraft types by airlines...'."\n";
2863 
+			}
2520 2864 
 			$Spotter = new Spotter($this->db);
2521 2865 
 			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2522 2866 
 			foreach ($alldata as $number) {
2523 2867 
 				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2524 2868 
 			}
2525 
-			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2869 
+			if ($globalDebug) {
2870 
+				echo 'Count all aircraft registrations by airlines...'."\n";
2871 
+			}
2526 2872 
 			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2527 2873 
 			foreach ($alldata as $number) {
2528 2874 
 				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2529 2875 
 			}
2530 
-			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2876 
+			if ($globalDebug) {
2877 
+				echo 'Count all callsigns by airlines...'."\n";
2878 
+			}
2531 2879 
 			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2532 2880 
 			foreach ($alldata as $number) {
2533 2881 
 				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2534 2882 
 			}
2535 
-			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2883 
+			if ($globalDebug) {
2884 
+				echo 'Count all owners by airlines...'."\n";
2885 
+			}
2536 2886 
 			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2537 2887 
 			foreach ($alldata as $number) {
2538 2888 
 				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2539 2889 
 			}
2540 
-			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2890 
+			if ($globalDebug) {
2891 
+				echo 'Count all pilots by airlines...'."\n";
2892 
+			}
2541 2893 
 			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2542 2894 
 			foreach ($alldata as $number) {
2543 2895 
 				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2544 2896 
 			}
2545 
-			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2897 
+			if ($globalDebug) {
2898 
+				echo 'Count all departure airports by airlines...'."\n";
2899 
+			}
2546 2900 
 			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2547 
-			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2901 
+			if ($globalDebug) {
2902 
+				echo 'Count all detected departure airports by airlines...'."\n";
2903 
+			}
2548 2904 
 			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2549 
-			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2905 
+			if ($globalDebug) {
2906 
+				echo 'Order detected departure airports by airlines...'."\n";
2907 
+			}
2550 2908 
 			//$alldata = array();
2551 2909 
 			foreach ($dall as $value) {
2552 2910 
 				$icao = $value['airport_departure_icao'];
 
@@ -2567,11 +2925,17 @@  discard block
 
 block discarded – undo
2567 2925 
 			foreach ($alldata as $number) {
2568 2926 
 				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);
2569 2927 
 			}
2570 
-			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2928 
+			if ($globalDebug) {
2929 
+				echo 'Count all arrival airports by airlines...'."\n";
2930 
+			}
2571 2931 
 			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2572 
-			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2932 
+			if ($globalDebug) {
2933 
+				echo 'Count all detected arrival airports by airlines...'."\n";
2934 
+			}
2573 2935 
 			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2574 
-			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2936 
+			if ($globalDebug) {
2937 
+				echo 'Order arrival airports by airlines...'."\n";
2938 
+			}
2575 2939 
 			//$alldata = array();
2576 2940 
 			foreach ($dall as $value) {
2577 2941 
 				$icao = $value['airport_arrival_icao'];
 
@@ -2590,37 +2954,53 @@  discard block
 
 block discarded – undo
2590 2954 
 			}
2591 2955 
 			$alldata = $pall;
2592 2956 
 			foreach ($alldata as $number) {
2593 
-				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);
2957 
+				if ($number['airline_icao'] != '') {
2958 
+					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);
2959 
+				}
2960 
+			}
2961 
+			if ($globalDebug) {
2962 
+				echo 'Count all flights by months by airlines...'."\n";
2594 2963 
 			}
2595 
-			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2596 2964 
 			$Spotter = new Spotter($this->db);
2597 2965 
 			$alldata = $Spotter->countAllMonthsByAirlines($filter_last_month);
2598 2966 
 			$lastyear = false;
2599 2967 
 			foreach ($alldata as $number) {
2600 
-				if ($number['year_name'] != date('Y')) $lastyear = true;
2968 
+				if ($number['year_name'] != date('Y')) {
2969 
+					$lastyear = true;
2970 
+				}
2601 2971 
 				$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']);
2602 2972 
 			}
2603 
-			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2973 
+			if ($globalDebug) {
2974 
+				echo 'Count all owners by months by airlines...'."\n";
2975 
+			}
2604 2976 
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2605 2977 
 			foreach ($alldata as $number) {
2606 2978 
 				$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']);
2607 2979 
 			}
2608 
-			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2980 
+			if ($globalDebug) {
2981 
+				echo 'Count all pilots by months by airlines...'."\n";
2982 
+			}
2609 2983 
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2610 2984 
 			foreach ($alldata as $number) {
2611 2985 
 				$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']);
2612 2986 
 			}
2613 
-			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2987 
+			if ($globalDebug) {
2988 
+				echo 'Count all aircrafts by months by airlines...'."\n";
2989 
+			}
2614 2990 
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2615 2991 
 			foreach ($alldata as $number) {
2616 2992 
 				$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']);
2617 2993 
 			}
2618 
-			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2994 
+			if ($globalDebug) {
2995 
+				echo 'Count all real arrivals by months by airlines...'."\n";
2996 
+			}
2619 2997 
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2620 2998 
 			foreach ($alldata as $number) {
2621 2999 
 				$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']);
2622 3000 
 			}
2623 
-			if ($globalDebug) echo '...Departure'."\n";
3001 
+			if ($globalDebug) {
3002 
+				echo '...Departure'."\n";
3003 
+			}
2624 3004 
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
2625 3005 
 			$dall = $Spotter->getLast7DaysDetectedAirportsDepartureByAirlines();
2626 3006 
 			foreach ($dall as $value) {
 
@@ -2643,7 +3023,9 @@  discard block
 
 block discarded – undo
2643 3023 
 			foreach ($alldata as $number) {
2644 3024 
 				$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']);
2645 3025 
 			}
2646 
-			if ($globalDebug) echo '...Arrival'."\n";
3026 
+			if ($globalDebug) {
3027 
+				echo '...Arrival'."\n";
3028 
+			}
2647 3029 
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
2648 3030 
 			$dall = $Spotter->getLast7DaysDetectedAirportsArrivalByAirlines();
2649 3031 
 			foreach ($dall as $value) {
 
@@ -2667,13 +3049,19 @@  discard block
 
 block discarded – undo
2667 3049 
 				$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']);
2668 3050 
 			}
2669 3051
2670 
-			if ($globalDebug) echo 'Flights data...'."\n";
2671 
-			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
3052 
+			if ($globalDebug) {
3053 
+				echo 'Flights data...'."\n";
3054 
+			}
3055 
+			if ($globalDebug) {
3056 
+				echo '-> countAllDatesLastMonth...'."\n";
3057 
+			}
2672 3058 
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2673 3059 
 			foreach ($alldata as $number) {
2674 3060 
 				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2675 3061 
 			}
2676 
-			if ($globalDebug) echo '-> countAllDates...'."\n";
3062 
+			if ($globalDebug) {
3063 
+				echo '-> countAllDates...'."\n";
3064 
+			}
2677 3065 
 			//$previousdata = $this->countAllDatesByAirlines();
2678 3066 
 			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2679 3067 
 			$values = array();
 
@@ -2686,14 +3074,18 @@  discard block
 
 block discarded – undo
2686 3074 
 				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2687 3075 
 			}
2688 3076
2689 
-			if ($globalDebug) echo '-> countAllHours...'."\n";
3077 
+			if ($globalDebug) {
3078 
+				echo '-> countAllHours...'."\n";
3079 
+			}
2690 3080 
 			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2691 3081 
 			foreach ($alldata as $number) {
2692 3082 
 				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2693 3083 
 			}
2694 3084
2695 3085 
 			// Stats by filters
2696 
-			if (!isset($globalStatsFilters) || $globalStatsFilters == '') $globalStatsFilters = array();
3086 
+			if (!isset($globalStatsFilters) || $globalStatsFilters == '') {
3087 
+				$globalStatsFilters = array();
3088 
+			}
2697 3089 
 			foreach ($globalStatsFilters as $name => $filter) {
2698 3090 
 				if (!empty($filter)) {
2699 3091 
 					//$filter_name = $filter['name'];
 
@@ -2701,7 +3093,9 @@  discard block
 
 block discarded – undo
2701 3093 
 					$reset = false;
2702 3094 
 					$last_update = $this->getLastStatsUpdate('last_update_stats_'.$filter_name);
2703 3095 
 					if (isset($filter['resetall']) && isset($last_update[0]['value']) && strtotime($filter['resetall']) > strtotime($last_update[0]['value'])) {
2704 
-						if ($globalDebug) echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
3096 
+						if ($globalDebug) {
3097 
+							echo '!!! Delete stats for filter '.$filter_name.' !!!'."\n";
3098 
+						}
2705 3099 
 						$this->deleteOldStats($filter_name);
2706 3100 
 						unset($last_update);
2707 3101 
 					}
 
@@ -2718,39 +3112,55 @@  discard block
 
 block discarded – undo
2718 3112 
 						$reset = true;
2719 3113 
 					}
2720 3114 
 					// Count by filter
2721 
-					if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
3115 
+					if ($globalDebug) {
3116 
+						echo '--- Stats for filter '.$filter_name.' ---'."\n";
3117 
+					}
2722 3118 
 					$Spotter = new Spotter($this->db);
2723 
-					if ($globalDebug) echo 'Count all aircraft types...'."\n";
3119 
+					if ($globalDebug) {
3120 
+						echo 'Count all aircraft types...'."\n";
3121 
+					}
2724 3122 
 					$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2725 3123 
 					foreach ($alldata as $number) {
2726 3124 
 						$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
2727 3125 
 					}
2728 
-					if ($globalDebug) echo 'Count all airlines...'."\n";
3126 
+					if ($globalDebug) {
3127 
+						echo 'Count all airlines...'."\n";
3128 
+					}
2729 3129 
 					$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
2730 3130 
 					foreach ($alldata as $number) {
2731 3131 
 						$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
2732 3132 
 					}
2733 
-					if ($globalDebug) echo 'Count all aircraft registrations...'."\n";
3133 
+					if ($globalDebug) {
3134 
+						echo 'Count all aircraft registrations...'."\n";
3135 
+					}
2734 3136 
 					$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
2735 3137 
 					foreach ($alldata as $number) {
2736 3138 
 						$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
2737 3139 
 					}
2738 
-					if ($globalDebug) echo 'Count all callsigns...'."\n";
3140 
+					if ($globalDebug) {
3141 
+						echo 'Count all callsigns...'."\n";
3142 
+					}
2739 3143 
 					$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
2740 3144 
 					foreach ($alldata as $number) {
2741 3145 
 						$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
2742 3146 
 					}
2743 
-					if ($globalDebug) echo 'Count all owners...'."\n";
3147 
+					if ($globalDebug) {
3148 
+						echo 'Count all owners...'."\n";
3149 
+					}
2744 3150 
 					$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
2745 3151 
 					foreach ($alldata as $number) {
2746 3152 
 						$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
2747 3153 
 					}
2748 
-					if ($globalDebug) echo 'Count all pilots...'."\n";
3154 
+					if ($globalDebug) {
3155 
+						echo 'Count all pilots...'."\n";
3156 
+					}
2749 3157 
 					$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
2750 3158 
 					foreach ($alldata as $number) {
2751 3159 
 						$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2752 3160 
 					}
2753 
-					if ($globalDebug) echo 'Count departure airports...'."\n";
3161 
+					if ($globalDebug) {
3162 
+						echo 'Count departure airports...'."\n";
3163 
+					}
2754 3164 
 					$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2755 3165 
 					$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2756 3166 
 					$alldata = array();
 
@@ -2762,7 +3172,9 @@  discard block
 
 block discarded – undo
2762 3172 
 						$icao = $value['airport_departure_icao'];
2763 3173 
 						if (isset($alldata[$icao])) {
2764 3174 
 							$alldata[$icao]['airport_departure_icao_count'] = $alldata[$icao]['airport_departure_icao_count'] + $value['airport_departure_icao_count'];
2765 
-						} else $alldata[$icao] = $value;
3175 
+						} else {
3176 
+							$alldata[$icao] = $value;
3177 
+						}
2766 3178 
 					}
2767 3179 
 					$count = array();
2768 3180 
 					foreach ($alldata as $key => $row) {
 
@@ -2772,7 +3184,9 @@  discard block
 
 block discarded – undo
2772 3184 
 					foreach ($alldata as $number) {
2773 3185 
 						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);
2774 3186 
 					}
2775 
-					if ($globalDebug) echo 'Count all arrival airports...'."\n";
3187 
+					if ($globalDebug) {
3188 
+						echo 'Count all arrival airports...'."\n";
3189 
+					}
2776 3190 
 					$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2777 3191 
 					$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2778 3192 
 					$alldata = array();
 
@@ -2784,7 +3198,9 @@  discard block
 
 block discarded – undo
2784 3198 
 						$icao = $value['airport_arrival_icao'];
2785 3199 
 						if (isset($alldata[$icao])) {
2786 3200 
 							$alldata[$icao]['airport_arrival_icao_count'] = $alldata[$icao]['airport_arrival_icao_count'] + $value['airport_arrival_icao_count'];
2787 
-						} else $alldata[$icao] = $value;
3201 
+						} else {
3202 
+							$alldata[$icao] = $value;
3203 
+						}
2788 3204 
 					}
2789 3205 
 					$count = array();
2790 3206 
 					foreach ($alldata as $key => $row) {
 
@@ -2794,35 +3210,49 @@  discard block
 
 block discarded – undo
2794 3210 
 					foreach ($alldata as $number) {
2795 3211 
 						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);
2796 3212 
 					}
2797 
-					if ($globalDebug) echo 'Count all months...'."\n";
3213 
+					if ($globalDebug) {
3214 
+						echo 'Count all months...'."\n";
3215 
+					}
2798 3216 
 					$Spotter = new Spotter($this->db);
2799 3217 
 					$alldata = $Spotter->countAllMonths($filter);
2800 3218 
 					$lastyear = false;
2801 3219 
 					foreach ($alldata as $number) {
2802 
-						if ($number['year_name'] != date('Y')) $lastyear = true;
3220 
+						if ($number['year_name'] != date('Y')) {
3221 
+							$lastyear = true;
3222 
+						}
2803 3223 
 						$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);
2804 3224 
 					}
2805 
-					if ($globalDebug) echo 'Count all owners by months...'."\n";
3225 
+					if ($globalDebug) {
3226 
+						echo 'Count all owners by months...'."\n";
3227 
+					}
2806 3228 
 					$alldata = $Spotter->countAllMonthsOwners($filter);
2807 3229 
 					foreach ($alldata as $number) {
2808 3230 
 						$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);
2809 3231 
 					}
2810 
-					if ($globalDebug) echo 'Count all pilots by months...'."\n";
3232 
+					if ($globalDebug) {
3233 
+						echo 'Count all pilots by months...'."\n";
3234 
+					}
2811 3235 
 					$alldata = $Spotter->countAllMonthsPilots($filter);
2812 3236 
 					foreach ($alldata as $number) {
2813 3237 
 						$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);
2814 3238 
 					}
2815 
-					if ($globalDebug) echo 'Count all military by months...'."\n";
3239 
+					if ($globalDebug) {
3240 
+						echo 'Count all military by months...'."\n";
3241 
+					}
2816 3242 
 					$alldata = $Spotter->countAllMilitaryMonths($filter);
2817 3243 
 					foreach ($alldata as $number) {
2818 3244 
 						$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);
2819 3245 
 					}
2820 
-					if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
3246 
+					if ($globalDebug) {
3247 
+						echo 'Count all aircrafts by months...'."\n";
3248 
+					}
2821 3249 
 					$alldata = $Spotter->countAllMonthsAircrafts($filter);
2822 3250 
 				    	foreach ($alldata as $number) {
2823 3251 
 			    			$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);
2824 3252 
 					}
2825 
-					if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
3253 
+					if ($globalDebug) {
3254 
+						echo 'Count all real arrivals by months...'."\n";
3255 
+					}
2826 3256 
 					$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2827 3257 
 					foreach ($alldata as $number) {
2828 3258 
 						$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name);
Please login to merge, or discard this patch.
require/class.Connection.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch 
@@ -1,12 +1,12 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 require_once(dirname(__FILE__).'/settings.php');
3 3
4 
-class Connection{
4 
+class Connection {
5 5 
 	public $db = null;
6 6 
 	public $dbs = array();
7 7 
 	public $latest_schema = 47;
8 8
9 
-	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
9 
+	public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) {
10 10 
 		global $globalNoDB;
11 11 
 		if (isset($globalNoDB) && $globalNoDB === TRUE) {
12 12 
 			$this->db = null;
 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 					if ($user === null && $pass === null) {
17 17 
 						$this->createDBConnection();
18 18 
 					} else {
19 
-						$this->createDBConnection(null,$user,$pass);
19 
+						$this->createDBConnection(null, $user, $pass);
20 20 
 					}
21 21 
 				} else {
22 22 
 					$this->createDBConnection($dbname);
 
@@ -100,14 +100,14 @@  discard block
 
 block discarded – undo
100 100 
 		while (true) {
101 101 
 			try {
102 102 
 				if ($globalDBSdriver == 'mysql') {
103 
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser,  $globalDBSpass);
103 
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass);
104 104 
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
105 105 
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
106 
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
107 
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
108 
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
109 
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
110 
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
106 
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
107 
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500);
108 
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
109 
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
110 
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
111 111 
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
112 112 
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
113 113 
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
 
@@ -117,19 +117,19 @@  discard block
 
 block discarded – undo
117 117 
 					$this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"');
118 118 
 					//$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"');
119 119 
 				} else {
120 
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser,  $globalDBSpass);
120 
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass);
121 121 
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
122 122 
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
123 
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
124 
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
125 
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
126 
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
127 
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
123 
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
124 
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200);
125 
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
126 
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
127 
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
128 128 
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
129 129 
 					$this->dbs[$DBname]->exec('SET timezone="UTC"');
130 130 
 				}
131 131 
 				break;
132 
-			} catch(PDOException $e) {
132 
+			} catch (PDOException $e) {
133 133 
 				$i++;
134 134 
 				if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
135 135 
 				//exit;
 
@@ -154,10 +154,10 @@  discard block
 
 block discarded – undo
154 154 
 		try {
155 155 
 			//$Connection = new Connection();
156 156 
 			$results = $this->db->query($query);
157 
-		} catch(PDOException $e) {
157 
+		} catch (PDOException $e) {
158 158 
 			return false;
159 159 
 		}
160 
-		if($results->rowCount()>0) {
160 
+		if ($results->rowCount() > 0) {
161 161 
 		    return true;
162 162 
 		}
163 163 
 		else return false;
 
@@ -179,8 +179,8 @@  discard block
 
 block discarded – undo
179 179 
 			     return false;
180 180 
 			}
181 181
182 
-		} catch(PDOException $e) {
183 
-			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
182 
+		} catch (PDOException $e) {
183 
+			if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
184 184 
             			throw $e;
185 185 
 	                }
186 186 
 	                //echo 'error ! '.$e->getMessage();
 
@@ -192,7 +192,7 @@  discard block
 
 block discarded – undo
192 192 
 	/*
193 193 
 	* Check if index exist
194 194 
 	*/
195 
-	public function indexExists($table,$index)
195 
+	public function indexExists($table, $index)
196 196 
 	{
197 197 
 		global $globalDBdriver, $globalDBname;
198 198 
 		if ($globalDBdriver == 'mysql') {
 
@@ -203,11 +203,11 @@  discard block
 
 block discarded – undo
203 203 
 		try {
204 204 
 			//$Connection = new Connection();
205 205 
 			$results = $this->db->query($query);
206 
-		} catch(PDOException $e) {
206 
+		} catch (PDOException $e) {
207 207 
 			return false;
208 208 
 		}
209 209 
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
210 
-		if($nb[0]['nb'] > 0) {
210 
+		if ($nb[0]['nb'] > 0) {
211 211 
 			return true;
212 212 
 		}
213 213 
 		else return false;
 
@@ -222,7 +222,7 @@  discard block
 
 block discarded – undo
222 222 
 		$query = "SELECT * FROM ".$table." LIMIT 0";
223 223 
 		try {
224 224 
 			$results = $this->db->query($query);
225 
-		} catch(PDOException $e) {
225 
+		} catch (PDOException $e) {
226 226 
 			return "error : ".$e->getMessage()."\n";
227 227 
 		}
228 228 
 		$columns = array();
 
@@ -234,7 +234,7 @@  discard block
 
 block discarded – undo
234 234 
 		return $columns;
235 235 
 	}
236 236
237 
-	public function getColumnType($table,$column) {
237 
+	public function getColumnType($table, $column) {
238 238 
 		$select = $this->db->query('SELECT '.$column.' FROM '.$table);
239 239 
 		$tomet = $select->getColumnMeta(0);
240 240 
 		return $tomet['native_type'];
 
@@ -244,7 +244,7 @@  discard block
 
 block discarded – undo
244 244 
 	* Check if a column name exist in a table
245 245 
 	* @return Boolean column exist or not
246 246 
 	*/
247 
-	public function checkColumnName($table,$name)
247 
+	public function checkColumnName($table, $name)
248 248 
 	{
249 249 
 		global $globalDBdriver, $globalDBname;
250 250 
 		if ($globalDBdriver == 'mysql') {
 
@@ -254,8 +254,8 @@  discard block
 
 block discarded – undo
254 254 
 		}
255 255 
 			try {
256 256 
 				$sth = $this->db()->prepare($query);
257 
-				$sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name));
258 
-			} catch(PDOException $e) {
257 
+				$sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name));
258 
+			} catch (PDOException $e) {
259 259 
 				echo "error : ".$e->getMessage()."\n";
260 260 
 			}
261 261 
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -294,7 +294,7 @@  discard block
 
 block discarded – undo
294 294 
 				try {
295 295 
 					$sth = $this->db->prepare($query);
296 296 
 					$sth->execute();
297 
-				} catch(PDOException $e) {
297 
+				} catch (PDOException $e) {
298 298 
 					return "error : ".$e->getMessage()."\n";
299 299 
 				}
300 300 
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
Please login to merge, or discard this patch.
require/class.Elevation.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch 
@@ -41,7 +41,7 @@  discard block
 
 block discarded – undo
41 41 
 			default:
42 42 
 				throw new \Exception("bad resolution can be only one of 1,3");
43 43 
 		}
44 
-		register_shutdown_function(function () {
44 
+		register_shutdown_function(function() {
45 45 
 			$this->closeAllFiles();
46 46 
 		});
47 47 
 	}
 
@@ -55,10 +55,10 @@  discard block
 
 block discarded – undo
55 55
56 56 
 	private function getElevationAtPosition($fileName, $row, $column) {
57 57 
 		if (!array_key_exists($fileName, $this->openedFiles)) {
58 
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
58 
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
59 59 
 				throw new \Exception("File '{$fileName}' not exists.");
60 60 
 			}
61 
-			$file = fopen($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName, "r");
61 
+			$file = fopen($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName, "r");
62 62 
 			if ($file === false) {
63 63 
 				throw new \Exception("Cant open file '{$fileName}' for reading.");
64 64 
 			}
 
@@ -72,7 +72,7 @@  discard block
 
 block discarded – undo
72 72 
 			throw new \Exception("Not implemented yet");
73 73 
 		}
74 74 
 		$aRow     = $this->measPerDeg - $row;
75 
-		$position = ($this->measPerDeg * ($aRow - 1)) + $column;
75 
+		$position = ($this->measPerDeg*($aRow - 1)) + $column;
76 76 
 		$position *= 2;
77 77 
 		fseek($file, $position);
78 78 
 		$short  = fread($file, 2);
 
@@ -100,8 +100,8 @@  discard block
 
 block discarded – undo
100 100 
 		$latSec = $this->getSec($lat);
101 101 
 		$lonSec = $this->getSec($lon);
102 102
103 
-		$Xn = round($latSec / $this->resolution, 3);
104 
-		$Yn = round($lonSec / $this->resolution, 3);
103 
+		$Xn = round($latSec/$this->resolution, 3);
104 
+		$Yn = round($lonSec/$this->resolution, 3);
105 105
106 106 
 		$a1 = round($Xn);
107 107 
 		$a2 = round($Yn);
 
@@ -133,55 +133,55 @@  discard block
 
 block discarded – undo
133 133 
 		$b3 = $this->getElevationAtPosition($fName, $b1, $b2);
134 134 
 		$c3 = $this->getElevationAtPosition($fName, $c1, $c2);
135 135
136 
-		$n1 = ($c2 - $a2) * ($b3 - $a3) - ($c3 - $a3) * ($b2 - $a2);
137 
-		$n2 = ($c3 - $a3) * ($b1 - $a1) - ($c1 - $a1) * ($b3 - $a3);
138 
-		$n3 = ($c1 - $a1) * ($b2 - $a2) - ($c2 - $a2) * ($b1 - $a1);
136 
+		$n1 = ($c2 - $a2)*($b3 - $a3) - ($c3 - $a3)*($b2 - $a2);
137 
+		$n2 = ($c3 - $a3)*($b1 - $a1) - ($c1 - $a1)*($b3 - $a3);
138 
+		$n3 = ($c1 - $a1)*($b2 - $a2) - ($c2 - $a2)*($b1 - $a1);
139 139
140 
-		$d  = -$n1 * $a1 - $n2 * $a2 - $n3 * $a3;
141 
-		$zN = (-$n1 * $Xn - $n2 * $Yn - $d) / $n3;
140 
+		$d  = -$n1*$a1 - $n2*$a2 - $n3*$a3;
141 
+		$zN = (-$n1*$Xn - $n2*$Yn - $d)/$n3;
142 142
143 143 
 		return $zN;
144 144 
 	}
145 145
146 146 
 	private function getDeg($deg, $numPrefix) {
147 147 
 		$deg = abs($deg);
148 
-		$d   = floor($deg);     // round degrees
148 
+		$d   = floor($deg); // round degrees
149 149 
 		if ($numPrefix >= 3) {
150 150 
 			if ($d < 100) {
151 
-				$d = '0' . $d;
151 
+				$d = '0'.$d;
152 152 
 			}
153 153 
 		} // pad with leading zeros
154 154 
 		if ($d < 10) {
155 
-			$d = '0' . $d;
155 
+			$d = '0'.$d;
156 156 
 		}
157 157 
 		return $d;
158 158 
 	}
159 159
160 160 
 	private function getSec($deg) {
161 161 
 		$deg = abs($deg);
162 
-		$sec = round($deg * 3600, 4);
163 
-		$m   = fmod(floor($sec / 60), 60);
162 
+		$sec = round($deg*3600, 4);
163 
+		$m   = fmod(floor($sec/60), 60);
164 164 
 		$s   = round(fmod($sec, 60), 4);
165 
-		return ($m * 60) + $s;
165 
+		return ($m*60) + $s;
166 166 
 	}
167 167
168 
-	public function download($lat,$lon, $debug = false) {
168 
+	public function download($lat, $lon, $debug = false) {
169 169 
 		$N      = $this->getDeg($lat, 2);
170 170 
 		$E      = $this->getDeg($lon, 3);
171 
-		$fileName  = "N{$N}E{$E}.hgt";
172 
-		if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) {
171 
+		$fileName = "N{$N}E{$E}.hgt";
172 
+		if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) {
173 173 
 			$Common = new Common();
174 174 
 			if ($debug) echo 'Downloading '.$fileName.'.gz ...';
175 
-			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
176 
-			if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) {
175 
+			$Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
176 
+			if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz')) {
177 177 
 				if ($debug) echo "File '{$fileName}.gz' not exists.";
178 178 
 				return false;
179 179 
 			}
180 180 
 			if ($debug) echo 'Done'."\n";
181 181 
 			if ($debug) echo 'Decompress '.$fileName.' ....';
182 
-			$Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName);
182 
+			$Common->gunzip($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName);
183 183 
 			if ($debug) echo 'Done'."\n";
184 
-			unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz');
184 
+			unlink($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz');
185 185 
 		}
186 186 
 		return true;
187 187 
 	}
 
@@ -194,22 +194,22 @@  discard block
 
 block discarded – undo
194 194 
 		try {
195 195 
 			$sth = $db->prepare($query);
196 196 
 			$sth->execute($query_values);
197 
-		} catch(PDOException $e) {
197 
+		} catch (PDOException $e) {
198 198 
 			return "error : ".$e->getMessage();
199 199 
 		}
200 200 
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
201 
-			$this->download($data['latitude'],$data['longitude'],true);
201 
+			$this->download($data['latitude'], $data['longitude'], true);
202 202 
 		}
203 203 
 		$query = 'SELECT latitude, longitude FROM tracker_output WHERE latitude <> 0 AND longitude <> 0 ORDER BY date DESC LIMIT 10';
204 204 
 		$query_values = array();
205 205 
 		try {
206 206 
 			$sth = $db->prepare($query);
207 207 
 			$sth->execute($query_values);
208 
-		} catch(PDOException $e) {
208 
+		} catch (PDOException $e) {
209 209 
 			return "error : ".$e->getMessage();
210 210 
 		}
211 211 
 		while ($data = $sth->fetch(PDO::FETCH_ASSOC)) {
212 
-			$this->download($data['latitude'],$data['longitude'],true);
212 
+			$this->download($data['latitude'], $data['longitude'], true);
213 213 
 		}
214 214 
 	}
215 215 
 }
Please login to merge, or discard this patch.
require/class.Marine.php 2 patches
Spacing   +191 added lines, -191 removed lines patch added patch discarded remove patch 
@@ -2,7 +2,7 @@  discard block
 
 block discarded – undo
2 2 
 require_once(dirname(__FILE__).'/class.Image.php');
3 3 
 $global_query = "SELECT marine_output.* FROM marine_output";
4 4
5 
-class Marine{
5 
+class Marine {
6 6 
 	public $db;
7 7
8 8 
 	public function __construct($dbc = null) {
 
@@ -17,33 +17,33 @@  discard block
 
 block discarded – undo
17 17 
 	* @return Array the SQL part
18 18 
 	*/
19 19
20 
-	public function getFilter($filter = array(),$where = false,$and = false) {
20 
+	public function getFilter($filter = array(), $where = false, $and = false) {
21 21 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
22 22 
 		$filters = array();
23 23 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
24 24 
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
25 25 
 				$filters = $globalStatsFilters[$globalFilterName];
26 26 
 			} else {
27 
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
27 
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
28 28 
 			}
29 29 
 		}
30 30 
 		if (isset($filter[0]['source'])) {
31 
-			$filters = array_merge($filters,$filter);
31 
+			$filters = array_merge($filters, $filter);
32 32 
 		}
33 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
33 
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
34 34 
 		$filter_query_join = '';
35 35 
 		$filter_query_where = '';
36 
-		foreach($filters as $flt) {
36 
+		foreach ($filters as $flt) {
37 37 
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
38 38 
 				if (isset($flt['source'])) {
39 
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
39 
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
40 40 
 				} else {
41 
-					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
41 
+					$filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id";
42 42 
 				}
43 43 
 			}
44 44 
 		}
45 45 
 		if (isset($filter['source']) && !empty($filter['source'])) {
46 
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
46 
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
47 47 
 		}
48 48 
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
49 49 
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
 
@@ -72,7 +72,7 @@  discard block
 
 block discarded – undo
72 72 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
73 73 
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
74 74 
 		if ($filter_query_where != '') {
75 
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
75 
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
76 76 
 		}
77 77 
 		$filter_query = $filter_query_join.$filter_query_where;
78 78 
 		return $filter_query;
 
@@ -87,7 +87,7 @@  discard block
 
 block discarded – undo
87 87 
 	* @return Array the spotter information
88 88 
 	*
89 89 
 	*/
90 
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
90 
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
91 91 
 	{
92 92 
 		date_default_timezone_set('UTC');
93 93 
 		if (!is_string($query))
 
@@ -107,13 +107,13 @@  discard block
 
 block discarded – undo
107 107 
 			$sth = $this->db->prepare($query.$limitQuery);
108 108 
 			$sth->execute($params);
109 109 
 		} catch (PDOException $e) {
110 
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
110 
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
111 111 
 			exit();
112 112 
 		}
113 113
114 114 
 		$num_rows = 0;
115 115 
 		$spotter_array = array();
116 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
116 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
117 117 
 		{
118 118 
 			$num_rows++;
119 119 
 			$temp_array = array();
 
@@ -145,10 +145,10 @@  discard block
 
 block discarded – undo
145 145 
 			}
146 146 
 			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
147 147
148 
-			if($temp_array['mmsi'] != "")
148 
+			if ($temp_array['mmsi'] != "")
149 149 
 			{
150 150 
 				$Image = new Image($this->db);
151 
-				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
151 
+				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'], '', $temp_array['ident']);
152 152 
 				else $image_array = $Image->getMarineImage($temp_array['mmsi']);
153 153 
 				unset($Image);
154 154 
 				if (count($image_array) > 0) {
 
@@ -184,17 +184,17 @@  discard block
 
 block discarded – undo
184 184 
 				{
185 185 
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
186 186 
 				} else {
187 
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
187 
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
188 188 
 				}
189 189 
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
190 
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
191 
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
190 
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
191 
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
192 192 
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
193 193 
 				if (isset($row['last_seen']) && $row['last_seen'] != '') {
194 194 
 					if (strtotime($row['last_seen']) > strtotime($row['date'])) {
195 195 
 						$temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']);
196 
-						$temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC"));
197 
-						$temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC"));
196 
+						$temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC"));
197 
+						$temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC"));
198 198 
 						$temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC");
199 199 
 					}
200 200 
 				}
 
@@ -227,8 +227,8 @@  discard block
 
 block discarded – undo
227 227 
 		if ($limit != "")
228 228 
 		{
229 229 
 			$limit_array = explode(",", $limit);
230 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
231 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
230 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
231 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
232 232 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
233 233 
 			{
234 234 
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 
@@ -242,8 +242,8 @@  discard block
 
 block discarded – undo
242 242 
 		} else {
243 243 
 			$orderby_query = " ORDER BY marine_output.date DESC";
244 244 
 		}
245 
-		$query  = $global_query.$filter_query." ".$orderby_query;
246 
-		$spotter_array = $this->getDataFromDB($query, array(),$limit_query,true);
245 
+		$query = $global_query.$filter_query." ".$orderby_query;
246 
+		$spotter_array = $this->getDataFromDB($query, array(), $limit_query, true);
247 247 
 		return $spotter_array;
248 248 
 	}
249 249 
     
@@ -261,8 +261,8 @@  discard block
 
 block discarded – undo
261 261 
 		if ($id == '') return array();
262 262 
 		$additional_query = "marine_output.fammarine_id = :id";
263 263 
 		$query_values = array(':id' => $id);
264 
-		$query  = $global_query." WHERE ".$additional_query." ";
265 
-		$spotter_array = $this->getDataFromDB($query,$query_values);
264 
+		$query = $global_query." WHERE ".$additional_query." ";
265 
+		$spotter_array = $this->getDataFromDB($query, $query_values);
266 266 
 		return $spotter_array;
267 267 
 	}
268 268 
 
@@ -281,7 +281,7 @@  discard block
 
 block discarded – undo
281 281 
 		$query_values = array();
282 282 
 		$limit_query = '';
283 283 
 		$additional_query = '';
284 
-		$filter_query = $this->getFilter($filter,true,true);
284 
+		$filter_query = $this->getFilter($filter, true, true);
285 285 
 		if ($ident != "")
286 286 
 		{
287 287 
 			if (!is_string($ident))
 
@@ -297,8 +297,8 @@  discard block
 
 block discarded – undo
297 297 
 		{
298 298 
 			$limit_array = explode(",", $limit);
299 299
300 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
301 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
300 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
301 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
302 302
303 303 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
304 304 
 			{
 
@@ -322,7 +322,7 @@  discard block
 
 block discarded – undo
322 322 
 		return $spotter_array;
323 323 
 	}
324 324
325 
-	public function getMarineDataByDate($date = '', $limit = '', $sort = '',$filter = array())
325 
+	public function getMarineDataByDate($date = '', $limit = '', $sort = '', $filter = array())
326 326 
 	{
327 327 
 		global $global_query, $globalTimezone, $globalDBdriver;
328 328 
 		
@@ -330,7 +330,7 @@  discard block
 
 block discarded – undo
330 330 
 		$limit_query = '';
331 331 
 		$additional_query = '';
332 332
333 
-		$filter_query = $this->getFilter($filter,true,true);
333 
+		$filter_query = $this->getFilter($filter, true, true);
334 334
335 335 
 		if ($date != "")
336 336 
 		{
 
@@ -356,8 +356,8 @@  discard block
 
 block discarded – undo
356 356 
 		{
357 357 
 			$limit_array = explode(",", $limit);
358 358
359 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
360 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
359 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
360 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
361 361
362 362 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
363 363 
 			{
 
@@ -388,11 +388,11 @@  discard block
 
 block discarded – undo
388 388 
 	* @return Array list of source name
389 389 
 	*
390 390 
 	*/
391 
-	public function getAllSourceName($type = '',$filters = array())
391 
+	public function getAllSourceName($type = '', $filters = array())
392 392 
 	{
393 
-		$filter_query = $this->getFilter($filters,true,true);
393 
+		$filter_query = $this->getFilter($filters, true, true);
394 394 
 		$query_values = array();
395 
-		$query  = "SELECT DISTINCT marine_output.source_name
395 
+		$query = "SELECT DISTINCT marine_output.source_name
396 396 
 				FROM marine_output".$filter_query." marine_output.source_name <> ''";
397 397 
 		if ($type != '') {
398 398 
 			$query_values = array(':type' => $type);
 
@@ -407,7 +407,7 @@  discard block
 
 block discarded – undo
407 407 
 		$source_array = array();
408 408 
 		$temp_array = array();
409 409
410 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
410 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
411 411 
 		{
412 412 
 			$temp_array['source_name'] = $row['source_name'];
413 413 
 			$source_array[] = $temp_array;
 
@@ -424,8 +424,8 @@  discard block
 
 block discarded – undo
424 424 
 	*/
425 425 
 	public function getAllIdents($filters = array())
426 426 
 	{
427 
-		$filter_query = $this->getFilter($filters,true,true);
428 
-		$query  = "SELECT DISTINCT marine_output.ident
427 
+		$filter_query = $this->getFilter($filters, true, true);
428 
+		$query = "SELECT DISTINCT marine_output.ident
429 429 
 								FROM marine_output".$filter_query." marine_output.ident <> ''
430 430 
 								ORDER BY marine_output.date ASC LIMIT 700 OFFSET 0";
431 431 
 
@@ -435,7 +435,7 @@  discard block
 
 block discarded – undo
435 435 
 		$ident_array = array();
436 436 
 		$temp_array = array();
437 437
438 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
438 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
439 439 
 		{
440 440 
 			$temp_array['ident'] = $row['ident'];
441 441 
 			$ident_array[] = $temp_array;
 
@@ -452,7 +452,7 @@  discard block
 
 block discarded – undo
452 452 
 	*/
453 453 
 	public function getIdentity($mmsi)
454 454 
 	{
455 
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT);
455 
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT);
456 456 
 		$query  = "SELECT * FROM marine_identity WHERE mmsi = :mmsi LIMIT 1";
457 457 
 		$sth = $this->db->prepare($query);
458 458 
 		$sth->execute(array(':mmsi' => $mmsi));
 
@@ -477,12 +477,12 @@  discard block
 
 block discarded – undo
477 477 
 		} else $offset = '+00:00';
478 478
479 479 
 		if ($globalDBdriver == 'mysql') {
480 
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
480 
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
481 481 
 								FROM marine_output
482 482 
 								WHERE marine_output.date <> ''
483 483 
 								ORDER BY marine_output.date ASC LIMIT 0,100";
484 484 
 		} else {
485 
-			$query  = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
485 
+			$query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
486 486 
 								FROM marine_output
487 487 
 								WHERE marine_output.date <> ''
488 488 
 								ORDER BY marine_output.date ASC LIMIT 0,100";
 
@@ -494,7 +494,7 @@  discard block
 
 block discarded – undo
494 494 
 		$date_array = array();
495 495 
 		$temp_array = array();
496 496
497 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
497 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
498 498 
 		{
499 499 
 			$temp_array['date'] = $row['date'];
500 500 
 
@@ -513,11 +513,11 @@  discard block
 
 block discarded – undo
513 513 
 	* @return String success or false
514 514 
 	*
515 515 
 	*/
516 
-	public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL)
516 
+	public function updateIdentMarineData($fammarine_id = '', $ident = '', $fromsource = NULL)
517 517 
 	{
518 518
519 519 
 		$query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id';
520 
-                $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident);
520 
+                $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident);
521 521
522 522 
 		try {
523 523 
 			$sth = $this->db->prepare($query);
 
@@ -539,11 +539,11 @@  discard block
 
 block discarded – undo
539 539 
 	* @return String success or false
540 540 
 	*
541 541 
 	*/
542 
-	public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '')
542 
+	public function updateStatusMarineData($fammarine_id = '', $status_id = '', $status = '')
543 543 
 	{
544 544
545 545 
 		$query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id';
546 
-                $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id);
546 
+                $query_values = array(':fammarine_id' => $fammarine_id, ':status' => $status, ':status_id' => $status_id);
547 547
548 548 
 		try {
549 549 
 			$sth = $this->db->prepare($query);
 
@@ -566,7 +566,7 @@  discard block
 
 block discarded – undo
566 566 
 	public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '')
567 567 
 	{
568 568 
 		$query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE fammarine_id = :fammarine_id';
569 
-                $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
569 
+                $query_values = array(':fammarine_id' => $fammarine_id, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident);
570 570
571 571 
 		try {
572 572 
 			$sth = $this->db->prepare($query);
 
@@ -604,7 +604,7 @@  discard block
 
 block discarded – undo
604 604 
 	* @param String $verticalrate vertival rate of flight
605 605 
 	* @return String success or false
606 606 
 	*/
607 
-	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '')
607 
+	public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $format_source = '', $source_name = '')
608 608 
 	{
609 609 
 		global $globalURL, $globalMarineImageFetch;
610 610 
 		
@@ -671,31 +671,31 @@  discard block
 
 block discarded – undo
671 671 
 		}
672 672
673 673
674 
-		if ($date == "" || strtotime($date) < time()-20*60)
674 
+		if ($date == "" || strtotime($date) < time() - 20*60)
675 675 
 		{
676 676 
 			$date = date("Y-m-d H:i:s", time());
677 677 
 		}
678 678
679 
-		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
680 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
681 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
682 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
683 
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
684 
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
685 
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
686 
-		$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
687 
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
688 
-		$status = filter_var($status,FILTER_SANITIZE_STRING);
689 
-		$imo = filter_var($imo,FILTER_SANITIZE_STRING);
690 
-		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
691 
-		$arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING);
692 
-		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
679 
+		$fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING);
680 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
681 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
682 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
683 
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
684 
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
685 
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
686 
+		$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
687 
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
688 
+		$status = filter_var($status, FILTER_SANITIZE_STRING);
689 
+		$imo = filter_var($imo, FILTER_SANITIZE_STRING);
690 
+		$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
691 
+		$arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING);
692 
+		$arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING);
693 693
694 694 
 		if (isset($globalMarineImageFetch) && $globalMarineImageFetch === TRUE) {
695 695 
 			$Image = new Image($this->db);
696 
-			$image_array = $Image->getMarineImage($mmsi,$imo,$ident);
696 
+			$image_array = $Image->getMarineImage($mmsi, $imo, $ident);
697 697 
 			if (!isset($image_array[0]['mmsi'])) {
698 
-				$Image->addMarineImage($mmsi,$imo,$ident);
698 
+				$Image->addMarineImage($mmsi, $imo, $ident);
699 699 
 			}
700 700 
 			unset($Image);
701 701 
 		}
 
@@ -707,10 +707,10 @@  discard block
 
 block discarded – undo
707 707 
                 if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
708 708 
                 if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
709 709 
                 if ($arrival_date == '') $arrival_date = NULL;
710 
-		$query  = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date)
710 
+		$query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date)
711 711 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)";
712 712
713 
-		$query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date);
713 
+		$query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date);
714 714 
 		try {
715 715
716 716 
 			$sth = $this->db->prepare($query);
 
@@ -735,13 +735,13 @@  discard block
 
 block discarded – undo
735 735 
 	{
736 736 
 		global $globalDBdriver, $globalTimezone;
737 737 
 		if ($globalDBdriver == 'mysql') {
738 
-			$query  = "SELECT marine_output.ident FROM marine_output
738 
+			$query = "SELECT marine_output.ident FROM marine_output
739 739 
 								WHERE marine_output.ident = :ident
740 740 
 								AND marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR)
741 741 
 								AND marine_output.date < UTC_TIMESTAMP()";
742 742 
 			$query_data = array(':ident' => $ident);
743 743 
 		} else {
744 
-			$query  = "SELECT marine_output.ident FROM marine_output
744 
+			$query = "SELECT marine_output.ident FROM marine_output
745 745 
 								WHERE marine_output.ident = :ident
746 746 
 								AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
747 747 
 								AND marine_output.date < now() AT TIME ZONE 'UTC'";
 
@@ -750,8 +750,8 @@  discard block
 
 block discarded – undo
750 750
751 751 
 		$sth = $this->db->prepare($query);
752 752 
 		$sth->execute($query_data);
753 
-    		$ident_result='';
754 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
753 
+    		$ident_result = '';
754 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
755 755 
 		{
756 756 
 			$ident_result = $row['ident'];
757 757 
 		}
 
@@ -777,8 +777,8 @@  discard block
 
 block discarded – undo
777 777 
 				return false;
778 778 
 			} else {
779 779 
 				$q_array = explode(" ", $q);
780 
-				foreach ($q_array as $q_item){
781 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
780 
+				foreach ($q_array as $q_item) {
781 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
782 782 
 					$additional_query .= " AND (";
783 783 
 					$additional_query .= "(marine_output.ident like '%".$q_item."%')";
784 784 
 					$additional_query .= ")";
 
@@ -786,11 +786,11 @@  discard block
 
 block discarded – undo
786 786 
 			}
787 787 
 		}
788 788 
 		if ($globalDBdriver == 'mysql') {
789 
-			$query  = "SELECT marine_output.* FROM marine_output
789 
+			$query = "SELECT marine_output.* FROM marine_output
790 790 
 				WHERE marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query."
791 791 
 				AND marine_output.date < UTC_TIMESTAMP()";
792 792 
 		} else {
793 
-			$query  = "SELECT marine_output.* FROM marine_output
793 
+			$query = "SELECT marine_output.* FROM marine_output
794 794 
 				WHERE marine_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query."
795 795 
 				AND marine_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
796 796 
 		}
 
@@ -809,16 +809,16 @@  discard block
 
 block discarded – undo
809 809 
 	*
810 810 
 	*/
811 811
812 
-	public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
812 
+	public function countAllMarineOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
813 813 
 	{
814 814 
 		global $globalDBdriver, $globalArchive;
815 815 
 		//$filter_query = $this->getFilter($filters,true,true);
816 
-		$Connection= new Connection($this->db);
816 
+		$Connection = new Connection($this->db);
817 817 
 		if (!$Connection->tableExists('countries')) return array();
818 818 
 		require_once('class.SpotterLive.php');
819 819 
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
820 820 
 			$MarineLive = new MarineLive($this->db);
821 
-			$filter_query = $MarineLive->getFilter($filters,true,true);
821 
+			$filter_query = $MarineLive->getFilter($filters, true, true);
822 822 
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
823 823 
 			if ($olderthanmonths > 0) {
824 824 
 				if ($globalDBdriver == 'mysql') {
 
@@ -838,7 +838,7 @@  discard block
 
 block discarded – undo
838 838 
 		} else {
839 839 
 			require_once(dirname(__FILE__)."/class.MarineArchive.php");
840 840 
 			$MarineArchive = new MarineArchive($this->db);
841 
-			$filter_query = $MarineArchive->getFilter($filters,true,true);
841 
+			$filter_query = $MarineArchive->getFilter($filters, true, true);
842 842 
 			$filter_query .= " over_country <> ''";
843 843 
 			if ($olderthanmonths > 0) {
844 844 
 				if ($globalDBdriver == 'mysql') {
 
@@ -866,7 +866,7 @@  discard block
 
 block discarded – undo
866 866 
 		$flight_array = array();
867 867 
 		$temp_array = array();
868 868
869 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
869 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
870 870 
 		{
871 871 
 			$temp_array['marine_count'] = $row['nb'];
872 872 
 			$temp_array['marine_country'] = $row['name'];
 
@@ -885,11 +885,11 @@  discard block
 
 block discarded – undo
885 885 
 	* @return Array the callsign list
886 886 
 	*
887 887 
 	*/
888 
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
888 
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
889 889 
 	{
890 890 
 		global $globalDBdriver;
891 
-		$filter_query = $this->getFilter($filters,true,true);
892 
-		$query  = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count
891 
+		$filter_query = $this->getFilter($filters, true, true);
892 
+		$query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count
893 893 
                     FROM marine_output".$filter_query." marine_output.ident <> ''";
894 894 
 		 if ($olderthanmonths > 0) {
895 895 
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
 
@@ -903,28 +903,28 @@  discard block
 
 block discarded – undo
903 903 
 		if ($year != '') {
904 904 
 			if ($globalDBdriver == 'mysql') {
905 905 
 				$query .= " AND YEAR(marine_output.date) = :year";
906 
-				$query_values = array_merge($query_values,array(':year' => $year));
906 
+				$query_values = array_merge($query_values, array(':year' => $year));
907 907 
 			} else {
908 908 
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
909 
-				$query_values = array_merge($query_values,array(':year' => $year));
909 
+				$query_values = array_merge($query_values, array(':year' => $year));
910 910 
 			}
911 911 
 		}
912 912 
 		if ($month != '') {
913 913 
 			if ($globalDBdriver == 'mysql') {
914 914 
 				$query .= " AND MONTH(marine_output.date) = :month";
915 
-				$query_values = array_merge($query_values,array(':month' => $month));
915 
+				$query_values = array_merge($query_values, array(':month' => $month));
916 916 
 			} else {
917 917 
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
918 
-				$query_values = array_merge($query_values,array(':month' => $month));
918 
+				$query_values = array_merge($query_values, array(':month' => $month));
919 919 
 			}
920 920 
 		}
921 921 
 		if ($day != '') {
922 922 
 			if ($globalDBdriver == 'mysql') {
923 923 
 				$query .= " AND DAY(marine_output.date) = :day";
924 
-				$query_values = array_merge($query_values,array(':day' => $day));
924 
+				$query_values = array_merge($query_values, array(':day' => $day));
925 925 
 			} else {
926 926 
 				$query .= " AND EXTRACT(DAY FROM marine_output.date) = :day";
927 
-				$query_values = array_merge($query_values,array(':day' => $day));
927 
+				$query_values = array_merge($query_values, array(':day' => $day));
928 928 
 			}
929 929 
 		}
930 930 
 		$query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC";
 
@@ -936,7 +936,7 @@  discard block
 
 block discarded – undo
936 936 
 		$callsign_array = array();
937 937 
 		$temp_array = array();
938 938
939 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
939 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
940 940 
 		{
941 941 
 			$temp_array['callsign_icao'] = $row['ident'];
942 942 
 			$temp_array['airline_name'] = $row['airline_name'];
 
@@ -988,7 +988,7 @@  discard block
 
 block discarded – undo
988 988 
 		$date_array = array();
989 989 
 		$temp_array = array();
990 990
991 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
991 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
992 992 
 		{
993 993 
 			$temp_array['date_name'] = $row['date_name'];
994 994 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -1014,7 +1014,7 @@  discard block
 
 block discarded – undo
1014 1014 
 			$datetime = new DateTime();
1015 1015 
 			$offset = $datetime->format('P');
1016 1016 
 		} else $offset = '+00:00';
1017 
-		$filter_query = $this->getFilter($filters,true,true);
1017 
+		$filter_query = $this->getFilter($filters, true, true);
1018 1018 
 		if ($globalDBdriver == 'mysql') {
1019 1019 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
1020 1020 
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
 
@@ -1035,7 +1035,7 @@  discard block
 
 block discarded – undo
1035 1035 
 		$date_array = array();
1036 1036 
 		$temp_array = array();
1037 1037
1038 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1038 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1039 1039 
 		{
1040 1040 
 			$temp_array['date_name'] = $row['date_name'];
1041 1041 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -1060,7 +1060,7 @@  discard block
 
 block discarded – undo
1060 1060 
 			$datetime = new DateTime();
1061 1061 
 			$offset = $datetime->format('P');
1062 1062 
 		} else $offset = '+00:00';
1063 
-		$filter_query = $this->getFilter($filters,true,true);
1063 
+		$filter_query = $this->getFilter($filters, true, true);
1064 1064 
 		if ($globalDBdriver == 'mysql') {
1065 1065 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
1066 1066 
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
 
@@ -1081,7 +1081,7 @@  discard block
 
 block discarded – undo
1081 1081 
 		$date_array = array();
1082 1082 
 		$temp_array = array();
1083 1083
1084 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1084 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1085 1085 
 		{
1086 1086 
 			$temp_array['date_name'] = $row['date_name'];
1087 1087 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -1128,7 +1128,7 @@  discard block
 
 block discarded – undo
1128 1128 
 		$date_array = array();
1129 1129 
 		$temp_array = array();
1130 1130
1131 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1131 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1132 1132 
 		{
1133 1133 
 			$temp_array['month_name'] = $row['month_name'];
1134 1134 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -1157,7 +1157,7 @@  discard block
 
 block discarded – undo
1157 1157 
 			$datetime = new DateTime();
1158 1158 
 			$offset = $datetime->format('P');
1159 1159 
 		} else $offset = '+00:00';
1160 
-		$filter_query = $this->getFilter($filters,true,true);
1160 
+		$filter_query = $this->getFilter($filters, true, true);
1161 1161 
 		if ($globalDBdriver == 'mysql') {
1162 1162 
 			$query  = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
1163 1163 
 								FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
 
@@ -1178,7 +1178,7 @@  discard block
 
 block discarded – undo
1178 1178 
 		$date_array = array();
1179 1179 
 		$temp_array = array();
1180 1180
1181 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1181 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1182 1182 
 		{
1183 1183 
 			$temp_array['year_name'] = $row['year_name'];
1184 1184 
 			$temp_array['month_name'] = $row['month_name'];
 
@@ -1198,7 +1198,7 @@  discard block
 
 block discarded – undo
1198 1198 
 	* @return Array the hour list
1199 1199 
 	*
1200 1200 
 	*/
1201 
-	public function countAllHours($orderby,$filters = array())
1201 
+	public function countAllHours($orderby, $filters = array())
1202 1202 
 	{
1203 1203 
 		global $globalTimezone, $globalDBdriver;
1204 1204 
 		if ($globalTimezone != '') {
 
@@ -1246,7 +1246,7 @@  discard block
 
 block discarded – undo
1246 1246 
 		$hour_array = array();
1247 1247 
 		$temp_array = array();
1248 1248
1249 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1249 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1250 1250 
 		{
1251 1251 
 			$temp_array['hour_name'] = $row['hour_name'];
1252 1252 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1268,8 +1268,8 @@  discard block
 
 block discarded – undo
1268 1268 
 	public function countAllHoursByDate($date, $filters = array())
1269 1269 
 	{
1270 1270 
 		global $globalTimezone, $globalDBdriver;
1271 
-		$filter_query = $this->getFilter($filters,true,true);
1272 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
1271 
+		$filter_query = $this->getFilter($filters, true, true);
1272 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
1273 1273 
 		if ($globalTimezone != '') {
1274 1274 
 			date_default_timezone_set($globalTimezone);
1275 1275 
 			$datetime = new DateTime($date);
 
@@ -1277,12 +1277,12 @@  discard block
 
 block discarded – undo
1277 1277 
 		} else $offset = '+00:00';
1278 1278
1279 1279 
 		if ($globalDBdriver == 'mysql') {
1280 
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1280 
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1281 1281 
 								FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = :date
1282 1282 
 								GROUP BY hour_name
1283 1283 
 								ORDER BY hour_name ASC";
1284 1284 
 		} else {
1285 
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1285 
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1286 1286 
 								FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
1287 1287 
 								GROUP BY hour_name
1288 1288 
 								ORDER BY hour_name ASC";
 
@@ -1294,7 +1294,7 @@  discard block
 
 block discarded – undo
1294 1294 
 		$hour_array = array();
1295 1295 
 		$temp_array = array();
1296 1296
1297 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1297 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1298 1298 
 		{
1299 1299 
 			$temp_array['hour_name'] = $row['hour_name'];
1300 1300 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1316,8 +1316,8 @@  discard block
 
 block discarded – undo
1316 1316 
 	public function countAllHoursByIdent($ident, $filters = array())
1317 1317 
 	{
1318 1318 
 		global $globalTimezone, $globalDBdriver;
1319 
-		$filter_query = $this->getFilter($filters,true,true);
1320 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
1319 
+		$filter_query = $this->getFilter($filters, true, true);
1320 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
1321 1321 
 		if ($globalTimezone != '') {
1322 1322 
 			date_default_timezone_set($globalTimezone);
1323 1323 
 			$datetime = new DateTime();
 
@@ -1325,12 +1325,12 @@  discard block
 
 block discarded – undo
1325 1325 
 		} else $offset = '+00:00';
1326 1326
1327 1327 
 		if ($globalDBdriver == 'mysql') {
1328 
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1328 
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1329 1329 
 								FROM marine_output".$filter_query." marine_output.ident = :ident
1330 1330 
 								GROUP BY hour_name
1331 1331 
 								ORDER BY hour_name ASC";
1332 1332 
 		} else {
1333 
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1333 
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1334 1334 
 								FROM marine_output".$filter_query." marine_output.ident = :ident
1335 1335 
 								GROUP BY hour_name
1336 1336 
 								ORDER BY hour_name ASC";
 
@@ -1338,12 +1338,12 @@  discard block
 
 block discarded – undo
1338 1338
1339 1339
1340 1340 
 		$sth = $this->db->prepare($query);
1341 
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
1341 
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
1342 1342
1343 1343 
 		$hour_array = array();
1344 1344 
 		$temp_array = array();
1345 1345
1346 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1346 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1347 1347 
 		{
1348 1348 
 			$temp_array['hour_name'] = $row['hour_name'];
1349 1349 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1362,33 +1362,33 @@  discard block
 
 block discarded – undo
1362 1362 
 	* @return Integer the number of vessels
1363 1363 
 	*
1364 1364 
 	*/
1365 
-	public function countOverallMarine($filters = array(),$year = '',$month = '')
1365 
+	public function countOverallMarine($filters = array(), $year = '', $month = '')
1366 1366 
 	{
1367 1367 
 		global $globalDBdriver;
1368 1368 
 		//$queryi  = "SELECT COUNT(marine_output.marine_id) AS flight_count FROM marine_output";
1369 
-		$queryi  = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output";
1369 
+		$queryi = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output";
1370 1370 
 		$query_values = array();
1371 1371 
 		$query = '';
1372 1372 
 		if ($year != '') {
1373 1373 
 			if ($globalDBdriver == 'mysql') {
1374 1374 
 				$query .= " AND YEAR(marine_output.date) = :year";
1375 
-				$query_values = array_merge($query_values,array(':year' => $year));
1375 
+				$query_values = array_merge($query_values, array(':year' => $year));
1376 1376 
 			} else {
1377 1377 
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
1378 
-				$query_values = array_merge($query_values,array(':year' => $year));
1378 
+				$query_values = array_merge($query_values, array(':year' => $year));
1379 1379 
 			}
1380 1380 
 		}
1381 1381 
 		if ($month != '') {
1382 1382 
 			if ($globalDBdriver == 'mysql') {
1383 1383 
 				$query .= " AND MONTH(marine_output.date) = :month";
1384 
-				$query_values = array_merge($query_values,array(':month' => $month));
1384 
+				$query_values = array_merge($query_values, array(':month' => $month));
1385 1385 
 			} else {
1386 1386 
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
1387 
-				$query_values = array_merge($query_values,array(':month' => $month));
1387 
+				$query_values = array_merge($query_values, array(':month' => $month));
1388 1388 
 			}
1389 1389 
 		}
1390 1390 
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1391 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1391 
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
1392 1392
1393 1393 
 		$sth = $this->db->prepare($queryi);
1394 1394 
 		$sth->execute($query_values);
 
@@ -1401,32 +1401,32 @@  discard block
 
 block discarded – undo
1401 1401 
 	* @return Integer the number of vessels
1402 1402 
 	*
1403 1403 
 	*/
1404 
-	public function countOverallMarineTypes($filters = array(),$year = '',$month = '')
1404 
+	public function countOverallMarineTypes($filters = array(), $year = '', $month = '')
1405 1405 
 	{
1406 1406 
 		global $globalDBdriver;
1407 
-		$queryi  = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output";
1407 
+		$queryi = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output";
1408 1408 
 		$query_values = array();
1409 1409 
 		$query = '';
1410 1410 
 		if ($year != '') {
1411 1411 
 			if ($globalDBdriver == 'mysql') {
1412 1412 
 				$query .= " AND YEAR(marine_output.date) = :year";
1413 
-				$query_values = array_merge($query_values,array(':year' => $year));
1413 
+				$query_values = array_merge($query_values, array(':year' => $year));
1414 1414 
 			} else {
1415 1415 
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
1416 
-				$query_values = array_merge($query_values,array(':year' => $year));
1416 
+				$query_values = array_merge($query_values, array(':year' => $year));
1417 1417 
 			}
1418 1418 
 		}
1419 1419 
 		if ($month != '') {
1420 1420 
 			if ($globalDBdriver == 'mysql') {
1421 1421 
 				$query .= " AND MONTH(marine_output.date) = :month";
1422 
-				$query_values = array_merge($query_values,array(':month' => $month));
1422 
+				$query_values = array_merge($query_values, array(':month' => $month));
1423 1423 
 			} else {
1424 1424 
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
1425 
-				$query_values = array_merge($query_values,array(':month' => $month));
1425 
+				$query_values = array_merge($query_values, array(':month' => $month));
1426 1426 
 			}
1427 1427 
 		}
1428 1428 
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1429 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1429 
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
1430 1430
1431 1431 
 		$sth = $this->db->prepare($queryi);
1432 1432 
 		$sth->execute($query_values);
 
@@ -1443,7 +1443,7 @@  discard block
 
 block discarded – undo
1443 1443 
 	public function countAllHoursFromToday($filters = array())
1444 1444 
 	{
1445 1445 
 		global $globalTimezone, $globalDBdriver;
1446 
-		$filter_query = $this->getFilter($filters,true,true);
1446 
+		$filter_query = $this->getFilter($filters, true, true);
1447 1447 
 		if ($globalTimezone != '') {
1448 1448 
 			date_default_timezone_set($globalTimezone);
1449 1449 
 			$datetime = new DateTime();
 
@@ -1451,12 +1451,12 @@  discard block
 
 block discarded – undo
1451 1451 
 		} else $offset = '+00:00';
1452 1452
1453 1453 
 		if ($globalDBdriver == 'mysql') {
1454 
-			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1454 
+			$query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1455 1455 
 								FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = CURDATE()
1456 1456 
 								GROUP BY hour_name
1457 1457 
 								ORDER BY hour_name ASC";
1458 1458 
 		} else {
1459 
-			$query  = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1459 
+			$query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1460 1460 
 								FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
1461 1461 
 								GROUP BY hour_name
1462 1462 
 								ORDER BY hour_name ASC";
 
@@ -1468,7 +1468,7 @@  discard block
 
 block discarded – undo
1468 1468 
 		$hour_array = array();
1469 1469 
 		$temp_array = array();
1470 1470
1471 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1471 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1472 1472 
 		{
1473 1473 
 			$temp_array['hour_name'] = $row['hour_name'];
1474 1474 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1487,9 +1487,9 @@  discard block
 
 block discarded – undo
1487 1487 
 	*/
1488 1488 
 	public function getMarineIDBasedOnFamMarineID($fammarine_id)
1489 1489 
 	{
1490 
-		$fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING);
1490 
+		$fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING);
1491 1491
1492 
-		$query  = "SELECT marine_output.marine_id
1492 
+		$query = "SELECT marine_output.marine_id
1493 1493 
 				FROM marine_output
1494 1494 
 				WHERE marine_output.fammarine_id = '".$fammarine_id."'";
1495 1495 
         
@@ -1497,7 +1497,7 @@  discard block
 
 block discarded – undo
1497 1497 
 		$sth = $this->db->prepare($query);
1498 1498 
 		$sth->execute();
1499 1499
1500 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1500 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1501 1501 
 		{
1502 1502 
 			return $row['marine_id'];
1503 1503 
 		}
 
@@ -1522,23 +1522,23 @@  discard block
 
 block discarded – undo
1522 1522 
 		}
1523 1523
1524 1524 
 		$current_date = date("Y-m-d H:i:s");
1525 
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
1525 
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
1526 1526
1527 1527 
 		$diff = abs(strtotime($current_date) - strtotime($date));
1528 1528
1529 
-		$time_array['years'] = floor($diff / (365*60*60*24));
1529 
+		$time_array['years'] = floor($diff/(365*60*60*24));
1530 1530 
 		$years = $time_array['years'];
1531 1531
1532 
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
1532 
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
1533 1533 
 		$months = $time_array['months'];
1534 1534
1535 
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
1535 
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
1536 1536 
 		$days = $time_array['days'];
1537 
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
1537 
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
1538 1538 
 		$hours = $time_array['hours'];
1539 
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
1539 
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
1540 1540 
 		$minutes = $time_array['minutes'];
1541 
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));
1541 
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));
1542 1542
1543 1543 
 		return $time_array;
1544 1544 
 	}
 
@@ -1561,63 +1561,63 @@  discard block
 
 block discarded – undo
1561 1561 
 			$temp_array['direction_degree'] = $direction;
1562 1562 
 			$temp_array['direction_shortname'] = "N";
1563 1563 
 			$temp_array['direction_fullname'] = "North";
1564 
-		} elseif ($direction >= 22.5 && $direction < 45){
1564 
+		} elseif ($direction >= 22.5 && $direction < 45) {
1565 1565 
 			$temp_array['direction_degree'] = $direction;
1566 1566 
 			$temp_array['direction_shortname'] = "NNE";
1567 1567 
 			$temp_array['direction_fullname'] = "North-Northeast";
1568 
-		} elseif ($direction >= 45 && $direction < 67.5){
1568 
+		} elseif ($direction >= 45 && $direction < 67.5) {
1569 1569 
 			$temp_array['direction_degree'] = $direction;
1570 1570 
 			$temp_array['direction_shortname'] = "NE";
1571 1571 
 			$temp_array['direction_fullname'] = "Northeast";
1572 
-		} elseif ($direction >= 67.5 && $direction < 90){
1572 
+		} elseif ($direction >= 67.5 && $direction < 90) {
1573 1573 
 			$temp_array['direction_degree'] = $direction;
1574 1574 
 			$temp_array['direction_shortname'] = "ENE";
1575 1575 
 			$temp_array['direction_fullname'] = "East-Northeast";
1576 
-		} elseif ($direction >= 90 && $direction < 112.5){
1576 
+		} elseif ($direction >= 90 && $direction < 112.5) {
1577 1577 
 			$temp_array['direction_degree'] = $direction;
1578 1578 
 			$temp_array['direction_shortname'] = "E";
1579 1579 
 			$temp_array['direction_fullname'] = "East";
1580 
-		} elseif ($direction >= 112.5 && $direction < 135){
1580 
+		} elseif ($direction >= 112.5 && $direction < 135) {
1581 1581 
 			$temp_array['direction_degree'] = $direction;
1582 1582 
 			$temp_array['direction_shortname'] = "ESE";
1583 1583 
 			$temp_array['direction_fullname'] = "East-Southeast";
1584 
-		} elseif ($direction >= 135 && $direction < 157.5){
1584 
+		} elseif ($direction >= 135 && $direction < 157.5) {
1585 1585 
 			$temp_array['direction_degree'] = $direction;
1586 1586 
 			$temp_array['direction_shortname'] = "SE";
1587 1587 
 			$temp_array['direction_fullname'] = "Southeast";
1588 
-		} elseif ($direction >= 157.5 && $direction < 180){
1588 
+		} elseif ($direction >= 157.5 && $direction < 180) {
1589 1589 
 			$temp_array['direction_degree'] = $direction;
1590 1590 
 			$temp_array['direction_shortname'] = "SSE";
1591 1591 
 			$temp_array['direction_fullname'] = "South-Southeast";
1592 
-		} elseif ($direction >= 180 && $direction < 202.5){
1592 
+		} elseif ($direction >= 180 && $direction < 202.5) {
1593 1593 
 			$temp_array['direction_degree'] = $direction;
1594 1594 
 			$temp_array['direction_shortname'] = "S";
1595 1595 
 			$temp_array['direction_fullname'] = "South";
1596 
-		} elseif ($direction >= 202.5 && $direction < 225){
1596 
+		} elseif ($direction >= 202.5 && $direction < 225) {
1597 1597 
 			$temp_array['direction_degree'] = $direction;
1598 1598 
 			$temp_array['direction_shortname'] = "SSW";
1599 1599 
 			$temp_array['direction_fullname'] = "South-Southwest";
1600 
-		} elseif ($direction >= 225 && $direction < 247.5){
1600 
+		} elseif ($direction >= 225 && $direction < 247.5) {
1601 1601 
 			$temp_array['direction_degree'] = $direction;
1602 1602 
 			$temp_array['direction_shortname'] = "SW";
1603 1603 
 			$temp_array['direction_fullname'] = "Southwest";
1604 
-		} elseif ($direction >= 247.5 && $direction < 270){
1604 
+		} elseif ($direction >= 247.5 && $direction < 270) {
1605 1605 
 			$temp_array['direction_degree'] = $direction;
1606 1606 
 			$temp_array['direction_shortname'] = "WSW";
1607 1607 
 			$temp_array['direction_fullname'] = "West-Southwest";
1608 
-		} elseif ($direction >= 270 && $direction < 292.5){
1608 
+		} elseif ($direction >= 270 && $direction < 292.5) {
1609 1609 
 			$temp_array['direction_degree'] = $direction;
1610 1610 
 			$temp_array['direction_shortname'] = "W";
1611 1611 
 			$temp_array['direction_fullname'] = "West";
1612 
-		} elseif ($direction >= 292.5 && $direction < 315){
1612 
+		} elseif ($direction >= 292.5 && $direction < 315) {
1613 1613 
 			$temp_array['direction_degree'] = $direction;
1614 1614 
 			$temp_array['direction_shortname'] = "WNW";
1615 1615 
 			$temp_array['direction_fullname'] = "West-Northwest";
1616 
-		} elseif ($direction >= 315 && $direction < 337.5){
1616 
+		} elseif ($direction >= 315 && $direction < 337.5) {
1617 1617 
 			$temp_array['direction_degree'] = $direction;
1618 1618 
 			$temp_array['direction_shortname'] = "NW";
1619 1619 
 			$temp_array['direction_fullname'] = "Northwest";
1620 
-		} elseif ($direction >= 337.5 && $direction < 360){
1620 
+		} elseif ($direction >= 337.5 && $direction < 360) {
1621 1621 
 			$temp_array['direction_degree'] = $direction;
1622 1622 
 			$temp_array['direction_shortname'] = "NNW";
1623 1623 
 			$temp_array['direction_fullname'] = "North-Northwest";
 
@@ -1634,11 +1634,11 @@  discard block
 
 block discarded – undo
1634 1634 
 	* @param Float $longitude longitute of the flight
1635 1635 
 	* @return String the countrie
1636 1636 
 	*/
1637 
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
1637 
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
1638 1638 
 	{
1639 1639 
 		global $globalDBdriver, $globalDebug;
1640 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1641 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1640 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1641 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1642 1642
1643 1643 
 		$Connection = new Connection($this->db);
1644 1644 
 		if (!$Connection->tableExists('countries')) return '';
 
@@ -1678,7 +1678,7 @@  discard block
 
 block discarded – undo
1678 1678 
 	public function getCountryFromISO2($iso2)
1679 1679 
 	{
1680 1680 
 		global $globalDBdriver, $globalDebug;
1681 
-		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
1681 
+		$iso2 = filter_var($iso2, FILTER_SANITIZE_STRING);
1682 1682
1683 1683 
 		$Connection = new Connection($this->db);
1684 1684 
 		if (!$Connection->tableExists('countries')) return '';
 
@@ -1726,7 +1726,7 @@  discard block
 
 block discarded – undo
1726 1726
1727 1727 
 		$bitly_data = json_decode($bitly_data);
1728 1728 
 		$bitly_url = '';
1729 
-		if ($bitly_data->status_txt = "OK"){
1729 
+		if ($bitly_data->status_txt = "OK") {
1730 1730 
 			$bitly_url = $bitly_data->data->url;
1731 1731 
 		}
1732 1732 
 
@@ -1740,11 +1740,11 @@  discard block
 
 block discarded – undo
1740 1740 
 	* @return Array the vessel type list
1741 1741 
 	*
1742 1742 
 	*/
1743 
-	public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
1743 
+	public function countAllMarineTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
1744 1744 
 	{
1745 1745 
 		global $globalDBdriver;
1746 
-		$filter_query = $this->getFilter($filters,true,true);
1747 
-		$query  = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count
1746 
+		$filter_query = $this->getFilter($filters, true, true);
1747 
+		$query = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count
1748 1748 
 		    FROM marine_output ".$filter_query." marine_output.type  <> ''";
1749 1749 
 		if ($olderthanmonths > 0) {
1750 1750 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1764,28 +1764,28 @@  discard block
 
 block discarded – undo
1764 1764 
 		if ($year != '') {
1765 1765 
 			if ($globalDBdriver == 'mysql') {
1766 1766 
 				$query .= " AND YEAR(marine_output.date) = :year";
1767 
-				$query_values = array_merge($query_values,array(':year' => $year));
1767 
+				$query_values = array_merge($query_values, array(':year' => $year));
1768 1768 
 			} else {
1769 1769 
 				$query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year";
1770 
-				$query_values = array_merge($query_values,array(':year' => $year));
1770 
+				$query_values = array_merge($query_values, array(':year' => $year));
1771 1771 
 			}
1772 1772 
 		}
1773 1773 
 		if ($month != '') {
1774 1774 
 			if ($globalDBdriver == 'mysql') {
1775 1775 
 				$query .= " AND MONTH(marine_output.date) = :month";
1776 
-				$query_values = array_merge($query_values,array(':month' => $month));
1776 
+				$query_values = array_merge($query_values, array(':month' => $month));
1777 1777 
 			} else {
1778 1778 
 				$query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month";
1779 
-				$query_values = array_merge($query_values,array(':month' => $month));
1779 
+				$query_values = array_merge($query_values, array(':month' => $month));
1780 1780 
 			}
1781 1781 
 		}
1782 1782 
 		if ($day != '') {
1783 1783 
 			if ($globalDBdriver == 'mysql') {
1784 1784 
 				$query .= " AND DAY(marine_output.date) = :day";
1785 
-				$query_values = array_merge($query_values,array(':day' => $day));
1785 
+				$query_values = array_merge($query_values, array(':day' => $day));
1786 1786 
 			} else {
1787 1787 
 				$query .= " AND EXTRACT(DAY FROM marine_output.date) = :day";
1788 
-				$query_values = array_merge($query_values,array(':day' => $day));
1788 
+				$query_values = array_merge($query_values, array(':day' => $day));
1789 1789 
 			}
1790 1790 
 		}
1791 1791 
 		$query .= " GROUP BY marine_output.type ORDER BY marine_type_count DESC";
 
@@ -1794,7 +1794,7 @@  discard block
 
 block discarded – undo
1794 1794 
 		$sth->execute($query_values);
1795 1795 
 		$marine_array = array();
1796 1796 
 		$temp_array = array();
1797 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1797 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1798 1798 
 		{
1799 1799 
 			$temp_array['marine_type'] = $row['marine_type'];
1800 1800 
 			$temp_array['marine_type_count'] = $row['marine_type_count'];
 
@@ -1809,13 +1809,13 @@  discard block
 
 block discarded – undo
1809 1809 
 	* @return Array the tracker information
1810 1810 
 	*
1811 1811 
 	*/
1812 
-	public function searchMarineData($q = '', $callsign = '',$mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
1812 
+	public function searchMarineData($q = '', $callsign = '', $mmsi = '', $imo = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
1813 1813 
 	{
1814 1814 
 		global $globalTimezone, $globalDBdriver;
1815 1815 
 		date_default_timezone_set('UTC');
1816 1816 
 		$query_values = array();
1817 1817 
 		$additional_query = '';
1818 
-		$filter_query = $this->getFilter($filters,true,true);
1818 
+		$filter_query = $this->getFilter($filters, true, true);
1819 1819 
 		if ($q != "")
1820 1820 
 		{
1821 1821 
 			if (!is_string($q))
 
@@ -1823,8 +1823,8 @@  discard block
 
 block discarded – undo
1823 1823 
 				return false;
1824 1824 
 			} else {
1825 1825 
 				$q_array = explode(" ", $q);
1826 
-				foreach ($q_array as $q_item){
1827 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
1826 
+				foreach ($q_array as $q_item) {
1827 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
1828 1828 
 					$additional_query .= " AND (";
1829 1829 
 					if (is_int($q_item)) $additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
1830 1830 
 					if (is_int($q_item)) $additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
 
@@ -1836,42 +1836,42 @@  discard block
 
 block discarded – undo
1836 1836 
 		}
1837 1837 
 		if ($callsign != "")
1838 1838 
 		{
1839 
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
1839 
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
1840 1840 
 			if (!is_string($callsign))
1841 1841 
 			{
1842 1842 
 				return false;
1843 1843 
 			} else {
1844 1844 
 				$additional_query .= " AND marine_output.ident = :callsign";
1845 
-				$query_values = array_merge($query_values,array(':callsign' => $callsign));
1845 
+				$query_values = array_merge($query_values, array(':callsign' => $callsign));
1846 1846 
 			}
1847 1847 
 		}
1848 1848 
 		if ($mmsi != "")
1849 1849 
 		{
1850 
-			$mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING);
1850 
+			$mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING);
1851 1851 
 			if (!is_numeric($mmsi))
1852 1852 
 			{
1853 1853 
 				return false;
1854 1854 
 			} else {
1855 1855 
 				$additional_query .= " AND marine_output.mmsi = :mmsi";
1856 
-				$query_values = array_merge($query_values,array(':mmsi' => $mmsi));
1856 
+				$query_values = array_merge($query_values, array(':mmsi' => $mmsi));
1857 1857 
 			}
1858 1858 
 		}
1859 1859 
 		if ($imo != "")
1860 1860 
 		{
1861 
-			$imo = filter_var($imo,FILTER_SANITIZE_STRING);
1861 
+			$imo = filter_var($imo, FILTER_SANITIZE_STRING);
1862 1862 
 			if (!is_numeric($imo))
1863 1863 
 			{
1864 1864 
 				return false;
1865 1865 
 			} else {
1866 1866 
 				$additional_query .= " AND marine_output.imo = :imo";
1867 
-				$query_values = array_merge($query_values,array(':imo' => $imo));
1867 
+				$query_values = array_merge($query_values, array(':imo' => $imo));
1868 1868 
 			}
1869 1869 
 		}
1870 1870 
 		if ($date_posted != "")
1871 1871 
 		{
1872 1872 
 			$date_array = explode(",", $date_posted);
1873 
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
1874 
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
1873 
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
1874 
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
1875 1875 
 			if ($globalTimezone != '') {
1876 1876 
 				date_default_timezone_set($globalTimezone);
1877 1877 
 				$datetime = new DateTime();
 
@@ -1898,8 +1898,8 @@  discard block
 
 block discarded – undo
1898 1898 
 		if ($limit != "")
1899 1899 
 		{
1900 1900 
 			$limit_array = explode(",", $limit);
1901 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1902 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1901 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1902 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1903 1903 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1904 1904 
 			{
1905 1905 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
 
@@ -1917,28 +1917,28 @@  discard block
 
 block discarded – undo
1917 1917 
 			}
1918 1918 
 		}
1919 1919 
 		if ($origLat != "" && $origLon != "" && $dist != "") {
1920 
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
1920 
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
1921 1921 
 			if ($globalDBdriver == 'mysql') {
1922 
-				$query="SELECT marine_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2))) as distance
1922 
+				$query = "SELECT marine_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2))) as distance
1923 1923 
 				    FROM marine_archive,marine_output".$filter_query." marine_output.fammarine_id = marine_archive.fammarine_id AND marine_output.ident <> '' ".$additional_query."AND marine_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and marine_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69))
1924 1924 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - marine_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(marine_archive.latitude*pi()/180)*POWER(SIN(($origLon-marine_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query;
1925 1925 
 			} else {
1926 
-				$query="SELECT marine_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(marine_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance
1926 
+				$query = "SELECT marine_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(marine_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance
1927 1927 
 				    FROM marine_archive,marine_output".$filter_query." marine_output.fammarine_id = marine_archive.fammarine_id AND marine_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69))
1928 1928 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(marine_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(marine_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query.$orderby_query;
1929 1929 
 			}
1930 1930 
 		} else {
1931 
-			$query  = "SELECT marine_output.* FROM marine_output".$filter_query." marine_output.ident <> ''
1931 
+			$query = "SELECT marine_output.* FROM marine_output".$filter_query." marine_output.ident <> ''
1932 1932 
 			    ".$additional_query."
1933 1933 
 			    ".$orderby_query;
1934 1934 
 		}
1935 
-		$marine_array = $this->getDataFromDB($query, $query_values,$limit_query);
1935 
+		$marine_array = $this->getDataFromDB($query, $query_values, $limit_query);
1936 1936 
 		return $marine_array;
1937 1937 
 	}
1938 1938
1939 1939 
 	public function getOrderBy()
1940 1940 
 	{
1941 
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC"));
1941 
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC"));
1942 1942
1943 1943 
 		return $orderby;
1944 1944
Please login to merge, or discard this patch.
Braces   +191 added lines, -68 removed lines patch added patch discarded remove patch 
@@ -8,7 +8,9 @@  discard block
 
 block discarded – undo
8 8 
 	public function __construct($dbc = null) {
9 9 
 		$Connection = new Connection($dbc);
10 10 
 		$this->db = $Connection->db();
11 
-		if ($this->db === null) die('Error: No DB connection. (Marine)');
11 
+		if ($this->db === null) {
12 
+			die('Error: No DB connection. (Marine)');
13 
+		}
12 14 
 	}
13 15
14 16 
 	/**
 
@@ -30,7 +32,9 @@  discard block
 
 block discarded – undo
30 32 
 		if (isset($filter[0]['source'])) {
31 33 
 			$filters = array_merge($filters,$filter);
32 34 
 		}
33 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
35 
+		if (is_array($globalFilter)) {
36 
+			$filter = array_merge($filter,$globalFilter);
37 
+		}
34 38 
 		$filter_query_join = '';
35 39 
 		$filter_query_where = '';
36 40 
 		foreach($filters as $flt) {
 
@@ -69,8 +73,11 @@  discard block
 
 block discarded – undo
69 73 
 				$filter_query_where .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'";
70 74 
 			}
71 75 
 		}
72 
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
73 
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
76 
+		if ($filter_query_where == '' && $where) {
77 
+			$filter_query_where = ' WHERE';
78 
+		} elseif ($filter_query_where != '' && $and) {
79 
+			$filter_query_where .= ' AND';
80 
+		}
74 81 
 		if ($filter_query_where != '') {
75 82 
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
76 83 
 		}
 
@@ -124,32 +131,54 @@  discard block
 
 block discarded – undo
124 131 
 				$temp_array['spotter_id'] = $row['spotter_archive_id'];
125 132 
 			} elseif (isset($row['spotter_archive_output_id'])) {
126 133 
 				$temp_array['spotter_id'] = $row['spotter_archive_output_id'];
127 
-			*/}
128 
-			elseif (isset($row['marineid'])) {
134 
+			*/} elseif (isset($row['marineid'])) {
129 135 
 				$temp_array['marine_id'] = $row['marineid'];
130 136 
 			} else {
131 137 
 				$temp_array['marine_id'] = '';
132 138 
 			}
133 
-			if (isset($row['fammarine_id'])) $temp_array['fammarine_id'] = $row['fammarine_id'];
134 
-			if (isset($row['mmsi'])) $temp_array['mmsi'] = $row['mmsi'];
135 
-			if (isset($row['type'])) $temp_array['type'] = $row['type'];
136 
-			if (isset($row['type_id'])) $temp_array['type_id'] = $row['type_id'];
137 
-			if (isset($row['ident'])) $temp_array['ident'] = $row['ident'];
138 
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
139 
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
140 
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
139 
+			if (isset($row['fammarine_id'])) {
140 
+				$temp_array['fammarine_id'] = $row['fammarine_id'];
141 
+			}
142 
+			if (isset($row['mmsi'])) {
143 
+				$temp_array['mmsi'] = $row['mmsi'];
144 
+			}
145 
+			if (isset($row['type'])) {
146 
+				$temp_array['type'] = $row['type'];
147 
+			}
148 
+			if (isset($row['type_id'])) {
149 
+				$temp_array['type_id'] = $row['type_id'];
150 
+			}
151 
+			if (isset($row['ident'])) {
152 
+				$temp_array['ident'] = $row['ident'];
153 
+			}
154 
+			if (isset($row['latitude'])) {
155 
+				$temp_array['latitude'] = $row['latitude'];
156 
+			}
157 
+			if (isset($row['longitude'])) {
158 
+				$temp_array['longitude'] = $row['longitude'];
159 
+			}
160 
+			if (isset($row['format_source'])) {
161 
+				$temp_array['format_source'] = $row['format_source'];
162 
+			}
141 163 
 			if (isset($row['heading'])) {
142 164 
 				$temp_array['heading'] = $row['heading'];
143 165 
 				$heading_direction = $this->parseDirection($row['heading']);
144 
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
166 
+				if (isset($heading_direction[0]['direction_fullname'])) {
167 
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
168 
+				}
169 
+			}
170 
+			if (isset($row['ground_speed'])) {
171 
+				$temp_array['ground_speed'] = $row['ground_speed'];
145 172 
 			}
146 
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
147 173
148 174 
 			if($temp_array['mmsi'] != "")
149 175 
 			{
150 176 
 				$Image = new Image($this->db);
151 
-				if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
152 
-				else $image_array = $Image->getMarineImage($temp_array['mmsi']);
177 
+				if (isset($temp_array['ident']) && $temp_array['ident'] != '') {
178 
+					$image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']);
179 
+				} else {
180 
+					$image_array = $Image->getMarineImage($temp_array['mmsi']);
181 
+				}
153 182 
 				unset($Image);
154 183 
 				if (count($image_array) > 0) {
155 184 
 					$temp_array['image'] = $image_array[0]['image'];
 
@@ -201,13 +230,21 @@  discard block
 
 block discarded – undo
201 230 
 			}
202 231
203 232 
 			$fromsource = NULL;
204 
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
205 
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
206 
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
233 
+			if (isset($row['source_name']) && $row['source_name'] != '') {
234 
+				$temp_array['source_name'] = $row['source_name'];
235 
+			}
236 
+			if (isset($row['over_country']) && $row['over_country'] != '') {
237 
+				$temp_array['over_country'] = $row['over_country'];
238 
+			}
239 
+			if (isset($row['distance']) && $row['distance'] != '') {
240 
+				$temp_array['distance'] = $row['distance'];
241 
+			}
207 242 
 			$temp_array['query_number_rows'] = $num_rows;
208 243 
 			$spotter_array[] = $temp_array;
209 244 
 		}
210 
-		if ($num_rows == 0) return array();
245 
+		if ($num_rows == 0) {
246 
+			return array();
247 
+		}
211 248 
 		$spotter_array[0]['query_number_rows'] = $num_rows;
212 249 
 		return $spotter_array;
213 250 
 	}	
@@ -233,8 +270,12 @@  discard block
 
 block discarded – undo
233 270 
 			{
234 271 
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
235 272 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
236 
-			} else $limit_query = "";
237 
-		} else $limit_query = "";
273 
+			} else {
274 
+				$limit_query = "";
275 
+			}
276 
+		} else {
277 
+			$limit_query = "";
278 
+		}
238 279 
 		if ($sort != "")
239 280 
 		{
240 281 
 			$search_orderby_array = $this->getOrderBy();
 
@@ -258,7 +299,9 @@  discard block
 
 block discarded – undo
258 299 
 		global $global_query;
259 300
260 301 
 		date_default_timezone_set('UTC');
261 
-		if ($id == '') return array();
302 
+		if ($id == '') {
303 
+			return array();
304 
+		}
262 305 
 		$additional_query = "marine_output.fammarine_id = :id";
263 306 
 		$query_values = array(':id' => $id);
264 307 
 		$query  = $global_query." WHERE ".$additional_query." ";
 
@@ -401,8 +444,11 @@  discard block
 
 block discarded – undo
401 444 
 		$query .= " ORDER BY marine_output.source_name ASC";
402 445
403 446 
 		$sth = $this->db->prepare($query);
404 
-		if (!empty($query_values)) $sth->execute($query_values);
405 
-		else $sth->execute();
447 
+		if (!empty($query_values)) {
448 
+			$sth->execute($query_values);
449 
+		} else {
450 
+			$sth->execute();
451 
+		}
406 452
407 453 
 		$source_array = array();
408 454 
 		$temp_array = array();
 
@@ -457,8 +503,11 @@  discard block
 
 block discarded – undo
457 503 
 		$sth = $this->db->prepare($query);
458 504 
 		$sth->execute(array(':mmsi' => $mmsi));
459 505 
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
460 
-		if (isset($result[0])) return $result[0];
461 
-		else return array();
506 
+		if (isset($result[0])) {
507 
+			return $result[0];
508 
+		} else {
509 
+			return array();
510 
+		}
462 511 
 	}
463 512
464 513 
 	/*
 
@@ -474,7 +523,9 @@  discard block
 
 block discarded – undo
474 523 
 			date_default_timezone_set($globalTimezone);
475 524 
 			$datetime = new DateTime();
476 525 
 			$offset = $datetime->format('P');
477 
-		} else $offset = '+00:00';
526 
+		} else {
527 
+			$offset = '+00:00';
528 
+		}
478 529
479 530 
 		if ($globalDBdriver == 'mysql') {
480 531 
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date
 
@@ -704,9 +755,15 @@  discard block
 
 block discarded – undo
704 755 
             		$latitude = 0;
705 756 
             		$longitude = 0;
706 757 
             	}
707 
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
708 
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
709 
-                if ($arrival_date == '') $arrival_date = NULL;
758 
+                if ($heading == '' || $Common->isInteger($heading) === false) {
759 
+                	$heading = 0;
760 
+                }
761 
+                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) {
762 
+                	$groundspeed = 0;
763 
+                }
764 
+                if ($arrival_date == '') {
765 
+                	$arrival_date = NULL;
766 
+                }
710 767 
 		$query  = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date)
711 768 
 		    VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)";
712 769 
 
@@ -814,7 +871,9 @@  discard block
 
 block discarded – undo
814 871 
 		global $globalDBdriver, $globalArchive;
815 872 
 		//$filter_query = $this->getFilter($filters,true,true);
816 873 
 		$Connection= new Connection($this->db);
817 
-		if (!$Connection->tableExists('countries')) return array();
874 
+		if (!$Connection->tableExists('countries')) {
875 
+			return array();
876 
+		}
818 877 
 		require_once('class.SpotterLive.php');
819 878 
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
820 879 
 			$MarineLive = new MarineLive($this->db);
 
@@ -858,7 +917,9 @@  discard block
 
 block discarded – undo
858 917 
 			$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT fammarine_id,over_country FROM marine_archive".$filter_query.") l ON c.iso2 = l.over_country ";
859 918 
 		}
860 919 
 		$query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC";
861 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
920 
+		if ($limit) {
921 
+			$query .= " LIMIT 10 OFFSET 0";
922 
+		}
862 923
863 924 
 		$sth = $this->db->prepare($query);
864 925 
 		$sth->execute();
 
@@ -892,12 +953,18 @@  discard block
 
 block discarded – undo
892 953 
 		$query  = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count
893 954 
                     FROM marine_output".$filter_query." marine_output.ident <> ''";
894 955 
 		 if ($olderthanmonths > 0) {
895 
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
896 
-			else $query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
956 
+			if ($globalDBdriver == 'mysql') {
957 
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
958 
+			} else {
959 
+				$query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
960 
+			}
897 961 
 		}
898 962 
 		if ($sincedate != '') {
899 
-			if ($globalDBdriver == 'mysql') $query .= " AND marine_output.date > '".$sincedate."'";
900 
-			else $query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
963 
+			if ($globalDBdriver == 'mysql') {
964 
+				$query .= " AND marine_output.date > '".$sincedate."'";
965 
+			} else {
966 
+				$query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
967 
+			}
901 968 
 		}
902 969 
 		$query_values = array();
903 970 
 		if ($year != '') {
 
@@ -928,7 +995,9 @@  discard block
 
 block discarded – undo
928 995 
 			}
929 996 
 		}
930 997 
 		$query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC";
931 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
998 
+		if ($limit) {
999 
+			$query .= " LIMIT 10 OFFSET 0";
1000 
+		}
932 1001
933 1002 
 		$sth = $this->db->prepare($query);
934 1003 
 		$sth->execute($query_values);
 
@@ -963,7 +1032,9 @@  discard block
 
 block discarded – undo
963 1032 
 			date_default_timezone_set($globalTimezone);
964 1033 
 			$datetime = new DateTime();
965 1034 
 			$offset = $datetime->format('P');
966 
-		} else $offset = '+00:00';
1035 
+		} else {
1036 
+			$offset = '+00:00';
1037 
+		}
967 1038
968 1039 
 		if ($globalDBdriver == 'mysql') {
969 1040 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1013,7 +1084,9 @@  discard block
 
 block discarded – undo
1013 1084 
 			date_default_timezone_set($globalTimezone);
1014 1085 
 			$datetime = new DateTime();
1015 1086 
 			$offset = $datetime->format('P');
1016 
-		} else $offset = '+00:00';
1087 
+		} else {
1088 
+			$offset = '+00:00';
1089 
+		}
1017 1090 
 		$filter_query = $this->getFilter($filters,true,true);
1018 1091 
 		if ($globalDBdriver == 'mysql') {
1019 1092 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1059,7 +1132,9 @@  discard block
 
 block discarded – undo
1059 1132 
 			date_default_timezone_set($globalTimezone);
1060 1133 
 			$datetime = new DateTime();
1061 1134 
 			$offset = $datetime->format('P');
1062 
-		} else $offset = '+00:00';
1135 
+		} else {
1136 
+			$offset = '+00:00';
1137 
+		}
1063 1138 
 		$filter_query = $this->getFilter($filters,true,true);
1064 1139 
 		if ($globalDBdriver == 'mysql') {
1065 1140 
 			$query  = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1107,7 +1182,9 @@  discard block
 
 block discarded – undo
1107 1182 
 			date_default_timezone_set($globalTimezone);
1108 1183 
 			$datetime = new DateTime();
1109 1184 
 			$offset = $datetime->format('P');
1110 
-		} else $offset = '+00:00';
1185 
+		} else {
1186 
+			$offset = '+00:00';
1187 
+		}
1111 1188
1112 1189 
 		if ($globalDBdriver == 'mysql') {
1113 1190 
 			$query  = "SELECT YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
 
@@ -1156,7 +1233,9 @@  discard block
 
 block discarded – undo
1156 1233 
 			date_default_timezone_set($globalTimezone);
1157 1234 
 			$datetime = new DateTime();
1158 1235 
 			$offset = $datetime->format('P');
1159 
-		} else $offset = '+00:00';
1236 
+		} else {
1237 
+			$offset = '+00:00';
1238 
+		}
1160 1239 
 		$filter_query = $this->getFilter($filters,true,true);
1161 1240 
 		if ($globalDBdriver == 'mysql') {
1162 1241 
 			$query  = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
 
@@ -1205,7 +1284,9 @@  discard block
 
 block discarded – undo
1205 1284 
 			date_default_timezone_set($globalTimezone);
1206 1285 
 			$datetime = new DateTime();
1207 1286 
 			$offset = $datetime->format('P');
1208 
-		} else $offset = '+00:00';
1287 
+		} else {
1288 
+			$offset = '+00:00';
1289 
+		}
1209 1290
1210 1291 
 		$orderby_sql = '';
1211 1292 
 		if ($orderby == "hour")
 
@@ -1274,7 +1355,9 @@  discard block
 
 block discarded – undo
1274 1355 
 			date_default_timezone_set($globalTimezone);
1275 1356 
 			$datetime = new DateTime($date);
1276 1357 
 			$offset = $datetime->format('P');
1277 
-		} else $offset = '+00:00';
1358 
+		} else {
1359 
+			$offset = '+00:00';
1360 
+		}
1278 1361
1279 1362 
 		if ($globalDBdriver == 'mysql') {
1280 1363 
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1322,7 +1405,9 @@  discard block
 
 block discarded – undo
1322 1405 
 			date_default_timezone_set($globalTimezone);
1323 1406 
 			$datetime = new DateTime();
1324 1407 
 			$offset = $datetime->format('P');
1325 
-		} else $offset = '+00:00';
1408 
+		} else {
1409 
+			$offset = '+00:00';
1410 
+		}
1326 1411
1327 1412 
 		if ($globalDBdriver == 'mysql') {
1328 1413 
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1387,8 +1472,11 @@  discard block
 
 block discarded – undo
1387 1472 
 				$query_values = array_merge($query_values,array(':month' => $month));
1388 1473 
 			}
1389 1474 
 		}
1390 
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1391 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1475 
+		if (empty($query_values)) {
1476 
+			$queryi .= $this->getFilter($filters);
1477 
+		} else {
1478 
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
1479 
+		}
1392 1480
1393 1481 
 		$sth = $this->db->prepare($queryi);
1394 1482 
 		$sth->execute($query_values);
 
@@ -1425,8 +1513,11 @@  discard block
 
 block discarded – undo
1425 1513 
 				$query_values = array_merge($query_values,array(':month' => $month));
1426 1514 
 			}
1427 1515 
 		}
1428 
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1429 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1516 
+		if (empty($query_values)) {
1517 
+			$queryi .= $this->getFilter($filters);
1518 
+		} else {
1519 
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
1520 
+		}
1430 1521
1431 1522 
 		$sth = $this->db->prepare($queryi);
1432 1523 
 		$sth->execute($query_values);
 
@@ -1448,7 +1539,9 @@  discard block
 
 block discarded – undo
1448 1539 
 			date_default_timezone_set($globalTimezone);
1449 1540 
 			$datetime = new DateTime();
1450 1541 
 			$offset = $datetime->format('P');
1451 
-		} else $offset = '+00:00';
1542 
+		} else {
1543 
+			$offset = '+00:00';
1544 
+		}
1452 1545
1453 1546 
 		if ($globalDBdriver == 'mysql') {
1454 1547 
 			$query  = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1552,7 +1645,9 @@  discard block
 
 block discarded – undo
1552 1645 
 	*/
1553 1646 
 	public function parseDirection($direction = 0)
1554 1647 
 	{
1555 
-		if ($direction == '') $direction = 0;
1648 
+		if ($direction == '') {
1649 
+			$direction = 0;
1650 
+		}
1556 1651 
 		$direction_array = array();
1557 1652 
 		$temp_array = array();
1558 1653 
 
@@ -1641,7 +1736,9 @@  discard block
 
 block discarded – undo
1641 1736 
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1642 1737
1643 1738 
 		$Connection = new Connection($this->db);
1644 
-		if (!$Connection->tableExists('countries')) return '';
1739 
+		if (!$Connection->tableExists('countries')) {
1740 
+			return '';
1741 
+		}
1645 1742
1646 1743 
 		try {
1647 1744 
 			/*
 
@@ -1661,9 +1758,13 @@  discard block
 
 block discarded – undo
1661 1758 
 			$sth->closeCursor();
1662 1759 
 			if (count($row) > 0) {
1663 1760 
 				return $row;
1664 
-			} else return '';
1761 
+			} else {
1762 
+				return '';
1763 
+			}
1665 1764 
 		} catch (PDOException $e) {
1666 
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
1765 
+			if (isset($globalDebug) && $globalDebug) {
1766 
+				echo 'Error : '.$e->getMessage()."\n";
1767 
+			}
1667 1768 
 			return '';
1668 1769 
 		}
1669 1770 
 	
@@ -1681,7 +1782,9 @@  discard block
 
 block discarded – undo
1681 1782 
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
1682 1783
1683 1784 
 		$Connection = new Connection($this->db);
1684 
-		if (!$Connection->tableExists('countries')) return '';
1785 
+		if (!$Connection->tableExists('countries')) {
1786 
+			return '';
1787 
+		}
1685 1788
1686 1789 
 		try {
1687 1790 
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
 
@@ -1693,9 +1796,13 @@  discard block
 
 block discarded – undo
1693 1796 
 			$sth->closeCursor();
1694 1797 
 			if (count($row) > 0) {
1695 1798 
 				return $row;
1696 
-			} else return '';
1799 
+			} else {
1800 
+				return '';
1801 
+			}
1697 1802 
 		} catch (PDOException $e) {
1698 
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
1803 
+			if (isset($globalDebug) && $globalDebug) {
1804 
+				echo 'Error : '.$e->getMessage()."\n";
1805 
+			}
1699 1806 
 			return '';
1700 1807 
 		}
1701 1808 
 	
@@ -1713,7 +1820,9 @@  discard block
 
 block discarded – undo
1713 1820 
 	{
1714 1821 
 		global $globalBitlyAccessToken;
1715 1822
1716 
-		if ($globalBitlyAccessToken == '') return $url;
1823 
+		if ($globalBitlyAccessToken == '') {
1824 
+			return $url;
1825 
+		}
1717 1826
1718 1827 
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
1719 1828 
 		
@@ -1789,7 +1898,9 @@  discard block
 
 block discarded – undo
1789 1898 
 			}
1790 1899 
 		}
1791 1900 
 		$query .= " GROUP BY marine_output.type ORDER BY marine_type_count DESC";
1792 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
1901 
+		if ($limit) {
1902 
+			$query .= " LIMIT 10 OFFSET 0";
1903 
+		}
1793 1904 
 		$sth = $this->db->prepare($query);
1794 1905 
 		$sth->execute($query_values);
1795 1906 
 		$marine_array = array();
 
@@ -1826,9 +1937,15 @@  discard block
 
 block discarded – undo
1826 1937 
 				foreach ($q_array as $q_item){
1827 1938 
 					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
1828 1939 
 					$additional_query .= " AND (";
1829 
-					if (is_int($q_item)) $additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
1830 
-					if (is_int($q_item)) $additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
1831 
-					if (is_int($q_item)) $additional_query .= "(marine_output.imo = '".$q_item."') OR ";
1940 
+					if (is_int($q_item)) {
1941 
+						$additional_query .= "(marine_output.marine_id = '".$q_item."') OR ";
1942 
+					}
1943 
+					if (is_int($q_item)) {
1944 
+						$additional_query .= "(marine_output.mmsi = '".$q_item."') OR ";
1945 
+					}
1946 
+					if (is_int($q_item)) {
1947 
+						$additional_query .= "(marine_output.imo = '".$q_item."') OR ";
1948 
+					}
1832 1949 
 					$additional_query .= "(marine_output.ident like '%".$q_item."%') OR ";
1833 1950 
 					$additional_query .= ")";
1834 1951 
 				}
 
@@ -1876,7 +1993,9 @@  discard block
 
 block discarded – undo
1876 1993 
 				date_default_timezone_set($globalTimezone);
1877 1994 
 				$datetime = new DateTime();
1878 1995 
 				$offset = $datetime->format('P');
1879 
-			} else $offset = '+00:00';
1996 
+			} else {
1997 
+				$offset = '+00:00';
1998 
+			}
1880 1999 
 			if ($date_array[1] != "")
1881 2000 
 			{
1882 2001 
 				$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
 
@@ -1903,8 +2022,12 @@  discard block
 
 block discarded – undo
1903 2022 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1904 2023 
 			{
1905 2024 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
1906 
-			} else $limit_query = "";
1907 
-		} else $limit_query = "";
2025 
+			} else {
2026 
+				$limit_query = "";
2027 
+			}
2028 
+		} else {
2029 
+			$limit_query = "";
2030 
+		}
1908 2031 
 		if ($sort != "")
1909 2032 
 		{
1910 2033 
 			$search_orderby_array = $this->getOrderBy();
Please login to merge, or discard this patch.
require/class.Tracker.php 2 patches
Spacing   +176 added lines, -176 removed lines patch added patch discarded remove patch 
@@ -4,7 +4,7 @@  discard block
 
 block discarded – undo
4 4 
 require_once(dirname(__FILE__).'/class.Image.php');
5 5 
 $global_query = "SELECT tracker_output.* FROM tracker_output";
6 6
7 
-class Tracker{
7 
+class Tracker {
8 8 
 	public $db;
9 9
10 10 
 	public function __construct($dbc = null) {
 
@@ -19,33 +19,33 @@  discard block
 
 block discarded – undo
19 19 
 	* @return Array the SQL part
20 20 
 	*/
21 21
22 
-	public function getFilter($filter = array(),$where = false,$and = false) {
22 
+	public function getFilter($filter = array(), $where = false, $and = false) {
23 23 
 		global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver;
24 24 
 		$filters = array();
25 25 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
26 26 
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
27 27 
 				$filters = $globalStatsFilters[$globalFilterName];
28 28 
 			} else {
29 
-				$filter = array_merge($filter,$globalStatsFilters[$globalFilterName]);
29 
+				$filter = array_merge($filter, $globalStatsFilters[$globalFilterName]);
30 30 
 			}
31 31 
 		}
32 32 
 		if (isset($filter[0]['source'])) {
33 
-			$filters = array_merge($filters,$filter);
33 
+			$filters = array_merge($filters, $filter);
34 34 
 		}
35 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
35 
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
36 36 
 		$filter_query_join = '';
37 37 
 		$filter_query_where = '';
38 
-		foreach($filters as $flt) {
38 
+		foreach ($filters as $flt) {
39 39 
 			if (isset($flt['idents']) && !empty($flt['idents'])) {
40 40 
 				if (isset($flt['source'])) {
41 
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."') AND tracker_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
41 
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."') AND tracker_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
42 42 
 				} else {
43 
-					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
43 
+					$filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid";
44 44 
 				}
45 45 
 			}
46 46 
 		}
47 47 
 		if (isset($filter['source']) && !empty($filter['source'])) {
48 
-			$filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')";
48 
+			$filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')";
49 49 
 		}
50 50 
 		if (isset($filter['ident']) && !empty($filter['ident'])) {
51 51 
 			$filter_query_where .= " AND ident = '".$filter['ident']."'";
 
@@ -74,7 +74,7 @@  discard block
 
 block discarded – undo
74 74 
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
75 75 
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
76 76 
 		if ($filter_query_where != '') {
77 
-			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
77 
+			$filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where);
78 78 
 		}
79 79 
 		$filter_query = $filter_query_join.$filter_query_where;
80 80 
 		return $filter_query;
 
@@ -89,7 +89,7 @@  discard block
 
 block discarded – undo
89 89 
 	* @return Array the tracker information
90 90 
 	*
91 91 
 	*/
92 
-	public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false)
92 
+	public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false)
93 93 
 	{
94 94 
 		date_default_timezone_set('UTC');
95 95 
 		if (!is_string($query))
 
@@ -109,13 +109,13 @@  discard block
 
 block discarded – undo
109 109 
 			$sth = $this->db->prepare($query.$limitQuery);
110 110 
 			$sth->execute($params);
111 111 
 		} catch (PDOException $e) {
112 
-			printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery);
112 
+			printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery);
113 113 
 			exit();
114 114 
 		}
115 115
116 116 
 		$num_rows = 0;
117 117 
 		$tracker_array = array();
118 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
118 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
119 119 
 		{
120 120 
 			$num_rows++;
121 121 
 			$temp_array = array();
 
@@ -171,17 +171,17 @@  discard block
 
 block discarded – undo
171 171 
 				{
172 172 
 					$temp_array['date'] = "about ".$dateArray['hours']." hours ago";
173 173 
 				} else {
174 
-					$temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC"));
174 
+					$temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC"));
175 175 
 				}
176 176 
 				$temp_array['date_minutes_past'] = $dateArray['minutes'];
177 
-				$temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC"));
178 
-				$temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC"));
177 
+				$temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC"));
178 
+				$temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC"));
179 179 
 				$temp_array['date_unix'] = strtotime($row['date']." UTC");
180 180 
 				if (isset($row['last_seen']) && $row['last_seen'] != '') {
181 181 
 					if (strtotime($row['last_seen']) > strtotime($row['date'])) {
182 182 
 						$temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']);
183 
-						$temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC"));
184 
-						$temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC"));
183 
+						$temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC"));
184 
+						$temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC"));
185 185 
 						$temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC");
186 186 
 					}
187 187 
 				}
 
@@ -218,8 +218,8 @@  discard block
 
 block discarded – undo
218 218 
 		{
219 219 
 			$limit_array = explode(",", $limit);
220 220
221 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
222 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
221 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
222 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
223 223
224 224 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
225 225 
 			{
 
@@ -236,9 +236,9 @@  discard block
 
 block discarded – undo
236 236 
 			$orderby_query = " ORDER BY tracker_output.date DESC";
237 237 
 		}
238 238
239 
-		$query  = $global_query.$filter_query." ".$orderby_query;
239 
+		$query = $global_query.$filter_query." ".$orderby_query;
240 240
241 
-		$tracker_array = $this->getDataFromDB($query, array(),$limit_query,true);
241 
+		$tracker_array = $this->getDataFromDB($query, array(), $limit_query, true);
242 242
243 243 
 		return $tracker_array;
244 244 
 	}
 
@@ -257,8 +257,8 @@  discard block
 
 block discarded – undo
257 257 
 		if ($id == '') return array();
258 258 
 		$additional_query = "tracker_output.famtrackid = :id";
259 259 
 		$query_values = array(':id' => $id);
260 
-		$query  = $global_query." WHERE ".$additional_query." ";
261 
-		$tracker_array = $this->getDataFromDB($query,$query_values);
260 
+		$query = $global_query." WHERE ".$additional_query." ";
261 
+		$tracker_array = $this->getDataFromDB($query, $query_values);
262 262 
 		return $tracker_array;
263 263 
 	}
264 264 
 
@@ -277,7 +277,7 @@  discard block
 
 block discarded – undo
277 277 
 		$query_values = array();
278 278 
 		$limit_query = '';
279 279 
 		$additional_query = '';
280 
-		$filter_query = $this->getFilter($filter,true,true);
280 
+		$filter_query = $this->getFilter($filter, true, true);
281 281 
 		if ($ident != "")
282 282 
 		{
283 283 
 			if (!is_string($ident))
 
@@ -293,8 +293,8 @@  discard block
 
 block discarded – undo
293 293 
 		{
294 294 
 			$limit_array = explode(",", $limit);
295 295
296 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
297 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
296 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
297 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
298 298
299 299 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
300 300 
 			{
 
@@ -318,7 +318,7 @@  discard block
 
 block discarded – undo
318 318 
 		return $tracker_array;
319 319 
 	}
320 320
321 
-	public function getTrackerDataByDate($date = '', $limit = '', $sort = '',$filter = array())
321 
+	public function getTrackerDataByDate($date = '', $limit = '', $sort = '', $filter = array())
322 322 
 	{
323 323 
 		global $global_query, $globalTimezone, $globalDBdriver;
324 324 
 		
@@ -326,7 +326,7 @@  discard block
 
 block discarded – undo
326 326 
 		$limit_query = '';
327 327 
 		$additional_query = '';
328 328
329 
-		$filter_query = $this->getFilter($filter,true,true);
329 
+		$filter_query = $this->getFilter($filter, true, true);
330 330
331 331 
 		if ($date != "")
332 332 
 		{
 
@@ -352,8 +352,8 @@  discard block
 
 block discarded – undo
352 352 
 		{
353 353 
 			$limit_array = explode(",", $limit);
354 354
355 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
356 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
355 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
356 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
357 357
358 358 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
359 359 
 			{
 
@@ -384,11 +384,11 @@  discard block
 
 block discarded – undo
384 384 
 	* @return Array list of source name
385 385 
 	*
386 386 
 	*/
387 
-	public function getAllSourceName($type = '',$filters = array())
387 
+	public function getAllSourceName($type = '', $filters = array())
388 388 
 	{
389 
-		$filter_query = $this->getFilter($filters,true,true);
389 
+		$filter_query = $this->getFilter($filters, true, true);
390 390 
 		$query_values = array();
391 
-		$query  = "SELECT DISTINCT tracker_output.source_name
391 
+		$query = "SELECT DISTINCT tracker_output.source_name
392 392 
 				FROM tracker_output".$filter_query." tracker_output.source_name <> ''";
393 393 
 		if ($type != '') {
394 394 
 			$query_values = array(':type' => $type);
 
@@ -403,7 +403,7 @@  discard block
 
 block discarded – undo
403 403 
 		$source_array = array();
404 404 
 		$temp_array = array();
405 405
406 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
406 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
407 407 
 		{
408 408 
 			$temp_array['source_name'] = $row['source_name'];
409 409 
 			$source_array[] = $temp_array;
 
@@ -420,8 +420,8 @@  discard block
 
 block discarded – undo
420 420 
 	*/
421 421 
 	public function getAllIdents($filters = array())
422 422 
 	{
423 
-		$filter_query = $this->getFilter($filters,true,true);
424 
-		$query  = "SELECT DISTINCT tracker_output.ident
423 
+		$filter_query = $this->getFilter($filters, true, true);
424 
+		$query = "SELECT DISTINCT tracker_output.ident
425 425 
 								FROM tracker_output".$filter_query." tracker_output.ident <> ''
426 426 
 								ORDER BY tracker_output.date ASC LIMIT 700 OFFSET 0";
427 427 
 
@@ -431,7 +431,7 @@  discard block
 
 block discarded – undo
431 431 
 		$ident_array = array();
432 432 
 		$temp_array = array();
433 433
434 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
434 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
435 435 
 		{
436 436 
 			$temp_array['ident'] = $row['ident'];
437 437 
 			$ident_array[] = $temp_array;
 
@@ -456,12 +456,12 @@  discard block
 
 block discarded – undo
456 456 
 		} else $offset = '+00:00';
457 457
458 458 
 		if ($globalDBdriver == 'mysql') {
459 
-			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
459 
+			$query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
460 460 
 								FROM tracker_output
461 461 
 								WHERE tracker_output.date <> ''
462 462 
 								ORDER BY tracker_output.date ASC LIMIT 0,100";
463 463 
 		} else {
464 
-			$query  = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
464 
+			$query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date
465 465 
 								FROM tracker_output
466 466 
 								WHERE tracker_output.date <> ''
467 467 
 								ORDER BY tracker_output.date ASC LIMIT 0,100";
 
@@ -473,7 +473,7 @@  discard block
 
 block discarded – undo
473 473 
 		$date_array = array();
474 474 
 		$temp_array = array();
475 475
476 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
476 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
477 477 
 		{
478 478 
 			$temp_array['date'] = $row['date'];
479 479 
 
@@ -492,11 +492,11 @@  discard block
 
 block discarded – undo
492 492 
 	* @return String success or false
493 493 
 	*
494 494 
 	*/
495 
-	public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL)
495 
+	public function updateIdentTrackerData($famtrackid = '', $ident = '', $fromsource = NULL)
496 496 
 	{
497 497
498 498 
 		$query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid';
499 
-                $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident);
499 
+                $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident);
500 500
501 501 
 		try {
502 502 
 			$sth = $this->db->prepare($query);
 
@@ -520,7 +520,7 @@  discard block
 
 block discarded – undo
520 520 
 	public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '')
521 521 
 	{
522 522 
 		$query = 'UPDATE tracker_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE famtrackid = :famtrackid';
523 
-                $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident);
523 
+                $query_values = array(':famtrackid' => $famtrackid, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident);
524 524
525 525 
 		try {
526 526 
 			$sth = $this->db->prepare($query);
 
@@ -560,7 +560,7 @@  discard block
 
 block discarded – undo
560 560 
 	* @param String $verticalrate vertival rate of flight
561 561 
 	* @return String success or false
562 562 
 	*/
563 
-	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '')
563 
+	public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '', $format_source = '', $source_name = '')
564 564 
 	{
565 565 
 		global $globalURL;
566 566 
 		
@@ -628,21 +628,21 @@  discard block
 
 block discarded – undo
628 628 
 		}
629 629
630 630
631 
-		if ($date == "" || strtotime($date) < time()-20*60)
631 
+		if ($date == "" || strtotime($date) < time() - 20*60)
632 632 
 		{
633 633 
 			$date = date("Y-m-d H:i:s", time());
634 634 
 		}
635 635
636 
-		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
637 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
638 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
639 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
640 
-		$altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
641 
-		$heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT);
642 
-		$groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
643 
-		$format_source = filter_var($format_source,FILTER_SANITIZE_STRING);
644 
-		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
645 
-		$type = filter_var($type,FILTER_SANITIZE_STRING);
636 
+		$famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING);
637 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
638 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
639 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
640 
+		$altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
641 
+		$heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT);
642 
+		$groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
643 
+		$format_source = filter_var($format_source, FILTER_SANITIZE_STRING);
644 
+		$comment = filter_var($comment, FILTER_SANITIZE_STRING);
645 
+		$type = filter_var($type, FILTER_SANITIZE_STRING);
646 646
647 647 
                 if ($latitude == '' && $longitude == '') {
648 648 
             		$latitude = 0;
 
@@ -650,10 +650,10 @@  discard block
 
 block discarded – undo
650 650 
             	}
651 651 
                 if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
652 652 
                 if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
653 
-                $query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type)
653 
+                $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type)
654 654 
                 VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)";
655 655
656 
-                $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type);
656 
+                $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':comment' => $comment, ':type' => $type);
657 657
658 658 
 		try {
659 659 
 		        
@@ -679,13 +679,13 @@  discard block
 
 block discarded – undo
679 679 
 	{
680 680 
 		global $globalDBdriver, $globalTimezone;
681 681 
 		if ($globalDBdriver == 'mysql') {
682 
-			$query  = "SELECT tracker_output.ident FROM tracker_output
682 
+			$query = "SELECT tracker_output.ident FROM tracker_output
683 683 
 								WHERE tracker_output.ident = :ident
684 684 
 								AND tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR)
685 685 
 								AND tracker_output.date < UTC_TIMESTAMP()";
686 686 
 			$query_data = array(':ident' => $ident);
687 687 
 		} else {
688 
-			$query  = "SELECT tracker_output.ident FROM tracker_output
688 
+			$query = "SELECT tracker_output.ident FROM tracker_output
689 689 
 								WHERE tracker_output.ident = :ident
690 690 
 								AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS'
691 691 
 								AND tracker_output.date < now() AT TIME ZONE 'UTC'";
 
@@ -694,8 +694,8 @@  discard block
 
 block discarded – undo
694 694
695 695 
 		$sth = $this->db->prepare($query);
696 696 
 		$sth->execute($query_data);
697 
-    		$ident_result='';
698 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
697 
+    		$ident_result = '';
698 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
699 699 
 		{
700 700 
 			$ident_result = $row['ident'];
701 701 
 		}
 
@@ -721,8 +721,8 @@  discard block
 
 block discarded – undo
721 721 
 				return false;
722 722 
 			} else {
723 723 
 				$q_array = explode(" ", $q);
724 
-				foreach ($q_array as $q_item){
725 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
724 
+				foreach ($q_array as $q_item) {
725 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
726 726 
 					$additional_query .= " AND (";
727 727 
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%')";
728 728 
 					$additional_query .= ")";
 
@@ -730,11 +730,11 @@  discard block
 
 block discarded – undo
730 730 
 			}
731 731 
 		}
732 732 
 		if ($globalDBdriver == 'mysql') {
733 
-			$query  = "SELECT tracker_output.* FROM tracker_output
733 
+			$query = "SELECT tracker_output.* FROM tracker_output
734 734 
 				WHERE tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query."
735 735 
 				AND tracker_output.date < UTC_TIMESTAMP()";
736 736 
 		} else {
737 
-			$query  = "SELECT tracker_output.* FROM tracker_output
737 
+			$query = "SELECT tracker_output.* FROM tracker_output
738 738 
 				WHERE tracker_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query."
739 739 
 				AND tracker_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'";
740 740 
 		}
 
@@ -748,16 +748,16 @@  discard block
 
 block discarded – undo
748 748 
 	* @return Array the airline country list
749 749 
 	*
750 750 
 	*/
751 
-	public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array())
751 
+	public function countAllTrackerOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array())
752 752 
 	{
753 753 
 		global $globalDBdriver, $globalArchive;
754 754 
 		//$filter_query = $this->getFilter($filters,true,true);
755 
-		$Connection= new Connection($this->db);
755 
+		$Connection = new Connection($this->db);
756 756 
 		if (!$Connection->tableExists('countries')) return array();
757 757 
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
758 758 
 			require_once('class.TrackerLive.php');
759 759 
 			$TrackerLive = new TrackerLive($this->db);
760 
-			$filter_query = $TrackerLive->getFilter($filters,true,true);
760 
+			$filter_query = $TrackerLive->getFilter($filters, true, true);
761 761 
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
762 762 
 			if ($olderthanmonths > 0) {
763 763 
 				if ($globalDBdriver == 'mysql') {
 
@@ -777,7 +777,7 @@  discard block
 
 block discarded – undo
777 777 
 		} else {
778 778 
 			require_once('class.TrackerArchive.php');
779 779 
 			$TrackerArchive = new TrackerArchive($this->db);
780 
-			$filter_query = $TrackerArchive->getFilter($filters,true,true);
780 
+			$filter_query = $TrackerArchive->getFilter($filters, true, true);
781 781 
 			$filter_query .= " over_country IS NOT NULL AND over_country <> ''";
782 782 
 			if ($olderthanmonths > 0) {
783 783 
 				if ($globalDBdriver == 'mysql') {
 
@@ -805,7 +805,7 @@  discard block
 
 block discarded – undo
805 805 
 		$flight_array = array();
806 806 
 		$temp_array = array();
807 807
808 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
808 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
809 809 
 		{
810 810 
 			$temp_array['tracker_count'] = $row['nb'];
811 811 
 			$temp_array['tracker_country'] = $row['name'];
 
@@ -822,11 +822,11 @@  discard block
 
 block discarded – undo
822 822 
 	* @return Array the callsign list
823 823 
 	*
824 824 
 	*/
825 
-	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '')
825 
+	public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
826 826 
 	{
827 827 
 		global $globalDBdriver;
828 
-		$filter_query = $this->getFilter($filters,true,true);
829 
-		$query  = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count
828 
+		$filter_query = $this->getFilter($filters, true, true);
829 
+		$query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count
830 830 
                     FROM tracker_output".$filter_query." tracker_output.ident <> ''";
831 831 
 		 if ($olderthanmonths > 0) {
832 832 
 			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
 
@@ -840,28 +840,28 @@  discard block
 
 block discarded – undo
840 840 
 		if ($year != '') {
841 841 
 			if ($globalDBdriver == 'mysql') {
842 842 
 				$query .= " AND YEAR(tracker_output.date) = :year";
843 
-				$query_values = array_merge($query_values,array(':year' => $year));
843 
+				$query_values = array_merge($query_values, array(':year' => $year));
844 844 
 			} else {
845 845 
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
846 
-				$query_values = array_merge($query_values,array(':year' => $year));
846 
+				$query_values = array_merge($query_values, array(':year' => $year));
847 847 
 			}
848 848 
 		}
849 849 
 		if ($month != '') {
850 850 
 			if ($globalDBdriver == 'mysql') {
851 851 
 				$query .= " AND MONTH(tracker_output.date) = :month";
852 
-				$query_values = array_merge($query_values,array(':month' => $month));
852 
+				$query_values = array_merge($query_values, array(':month' => $month));
853 853 
 			} else {
854 854 
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
855 
-				$query_values = array_merge($query_values,array(':month' => $month));
855 
+				$query_values = array_merge($query_values, array(':month' => $month));
856 856 
 			}
857 857 
 		}
858 858 
 		if ($day != '') {
859 859 
 			if ($globalDBdriver == 'mysql') {
860 860 
 				$query .= " AND DAY(tracker_output.date) = :day";
861 
-				$query_values = array_merge($query_values,array(':day' => $day));
861 
+				$query_values = array_merge($query_values, array(':day' => $day));
862 862 
 			} else {
863 863 
 				$query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day";
864 
-				$query_values = array_merge($query_values,array(':day' => $day));
864 
+				$query_values = array_merge($query_values, array(':day' => $day));
865 865 
 			}
866 866 
 		}
867 867 
 		$query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC";
 
@@ -873,7 +873,7 @@  discard block
 
 block discarded – undo
873 873 
 		$callsign_array = array();
874 874 
 		$temp_array = array();
875 875
876 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
876 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
877 877 
 		{
878 878 
 			$temp_array['callsign_icao'] = $row['ident'];
879 879 
 			$temp_array['airline_name'] = $row['airline_name'];
 
@@ -925,7 +925,7 @@  discard block
 
 block discarded – undo
925 925 
 		$date_array = array();
926 926 
 		$temp_array = array();
927 927
928 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
928 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
929 929 
 		{
930 930 
 			$temp_array['date_name'] = $row['date_name'];
931 931 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -951,7 +951,7 @@  discard block
 
 block discarded – undo
951 951 
 			$datetime = new DateTime();
952 952 
 			$offset = $datetime->format('P');
953 953 
 		} else $offset = '+00:00';
954 
-		$filter_query = $this->getFilter($filters,true,true);
954 
+		$filter_query = $this->getFilter($filters, true, true);
955 955 
 		if ($globalDBdriver == 'mysql') {
956 956 
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
957 957 
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)";
 
@@ -972,7 +972,7 @@  discard block
 
 block discarded – undo
972 972 
 		$date_array = array();
973 973 
 		$temp_array = array();
974 974
975 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
975 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
976 976 
 		{
977 977 
 			$temp_array['date_name'] = $row['date_name'];
978 978 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -997,7 +997,7 @@  discard block
 
 block discarded – undo
997 997 
 			$datetime = new DateTime();
998 998 
 			$offset = $datetime->format('P');
999 999 
 		} else $offset = '+00:00';
1000 
-		$filter_query = $this->getFilter($filters,true,true);
1000 
+		$filter_query = $this->getFilter($filters, true, true);
1001 1001 
 		if ($globalDBdriver == 'mysql') {
1002 1002 
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
1003 1003 
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)";
 
@@ -1018,7 +1018,7 @@  discard block
 
 block discarded – undo
1018 1018 
 		$date_array = array();
1019 1019 
 		$temp_array = array();
1020 1020
1021 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1021 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1022 1022 
 		{
1023 1023 
 			$temp_array['date_name'] = $row['date_name'];
1024 1024 
 			$temp_array['date_count'] = $row['date_count'];
 
@@ -1065,7 +1065,7 @@  discard block
 
 block discarded – undo
1065 1065 
 		$date_array = array();
1066 1066 
 		$temp_array = array();
1067 1067
1068 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1068 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1069 1069 
 		{
1070 1070 
 			$temp_array['month_name'] = $row['month_name'];
1071 1071 
 			$temp_array['year_name'] = $row['year_name'];
 
@@ -1094,7 +1094,7 @@  discard block
 
 block discarded – undo
1094 1094 
 			$datetime = new DateTime();
1095 1095 
 			$offset = $datetime->format('P');
1096 1096 
 		} else $offset = '+00:00';
1097 
-		$filter_query = $this->getFilter($filters,true,true);
1097 
+		$filter_query = $this->getFilter($filters, true, true);
1098 1098 
 		if ($globalDBdriver == 'mysql') {
1099 1099 
 			$query  = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
1100 1100 
 								FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)";
 
@@ -1115,7 +1115,7 @@  discard block
 
 block discarded – undo
1115 1115 
 		$date_array = array();
1116 1116 
 		$temp_array = array();
1117 1117
1118 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1118 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1119 1119 
 		{
1120 1120 
 			$temp_array['year_name'] = $row['year_name'];
1121 1121 
 			$temp_array['month_name'] = $row['month_name'];
 
@@ -1135,7 +1135,7 @@  discard block
 
 block discarded – undo
1135 1135 
 	* @return Array the hour list
1136 1136 
 	*
1137 1137 
 	*/
1138 
-	public function countAllHours($orderby,$filters = array())
1138 
+	public function countAllHours($orderby, $filters = array())
1139 1139 
 	{
1140 1140 
 		global $globalTimezone, $globalDBdriver;
1141 1141 
 		if ($globalTimezone != '') {
 
@@ -1183,7 +1183,7 @@  discard block
 
 block discarded – undo
1183 1183 
 		$hour_array = array();
1184 1184 
 		$temp_array = array();
1185 1185
1186 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1186 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1187 1187 
 		{
1188 1188 
 			$temp_array['hour_name'] = $row['hour_name'];
1189 1189 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1205,8 +1205,8 @@  discard block
 
 block discarded – undo
1205 1205 
 	public function countAllHoursByDate($date, $filters = array())
1206 1206 
 	{
1207 1207 
 		global $globalTimezone, $globalDBdriver;
1208 
-		$filter_query = $this->getFilter($filters,true,true);
1209 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
1208 
+		$filter_query = $this->getFilter($filters, true, true);
1209 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
1210 1210 
 		if ($globalTimezone != '') {
1211 1211 
 			date_default_timezone_set($globalTimezone);
1212 1212 
 			$datetime = new DateTime($date);
 
@@ -1214,12 +1214,12 @@  discard block
 
 block discarded – undo
1214 1214 
 		} else $offset = '+00:00';
1215 1215
1216 1216 
 		if ($globalDBdriver == 'mysql') {
1217 
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1217 
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1218 1218 
 								FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = :date
1219 1219 
 								GROUP BY hour_name
1220 1220 
 								ORDER BY hour_name ASC";
1221 1221 
 		} else {
1222 
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1222 
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1223 1223 
 								FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date
1224 1224 
 								GROUP BY hour_name
1225 1225 
 								ORDER BY hour_name ASC";
 
@@ -1231,7 +1231,7 @@  discard block
 
 block discarded – undo
1231 1231 
 		$hour_array = array();
1232 1232 
 		$temp_array = array();
1233 1233
1234 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1234 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1235 1235 
 		{
1236 1236 
 			$temp_array['hour_name'] = $row['hour_name'];
1237 1237 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1253,8 +1253,8 @@  discard block
 
 block discarded – undo
1253 1253 
 	public function countAllHoursByIdent($ident, $filters = array())
1254 1254 
 	{
1255 1255 
 		global $globalTimezone, $globalDBdriver;
1256 
-		$filter_query = $this->getFilter($filters,true,true);
1257 
-		$ident = filter_var($ident,FILTER_SANITIZE_STRING);
1256 
+		$filter_query = $this->getFilter($filters, true, true);
1257 
+		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
1258 1258 
 		if ($globalTimezone != '') {
1259 1259 
 			date_default_timezone_set($globalTimezone);
1260 1260 
 			$datetime = new DateTime();
 
@@ -1262,12 +1262,12 @@  discard block
 
 block discarded – undo
1262 1262 
 		} else $offset = '+00:00';
1263 1263
1264 1264 
 		if ($globalDBdriver == 'mysql') {
1265 
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1265 
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1266 1266 
 								FROM tracker_output".$filter_query." tracker_output.ident = :ident
1267 1267 
 								GROUP BY hour_name
1268 1268 
 								ORDER BY hour_name ASC";
1269 1269 
 		} else {
1270 
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1270 
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1271 1271 
 								FROM tracker_output".$filter_query." tracker_output.ident = :ident
1272 1272 
 								GROUP BY hour_name
1273 1273 
 								ORDER BY hour_name ASC";
 
@@ -1275,12 +1275,12 @@  discard block
 
 block discarded – undo
1275 1275
1276 1276
1277 1277 
 		$sth = $this->db->prepare($query);
1278 
-		$sth->execute(array(':ident' => $ident,':offset' => $offset));
1278 
+		$sth->execute(array(':ident' => $ident, ':offset' => $offset));
1279 1279
1280 1280 
 		$hour_array = array();
1281 1281 
 		$temp_array = array();
1282 1282
1283 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1283 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1284 1284 
 		{
1285 1285 
 			$temp_array['hour_name'] = $row['hour_name'];
1286 1286 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1299,33 +1299,33 @@  discard block
 
 block discarded – undo
1299 1299 
 	* @return Integer the number of trackers
1300 1300 
 	*
1301 1301 
 	*/
1302 
-	public function countOverallTracker($filters = array(),$year = '',$month = '')
1302 
+	public function countOverallTracker($filters = array(), $year = '', $month = '')
1303 1303 
 	{
1304 1304 
 		global $globalDBdriver;
1305 1305 
 		//$queryi  = "SELECT COUNT(tracker_output.tracker_id) AS flight_count FROM tracker_output";
1306 
-		$queryi  = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output";
1306 
+		$queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output";
1307 1307 
 		$query_values = array();
1308 1308 
 		$query = '';
1309 1309 
 		if ($year != '') {
1310 1310 
 			if ($globalDBdriver == 'mysql') {
1311 1311 
 				$query .= " AND YEAR(tracker_output.date) = :year";
1312 
-				$query_values = array_merge($query_values,array(':year' => $year));
1312 
+				$query_values = array_merge($query_values, array(':year' => $year));
1313 1313 
 			} else {
1314 1314 
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
1315 
-				$query_values = array_merge($query_values,array(':year' => $year));
1315 
+				$query_values = array_merge($query_values, array(':year' => $year));
1316 1316 
 			}
1317 1317 
 		}
1318 1318 
 		if ($month != '') {
1319 1319 
 			if ($globalDBdriver == 'mysql') {
1320 1320 
 				$query .= " AND MONTH(tracker_output.date) = :month";
1321 
-				$query_values = array_merge($query_values,array(':month' => $month));
1321 
+				$query_values = array_merge($query_values, array(':month' => $month));
1322 1322 
 			} else {
1323 1323 
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
1324 
-				$query_values = array_merge($query_values,array(':month' => $month));
1324 
+				$query_values = array_merge($query_values, array(':month' => $month));
1325 1325 
 			}
1326 1326 
 		}
1327 1327 
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1328 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1328 
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
1329 1329
1330 1330 
 		$sth = $this->db->prepare($queryi);
1331 1331 
 		$sth->execute($query_values);
 
@@ -1338,32 +1338,32 @@  discard block
 
 block discarded – undo
1338 1338 
 	* @return Integer the number of flights
1339 1339 
 	*
1340 1340 
 	*/
1341 
-	public function countOverallTrackerTypes($filters = array(),$year = '',$month = '')
1341 
+	public function countOverallTrackerTypes($filters = array(), $year = '', $month = '')
1342 1342 
 	{
1343 1343 
 		global $globalDBdriver;
1344 
-		$queryi  = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output";
1344 
+		$queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output";
1345 1345 
 		$query_values = array();
1346 1346 
 		$query = '';
1347 1347 
 		if ($year != '') {
1348 1348 
 			if ($globalDBdriver == 'mysql') {
1349 1349 
 				$query .= " AND YEAR(tracker_output.date) = :year";
1350 
-				$query_values = array_merge($query_values,array(':year' => $year));
1350 
+				$query_values = array_merge($query_values, array(':year' => $year));
1351 1351 
 			} else {
1352 1352 
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
1353 
-				$query_values = array_merge($query_values,array(':year' => $year));
1353 
+				$query_values = array_merge($query_values, array(':year' => $year));
1354 1354 
 			}
1355 1355 
 		}
1356 1356 
 		if ($month != '') {
1357 1357 
 			if ($globalDBdriver == 'mysql') {
1358 1358 
 				$query .= " AND MONTH(tracker_output.date) = :month";
1359 
-				$query_values = array_merge($query_values,array(':month' => $month));
1359 
+				$query_values = array_merge($query_values, array(':month' => $month));
1360 1360 
 			} else {
1361 1361 
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
1362 
-				$query_values = array_merge($query_values,array(':month' => $month));
1362 
+				$query_values = array_merge($query_values, array(':month' => $month));
1363 1363 
 			}
1364 1364 
 		}
1365 1365 
 		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1366 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1366 
+		else $queryi .= $this->getFilter($filters, true, true).substr($query, 4);
1367 1367
1368 1368 
 		$sth = $this->db->prepare($queryi);
1369 1369 
 		$sth->execute($query_values);
 
@@ -1380,7 +1380,7 @@  discard block
 
 block discarded – undo
1380 1380 
 	public function countAllHoursFromToday($filters = array())
1381 1381 
 	{
1382 1382 
 		global $globalTimezone, $globalDBdriver;
1383 
-		$filter_query = $this->getFilter($filters,true,true);
1383 
+		$filter_query = $this->getFilter($filters, true, true);
1384 1384 
 		if ($globalTimezone != '') {
1385 1385 
 			date_default_timezone_set($globalTimezone);
1386 1386 
 			$datetime = new DateTime();
 
@@ -1388,12 +1388,12 @@  discard block
 
 block discarded – undo
1388 1388 
 		} else $offset = '+00:00';
1389 1389
1390 1390 
 		if ($globalDBdriver == 'mysql') {
1391 
-			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1391 
+			$query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
1392 1392 
 								FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = CURDATE()
1393 1393 
 								GROUP BY hour_name
1394 1394 
 								ORDER BY hour_name ASC";
1395 1395 
 		} else {
1396 
-			$query  = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1396 
+			$query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count
1397 1397 
 								FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date)
1398 1398 
 								GROUP BY hour_name
1399 1399 
 								ORDER BY hour_name ASC";
 
@@ -1405,7 +1405,7 @@  discard block
 
 block discarded – undo
1405 1405 
 		$hour_array = array();
1406 1406 
 		$temp_array = array();
1407 1407
1408 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1408 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1409 1409 
 		{
1410 1410 
 			$temp_array['hour_name'] = $row['hour_name'];
1411 1411 
 			$temp_array['hour_count'] = $row['hour_count'];
 
@@ -1424,9 +1424,9 @@  discard block
 
 block discarded – undo
1424 1424 
 	*/
1425 1425 
 	public function getTrackerIDBasedOnFamTrackID($famtrackid)
1426 1426 
 	{
1427 
-		$famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING);
1427 
+		$famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING);
1428 1428
1429 
-		$query  = "SELECT tracker_output.tracker_id
1429 
+		$query = "SELECT tracker_output.tracker_id
1430 1430 
 				FROM tracker_output
1431 1431 
 				WHERE tracker_output.famtrackid = '".$famtrackid."'";
1432 1432 
         
@@ -1434,7 +1434,7 @@  discard block
 
 block discarded – undo
1434 1434 
 		$sth = $this->db->prepare($query);
1435 1435 
 		$sth->execute();
1436 1436
1437 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1437 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1438 1438 
 		{
1439 1439 
 			return $row['tracker_id'];
1440 1440 
 		}
 
@@ -1459,23 +1459,23 @@  discard block
 
 block discarded – undo
1459 1459 
 		}
1460 1460
1461 1461 
 		$current_date = date("Y-m-d H:i:s");
1462 
-		$date = date("Y-m-d H:i:s",strtotime($dateString." UTC"));
1462 
+		$date = date("Y-m-d H:i:s", strtotime($dateString." UTC"));
1463 1463
1464 1464 
 		$diff = abs(strtotime($current_date) - strtotime($date));
1465 1465
1466 
-		$time_array['years'] = floor($diff / (365*60*60*24));
1466 
+		$time_array['years'] = floor($diff/(365*60*60*24));
1467 1467 
 		$years = $time_array['years'];
1468 1468
1469 
-		$time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24));
1469 
+		$time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24));
1470 1470 
 		$months = $time_array['months'];
1471 1471
1472 
-		$time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24));
1472 
+		$time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24));
1473 1473 
 		$days = $time_array['days'];
1474 
-		$time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60));
1474 
+		$time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60));
1475 1475 
 		$hours = $time_array['hours'];
1476 
-		$time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60);
1476 
+		$time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60);
1477 1477 
 		$minutes = $time_array['minutes'];
1478 
-		$time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));
1478 
+		$time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60));
1479 1479
1480 1480 
 		return $time_array;
1481 1481 
 	}
 
@@ -1498,63 +1498,63 @@  discard block
 
 block discarded – undo
1498 1498 
 			$temp_array['direction_degree'] = $direction;
1499 1499 
 			$temp_array['direction_shortname'] = "N";
1500 1500 
 			$temp_array['direction_fullname'] = "North";
1501 
-		} elseif ($direction >= 22.5 && $direction < 45){
1501 
+		} elseif ($direction >= 22.5 && $direction < 45) {
1502 1502 
 			$temp_array['direction_degree'] = $direction;
1503 1503 
 			$temp_array['direction_shortname'] = "NNE";
1504 1504 
 			$temp_array['direction_fullname'] = "North-Northeast";
1505 
-		} elseif ($direction >= 45 && $direction < 67.5){
1505 
+		} elseif ($direction >= 45 && $direction < 67.5) {
1506 1506 
 			$temp_array['direction_degree'] = $direction;
1507 1507 
 			$temp_array['direction_shortname'] = "NE";
1508 1508 
 			$temp_array['direction_fullname'] = "Northeast";
1509 
-		} elseif ($direction >= 67.5 && $direction < 90){
1509 
+		} elseif ($direction >= 67.5 && $direction < 90) {
1510 1510 
 			$temp_array['direction_degree'] = $direction;
1511 1511 
 			$temp_array['direction_shortname'] = "ENE";
1512 1512 
 			$temp_array['direction_fullname'] = "East-Northeast";
1513 
-		} elseif ($direction >= 90 && $direction < 112.5){
1513 
+		} elseif ($direction >= 90 && $direction < 112.5) {
1514 1514 
 			$temp_array['direction_degree'] = $direction;
1515 1515 
 			$temp_array['direction_shortname'] = "E";
1516 1516 
 			$temp_array['direction_fullname'] = "East";
1517 
-		} elseif ($direction >= 112.5 && $direction < 135){
1517 
+		} elseif ($direction >= 112.5 && $direction < 135) {
1518 1518 
 			$temp_array['direction_degree'] = $direction;
1519 1519 
 			$temp_array['direction_shortname'] = "ESE";
1520 1520 
 			$temp_array['direction_fullname'] = "East-Southeast";
1521 
-		} elseif ($direction >= 135 && $direction < 157.5){
1521 
+		} elseif ($direction >= 135 && $direction < 157.5) {
1522 1522 
 			$temp_array['direction_degree'] = $direction;
1523 1523 
 			$temp_array['direction_shortname'] = "SE";
1524 1524 
 			$temp_array['direction_fullname'] = "Southeast";
1525 
-		} elseif ($direction >= 157.5 && $direction < 180){
1525 
+		} elseif ($direction >= 157.5 && $direction < 180) {
1526 1526 
 			$temp_array['direction_degree'] = $direction;
1527 1527 
 			$temp_array['direction_shortname'] = "SSE";
1528 1528 
 			$temp_array['direction_fullname'] = "South-Southeast";
1529 
-		} elseif ($direction >= 180 && $direction < 202.5){
1529 
+		} elseif ($direction >= 180 && $direction < 202.5) {
1530 1530 
 			$temp_array['direction_degree'] = $direction;
1531 1531 
 			$temp_array['direction_shortname'] = "S";
1532 1532 
 			$temp_array['direction_fullname'] = "South";
1533 
-		} elseif ($direction >= 202.5 && $direction < 225){
1533 
+		} elseif ($direction >= 202.5 && $direction < 225) {
1534 1534 
 			$temp_array['direction_degree'] = $direction;
1535 1535 
 			$temp_array['direction_shortname'] = "SSW";
1536 1536 
 			$temp_array['direction_fullname'] = "South-Southwest";
1537 
-		} elseif ($direction >= 225 && $direction < 247.5){
1537 
+		} elseif ($direction >= 225 && $direction < 247.5) {
1538 1538 
 			$temp_array['direction_degree'] = $direction;
1539 1539 
 			$temp_array['direction_shortname'] = "SW";
1540 1540 
 			$temp_array['direction_fullname'] = "Southwest";
1541 
-		} elseif ($direction >= 247.5 && $direction < 270){
1541 
+		} elseif ($direction >= 247.5 && $direction < 270) {
1542 1542 
 			$temp_array['direction_degree'] = $direction;
1543 1543 
 			$temp_array['direction_shortname'] = "WSW";
1544 1544 
 			$temp_array['direction_fullname'] = "West-Southwest";
1545 
-		} elseif ($direction >= 270 && $direction < 292.5){
1545 
+		} elseif ($direction >= 270 && $direction < 292.5) {
1546 1546 
 			$temp_array['direction_degree'] = $direction;
1547 1547 
 			$temp_array['direction_shortname'] = "W";
1548 1548 
 			$temp_array['direction_fullname'] = "West";
1549 
-		} elseif ($direction >= 292.5 && $direction < 315){
1549 
+		} elseif ($direction >= 292.5 && $direction < 315) {
1550 1550 
 			$temp_array['direction_degree'] = $direction;
1551 1551 
 			$temp_array['direction_shortname'] = "WNW";
1552 1552 
 			$temp_array['direction_fullname'] = "West-Northwest";
1553 
-		} elseif ($direction >= 315 && $direction < 337.5){
1553 
+		} elseif ($direction >= 315 && $direction < 337.5) {
1554 1554 
 			$temp_array['direction_degree'] = $direction;
1555 1555 
 			$temp_array['direction_shortname'] = "NW";
1556 1556 
 			$temp_array['direction_fullname'] = "Northwest";
1557 
-		} elseif ($direction >= 337.5 && $direction < 360){
1557 
+		} elseif ($direction >= 337.5 && $direction < 360) {
1558 1558 
 			$temp_array['direction_degree'] = $direction;
1559 1559 
 			$temp_array['direction_shortname'] = "NNW";
1560 1560 
 			$temp_array['direction_fullname'] = "North-Northwest";
 
@@ -1571,11 +1571,11 @@  discard block
 
 block discarded – undo
1571 1571 
 	* @param Float $longitude longitute of the flight
1572 1572 
 	* @return String the countrie
1573 1573 
 	*/
1574 
-	public function getCountryFromLatitudeLongitude($latitude,$longitude)
1574 
+	public function getCountryFromLatitudeLongitude($latitude, $longitude)
1575 1575 
 	{
1576 1576 
 		global $globalDBdriver, $globalDebug;
1577 
-		$latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1578 
-		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1577 
+		$latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1578 
+		$longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1579 1579
1580 1580 
 		$Connection = new Connection($this->db);
1581 1581 
 		if (!$Connection->tableExists('countries')) return '';
 
@@ -1615,7 +1615,7 @@  discard block
 
 block discarded – undo
1615 1615 
 	public function getCountryFromISO2($iso2)
1616 1616 
 	{
1617 1617 
 		global $globalDBdriver, $globalDebug;
1618 
-		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
1618 
+		$iso2 = filter_var($iso2, FILTER_SANITIZE_STRING);
1619 1619
1620 1620 
 		$Connection = new Connection($this->db);
1621 1621 
 		if (!$Connection->tableExists('countries')) return '';
 
@@ -1644,11 +1644,11 @@  discard block
 
 block discarded – undo
1644 1644 
 	* @return Array the vessel type list
1645 1645 
 	*
1646 1646 
 	*/
1647 
-	public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '')
1647 
+	public function countAllTrackerTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '')
1648 1648 
 	{
1649 1649 
 		global $globalDBdriver;
1650 
-		$filter_query = $this->getFilter($filters,true,true);
1651 
-		$query  = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count
1650 
+		$filter_query = $this->getFilter($filters, true, true);
1651 
+		$query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count
1652 1652 
 		    FROM tracker_output ".$filter_query." tracker_output.type  <> ''";
1653 1653 
 		if ($olderthanmonths > 0) {
1654 1654 
 			if ($globalDBdriver == 'mysql') {
 
@@ -1668,28 +1668,28 @@  discard block
 
 block discarded – undo
1668 1668 
 		if ($year != '') {
1669 1669 
 			if ($globalDBdriver == 'mysql') {
1670 1670 
 				$query .= " AND YEAR(tracker_output.date) = :year";
1671 
-				$query_values = array_merge($query_values,array(':year' => $year));
1671 
+				$query_values = array_merge($query_values, array(':year' => $year));
1672 1672 
 			} else {
1673 1673 
 				$query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year";
1674 
-				$query_values = array_merge($query_values,array(':year' => $year));
1674 
+				$query_values = array_merge($query_values, array(':year' => $year));
1675 1675 
 			}
1676 1676 
 		}
1677 1677 
 		if ($month != '') {
1678 1678 
 			if ($globalDBdriver == 'mysql') {
1679 1679 
 				$query .= " AND MONTH(tracker_output.date) = :month";
1680 
-				$query_values = array_merge($query_values,array(':month' => $month));
1680 
+				$query_values = array_merge($query_values, array(':month' => $month));
1681 1681 
 			} else {
1682 1682 
 				$query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month";
1683 
-				$query_values = array_merge($query_values,array(':month' => $month));
1683 
+				$query_values = array_merge($query_values, array(':month' => $month));
1684 1684 
 			}
1685 1685 
 		}
1686 1686 
 		if ($day != '') {
1687 1687 
 			if ($globalDBdriver == 'mysql') {
1688 1688 
 				$query .= " AND DAY(tracker_output.date) = :day";
1689 
-				$query_values = array_merge($query_values,array(':day' => $day));
1689 
+				$query_values = array_merge($query_values, array(':day' => $day));
1690 1690 
 			} else {
1691 1691 
 				$query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day";
1692 
-				$query_values = array_merge($query_values,array(':day' => $day));
1692 
+				$query_values = array_merge($query_values, array(':day' => $day));
1693 1693 
 			}
1694 1694 
 		}
1695 1695 
 		$query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC";
 
@@ -1698,7 +1698,7 @@  discard block
 
 block discarded – undo
1698 1698 
 		$sth->execute($query_values);
1699 1699 
 		$tracker_array = array();
1700 1700 
 		$temp_array = array();
1701 
-		while($row = $sth->fetch(PDO::FETCH_ASSOC))
1701 
+		while ($row = $sth->fetch(PDO::FETCH_ASSOC))
1702 1702 
 		{
1703 1703 
 			$temp_array['tracker_type'] = $row['tracker_type'];
1704 1704 
 			$temp_array['tracker_type_count'] = $row['tracker_type_count'];
 
@@ -1713,13 +1713,13 @@  discard block
 
 block discarded – undo
1713 1713 
 	* @return Array the tracker information
1714 1714 
 	*
1715 1715 
 	*/
1716 
-	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '',$filters = array())
1716 
+	public function searchTrackerData($q = '', $callsign = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array())
1717 1717 
 	{
1718 1718 
 		global $globalTimezone, $globalDBdriver;
1719 1719 
 		date_default_timezone_set('UTC');
1720 1720 
 		$query_values = array();
1721 1721 
 		$additional_query = '';
1722 
-		$filter_query = $this->getFilter($filters,true,true);
1722 
+		$filter_query = $this->getFilter($filters, true, true);
1723 1723 
 		if ($q != "")
1724 1724 
 		{
1725 1725 
 			if (!is_string($q))
 
@@ -1727,8 +1727,8 @@  discard block
 
 block discarded – undo
1727 1727 
 				return false;
1728 1728 
 			} else {
1729 1729 
 				$q_array = explode(" ", $q);
1730 
-				foreach ($q_array as $q_item){
1731 
-					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
1730 
+				foreach ($q_array as $q_item) {
1731 
+					$q_item = filter_var($q_item, FILTER_SANITIZE_STRING);
1732 1732 
 					$additional_query .= " AND (";
1733 1733 
 					if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
1734 1734 
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%') OR ";
 
@@ -1738,20 +1738,20 @@  discard block
 
 block discarded – undo
1738 1738 
 		}
1739 1739 
 		if ($callsign != "")
1740 1740 
 		{
1741 
-			$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
1741 
+			$callsign = filter_var($callsign, FILTER_SANITIZE_STRING);
1742 1742 
 			if (!is_string($callsign))
1743 1743 
 			{
1744 1744 
 				return false;
1745 1745 
 			} else {
1746 1746 
 				$additional_query .= " AND tracker_output.ident = :callsign";
1747 
-				$query_values = array_merge($query_values,array(':callsign' => $callsign));
1747 
+				$query_values = array_merge($query_values, array(':callsign' => $callsign));
1748 1748 
 			}
1749 1749 
 		}
1750 1750 
 		if ($date_posted != "")
1751 1751 
 		{
1752 1752 
 			$date_array = explode(",", $date_posted);
1753 
-			$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
1754 
-			$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
1753 
+			$date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING);
1754 
+			$date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING);
1755 1755 
 			if ($globalTimezone != '') {
1756 1756 
 				date_default_timezone_set($globalTimezone);
1757 1757 
 				$datetime = new DateTime();
 
@@ -1778,8 +1778,8 @@  discard block
 
 block discarded – undo
1778 1778 
 		if ($limit != "")
1779 1779 
 		{
1780 1780 
 			$limit_array = explode(",", $limit);
1781 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1782 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1781 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1782 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1783 1783 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1784 1784 
 			{
1785 1785 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
 
@@ -1797,22 +1797,22 @@  discard block
 
 block discarded – undo
1797 1797 
 			}
1798 1798 
 		}
1799 1799 
 		if ($origLat != "" && $origLon != "" && $dist != "") {
1800 
-			$dist = number_format($dist*0.621371,2,'.',''); // convert km to mile
1800 
+			$dist = number_format($dist*0.621371, 2, '.', ''); // convert km to mile
1801 1801 
 			if ($globalDBdriver == 'mysql') {
1802 
-				$query="SELECT tracker_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2))) as distance
1802 
+				$query = "SELECT tracker_output.*, 1.60935*3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2))) as distance
1803 1803 
 				    FROM tracker_archive,tracker_output".$filter_query." tracker_output.famtrackid = tracker_archive.famtrackid AND tracker_output.ident <> '' ".$additional_query."AND tracker_archive.longitude between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat)*69)) and tracker_archive.latitude between ($origLat-($dist/69)) and ($origLat+($dist/69))
1804 1804 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - tracker_archive.latitude)*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(tracker_archive.latitude*pi()/180)*POWER(SIN(($origLon-tracker_archive.longitude)*pi()/180/2),2)))) < $dist".$orderby_query;
1805 1805 
 			} else {
1806 
-				$query="SELECT tracker_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance
1806 
+				$query = "SELECT tracker_output.*, 1.60935 * 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2))) as distance
1807 1807 
 				    FROM tracker_archive,tracker_output".$filter_query." tracker_output.famtrackid = tracker_archive.famtrackid AND tracker_output.ident <> '' ".$additional_query."AND CAST(tracker_archive.longitude as double precision) between ($origLon-$dist/cos(radians($origLat))*69) and ($origLon+$dist/cos(radians($origLat))*69) and CAST(tracker_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69))
1808 1808 
 				    AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - CAST(tracker_archive.latitude as double precision))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(CAST(tracker_archive.latitude as double precision)*pi()/180)*POWER(SIN(($origLon-CAST(tracker_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query.$orderby_query;
1809 1809 
 			}
1810 1810 
 		} else {
1811 
-			$query  = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> ''
1811 
+			$query = "SELECT tracker_output.* FROM tracker_output".$filter_query." tracker_output.ident <> ''
1812 1812 
 			    ".$additional_query."
1813 1813 
 			    ".$orderby_query;
1814 1814 
 		}
1815 
-		$tracker_array = $this->getDataFromDB($query, $query_values,$limit_query);
1815 
+		$tracker_array = $this->getDataFromDB($query, $query_values, $limit_query);
1816 1816 
 		return $tracker_array;
1817 1817 
 	}
1818 1818 
 
@@ -1837,7 +1837,7 @@  discard block
 
 block discarded – undo
1837 1837 
 		curl_close($ch);
1838 1838 
 		$bitly_data = json_decode($bitly_data);
1839 1839 
 		$bitly_url = '';
1840 
-		if ($bitly_data->status_txt = "OK"){
1840 
+		if ($bitly_data->status_txt = "OK") {
1841 1841 
 			$bitly_url = $bitly_data->data->url;
1842 1842 
 		}
1843 1843 
 		return $bitly_url;
 
@@ -1845,7 +1845,7 @@  discard block
 
 block discarded – undo
1845 1845
1846 1846 
 	public function getOrderBy()
1847 1847 
 	{
1848 
-		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC"));
1848 
+		$orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC"));
1849 1849
1850 1850 
 		return $orderby;
1851 1851
Please login to merge, or discard this patch.
Braces   +172 added lines, -61 removed lines patch added patch discarded remove patch 
@@ -10,7 +10,9 @@  discard block
 
 block discarded – undo
10 10 
 	public function __construct($dbc = null) {
11 11 
 		$Connection = new Connection($dbc);
12 12 
 		$this->db = $Connection->db();
13 
-		if ($this->db === null) die('Error: No DB connection. (Tracker)');
13 
+		if ($this->db === null) {
14 
+			die('Error: No DB connection. (Tracker)');
15 
+		}
14 16 
 	}
15 17
16 18 
 	/**
 
@@ -32,7 +34,9 @@  discard block
 
 block discarded – undo
32 34 
 		if (isset($filter[0]['source'])) {
33 35 
 			$filters = array_merge($filters,$filter);
34 36 
 		}
35 
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
37 
+		if (is_array($globalFilter)) {
38 
+			$filter = array_merge($filter,$globalFilter);
39 
+		}
36 40 
 		$filter_query_join = '';
37 41 
 		$filter_query_where = '';
38 42 
 		foreach($filters as $flt) {
 
@@ -71,8 +75,11 @@  discard block
 
 block discarded – undo
71 75 
 				$filter_query_where .= " AND EXTRACT(DAY FROM tracker_output.date) = '".$filter['day']."'";
72 76 
 			}
73 77 
 		}
74 
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
75 
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
78 
+		if ($filter_query_where == '' && $where) {
79 
+			$filter_query_where = ' WHERE';
80 
+		} elseif ($filter_query_where != '' && $and) {
81 
+			$filter_query_where .= ' AND';
82 
+		}
76 83 
 		if ($filter_query_where != '') {
77 84 
 			$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
78 85 
 		}
 
@@ -126,26 +133,43 @@  discard block
 
 block discarded – undo
126 133 
 				$temp_array['tracker_id'] = $row['tracker_archive_id'];
127 134 
 			} elseif (isset($row['tracker_archive_output_id'])) {
128 135 
 				$temp_array['tracker_id'] = $row['tracker_archive_output_id'];
129 
-			*/}
130 
-			elseif (isset($row['trackerid'])) {
136 
+			*/} elseif (isset($row['trackerid'])) {
131 137 
 				$temp_array['trackerid'] = $row['trackerid'];
132 138 
 			} else {
133 139 
 				$temp_array['trackerid'] = '';
134 140 
 			}
135 
-			if (isset($row['famtrackid'])) $temp_array['famtrackid'] = $row['famtrackid'];
136 
-			if (isset($row['type'])) $temp_array['type'] = $row['type'];
137 
-			if (isset($row['comment'])) $temp_array['comment'] = $row['comment'];
141 
+			if (isset($row['famtrackid'])) {
142 
+				$temp_array['famtrackid'] = $row['famtrackid'];
143 
+			}
144 
+			if (isset($row['type'])) {
145 
+				$temp_array['type'] = $row['type'];
146 
+			}
147 
+			if (isset($row['comment'])) {
148 
+				$temp_array['comment'] = $row['comment'];
149 
+			}
138 150 
 			$temp_array['ident'] = $row['ident'];
139 
-			if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude'];
140 
-			if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude'];
141 
-			if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source'];
142 
-			if (isset($row['altitude'])) $temp_array['altitude'] = $row['altitude'];
151 
+			if (isset($row['latitude'])) {
152 
+				$temp_array['latitude'] = $row['latitude'];
153 
+			}
154 
+			if (isset($row['longitude'])) {
155 
+				$temp_array['longitude'] = $row['longitude'];
156 
+			}
157 
+			if (isset($row['format_source'])) {
158 
+				$temp_array['format_source'] = $row['format_source'];
159 
+			}
160 
+			if (isset($row['altitude'])) {
161 
+				$temp_array['altitude'] = $row['altitude'];
162 
+			}
143 163 
 			if (isset($row['heading'])) {
144 164 
 				$temp_array['heading'] = $row['heading'];
145 165 
 				$heading_direction = $this->parseDirection($row['heading']);
146 
-				if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
166 
+				if (isset($heading_direction[0]['direction_fullname'])) {
167 
+					$temp_array['heading_name'] = $heading_direction[0]['direction_fullname'];
168 
+				}
169 
+			}
170 
+			if (isset($row['ground_speed'])) {
171 
+				$temp_array['ground_speed'] = $row['ground_speed'];
147 172 
 			}
148 
-			if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed'];
149 173
150 174 
 			if (isset($row['date'])) {
151 175 
 				$dateArray = $this->parseDateString($row['date']);
 
@@ -188,13 +212,21 @@  discard block
 
 block discarded – undo
188 212 
 			}
189 213
190 214 
 			$fromsource = NULL;
191 
-			if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name'];
192 
-			if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country'];
193 
-			if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance'];
215 
+			if (isset($row['source_name']) && $row['source_name'] != '') {
216 
+				$temp_array['source_name'] = $row['source_name'];
217 
+			}
218 
+			if (isset($row['over_country']) && $row['over_country'] != '') {
219 
+				$temp_array['over_country'] = $row['over_country'];
220 
+			}
221 
+			if (isset($row['distance']) && $row['distance'] != '') {
222 
+				$temp_array['distance'] = $row['distance'];
223 
+			}
194 224 
 			$temp_array['query_number_rows'] = $num_rows;
195 225 
 			$tracker_array[] = $temp_array;
196 226 
 		}
197 
-		if ($num_rows == 0) return array();
227 
+		if ($num_rows == 0) {
228 
+			return array();
229 
+		}
198 230 
 		$tracker_array[0]['query_number_rows'] = $num_rows;
199 231 
 		return $tracker_array;
200 232 
 	}	
@@ -225,8 +257,12 @@  discard block
 
 block discarded – undo
225 257 
 			{
226 258 
 				//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
227 259 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
228 
-			} else $limit_query = "";
229 
-		} else $limit_query = "";
260 
+			} else {
261 
+				$limit_query = "";
262 
+			}
263 
+		} else {
264 
+			$limit_query = "";
265 
+		}
230 266
231 267 
 		if ($sort != "")
232 268 
 		{
 
@@ -254,7 +290,9 @@  discard block
 
 block discarded – undo
254 290 
 		global $global_query;
255 291
256 292 
 		date_default_timezone_set('UTC');
257 
-		if ($id == '') return array();
293 
+		if ($id == '') {
294 
+			return array();
295 
+		}
258 296 
 		$additional_query = "tracker_output.famtrackid = :id";
259 297 
 		$query_values = array(':id' => $id);
260 298 
 		$query  = $global_query." WHERE ".$additional_query." ";
 
@@ -397,8 +435,11 @@  discard block
 
 block discarded – undo
397 435 
 		$query .= " ORDER BY tracker_output.source_name ASC";
398 436
399 437 
 		$sth = $this->db->prepare($query);
400 
-		if (!empty($query_values)) $sth->execute($query_values);
401 
-		else $sth->execute();
438 
+		if (!empty($query_values)) {
439 
+			$sth->execute($query_values);
440 
+		} else {
441 
+			$sth->execute();
442 
+		}
402 443
403 444 
 		$source_array = array();
404 445 
 		$temp_array = array();
 
@@ -453,7 +494,9 @@  discard block
 
 block discarded – undo
453 494 
 			date_default_timezone_set($globalTimezone);
454 495 
 			$datetime = new DateTime();
455 496 
 			$offset = $datetime->format('P');
456 
-		} else $offset = '+00:00';
497 
+		} else {
498 
+			$offset = '+00:00';
499 
+		}
457 500
458 501 
 		if ($globalDBdriver == 'mysql') {
459 502 
 			$query  = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date
 
@@ -609,7 +652,9 @@  discard block
 
 block discarded – undo
609 652 
 			{
610 653 
 				return false;
611 654 
 			}
612 
-		} else $altitude = 0;
655 
+		} else {
656 
+			$altitude = 0;
657 
+		}
613 658
614 659 
 		if ($heading != "")
615 660 
 		{
 
@@ -648,8 +693,12 @@  discard block
 
 block discarded – undo
648 693 
             		$latitude = 0;
649 694 
             		$longitude = 0;
650 695 
             	}
651 
-                if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0;
652 
-                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0;
696 
+                if ($heading == '' || $Common->isInteger($heading) === false) {
697 
+                	$heading = 0;
698 
+                }
699 
+                if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) {
700 
+                	$groundspeed = 0;
701 
+                }
653 702 
                 $query  = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type)
654 703 
                 VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)";
655 704 
 
@@ -753,7 +802,9 @@  discard block
 
 block discarded – undo
753 802 
 		global $globalDBdriver, $globalArchive;
754 803 
 		//$filter_query = $this->getFilter($filters,true,true);
755 804 
 		$Connection= new Connection($this->db);
756 
-		if (!$Connection->tableExists('countries')) return array();
805 
+		if (!$Connection->tableExists('countries')) {
806 
+			return array();
807 
+		}
757 808 
 		if (!isset($globalArchive) || $globalArchive !== TRUE) {
758 809 
 			require_once('class.TrackerLive.php');
759 810 
 			$TrackerLive = new TrackerLive($this->db);
 
@@ -796,7 +847,9 @@  discard block
 
 block discarded – undo
796 847 
 			$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT famtrackid,over_country FROM tracker_archive".$filter_query.") l ON c.iso2 = l.over_country ";
797 848 
 		}
798 849 
 		$query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC";
799 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
850 
+		if ($limit) {
851 
+			$query .= " LIMIT 10 OFFSET 0";
852 
+		}
800 853
801 854
802 855 
 		$sth = $this->db->prepare($query);
 
@@ -829,12 +882,18 @@  discard block
 
 block discarded – undo
829 882 
 		$query  = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count
830 883 
                     FROM tracker_output".$filter_query." tracker_output.ident <> ''";
831 884 
 		 if ($olderthanmonths > 0) {
832 
-			if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
833 
-			else $query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
885 
+			if ($globalDBdriver == 'mysql') {
886 
+				$query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)';
887 
+			} else {
888 
+				$query .= " AND tracker_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
889 
+			}
834 890 
 		}
835 891 
 		if ($sincedate != '') {
836 
-			if ($globalDBdriver == 'mysql') $query .= " AND tracker_output.date > '".$sincedate."'";
837 
-			else $query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
892 
+			if ($globalDBdriver == 'mysql') {
893 
+				$query .= " AND tracker_output.date > '".$sincedate."'";
894 
+			} else {
895 
+				$query .= " AND tracker_output.date > CAST('".$sincedate."' AS TIMESTAMP)";
896 
+			}
838 897 
 		}
839 898 
 		$query_values = array();
840 899 
 		if ($year != '') {
 
@@ -865,7 +924,9 @@  discard block
 
 block discarded – undo
865 924 
 			}
866 925 
 		}
867 926 
 		$query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC";
868 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
927 
+		if ($limit) {
928 
+			$query .= " LIMIT 10 OFFSET 0";
929 
+		}
869 930
870 931 
 		$sth = $this->db->prepare($query);
871 932 
 		$sth->execute($query_values);
 
@@ -900,7 +961,9 @@  discard block
 
 block discarded – undo
900 961 
 			date_default_timezone_set($globalTimezone);
901 962 
 			$datetime = new DateTime();
902 963 
 			$offset = $datetime->format('P');
903 
-		} else $offset = '+00:00';
964 
+		} else {
965 
+			$offset = '+00:00';
966 
+		}
904 967
905 968 
 		if ($globalDBdriver == 'mysql') {
906 969 
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -950,7 +1013,9 @@  discard block
 
 block discarded – undo
950 1013 
 			date_default_timezone_set($globalTimezone);
951 1014 
 			$datetime = new DateTime();
952 1015 
 			$offset = $datetime->format('P');
953 
-		} else $offset = '+00:00';
1016 
+		} else {
1017 
+			$offset = '+00:00';
1018 
+		}
954 1019 
 		$filter_query = $this->getFilter($filters,true,true);
955 1020 
 		if ($globalDBdriver == 'mysql') {
956 1021 
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -996,7 +1061,9 @@  discard block
 
 block discarded – undo
996 1061 
 			date_default_timezone_set($globalTimezone);
997 1062 
 			$datetime = new DateTime();
998 1063 
 			$offset = $datetime->format('P');
999 
-		} else $offset = '+00:00';
1064 
+		} else {
1065 
+			$offset = '+00:00';
1066 
+		}
1000 1067 
 		$filter_query = $this->getFilter($filters,true,true);
1001 1068 
 		if ($globalDBdriver == 'mysql') {
1002 1069 
 			$query  = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count
 
@@ -1044,7 +1111,9 @@  discard block
 
 block discarded – undo
1044 1111 
 			date_default_timezone_set($globalTimezone);
1045 1112 
 			$datetime = new DateTime();
1046 1113 
 			$offset = $datetime->format('P');
1047 
-		} else $offset = '+00:00';
1114 
+		} else {
1115 
+			$offset = '+00:00';
1116 
+		}
1048 1117
1049 1118 
 		if ($globalDBdriver == 'mysql') {
1050 1119 
 			$query  = "SELECT YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count
 
@@ -1093,7 +1162,9 @@  discard block
 
 block discarded – undo
1093 1162 
 			date_default_timezone_set($globalTimezone);
1094 1163 
 			$datetime = new DateTime();
1095 1164 
 			$offset = $datetime->format('P');
1096 
-		} else $offset = '+00:00';
1165 
+		} else {
1166 
+			$offset = '+00:00';
1167 
+		}
1097 1168 
 		$filter_query = $this->getFilter($filters,true,true);
1098 1169 
 		if ($globalDBdriver == 'mysql') {
1099 1170 
 			$query  = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count
 
@@ -1142,7 +1213,9 @@  discard block
 
 block discarded – undo
1142 1213 
 			date_default_timezone_set($globalTimezone);
1143 1214 
 			$datetime = new DateTime();
1144 1215 
 			$offset = $datetime->format('P');
1145 
-		} else $offset = '+00:00';
1216 
+		} else {
1217 
+			$offset = '+00:00';
1218 
+		}
1146 1219
1147 1220 
 		$orderby_sql = '';
1148 1221 
 		if ($orderby == "hour")
 
@@ -1211,7 +1284,9 @@  discard block
 
 block discarded – undo
1211 1284 
 			date_default_timezone_set($globalTimezone);
1212 1285 
 			$datetime = new DateTime($date);
1213 1286 
 			$offset = $datetime->format('P');
1214 
-		} else $offset = '+00:00';
1287 
+		} else {
1288 
+			$offset = '+00:00';
1289 
+		}
1215 1290
1216 1291 
 		if ($globalDBdriver == 'mysql') {
1217 1292 
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1259,7 +1334,9 @@  discard block
 
 block discarded – undo
1259 1334 
 			date_default_timezone_set($globalTimezone);
1260 1335 
 			$datetime = new DateTime();
1261 1336 
 			$offset = $datetime->format('P');
1262 
-		} else $offset = '+00:00';
1337 
+		} else {
1338 
+			$offset = '+00:00';
1339 
+		}
1263 1340
1264 1341 
 		if ($globalDBdriver == 'mysql') {
1265 1342 
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1324,8 +1401,11 @@  discard block
 
 block discarded – undo
1324 1401 
 				$query_values = array_merge($query_values,array(':month' => $month));
1325 1402 
 			}
1326 1403 
 		}
1327 
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1328 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1404 
+		if (empty($query_values)) {
1405 
+			$queryi .= $this->getFilter($filters);
1406 
+		} else {
1407 
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
1408 
+		}
1329 1409
1330 1410 
 		$sth = $this->db->prepare($queryi);
1331 1411 
 		$sth->execute($query_values);
 
@@ -1362,8 +1442,11 @@  discard block
 
 block discarded – undo
1362 1442 
 				$query_values = array_merge($query_values,array(':month' => $month));
1363 1443 
 			}
1364 1444 
 		}
1365 
-		if (empty($query_values)) $queryi .= $this->getFilter($filters);
1366 
-		else $queryi .= $this->getFilter($filters,true,true).substr($query,4);
1445 
+		if (empty($query_values)) {
1446 
+			$queryi .= $this->getFilter($filters);
1447 
+		} else {
1448 
+			$queryi .= $this->getFilter($filters,true,true).substr($query,4);
1449 
+		}
1367 1450
1368 1451 
 		$sth = $this->db->prepare($queryi);
1369 1452 
 		$sth->execute($query_values);
 
@@ -1385,7 +1468,9 @@  discard block
 
 block discarded – undo
1385 1468 
 			date_default_timezone_set($globalTimezone);
1386 1469 
 			$datetime = new DateTime();
1387 1470 
 			$offset = $datetime->format('P');
1388 
-		} else $offset = '+00:00';
1471 
+		} else {
1472 
+			$offset = '+00:00';
1473 
+		}
1389 1474
1390 1475 
 		if ($globalDBdriver == 'mysql') {
1391 1476 
 			$query  = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count
 
@@ -1489,7 +1574,9 @@  discard block
 
 block discarded – undo
1489 1574 
 	*/
1490 1575 
 	public function parseDirection($direction = 0)
1491 1576 
 	{
1492 
-		if ($direction == '') $direction = 0;
1577 
+		if ($direction == '') {
1578 
+			$direction = 0;
1579 
+		}
1493 1580 
 		$direction_array = array();
1494 1581 
 		$temp_array = array();
1495 1582 
 
@@ -1578,7 +1665,9 @@  discard block
 
 block discarded – undo
1578 1665 
 		$longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1579 1666
1580 1667 
 		$Connection = new Connection($this->db);
1581 
-		if (!$Connection->tableExists('countries')) return '';
1668 
+		if (!$Connection->tableExists('countries')) {
1669 
+			return '';
1670 
+		}
1582 1671
1583 1672 
 		try {
1584 1673 
 			/*
 
@@ -1598,9 +1687,13 @@  discard block
 
 block discarded – undo
1598 1687 
 			$sth->closeCursor();
1599 1688 
 			if (count($row) > 0) {
1600 1689 
 				return $row;
1601 
-			} else return '';
1690 
+			} else {
1691 
+				return '';
1692 
+			}
1602 1693 
 		} catch (PDOException $e) {
1603 
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
1694 
+			if (isset($globalDebug) && $globalDebug) {
1695 
+				echo 'Error : '.$e->getMessage()."\n";
1696 
+			}
1604 1697 
 			return '';
1605 1698 
 		}
1606 1699 
 	
@@ -1618,7 +1711,9 @@  discard block
 
 block discarded – undo
1618 1711 
 		$iso2 = filter_var($iso2,FILTER_SANITIZE_STRING);
1619 1712
1620 1713 
 		$Connection = new Connection($this->db);
1621 
-		if (!$Connection->tableExists('countries')) return '';
1714 
+		if (!$Connection->tableExists('countries')) {
1715 
+			return '';
1716 
+		}
1622 1717
1623 1718 
 		try {
1624 1719 
 			$query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1";
 
@@ -1630,9 +1725,13 @@  discard block
 
 block discarded – undo
1630 1725 
 			$sth->closeCursor();
1631 1726 
 			if (count($row) > 0) {
1632 1727 
 				return $row;
1633 
-			} else return '';
1728 
+			} else {
1729 
+				return '';
1730 
+			}
1634 1731 
 		} catch (PDOException $e) {
1635 
-			if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n";
1732 
+			if (isset($globalDebug) && $globalDebug) {
1733 
+				echo 'Error : '.$e->getMessage()."\n";
1734 
+			}
1636 1735 
 			return '';
1637 1736 
 		}
1638 1737 
 	
@@ -1693,7 +1792,9 @@  discard block
 
 block discarded – undo
1693 1792 
 			}
1694 1793 
 		}
1695 1794 
 		$query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC";
1696 
-		if ($limit) $query .= " LIMIT 10 OFFSET 0";
1795 
+		if ($limit) {
1796 
+			$query .= " LIMIT 10 OFFSET 0";
1797 
+		}
1697 1798 
 		$sth = $this->db->prepare($query);
1698 1799 
 		$sth->execute($query_values);
1699 1800 
 		$tracker_array = array();
 
@@ -1730,7 +1831,9 @@  discard block
 
 block discarded – undo
1730 1831 
 				foreach ($q_array as $q_item){
1731 1832 
 					$q_item = filter_var($q_item,FILTER_SANITIZE_STRING);
1732 1833 
 					$additional_query .= " AND (";
1733 
-					if (is_int($q_item)) $additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
1834 
+					if (is_int($q_item)) {
1835 
+						$additional_query .= "(tracker_output.tracker_id = '".$q_item."') OR ";
1836 
+					}
1734 1837 
 					$additional_query .= "(tracker_output.ident like '%".$q_item."%') OR ";
1735 1838 
 					$additional_query .= ")";
1736 1839 
 				}
 
@@ -1756,7 +1859,9 @@  discard block
 
 block discarded – undo
1756 1859 
 				date_default_timezone_set($globalTimezone);
1757 1860 
 				$datetime = new DateTime();
1758 1861 
 				$offset = $datetime->format('P');
1759 
-			} else $offset = '+00:00';
1862 
+			} else {
1863 
+				$offset = '+00:00';
1864 
+			}
1760 1865 
 			if ($date_array[1] != "")
1761 1866 
 			{
1762 1867 
 				$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
 
@@ -1783,8 +1888,12 @@  discard block
 
 block discarded – undo
1783 1888 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1784 1889 
 			{
1785 1890 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
1786 
-			} else $limit_query = "";
1787 
-		} else $limit_query = "";
1891 
+			} else {
1892 
+				$limit_query = "";
1893 
+			}
1894 
+		} else {
1895 
+			$limit_query = "";
1896 
+		}
1788 1897 
 		if ($sort != "")
1789 1898 
 		{
1790 1899 
 			$search_orderby_array = $this->getOrderBy();
 
@@ -1827,7 +1936,9 @@  discard block
 
 block discarded – undo
1827 1936 
 	{
1828 1937 
 		global $globalBitlyAccessToken;
1829 1938
1830 
-		if ($globalBitlyAccessToken == '') return $url;
1939 
+		if ($globalBitlyAccessToken == '') {
1940 
+			return $url;
1941 
+		}
1831 1942 
 		$google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url;
1832 1943 
 		$ch = curl_init();
1833 1944 
 		curl_setopt($ch, CURLOPT_HEADER, 0);
Please login to merge, or discard this patch.