Completed
Push — master ( f4eedb...76be65 )
by Yannick
126:35 queued 101:17
created
require/class.ACARS.php 1 patch
Spacing   +256 added lines, -256 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 	public $db;
11 11
 	public $SI;
12 12
 	private $fromACARSscript = false;
13
-	public function __construct($dbc = null,$fromACARSscript = false) {
13
+	public function __construct($dbc = null, $fromACARSscript = false) {
14 14
 		$Connection = new Connection($dbc);
15 15
 		$this->db = $Connection->db();
16 16
 		if ($this->db === null) die('Error: No DB connection.');
@@ -26,14 +26,14 @@  discard block
 block discarded – undo
26 26
 	* @return String the icao
27 27
 	*/
28 28
 	public function ident2icao($ident) {
29
-		if (substr($ident,0,2) == 'AF') {
30
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
31
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
29
+		if (substr($ident, 0, 2) == 'AF') {
30
+			if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
31
+			else $icao = 'AFR'.ltrim(substr($ident, 2), '0');
32 32
 		} else {
33 33
 			$Spotter = new Spotter($this->db);
34
-			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
34
+			$identicao = $Spotter->getAllAirlineInfo(substr($ident, 0, 2));
35 35
 			if (isset($identicao[0])) {
36
-				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
36
+				$icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0');
37 37
 			} else $icao = $ident;
38 38
 		}
39 39
 		return $icao;
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
 			$sth = $this->db->prepare($query);
59 59
 			$sth->execute();
60
-		} catch(PDOException $e) {
60
+		} catch (PDOException $e) {
61 61
 			return "error";
62 62
 		}
63 63
 		return "success";
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
 			$sth = $this->db->prepare($query);
83 83
 			$sth->execute();
84
-		} catch(PDOException $e) {
84
+		} catch (PDOException $e) {
85 85
 			return "error";
86 86
 		}
87 87
 		return "success";
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
106 106
 		$ident = '';
107 107
 		$message = '';
108 108
 		$result = array();
109
-		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
110
-		if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
111
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
112
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
109
+		$n = sscanf($data, '(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
110
+		if ($n == 0) $n = sscanf($data, 'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
111
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
112
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
113 113
 		if ($n != 0) {
114
-			$registration = str_replace('.','',$registration);
115
-			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
114
+			$registration = str_replace('.', '', $registration);
115
+			$result = array('registration' => $registration, 'ident' => $ident, 'label' => $label, 'block_id' => $block_id, 'msg_no' => $msg_no, 'message' => $message);
116 116
 			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
117 117
 		} else $message = $data;
118 118
 		$decode = array();
@@ -132,14 +132,14 @@  discard block
 block discarded – undo
132 132
 				$temp = '';
133 133
 				$n = sscanf($message, "FST01%4c%4c%c%06d%c%07d%03d%*8[0-9a-zA-Z ]-%02dC", $dair, $darr, $lac, $la, $lnc, $ln, $alt, $temp);
134 134
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
135
-					$latitude = $la / 10000.0;
136
-					$longitude = $ln / 10000.0;
135
+					$latitude = $la/10000.0;
136
+					$longitude = $ln/10000.0;
137 137
 					if ($lac == 'S') $latitude = '-'.$latitude;
138 138
 					if ($lnc == 'W') $longitude = '-'.$longitude;
139 139
 					// Temp not always available
140 140
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
141
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
142
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
141
+					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => $alt);
142
+					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt, 'Temperature' => $temp.'°C');
143 143
 
144 144
 					//$icao = $Translation->checkTranslation($ident);
145 145
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -151,19 +151,19 @@  discard block
 block discarded – undo
151 151
 				$dhour = '';
152 152
 				$darr = '';
153 153
 				$ahour = '';
154
-				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
154
+				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr, $ahour);
155 155
 				if ($n == 4 && strlen($darr) == 4) {
156
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
157
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
158
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
156
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
157
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
158
+					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '.$darr.' - departure hour : '.$dhour.' - arrival hour : '.$ahour."\n";
159 159
 					//$icao = ACARS->ident2icao($ident);
160 160
 					//$icao = $Translation->checkTranslation($ident);
161 161
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
162 162
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
163 163
 					$found = true;
164 164
 				}
165
-				elseif ($n == 2 || $n  == 4) {
166
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
165
+				elseif ($n == 2 || $n == 4) {
166
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
167 167
 					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
168 168
 					//$icao = ACARS->ident2icao($ident);
169 169
 					//$icao = $Translation->checkTranslation($ident);
@@ -221,11 +221,11 @@  discard block
 block discarded – undo
221 221
 				$ahour = '';
222 222
 				$aair = '';
223 223
 				$apiste = '';
224
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
224
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao, $aident, $dair, $darr, $ddate, $dhour, $ahour, $aair, $apiste);
225 225
 				if ($n > 8) {
226
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
227
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
228
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
226
+					if ($globalDebug) echo 'airicao : '.$airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '.$darr.' - date depart : '.$ddate.' - departure hour : '.$dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
227
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
228
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
229 229
 					$icao = trim($aident);
230 230
 
231 231
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
@@ -250,8 +250,8 @@  discard block
 block discarded – undo
250 250
 				if ($n == 10 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
251 251
 					$las = $las.'.'.$lass;
252 252
 					$lns = $lns.'.'.$lns;
253
-					$latitude = $las / 1000.0;
254
-					$longitude = $lns / 1000.0;
253
+					$latitude = $las/1000.0;
254
+					$longitude = $lns/1000.0;
255 255
 					if ($lac == 'S') $latitude = '-'.$latitude;
256 256
 					if ($lnc == 'W') $longitude = '-'.$longitude;
257 257
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
@@ -346,17 +346,17 @@  discard block
 block discarded – undo
346 346
 				$alt = '';
347 347
 				$fuel = '';
348 348
 				$speed = '';
349
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
349
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
350 350
 				if ($n == 9) {
351 351
 					//if (self->$debug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
352 352
 					$icao = trim($aident);
353 353
 					$decode['icao'] = $icao;
354
-					$latitude = $las / 100.0;
355
-					$longitude = $lns / 100.0;
354
+					$latitude = $las/100.0;
355
+					$longitude = $lns/100.0;
356 356
 					if ($lac == 'S') $latitude = '-'.$latitude;
357 357
 					if ($lnc == 'W') $longitude = '-'.$longitude;
358 358
 
359
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
359
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Altitude' => 'FL'.$alt, 'Fuel' => $fuel, 'speed' => $speed);
360 360
 					$found = true;
361 361
 				}
362 362
 			}
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 					if ($lac == 'S') $latitude = '-'.$latitude;
376 376
 					if ($lnc == 'W') $longitude = '-'.$longitude;
377 377
 
378
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
378
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
379 379
 					$found = true;
380 380
 				}
381 381
 			}
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 				$dair = '';
409 409
 				$darr = '';
410 410
 				$aident = '';
411
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
411
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
412 412
 				if ($n == 8) {
413 413
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
414 414
 					$icao = trim($aident);
@@ -440,7 +440,7 @@  discard block
 block discarded – undo
440 440
 				*/
441 441
 				$dair = '';
442 442
 				$darr = '';
443
-				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
443
+				$n = sscanf($message, '%4[A-Z]%4[A-Z]%*4d', $dair, $darr);
444 444
 				if ($n == 3) {
445 445
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
446 446
 					//$icao = $Translation->checkTranslation($ident);
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
 				*/
456 456
 				$dair = '';
457 457
 				$darr = '';
458
-				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
458
+				$n = sscanf($message, '3J01 DSPTCH %*d/%*d %4s/%4s .%*6s', $dair, $darr);
459 459
 				if ($n == 3) {
460 460
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
461 461
 					//$icao = $Translation->checkTranslation($ident);
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
 				}
466 466
 			}
467 467
 			if (!$found) {
468
-				$n = sscanf($message,'MET01%4c',$airport);
468
+				$n = sscanf($message, 'MET01%4c', $airport);
469 469
 				if ($n == 1) {
470 470
 					if ($globalDebug) echo 'airport name : '.$airport;
471 471
 					$decode = array('Airport/Waypoint name' => $airport);
@@ -473,241 +473,241 @@  discard block
 block discarded – undo
473 473
 				}
474 474
 			}
475 475
 			if ($label == 'H1') {
476
-				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
477
-					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
476
+				if (preg_match('/^#CFBFLR/', $message) || preg_match('/^#CFBWRN/', $message)) {
477
+					$decode = array_merge(array('Message nature' => 'Equipment failure'), $decode);
478 478
 				}
479
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
480
-					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
479
+				elseif (preg_match('/^#DFB\*TKO/', $message) || preg_match('/^#DFBTKO/', $message)) {
480
+					$decode = array_merge(array('Message nature' => 'Take off performance data'), $decode);
481 481
 				}
482
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
483
-					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
482
+				elseif (preg_match('/^#DFB\*CRZ/', $message) || preg_match('/^#DFBCRZ/', $message)) {
483
+					$decode = array_merge(array('Message nature' => 'Cruise performance data'), $decode);
484 484
 				}
485
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
486
-					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
485
+				elseif (preg_match('/^#DFB\*WOB/', $message) || preg_match('/^#DFBWOB/', $message)) {
486
+					$decode = array_merge(array('Message nature' => 'Weather observation'), $decode);
487 487
 				}
488
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
489
-					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
488
+				elseif (preg_match(':^#DFB/PIREP:', $message)) {
489
+					$decode = array_merge(array('Message nature' => 'Pilot Report'), $decode);
490 490
 				}
491
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
492
-					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
491
+				elseif (preg_match('/^#DFBEDA/', $message) || preg_match('/^#DFBENG/', $message)) {
492
+					$decode = array_merge(array('Message nature' => 'Engine Data'), $decode);
493 493
 				}
494
-				elseif (preg_match(':^#M1AAEP:',$message)) {
495
-					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
494
+				elseif (preg_match(':^#M1AAEP:', $message)) {
495
+					$decode = array_merge(array('Message nature' => 'Position/Weather Report'), $decode);
496 496
 				}
497
-				elseif (preg_match(':^#M2APWD:',$message)) {
498
-					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
497
+				elseif (preg_match(':^#M2APWD:', $message)) {
498
+					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'), $decode);
499 499
 				}
500
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
501
-					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
500
+				elseif (preg_match(':^#M1BREQPWI:', $message)) {
501
+					$decode = array_merge(array('Message nature' => 'Predicted wind info request'), $decode);
502 502
 				}
503
-				elseif (preg_match(':^#CF:',$message)) {
504
-					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
503
+				elseif (preg_match(':^#CF:', $message)) {
504
+					$decode = array_merge(array('Message nature' => 'Central Fault Display'), $decode);
505 505
 				}
506
-				elseif (preg_match(':^#DF:',$message)) {
507
-					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
506
+				elseif (preg_match(':^#DF:', $message)) {
507
+					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'), $decode);
508 508
 				}
509
-				elseif (preg_match(':^#EC:',$message)) {
510
-					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
509
+				elseif (preg_match(':^#EC:', $message)) {
510
+					$decode = array_merge(array('Message nature' => 'Engine Display System'), $decode);
511 511
 				}
512
-				elseif (preg_match(':^#EI:',$message)) {
513
-					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
512
+				elseif (preg_match(':^#EI:', $message)) {
513
+					$decode = array_merge(array('Message nature' => 'Engine Report'), $decode);
514 514
 				}
515
-				elseif (preg_match(':^#H1:',$message)) {
516
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
515
+				elseif (preg_match(':^#H1:', $message)) {
516
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'), $decode);
517 517
 				}
518
-				elseif (preg_match(':^#H2:',$message)) {
519
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
518
+				elseif (preg_match(':^#H2:', $message)) {
519
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'), $decode);
520 520
 				}
521
-				elseif (preg_match(':^#HD:',$message)) {
522
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
521
+				elseif (preg_match(':^#HD:', $message)) {
522
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'), $decode);
523 523
 				}
524
-				elseif (preg_match(':^#M1:',$message)) {
525
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
524
+				elseif (preg_match(':^#M1:', $message)) {
525
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'), $decode);
526 526
 				}
527
-				elseif (preg_match(':^#M2:',$message)) {
528
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
527
+				elseif (preg_match(':^#M2:', $message)) {
528
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'), $decode);
529 529
 				}
530
-				elseif (preg_match(':^#M3:',$message)) {
531
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
530
+				elseif (preg_match(':^#M3:', $message)) {
531
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'), $decode);
532 532
 				}
533
-				elseif (preg_match(':^#MD:',$message)) {
534
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
533
+				elseif (preg_match(':^#MD:', $message)) {
534
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'), $decode);
535 535
 				}
536
-				elseif (preg_match(':^#PS:',$message)) {
537
-					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
536
+				elseif (preg_match(':^#PS:', $message)) {
537
+					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'), $decode);
538 538
 				}
539
-				elseif (preg_match(':^#S1:',$message)) {
540
-					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
539
+				elseif (preg_match(':^#S1:', $message)) {
540
+					$decode = array_merge(array('Message nature' => 'SDU - Left'), $decode);
541 541
 				}
542
-				elseif (preg_match(':^#S2:',$message)) {
543
-					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
542
+				elseif (preg_match(':^#S2:', $message)) {
543
+					$decode = array_merge(array('Message nature' => 'SDU - Right'), $decode);
544 544
 				}
545
-				elseif (preg_match(':^#SD:',$message)) {
546
-					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
545
+				elseif (preg_match(':^#SD:', $message)) {
546
+					$decode = array_merge(array('Message nature' => 'SDU - Selected'), $decode);
547 547
 				}
548
-				elseif (preg_match(':^#T[0-8]:',$message)) {
549
-					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
548
+				elseif (preg_match(':^#T[0-8]:', $message)) {
549
+					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'), $decode);
550 550
 				}
551
-				elseif (preg_match(':^#WO:',$message)) {
552
-					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
551
+				elseif (preg_match(':^#WO:', $message)) {
552
+					$decode = array_merge(array('Message nature' => 'Weather Observation Report'), $decode);
553 553
 				}
554
-				elseif (preg_match(':^#A1:',$message)) {
555
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
554
+				elseif (preg_match(':^#A1:', $message)) {
555
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'), $decode);
556 556
 				}
557
-				elseif (preg_match(':^#A3:',$message)) {
558
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
557
+				elseif (preg_match(':^#A3:', $message)) {
558
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'), $decode);
559 559
 				}
560
-				elseif (preg_match(':^#A4:',$message)) {
561
-					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
560
+				elseif (preg_match(':^#A4:', $message)) {
561
+					$decode = array_merge(array('Message nature' => 'Flight Systems Message'), $decode);
562 562
 				}
563
-				elseif (preg_match(':^#A6:',$message)) {
564
-					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
563
+				elseif (preg_match(':^#A6:', $message)) {
564
+					$decode = array_merge(array('Message nature' => 'Request ADS Reports'), $decode);
565 565
 				}
566
-				elseif (preg_match(':^#A8:',$message)) {
567
-					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
566
+				elseif (preg_match(':^#A8:', $message)) {
567
+					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'), $decode);
568 568
 				}
569
-				elseif (preg_match(':^#A9:',$message)) {
570
-					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
569
+				elseif (preg_match(':^#A9:', $message)) {
570
+					$decode = array_merge(array('Message nature' => 'ATIS report'), $decode);
571 571
 				}
572
-				elseif (preg_match(':^#A0:',$message)) {
573
-					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
572
+				elseif (preg_match(':^#A0:', $message)) {
573
+					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'), $decode);
574 574
 				}
575
-				elseif (preg_match(':^#AA:',$message)) {
576
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
575
+				elseif (preg_match(':^#AA:', $message)) {
576
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
577 577
 				}
578
-				elseif (preg_match(':^#AB:',$message)) {
579
-					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
578
+				elseif (preg_match(':^#AB:', $message)) {
579
+					$decode = array_merge(array('Message nature' => 'TWIP Report'), $decode);
580 580
 				}
581
-				elseif (preg_match(':^#AC:',$message)) {
582
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
581
+				elseif (preg_match(':^#AC:', $message)) {
582
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance'), $decode);
583 583
 				}
584
-				elseif (preg_match(':^#AD:',$message)) {
585
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
584
+				elseif (preg_match(':^#AD:', $message)) {
585
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'), $decode);
586 586
 				}
587
-				elseif (preg_match(':^#AF:',$message)) {
588
-					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
587
+				elseif (preg_match(':^#AF:', $message)) {
588
+					$decode = array_merge(array('Message nature' => 'CPC Command/Response'), $decode);
589 589
 				}
590
-				elseif (preg_match(':^#B1:',$message)) {
591
-					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
590
+				elseif (preg_match(':^#B1:', $message)) {
591
+					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'), $decode);
592 592
 				}
593
-				elseif (preg_match(':^#B2:',$message)) {
594
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
593
+				elseif (preg_match(':^#B2:', $message)) {
594
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'), $decode);
595 595
 				}
596
-				elseif (preg_match(':^#B3:',$message)) {
597
-					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
596
+				elseif (preg_match(':^#B3:', $message)) {
597
+					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'), $decode);
598 598
 				}
599
-				elseif (preg_match(':^#B4:',$message)) {
600
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
599
+				elseif (preg_match(':^#B4:', $message)) {
600
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'), $decode);
601 601
 				}
602
-				elseif (preg_match(':^#B6:',$message)) {
603
-					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
602
+				elseif (preg_match(':^#B6:', $message)) {
603
+					$decode = array_merge(array('Message nature' => 'Provide ADS Report'), $decode);
604 604
 				}
605
-				elseif (preg_match(':^#B8:',$message)) {
606
-					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
605
+				elseif (preg_match(':^#B8:', $message)) {
606
+					$decode = array_merge(array('Message nature' => 'Request Departure Slot'), $decode);
607 607
 				}
608
-				elseif (preg_match(':^#B9:',$message)) {
609
-					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
608
+				elseif (preg_match(':^#B9:', $message)) {
609
+					$decode = array_merge(array('Message nature' => 'Request ATIS Report'), $decode);
610 610
 				}
611
-				elseif (preg_match(':^#B0:',$message)) {
612
-					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
611
+				elseif (preg_match(':^#B0:', $message)) {
612
+					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'), $decode);
613 613
 				}
614
-				elseif (preg_match(':^#BA:',$message)) {
615
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
614
+				elseif (preg_match(':^#BA:', $message)) {
615
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
616 616
 				}
617
-				elseif (preg_match(':^#BB:',$message)) {
618
-					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
617
+				elseif (preg_match(':^#BB:', $message)) {
618
+					$decode = array_merge(array('Message nature' => 'Request TWIP Report'), $decode);
619 619
 				}
620
-				elseif (preg_match(':^#BC:',$message)) {
621
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
620
+				elseif (preg_match(':^#BC:', $message)) {
621
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'), $decode);
622 622
 				}
623
-				elseif (preg_match(':^#BD:',$message)) {
624
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
623
+				elseif (preg_match(':^#BD:', $message)) {
624
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'), $decode);
625 625
 				}
626
-				elseif (preg_match(':^#BE:',$message)) {
627
-					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
626
+				elseif (preg_match(':^#BE:', $message)) {
627
+					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'), $decode);
628 628
 				}
629
-				elseif (preg_match(':^#BF:',$message)) {
630
-					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
629
+				elseif (preg_match(':^#BF:', $message)) {
630
+					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'), $decode);
631 631
 				}
632
-				elseif (preg_match(':^#H3:',$message)) {
633
-					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
632
+				elseif (preg_match(':^#H3:', $message)) {
633
+					$decode = array_merge(array('Message nature' => 'Icing Report'), $decode);
634 634
 				}
635 635
 			}
636 636
 			if ($label == '10') {
637
-				if (preg_match(':^DTO01:',$message)) {
638
-					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
637
+				if (preg_match(':^DTO01:', $message)) {
638
+					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'), $decode);
639 639
 				}
640
-				elseif (preg_match(':^AIS01:',$message)) {
641
-					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
640
+				elseif (preg_match(':^AIS01:', $message)) {
641
+					$decode = array_merge(array('Message nature' => 'AIS Request'), $decode);
642 642
 				}
643
-				elseif (preg_match(':^FTX01:',$message)) {
644
-					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
643
+				elseif (preg_match(':^FTX01:', $message)) {
644
+					$decode = array_merge(array('Message nature' => 'Free Text Downlink'), $decode);
645 645
 				}
646
-				elseif (preg_match(':^FPL01:',$message)) {
647
-					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
646
+				elseif (preg_match(':^FPL01:', $message)) {
647
+					$decode = array_merge(array('Message nature' => 'Flight Plan Request'), $decode);
648 648
 				}
649
-				elseif (preg_match(':^WAB01:',$message)) {
650
-					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
649
+				elseif (preg_match(':^WAB01:', $message)) {
650
+					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'), $decode);
651 651
 				}
652
-				elseif (preg_match(':^MET01:',$message)) {
653
-					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
652
+				elseif (preg_match(':^MET01:', $message)) {
653
+					$decode = array_merge(array('Message nature' => 'Weather Data Request'), $decode);
654 654
 				}
655
-				elseif (preg_match(':^WAB02:',$message)) {
656
-					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
655
+				elseif (preg_match(':^WAB02:', $message)) {
656
+					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'), $decode);
657 657
 				}
658 658
 			}
659 659
 			if ($label == '15') {
660
-				if (preg_match(':^FST01:',$message)) {
661
-					$decode = array_merge(array('Message nature' => 'Flight Status Report'),$decode);
660
+				if (preg_match(':^FST01:', $message)) {
661
+					$decode = array_merge(array('Message nature' => 'Flight Status Report'), $decode);
662 662
 				}
663 663
 			}
664 664
 			if (!$found && $label == 'SA') {
665
-				$n = sscanf($message, "%d%c%c%6[0-9]", $version,$state,$type,$at);
665
+				$n = sscanf($message, "%d%c%c%6[0-9]", $version, $state, $type, $at);
666 666
 				if ($n == 4) {
667 667
 					$vsta = array('Version' => $version);
668 668
 					if ($state == 'E') {
669
-						$vsta = array_merge($vsta,array('Link state' => 'Established'));
669
+						$vsta = array_merge($vsta, array('Link state' => 'Established'));
670 670
 					}
671 671
 					elseif ($state == 'L') {
672
-						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
672
+						$vsta = array_merge($vsta, array('Link state' => 'Lost'));
673 673
 					}
674 674
 					else {
675
-						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
675
+						$vsta = array_merge($vsta, array('Link state' => 'Unknown'));
676 676
 					}
677 677
 					if ($type == 'V') {
678
-						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
678
+						$vsta = array_merge($vsta, array('Link type' => 'VHF ACARS'));
679 679
 					}
680 680
 					elseif ($type == 'S') {
681
-						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
681
+						$vsta = array_merge($vsta, array('Link type' => 'Generic SATCOM'));
682 682
 					}
683 683
 					elseif ($type == 'H') {
684
-						$vsta = array_merge($vsta,array('Link type' => 'HF'));
684
+						$vsta = array_merge($vsta, array('Link type' => 'HF'));
685 685
 					}
686 686
 					elseif ($type == 'G') {
687
-						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
687
+						$vsta = array_merge($vsta, array('Link type' => 'GlobalStar SATCOM'));
688 688
 					}
689 689
 					elseif ($type == 'C') {
690
-						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
690
+						$vsta = array_merge($vsta, array('Link type' => 'ICO SATCOM'));
691 691
 					}
692 692
 					elseif ($type == '2') {
693
-						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
693
+						$vsta = array_merge($vsta, array('Link type' => 'VDL Mode 2'));
694 694
 					}
695 695
 					elseif ($type == 'X') {
696
-						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
696
+						$vsta = array_merge($vsta, array('Link type' => 'Inmarsat Aero'));
697 697
 					}
698 698
 					elseif ($type == 'I') {
699
-						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
699
+						$vsta = array_merge($vsta, array('Link type' => 'Irridium SATCOM'));
700 700
 					}
701 701
 					else {
702
-						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
702
+						$vsta = array_merge($vsta, array('Link type' => 'Unknown'));
703 703
 					}
704
-					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
705
-					$decode = array_merge($vsta,$decode);
704
+					$vsta = array_merge($vsta, array('Event occured at' => implode(':', str_split($at, 2))));
705
+					$decode = array_merge($vsta, $decode);
706 706
 				}
707 707
 			}
708 708
 
709 709
 			$title = $this->getTitlefromLabel($label);
710
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
710
+			if ($title != '') $decode = array_merge(array('Message title' => $title), $decode);
711 711
 			/*
712 712
 			// Business jets always use GS0001
713 713
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
@@ -735,13 +735,13 @@  discard block
 block discarded – undo
735 735
 		$Translation = new Translation($this->db);
736 736
 		$message = $this->parse($data);
737 737
 		if (isset($message['registration']) && $message['registration'] != '' && $message['ident'] != '' && $message['registration'] != '!') {
738
-			$ident = (string)$message['ident'];
738
+			$ident = (string) $message['ident'];
739 739
 			$label = $message['label'];
740 740
 			$block_id = $message['block_id'];
741 741
 			$msg_no = $message['msg_no'];
742 742
 			$msg = $message['message'];
743 743
 			$decode = $message['decode'];
744
-			$registration = (string)$message['registration'];
744
+			$registration = (string) $message['registration'];
745 745
 			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
746 746
 			else $latitude = '';
747 747
 			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
@@ -755,20 +755,20 @@  discard block
 block discarded – undo
755 755
 				$Image->addSpotterImage($registration);
756 756
 			}
757 757
 			// Business jets always use GS0001
758
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
758
+			if ($ident != 'GS0001') $info = $this->addModeSData($ident, $registration, $icao, $airicao, $latitude, $longitude);
759 759
 			if ($globalDebug && isset($info) && $info != '') echo $info;
760 760
 			if (count($decode) > 0) $decode_json = json_encode($decode);
761 761
 			else $decode_json = '';
762 762
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
763
-				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
763
+				$Schedule->addSchedule($icao, $decode['Departure airport'], $decode['Departure hour'], $decode['Arrival airport'], $decode['Arrival hour'], 'ACARS');
764 764
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
765
-				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
765
+				$Schedule->addSchedule($icao, $decode['Departure airport'], '', $decode['Arrival airport'], '', 'ACARS');
766 766
 			}
767
-			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
768
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
769
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
767
+			$result = $this->addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
768
+			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10', '80', '81', '82', '3F');
769
+			if ($result && in_array($label, $globalACARSArchive)) $this->addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
770 770
 			if ($globalDebug && count($decode) > 0) {
771
-				echo "Human readable data : ".implode(' - ',$decode)."\n";
771
+				echo "Human readable data : ".implode(' - ', $decode)."\n";
772 772
 			}
773 773
 		}
774 774
 	}
@@ -783,7 +783,7 @@  discard block
 block discarded – undo
783 783
 	* @param String $msg_no Number of the ACARS message
784 784
 	* @param String $message ACARS message
785 785
 	*/
786
-	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
786
+	public function addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
787 787
 		global $globalDebug;
788 788
 		date_default_timezone_set('UTC');
789 789
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
@@ -791,21 +791,21 @@  discard block
 block discarded – undo
791 791
 			$this->db = $Connection->db;
792 792
 			if ($globalDebug) echo "Test if not already in Live ACARS table...";
793 793
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
794
-			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
794
+			$query_test_values = array(':ident' => $ident, ':registration' => $registration, ':message' => $message);
795 795
 			try {
796 796
 				$stht = $this->db->prepare($query_test);
797 797
 				$stht->execute($query_test_values);
798
-			} catch(PDOException $e) {
798
+			} catch (PDOException $e) {
799 799
 				return "error : ".$e->getMessage();
800 800
 			}
801 801
 			if ($stht->fetchColumn() == 0) {
802 802
 				if ($globalDebug) echo "Add Live ACARS data...";
803 803
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
804
-				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
804
+				$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode, ':date' => date("Y-m-d H:i:s"));
805 805
 				try {
806 806
 					$sth = $this->db->prepare($query);
807 807
 					$sth->execute($query_values);
808
-				} catch(PDOException $e) {
808
+				} catch (PDOException $e) {
809 809
 					return "error : ".$e->getMessage();
810 810
 				}
811 811
 			} else {
@@ -827,10 +827,10 @@  discard block
 block discarded – undo
827 827
 	* @param String $msg_no Number of the ACARS message
828 828
 	* @param String $message ACARS message
829 829
 	*/
830
-	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
830
+	public function addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
831 831
 		global $globalDebug;
832 832
 		date_default_timezone_set('UTC');
833
-		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/',$message) === 0 && preg_match('/^ARR0/',$message) === 0 && preg_match('/^ETA/',$message) === 0 && preg_match('/^WXR/',$message) === 0 && preg_match('/^FTX01.FIC/',$message) === 0) {
833
+		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/', $message) === 0 && preg_match('/^ARR0/', $message) === 0 && preg_match('/^ETA/', $message) === 0 && preg_match('/^WXR/', $message) === 0 && preg_match('/^FTX01.FIC/', $message) === 0) {
834 834
 			/*
835 835
 				    if ($globalDebug) echo "Test if not already in Archive ACARS table...";
836 836
 			    	    $query_test = "SELECT COUNT(*) as nb FROM acars_archive WHERE ident = :ident AND registration = :registration AND message = :message";
@@ -845,11 +845,11 @@  discard block
 block discarded – undo
845 845
 			*/
846 846
 			if ($globalDebug) echo "Add Live ACARS data...";
847 847
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
848
-			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
848
+			$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
849 849
 			try {
850 850
 				$sth = $this->db->prepare($query);
851 851
 				$sth->execute($query_values);
852
-			} catch(PDOException $e) {
852
+			} catch (PDOException $e) {
853 853
 				return "error : ".$e->getMessage();
854 854
 			}
855 855
 			if ($globalDebug) echo "Done\n";
@@ -870,7 +870,7 @@  discard block
 block discarded – undo
870 870
 		try {
871 871
 			$sth = $this->db->prepare($query);
872 872
 			$sth->execute($query_values);
873
-		} catch(PDOException $e) {
873
+		} catch (PDOException $e) {
874 874
 			echo "error : ".$e->getMessage();
875 875
 			return '';
876 876
 		}
@@ -890,7 +890,7 @@  discard block
 block discarded – undo
890 890
 		try {
891 891
 			$sth = $this->db->prepare($query);
892 892
 			$sth->execute($query_values);
893
-		} catch(PDOException $e) {
893
+		} catch (PDOException $e) {
894 894
 			echo "error : ".$e->getMessage();
895 895
 			return array();
896 896
 		}
@@ -911,7 +911,7 @@  discard block
 block discarded – undo
911 911
 		try {
912 912
 			$sth = $this->db->prepare($query);
913 913
 			$sth->execute($query_values);
914
-		} catch(PDOException $e) {
914
+		} catch (PDOException $e) {
915 915
 			echo "error : ".$e->getMessage();
916 916
 			return array();
917 917
 		}
@@ -925,7 +925,7 @@  discard block
 block discarded – undo
925 925
 	*
926 926
 	* @return Array Return ACARS data in array
927 927
 	*/
928
-	public function getLatestAcarsData($limit = '',$label = '') {
928
+	public function getLatestAcarsData($limit = '', $label = '') {
929 929
 		global $globalURL, $globalDBdriver;
930 930
 		$Image = new Image($this->db);
931 931
 		$Spotter = new Spotter($this->db);
@@ -936,8 +936,8 @@  discard block
 block discarded – undo
936 936
 		if ($limit != "")
937 937
 		{
938 938
 			$limit_array = explode(",", $limit);
939
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
940
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
939
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
940
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
941 941
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
942 942
 			{
943 943
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -953,46 +953,46 @@  discard block
 block discarded – undo
953 953
 		try {
954 954
 			$sth = $this->db->prepare($query);
955 955
 			$sth->execute($query_values);
956
-		} catch(PDOException $e) {
956
+		} catch (PDOException $e) {
957 957
 			return "error : ".$e->getMessage();
958 958
 		}
959 959
 		$i = 0;
960 960
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
961 961
 			$data = array();
962 962
 			if ($row['registration'] != '') {
963
-				$row['registration'] = str_replace('.','',$row['registration']);
963
+				$row['registration'] = str_replace('.', '', $row['registration']);
964 964
 				$image_array = $Image->getSpotterImage($row['registration']);
965
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
966
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
967
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
965
+				if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
966
+				else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
967
+			} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
968 968
 			if ($row['registration'] == '') $row['registration'] = 'NA';
969 969
 			if ($row['ident'] == '') $row['ident'] = 'NA';
970
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
970
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
971 971
 			if (isset($identicao[0])) {
972
-				if (substr($row['ident'],0,2) == 'AF') {
973
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
974
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
975
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
976
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
972
+				if (substr($row['ident'], 0, 2) == 'AF') {
973
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
974
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
975
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
976
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
977 977
 			} else $icao = $row['ident'];
978
-			$icao = $Translation->checkTranslation($icao,false);
979
-			$decode = json_decode($row['decode'],true);
978
+			$icao = $Translation->checkTranslation($icao, false);
979
+			$decode = json_decode($row['decode'], true);
980 980
 			$found = false;
981
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
981
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
982 982
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
983 983
 				if (isset($airport_info[0]['icao'])) {
984 984
 					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
985 985
 					$found = true;
986 986
 				}
987 987
 			}
988
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
988
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
989 989
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
990 990
 				if (isset($airport_info[0]['icao'])) {
991 991
 					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
992 992
 					$found = true;
993 993
 				}
994 994
 			}
995
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
995
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
996 996
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
997 997
 				if (isset($airport_info[0]['icao'])) {
998 998
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
@@ -1000,7 +1000,7 @@  discard block
 block discarded – undo
1000 1000
 				}
1001 1001
 			}
1002 1002
 			if ($found) $row['decode'] = json_encode($decode);
1003
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1003
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1004 1004
 			$result[] = $data;
1005 1005
 			$i++;
1006 1006
 		}
@@ -1016,7 +1016,7 @@  discard block
 block discarded – undo
1016 1016
 	*
1017 1017
 	* @return Array Return ACARS data in array
1018 1018
 	*/
1019
-	public function getArchiveAcarsData($limit = '',$label = '') {
1019
+	public function getArchiveAcarsData($limit = '', $label = '') {
1020 1020
 		global $globalURL, $globalDBdriver;
1021 1021
 		$Image = new Image($this->db);
1022 1022
 		$Spotter = new Spotter($this->db);
@@ -1026,8 +1026,8 @@  discard block
 block discarded – undo
1026 1026
 		if ($limit != "")
1027 1027
 		{
1028 1028
 			$limit_array = explode(",", $limit);
1029
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1030
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1029
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1030
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1031 1031
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1032 1032
 			{
1033 1033
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -1048,43 +1048,43 @@  discard block
 block discarded – undo
1048 1048
 		try {
1049 1049
 			$sth = $this->db->prepare($query);
1050 1050
 			$sth->execute($query_values);
1051
-		} catch(PDOException $e) {
1051
+		} catch (PDOException $e) {
1052 1052
 			return "error : ".$e->getMessage();
1053 1053
 		}
1054
-		$i=0;
1054
+		$i = 0;
1055 1055
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
1056 1056
 			$data = array();
1057 1057
 			if ($row['registration'] != '') {
1058
-				$row['registration'] = str_replace('.','',$row['registration']);
1058
+				$row['registration'] = str_replace('.', '', $row['registration']);
1059 1059
 				$image_array = $Image->getSpotterImage($row['registration']);
1060
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
1061
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1062
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1060
+				if (count($image_array) > 0) $data = array_merge($data, array('image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
1061
+				else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
1062
+			} else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
1063 1063
 			$icao = '';
1064 1064
 			if ($row['registration'] == '') $row['registration'] = 'NA';
1065 1065
 			if ($row['ident'] == '') $row['ident'] = 'NA';
1066
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
1066
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
1067 1067
 			if (isset($identicao[0])) {
1068
-				if (substr($row['ident'],0,2) == 'AF') {
1069
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1070
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1071
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1072
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
1068
+				if (substr($row['ident'], 0, 2) == 'AF') {
1069
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1070
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
1071
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
1072
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
1073 1073
 			} else $icao = $row['ident'];
1074 1074
 			$icao = $Translation->checkTranslation($icao);
1075
-			$decode = json_decode($row['decode'],true);
1075
+			$decode = json_decode($row['decode'], true);
1076 1076
 			$found = false;
1077
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
1077
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
1078 1078
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
1079 1079
 				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1080 1080
 				$found = true;
1081 1081
 			}
1082
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
1082
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
1083 1083
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
1084 1084
 				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1085 1085
 				$found = true;
1086 1086
 			}
1087
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
1087
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
1088 1088
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
1089 1089
 				if (isset($airport_info[0]['icao'])) {
1090 1090
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
@@ -1092,7 +1092,7 @@  discard block
 block discarded – undo
1092 1092
 				}
1093 1093
 			}
1094 1094
 			if ($found) $row['decode'] = json_encode($decode);
1095
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1095
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1096 1096
 			$result[] = $data;
1097 1097
 			$i++;
1098 1098
 		}
@@ -1110,7 +1110,7 @@  discard block
 block discarded – undo
1110 1110
 	* @param String $icao
1111 1111
 	* @param String $ICAOTypeCode
1112 1112
 	*/
1113
-	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
1113
+	public function addModeSData($ident, $registration, $icao = '', $ICAOTypeCode = '', $latitude = '', $longitude = '') {
1114 1114
 		global $globalDebug, $globalDBdriver;
1115 1115
 		$ident = trim($ident);
1116 1116
 		$Translation = new Translation($this->db);
@@ -1123,7 +1123,7 @@  discard block
 block discarded – undo
1123 1123
 			if ($globalDebug) echo "Ident or registration null, exit\n";
1124 1124
 			return '';
1125 1125
 		}
1126
-		$registration = str_replace('.','',$registration);
1126
+		$registration = str_replace('.', '', $registration);
1127 1127
 		$ident = $Translation->ident2icao($ident);
1128 1128
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
1129 1129
 		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
@@ -1132,7 +1132,7 @@  discard block
 block discarded – undo
1132 1132
 		try {
1133 1133
 			$sthsi = $this->db->prepare($querysi);
1134 1134
 			$sthsi->execute($querysi_values);
1135
-		} catch(PDOException $e) {
1135
+		} catch (PDOException $e) {
1136 1136
 			if ($globalDebug) echo $e->getMessage();
1137 1137
 			return "error : ".$e->getMessage();
1138 1138
 		}
@@ -1142,8 +1142,8 @@  discard block
 block discarded – undo
1142 1142
 			$Translation = new Translation($this->db);
1143 1143
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
1144 1144
 			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1145
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1146
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1145
+			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'], $ident, 'ACARS');
1146
+			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'], $ident, 'ACARS');
1147 1147
 		} else {
1148 1148
 			if ($registration != '' && $latitude != '' && $longitude != '') {
1149 1149
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1151,7 +1151,7 @@  discard block
 block discarded – undo
1151 1151
 				try {
1152 1152
 					$sth = $this->db->prepare($query);
1153 1153
 					$sth->execute($query_values);
1154
-				} catch(PDOException $e) {
1154
+				} catch (PDOException $e) {
1155 1155
 					if ($globalDebug) echo $e->getMessage();
1156 1156
 					return "error : ".$e->getMessage();
1157 1157
 				}
@@ -1159,7 +1159,7 @@  discard block
 block discarded – undo
1159 1159
 				$sth->closeCursor();
1160 1160
 				if (isset($result['modes'])) $hex = $result['modes'];
1161 1161
 				else $hex = '';
1162
-				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
1162
+				$SI_data = array('hex' => $hex, 'ident' => $ident, 'aircraft_icao' => $ICAOTypeCode, 'registration' => $registration, 'latitude' => $latitude, '$longitude' => $longitude, 'format_source' => 'ACARS');
1163 1163
 				if ($this->fromACARSscript) $this->SI->add($SI_data);
1164 1164
 			}
1165 1165
 		}
@@ -1169,7 +1169,7 @@  discard block
 block discarded – undo
1169 1169
 		try {
1170 1170
 			$sth = $this->db->prepare($query);
1171 1171
 			$sth->execute($query_values);
1172
-		} catch(PDOException $e) {
1172
+		} catch (PDOException $e) {
1173 1173
 			if ($globalDebug) echo $e->getMessage();
1174 1174
 			return "error : ".$e->getMessage();
1175 1175
 		}
@@ -1179,7 +1179,7 @@  discard block
 block discarded – undo
1179 1179
 			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
1180 1180
 			else $ModeS = '';
1181 1181
 			if ($ModeS == '') {
1182
-				$id = explode('-',$result['flightaware_id']);
1182
+				$id = explode('-', $result['flightaware_id']);
1183 1183
 				$ModeS = $id[0];
1184 1184
 			}
1185 1185
 			if ($ModeS != '') {
@@ -1189,20 +1189,20 @@  discard block
 block discarded – undo
1189 1189
 				try {
1190 1190
 					$sthc = $this->db->prepare($queryc);
1191 1191
 					$sthc->execute($queryc_values);
1192
-				} catch(PDOException $e) {
1192
+				} catch (PDOException $e) {
1193 1193
 					if ($globalDebug) echo $e->getMessage();
1194 1194
 					return "error : ".$e->getMessage();
1195 1195
 				}
1196 1196
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
1197 1197
 				$sthc->closeCursor();
1198
-				if (count($row) ==  0) {
1198
+				if (count($row) == 0) {
1199 1199
 					if ($globalDebug) echo " Add to ModeS table - ";
1200 1200
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
1201
-					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1201
+					$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1202 1202
 					try {
1203 1203
 						$sthi = $this->db->prepare($queryi);
1204 1204
 						$sthi->execute($queryi_values);
1205
-					} catch(PDOException $e) {
1205
+					} catch (PDOException $e) {
1206 1206
 						if ($globalDebug) echo $e->getMessage();
1207 1207
 						return "error : ".$e->getMessage();
1208 1208
 					}
@@ -1210,15 +1210,15 @@  discard block
 block discarded – undo
1210 1210
 					if ($globalDebug) echo " Update ModeS table - ";
1211 1211
 					if ($ICAOTypeCode != '') {
1212 1212
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1213
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1213
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1214 1214
 					} else {
1215 1215
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1216
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration);
1216
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration);
1217 1217
 					}
1218 1218
 					try {
1219 1219
 						$sthi = $this->db->prepare($queryi);
1220 1220
 						$sthi->execute($queryi_values);
1221
-					} catch(PDOException $e) {
1221
+					} catch (PDOException $e) {
1222 1222
 						if ($globalDebug) echo $e->getMessage();
1223 1223
 						return "error : ".$e->getMessage();
1224 1224
 					}
@@ -1255,12 +1255,12 @@  discard block
 block discarded – undo
1255 1255
 					elseif ($globalDBdriver == 'pgsql') {
1256 1256
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
1257 1257
 					}
1258
-					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
1258
+					$queryi_values = array(':Registration' => $registration, ':ident' => $icao);
1259 1259
 				}
1260 1260
 				try {
1261 1261
 					$sthi = $this->db->prepare($queryi);
1262 1262
 					$sthi->execute($queryi_values);
1263
-				} catch(PDOException $e) {
1263
+				} catch (PDOException $e) {
1264 1264
 					if ($globalDebug) echo $e->getMessage();
1265 1265
 					return "error : ".$e->getMessage();
1266 1266
 				}
Please login to merge, or discard this patch.
require/class.Stats.php 1 patch
Spacing   +540 added lines, -540 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@  discard block
 block discarded – undo
19 19
 		if ($this->db === null) die('Error: No DB connection.');
20 20
 	}
21 21
 
22
-	public function addLastStatsUpdate($type,$stats_date) {
22
+	public function addLastStatsUpdate($type, $stats_date) {
23 23
 		$query = "DELETE FROM config WHERE name = :type;
24 24
 			    INSERT INTO config (name,value) VALUES (:type,:stats_date);";
25
-		$query_values = array('type' => $type,':stats_date' => $stats_date);
25
+		$query_values = array('type' => $type, ':stats_date' => $stats_date);
26 26
 		try {
27 27
 			$sth = $this->db->prepare($query);
28 28
 			$sth->execute($query_values);
29
-		} catch(PDOException $e) {
29
+		} catch (PDOException $e) {
30 30
 			return "error : ".$e->getMessage();
31 31
 		}
32 32
 	}
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		try {
37 37
 			$sth = $this->db->prepare($query);
38 38
 			$sth->execute(array(':type' => $type));
39
-		} catch(PDOException $e) {
39
+		} catch (PDOException $e) {
40 40
 			echo "error : ".$e->getMessage();
41 41
 		}
42 42
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		try {
58 58
 			$sth = $this->db->prepare($query);
59 59
 			$sth->execute(array(':filter_name' => $filter_name));
60
-		} catch(PDOException $e) {
60
+		} catch (PDOException $e) {
61 61
 			return "error : ".$e->getMessage();
62 62
 		}
63 63
 	}
@@ -70,14 +70,14 @@  discard block
 block discarded – undo
70 70
 		try {
71 71
 			$sth = $this->db->prepare($query);
72 72
 			$sth->execute();
73
-		} catch(PDOException $e) {
73
+		} catch (PDOException $e) {
74 74
 			return "error : ".$e->getMessage();
75 75
 		}
76 76
 		$query = "DELETE FROM stats_aircraft WHERE filter_name = :filter_name;DELETE FROM stats_airline WHERE filter_name = :filter_name;DELETE FROM stats_callsign WHERE filter_name = :filter_name;DELETE FROM stats_country WHERE filter_name = :filter_name;DELETE FROM stats_owner WHERE filter_name = :filter_name;DELETE FROM stats_pilot WHERE filter_name = :filter_name;DELETE FROM stats_registration WHERE filter_name = :filter_name;";
77 77
 		try {
78 78
 			$sth = $this->db->prepare($query);
79 79
 			$sth->execute(array(':filter_name' => $filter_name));
80
-		} catch(PDOException $e) {
80
+		} catch (PDOException $e) {
81 81
 			return "error : ".$e->getMessage();
82 82
 		}
83 83
 	}
@@ -89,77 +89,77 @@  discard block
 block discarded – undo
89 89
 		 try {
90 90
 			$sth = $this->db->prepare($query);
91 91
 			$sth->execute(array(':filter_name' => $filter_name));
92
-		} catch(PDOException $e) {
92
+		} catch (PDOException $e) {
93 93
 			echo "error : ".$e->getMessage();
94 94
 		}
95 95
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
96 96
 		if (empty($all)) {
97 97
 			$filters = array();
98 98
 			if ($filter_name != '') {
99
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
99
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
100 100
 			}
101 101
 			$Spotter = new Spotter($this->db);
102
-			$all = $Spotter->getAllAirlineNames('',NULL,$filters);
102
+			$all = $Spotter->getAllAirlineNames('', NULL, $filters);
103 103
 		}
104 104
 		return $all;
105 105
 	}
106
-	public function getAllAircraftTypes($stats_airline = '',$filter_name = '') {
106
+	public function getAllAircraftTypes($stats_airline = '', $filter_name = '') {
107 107
 		if ($filter_name == '') $filter_name = $this->filter_name;
108 108
 		$query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC";
109 109
 		try {
110 110
 			$sth = $this->db->prepare($query);
111
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
112
-		} catch(PDOException $e) {
111
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
112
+		} catch (PDOException $e) {
113 113
 			echo "error : ".$e->getMessage();
114 114
 		}
115 115
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
116 116
 		return $all;
117 117
 	}
118
-	public function getAllManufacturers($stats_airline = '',$filter_name = '') {
118
+	public function getAllManufacturers($stats_airline = '', $filter_name = '') {
119 119
 		if ($filter_name == '') $filter_name = $this->filter_name;
120 120
 		$query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC";
121 121
 		try {
122 122
 			$sth = $this->db->prepare($query);
123
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
124
-		} catch(PDOException $e) {
123
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
124
+		} catch (PDOException $e) {
125 125
 			echo "error : ".$e->getMessage();
126 126
 		}
127 127
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
128 128
 		return $all;
129 129
 	}
130
-	public function getAllAirportNames($stats_airline = '',$filter_name = '') {
130
+	public function getAllAirportNames($stats_airline = '', $filter_name = '') {
131 131
 		if ($filter_name == '') $filter_name = $this->filter_name;
132 132
 		$query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC";
133 133
 		try {
134 134
 			$sth = $this->db->prepare($query);
135
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
136
-		} catch(PDOException $e) {
135
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
136
+		} catch (PDOException $e) {
137 137
 			echo "error : ".$e->getMessage();
138 138
 		}
139 139
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
140 140
 		return $all;
141 141
 	}
142 142
 
143
-	public function getAllOwnerNames($stats_airline = '',$filter_name = '') {
143
+	public function getAllOwnerNames($stats_airline = '', $filter_name = '') {
144 144
 		if ($filter_name == '') $filter_name = $this->filter_name;
145 145
 		$query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC";
146 146
 		try {
147 147
 			$sth = $this->db->prepare($query);
148
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
149
-		} catch(PDOException $e) {
148
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
149
+		} catch (PDOException $e) {
150 150
 			echo "error : ".$e->getMessage();
151 151
 		}
152 152
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
153 153
 		return $all;
154 154
 	}
155 155
 
156
-	public function getAllPilotNames($stats_airline = '',$filter_name = '') {
156
+	public function getAllPilotNames($stats_airline = '', $filter_name = '') {
157 157
 		if ($filter_name == '') $filter_name = $this->filter_name;
158 158
 		$query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC";
159 159
 		try {
160 160
 			$sth = $this->db->prepare($query);
161
-			$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
162
-		} catch(PDOException $e) {
161
+			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
162
+		} catch (PDOException $e) {
163 163
 			echo "error : ".$e->getMessage();
164 164
 		}
165 165
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -167,23 +167,23 @@  discard block
 block discarded – undo
167 167
 	}
168 168
 
169 169
 
170
-	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
170
+	public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
171 171
 		global $globalStatsFilters;
172 172
 		if ($filter_name == '') $filter_name = $this->filter_name;
173
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
173
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
174 174
 			$Spotter = new Spotter($this->db);
175
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
175
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
176 176
 			$alliance_airlines = array();
177 177
 			foreach ($airlines as $airline) {
178
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
178
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
179 179
 			}
180 180
 			if ($year == '' && $month == '') {
181
-				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182
-				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
181
+				if ($limit) $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC LIMIT 10 OFFSET 0";
182
+				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
183 183
 				try {
184 184
 					$sth = $this->db->prepare($query);
185 185
 					$sth->execute(array(':filter_name' => $filter_name));
186
-				} catch(PDOException $e) {
186
+				} catch (PDOException $e) {
187 187
 					echo "error : ".$e->getMessage();
188 188
 				}
189 189
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -194,29 +194,29 @@  discard block
 block discarded – undo
194 194
 				else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC";
195 195
 				try {
196 196
 					$sth = $this->db->prepare($query);
197
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
198
-				} catch(PDOException $e) {
197
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
198
+				} catch (PDOException $e) {
199 199
 					echo "error : ".$e->getMessage();
200 200
 				}
201 201
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
202 202
 			} else $all = array();
203 203
 		}
204 204
 		if (empty($all)) {
205
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
206
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
205
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
206
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
207 207
 			} else {
208
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
208
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
209 209
 			}
210 210
 			if ($filter_name != '') {
211
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
211
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
212 212
 			}
213 213
 			$Spotter = new Spotter($this->db);
214 214
 			//$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month);
215
-			$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters);
215
+			$all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters);
216 216
 		}
217 217
 		return $all;
218 218
 	}
219
-	public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') {
219
+	public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') {
220 220
 		global $globalStatsFilters;
221 221
 		if ($filter_name == '') $filter_name = $this->filter_name;
222 222
 		if ($year == '' && $month == '') {
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 			try {
226 226
 				$sth = $this->db->prepare($query);
227 227
 				$sth->execute(array(':filter_name' => $filter_name));
228
-			} catch(PDOException $e) {
228
+			} catch (PDOException $e) {
229 229
 				echo "error : ".$e->getMessage();
230 230
 			}
231 231
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -233,32 +233,32 @@  discard block
 block discarded – undo
233 233
 		if (empty($all)) {
234 234
 			$Spotter = new Spotter($this->db);
235 235
 			$filters = array();
236
-			$filters = array('year' => $year,'month' => $month);
236
+			$filters = array('year' => $year, 'month' => $month);
237 237
 			if ($filter_name != '') {
238
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
238
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
239 239
 			}
240 240
 			//$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month);
241
-			$all = $Spotter->countAllAirlineCountries($limit,$filters);
241
+			$all = $Spotter->countAllAirlineCountries($limit, $filters);
242 242
 		}
243 243
 		return $all;
244 244
 	}
245
-	public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') {
245
+	public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
246 246
 		global $globalStatsFilters;
247 247
 		if ($filter_name == '') $filter_name = $this->filter_name;
248
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
248
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
249 249
 			$Spotter = new Spotter($this->db);
250
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
250
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
251 251
 			$alliance_airlines = array();
252 252
 			foreach ($airlines as $airline) {
253
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
253
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
254 254
 			}
255 255
 			if ($year == '' && $month == '') {
256
-				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257
-				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
256
+				if ($limit) $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC LIMIT 10 OFFSET 0";
257
+				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
258 258
 				try {
259 259
 					$sth = $this->db->prepare($query);
260 260
 					$sth->execute(array(':filter_name' => $filter_name));
261
-				} catch(PDOException $e) {
261
+				} catch (PDOException $e) {
262 262
 					echo "error : ".$e->getMessage();
263 263
 				}
264 264
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -269,21 +269,21 @@  discard block
 block discarded – undo
269 269
 				else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC";
270 270
 				try {
271 271
 					$sth = $this->db->prepare($query);
272
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
273
-				} catch(PDOException $e) {
272
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
273
+				} catch (PDOException $e) {
274 274
 					echo "error : ".$e->getMessage();
275 275
 				}
276 276
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
277 277
 			} else $all = array();
278 278
 		}
279 279
 		if (empty($all)) {
280
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
281
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
280
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
281
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
282 282
 			} else {
283
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
283
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
284 284
 			}
285 285
 			if ($filter_name != '') {
286
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
286
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
287 287
 			}
288 288
 			$Spotter = new Spotter($this->db);
289 289
 			//$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month);
@@ -292,23 +292,23 @@  discard block
 block discarded – undo
292 292
 		return $all;
293 293
 	}
294 294
 
295
-	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') {
295
+	public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
296 296
 		global $globalStatsFilters;
297 297
 		if ($filter_name == '') $filter_name = $this->filter_name;
298
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
298
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
299 299
 			$Spotter = new Spotter($this->db);
300
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
300
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
301 301
 			$alliance_airlines = array();
302 302
 			foreach ($airlines as $airline) {
303
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
303
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
304 304
 			}
305 305
 			if ($year == '' && $month == '') {
306
-				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307
-				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
306
+				if ($limit) $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC LIMIT 10 OFFSET 0";
307
+				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
308 308
 				try {
309 309
 					$sth = $this->db->prepare($query);
310 310
 					$sth->execute(array(':filter_name' => $filter_name));
311
-				} catch(PDOException $e) {
311
+				} catch (PDOException $e) {
312 312
 					echo "error : ".$e->getMessage();
313 313
 				}
314 314
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -319,61 +319,61 @@  discard block
 block discarded – undo
319 319
 				else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC";
320 320
 				try {
321 321
 					$sth = $this->db->prepare($query);
322
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
323
-				} catch(PDOException $e) {
322
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
323
+				} catch (PDOException $e) {
324 324
 					echo "error : ".$e->getMessage();
325 325
 				}
326 326
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
327 327
 			} else $all = array();
328 328
 		}
329 329
 		if (empty($all)) {
330
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
331
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
330
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
331
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
332 332
 			} else {
333
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
333
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
334 334
 			}
335 335
 			if ($filter_name != '') {
336
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
336
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
337 337
 			}
338 338
 			$Spotter = new Spotter($this->db);
339 339
 			//$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month);
340
-			$all = $Spotter->countAllArrivalCountries($limit,$filters);
340
+			$all = $Spotter->countAllArrivalCountries($limit, $filters);
341 341
 		}
342 342
 		return $all;
343 343
 	}
344 344
 	public function countAllDepartureCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
345 345
 		global $globalStatsFilters;
346 346
 		if ($filter_name == '') $filter_name = $this->filter_name;
347
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
347
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
348 348
 			$Spotter = new Spotter($this->db);
349
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
349
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
350 350
 			$alliance_airlines = array();
351 351
 			foreach ($airlines as $airline) {
352
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
352
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
353 353
 			}
354
-			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355
-			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
354
+			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
355
+			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
356 356
 			$query_values = array(':filter_name' => $filter_name);
357 357
 		} else {
358 358
 			if ($limit) $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC LIMIT 10 OFFSET 0";
359 359
 			else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC";
360
-			$query_values = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
360
+			$query_values = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
361 361
 		}
362 362
 		try {
363 363
 			$sth = $this->db->prepare($query);
364 364
 			$sth->execute($query_values);
365
-		} catch(PDOException $e) {
365
+		} catch (PDOException $e) {
366 366
 			echo "error : ".$e->getMessage();
367 367
 		}
368 368
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
369 369
 		if (empty($all)) {
370
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
371
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
370
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
371
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
372 372
 			} else {
373
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
373
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
374 374
 			}
375 375
 			if ($filter_name != '') {
376
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
376
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
377 377
 			}
378 378
 			$Spotter = new Spotter($this->db);
379 379
 			//$all = $Spotter->countAllDepartureCountries($filters,$year,$month);
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 		return $all;
383 383
 	}
384 384
 
385
-	public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') {
385
+	public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') {
386 386
 		global $globalStatsFilters, $globalVATSIM, $globalIVAO;
387 387
 		if ($filter_name == '') $filter_name = $this->filter_name;
388 388
 		if ($year == '' && $month == '') {
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 			if (isset($forsource)) {
392 392
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
393 393
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC";
394
-				$query_values = array(':filter_name' => $filter_name,':forsource' => $forsource);
394
+				$query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource);
395 395
 			} else {
396 396
 				if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0";
397 397
 				else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC";
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 			try {
401 401
 				$sth = $this->db->prepare($query);
402 402
 				$sth->execute($query_values);
403
-			} catch(PDOException $e) {
403
+			} catch (PDOException $e) {
404 404
 				echo "error : ".$e->getMessage();
405 405
 			}
406 406
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -408,32 +408,32 @@  discard block
 block discarded – undo
408 408
                 if (empty($all)) {
409 409
 	                $Spotter = new Spotter($this->db);
410 410
             		$filters = array();
411
-			$filters = array('year' => $year,'month' => $month);
411
+			$filters = array('year' => $year, 'month' => $month);
412 412
             		if ($filter_name != '') {
413
-            			$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
413
+            			$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
414 414
 			}
415 415
 			//$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month);
416
-    		        $all = $Spotter->countAllAirlines($limit,0,'',$filters);
416
+    		        $all = $Spotter->countAllAirlines($limit, 0, '', $filters);
417 417
                 }
418 418
                 return $all;
419 419
 	}
420
-	public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
420
+	public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
421 421
 		global $globalStatsFilters;
422 422
 		if ($filter_name == '') $filter_name = $this->filter_name;
423
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
423
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
424 424
 			$Spotter = new Spotter($this->db);
425
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
425
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
426 426
 			$alliance_airlines = array();
427 427
 			foreach ($airlines as $airline) {
428
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
428
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
429 429
 			}
430 430
 			if ($year == '' && $month == '') {
431
-				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432
-				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
431
+				if ($limit) $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name, s.registration FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC LIMIT 10 OFFSET 0";
432
+				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
433 433
 				try {
434 434
 					$sth = $this->db->prepare($query);
435 435
 					$sth->execute(array(':filter_name' => $filter_name));
436
-				} catch(PDOException $e) {
436
+				} catch (PDOException $e) {
437 437
 					echo "error : ".$e->getMessage();
438 438
 				}
439 439
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -444,45 +444,45 @@  discard block
 block discarded – undo
444 444
 				else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC";
445 445
 				try {
446 446
 					$sth = $this->db->prepare($query);
447
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
448
-				} catch(PDOException $e) {
447
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
448
+				} catch (PDOException $e) {
449 449
 					echo "error : ".$e->getMessage();
450 450
 				}
451 451
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
452 452
 			} else $all = array();
453 453
 		}
454 454
 		if (empty($all)) {
455
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
456
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
455
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
456
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
457 457
 			} else {
458
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
458
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
459 459
 			}
460 460
 			if ($filter_name != '') {
461
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
461
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
462 462
 			}
463 463
 			$Spotter = new Spotter($this->db);
464 464
 			//$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month);
465
-			$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters);
465
+			$all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters);
466 466
 		}
467 467
 		return $all;
468 468
 	}
469
-	public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
469
+	public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
470 470
 		global $globalStatsFilters;
471 471
 		if ($filter_name == '') $filter_name = $this->filter_name;
472
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
472
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
473 473
 			$Spotter = new Spotter($this->db);
474
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
474
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
475 475
 			$alliance_airlines = array();
476 476
 			foreach ($airlines as $airline) {
477
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
477
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
478 478
 			}
479 479
 			if ($year == '' && $month == '') {
480
-				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481
-				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
480
+				if ($limit) $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC LIMIT 10 OFFSET 0";
481
+				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
482 482
 				 try {
483 483
 					$sth = $this->db->prepare($query);
484 484
 					$sth->execute(array(':filter_name' => $filter_name));
485
-				} catch(PDOException $e) {
485
+				} catch (PDOException $e) {
486 486
 					echo "error : ".$e->getMessage();
487 487
 				}
488 488
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -493,46 +493,46 @@  discard block
 block discarded – undo
493 493
 				else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC";
494 494
 				 try {
495 495
 					$sth = $this->db->prepare($query);
496
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
497
-				} catch(PDOException $e) {
496
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
497
+				} catch (PDOException $e) {
498 498
 					echo "error : ".$e->getMessage();
499 499
 				}
500 500
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
501 501
 			} else $all = array();
502 502
 		}
503 503
 		if (empty($all)) {
504
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
505
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
504
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
505
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
506 506
 			} else {
507
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
507
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
508 508
 			}
509 509
 			if ($filter_name != '') {
510
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
510
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
511 511
 			}
512 512
 			$Spotter = new Spotter($this->db);
513 513
 			//$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month);
514
-			$all = $Spotter->countAllCallsigns($limit,0,'',$filters);
514
+			$all = $Spotter->countAllCallsigns($limit, 0, '', $filters);
515 515
 		}
516 516
 		return $all;
517 517
 	}
518
-	public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') {
518
+	public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
519 519
 		$Connection = new Connection();
520 520
 		if ($filter_name == '') $filter_name = $this->filter_name;
521 521
 		if ($Connection->tableExists('countries')) {
522
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
522
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
523 523
 				$Spotter = new Spotter($this->db);
524
-				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
524
+				$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
525 525
 				if ($year == '' && $month == '') {
526 526
 					$alliance_airlines = array();
527 527
 					foreach ($airlines as $airline) {
528
-						$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
528
+						$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
529 529
 					}
530
-					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531
-					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
530
+					if ($limit) $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC LIMIT 20 OFFSET 0";
531
+					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY flight_count DESC";
532 532
 					 try {
533 533
 						$sth = $this->db->prepare($query);
534 534
 						$sth->execute(array(':filter_name' => $filter_name));
535
-					} catch(PDOException $e) {
535
+					} catch (PDOException $e) {
536 536
 						echo "error : ".$e->getMessage();
537 537
 					}
538 538
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -544,8 +544,8 @@  discard block
 block discarded – undo
544 544
 					else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC";
545 545
 					 try {
546 546
 						$sth = $this->db->prepare($query);
547
-						$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
548
-					} catch(PDOException $e) {
547
+						$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
548
+					} catch (PDOException $e) {
549 549
 						echo "error : ".$e->getMessage();
550 550
 					}
551 551
 					$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
 			return array();
563 563
 		}
564 564
 	}
565
-	public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') {
565
+	public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
566 566
 		global $globalStatsFilters;
567 567
 		if ($filter_name == '') $filter_name = $this->filter_name;
568 568
 		if ($year == '' && $month == '') {
@@ -570,41 +570,41 @@  discard block
 block discarded – undo
570 570
 			else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC";
571 571
 			try {
572 572
 				$sth = $this->db->prepare($query);
573
-				$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
574
-			} catch(PDOException $e) {
573
+				$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
574
+			} catch (PDOException $e) {
575 575
 				echo "error : ".$e->getMessage();
576 576
 			}
577 577
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
578 578
 		} else $all = array();
579 579
 		if (empty($all)) {
580
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
580
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
581 581
 			if ($filter_name != '') {
582
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
582
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
583 583
 			}
584 584
 			$Spotter = new Spotter($this->db);
585 585
 			//$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month);
586
-			$all = $Spotter->countAllPilots($limit,0,'',$filters);
586
+			$all = $Spotter->countAllPilots($limit, 0, '', $filters);
587 587
 		}
588 588
 		return $all;
589 589
 	}
590 590
 
591
-	public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') {
591
+	public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
592 592
 		global $globalStatsFilters;
593 593
 		if ($filter_name == '') $filter_name = $this->filter_name;
594
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
594
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
595 595
 			$Spotter = new Spotter($this->db);
596
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
596
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
597 597
 			if ($year == '' && $month == '') {
598 598
 				$alliance_airlines = array();
599 599
 				foreach ($airlines as $airline) {
600
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
600
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
601 601
 				}
602
-				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603
-				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
602
+				if ($limit) $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC LIMIT 10 OFFSET 0";
603
+				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY owner_count DESC";
604 604
 				try {
605 605
 					$sth = $this->db->prepare($query);
606 606
 					$sth->execute(array(':filter_name' => $filter_name));
607
-				} catch(PDOException $e) {
607
+				} catch (PDOException $e) {
608 608
 					echo "error : ".$e->getMessage();
609 609
 				}
610 610
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -615,45 +615,45 @@  discard block
 block discarded – undo
615 615
 				else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC";
616 616
 				try {
617 617
 					$sth = $this->db->prepare($query);
618
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
619
-				} catch(PDOException $e) {
618
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
619
+				} catch (PDOException $e) {
620 620
 					echo "error : ".$e->getMessage();
621 621
 				}
622 622
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
623 623
 			} else $all = array();
624 624
 		}
625 625
 		if (empty($all)) {
626
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
627
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
626
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
627
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
628 628
 			} else {
629
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
629
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
630 630
 			}
631 631
 			if ($filter_name != '') {
632
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
632
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
633 633
 			}
634 634
 			$Spotter = new Spotter($this->db);
635 635
 			//$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month);
636
-			$all = $Spotter->countAllOwners($limit,0,'',$filters);
636
+			$all = $Spotter->countAllOwners($limit, 0, '', $filters);
637 637
 		}
638 638
 		return $all;
639 639
 	}
640
-	public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
640
+	public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
641 641
 		global $globalStatsFilters;
642 642
 		if ($filter_name == '') $filter_name = $this->filter_name;
643
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
643
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
644 644
 			$Spotter = new Spotter($this->db);
645
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
645
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
646 646
 			if ($year == '' && $month == '') {
647 647
 				$alliance_airlines = array();
648 648
 				foreach ($airlines as $airline) {
649
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
649
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
650 650
 				}
651
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652
-				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
651
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC LIMIT 10 OFFSET 0";
652
+				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
653 653
 				try {
654 654
 					$sth = $this->db->prepare($query);
655 655
 					$sth->execute(array(':filter_name' => $filter_name));
656
-				} catch(PDOException $e) {
656
+				} catch (PDOException $e) {
657 657
 					echo "error : ".$e->getMessage();
658 658
 				}
659 659
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -664,27 +664,27 @@  discard block
 block discarded – undo
664 664
 				else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC";
665 665
 				try {
666 666
 					$sth = $this->db->prepare($query);
667
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
668
-				} catch(PDOException $e) {
667
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
668
+				} catch (PDOException $e) {
669 669
 					echo "error : ".$e->getMessage();
670 670
 				}
671 671
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
672 672
 			} else $all = array();
673 673
 		}
674 674
 		if (empty($all)) {
675
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
676
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
675
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
676
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
677 677
 			} else {
678
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
678
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
679 679
 			}
680 680
 			if ($filter_name != '') {
681
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
681
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
682 682
 			}
683 683
 			$Spotter = new Spotter($this->db);
684 684
 //            		$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month);
685 685
   //      		$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month);
686
-			$pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters);
687
-			$dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters);
686
+			$pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters);
687
+			$dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters);
688 688
 			$all = array();
689 689
 			foreach ($pall as $value) {
690 690
 				$icao = $value['airport_departure_icao'];
@@ -700,27 +700,27 @@  discard block
 block discarded – undo
700 700
 			foreach ($all as $key => $row) {
701 701
 				$count[$key] = $row['airport_departure_icao_count'];
702 702
 			}
703
-			array_multisort($count,SORT_DESC,$all);
703
+			array_multisort($count, SORT_DESC, $all);
704 704
 		}
705 705
 		return $all;
706 706
 	}
707
-	public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') {
707
+	public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') {
708 708
 		global $globalStatsFilters;
709 709
 		if ($filter_name == '') $filter_name = $this->filter_name;
710
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
710
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
711 711
 			$Spotter = new Spotter($this->db);
712
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
712
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
713 713
 			if ($year == '' && $month == '') {
714 714
 				$alliance_airlines = array();
715 715
 				foreach ($airlines as $airline) {
716
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
716
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
717 717
 				}
718
-				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719
-				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
718
+				if ($limit) $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC LIMIT 10 OFFSET 0";
719
+				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
720 720
 				try {
721 721
 					$sth = $this->db->prepare($query);
722 722
 					$sth->execute(array(':filter_name' => $filter_name));
723
-				} catch(PDOException $e) {
723
+				} catch (PDOException $e) {
724 724
 					echo "error : ".$e->getMessage();
725 725
 				}
726 726
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -731,27 +731,27 @@  discard block
 block discarded – undo
731 731
 				else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC";
732 732
 				try {
733 733
 					$sth = $this->db->prepare($query);
734
-					$sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name));
735
-				} catch(PDOException $e) {
734
+					$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
735
+				} catch (PDOException $e) {
736 736
 					echo "error : ".$e->getMessage();
737 737
 				}
738 738
 				$all = $sth->fetchAll(PDO::FETCH_ASSOC);
739 739
 			} else $all = array();
740 740
 		}
741 741
 		if (empty($all)) {
742
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
743
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
742
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
743
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
744 744
 			} else {
745
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
745
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
746 746
 			}
747 747
 			if ($filter_name != '') {
748
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
748
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
749 749
 			}
750 750
 			$Spotter = new Spotter($this->db);
751 751
 //			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month);
752 752
 //			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month);
753
-			$pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters);
754
-			$dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters);
753
+			$pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters);
754
+			$dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters);
755 755
 			$all = array();
756 756
 			foreach ($pall as $value) {
757 757
 				$icao = $value['airport_arrival_icao'];
@@ -767,26 +767,26 @@  discard block
 block discarded – undo
767 767
 			foreach ($all as $key => $row) {
768 768
 				$count[$key] = $row['airport_arrival_icao_count'];
769 769
 			}
770
-			array_multisort($count,SORT_DESC,$all);
770
+			array_multisort($count, SORT_DESC, $all);
771 771
 		}
772 772
 		return $all;
773 773
 	}
774
-	public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') {
774
+	public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') {
775 775
 		global $globalDBdriver, $globalStatsFilters;
776 776
 		if ($filter_name == '') $filter_name = $this->filter_name;
777
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
777
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
778 778
 			$Spotter = new Spotter($this->db);
779
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
779
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
780 780
 			$alliance_airlines = array();
781 781
 			foreach ($airlines as $airline) {
782
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
782
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
783 783
 			}
784 784
 			if ($globalDBdriver == 'mysql') {
785
-				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786
-				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
785
+				if ($limit) $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 12 MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
786
+				else $query = "SELECT MONTH(stats_date) as month_name, YEAR(stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
787 787
 			} else {
788
-				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789
-				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
788
+				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
789
+				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date";
790 790
 			}
791 791
 			$query_data = array(':filter_name' => $filter_name);
792 792
 		} else {
@@ -797,23 +797,23 @@  discard block
 block discarded – undo
797 797
 				if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
798 798
 				else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name";
799 799
 			}
800
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
800
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
801 801
 		}
802 802
 		try {
803 803
 			$sth = $this->db->prepare($query);
804 804
 			$sth->execute($query_data);
805
-		} catch(PDOException $e) {
805
+		} catch (PDOException $e) {
806 806
 			echo "error : ".$e->getMessage();
807 807
 		}
808 808
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
809 809
 		if (empty($all)) {
810
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
811
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
810
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
811
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
812 812
 			} else {
813 813
 				$filters = array('airlines' => array($stats_airline));
814 814
 			}
815 815
 			if ($filter_name != '') {
816
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
816
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
817 817
 			}
818 818
 			$Spotter = new Spotter($this->db);
819 819
 			$all = $Spotter->countAllMonthsLastYear($filters);
@@ -821,57 +821,57 @@  discard block
 block discarded – undo
821 821
 		return $all;
822 822
 	}
823 823
 	
824
-	public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') {
824
+	public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') {
825 825
 		global $globalStatsFilters;
826 826
 		if ($filter_name == '') $filter_name = $this->filter_name;
827
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
827
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
828 828
 			$Spotter = new Spotter($this->db);
829
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
829
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
830 830
 			$alliance_airlines = array();
831 831
 			foreach ($airlines as $airline) {
832
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
832
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
833 833
 			}
834
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
834
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline  IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
835 835
 			$query_data = array(':filter_name' => $filter_name);
836 836
 		} else {
837 837
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name";
838
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
838
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
839 839
 		}
840 840
 		try {
841 841
 			$sth = $this->db->prepare($query);
842 842
 			$sth->execute($query_data);
843
-		} catch(PDOException $e) {
843
+		} catch (PDOException $e) {
844 844
 			echo "error : ".$e->getMessage();
845 845
 		}
846 846
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
847 847
 		if (empty($all)) {
848
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
849
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
848
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
849
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
850 850
 			} else {
851 851
 				$filters = array('airlines' => array($stats_airline));
852 852
 			}
853 853
 			if ($filter_name != '') {
854
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
854
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
855 855
 			}
856 856
 			$Spotter = new Spotter($this->db);
857 857
 			$all = $Spotter->countAllDatesLastMonth($filters);
858 858
 		}
859 859
 		return $all;
860 860
 	}
861
-	public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') {
861
+	public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') {
862 862
 		global $globalDBdriver, $globalStatsFilters;
863 863
 		if ($filter_name == '') $filter_name = $this->filter_name;
864
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
864
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
865 865
 			$Spotter = new Spotter($this->db);
866
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
866
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
867 867
 			$alliance_airlines = array();
868 868
 			foreach ($airlines as $airline) {
869
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
869
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
870 870
 			}
871 871
 			if ($globalDBdriver == 'mysql') {
872
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
872
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
873 873
 			} else {
874
-				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
874
+				$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
875 875
 			}
876 876
 			$query_data = array(':filter_name' => $filter_name);
877 877
 		} else {
@@ -880,60 +880,60 @@  discard block
 block discarded – undo
880 880
 			} else {
881 881
 				$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name";
882 882
 			}
883
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
883
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
884 884
 		}
885 885
 		try {
886 886
 			$sth = $this->db->prepare($query);
887 887
 			$sth->execute($query_data);
888
-		} catch(PDOException $e) {
888
+		} catch (PDOException $e) {
889 889
 			echo "error : ".$e->getMessage();
890 890
 		}
891 891
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
892 892
 		if (empty($all)) {
893
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
894
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
893
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
894
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
895 895
 			} else {
896 896
 				$filters = array('airlines' => array($stats_airline));
897 897
 			}
898 898
 			if ($filter_name != '') {
899
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
899
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
900 900
 			}
901 901
 			$Spotter = new Spotter($this->db);
902 902
 			$all = $Spotter->countAllDatesLast7Days($filters);
903 903
 		}
904 904
 		return $all;
905 905
 	}
906
-	public function countAllDates($stats_airline = '',$filter_name = '') {
906
+	public function countAllDates($stats_airline = '', $filter_name = '') {
907 907
 		global $globalStatsFilters;
908 908
 		if ($filter_name == '') $filter_name = $this->filter_name;
909
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
909
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
910 910
 			$Spotter = new Spotter($this->db);
911
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
911
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
912 912
 			$alliance_airlines = array();
913 913
 			foreach ($airlines as $airline) {
914
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
914
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
915 915
 			}
916
-			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
916
+			$query = "SELECT flight_date as date_name, SUM(cnt) as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date ORDER BY date_count DESC";
917 917
 			$query_data = array(':filter_name' => $filter_name);
918 918
 		} else {
919 919
 			$query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC";
920
-			$query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name);
920
+			$query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
921 921
 		}
922 922
 		try {
923 923
 			$sth = $this->db->prepare($query);
924 924
 			$sth->execute($query_data);
925
-		} catch(PDOException $e) {
925
+		} catch (PDOException $e) {
926 926
 			echo "error : ".$e->getMessage();
927 927
 		}
928 928
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
929 929
 		if (empty($all)) {
930
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
931
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
930
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
931
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
932 932
 			} else {
933 933
 				$filters = array('airlines' => array($stats_airline));
934 934
 			}
935 935
 			if ($filter_name != '') {
936
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
936
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
937 937
 			}
938 938
 			$Spotter = new Spotter($this->db);
939 939
 			$all = $Spotter->countAllDates($filters);
@@ -948,34 +948,34 @@  discard block
 block discarded – undo
948 948
 		try {
949 949
 			$sth = $this->db->prepare($query);
950 950
 			$sth->execute($query_data);
951
-		} catch(PDOException $e) {
951
+		} catch (PDOException $e) {
952 952
 			echo "error : ".$e->getMessage();
953 953
 		}
954 954
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
955 955
 		if (empty($all)) {
956 956
 			$filters = array();
957 957
 			if ($filter_name != '') {
958
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
958
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
959 959
 			}
960 960
 			$Spotter = new Spotter($this->db);
961 961
 			$all = $Spotter->countAllDatesByAirlines($filters);
962 962
 		}
963 963
 		return $all;
964 964
 	}
965
-	public function countAllMonths($stats_airline = '',$filter_name = '') {
965
+	public function countAllMonths($stats_airline = '', $filter_name = '') {
966 966
 		global $globalStatsFilters, $globalDBdriver;
967 967
 		if ($filter_name == '') $filter_name = $this->filter_name;
968
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
968
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
969 969
 			$Spotter = new Spotter($this->db);
970
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
970
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
971 971
 			$alliance_airlines = array();
972 972
 			foreach ($airlines as $airline) {
973
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
973
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
974 974
 			}
975 975
 			if ($globalDBdriver == 'mysql') {
976
-				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
976
+				$query = "SELECT YEAR(stats_date) AS year_name,MONTH(stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
977 977
 			} else {
978
-				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
978
+				$query = "SELECT EXTRACT(YEAR FROM stats_date) AS year_name,EXTRACT(MONTH FROM stats_date) AS month_name, SUM(cnt) as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY stats_date ORDER BY date_count DESC";
979 979
 			}
980 980
 			$query_data = array(':filter_name' => $filter_name);
981 981
 		} else {
@@ -989,18 +989,18 @@  discard block
 block discarded – undo
989 989
 		try {
990 990
 			$sth = $this->db->prepare($query);
991 991
 			$sth->execute($query_data);
992
-		} catch(PDOException $e) {
992
+		} catch (PDOException $e) {
993 993
 			echo "error : ".$e->getMessage();
994 994
 		}
995 995
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
996 996
 		if (empty($all)) {
997
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
998
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
997
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
998
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
999 999
 			} else {
1000 1000
 				$filters = array('airlines' => array($stats_airline));
1001 1001
 			}
1002 1002
 			if ($filter_name != '') {
1003
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1003
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1004 1004
 			}
1005 1005
 			$Spotter = new Spotter($this->db);
1006 1006
 			$all = $Spotter->countAllMonths($filters);
@@ -1017,7 +1017,7 @@  discard block
 block discarded – undo
1017 1017
 		try {
1018 1018
 			$sth = $this->db->prepare($query);
1019 1019
 			$sth->execute();
1020
-		} catch(PDOException $e) {
1020
+		} catch (PDOException $e) {
1021 1021
 			echo "error : ".$e->getMessage();
1022 1022
 		}
1023 1023
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1037,7 +1037,7 @@  discard block
 block discarded – undo
1037 1037
 		try {
1038 1038
 			$sth = $this->db->prepare($query);
1039 1039
 			$sth->execute();
1040
-		} catch(PDOException $e) {
1040
+		} catch (PDOException $e) {
1041 1041
 			echo "error : ".$e->getMessage();
1042 1042
 		}
1043 1043
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1054,32 +1054,32 @@  discard block
 block discarded – undo
1054 1054
 		try {
1055 1055
 			$sth = $this->db->prepare($query);
1056 1056
 			$sth->execute(array(':filter_name' => $filter_name));
1057
-		} catch(PDOException $e) {
1057
+		} catch (PDOException $e) {
1058 1058
 			echo "error : ".$e->getMessage();
1059 1059
 		}
1060 1060
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1061 1061
 		if (empty($all)) {
1062 1062
 			$filters = array();
1063 1063
 			if ($filter_name != '') {
1064
-					$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1064
+					$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1065 1065
 			}
1066 1066
 			$Spotter = new Spotter($this->db);
1067 1067
 			$all = $Spotter->countAllMilitaryMonths($filters);
1068 1068
 		}
1069 1069
 		return $all;
1070 1070
 	}
1071
-	public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') {
1071
+	public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') {
1072 1072
 		global $globalTimezone, $globalDBdriver, $globalStatsFilters;
1073 1073
 		if ($filter_name == '') $filter_name = $this->filter_name;
1074
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1074
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1075 1075
 			$Spotter = new Spotter($this->db);
1076
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1076
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1077 1077
 			$alliance_airlines = array();
1078 1078
 			foreach ($airlines as $airline) {
1079
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1079
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1080 1080
 			}
1081
-			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082
-			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1081
+			if ($limit) $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1082
+			else $query = "SELECT flight_date as hour_name, SUM(cnt) as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name GROUP BY flight_date";
1083 1083
 			$query_data = array(':filter_name' => $filter_name);
1084 1084
 		} else {
1085 1085
 			if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name";
@@ -1097,37 +1097,37 @@  discard block
 block discarded – undo
1097 1097
 		try {
1098 1098
 			$sth = $this->db->prepare($query);
1099 1099
 			$sth->execute($query_data);
1100
-		} catch(PDOException $e) {
1100
+		} catch (PDOException $e) {
1101 1101
 			echo "error : ".$e->getMessage();
1102 1102
 		}
1103 1103
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1104 1104
 		if (empty($all)) {
1105
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1106
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1105
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1106
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1107 1107
 			} else {
1108 1108
 				$filters = array('airlines' => array($stats_airline));
1109 1109
 			}
1110 1110
 			if ($filter_name != '') {
1111
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1111
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1112 1112
 			}
1113 1113
 			$Spotter = new Spotter($this->db);
1114
-			$all = $Spotter->countAllHours($orderby,$filters);
1114
+			$all = $Spotter->countAllHours($orderby, $filters);
1115 1115
 		}
1116 1116
 		return $all;
1117 1117
 	}
1118
-	public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') {
1118
+	public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1119 1119
 		global $globalStatsFilters;
1120 1120
 		if ($filter_name == '') $filter_name = $this->filter_name;
1121 1121
 		if ($year == '') $year = date('Y');
1122
-		$all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month);
1122
+		$all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month);
1123 1123
 		if (empty($all)) {
1124
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1125
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1124
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1125
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1126 1126
 			} else {
1127
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1127
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1128 1128
 			}
1129 1129
 			if ($filter_name != '') {
1130
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1130
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1131 1131
 			}
1132 1132
 			$Spotter = new Spotter($this->db);
1133 1133
 			//$all = $Spotter->countOverallFlights($filters,$year,$month);
@@ -1135,16 +1135,16 @@  discard block
 block discarded – undo
1135 1135
 		}
1136 1136
 		return $all;
1137 1137
 	}
1138
-	public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') {
1138
+	public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') {
1139 1139
 		global $globalStatsFilters;
1140 1140
 		if ($filter_name == '') $filter_name = $this->filter_name;
1141 1141
 		if ($year == '') $year = date('Y');
1142
-		$all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month);
1142
+		$all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month);
1143 1143
 		if (empty($all)) {
1144 1144
 			$filters = array();
1145
-			$filters = array('year' => $year,'month' => $month);
1145
+			$filters = array('year' => $year, 'month' => $month);
1146 1146
 			if ($filter_name != '') {
1147
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1147
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1148 1148
 			}
1149 1149
 			$Spotter = new Spotter($this->db);
1150 1150
 			//$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month);
@@ -1152,19 +1152,19 @@  discard block
 block discarded – undo
1152 1152
 		}
1153 1153
 		return $all;
1154 1154
 	}
1155
-	public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') {
1155
+	public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1156 1156
 		global $globalStatsFilters;
1157 1157
 		if ($filter_name == '') $filter_name = $this->filter_name;
1158 1158
 		if ($year == '') $year = date('Y');
1159
-		$all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month);
1159
+		$all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month);
1160 1160
 		if (empty($all)) {
1161
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1162
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1161
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1162
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1163 1163
 			} else {
1164
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1164
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1165 1165
 			}
1166 1166
 			if ($filter_name != '') {
1167
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1167
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1168 1168
 			}
1169 1169
 			$Spotter = new Spotter($this->db);
1170 1170
 			//$all = $Spotter->countOverallArrival($filters,$year,$month);
@@ -1172,48 +1172,48 @@  discard block
 block discarded – undo
1172 1172
 		}
1173 1173
 		return $all;
1174 1174
 	}
1175
-	public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1175
+	public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1176 1176
 		global $globalStatsFilters;
1177 1177
 		if ($filter_name == '') $filter_name = $this->filter_name;
1178
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1178
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1179 1179
 			$Spotter = new Spotter($this->db);
1180
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1180
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1181 1181
 			if ($year == '' && $month == '') {
1182 1182
 				$alliance_airlines = array();
1183 1183
 				foreach ($airlines as $airline) {
1184
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1184
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1185 1185
 				}
1186
-				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1186
+				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1187 1187
 				try {
1188 1188
 					$sth = $this->db->prepare($query);
1189 1189
 					$sth->execute(array(':filter_name' => $filter_name));
1190
-				} catch(PDOException $e) {
1190
+				} catch (PDOException $e) {
1191 1191
 					echo "error : ".$e->getMessage();
1192 1192
 				}
1193 1193
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1194 1194
 				$all = $result[0]['nb'];
1195
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1195
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1196 1196
 		} else {
1197 1197
 			if ($year == '' && $month == '') {
1198 1198
 				$query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name";
1199 1199
 				try {
1200 1200
 					$sth = $this->db->prepare($query);
1201
-					$sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline));
1202
-				} catch(PDOException $e) {
1201
+					$sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline));
1202
+				} catch (PDOException $e) {
1203 1203
 					echo "error : ".$e->getMessage();
1204 1204
 				}
1205 1205
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1206 1206
 				$all = $result[0]['nb'];
1207
-			} else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month);
1207
+			} else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month);
1208 1208
 		}
1209 1209
 		if (empty($all)) {
1210
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1211
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1210
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1211
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1212 1212
 			} else {
1213
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1213
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1214 1214
 			}
1215 1215
 			if ($filter_name != '') {
1216
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1216
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1217 1217
 			}
1218 1218
 			$Spotter = new Spotter($this->db);
1219 1219
 			//$all = $Spotter->countOverallAircrafts($filters,$year,$month);
@@ -1221,7 +1221,7 @@  discard block
 block discarded – undo
1221 1221
 		}
1222 1222
 		return $all;
1223 1223
 	}
1224
-	public function countOverallAirlines($filter_name = '',$year = '',$month = '') {
1224
+	public function countOverallAirlines($filter_name = '', $year = '', $month = '') {
1225 1225
 		global $globalStatsFilters;
1226 1226
 		if ($filter_name == '') $filter_name = $this->filter_name;
1227 1227
 		if ($year == '' && $month == '') {
@@ -1229,17 +1229,17 @@  discard block
 block discarded – undo
1229 1229
 			try {
1230 1230
 				$sth = $this->db->prepare($query);
1231 1231
 				$sth->execute(array(':filter_name' => $filter_name));
1232
-			} catch(PDOException $e) {
1232
+			} catch (PDOException $e) {
1233 1233
 				echo "error : ".$e->getMessage();
1234 1234
 			}
1235 1235
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1236 1236
 			$all = $result[0]['nb_airline'];
1237
-		} else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month);
1237
+		} else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month);
1238 1238
 		if (empty($all)) {
1239 1239
 			$filters = array();
1240
-			$filters = array('year' => $year,'month' => $month);
1240
+			$filters = array('year' => $year, 'month' => $month);
1241 1241
 			if ($filter_name != '') {
1242
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1242
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1243 1243
 			}
1244 1244
 			$Spotter = new Spotter($this->db);
1245 1245
 			//$all = $Spotter->countOverallAirlines($filters,$year,$month);
@@ -1247,29 +1247,29 @@  discard block
 block discarded – undo
1247 1247
 		}
1248 1248
 		return $all;
1249 1249
 	}
1250
-	public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') {
1250
+	public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1251 1251
 		global $globalStatsFilters;
1252 1252
 		if ($filter_name == '') $filter_name = $this->filter_name;
1253
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1253
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1254 1254
 			$Spotter = new Spotter($this->db);
1255
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1255
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1256 1256
 			if ($year == '' && $month == '') {
1257 1257
 				$alliance_airlines = array();
1258 1258
 				foreach ($airlines as $airline) {
1259
-					$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1259
+					$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1260 1260
 				}
1261
-				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1261
+				$query = "SELECT count(*) as nb FROM stats_owner WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1262 1262
 				$query_values = array(':filter_name' => $filter_name);
1263 1263
 				try {
1264 1264
 					$sth = $this->db->prepare($query);
1265 1265
 					$sth->execute($query_values);
1266
-				} catch(PDOException $e) {
1266
+				} catch (PDOException $e) {
1267 1267
 					echo "error : ".$e->getMessage();
1268 1268
 				}
1269 1269
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1270 1270
 				$all = $result[0]['nb'];
1271 1271
 			} else {
1272
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1272
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1273 1273
 			}
1274 1274
 		} else {
1275 1275
 			if ($year == '' && $month == '') {
@@ -1278,23 +1278,23 @@  discard block
 block discarded – undo
1278 1278
 				try {
1279 1279
 					$sth = $this->db->prepare($query);
1280 1280
 					$sth->execute($query_values);
1281
-				} catch(PDOException $e) {
1281
+				} catch (PDOException $e) {
1282 1282
 					echo "error : ".$e->getMessage();
1283 1283
 				}
1284 1284
 				$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1285 1285
 				$all = $result[0]['nb'];
1286 1286
 			} else {
1287
-				$all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month);
1287
+				$all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month);
1288 1288
 			}
1289 1289
 		}
1290 1290
 		if (empty($all)) {
1291
-			if (strpos($stats_airline,'alliance_') !== FALSE) {
1292
-				$filters = array('alliance' => str_replace('_',' ',str_replace('alliance_','',$stats_airline)),'year' => $year,'month' => $month);
1291
+			if (strpos($stats_airline, 'alliance_') !== FALSE) {
1292
+				$filters = array('alliance' => str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)), 'year' => $year, 'month' => $month);
1293 1293
 			} else {
1294
-				$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1294
+				$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1295 1295
 			}
1296 1296
 			if ($filter_name != '') {
1297
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1297
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1298 1298
 			}
1299 1299
 			$Spotter = new Spotter($this->db);
1300 1300
 			//$all = $Spotter->countOverallOwners($filters,$year,$month);
@@ -1302,7 +1302,7 @@  discard block
 block discarded – undo
1302 1302
 		}
1303 1303
 		return $all;
1304 1304
 	}
1305
-	public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') {
1305
+	public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') {
1306 1306
 		global $globalStatsFilters;
1307 1307
 		if ($filter_name == '') $filter_name = $this->filter_name;
1308 1308
 		//if ($year == '') $year = date('Y');
@@ -1312,18 +1312,18 @@  discard block
 block discarded – undo
1312 1312
 			try {
1313 1313
 				$sth = $this->db->prepare($query);
1314 1314
 				$sth->execute($query_values);
1315
-			} catch(PDOException $e) {
1315
+			} catch (PDOException $e) {
1316 1316
 				echo "error : ".$e->getMessage();
1317 1317
 			}
1318 1318
 			$result = $sth->fetchAll(PDO::FETCH_ASSOC);
1319 1319
 			$all = $result[0]['nb'];
1320 1320
 		} else {
1321
-			$all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month);
1321
+			$all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month);
1322 1322
 		}
1323 1323
 		if (empty($all)) {
1324
-			$filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month);
1324
+			$filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month);
1325 1325
 			if ($filter_name != '') {
1326
-				$filters = array_merge($filters,$globalStatsFilters[$filter_name]);
1326
+				$filters = array_merge($filters, $globalStatsFilters[$filter_name]);
1327 1327
 			}
1328 1328
 			$Spotter = new Spotter($this->db);
1329 1329
 			//$all = $Spotter->countOverallPilots($filters,$year,$month);
@@ -1332,104 +1332,104 @@  discard block
 block discarded – undo
1332 1332
 		return $all;
1333 1333
 	}
1334 1334
 
1335
-	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') {
1335
+	public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') {
1336 1336
 		if ($filter_name == '') $filter_name = $this->filter_name;
1337
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1337
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1338 1338
 			$Spotter = new Spotter($this->db);
1339
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1339
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1340 1340
 			$alliance_airlines = array();
1341 1341
 			foreach ($airlines as $airline) {
1342
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1342
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1343 1343
 			}
1344
-			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
1345
-			$query_values = array(':airport_icao' => $airport_icao,':filter_name' => $filter_name);
1344
+			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name ORDER BY date";
1345
+			$query_values = array(':airport_icao' => $airport_icao, ':filter_name' => $filter_name);
1346 1346
 		} else {
1347 1347
 			$query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date";
1348
-			$query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1348
+			$query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1349 1349
 		}
1350 1350
 		try {
1351 1351
 			$sth = $this->db->prepare($query);
1352 1352
 			$sth->execute($query_values);
1353
-		} catch(PDOException $e) {
1353
+		} catch (PDOException $e) {
1354 1354
 			echo "error : ".$e->getMessage();
1355 1355
 		}
1356 1356
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1357 1357
 		return $all;
1358 1358
 	}
1359
-	public function getStats($type,$stats_airline = '', $filter_name = '') {
1359
+	public function getStats($type, $stats_airline = '', $filter_name = '') {
1360 1360
 		if ($filter_name == '') $filter_name = $this->filter_name;
1361 1361
 		$query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date";
1362
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1362
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1363 1363
 		try {
1364 1364
 			$sth = $this->db->prepare($query);
1365 1365
 			$sth->execute($query_values);
1366
-		} catch(PDOException $e) {
1366
+		} catch (PDOException $e) {
1367 1367
 			echo "error : ".$e->getMessage();
1368 1368
 		}
1369 1369
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1370 1370
 		return $all;
1371 1371
 	}
1372
-	public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') {
1372
+	public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') {
1373 1373
 		if ($filter_name == '') $filter_name = $this->filter_name;
1374 1374
 		$query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name";
1375
-		$query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1375
+		$query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1376 1376
 		try {
1377 1377
 			$sth = $this->db->prepare($query);
1378 1378
 			$sth->execute($query_values);
1379
-		} catch(PDOException $e) {
1379
+		} catch (PDOException $e) {
1380 1380
 			echo "error : ".$e->getMessage();
1381 1381
 		}
1382 1382
 	}
1383
-	public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') {
1383
+	public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') {
1384 1384
 		if ($filter_name == '') $filter_name = $this->filter_name;
1385 1385
 		global $globalArchiveMonths, $globalDBdriver;
1386
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1386
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1387 1387
 			$Spotter = new Spotter($this->db);
1388
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1388
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1389 1389
 			$alliance_airlines = array();
1390 1390
 			foreach ($airlines as $airline) {
1391
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1391
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1392 1392
 			}
1393 1393
 			if ($globalDBdriver == 'mysql') {
1394 1394
 				if ($month == '') {
1395
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1395
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1396 1396
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1397 1397
 				} else {
1398
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1399
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1398
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1399
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1400 1400
 				}
1401 1401
 			} else {
1402 1402
 				if ($month == '') {
1403
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1403
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1404 1404
 					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name);
1405 1405
 				} else {
1406
-					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1407
-					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name,':month' => $month);
1406
+					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1407
+					$query_values = array(':type' => $type, ':year' => $year, ':filter_name' => $filter_name, ':month' => $month);
1408 1408
 				}
1409 1409
 			}
1410 1410
 		} else {
1411 1411
 			if ($globalDBdriver == 'mysql') {
1412 1412
 				if ($month == '') {
1413 1413
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
1414
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1414
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1415 1415
 				} else {
1416 1416
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
1417
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1417
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1418 1418
 				}
1419 1419
 			} else {
1420 1420
 				if ($month == '') {
1421 1421
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name";
1422
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1422
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1423 1423
 				} else {
1424 1424
 					$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name";
1425
-					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month);
1425
+					$query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month);
1426 1426
 				}
1427 1427
 			}
1428 1428
 		}
1429 1429
 		try {
1430 1430
 			$sth = $this->db->prepare($query);
1431 1431
 			$sth->execute($query_values);
1432
-		} catch(PDOException $e) {
1432
+		} catch (PDOException $e) {
1433 1433
 			echo "error : ".$e->getMessage();
1434 1434
 		}
1435 1435
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1438,17 +1438,17 @@  discard block
 block discarded – undo
1438 1438
 	public function getStatsTotal($type, $stats_airline = '', $filter_name = '') {
1439 1439
 		global $globalArchiveMonths, $globalDBdriver;
1440 1440
 		if ($filter_name == '') $filter_name = $this->filter_name;
1441
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1441
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1442 1442
 			$Spotter = new Spotter($this->db);
1443
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1443
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1444 1444
 			$alliance_airlines = array();
1445 1445
 			foreach ($airlines as $airline) {
1446
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1446
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1447 1447
 			}
1448 1448
 			if ($globalDBdriver == 'mysql') {
1449
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1449
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL ".$globalArchiveMonths." MONTH) AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1450 1450
 			} else {
1451
-				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1451
+				$query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND stats_date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveMonths." MONTHS' AND stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1452 1452
 			}
1453 1453
 			$query_values = array(':type' => $type, ':filter_name' => $filter_name);
1454 1454
 		} else {
@@ -1462,7 +1462,7 @@  discard block
 block discarded – undo
1462 1462
 		try {
1463 1463
 			$sth = $this->db->prepare($query);
1464 1464
 			$sth->execute($query_values);
1465
-		} catch(PDOException $e) {
1465
+		} catch (PDOException $e) {
1466 1466
 			echo "error : ".$e->getMessage();
1467 1467
 		}
1468 1468
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1471,17 +1471,17 @@  discard block
 block discarded – undo
1471 1471
 	public function getStatsAircraftTotal($stats_airline = '', $filter_name = '') {
1472 1472
 		global $globalArchiveMonths, $globalDBdriver;
1473 1473
 		if ($filter_name == '') $filter_name = $this->filter_name;
1474
-		if (strpos($stats_airline,'alliance_') !== FALSE) {
1474
+		if (strpos($stats_airline, 'alliance_') !== FALSE) {
1475 1475
 			$Spotter = new Spotter($this->db);
1476
-			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_',' ',str_replace('alliance_','',$stats_airline)));
1476
+			$airlines = $Spotter->getAllAirlineNamesByAlliance(str_replace('_', ' ', str_replace('alliance_', '', $stats_airline)));
1477 1477
 			$alliance_airlines = array();
1478 1478
 			foreach ($airlines as $airline) {
1479
-				$alliance_airlines = array_merge($alliance_airlines,array($airline['airline_icao']));
1479
+				$alliance_airlines = array_merge($alliance_airlines, array($airline['airline_icao']));
1480 1480
 			}
1481 1481
 			if ($globalDBdriver == 'mysql') {
1482
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1482
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1483 1483
 			} else {
1484
-				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','",$alliance_airlines)."') AND filter_name = :filter_name";
1484
+				$query = "SELECT SUM(cnt) as total FROM stats_aircraft WHERE stats_airline IN ('".implode("','", $alliance_airlines)."') AND filter_name = :filter_name";
1485 1485
 			}
1486 1486
 		} else {
1487 1487
 			if ($globalDBdriver == 'mysql') {
@@ -1493,7 +1493,7 @@  discard block
 block discarded – undo
1493 1493
 		try {
1494 1494
 			$sth = $this->db->prepare($query);
1495 1495
 			$sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name));
1496
-		} catch(PDOException $e) {
1496
+		} catch (PDOException $e) {
1497 1497
 			echo "error : ".$e->getMessage();
1498 1498
 		}
1499 1499
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1510,7 +1510,7 @@  discard block
 block discarded – undo
1510 1510
 		try {
1511 1511
 			$sth = $this->db->prepare($query);
1512 1512
 			$sth->execute(array(':filter_name' => $filter_name));
1513
-		} catch(PDOException $e) {
1513
+		} catch (PDOException $e) {
1514 1514
 			echo "error : ".$e->getMessage();
1515 1515
 		}
1516 1516
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1527,20 +1527,20 @@  discard block
 block discarded – undo
1527 1527
 		try {
1528 1528
 			$sth = $this->db->prepare($query);
1529 1529
 			$sth->execute(array(':filter_name' => $filter_name));
1530
-		} catch(PDOException $e) {
1530
+		} catch (PDOException $e) {
1531 1531
 			echo "error : ".$e->getMessage();
1532 1532
 		}
1533 1533
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1534 1534
 		return $all[0]['total'];
1535 1535
 	}
1536
-	public function getStatsOwner($owner_name,$filter_name = '') {
1536
+	public function getStatsOwner($owner_name, $filter_name = '') {
1537 1537
 		global $globalArchiveMonths, $globalDBdriver;
1538 1538
 		if ($filter_name == '') $filter_name = $this->filter_name;
1539 1539
 		$query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name";
1540 1540
 		try {
1541 1541
 			$sth = $this->db->prepare($query);
1542
-			$sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name));
1543
-		} catch(PDOException $e) {
1542
+			$sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name));
1543
+		} catch (PDOException $e) {
1544 1544
 			echo "error : ".$e->getMessage();
1545 1545
 		}
1546 1546
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1558,20 +1558,20 @@  discard block
 block discarded – undo
1558 1558
 		try {
1559 1559
 			$sth = $this->db->prepare($query);
1560 1560
 			$sth->execute(array(':filter_name' => $filter_name));
1561
-		} catch(PDOException $e) {
1561
+		} catch (PDOException $e) {
1562 1562
 			echo "error : ".$e->getMessage();
1563 1563
 		}
1564 1564
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1565 1565
 		return $all[0]['total'];
1566 1566
 	}
1567
-	public function getStatsPilot($pilot,$filter_name = '') {
1567
+	public function getStatsPilot($pilot, $filter_name = '') {
1568 1568
 		global $globalArchiveMonths, $globalDBdriver;
1569 1569
 		if ($filter_name == '') $filter_name = $this->filter_name;
1570 1570
 		$query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)";
1571 1571
 		try {
1572 1572
 			$sth = $this->db->prepare($query);
1573
-			$sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot));
1574
-		} catch(PDOException $e) {
1573
+			$sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot));
1574
+		} catch (PDOException $e) {
1575 1575
 			echo "error : ".$e->getMessage();
1576 1576
 		}
1577 1577
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1579,7 +1579,7 @@  discard block
 block discarded – undo
1579 1579
 		else return 0;
1580 1580
 	}
1581 1581
 
1582
-	public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1582
+	public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1583 1583
 		global $globalDBdriver;
1584 1584
 		if ($filter_name == '') $filter_name = $this->filter_name;
1585 1585
 		if ($globalDBdriver == 'mysql') {
@@ -1587,15 +1587,15 @@  discard block
 block discarded – undo
1587 1587
 		} else {
1588 1588
 			$query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1589 1589
 		}
1590
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1590
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1591 1591
 		try {
1592 1592
 			$sth = $this->db->prepare($query);
1593 1593
 			$sth->execute($query_values);
1594
-		} catch(PDOException $e) {
1594
+		} catch (PDOException $e) {
1595 1595
 			return "error : ".$e->getMessage();
1596 1596
 		}
1597 1597
 	}
1598
-	public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') {
1598
+	public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') {
1599 1599
 		global $globalDBdriver;
1600 1600
 		if ($filter_name == '') $filter_name = $this->filter_name;
1601 1601
 		if ($globalDBdriver == 'mysql') {
@@ -1604,11 +1604,11 @@  discard block
 block discarded – undo
1604 1604
 			//$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date";
1605 1605
 			$query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE  stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1606 1606
 		}
1607
-		$query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1607
+		$query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1608 1608
 		try {
1609 1609
 			$sth = $this->db->prepare($query);
1610 1610
 			$sth->execute($query_values);
1611
-		} catch(PDOException $e) {
1611
+		} catch (PDOException $e) {
1612 1612
 			return "error : ".$e->getMessage();
1613 1613
 		}
1614 1614
 	}
@@ -1632,75 +1632,75 @@  discard block
 block discarded – undo
1632 1632
         }
1633 1633
         */
1634 1634
 
1635
-	public function getStatsSource($stats_type,$year = '',$month = '',$day = '') {
1635
+	public function getStatsSource($stats_type, $year = '', $month = '', $day = '') {
1636 1636
 		global $globalDBdriver;
1637 1637
 		$query = "SELECT * FROM stats_source WHERE stats_type = :stats_type";
1638 1638
 		$query_values = array();
1639 1639
 		if ($globalDBdriver == 'mysql') {
1640 1640
 			if ($year != '') {
1641 1641
 				$query .= ' AND YEAR(stats_date) = :year';
1642
-				$query_values = array_merge($query_values,array(':year' => $year));
1642
+				$query_values = array_merge($query_values, array(':year' => $year));
1643 1643
 			}
1644 1644
 			if ($month != '') {
1645 1645
 				$query .= ' AND MONTH(stats_date) = :month';
1646
-				$query_values = array_merge($query_values,array(':month' => $month));
1646
+				$query_values = array_merge($query_values, array(':month' => $month));
1647 1647
 			}
1648 1648
 			if ($day != '') {
1649 1649
 				$query .= ' AND DAY(stats_date) = :day';
1650
-				$query_values = array_merge($query_values,array(':day' => $day));
1650
+				$query_values = array_merge($query_values, array(':day' => $day));
1651 1651
 			}
1652 1652
 		} else {
1653 1653
 			if ($year != '') {
1654 1654
 				$query .= ' AND EXTRACT(YEAR FROM stats_date) = :year';
1655
-				$query_values = array_merge($query_values,array(':year' => $year));
1655
+				$query_values = array_merge($query_values, array(':year' => $year));
1656 1656
 			}
1657 1657
 			if ($month != '') {
1658 1658
 				$query .= ' AND EXTRACT(MONTH FROM stats_date) = :month';
1659
-				$query_values = array_merge($query_values,array(':month' => $month));
1659
+				$query_values = array_merge($query_values, array(':month' => $month));
1660 1660
 			}
1661 1661
 			if ($day != '') {
1662 1662
 				$query .= ' AND EXTRACT(DAY FROM stats_date) = :day';
1663
-				$query_values = array_merge($query_values,array(':day' => $day));
1663
+				$query_values = array_merge($query_values, array(':day' => $day));
1664 1664
 			}
1665 1665
 		}
1666 1666
 		$query .= " ORDER BY source_name";
1667
-		$query_values = array_merge($query_values,array(':stats_type' => $stats_type));
1667
+		$query_values = array_merge($query_values, array(':stats_type' => $stats_type));
1668 1668
 		try {
1669 1669
 			$sth = $this->db->prepare($query);
1670 1670
 			$sth->execute($query_values);
1671
-		} catch(PDOException $e) {
1671
+		} catch (PDOException $e) {
1672 1672
 			echo "error : ".$e->getMessage();
1673 1673
 		}
1674 1674
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1675 1675
 		return $all;
1676 1676
 	}
1677 1677
 
1678
-	public function addStatSource($data,$source_name,$stats_type,$date) {
1678
+	public function addStatSource($data, $source_name, $stats_type, $date) {
1679 1679
 		global $globalDBdriver;
1680 1680
 		if ($globalDBdriver == 'mysql') {
1681 1681
 			$query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data";
1682 1682
 		} else {
1683 1683
 			$query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; 
1684 1684
 		}
1685
-		$query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type);
1685
+		$query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type);
1686 1686
 		try {
1687 1687
 			$sth = $this->db->prepare($query);
1688 1688
 			$sth->execute($query_values);
1689
-		} catch(PDOException $e) {
1689
+		} catch (PDOException $e) {
1690 1690
 			return "error : ".$e->getMessage();
1691 1691
 		}
1692 1692
 	}
1693
-	public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') {
1693
+	public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') {
1694 1694
 		$query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)";
1695
-		$query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1695
+		$query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1696 1696
 		try {
1697 1697
 			$sth = $this->db->prepare($query);
1698 1698
 			$sth->execute($query_values);
1699
-		} catch(PDOException $e) {
1699
+		} catch (PDOException $e) {
1700 1700
 			return "error : ".$e->getMessage();
1701 1701
 		}
1702 1702
 	}
1703
-	public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) {
1703
+	public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) {
1704 1704
 		global $globalDBdriver;
1705 1705
 		if ($globalDBdriver == 'mysql') {
1706 1706
 			if ($reset) {
@@ -1715,15 +1715,15 @@  discard block
 block discarded – undo
1715 1715
 				$query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1716 1716
 			}
1717 1717
 		}
1718
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1718
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1719 1719
 		try {
1720 1720
 			$sth = $this->db->prepare($query);
1721 1721
 			$sth->execute($query_values);
1722
-		} catch(PDOException $e) {
1722
+		} catch (PDOException $e) {
1723 1723
 			return "error : ".$e->getMessage();
1724 1724
 		}
1725 1725
 	}
1726
-	public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) {
1726
+	public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1727 1727
 		global $globalDBdriver;
1728 1728
 		if ($globalDBdriver == 'mysql') {
1729 1729
 			if ($reset) {
@@ -1738,15 +1738,15 @@  discard block
 block discarded – undo
1738 1738
 				$query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; 
1739 1739
 			}
1740 1740
 		}
1741
-		$query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name);
1741
+		$query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name);
1742 1742
 		try {
1743 1743
 			$sth = $this->db->prepare($query);
1744 1744
 			$sth->execute($query_values);
1745
-		} catch(PDOException $e) {
1745
+		} catch (PDOException $e) {
1746 1746
 			return "error : ".$e->getMessage();
1747 1747
 		}
1748 1748
 	}
1749
-	public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) {
1749
+	public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) {
1750 1750
 		global $globalDBdriver;
1751 1751
 		if ($globalDBdriver == 'mysql') {
1752 1752
 			if ($reset) {
@@ -1761,15 +1761,15 @@  discard block
 block discarded – undo
1761 1761
 				$query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; 
1762 1762
 			}
1763 1763
 		}
1764
-		$query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao);
1764
+		$query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao);
1765 1765
 		try {
1766 1766
 			$sth = $this->db->prepare($query);
1767 1767
 			$sth->execute($query_values);
1768
-		} catch(PDOException $e) {
1768
+		} catch (PDOException $e) {
1769 1769
 			return "error : ".$e->getMessage();
1770 1770
 		}
1771 1771
 	}
1772
-	public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1772
+	public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) {
1773 1773
 		global $globalDBdriver;
1774 1774
 		if ($globalDBdriver == 'mysql') {
1775 1775
 			if ($reset) {
@@ -1784,15 +1784,15 @@  discard block
 block discarded – undo
1784 1784
 				$query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1785 1785
 			}
1786 1786
 		}
1787
-		$query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1787
+		$query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1788 1788
 		try {
1789 1789
 			$sth = $this->db->prepare($query);
1790 1790
 			$sth->execute($query_values);
1791
-		} catch(PDOException $e) {
1791
+		} catch (PDOException $e) {
1792 1792
 			return "error : ".$e->getMessage();
1793 1793
 		}
1794 1794
 	}
1795
-	public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) {
1795
+	public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) {
1796 1796
 		global $globalDBdriver;
1797 1797
 		if ($globalDBdriver == 'mysql') {
1798 1798
 			if ($reset) {
@@ -1807,15 +1807,15 @@  discard block
 block discarded – undo
1807 1807
 				$query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; 
1808 1808
 			}
1809 1809
 		}
1810
-		$query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name);
1810
+		$query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name);
1811 1811
 		try {
1812 1812
 			$sth = $this->db->prepare($query);
1813 1813
 			$sth->execute($query_values);
1814
-		} catch(PDOException $e) {
1814
+		} catch (PDOException $e) {
1815 1815
 			return "error : ".$e->getMessage();
1816 1816
 		}
1817 1817
 	}
1818
-	public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) {
1818
+	public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) {
1819 1819
 		global $globalDBdriver;
1820 1820
 		if ($globalDBdriver == 'mysql') {
1821 1821
 			if ($reset) {
@@ -1830,15 +1830,15 @@  discard block
 block discarded – undo
1830 1830
 				$query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1831 1831
 			}
1832 1832
 		}
1833
-		$query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name);
1833
+		$query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name);
1834 1834
 		try {
1835 1835
 			$sth = $this->db->prepare($query);
1836 1836
 			$sth->execute($query_values);
1837
-		} catch(PDOException $e) {
1837
+		} catch (PDOException $e) {
1838 1838
 			return "error : ".$e->getMessage();
1839 1839
 		}
1840 1840
 	}
1841
-	public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) {
1841
+	public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) {
1842 1842
 		global $globalDBdriver;
1843 1843
 		if ($globalDBdriver == 'mysql') {
1844 1844
 			if ($reset) {
@@ -1853,15 +1853,15 @@  discard block
 block discarded – undo
1853 1853
 				$query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; 
1854 1854
 			}
1855 1855
 		}
1856
-		$query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source);
1856
+		$query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source);
1857 1857
 		try {
1858 1858
 			$sth = $this->db->prepare($query);
1859 1859
 			$sth->execute($query_values);
1860
-		} catch(PDOException $e) {
1860
+		} catch (PDOException $e) {
1861 1861
 			return "error : ".$e->getMessage();
1862 1862
 		}
1863 1863
 	}
1864
-	public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) {
1864
+	public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) {
1865 1865
 		global $globalDBdriver;
1866 1866
 		if ($airport_icao != '') {
1867 1867
 			if ($globalDBdriver == 'mysql') {
@@ -1877,16 +1877,16 @@  discard block
 block discarded – undo
1877 1877
 					$query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
1878 1878
 				}
1879 1879
 			}
1880
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1880
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1881 1881
 			try {
1882 1882
 				$sth = $this->db->prepare($query);
1883 1883
 				$sth->execute($query_values);
1884
-			} catch(PDOException $e) {
1884
+			} catch (PDOException $e) {
1885 1885
 				return "error : ".$e->getMessage();
1886 1886
 			}
1887 1887
 		}
1888 1888
 	}
1889
-	public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') {
1889
+	public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') {
1890 1890
 		global $globalDBdriver;
1891 1891
 		if ($airport_icao != '') {
1892 1892
 			if ($globalDBdriver == 'mysql') {
@@ -1894,16 +1894,16 @@  discard block
 block discarded – undo
1894 1894
 			} else {
1895 1895
 				$query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1896 1896
 			}
1897
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1897
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1898 1898
 			 try {
1899 1899
 				$sth = $this->db->prepare($query);
1900 1900
 				$sth->execute($query_values);
1901
-			} catch(PDOException $e) {
1901
+			} catch (PDOException $e) {
1902 1902
 				return "error : ".$e->getMessage();
1903 1903
 			}
1904 1904
 		}
1905 1905
 	}
1906
-	public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) {
1906
+	public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) {
1907 1907
 		global $globalDBdriver;
1908 1908
 		if ($airport_icao != '') {
1909 1909
 			if ($globalDBdriver == 'mysql') {
@@ -1919,16 +1919,16 @@  discard block
 block discarded – undo
1919 1919
 					$query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; 
1920 1920
 				}
1921 1921
 			}
1922
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1922
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1923 1923
 			try {
1924 1924
 				$sth = $this->db->prepare($query);
1925 1925
 				$sth->execute($query_values);
1926
-			} catch(PDOException $e) {
1926
+			} catch (PDOException $e) {
1927 1927
 				return "error : ".$e->getMessage();
1928 1928
 			}
1929 1929
 		}
1930 1930
 	}
1931
-	public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') {
1931
+	public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') {
1932 1932
 		global $globalDBdriver;
1933 1933
 		if ($airport_icao != '') {
1934 1934
 			if ($globalDBdriver == 'mysql') {
@@ -1936,11 +1936,11 @@  discard block
 block discarded – undo
1936 1936
 			} else {
1937 1937
 				$query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; 
1938 1938
 			}
1939
-			$query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name);
1939
+			$query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name);
1940 1940
 			try {
1941 1941
 				$sth = $this->db->prepare($query);
1942 1942
 				$sth->execute($query_values);
1943
-			} catch(PDOException $e) {
1943
+			} catch (PDOException $e) {
1944 1944
 				return "error : ".$e->getMessage();
1945 1945
 			}
1946 1946
 		}
@@ -1952,7 +1952,7 @@  discard block
 block discarded – undo
1952 1952
 		try {
1953 1953
 			$sth = $this->db->prepare($query);
1954 1954
 			$sth->execute($query_values);
1955
-		} catch(PDOException $e) {
1955
+		} catch (PDOException $e) {
1956 1956
 			return "error : ".$e->getMessage();
1957 1957
 		}
1958 1958
 	}
@@ -1962,7 +1962,7 @@  discard block
 block discarded – undo
1962 1962
 		try {
1963 1963
 			$sth = $this->db->prepare($query);
1964 1964
 			$sth->execute($query_values);
1965
-		} catch(PDOException $e) {
1965
+		} catch (PDOException $e) {
1966 1966
 			return "error : ".$e->getMessage();
1967 1967
 		}
1968 1968
 	}
@@ -1972,13 +1972,13 @@  discard block
 block discarded – undo
1972 1972
 		try {
1973 1973
 			$sth = $this->db->prepare($query);
1974 1974
 			$sth->execute($query_values);
1975
-		} catch(PDOException $e) {
1975
+		} catch (PDOException $e) {
1976 1976
 			return "error : ".$e->getMessage();
1977 1977
 		}
1978 1978
 	}
1979 1979
 
1980 1980
 	public function addOldStats() {
1981
-		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear, $globalAccidents;
1981
+		global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear, $globalAccidents;
1982 1982
 		$Common = new Common();
1983 1983
 		$Connection = new Connection();
1984 1984
 		date_default_timezone_set('UTC');
@@ -1996,41 +1996,41 @@  discard block
 block discarded – undo
1996 1996
 			$Spotter = new Spotter($this->db);
1997 1997
 
1998 1998
 			if ($globalDebug) echo 'Count all aircraft types...'."\n";
1999
-			$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day);
1999
+			$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day);
2000 2000
 			foreach ($alldata as $number) {
2001
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset);
2001
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset);
2002 2002
 			}
2003 2003
 			if ($globalDebug) echo 'Count all airlines...'."\n";
2004
-			$alldata = $Spotter->countAllAirlines(false,0,$last_update_day);
2004
+			$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day);
2005 2005
 			foreach ($alldata as $number) {
2006
-				$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset);
2006
+				$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset);
2007 2007
 			}
2008 2008
 			if ($globalDebug) echo 'Count all registrations...'."\n";
2009
-			$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day);
2009
+			$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day);
2010 2010
 			foreach ($alldata as $number) {
2011
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset);
2011
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset);
2012 2012
 			}
2013 2013
 			if ($globalDebug) echo 'Count all callsigns...'."\n";
2014
-			$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day);
2014
+			$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day);
2015 2015
 			foreach ($alldata as $number) {
2016
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2016
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2017 2017
 			}
2018 2018
 			if ($globalDebug) echo 'Count all owners...'."\n";
2019
-			$alldata = $Spotter->countAllOwners(false,0,$last_update_day);
2019
+			$alldata = $Spotter->countAllOwners(false, 0, $last_update_day);
2020 2020
 			foreach ($alldata as $number) {
2021
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset);
2021
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset);
2022 2022
 			}
2023 2023
 			if ($globalDebug) echo 'Count all pilots...'."\n";
2024
-			$alldata = $Spotter->countAllPilots(false,0,$last_update_day);
2024
+			$alldata = $Spotter->countAllPilots(false, 0, $last_update_day);
2025 2025
 			foreach ($alldata as $number) {
2026 2026
 				if ($number['pilot_id'] == 0 || $number['pilot_id'] == '') $number['pilot_id'] = $number['pilot_name'];
2027
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset);
2027
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset);
2028 2028
 			}
2029 2029
 			
2030 2030
 			if ($globalDebug) echo 'Count all departure airports...'."\n";
2031
-			$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day);
2031
+			$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day);
2032 2032
 			if ($globalDebug) echo 'Count all detected departure airports...'."\n";
2033
-			$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day);
2033
+			$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day);
2034 2034
 			if ($globalDebug) echo 'Order departure airports...'."\n";
2035 2035
 			$alldata = array();
2036 2036
 			foreach ($pall as $value) {
@@ -2047,14 +2047,14 @@  discard block
 block discarded – undo
2047 2047
 			foreach ($alldata as $key => $row) {
2048 2048
 				$count[$key] = $row['airport_departure_icao_count'];
2049 2049
 			}
2050
-			array_multisort($count,SORT_DESC,$alldata);
2050
+			array_multisort($count, SORT_DESC, $alldata);
2051 2051
 			foreach ($alldata as $number) {
2052
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset);
2052
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', '', $reset);
2053 2053
 			}
2054 2054
 			if ($globalDebug) echo 'Count all arrival airports...'."\n";
2055
-			$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day);
2055
+			$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day);
2056 2056
 			if ($globalDebug) echo 'Count all detected arrival airports...'."\n";
2057
-			$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day);
2057
+			$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day);
2058 2058
 			if ($globalDebug) echo 'Order arrival airports...'."\n";
2059 2059
 			$alldata = array();
2060 2060
 			foreach ($pall as $value) {
@@ -2071,18 +2071,18 @@  discard block
 block discarded – undo
2071 2071
 			foreach ($alldata as $key => $row) {
2072 2072
 				$count[$key] = $row['airport_arrival_icao_count'];
2073 2073
 			}
2074
-			array_multisort($count,SORT_DESC,$alldata);
2074
+			array_multisort($count, SORT_DESC, $alldata);
2075 2075
 			foreach ($alldata as $number) {
2076
-				echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset);
2076
+				echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', '', $reset);
2077 2077
 			}
2078 2078
 			if ($Connection->tableExists('countries')) {
2079 2079
 				if ($globalDebug) echo 'Count all flights by countries...'."\n";
2080 2080
 				//$SpotterArchive = new SpotterArchive();
2081 2081
 				//$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day);
2082 2082
 				$Spotter = new Spotter($this->db);
2083
-				$alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day);
2083
+				$alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day);
2084 2084
 				foreach ($alldata as $number) {
2085
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset);
2085
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset);
2086 2086
 				}
2087 2087
 			}
2088 2088
 			
@@ -2092,12 +2092,12 @@  discard block
 block discarded – undo
2092 2092
 				$this->deleteStatsByType('fatalities_byyear');
2093 2093
 				$alldata = $Accident->countFatalitiesByYear();
2094 2094
 				foreach ($alldata as $number) {
2095
-					$this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year'])));
2095
+					$this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year'])));
2096 2096
 				}
2097 2097
 				$this->deleteStatsByType('fatalities_bymonth');
2098 2098
 				$alldata = $Accident->countFatalitiesLast12Months();
2099 2099
 				foreach ($alldata as $number) {
2100
-					$this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year'])));
2100
+					$this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year'])));
2101 2101
 				}
2102 2102
 			}
2103 2103
 
@@ -2111,37 +2111,37 @@  discard block
 block discarded – undo
2111 2111
 			$lastyear = false;
2112 2112
 			foreach ($alldata as $number) {
2113 2113
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2114
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2114
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2115 2115
 			}
2116 2116
 			if ($globalDebug) echo 'Count all military flights by months...'."\n";
2117 2117
 			$alldata = $Spotter->countAllMilitaryMonths($filter_last_month);
2118 2118
 			foreach ($alldata as $number) {
2119
-				$this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2119
+				$this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2120 2120
 			}
2121 2121
 			if ($globalDebug) echo 'Count all owners by months...'."\n";
2122 2122
 			$alldata = $Spotter->countAllMonthsOwners($filter_last_month);
2123 2123
 			foreach ($alldata as $number) {
2124
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2124
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2125 2125
 			}
2126 2126
 			if ($globalDebug) echo 'Count all pilots by months...'."\n";
2127 2127
 			$alldata = $Spotter->countAllMonthsPilots($filter_last_month);
2128 2128
 			foreach ($alldata as $number) {
2129
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2129
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2130 2130
 			}
2131 2131
 			if ($globalDebug) echo 'Count all airlines by months...'."\n";
2132 2132
 			$alldata = $Spotter->countAllMonthsAirlines($filter_last_month);
2133 2133
 			foreach ($alldata as $number) {
2134
-				$this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2134
+				$this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2135 2135
 			}
2136 2136
 			if ($globalDebug) echo 'Count all aircrafts by months...'."\n";
2137 2137
 			$alldata = $Spotter->countAllMonthsAircrafts($filter_last_month);
2138 2138
 			foreach ($alldata as $number) {
2139
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2139
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2140 2140
 			}
2141 2141
 			if ($globalDebug) echo 'Count all real arrivals by months...'."\n";
2142 2142
 			$alldata = $Spotter->countAllMonthsRealArrivals($filter_last_month);
2143 2143
 			foreach ($alldata as $number) {
2144
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])));
2144
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])));
2145 2145
 			}
2146 2146
 			if ($globalDebug) echo 'Airports data...'."\n";
2147 2147
 			if ($globalDebug) echo '...Departure'."\n";
@@ -2186,7 +2186,7 @@  discard block
 block discarded – undo
2186 2186
 			}
2187 2187
 			$alldata = $pall;
2188 2188
 			foreach ($alldata as $number) {
2189
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']);
2189
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']);
2190 2190
 			}
2191 2191
 			echo '...Arrival'."\n";
2192 2192
 			$pall = $Spotter->getLast7DaysAirportsArrival();
@@ -2227,7 +2227,7 @@  discard block
 block discarded – undo
2227 2227
 			}
2228 2228
 			$alldata = $pall;
2229 2229
 			foreach ($alldata as $number) {
2230
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']);
2230
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']);
2231 2231
 			}
2232 2232
 
2233 2233
 			echo 'Flights data...'."\n";
@@ -2235,28 +2235,28 @@  discard block
 block discarded – undo
2235 2235
 			echo '-> countAllDatesLastMonth...'."\n";
2236 2236
 			$alldata = $Spotter->countAllDatesLastMonth($filter_last_month);
2237 2237
 			foreach ($alldata as $number) {
2238
-				$this->addStatFlight('month',$number['date_name'],$number['date_count']);
2238
+				$this->addStatFlight('month', $number['date_name'], $number['date_count']);
2239 2239
 			}
2240 2240
 			echo '-> countAllDates...'."\n";
2241 2241
 			$previousdata = $this->countAllDates();
2242 2242
 			$previousdatabyairlines = $this->countAllDatesByAirlines();
2243 2243
 			$this->deleteStatFlight('date');
2244
-			$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter_last_month));
2244
+			$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter_last_month));
2245 2245
 			$values = array();
2246 2246
 			foreach ($alldata as $cnt) {
2247 2247
 				$values[] = $cnt['date_count'];
2248 2248
 			}
2249
-			array_multisort($values,SORT_DESC,$alldata);
2250
-			array_splice($alldata,11);
2249
+			array_multisort($values, SORT_DESC, $alldata);
2250
+			array_splice($alldata, 11);
2251 2251
 			foreach ($alldata as $number) {
2252
-				$this->addStatFlight('date',$number['date_name'],$number['date_count']);
2252
+				$this->addStatFlight('date', $number['date_name'], $number['date_count']);
2253 2253
 			}
2254 2254
 			
2255 2255
 			$this->deleteStatFlight('hour');
2256 2256
 			echo '-> countAllHours...'."\n";
2257
-			$alldata = $Spotter->countAllHours('hour',$filter_last_month);
2257
+			$alldata = $Spotter->countAllHours('hour', $filter_last_month);
2258 2258
 			foreach ($alldata as $number) {
2259
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count']);
2259
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count']);
2260 2260
 			}
2261 2261
 
2262 2262
 			// Count by airlines
@@ -2265,42 +2265,42 @@  discard block
 block discarded – undo
2265 2265
 				if ($globalDebug) echo 'Count all flights by countries by airlines...'."\n";
2266 2266
 				$SpotterArchive = new SpotterArchive();
2267 2267
 				//$Spotter = new Spotter($this->db);
2268
-				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2268
+				$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day);
2269 2269
 				//$alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day);
2270 2270
 				foreach ($alldata as $number) {
2271
-					$this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset);
2271
+					$this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset);
2272 2272
 				}
2273 2273
 			}
2274 2274
 			if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n";
2275 2275
 			$Spotter = new Spotter($this->db);
2276
-			$alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day);
2276
+			$alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day);
2277 2277
 			foreach ($alldata as $number) {
2278
-				$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset);
2278
+				$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset);
2279 2279
 			}
2280 2280
 			if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n";
2281
-			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day);
2281
+			$alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day);
2282 2282
 			foreach ($alldata as $number) {
2283
-				$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset);
2283
+				$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset);
2284 2284
 			}
2285 2285
 			if ($globalDebug) echo 'Count all callsigns by airlines...'."\n";
2286
-			$alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day);
2286
+			$alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day);
2287 2287
 			foreach ($alldata as $number) {
2288
-				$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset);
2288
+				$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset);
2289 2289
 			}
2290 2290
 			if ($globalDebug) echo 'Count all owners by airlines...'."\n";
2291
-			$alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day);
2291
+			$alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day);
2292 2292
 			foreach ($alldata as $number) {
2293
-				$this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset);
2293
+				$this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset);
2294 2294
 			}
2295 2295
 			if ($globalDebug) echo 'Count all pilots by airlines...'."\n";
2296
-			$alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day);
2296
+			$alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day);
2297 2297
 			foreach ($alldata as $number) {
2298
-				$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset);
2298
+				$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset);
2299 2299
 			}
2300 2300
 			if ($globalDebug) echo 'Count all departure airports by airlines...'."\n";
2301
-			$pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day);
2301
+			$pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day);
2302 2302
 			if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n";
2303
-			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day);
2303
+			$dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day);
2304 2304
 			if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n";
2305 2305
 			//$alldata = array();
2306 2306
 			foreach ($dall as $value) {
@@ -2320,12 +2320,12 @@  discard block
 block discarded – undo
2320 2320
 			}
2321 2321
 			$alldata = $pall;
2322 2322
 			foreach ($alldata as $number) {
2323
-				echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset);
2323
+				echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], $number['airline_icao'], '', $reset);
2324 2324
 			}
2325 2325
 			if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n";
2326
-			$pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day);
2326
+			$pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day);
2327 2327
 			if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n";
2328
-			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day);
2328
+			$dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day);
2329 2329
 			if ($globalDebug) echo 'Order arrival airports by airlines...'."\n";
2330 2330
 			//$alldata = array();
2331 2331
 			foreach ($dall as $value) {
@@ -2345,7 +2345,7 @@  discard block
 block discarded – undo
2345 2345
 			}
2346 2346
 			$alldata = $pall;
2347 2347
 			foreach ($alldata as $number) {
2348
-				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset);
2348
+				if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], $number['airline_icao'], '', $reset);
2349 2349
 			}
2350 2350
 			if ($globalDebug) echo 'Count all flights by months by airlines...'."\n";
2351 2351
 			$Spotter = new Spotter($this->db);
@@ -2353,27 +2353,27 @@  discard block
 block discarded – undo
2353 2353
 			$lastyear = false;
2354 2354
 			foreach ($alldata as $number) {
2355 2355
 				if ($number['year_name'] != date('Y')) $lastyear = true;
2356
-				$this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2356
+				$this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2357 2357
 			}
2358 2358
 			if ($globalDebug) echo 'Count all owners by months by airlines...'."\n";
2359 2359
 			$alldata = $Spotter->countAllMonthsOwnersByAirlines($filter_last_month);
2360 2360
 			foreach ($alldata as $number) {
2361
-				$this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2361
+				$this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2362 2362
 			}
2363 2363
 			if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n";
2364 2364
 			$alldata = $Spotter->countAllMonthsPilotsByAirlines($filter_last_month);
2365 2365
 			foreach ($alldata as $number) {
2366
-				$this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2366
+				$this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2367 2367
 			}
2368 2368
 			if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n";
2369 2369
 			$alldata = $Spotter->countAllMonthsAircraftsByAirlines($filter_last_month);
2370 2370
 			foreach ($alldata as $number) {
2371
-				$this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2371
+				$this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2372 2372
 			}
2373 2373
 			if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n";
2374 2374
 			$alldata = $Spotter->countAllMonthsRealArrivalsByAirlines($filter_last_month);
2375 2375
 			foreach ($alldata as $number) {
2376
-				$this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']);
2376
+				$this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']);
2377 2377
 			}
2378 2378
 			if ($globalDebug) echo '...Departure'."\n";
2379 2379
 			$pall = $Spotter->getLast7DaysAirportsDepartureByAirlines();
@@ -2396,7 +2396,7 @@  discard block
 block discarded – undo
2396 2396
 			}
2397 2397
 			$alldata = $pall;
2398 2398
 			foreach ($alldata as $number) {
2399
-				$this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']);
2399
+				$this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], $number['airline_icao']);
2400 2400
 			}
2401 2401
 			if ($globalDebug) echo '...Arrival'."\n";
2402 2402
 			$pall = $Spotter->getLast7DaysAirportsArrivalByAirlines();
@@ -2419,32 +2419,32 @@  discard block
 block discarded – undo
2419 2419
 			}
2420 2420
 			$alldata = $pall;
2421 2421
 			foreach ($alldata as $number) {
2422
-				$this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']);
2422
+				$this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], $number['airline_icao']);
2423 2423
 			}
2424 2424
 
2425 2425
 			if ($globalDebug) echo 'Flights data...'."\n";
2426 2426
 			if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n";
2427 2427
 			$alldata = $Spotter->countAllDatesLastMonthByAirlines($filter_last_month);
2428 2428
 			foreach ($alldata as $number) {
2429
-				$this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']);
2429
+				$this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']);
2430 2430
 			}
2431 2431
 			if ($globalDebug) echo '-> countAllDates...'."\n";
2432 2432
 			//$previousdata = $this->countAllDatesByAirlines();
2433
-			$alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines($filter_last_month));
2433
+			$alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines($filter_last_month));
2434 2434
 			$values = array();
2435 2435
 			foreach ($alldata as $cnt) {
2436 2436
 				$values[] = $cnt['date_count'];
2437 2437
 			}
2438
-			array_multisort($values,SORT_DESC,$alldata);
2439
-			array_splice($alldata,11);
2438
+			array_multisort($values, SORT_DESC, $alldata);
2439
+			array_splice($alldata, 11);
2440 2440
 			foreach ($alldata as $number) {
2441
-				$this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']);
2441
+				$this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']);
2442 2442
 			}
2443 2443
 			
2444 2444
 			if ($globalDebug) echo '-> countAllHours...'."\n";
2445
-			$alldata = $Spotter->countAllHoursByAirlines('hour',$filter_last_month);
2445
+			$alldata = $Spotter->countAllHoursByAirlines('hour', $filter_last_month);
2446 2446
 			foreach ($alldata as $number) {
2447
-				$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']);
2447
+				$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']);
2448 2448
 			}
2449 2449
 
2450 2450
 			// Stats by filters
@@ -2467,7 +2467,7 @@  discard block
 block discarded – undo
2467 2467
 						$last_update_day = date('Y').'-01-01 00:00:00';
2468 2468
 					}
2469 2469
 				}
2470
-				if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) {
2470
+				if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) {
2471 2471
 					$last_update_day = date('Y').'-01-01 00:00:00';
2472 2472
 					$reset = true;
2473 2473
 				}
@@ -2476,32 +2476,32 @@  discard block
 block discarded – undo
2476 2476
 				// Count by filter
2477 2477
 				if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n";
2478 2478
 				$Spotter = new Spotter($this->db);
2479
-				$alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter);
2479
+				$alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter);
2480 2480
 				foreach ($alldata as $number) {
2481
-					$this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset);
2481
+					$this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset);
2482 2482
 				}
2483
-				$alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter);
2483
+				$alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter);
2484 2484
 				foreach ($alldata as $number) {
2485
-					$this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset);
2485
+					$this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset);
2486 2486
 				}
2487
-				$alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter);
2487
+				$alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter);
2488 2488
 				foreach ($alldata as $number) {
2489
-					$this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset);
2489
+					$this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset);
2490 2490
 				}
2491
-				$alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter);
2491
+				$alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter);
2492 2492
 				foreach ($alldata as $number) {
2493
-					$this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset);
2493
+					$this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset);
2494 2494
 				}
2495
-				$alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter);
2495
+				$alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter);
2496 2496
 				foreach ($alldata as $number) {
2497
-					$this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset);
2497
+					$this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset);
2498 2498
 				}
2499
-				$alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter);
2499
+				$alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter);
2500 2500
 				foreach ($alldata as $number) {
2501
-					$this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset);
2501
+					$this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset);
2502 2502
 				}
2503
-				$pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter);
2504
-				$dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter);
2503
+				$pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter);
2504
+				$dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter);
2505 2505
 				$alldata = array();
2506 2506
 				foreach ($pall as $value) {
2507 2507
 					$icao = $value['airport_departure_icao'];
@@ -2517,12 +2517,12 @@  discard block
 block discarded – undo
2517 2517
 				foreach ($alldata as $key => $row) {
2518 2518
 					$count[$key] = $row['airport_departure_icao_count'];
2519 2519
 				}
2520
-				array_multisort($count,SORT_DESC,$alldata);
2520
+				array_multisort($count, SORT_DESC, $alldata);
2521 2521
 				foreach ($alldata as $number) {
2522
-					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);
2522
+					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);
2523 2523
 				}
2524
-				$pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter);
2525
-				$dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter);
2524
+				$pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter);
2525
+				$dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter);
2526 2526
 				$alldata = array();
2527 2527
 				foreach ($pall as $value) {
2528 2528
 					$icao = $value['airport_arrival_icao'];
@@ -2538,40 +2538,40 @@  discard block
 block discarded – undo
2538 2538
 				foreach ($alldata as $key => $row) {
2539 2539
 					$count[$key] = $row['airport_arrival_icao_count'];
2540 2540
 				}
2541
-				array_multisort($count,SORT_DESC,$alldata);
2541
+				array_multisort($count, SORT_DESC, $alldata);
2542 2542
 				foreach ($alldata as $number) {
2543
-					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);
2543
+					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);
2544 2544
 				}
2545 2545
 				$Spotter = new Spotter($this->db);
2546 2546
 				$alldata = $Spotter->countAllMonths($filter);
2547 2547
 				$lastyear = false;
2548 2548
 				foreach ($alldata as $number) {
2549 2549
 					if ($number['year_name'] != date('Y')) $lastyear = true;
2550
-					$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);
2550
+					$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);
2551 2551
 				}
2552 2552
 				$alldata = $Spotter->countAllMonthsOwners($filter);
2553 2553
 				foreach ($alldata as $number) {
2554
-					$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);
2554
+					$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);
2555 2555
 				}
2556 2556
 				$alldata = $Spotter->countAllMonthsPilots($filter);
2557 2557
 				foreach ($alldata as $number) {
2558
-					$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);
2558
+					$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);
2559 2559
 				}
2560 2560
 				$alldata = $Spotter->countAllMilitaryMonths($filter);
2561 2561
 				foreach ($alldata as $number) {
2562
-					$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);
2562
+					$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);
2563 2563
 				}
2564 2564
 				$alldata = $Spotter->countAllMonthsAircrafts($filter);
2565 2565
 				foreach ($alldata as $number) {
2566
-					$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);
2566
+					$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);
2567 2567
 				}
2568 2568
 				$alldata = $Spotter->countAllMonthsRealArrivals($filter);
2569 2569
 				foreach ($alldata as $number) {
2570
-					$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);
2570
+					$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);
2571 2571
 				}
2572 2572
 				echo '...Departure'."\n";
2573
-				$pall = $Spotter->getLast7DaysAirportsDeparture('',$filter);
2574
-				$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter);
2573
+				$pall = $Spotter->getLast7DaysAirportsDeparture('', $filter);
2574
+				$dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter);
2575 2575
 				foreach ($dall as $value) {
2576 2576
 					$icao = $value['departure_airport_icao'];
2577 2577
 					$ddate = $value['date'];
@@ -2589,11 +2589,11 @@  discard block
 block discarded – undo
2589 2589
 				}
2590 2590
 				$alldata = $pall;
2591 2591
 				foreach ($alldata as $number) {
2592
-					$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);
2592
+					$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);
2593 2593
 				}
2594 2594
 				echo '...Arrival'."\n";
2595
-				$pall = $Spotter->getLast7DaysAirportsArrival('',$filter);
2596
-				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter);
2595
+				$pall = $Spotter->getLast7DaysAirportsArrival('', $filter);
2596
+				$dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter);
2597 2597
 				foreach ($dall as $value) {
2598 2598
 					$icao = $value['arrival_airport_icao'];
2599 2599
 					$ddate = $value['date'];
@@ -2611,39 +2611,39 @@  discard block
 block discarded – undo
2611 2611
 				}
2612 2612
 				$alldata = $pall;
2613 2613
 				foreach ($alldata as $number) {
2614
-					$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);
2614
+					$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);
2615 2615
 				}
2616 2616
 				echo 'Flights data...'."\n";
2617 2617
 				echo '-> countAllDatesLastMonth...'."\n";
2618 2618
 				$alldata = $Spotter->countAllDatesLastMonth($filter);
2619 2619
 				foreach ($alldata as $number) {
2620
-					$this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name);
2620
+					$this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name);
2621 2621
 				}
2622 2622
 				echo '-> countAllDates...'."\n";
2623
-				$previousdata = $this->countAllDates('',$filter_name);
2624
-				$alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter));
2623
+				$previousdata = $this->countAllDates('', $filter_name);
2624
+				$alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter));
2625 2625
 				$values = array();
2626 2626
 				foreach ($alldata as $cnt) {
2627 2627
 					$values[] = $cnt['date_count'];
2628 2628
 				}
2629
-				array_multisort($values,SORT_DESC,$alldata);
2630
-				array_splice($alldata,11);
2629
+				array_multisort($values, SORT_DESC, $alldata);
2630
+				array_splice($alldata, 11);
2631 2631
 				foreach ($alldata as $number) {
2632
-					$this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name);
2632
+					$this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name);
2633 2633
 				}
2634 2634
 				
2635 2635
 				echo '-> countAllHours...'."\n";
2636
-				$alldata = $Spotter->countAllHours('hour',$filter);
2636
+				$alldata = $Spotter->countAllHours('hour', $filter);
2637 2637
 				foreach ($alldata as $number) {
2638
-					$this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name);
2638
+					$this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name);
2639 2639
 				}
2640 2640
 				echo 'Insert last stats update date...'."\n";
2641 2641
 				date_default_timezone_set('UTC');
2642
-				$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s'));
2642
+				$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s'));
2643 2643
 				if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) {
2644
-					if (date('Y',strtotime($last_update_day)) != date('Y')) {
2644
+					if (date('Y', strtotime($last_update_day)) != date('Y')) {
2645 2645
 						$this->deleteOldStats($filter_name);
2646
-						$this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00');
2646
+						$this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00');
2647 2647
 					}
2648 2648
 				}
2649 2649
 			}
@@ -2654,16 +2654,16 @@  discard block
 block discarded – undo
2654 2654
 				// SUM all previous month to put as year
2655 2655
 				$previous_year = date('Y');
2656 2656
 				$previous_year--;
2657
-				$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2658
-				$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2659
-				$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2660
-				$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00');
2657
+				$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2658
+				$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2659
+				$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2660
+				$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00');
2661 2661
 				$allairlines = $this->getAllAirlineNames();
2662 2662
 				foreach ($allairlines as $data) {
2663
-					$this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2664
-					$this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2665
-					$this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2666
-					$this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']);
2663
+					$this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2664
+					$this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2665
+					$this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2666
+					$this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']);
2667 2667
 				}
2668 2668
 				
2669 2669
 				if (isset($globalArchiveYear) && $globalArchiveYear) {
@@ -2672,7 +2672,7 @@  discard block
 block discarded – undo
2672 2672
 						try {
2673 2673
 							$sth = $this->db->prepare($query);
2674 2674
 							$sth->execute();
2675
-						} catch(PDOException $e) {
2675
+						} catch (PDOException $e) {
2676 2676
 							return "error : ".$e->getMessage().' - query : '.$query."\n";
2677 2677
 						}
2678 2678
 					}
@@ -2681,15 +2681,15 @@  discard block
 block discarded – undo
2681 2681
 					try {
2682 2682
 						$sth = $this->db->prepare($query);
2683 2683
 						$sth->execute();
2684
-					} catch(PDOException $e) {
2684
+					} catch (PDOException $e) {
2685 2685
 						return "error : ".$e->getMessage().' - query : '.$query."\n";
2686 2686
 					}
2687 2687
 				}
2688 2688
 				if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) {
2689 2689
 					$last_update = $this->getLastStatsUpdate('last_update_stats');
2690
-					if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) {
2690
+					if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) {
2691 2691
 						$this->deleteOldStats();
2692
-						$this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00');
2692
+						$this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00');
2693 2693
 						$lastyearupdate = true;
2694 2694
 					}
2695 2695
 				}
@@ -2711,7 +2711,7 @@  discard block
 block discarded – undo
2711 2711
 					try {
2712 2712
 						$sth = $this->db->prepare($query);
2713 2713
 						$sth->execute();
2714
-					} catch(PDOException $e) {
2714
+					} catch (PDOException $e) {
2715 2715
 						return "error : ".$e->getMessage();
2716 2716
 					}
2717 2717
 				}
@@ -2725,14 +2725,14 @@  discard block
 block discarded – undo
2725 2725
 				try {
2726 2726
 					$sth = $this->db->prepare($query);
2727 2727
 					$sth->execute();
2728
-				} catch(PDOException $e) {
2728
+				} catch (PDOException $e) {
2729 2729
 					return "error : ".$e->getMessage();
2730 2730
 				}
2731 2731
 			}
2732 2732
 			if (!isset($lastyearupdate)) {
2733 2733
 				echo 'Insert last stats update date...'."\n";
2734 2734
 				date_default_timezone_set('UTC');
2735
-				$this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s'));
2735
+				$this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s'));
2736 2736
 			}
2737 2737
 			if ($globalStatsResetYear) {
2738 2738
 				require_once(dirname(__FILE__).'/../install/class.settings.php');
Please login to merge, or discard this patch.