View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 613dee...cccbb0 )
by Yannick
31:28
created
Status
Category
Toggle Patches
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.
getImages.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch 
@@ -4,9 +4,9 @@  discard block
 
 block discarded – undo
4 4 
 	$hex = str_replace("#", "", $hex);
5 5 
 	$color = array();
6 6 
 	if (strlen($hex) == 3) {
7 
-	    $color['r'] = hexdec(substr($hex, 0, 1) . substr($hex,0,1));
8 
-	    $color['g'] = hexdec(substr($hex, 1, 1) . substr($hex,1,1));
9 
-	    $color['b'] = hexdec(substr($hex, 2, 1) . substr($hex,2,1));
7 
+	    $color['r'] = hexdec(substr($hex, 0, 1).substr($hex, 0, 1));
8 
+	    $color['g'] = hexdec(substr($hex, 1, 1).substr($hex, 1, 1));
9 
+	    $color['b'] = hexdec(substr($hex, 2, 1).substr($hex, 2, 1));
10 10 
 	} else if (strlen($hex) == 6) {
11 11 
 	    $color['r'] = hexdec(substr($hex, 0, 2));
12 12 
 	    $color['g'] = hexdec(substr($hex, 2, 2));
 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
 }
17 17
18 18
19 
-if (!isset($_GET['color']) || $_GET['color'] == '' || !preg_match('/^([a-fA-F0-9]){3}(([a-fA-F0-9]){3})?\b/',$_GET['color'])) {
19 
+if (!isset($_GET['color']) || $_GET['color'] == '' || !preg_match('/^([a-fA-F0-9]){3}(([a-fA-F0-9]){3})?\b/', $_GET['color'])) {
20 20 
     exit(0);
21 21 
 }
22 22 
 $color = $_GET['color'];
 
@@ -47,15 +47,15 @@  discard block
 
 block discarded – undo
47 47
48 48 
 if (extension_loaded('gd') && function_exists('gd_info')) {
49 49 
     $image = imagecreatefrompng($original);
50 
-    $index = imagecolorexact($image,26,49,81);
50 
+    $index = imagecolorexact($image, 26, 49, 81);
51 51 
     if ($index < 0) {
52 
-	$index = imagecolorexact($image,25,49,79);
52 
+	$index = imagecolorexact($image, 25, 49, 79);
53 53 
     }
54 54 
     if ($index < 0) {
55 
-	$index = imagecolorexact($image,0,0,0);
55 
+	$index = imagecolorexact($image, 0, 0, 0);
56 56 
     }
57 57 
     $c = hexToRGB($color);
58 
-    imagecolorset($image,$index,$c['r'],$c['g'],$c['b']);
58 
+    imagecolorset($image, $index, $c['r'], $c['g'], $c['b']);
59 59 
  /*
60 60 
     $ig = imagecolorat($image, 0, 0);
61 61 
     imagecolortransparent($image, $ig);
 
@@ -63,14 +63,14 @@  discard block
 
 block discarded – undo
63 63
64 64 
     header('Content-type: image/png');
65 65 
     if (isset($_GET['resize']) && function_exists('imagecopyresampled')) {
66 
-	$resize = filter_input(INPUT_GET,'resize',FILTER_SANITIZE_NUMBER_INT);
67 
-	$newimg = imagecreatetruecolor($resize,$resize);
66 
+	$resize = filter_input(INPUT_GET, 'resize', FILTER_SANITIZE_NUMBER_INT);
67 
+	$newimg = imagecreatetruecolor($resize, $resize);
68 68 
         imagealphablending($newimg, false);
69 69 
 	imagesavealpha($newimg, true);
70 
-	imagecopyresampled($newimg,$image,0,0,0,0,15,15,imagesx($image),imagesy($image));
70 
+	imagecopyresampled($newimg, $image, 0, 0, 0, 0, 15, 15, imagesx($image), imagesy($image));
71 71 
 	if (isset($_GET['heading'])) {
72 
-    	    $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT);
73 
-    	    $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127));
72 
+    	    $heading = filter_input(INPUT_GET, 'heading', FILTER_SANITIZE_NUMBER_INT);
73 
+    	    $rotation = imagerotate($newimg, $heading, imageColorAllocateAlpha($newimg, 0, 0, 0, 127));
74 74 
     	    imagealphablending($rotation, false);
75 75 
 	    imagesavealpha($rotation, true);
76 76 
     	    imagepng($rotation);
 
@@ -89,7 +89,7 @@  discard block
 
 block discarded – undo
89 89 
 	imagepng($image);
90 90 
 	imagepng($image);
91 91 
 	if (is_writable(dirname(__FILE__).'/cache')) {
92 
-    	    imagepng($image,dirname(__FILE__).'/cache/'.$color.'-'.$filename);
92 
+    	    imagepng($image, dirname(__FILE__).'/cache/'.$color.'-'.$filename);
93 93 
 	}
94 94 
         imagedestroy($image);
95 95 
     }
Please login to merge, or discard this patch.
install/class.update_schema.php 1 patch
Spacing   +234 added lines, -234 removed lines patch added patch discarded remove patch 
@@ -14,11 +14,11 @@  discard block
 
 block discarded – undo
14 14 
             try {
15 15 
             	$sth = $Connection->db->prepare($query);
16 16 
 		$sth->execute();
17 
-    	    } catch(PDOException $e) {
17 
+    	    } catch (PDOException $e) {
18 18 
 		return "error : ".$e->getMessage()."\n";
19 19 
     	    }
20 20 
     	    while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
21 
-    		$Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']);
21 
+    		$Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']);
22 22 
     	    }
23 23
24 24 
 	}
 
@@ -50,7 +50,7 @@  discard block
 
 block discarded – undo
50 50 
         	try {
51 51 
             	    $sth = $Connection->db->prepare($query);
52 52 
 		    $sth->execute();
53 
-    		} catch(PDOException $e) {
53 
+    		} catch (PDOException $e) {
54 54 
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
55 55 
     		}
56 56 
     		// Copy schedules data to routes table
 
@@ -60,7 +60,7 @@  discard block
 
 block discarded – undo
60 60 
         	try {
61 61 
             	    $sth = $Connection->db->prepare($query);
62 62 
 		    $sth->execute();
63 
-    		} catch(PDOException $e) {
63 
+    		} catch (PDOException $e) {
64 64 
 		    return "error (delete schedule table) : ".$e->getMessage()."\n";
65 65 
     		}
66 66 
     		// Add source column
 
@@ -68,7 +68,7 @@  discard block
 
 block discarded – undo
68 68 
     		try {
69 69 
             	    $sth = $Connection->db->prepare($query);
70 70 
 		    $sth->execute();
71 
-    		} catch(PDOException $e) {
71 
+    		} catch (PDOException $e) {
72 72 
 		    return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n";
73 73 
     		}
74 74 
 		// Delete unused column
 
@@ -76,7 +76,7 @@  discard block
 
 block discarded – undo
76 76 
     		try {
77 77 
             	    $sth = $Connection->db->prepare($query);
78 78 
 		    $sth->execute();
79 
-    		} catch(PDOException $e) {
79 
+    		} catch (PDOException $e) {
80 80 
 		    return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n";
81 81 
     		}
82 82 
 		// Add ModeS column
 
@@ -84,14 +84,14 @@  discard block
 
 block discarded – undo
84 84 
     		try {
85 85 
             	    $sth = $Connection->db->prepare($query);
86 86 
 		    $sth->execute();
87 
-    		} catch(PDOException $e) {
87 
+    		} catch (PDOException $e) {
88 88 
 		    return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n";
89 89 
     		}
90 90 
 		$query = "ALTER TABLE `spotter_live`  ADD `ModeS` VARCHAR(255)";
91 91 
     		try {
92 92 
             	    $sth = $Connection->db->prepare($query);
93 93 
 		    $sth->execute();
94 
-    		} catch(PDOException $e) {
94 
+    		} catch (PDOException $e) {
95 95 
 		    return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n";
96 96 
     		}
97 97 
     		// Add auto_increment for aircraft_modes
 
@@ -99,7 +99,7 @@  discard block
 
 block discarded – undo
99 99 
     		try {
100 100 
             	    $sth = $Connection->db->prepare($query);
101 101 
 		    $sth->execute();
102 
-    		} catch(PDOException $e) {
102 
+    		} catch (PDOException $e) {
103 103 
 		    return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n";
104 104 
     		}
105 105 
     		$error = '';
 
@@ -110,7 +110,7 @@  discard block
 
 block discarded – undo
110 110 
         	try {
111 111 
             	    $sth = $Connection->db->prepare($query);
112 112 
 		    $sth->execute();
113 
-    		} catch(PDOException $e) {
113 
+    		} catch (PDOException $e) {
114 114 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
115 115 
     		}
116 116 
 		return $error;
 
@@ -123,7 +123,7 @@  discard block
 
 block discarded – undo
123 123 
         	try {
124 124 
             	    $sth = $Connection->db->prepare($query);
125 125 
 		    $sth->execute();
126 
-    		} catch(PDOException $e) {
126 
+    		} catch (PDOException $e) {
127 127 
 		    return "error (add new columns to routes table) : ".$e->getMessage()."\n";
128 128 
     		}
129 129 
     		$error = '';
 
@@ -134,7 +134,7 @@  discard block
 
 block discarded – undo
134 134 
         	try {
135 135 
             	    $sth = $Connection->db->prepare($query);
136 136 
 		    $sth->execute();
137 
-    		} catch(PDOException $e) {
137 
+    		} catch (PDOException $e) {
138 138 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
139 139 
     		}
140 140 
 		return $error;
 
@@ -147,7 +147,7 @@  discard block
 
 block discarded – undo
147 147 
         	try {
148 148 
             	    $sth = $Connection->db->prepare($query);
149 149 
 		    $sth->execute();
150 
-    		} catch(PDOException $e) {
150 
+    		} catch (PDOException $e) {
151 151 
 		    return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n";
152 152 
     		}
153 153 
     		// Add image_source_website column to spotter_image
 
@@ -155,7 +155,7 @@  discard block
 
 block discarded – undo
155 155 
         	try {
156 156 
             	    $sth = $Connection->db->prepare($query);
157 157 
 		    $sth->execute();
158 
-    		} catch(PDOException $e) {
158 
+    		} catch (PDOException $e) {
159 159 
 		    return "error (add new columns to spotter_image) : ".$e->getMessage()."\n";
160 160 
     		}
161 161 
     		$error = '';
 
@@ -164,7 +164,7 @@  discard block
 
 block discarded – undo
164 164 
         	try {
165 165 
             	    $sth = $Connection->db->prepare($query);
166 166 
 		    $sth->execute();
167 
-    		} catch(PDOException $e) {
167 
+    		} catch (PDOException $e) {
168 168 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
169 169 
     		}
170 170 
 		return $error;
 
@@ -182,7 +182,7 @@  discard block
 
 block discarded – undo
182 182 
         	    try {
183 183 
             		$sth = $Connection->db->prepare($query);
184 184 
 			$sth->execute();
185 
-    		    } catch(PDOException $e) {
185 
+    		    } catch (PDOException $e) {
186 186 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
187 187 
     		    }
188 188 
     		}
 
@@ -196,7 +196,7 @@  discard block
 
 block discarded – undo
196 196 
         	try {
197 197 
             	    $sth = $Connection->db->prepare($query);
198 198 
 		    $sth->execute();
199 
-    		} catch(PDOException $e) {
199 
+    		} catch (PDOException $e) {
200 200 
 		    return "error (add new columns to translation) : ".$e->getMessage()."\n";
201 201 
     		}
202 202 
     		// Add aircraft_shadow column to aircraft
 
@@ -204,7 +204,7 @@  discard block
 
 block discarded – undo
204 204 
         	try {
205 205 
             	    $sth = $Connection->db->prepare($query);
206 206 
 		    $sth->execute();
207 
-    		} catch(PDOException $e) {
207 
+    		} catch (PDOException $e) {
208 208 
 		    return "error (add new column to aircraft) : ".$e->getMessage()."\n";
209 209 
     		}
210 210 
     		// Add aircraft_shadow column to spotter_live
 
@@ -212,7 +212,7 @@  discard block
 
 block discarded – undo
212 212 
         	try {
213 213 
             	    $sth = $Connection->db->prepare($query);
214 214 
 		    $sth->execute();
215 
-    		} catch(PDOException $e) {
215 
+    		} catch (PDOException $e) {
216 216 
 		    return "error (add new column to spotter_live) : ".$e->getMessage()."\n";
217 217 
     		}
218 218 
     		$error = '';
 
@@ -225,7 +225,7 @@  discard block
 
 block discarded – undo
225 225 
         	try {
226 226 
             	    $sth = $Connection->db->prepare($query);
227 227 
 		    $sth->execute();
228 
-    		} catch(PDOException $e) {
228 
+    		} catch (PDOException $e) {
229 229 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
230 230 
     		}
231 231 
 		return $error;
 
@@ -233,7 +233,7 @@  discard block
 
 block discarded – undo
233 233
234 234 
 	private static function update_from_6() {
235 235 
     		$Connection = new Connection();
236 
-    		if (!$Connection->indexExists('spotter_output','flightaware_id')) {
236 
+    		if (!$Connection->indexExists('spotter_output', 'flightaware_id')) {
237 237 
     		    $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id);
238 238 
 			ALTER TABLE spotter_output ADD INDEX(date);
239 239 
 			ALTER TABLE spotter_output ADD INDEX(ident);
 
@@ -250,7 +250,7 @@  discard block
 
 block discarded – undo
250 250 
         	    try {
251 251 
             		$sth = $Connection->db->prepare($query);
252 252 
 			$sth->execute();
253 
-    		    } catch(PDOException $e) {
253 
+    		    } catch (PDOException $e) {
254 254 
 			return "error (add some indexes) : ".$e->getMessage()."\n";
255 255 
     		    }
256 256 
     		}
 
@@ -265,7 +265,7 @@  discard block
 
 block discarded – undo
265 265 
         	try {
266 266 
             	    $sth = $Connection->db->prepare($query);
267 267 
 		    $sth->execute();
268 
-    		} catch(PDOException $e) {
268 
+    		} catch (PDOException $e) {
269 269 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
270 270 
     		}
271 271 
 		return $error;
 
@@ -274,12 +274,12 @@  discard block
 
 block discarded – undo
274 274 
 	private static function update_from_7() {
275 275 
 		global $globalDBname, $globalDBdriver;
276 276 
     		$Connection = new Connection();
277 
-    		$query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
277 
+    		$query = "ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;
278 278 
     			ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;";
279 279 
         	try {
280 280 
             	    $sth = $Connection->db->prepare($query);
281 281 
 		    $sth->execute();
282 
-    		} catch(PDOException $e) {
282 
+    		} catch (PDOException $e) {
283 283 
 		    return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
284 284 
     		}
285 285 
     		if ($globalDBdriver == 'mysql') {
 
@@ -287,7 +287,7 @@  discard block
 
 block discarded – undo
287 287 
 		    try {
288 288 
             		$sth = $Connection->db->prepare($query);
289 289 
 			$sth->execute();
290 
-    		    } catch(PDOException $e) {
290 
+    		    } catch (PDOException $e) {
291 291 
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
292 292 
     		    }
293 293 
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -299,15 +299,15 @@  discard block
 
 block discarded – undo
299 299 
 				DROP TABLE spotter_archive;
300 300 
 				RENAME TABLE copy TO spotter_archive;";
301 301 
             	    } else {
302 
-    			$query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
302 
+    			$query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
303 303 
             	    }
304 304 
                 } else {
305 
-    		    $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
305 
+    		    $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL";
306 306 
                 }
307 307 
         	try {
308 308 
             	    $sth = $Connection->db->prepare($query);
309 309 
 		    $sth->execute();
310 
-    		} catch(PDOException $e) {
310 
+    		} catch (PDOException $e) {
311 311 
 		    return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n";
312 312 
     		}
313 313 
 
@@ -320,7 +320,7 @@  discard block
 
 block discarded – undo
320 320 
         	try {
321 321 
             	    $sth = $Connection->db->prepare($query);
322 322 
 		    $sth->execute();
323 
-    		} catch(PDOException $e) {
323 
+    		} catch (PDOException $e) {
324 324 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
325 325 
     		}
326 326 
 		return $error;
 
@@ -339,14 +339,14 @@  discard block
 
 block discarded – undo
339 339 
         	try {
340 340 
             	    $sth = $Connection->db->prepare($query);
341 341 
 		    $sth->execute();
342 
-    		} catch(PDOException $e) {
342 
+    		} catch (PDOException $e) {
343 343 
 		    return "error (insert last_update values) : ".$e->getMessage()."\n";
344 344 
     		}
345 345 
 		$query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'";
346 346 
         	try {
347 347 
             	    $sth = $Connection->db->prepare($query);
348 348 
 		    $sth->execute();
349 
-    		} catch(PDOException $e) {
349 
+    		} catch (PDOException $e) {
350 350 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
351 351 
     		}
352 352 
 		return $error;
 
@@ -354,12 +354,12 @@  discard block
 
 block discarded – undo
354 354
355 355 
 	private static function update_from_9() {
356 356 
     		$Connection = new Connection();
357 
-    		$query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
357 
+    		$query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL;
358 358 
     			ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;";
359 359 
         	try {
360 360 
             	    $sth = $Connection->db->prepare($query);
361 361 
 		    $sth->execute();
362 
-    		} catch(PDOException $e) {
362 
+    		} catch (PDOException $e) {
363 363 
 		    return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n";
364 364 
     		}
365 365 
 		$error = '';
 
@@ -371,7 +371,7 @@  discard block
 
 block discarded – undo
371 371 
         	try {
372 372 
             	    $sth = $Connection->db->prepare($query);
373 373 
 		    $sth->execute();
374 
-    		} catch(PDOException $e) {
374 
+    		} catch (PDOException $e) {
375 375 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
376 376 
     		}
377 377 
 		return $error;
 
@@ -379,11 +379,11 @@  discard block
 
 block discarded – undo
379 379
380 380 
 	private static function update_from_10() {
381 381 
     		$Connection = new Connection();
382 
-    		$query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
382 
+    		$query = "ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL";
383 383 
         	try {
384 384 
             	    $sth = $Connection->db->prepare($query);
385 385 
 		    $sth->execute();
386 
-    		} catch(PDOException $e) {
386 
+    		} catch (PDOException $e) {
387 387 
 		    return "error (add new enum to ATC table) : ".$e->getMessage()."\n";
388 388 
     		}
389 389 
 		$error = '';
 
@@ -401,7 +401,7 @@  discard block
 
 block discarded – undo
401 401 
         	try {
402 402 
             	    $sth = $Connection->db->prepare($query);
403 403 
 		    $sth->execute();
404 
-    		} catch(PDOException $e) {
404 
+    		} catch (PDOException $e) {
405 405 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
406 406 
     		}
407 407 
 		return $error;
 
@@ -410,18 +410,18 @@  discard block
 
 block discarded – undo
410 410 
 	private static function update_from_11() {
411 411 
 		global $globalDBdriver, $globalDBname;
412 412 
     		$Connection = new Connection();
413 
-    		$query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
413 
+    		$query = "ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)";
414 414 
         	try {
415 415 
             	    $sth = $Connection->db->prepare($query);
416 416 
 		    $sth->execute();
417 
-    		} catch(PDOException $e) {
417 
+    		} catch (PDOException $e) {
418 418 
 		    return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n";
419 419 
     		}
420 
-    		$query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
420 
+    		$query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
421 421 
         	try {
422 422 
             	    $sth = $Connection->db->prepare($query);
423 423 
 		    $sth->execute();
424 
-    		} catch(PDOException $e) {
424 
+    		} catch (PDOException $e) {
425 425 
 		    return "error (format_source column to spotter_live) : ".$e->getMessage()."\n";
426 426 
     		}
427 427 
     		if ($globalDBdriver == 'mysql') {
 
@@ -429,7 +429,7 @@  discard block
 
 block discarded – undo
429 429 
 		    try {
430 430 
             		$sth = $Connection->db->prepare($query);
431 431 
 			$sth->execute();
432 
-    		    } catch(PDOException $e) {
432 
+    		    } catch (PDOException $e) {
433 433 
 			return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
434 434 
     		    }
435 435 
     		    $row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -441,15 +441,15 @@  discard block
 
 block discarded – undo
441 441 
 				DROP TABLE spotter_archive;
442 442 
 				RENAME TABLE copy TO spotter_archive;";
443 443 
             	    } else {
444 
-    			$query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
444 
+    			$query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
445 445 
             	    }
446 446 
                 } else {
447 
-    		    $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
447 
+    		    $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE";
448 448 
                 }
449 449 
         	try {
450 450 
             	    $sth = $Connection->db->prepare($query);
451 451 
 		    $sth->execute();
452 
-    		} catch(PDOException $e) {
452 
+    		} catch (PDOException $e) {
453 453 
 		    return "error (add columns to spotter_archive) : ".$e->getMessage()."\n";
454 454 
     		}
455 455 
 
@@ -459,7 +459,7 @@  discard block
 
 block discarded – undo
459 459 
         	try {
460 460 
             	    $sth = $Connection->db->prepare($query);
461 461 
 		    $sth->execute();
462 
-    		} catch(PDOException $e) {
462 
+    		} catch (PDOException $e) {
463 463 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
464 464 
     		}
465 465 
 		return $error;
 
@@ -487,7 +487,7 @@  discard block
 
 block discarded – undo
487 487 
         	try {
488 488 
             	    $sth = $Connection->db->prepare($query);
489 489 
 		    $sth->execute();
490 
-    		} catch(PDOException $e) {
490 
+    		} catch (PDOException $e) {
491 491 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
492 492 
     		}
493 493 
 		return $error;
 
@@ -495,12 +495,12 @@  discard block
 
 block discarded – undo
495 495
496 496 
 	private static function update_from_13() {
497 497 
     		$Connection = new Connection();
498 
-    		if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) {
499 
-    			$query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
498 
+    		if (!$Connection->checkColumnName('spotter_archive_output', 'real_departure_airport_icao')) {
499 
+    			$query = "ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)";
500 500 
 			try {
501 501 
 				$sth = $Connection->db->prepare($query);
502 502 
 				$sth->execute();
503 
-	    		} catch(PDOException $e) {
503 
+	    		} catch (PDOException $e) {
504 504 
 				return "error (update spotter_archive_output) : ".$e->getMessage()."\n";
505 505 
     			}
506 506 
 		}
 
@@ -509,7 +509,7 @@  discard block
 
 block discarded – undo
509 509 
         	try {
510 510 
             	    $sth = $Connection->db->prepare($query);
511 511 
 		    $sth->execute();
512 
-    		} catch(PDOException $e) {
512 
+    		} catch (PDOException $e) {
513 513 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
514 514 
     		}
515 515 
 		return $error;
 
@@ -527,7 +527,7 @@  discard block
 
 block discarded – undo
527 527 
         	try {
528 528 
             	    $sth = $Connection->db->prepare($query);
529 529 
 		    $sth->execute();
530 
-    		} catch(PDOException $e) {
530 
+    		} catch (PDOException $e) {
531 531 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
532 532 
     		}
533 533 
 		return $error;
 
@@ -538,11 +538,11 @@  discard block
 
 block discarded – undo
538 538 
     		$Connection = new Connection();
539 539 
 		$error = '';
540 540 
     		// Add tables
541 
-    		$query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
541 
+    		$query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP";
542 542 
         	try {
543 543 
             	    $sth = $Connection->db->prepare($query);
544 544 
 		    $sth->execute();
545 
-    		} catch(PDOException $e) {
545 
+    		} catch (PDOException $e) {
546 546 
 		    return "error (update stats) : ".$e->getMessage()."\n";
547 547 
     		}
548 548 
 		if ($error != '') return $error;
 
@@ -550,7 +550,7 @@  discard block
 
 block discarded – undo
550 550 
         	try {
551 551 
             	    $sth = $Connection->db->prepare($query);
552 552 
 		    $sth->execute();
553 
-    		} catch(PDOException $e) {
553 
+    		} catch (PDOException $e) {
554 554 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
555 555 
     		}
556 556 
 		return $error;
 
@@ -571,7 +571,7 @@  discard block
 
 block discarded – undo
571 571 
         	try {
572 572 
             	    $sth = $Connection->db->prepare($query);
573 573 
 		    $sth->execute();
574 
-    		} catch(PDOException $e) {
574 
+    		} catch (PDOException $e) {
575 575 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
576 576 
     		}
577 577 
 		return $error;
 
@@ -589,7 +589,7 @@  discard block
 
 block discarded – undo
589 589 
         	try {
590 590 
             	    $sth = $Connection->db->prepare($query);
591 591 
 		    $sth->execute();
592 
-    		} catch(PDOException $e) {
592 
+    		} catch (PDOException $e) {
593 593 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
594 594 
     		}
595 595 
 		return $error;
 
@@ -598,12 +598,12 @@  discard block
 
 block discarded – undo
598 598 
     		$Connection = new Connection();
599 599 
 		$error = '';
600 600 
     		// Modify stats_airport table
601 
-    		if (!$Connection->checkColumnName('stats_airport','airport_name')) {
601 
+    		if (!$Connection->checkColumnName('stats_airport', 'airport_name')) {
602 602 
     			$query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)";
603 603 
     	        	try {
604 604 
 	            	    $sth = $Connection->db->prepare($query);
605 605 
 			    $sth->execute();
606 
-    			} catch(PDOException $e) {
606 
+    			} catch (PDOException $e) {
607 607 
 			    return "error (update stats) : ".$e->getMessage()."\n";
608 608 
     			}
609 609 
     		}
 
@@ -612,7 +612,7 @@  discard block
 
 block discarded – undo
612 612 
         	try {
613 613 
             	    $sth = $Connection->db->prepare($query);
614 614 
 		    $sth->execute();
615 
-    		} catch(PDOException $e) {
615 
+    		} catch (PDOException $e) {
616 616 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
617 617 
     		}
618 618 
 		return $error;
 
@@ -629,73 +629,73 @@  discard block
 
 block discarded – undo
629 629 
         	try {
630 630 
             	    $sth = $Connection->db->prepare($query);
631 631 
 		    $sth->execute();
632 
-    		} catch(PDOException $e) {
632 
+    		} catch (PDOException $e) {
633 633 
 		    return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n";
634 634 
     		}
635 635 
 		$query = "alter table spotter_archive add spotter_archive_id INT(11)";
636 636 
         	try {
637 637 
             	    $sth = $Connection->db->prepare($query);
638 638 
 		    $sth->execute();
639 
-    		} catch(PDOException $e) {
639 
+    		} catch (PDOException $e) {
640 640 
 		    return "error (add id again on spotter_archive) : ".$e->getMessage()."\n";
641 641 
     		}
642 
-		if (!$Connection->checkColumnName('spotter_archive','over_country')) {
642 
+		if (!$Connection->checkColumnName('spotter_archive', 'over_country')) {
643 643 
 			// Add column over_country
644 644 
     			$query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
645 645 
 			try {
646 646 
             			$sth = $Connection->db->prepare($query);
647 647 
 				$sth->execute();
648 
-			} catch(PDOException $e) {
648 
+			} catch (PDOException $e) {
649 649 
 				return "error (add over_country) : ".$e->getMessage()."\n";
650 650 
 			}
651 651 
 		}
652 
-		if (!$Connection->checkColumnName('spotter_live','over_country')) {
652 
+		if (!$Connection->checkColumnName('spotter_live', 'over_country')) {
653 653 
 			// Add column over_country
654 654 
     			$query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL";
655 655 
 			try {
656 656 
             			$sth = $Connection->db->prepare($query);
657 657 
 				$sth->execute();
658 
-			} catch(PDOException $e) {
658 
+			} catch (PDOException $e) {
659 659 
 				return "error (add over_country) : ".$e->getMessage()."\n";
660 660 
 			}
661 661 
 		}
662 
-		if (!$Connection->checkColumnName('spotter_output','source_name')) {
662 
+		if (!$Connection->checkColumnName('spotter_output', 'source_name')) {
663 663 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
664 664 
     			$query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
665 665 
 			try {
666 666 
 				$sth = $Connection->db->prepare($query);
667 667 
 				$sth->execute();
668 
-			} catch(PDOException $e) {
668 
+			} catch (PDOException $e) {
669 669 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
670 670 
     			}
671 671 
     		}
672 
-		if (!$Connection->checkColumnName('spotter_live','source_name')) {
672 
+		if (!$Connection->checkColumnName('spotter_live', 'source_name')) {
673 673 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
674 674 
     			$query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
675 675 
 			try {
676 676 
 				$sth = $Connection->db->prepare($query);
677 677 
 				$sth->execute();
678 
-			} catch(PDOException $e) {
678 
+			} catch (PDOException $e) {
679 679 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
680 680 
     			}
681 681 
     		}
682 
-		if (!$Connection->checkColumnName('spotter_archive_output','source_name')) {
682 
+		if (!$Connection->checkColumnName('spotter_archive_output', 'source_name')) {
683 683 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
684 684 
     			$query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`";
685 685 
 			try {
686 686 
 				$sth = $Connection->db->prepare($query);
687 687 
 				$sth->execute();
688 
-			} catch(PDOException $e) {
688 
+			} catch (PDOException $e) {
689 689 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
690 690 
     			}
691 691 
     		}
692 
-		if (!$Connection->checkColumnName('spotter_archive','source_name')) {
692 
+		if (!$Connection->checkColumnName('spotter_archive', 'source_name')) {
693 693 
 			// Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output
694 694 
     			$query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;";
695 695 
 			try {
696 696 
 				$sth = $Connection->db->prepare($query);
697 697 
 				$sth->execute();
698 
-			} catch(PDOException $e) {
698 
+			} catch (PDOException $e) {
699 699 
 				return "error (add source_name column) : ".$e->getMessage()."\n";
700 700 
     			}
701 701 
     		}
 
@@ -704,7 +704,7 @@  discard block
 
 block discarded – undo
704 704 
         	try {
705 705 
             	    $sth = $Connection->db->prepare($query);
706 706 
 		    $sth->execute();
707 
-    		} catch(PDOException $e) {
707 
+    		} catch (PDOException $e) {
708 708 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
709 709 
     		}
710 710 
 		return $error;
 
@@ -719,13 +719,13 @@  discard block
 
 block discarded – undo
719 719 
 			$error .= create_db::import_file('../db/airlines.sql');
720 720 
 			if ($error != '') return 'Import airlines.sql : '.$error;
721 721 
 		}
722 
-		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
722 
+		if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) {
723 723 
 			// Add column over_country
724 724 
     			$query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;";
725 725 
         		try {
726 726 
 				$sth = $Connection->db->prepare($query);
727 727 
 				$sth->execute();
728 
-			} catch(PDOException $e) {
728 
+			} catch (PDOException $e) {
729 729 
 				return "error (add over_country) : ".$e->getMessage()."\n";
730 730 
     			}
731 731 
     		}
 
@@ -741,7 +741,7 @@  discard block
 
 block discarded – undo
741 741 
         	try {
742 742 
             	    $sth = $Connection->db->prepare($query);
743 743 
 		    $sth->execute();
744 
-    		} catch(PDOException $e) {
744 
+    		} catch (PDOException $e) {
745 745 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
746 746 
     		}
747 747 
 		return $error;
 
@@ -750,13 +750,13 @@  discard block
 
 block discarded – undo
750 750 
 	private static function update_from_21() {
751 751 
 		$Connection = new Connection();
752 752 
 		$error = '';
753 
-		if (!$Connection->checkColumnName('stats_airport','stats_type')) {
753 
+		if (!$Connection->checkColumnName('stats_airport', 'stats_type')) {
754 754 
 			// Rename type to stats_type
755 755 
 			$query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);";
756 756 
 			try {
757 757 
 				$sth = $Connection->db->prepare($query);
758 758 
 				$sth->execute();
759 
-			} catch(PDOException $e) {
759 
+			} catch (PDOException $e) {
760 760 
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
761 761 
 			}
762 762 
 			if ($error != '') return $error;
 
@@ -765,7 +765,7 @@  discard block
 
 block discarded – undo
765 765 
         	try {
766 766 
             	    $sth = $Connection->db->prepare($query);
767 767 
 		    $sth->execute();
768 
-    		} catch(PDOException $e) {
768 
+    		} catch (PDOException $e) {
769 769 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
770 770 
     		}
771 771 
 		return $error;
 
@@ -788,7 +788,7 @@  discard block
 
 block discarded – undo
788 788 
         	try {
789 789 
             	    $sth = $Connection->db->prepare($query);
790 790 
 		    $sth->execute();
791 
-    		} catch(PDOException $e) {
791 
+    		} catch (PDOException $e) {
792 792 
 		    return "error (update schema_version) : ".$e->getMessage()."\n";
793 793 
     		}
794 794 
 		return $error;
 
@@ -814,17 +814,17 @@  discard block
 
 block discarded – undo
814 814 
 			try {
815 815 
 				$sth = $Connection->db->prepare($query);
816 816 
 				$sth->execute();
817 
-			} catch(PDOException $e) {
817 
+			} catch (PDOException $e) {
818 818 
 				return "error (create index on spotter_archive) : ".$e->getMessage()."\n";
819 819 
 			}
820 820 
 		}
821 
-		if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) {
821 
+		if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) {
822 822 
 			// Add aircraft_manufacturer to stats_aircraft
823 823 
     			$query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL";
824 824 
 			try {
825 825 
 				$sth = $Connection->db->prepare($query);
826 826 
 				$sth->execute();
827 
-			} catch(PDOException $e) {
827 
+			} catch (PDOException $e) {
828 828 
 				return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n";
829 829 
     			}
830 830 
     		}
 
@@ -833,7 +833,7 @@  discard block
 
 block discarded – undo
833 833 
 		try {
834 834 
 			$sth = $Connection->db->prepare($query);
835 835 
 			$sth->execute();
836 
-		} catch(PDOException $e) {
836 
+		} catch (PDOException $e) {
837 837 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
838 838 
 		}
839 839 
 		return $error;
 
@@ -849,23 +849,23 @@  discard block
 
 block discarded – undo
849 849 
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
850 850 
 		}
851 851 
 		if ($error != '') return 'Import airlines.sql : '.$error;
852 
-		if (!$Connection->checkColumnName('airlines','forsource')) {
852 
+		if (!$Connection->checkColumnName('airlines', 'forsource')) {
853 853 
 			// Add forsource to airlines
854 854 
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
855 855 
 			try {
856 856 
 				$sth = $Connection->db->prepare($query);
857 857 
 				$sth->execute();
858 
-			} catch(PDOException $e) {
858 
+			} catch (PDOException $e) {
859 859 
 				return "error (add forsource column) : ".$e->getMessage()."\n";
860 860 
 			}
861 861 
 		}
862 
-		if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) {
862 
+		if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) {
863 863 
 			// Add forsource to airlines
864 864 
 			$query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
865 865 
 			try {
866 866 
 				$sth = $Connection->db->prepare($query);
867 867 
 				$sth->execute();
868 
-			} catch(PDOException $e) {
868 
+			} catch (PDOException $e) {
869 869 
 				return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n";
870 870 
 			}
871 871 
 			// Add unique key
 
@@ -877,17 +877,17 @@  discard block
 
 block discarded – undo
877 877 
 			try {
878 878 
 				$sth = $Connection->db->prepare($query);
879 879 
 				$sth->execute();
880 
-			} catch(PDOException $e) {
880 
+			} catch (PDOException $e) {
881 881 
 				return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n";
882 882 
 			}
883 883 
 		}
884 
-		if (!$Connection->checkColumnName('stats_airport','stats_airline')) {
884 
+		if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) {
885 885 
 			// Add forsource to airlines
886 886 
 			$query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
887 887 
 			try {
888 888 
 				$sth = $Connection->db->prepare($query);
889 889 
 				$sth->execute();
890 
-			} catch(PDOException $e) {
890 
+			} catch (PDOException $e) {
891 891 
 				return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n";
892 892 
 			}
893 893 
 			// Add unique key
 
@@ -899,17 +899,17 @@  discard block
 
 block discarded – undo
899 899 
 			try {
900 900 
 				$sth = $Connection->db->prepare($query);
901 901 
 				$sth->execute();
902 
-			} catch(PDOException $e) {
902 
+			} catch (PDOException $e) {
903 903 
 				return "error (add unique key in stats_airport) : ".$e->getMessage()."\n";
904 904 
 			}
905 905 
 		}
906 
-		if (!$Connection->checkColumnName('stats_country','stats_airline')) {
906 
+		if (!$Connection->checkColumnName('stats_country', 'stats_airline')) {
907 907 
 			// Add forsource to airlines
908 908 
 			$query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
909 909 
 			try {
910 910 
 				$sth = $Connection->db->prepare($query);
911 911 
 				$sth->execute();
912 
-			} catch(PDOException $e) {
912 
+			} catch (PDOException $e) {
913 913 
 				return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n";
914 914 
 			}
915 915 
 			// Add unique key
 
@@ -921,36 +921,36 @@  discard block
 
 block discarded – undo
921 921 
 			try {
922 922 
 				$sth = $Connection->db->prepare($query);
923 923 
 				$sth->execute();
924 
-			} catch(PDOException $e) {
924 
+			} catch (PDOException $e) {
925 925 
 				return "error (add unique key in stats_airline) : ".$e->getMessage()."\n";
926 926 
 			}
927 927 
 		}
928 
-		if (!$Connection->checkColumnName('stats_flight','stats_airline')) {
928 
+		if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) {
929 929 
 			// Add forsource to airlines
930 930 
 			$query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
931 931 
 			try {
932 932 
 				$sth = $Connection->db->prepare($query);
933 933 
 				$sth->execute();
934 
-			} catch(PDOException $e) {
934 
+			} catch (PDOException $e) {
935 935 
 				return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n";
936 936 
 			}
937 937 
 		}
938 
-		if (!$Connection->checkColumnName('stats','stats_airline')) {
938 
+		if (!$Connection->checkColumnName('stats', 'stats_airline')) {
939 939 
 			// Add forsource to airlines
940 940 
 			$query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
941 941 
 			try {
942 942 
 				$sth = $Connection->db->prepare($query);
943 943 
 				$sth->execute();
944 
-			} catch(PDOException $e) {
944 
+			} catch (PDOException $e) {
945 945 
 				return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n";
946 946 
 			}
947 
-			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) {
947 
+			if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) {
948 948 
 				// Add unique key
949 949 
 				$query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);";
950 950 
 				try {
951 951 
 					$sth = $Connection->db->prepare($query);
952 952 
 					$sth->execute();
953 
-				} catch(PDOException $e) {
953 
+				} catch (PDOException $e) {
954 954 
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
955 955 
 				}
956 956 
 			} else {
 
@@ -963,18 +963,18 @@  discard block
 
 block discarded – undo
963 963 
 				try {
964 964 
 					$sth = $Connection->db->prepare($query);
965 965 
 					$sth->execute();
966 
-				} catch(PDOException $e) {
966 
+				} catch (PDOException $e) {
967 967 
 					return "error (add unique key in stats) : ".$e->getMessage()."\n";
968 968 
 				}
969 969 
 			}
970 970 
 		}
971 
-		if (!$Connection->checkColumnName('stats_registration','stats_airline')) {
971 
+		if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) {
972 972 
 			// Add forsource to airlines
973 973 
 			$query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
974 974 
 			try {
975 975 
 				$sth = $Connection->db->prepare($query);
976 976 
 				$sth->execute();
977 
-			} catch(PDOException $e) {
977 
+			} catch (PDOException $e) {
978 978 
 				return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n";
979 979 
 			}
980 980 
 			// Add unique key
 
@@ -986,17 +986,17 @@  discard block
 
 block discarded – undo
986 986 
 			try {
987 987 
 				$sth = $Connection->db->prepare($query);
988 988 
 				$sth->execute();
989 
-			} catch(PDOException $e) {
989 
+			} catch (PDOException $e) {
990 990 
 				return "error (add unique key in stats_registration) : ".$e->getMessage()."\n";
991 991 
 			}
992 992 
 		}
993 
-		if (!$Connection->checkColumnName('stats_callsign','filter_name')) {
993 
+		if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) {
994 994 
 			// Add forsource to airlines
995 995 
 			$query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''";
996 996 
 			try {
997 997 
 				$sth = $Connection->db->prepare($query);
998 998 
 				$sth->execute();
999 
-			} catch(PDOException $e) {
999 
+			} catch (PDOException $e) {
1000 1000 
 				return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n";
1001 1001 
 			}
1002 1002 
 			// Add unique key
 
@@ -1008,17 +1008,17 @@  discard block
 
 block discarded – undo
1008 1008 
 			try {
1009 1009 
 				$sth = $Connection->db->prepare($query);
1010 1010 
 				$sth->execute();
1011 
-			} catch(PDOException $e) {
1011 
+			} catch (PDOException $e) {
1012 1012 
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
1013 1013 
 			}
1014 1014 
 		}
1015 
-		if (!$Connection->checkColumnName('stats_airline','filter_name')) {
1015 
+		if (!$Connection->checkColumnName('stats_airline', 'filter_name')) {
1016 1016 
 			// Add forsource to airlines
1017 1017 
 			$query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''";
1018 1018 
 			try {
1019 1019 
 				$sth = $Connection->db->prepare($query);
1020 1020 
 				$sth->execute();
1021 
-			} catch(PDOException $e) {
1021 
+			} catch (PDOException $e) {
1022 1022 
 				return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n";
1023 1023 
 			}
1024 1024 
 			// Add unique key
 
@@ -1030,7 +1030,7 @@  discard block
 
 block discarded – undo
1030 1030 
 			try {
1031 1031 
 				$sth = $Connection->db->prepare($query);
1032 1032 
 				$sth->execute();
1033 
-			} catch(PDOException $e) {
1033 
+			} catch (PDOException $e) {
1034 1034 
 				return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n";
1035 1035 
 			}
1036 1036 
 		}
 
@@ -1039,7 +1039,7 @@  discard block
 
 block discarded – undo
1039 1039 
 		try {
1040 1040 
 			$sth = $Connection->db->prepare($query);
1041 1041 
 			$sth->execute();
1042 
-		} catch(PDOException $e) {
1042 
+		} catch (PDOException $e) {
1043 1043 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1044 1044 
 		}
1045 1045 
 		return $error;
 
@@ -1049,13 +1049,13 @@  discard block
 
 block discarded – undo
1049 1049 
 		global $globalDBdriver;
1050 1050 
 		$Connection = new Connection();
1051 1051 
 		$error = '';
1052 
-		if (!$Connection->checkColumnName('stats_owner','stats_airline')) {
1052 
+		if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) {
1053 1053 
 			// Add forsource to airlines
1054 1054 
 			$query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
1055 1055 
 			try {
1056 1056 
 				$sth = $Connection->db->prepare($query);
1057 1057 
 				$sth->execute();
1058 
-			} catch(PDOException $e) {
1058 
+			} catch (PDOException $e) {
1059 1059 
 				return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n";
1060 1060 
 			}
1061 1061 
 			// Add unique key
 
@@ -1067,17 +1067,17 @@  discard block
 
 block discarded – undo
1067 1067 
 			try {
1068 1068 
 				$sth = $Connection->db->prepare($query);
1069 1069 
 				$sth->execute();
1070 
-			} catch(PDOException $e) {
1070 
+			} catch (PDOException $e) {
1071 1071 
 				return "error (add unique key in stats_owner) : ".$e->getMessage()."\n";
1072 1072 
 			}
1073 1073 
 		}
1074 
-		if (!$Connection->checkColumnName('stats_pilot','stats_airline')) {
1074 
+		if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) {
1075 1075 
 			// Add forsource to airlines
1076 1076 
 			$query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''";
1077 1077 
 			try {
1078 1078 
 				$sth = $Connection->db->prepare($query);
1079 1079 
 				$sth->execute();
1080 
-			} catch(PDOException $e) {
1080 
+			} catch (PDOException $e) {
1081 1081 
 				return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n";
1082 1082 
 			}
1083 1083 
 			// Add unique key
 
@@ -1089,7 +1089,7 @@  discard block
 
 block discarded – undo
1089 1089 
 			try {
1090 1090 
 				$sth = $Connection->db->prepare($query);
1091 1091 
 				$sth->execute();
1092 
-			} catch(PDOException $e) {
1092 
+			} catch (PDOException $e) {
1093 1093 
 				return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n";
1094 1094 
 			}
1095 1095 
 		}
 
@@ -1097,7 +1097,7 @@  discard block
 
 block discarded – undo
1097 1097 
 		try {
1098 1098 
 			$sth = $Connection->db->prepare($query);
1099 1099 
 			$sth->execute();
1100 
-		} catch(PDOException $e) {
1100 
+		} catch (PDOException $e) {
1101 1101 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1102 1102 
 		}
1103 1103 
 		return $error;
 
@@ -1107,12 +1107,12 @@  discard block
 
 block discarded – undo
1107 1107 
 		global $globalDBdriver;
1108 1108 
 		$Connection = new Connection();
1109 1109 
 		$error = '';
1110 
-		if (!$Connection->checkColumnName('atc','format_source')) {
1110 
+		if (!$Connection->checkColumnName('atc', 'format_source')) {
1111 1111 
 			$query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL";
1112 1112 
 			try {
1113 1113 
 				$sth = $Connection->db->prepare($query);
1114 1114 
 				$sth->execute();
1115 
-			} catch(PDOException $e) {
1115 
+			} catch (PDOException $e) {
1116 1116 
 				return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n";
1117 1117 
 			}
1118 1118 
 		}
 
@@ -1120,7 +1120,7 @@  discard block
 
 block discarded – undo
1120 1120 
 		try {
1121 1121 
 			$sth = $Connection->db->prepare($query);
1122 1122 
 			$sth->execute();
1123 
-		} catch(PDOException $e) {
1123 
+		} catch (PDOException $e) {
1124 1124 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1125 1125 
 		}
1126 1126 
 		return $error;
 
@@ -1130,13 +1130,13 @@  discard block
 
 block discarded – undo
1130 1130 
 		global $globalDBdriver;
1131 1131 
 		$Connection = new Connection();
1132 1132 
 		$error = '';
1133 
-		if (!$Connection->checkColumnName('stats_pilot','format_source')) {
1133 
+		if (!$Connection->checkColumnName('stats_pilot', 'format_source')) {
1134 1134 
 			// Add forsource to airlines
1135 1135 
 			$query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''";
1136 1136 
 			try {
1137 1137 
 				$sth = $Connection->db->prepare($query);
1138 1138 
 				$sth->execute();
1139 
-			} catch(PDOException $e) {
1139 
+			} catch (PDOException $e) {
1140 1140 
 				return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n";
1141 1141 
 			}
1142 1142 
 			// Add unique key
 
@@ -1148,7 +1148,7 @@  discard block
 
 block discarded – undo
1148 1148 
 			try {
1149 1149 
 				$sth = $Connection->db->prepare($query);
1150 1150 
 				$sth->execute();
1151 
-			} catch(PDOException $e) {
1151 
+			} catch (PDOException $e) {
1152 1152 
 				return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n";
1153 1153 
 			}
1154 1154 
 		}
 
@@ -1156,7 +1156,7 @@  discard block
 
 block discarded – undo
1156 1156 
 		try {
1157 1157 
 			$sth = $Connection->db->prepare($query);
1158 1158 
 			$sth->execute();
1159 
-		} catch(PDOException $e) {
1159 
+		} catch (PDOException $e) {
1160 1160 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1161 1161 
 		}
1162 1162 
 		return $error;
 
@@ -1166,23 +1166,23 @@  discard block
 
 block discarded – undo
1166 1166 
 		global $globalDBdriver;
1167 1167 
 		$Connection = new Connection();
1168 1168 
 		$error = '';
1169 
-		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) {
1169 
+		if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) {
1170 1170 
 			// Add unique key
1171 1171 
 			$query = "alter table spotter_live add index(latitude,longitude)";
1172 1172 
 			try {
1173 1173 
 				$sth = $Connection->db->prepare($query);
1174 1174 
 				$sth->execute();
1175 
-			} catch(PDOException $e) {
1175 
+			} catch (PDOException $e) {
1176 1176 
 				return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n";
1177 1177 
 			}
1178 1178 
                 }
1179 
-		if (!$Connection->checkColumnName('aircraft','mfr')) {
1179 
+		if (!$Connection->checkColumnName('aircraft', 'mfr')) {
1180 1180 
 			// Add mfr to aircraft
1181 1181 
 			$query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL";
1182 1182 
 			try {
1183 1183 
 				$sth = $Connection->db->prepare($query);
1184 1184 
 				$sth->execute();
1185 
-			} catch(PDOException $e) {
1185 
+			} catch (PDOException $e) {
1186 1186 
 				return "error (add mfr column in aircraft) : ".$e->getMessage()."\n";
1187 1187 
 			}
1188 1188 
 		}
 
@@ -1198,7 +1198,7 @@  discard block
 
 block discarded – undo
1198 1198 
 		try {
1199 1199 
 			$sth = $Connection->db->prepare($query);
1200 1200 
 			$sth->execute();
1201 
-		} catch(PDOException $e) {
1201 
+		} catch (PDOException $e) {
1202 1202 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1203 1203 
 		}
1204 1204 
 		return $error;
 
@@ -1208,13 +1208,13 @@  discard block
 
 block discarded – undo
1208 1208 
 		global $globalDBdriver;
1209 1209 
 		$Connection = new Connection();
1210 1210 
 		$error = '';
1211 
-		if ($Connection->checkColumnName('aircraft','mfr')) {
1211 
+		if ($Connection->checkColumnName('aircraft', 'mfr')) {
1212 1212 
 			// drop mfr to aircraft
1213 1213 
 			$query = "ALTER TABLE aircraft DROP COLUMN mfr";
1214 1214 
 			try {
1215 1215 
 				$sth = $Connection->db->prepare($query);
1216 1216 
 				$sth->execute();
1217 
-			} catch(PDOException $e) {
1217 
+			} catch (PDOException $e) {
1218 1218 
 				return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n";
1219 1219 
 			}
1220 1220 
 		}
 
@@ -1230,7 +1230,7 @@  discard block
 
 block discarded – undo
1230 1230 
 		try {
1231 1231 
 			$sth = $Connection->db->prepare($query);
1232 1232 
 			$sth->execute();
1233 
-		} catch(PDOException $e) {
1233 
+		} catch (PDOException $e) {
1234 1234 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1235 1235 
 		}
1236 1236 
 		return $error;
 
@@ -1240,33 +1240,33 @@  discard block
 
 block discarded – undo
1240 1240 
 		global $globalDBdriver;
1241 1241 
 		$Connection = new Connection();
1242 1242 
 		$error = '';
1243 
-		if (!$Connection->indexExists('notam','ref_idx')) {
1243 
+		if (!$Connection->indexExists('notam', 'ref_idx')) {
1244 1244 
 			// Add index key
1245 1245 
 			$query = "create index ref_idx on notam (ref)";
1246 1246 
 			try {
1247 1247 
 				$sth = $Connection->db->prepare($query);
1248 1248 
 				$sth->execute();
1249 
-			} catch(PDOException $e) {
1249 
+			} catch (PDOException $e) {
1250 1250 
 				return "error (add index ref on notam) : ".$e->getMessage()."\n";
1251 1251 
 			}
1252 1252 
                 }
1253 
-		if (!$Connection->indexExists('accidents','registration_idx')) {
1253 
+		if (!$Connection->indexExists('accidents', 'registration_idx')) {
1254 1254 
 			// Add index key
1255 1255 
 			$query = "create index registration_idx on accidents (registration)";
1256 1256 
 			try {
1257 1257 
 				$sth = $Connection->db->prepare($query);
1258 1258 
 				$sth->execute();
1259 
-			} catch(PDOException $e) {
1259 
+			} catch (PDOException $e) {
1260 1260 
 				return "error (add index registration on accidents) : ".$e->getMessage()."\n";
1261 1261 
 			}
1262 1262 
                 }
1263 
-		if (!$Connection->indexExists('accidents','rdts')) {
1263 
+		if (!$Connection->indexExists('accidents', 'rdts')) {
1264 1264 
 			// Add index key
1265 1265 
 			$query = "create index rdts on accidents (registration,date,type,source)";
1266 1266 
 			try {
1267 1267 
 				$sth = $Connection->db->prepare($query);
1268 1268 
 				$sth->execute();
1269 
-			} catch(PDOException $e) {
1269 
+			} catch (PDOException $e) {
1270 1270 
 				return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n";
1271 1271 
 			}
1272 1272 
                 }
 
@@ -1275,7 +1275,7 @@  discard block
 
 block discarded – undo
1275 1275 
 		try {
1276 1276 
 			$sth = $Connection->db->prepare($query);
1277 1277 
 			$sth->execute();
1278 
-		} catch(PDOException $e) {
1278 
+		} catch (PDOException $e) {
1279 1279 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1280 1280 
 		}
1281 1281 
 		return $error;
 
@@ -1285,23 +1285,23 @@  discard block
 
 block discarded – undo
1285 1285 
 		global $globalDBdriver;
1286 1286 
 		$Connection = new Connection();
1287 1287 
 		$error = '';
1288 
-		if (!$Connection->checkColumnName('accidents','airline_name')) {
1288 
+		if (!$Connection->checkColumnName('accidents', 'airline_name')) {
1289 1289 
 			// Add airline_name to accidents
1290 1290 
 			$query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL";
1291 1291 
 			try {
1292 1292 
 				$sth = $Connection->db->prepare($query);
1293 1293 
 				$sth->execute();
1294 
-			} catch(PDOException $e) {
1294 
+			} catch (PDOException $e) {
1295 1295 
 				return "error (add airline_name column in accidents) : ".$e->getMessage()."\n";
1296 1296 
 			}
1297 1297 
 		}
1298 
-		if (!$Connection->checkColumnName('accidents','airline_icao')) {
1298 
+		if (!$Connection->checkColumnName('accidents', 'airline_icao')) {
1299 1299 
 			// Add airline_icao to accidents
1300 1300 
 			$query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL";
1301 1301 
 			try {
1302 1302 
 				$sth = $Connection->db->prepare($query);
1303 1303 
 				$sth->execute();
1304 
-			} catch(PDOException $e) {
1304 
+			} catch (PDOException $e) {
1305 1305 
 				return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n";
1306 1306 
 			}
1307 1307 
 		}
 
@@ -1309,7 +1309,7 @@  discard block
 
 block discarded – undo
1309 1309 
 		try {
1310 1310 
 			$sth = $Connection->db->prepare($query);
1311 1311 
 			$sth->execute();
1312 
-		} catch(PDOException $e) {
1312 
+		} catch (PDOException $e) {
1313 1313 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1314 1314 
 		}
1315 1315 
 		return $error;
 
@@ -1319,13 +1319,13 @@  discard block
 
 block discarded – undo
1319 1319 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
1320 1320 
 		$Connection = new Connection();
1321 1321 
 		$error = '';
1322 
-		if (!$Connection->checkColumnName('airlines','alliance')) {
1322 
+		if (!$Connection->checkColumnName('airlines', 'alliance')) {
1323 1323 
 			// Add alliance to airlines
1324 1324 
 			$query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL";
1325 1325 
 			try {
1326 1326 
 				$sth = $Connection->db->prepare($query);
1327 1327 
 				$sth->execute();
1328 
-			} catch(PDOException $e) {
1328 
+			} catch (PDOException $e) {
1329 1329 
 				return "error (add alliance column in airlines) : ".$e->getMessage()."\n";
1330 1330 
 			}
1331 1331 
 		}
 
@@ -1352,7 +1352,7 @@  discard block
 
 block discarded – undo
1352 1352 
 		try {
1353 1353 
 			$sth = $Connection->db->prepare($query);
1354 1354 
 			$sth->execute();
1355 
-		} catch(PDOException $e) {
1355 
+		} catch (PDOException $e) {
1356 1356 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1357 1357 
 		}
1358 1358 
 		return $error;
 
@@ -1362,13 +1362,13 @@  discard block
 
 block discarded – undo
1362 1362 
 		global $globalDBdriver, $globalVATSIM, $globalIVAO;
1363 1363 
 		$Connection = new Connection();
1364 1364 
 		$error = '';
1365 
-		if (!$Connection->checkColumnName('airlines','ban_eu')) {
1365 
+		if (!$Connection->checkColumnName('airlines', 'ban_eu')) {
1366 1366 
 			// Add ban_eu to airlines
1367 1367 
 			$query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'";
1368 1368 
 			try {
1369 1369 
 				$sth = $Connection->db->prepare($query);
1370 1370 
 				$sth->execute();
1371 
-			} catch(PDOException $e) {
1371 
+			} catch (PDOException $e) {
1372 1372 
 				return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n";
1373 1373 
 			}
1374 1374 
 		}
 
@@ -1376,7 +1376,7 @@  discard block
 
 block discarded – undo
1376 1376 
 		try {
1377 1377 
 			$sth = $Connection->db->prepare($query);
1378 1378 
 			$sth->execute();
1379 
-		} catch(PDOException $e) {
1379 
+		} catch (PDOException $e) {
1380 1380 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1381 1381 
 		}
1382 1382 
 		return $error;
 
@@ -1387,19 +1387,19 @@  discard block
 
 block discarded – undo
1387 1387 
 		$Connection = new Connection();
1388 1388 
 		$error = '';
1389 1389 
 		if ($globalDBdriver == 'mysql') {
1390 
-			if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') {
1390 
+			if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') {
1391 1391 
 				$query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL";
1392 1392 
 				try {
1393 1393 
 					$sth = $Connection->db->prepare($query);
1394 1394 
 					$sth->execute();
1395 
-				} catch(PDOException $e) {
1395 
+				} catch (PDOException $e) {
1396 1396 
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
1397 1397 
 				}
1398 1398 
 				$query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()";
1399 1399 
 				try {
1400 1400 
 					$sth = $Connection->db->prepare($query);
1401 1401 
 					$sth->execute();
1402 
-				} catch(PDOException $e) {
1402 
+				} catch (PDOException $e) {
1403 1403 
 					return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n";
1404 1404 
 				}
1405 1405 
 				
@@ -1407,7 +1407,7 @@  discard block
 
 block discarded – undo
1407 1407 
 				try {
1408 1408 
 					$sth = $Connection->db->prepare($query);
1409 1409 
 					$sth->execute();
1410 
-				} catch(PDOException $e) {
1410 
+				} catch (PDOException $e) {
1411 1411 
 					return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n";
1412 1412 
 				}
1413 1413 
 				/*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150";
 
@@ -1458,7 +1458,7 @@  discard block
 
 block discarded – undo
1458 1458 
 				try {
1459 1459 
 					$sth = $Connection->db->prepare($query);
1460 1460 
 					$sth->execute();
1461 
-				} catch(PDOException $e) {
1461 
+				} catch (PDOException $e) {
1462 1462 
 					return "error (fix date) : ".$e->getMessage()."\n";
1463 1463 
 				}
1464 1464 
 			}
 
@@ -1543,7 +1543,7 @@  discard block
 
 block discarded – undo
1543 1543 
 		try {
1544 1544 
 			$sth = $Connection->db->prepare($query);
1545 1545 
 			$sth->execute();
1546 
-		} catch(PDOException $e) {
1546 
+		} catch (PDOException $e) {
1547 1547 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1548 1548 
 		}
1549 1549 
 		return $error;
 
@@ -1552,13 +1552,13 @@  discard block
 
 block discarded – undo
1552 1552 
 		global $globalDBdriver;
1553 1553 
 		$Connection = new Connection();
1554 1554 
 		$error = '';
1555 
-		if (!$Connection->indexExists('accidents','type')) {
1555 
+		if (!$Connection->indexExists('accidents', 'type')) {
1556 1556 
 			// Add index key
1557 1557 
 			$query = "create index type on accidents (type,date)";
1558 1558 
 			try {
1559 1559 
 				$sth = $Connection->db->prepare($query);
1560 1560 
 				$sth->execute();
1561 
-			} catch(PDOException $e) {
1561 
+			} catch (PDOException $e) {
1562 1562 
 				return "error (add index type on accidents) : ".$e->getMessage()."\n";
1563 1563 
 			}
1564 1564 
                 }
 
@@ -1566,7 +1566,7 @@  discard block
 
 block discarded – undo
1566 1566 
 		try {
1567 1567 
 			$sth = $Connection->db->prepare($query);
1568 1568 
 			$sth->execute();
1569 
-		} catch(PDOException $e) {
1569 
+		} catch (PDOException $e) {
1570 1570 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1571 1571 
 		}
1572 1572 
 		return $error;
 
@@ -1576,12 +1576,12 @@  discard block
 
 block discarded – undo
1576 1576 
 		global $globalDBdriver;
1577 1577 
 		$Connection = new Connection();
1578 1578 
 		$error = '';
1579 
-		if (!$Connection->checkColumnName('aircraft_modes','source_type')) {
1579 
+		if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) {
1580 1580 
 			$query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'";
1581 1581 
 			try {
1582 1582 
 				$sth = $Connection->db->prepare($query);
1583 1583 
 				$sth->execute();
1584 
-			} catch(PDOException $e) {
1584 
+			} catch (PDOException $e) {
1585 1585 
 				return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n";
1586 1586 
 			}
1587 1587 
 		}
 
@@ -1647,7 +1647,7 @@  discard block
 
 block discarded – undo
1647 1647 
 		try {
1648 1648 
 			$sth = $Connection->db->prepare($query);
1649 1649 
 			$sth->execute();
1650 
-		} catch(PDOException $e) {
1650 
+		} catch (PDOException $e) {
1651 1651 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1652 1652 
 		}
1653 1653 
 		return $error;
 
@@ -1699,7 +1699,7 @@  discard block
 
 block discarded – undo
1699 1699 
 			try {
1700 1700 
 				$sth = $Connection->db->prepare($query);
1701 1701 
 				$sth->execute();
1702 
-			} catch(PDOException $e) {
1702 
+			} catch (PDOException $e) {
1703 1703 
 				return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n";
1704 1704 
 			}
1705 1705 
 			$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -1708,18 +1708,18 @@  discard block
 
 block discarded – undo
1708 1708 
 				try {
1709 1709 
 					$sth = $Connection->db->prepare($query);
1710 1710 
 					$sth->execute();
1711 
-				} catch(PDOException $e) {
1711 
+				} catch (PDOException $e) {
1712 1712 
 					return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n";
1713 1713 
 				}
1714 1714 
 			}
1715 1715 
 		}
1716 
-		if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) {
1716 
+		if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) {
1717 1717 
 			// Add index key
1718 1718 
 			$query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)";
1719 1719 
 			try {
1720 1720 
 				$sth = $Connection->db->prepare($query);
1721 1721 
 				$sth->execute();
1722 
-			} catch(PDOException $e) {
1722 
+			} catch (PDOException $e) {
1723 1723 
 				return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n";
1724 1724 
 			}
1725 1725 
                 }
 
@@ -1727,7 +1727,7 @@  discard block
 
 block discarded – undo
1727 1727 
 		try {
1728 1728 
 			$sth = $Connection->db->prepare($query);
1729 1729 
 			$sth->execute();
1730 
-		} catch(PDOException $e) {
1730 
+		} catch (PDOException $e) {
1731 1731 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1732 1732 
 		}
1733 1733 
 		return $error;
 
@@ -1738,148 +1738,148 @@  discard block
 
 block discarded – undo
1738 1738 
 		$Connection = new Connection();
1739 1739 
 		$error = '';
1740 1740 
 		if ($globalDBdriver == 'mysql') {
1741 
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
1741 
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
1742 1742 
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL";
1743 1743 
 				try {
1744 1744 
 					$sth = $Connection->db->prepare($query);
1745 1745 
 					$sth->execute();
1746 
-				} catch(PDOException $e) {
1746 
+				} catch (PDOException $e) {
1747 1747 
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
1748 1748 
 				}
1749 1749 
 			}
1750 
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
1750 
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
1751 1751 
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL";
1752 1752 
 				try {
1753 1753 
 					$sth = $Connection->db->prepare($query);
1754 1754 
 					$sth->execute();
1755 
-				} catch(PDOException $e) {
1755 
+				} catch (PDOException $e) {
1756 1756 
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
1757 1757 
 				}
1758 1758 
 			}
1759 
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
1759 
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
1760 1760 
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL";
1761 1761 
 				try {
1762 1762 
 					$sth = $Connection->db->prepare($query);
1763 1763 
 					$sth->execute();
1764 
-				} catch(PDOException $e) {
1764 
+				} catch (PDOException $e) {
1765 1765 
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
1766 1766 
 				}
1767 1767 
 			}
1768 
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
1768 
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
1769 1769 
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL";
1770 1770 
 				try {
1771 1771 
 					$sth = $Connection->db->prepare($query);
1772 1772 
 					$sth->execute();
1773 
-				} catch(PDOException $e) {
1773 
+				} catch (PDOException $e) {
1774 1774 
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
1775 1775 
 				}
1776 1776 
 			}
1777 
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
1777 
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
1778 1778 
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL";
1779 1779 
 				try {
1780 1780 
 					$sth = $Connection->db->prepare($query);
1781 1781 
 					$sth->execute();
1782 
-				} catch(PDOException $e) {
1782 
+				} catch (PDOException $e) {
1783 1783 
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
1784 1784 
 				}
1785 1785 
 			}
1786 
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
1786 
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
1787 1787 
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL";
1788 1788 
 				try {
1789 1789 
 					$sth = $Connection->db->prepare($query);
1790 1790 
 					$sth->execute();
1791 
-				} catch(PDOException $e) {
1791 
+				} catch (PDOException $e) {
1792 1792 
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
1793 1793 
 				}
1794 1794 
 			}
1795 
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
1795 
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
1796 1796 
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL";
1797 1797 
 				try {
1798 1798 
 					$sth = $Connection->db->prepare($query);
1799 1799 
 					$sth->execute();
1800 
-				} catch(PDOException $e) {
1800 
+				} catch (PDOException $e) {
1801 1801 
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
1802 1802 
 				}
1803 1803 
 			}
1804 
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
1804 
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
1805 1805 
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL";
1806 1806 
 				try {
1807 1807 
 					$sth = $Connection->db->prepare($query);
1808 1808 
 					$sth->execute();
1809 
-				} catch(PDOException $e) {
1809 
+				} catch (PDOException $e) {
1810 1810 
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
1811 1811 
 				}
1812 1812 
 			}
1813 1813 
 		} else {
1814 
-			if (!$Connection->checkColumnName('marine_output','type_id')) {
1814 
+			if (!$Connection->checkColumnName('marine_output', 'type_id')) {
1815 1815 
 				$query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL";
1816 1816 
 				try {
1817 1817 
 					$sth = $Connection->db->prepare($query);
1818 1818 
 					$sth->execute();
1819 
-				} catch(PDOException $e) {
1819 
+				} catch (PDOException $e) {
1820 1820 
 					return "error (add column type_id in marine_output) : ".$e->getMessage()."\n";
1821 1821 
 				}
1822 1822 
 			}
1823 
-			if (!$Connection->checkColumnName('marine_live','type_id')) {
1823 
+			if (!$Connection->checkColumnName('marine_live', 'type_id')) {
1824 1824 
 				$query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL";
1825 1825 
 				try {
1826 1826 
 					$sth = $Connection->db->prepare($query);
1827 1827 
 					$sth->execute();
1828 
-				} catch(PDOException $e) {
1828 
+				} catch (PDOException $e) {
1829 1829 
 					return "error (add column type_id in marine_live) : ".$e->getMessage()."\n";
1830 1830 
 				}
1831 1831 
 			}
1832 
-			if (!$Connection->checkColumnName('marine_archive','type_id')) {
1832 
+			if (!$Connection->checkColumnName('marine_archive', 'type_id')) {
1833 1833 
 				$query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL";
1834 1834 
 				try {
1835 1835 
 					$sth = $Connection->db->prepare($query);
1836 1836 
 					$sth->execute();
1837 
-				} catch(PDOException $e) {
1837 
+				} catch (PDOException $e) {
1838 1838 
 					return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n";
1839 1839 
 				}
1840 1840 
 			}
1841 
-			if (!$Connection->checkColumnName('marine_archive_output','type_id')) {
1841 
+			if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) {
1842 1842 
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL";
1843 1843 
 				try {
1844 1844 
 					$sth = $Connection->db->prepare($query);
1845 1845 
 					$sth->execute();
1846 
-				} catch(PDOException $e) {
1846 
+				} catch (PDOException $e) {
1847 1847 
 					return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n";
1848 1848 
 				}
1849 1849 
 			}
1850 
-			if (!$Connection->checkColumnName('marine_output','status_id')) {
1850 
+			if (!$Connection->checkColumnName('marine_output', 'status_id')) {
1851 1851 
 				$query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL";
1852 1852 
 				try {
1853 1853 
 					$sth = $Connection->db->prepare($query);
1854 1854 
 					$sth->execute();
1855 
-				} catch(PDOException $e) {
1855 
+				} catch (PDOException $e) {
1856 1856 
 					return "error (add column status_id in marine_output) : ".$e->getMessage()."\n";
1857 1857 
 				}
1858 1858 
 			}
1859 
-			if (!$Connection->checkColumnName('marine_live','status_id')) {
1859 
+			if (!$Connection->checkColumnName('marine_live', 'status_id')) {
1860 1860 
 				$query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL";
1861 1861 
 				try {
1862 1862 
 					$sth = $Connection->db->prepare($query);
1863 1863 
 					$sth->execute();
1864 
-				} catch(PDOException $e) {
1864 
+				} catch (PDOException $e) {
1865 1865 
 					return "error (add column status_id in marine_live) : ".$e->getMessage()."\n";
1866 1866 
 				}
1867 1867 
 			}
1868 
-			if (!$Connection->checkColumnName('marine_archive','status_id')) {
1868 
+			if (!$Connection->checkColumnName('marine_archive', 'status_id')) {
1869 1869 
 				$query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL";
1870 1870 
 				try {
1871 1871 
 					$sth = $Connection->db->prepare($query);
1872 1872 
 					$sth->execute();
1873 
-				} catch(PDOException $e) {
1873 
+				} catch (PDOException $e) {
1874 1874 
 					return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n";
1875 1875 
 				}
1876 1876 
 			}
1877 
-			if (!$Connection->checkColumnName('marine_archive_output','status_id')) {
1877 
+			if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) {
1878 1878 
 				$query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL";
1879 1879 
 				try {
1880 1880 
 					$sth = $Connection->db->prepare($query);
1881 1881 
 					$sth->execute();
1882 
-				} catch(PDOException $e) {
1882 
+				} catch (PDOException $e) {
1883 1883 
 					return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n";
1884 1884 
 				}
1885 1885 
 			}
 
@@ -1888,7 +1888,7 @@  discard block
 
 block discarded – undo
1888 1888 
 		try {
1889 1889 
 			$sth = $Connection->db->prepare($query);
1890 1890 
 			$sth->execute();
1891 
-		} catch(PDOException $e) {
1891 
+		} catch (PDOException $e) {
1892 1892 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1893 1893 
 		}
1894 1894 
 		return $error;
 
@@ -1903,14 +1903,14 @@  discard block
 
 block discarded – undo
1903 1903 
 			try {
1904 1904 
 				$sth = $Connection->db->prepare($query);
1905 1905 
 				$sth->execute();
1906 
-			} catch(PDOException $e) {
1906 
+			} catch (PDOException $e) {
1907 1907 
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
1908 1908 
 			}
1909 1909 
 			$query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL";
1910 1910 
 			try {
1911 1911 
 				$sth = $Connection->db->prepare($query);
1912 1912 
 				$sth->execute();
1913 
-			} catch(PDOException $e) {
1913 
+			} catch (PDOException $e) {
1914 1914 
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
1915 1915 
 			}
1916 1916 
 		} else {
 
@@ -1918,14 +1918,14 @@  discard block
 
 block discarded – undo
1918 1918 
 			try {
1919 1919 
 				$sth = $Connection->db->prepare($query);
1920 1920 
 				$sth->execute();
1921 
-			} catch(PDOException $e) {
1921 
+			} catch (PDOException $e) {
1922 1922 
 				return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n";
1923 1923 
 			}
1924 1924 
 			$query = "alter table marine_identity alter column mmsi type varchar(255)";
1925 1925 
 			try {
1926 1926 
 				$sth = $Connection->db->prepare($query);
1927 1927 
 				$sth->execute();
1928 
-			} catch(PDOException $e) {
1928 
+			} catch (PDOException $e) {
1929 1929 
 				return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n";
1930 1930 
 			}
1931 1931 
 		}
 
@@ -1933,7 +1933,7 @@  discard block
 
 block discarded – undo
1933 1933 
 		try {
1934 1934 
 			$sth = $Connection->db->prepare($query);
1935 1935 
 			$sth->execute();
1936 
-		} catch(PDOException $e) {
1936 
+		} catch (PDOException $e) {
1937 1937 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1938 1938 
 		}
1939 1939 
 		return $error;
 
@@ -1943,32 +1943,32 @@  discard block
 
 block discarded – undo
1943 1943 
 		global $globalDBdriver;
1944 1944 
 		$Connection = new Connection();
1945 1945 
 		$error = '';
1946 
-		if (!$Connection->checkColumnName('source_location','last_seen')) {
1946 
+		if (!$Connection->checkColumnName('source_location', 'last_seen')) {
1947 1947 
 			$query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL";
1948 1948 
 			try {
1949 1949 
 				$sth = $Connection->db->prepare($query);
1950 1950 
 				$sth->execute();
1951 
-			} catch(PDOException $e) {
1951 
+			} catch (PDOException $e) {
1952 1952 
 				return "error (add column last_seen in source_location) : ".$e->getMessage()."\n";
1953 1953 
 			}
1954 1954 
 		}
1955 1955 
 		if ($globalDBdriver == 'mysql') {
1956 
-			if (!$Connection->checkColumnName('source_location','location_id')) {
1956 
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
1957 1957 
 				$query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL";
1958 1958 
 				try {
1959 1959 
 					$sth = $Connection->db->prepare($query);
1960 1960 
 					$sth->execute();
1961 
-				} catch(PDOException $e) {
1961 
+				} catch (PDOException $e) {
1962 1962 
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
1963 1963 
 				}
1964 1964 
 			}
1965 1965 
 		} else {
1966 
-			if (!$Connection->checkColumnName('source_location','location_id')) {
1966 
+			if (!$Connection->checkColumnName('source_location', 'location_id')) {
1967 1967 
 				$query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL";
1968 1968 
 				try {
1969 1969 
 					$sth = $Connection->db->prepare($query);
1970 1970 
 					$sth->execute();
1971 
-				} catch(PDOException $e) {
1971 
+				} catch (PDOException $e) {
1972 1972 
 					return "error (add column location_id in source_location) : ".$e->getMessage()."\n";
1973 1973 
 				}
1974 1974 
 			}
 
@@ -1977,7 +1977,7 @@  discard block
 
 block discarded – undo
1977 1977 
 		try {
1978 1978 
 			$sth = $Connection->db->prepare($query);
1979 1979 
 			$sth->execute();
1980 
-		} catch(PDOException $e) {
1980 
+		} catch (PDOException $e) {
1981 1981 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
1982 1982 
 		}
1983 1983 
 		return $error;
 
@@ -1987,12 +1987,12 @@  discard block
 
 block discarded – undo
1987 1987 
 		global $globalDBdriver;
1988 1988 
 		$Connection = new Connection();
1989 1989 
 		$error = '';
1990 
-		if (!$Connection->checkColumnName('source_location','description')) {
1990 
+		if (!$Connection->checkColumnName('source_location', 'description')) {
1991 1991 
 			$query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL";
1992 1992 
 			try {
1993 1993 
 				$sth = $Connection->db->prepare($query);
1994 1994 
 				$sth->execute();
1995 
-			} catch(PDOException $e) {
1995 
+			} catch (PDOException $e) {
1996 1996 
 				return "error (add column description in source_location) : ".$e->getMessage()."\n";
1997 1997 
 			}
1998 1998 
 		}
 
@@ -2000,7 +2000,7 @@  discard block
 
 block discarded – undo
2000 2000 
 		try {
2001 2001 
 			$sth = $Connection->db->prepare($query);
2002 2002 
 			$sth->execute();
2003 
-		} catch(PDOException $e) {
2003 
+		} catch (PDOException $e) {
2004 2004 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2005 2005 
 		}
2006 2006 
 		return $error;
 
@@ -2010,39 +2010,39 @@  discard block
 
 block discarded – undo
2010 2010 
 		global $globalDBdriver;
2011 2011 
 		$Connection = new Connection();
2012 2012 
 		$error = '';
2013 
-		if (!$Connection->checkColumnName('spotter_live','real_altitude')) {
2013 
+		if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) {
2014 2014 
 			$query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL";
2015 2015 
 			try {
2016 2016 
 				$sth = $Connection->db->prepare($query);
2017 2017 
 				$sth->execute();
2018 
-			} catch(PDOException $e) {
2018 
+			} catch (PDOException $e) {
2019 2019 
 				return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n";
2020 2020 
 			}
2021 2021 
 		}
2022 
-		if (!$Connection->checkColumnName('spotter_output','real_altitude')) {
2022 
+		if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) {
2023 2023 
 			$query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL";
2024 2024 
 			try {
2025 2025 
 				$sth = $Connection->db->prepare($query);
2026 2026 
 				$sth->execute();
2027 
-			} catch(PDOException $e) {
2027 
+			} catch (PDOException $e) {
2028 2028 
 				return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n";
2029 2029 
 			}
2030 2030 
 		}
2031 
-		if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) {
2031 
+		if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) {
2032 2032 
 			$query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL";
2033 2033 
 			try {
2034 2034 
 				$sth = $Connection->db->prepare($query);
2035 2035 
 				$sth->execute();
2036 
-			} catch(PDOException $e) {
2036 
+			} catch (PDOException $e) {
2037 2037 
 				return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n";
2038 2038 
 			}
2039 2039 
 		}
2040 
-		if (!$Connection->checkColumnName('spotter_archive','real_altitude')) {
2040 
+		if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) {
2041 2041 
 			$query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL";
2042 2042 
 			try {
2043 2043 
 				$sth = $Connection->db->prepare($query);
2044 2044 
 				$sth->execute();
2045 
-			} catch(PDOException $e) {
2045 
+			} catch (PDOException $e) {
2046 2046 
 				return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n";
2047 2047 
 			}
2048 2048 
 		}
 
@@ -2050,7 +2050,7 @@  discard block
 
 block discarded – undo
2050 2050 
 		try {
2051 2051 
 			$sth = $Connection->db->prepare($query);
2052 2052 
 			$sth->execute();
2053 
-		} catch(PDOException $e) {
2053 
+		} catch (PDOException $e) {
2054 2054 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2055 2055 
 		}
2056 2056 
 		return $error;
 
@@ -2072,14 +2072,14 @@  discard block
 
 block discarded – undo
2072 2072 
 		try {
2073 2073 
 			$sth = $Connection->db->prepare($query);
2074 2074 
 			$sth->execute();
2075 
-		} catch(PDOException $e) {
2075 
+		} catch (PDOException $e) {
2076 2076 
 			return "error (modify column altitude in tracker_*) : ".$e->getMessage()."\n";
2077 2077 
 		}
2078 2078 
 		$query = "UPDATE config SET value = '44' WHERE name = 'schema_version'";
2079 2079 
 		try {
2080 2080 
 			$sth = $Connection->db->prepare($query);
2081 2081 
 			$sth->execute();
2082 
-		} catch(PDOException $e) {
2082 
+		} catch (PDOException $e) {
2083 2083 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2084 2084 
 		}
2085 2085 
 		return $error;
 
@@ -2120,7 +2120,7 @@  discard block
 
 block discarded – undo
2120 2120 
 		try {
2121 2121 
 			$sth = $Connection->db->prepare($query);
2122 2122 
 			$sth->execute();
2123 
-		} catch(PDOException $e) {
2123 
+		} catch (PDOException $e) {
2124 2124 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2125 2125 
 		}
2126 2126 
 		return $error;
 
@@ -2143,7 +2143,7 @@  discard block
 
 block discarded – undo
2143 2143 
 		try {
2144 2144 
 			$sth = $Connection->db->prepare($query);
2145 2145 
 			$sth->execute();
2146 
-		} catch(PDOException $e) {
2146 
+		} catch (PDOException $e) {
2147 2147 
 			return "error (update schema_version) : ".$e->getMessage()."\n";
2148 2148 
 		}
2149 2149 
 		return $error;
 
@@ -2166,7 +2166,7 @@  discard block
 
 block discarded – undo
2166 2166 
 					try {
2167 2167 
 						$sth = $Connection->db->prepare($query);
2168 2168 
 						$sth->execute();
2169 
-					} catch(PDOException $e) {
2169 
+					} catch (PDOException $e) {
2170 2170 
 						return "error (check_version): ".$e->getMessage()."\n";
2171 2171 
 					}
2172 2172 
 					$result = $sth->fetch(PDO::FETCH_ASSOC);
Please login to merge, or discard this patch.
pilot.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -7,10 +7,10 @@  discard block
 
 block discarded – undo
7 7
8 8 
 if (isset($_POST['pilot']))
9 9 
 {
10 
-	header('Location: '.$globalURL.'/pilot/'.filter_input(INPUT_POST,'pilot',FILTER_SANITIZE_STRING));
10 
+	header('Location: '.$globalURL.'/pilot/'.filter_input(INPUT_POST, 'pilot', FILTER_SANITIZE_STRING));
11 11 
 //} else if (isset($_GET['airport'])){
12 12 
 } else {
13 
-	$Spotter= new Spotter();
13 
+	$Spotter = new Spotter();
14 14 
 	$Stats = new Stats();
15 15 
 	$Common = new Common();
16 16 
 	$title = _("Pilots");
 
@@ -24,11 +24,11 @@  discard block
 
 block discarded – undo
24 24 
 	//ksort($pilot_names);
25 25 
 	$previous = null;
26 26 
 	print '<div class="alphabet-legend">';
27 
-	foreach($pilot_names as $value) {
27 
+	foreach ($pilot_names as $value) {
28 28 
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['pilot_name'], 0, 1));
29 
-		if($previous !== $firstLetter && $firstLetter != "'")
29 
+		if ($previous !== $firstLetter && $firstLetter != "'")
30 30 
 		{
31 
-			if ($previous !== null){
31 
+			if ($previous !== null) {
32 32 
 				print ' | ';
33 33 
 			}
34 34 
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
 
@@ -37,13 +37,13 @@  discard block
 
 block discarded – undo
37 37 
 	}
38 38 
 	print '</div>';
39 39 
 	$previous = null;
40 
-	foreach($pilot_names as $value) {
40 
+	foreach ($pilot_names as $value) {
41 41 
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['pilot_name'], 0, 1));
42 42 
 		if ($firstLetter != "")
43 43 
 		{
44 
-			if($previous !== $firstLetter && $firstLetter != "'")
44 
+			if ($previous !== $firstLetter && $firstLetter != "'")
45 45 
 			{
46 
-				if ($previous !== null){
46 
+				if ($previous !== null) {
47 47 
 					print '</div>';
48 48 
 				}
49 49 
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
Please login to merge, or discard this patch.
owner.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -7,10 +7,10 @@  discard block
 
 block discarded – undo
7 7
8 8 
 if (isset($_POST['owner']))
9 9 
 {
10 
-	header('Location: '.$globalURL.'/owner/'.filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING));
10 
+	header('Location: '.$globalURL.'/owner/'.filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING));
11 11 
 //} else if (isset($_GET['airport'])){
12 12 
 } else {
13 
-	$Spotter= new Spotter();
13 
+	$Spotter = new Spotter();
14 14 
 	$Stats = new Stats();
15 15 
 	$Common = new Common();
16 16 
 	$title = _("Owners");
 
@@ -24,11 +24,11 @@  discard block
 
 block discarded – undo
24 24 
 	ksort($owner_names);
25 25 
 	$previous = null;
26 26 
 	print '<div class="alphabet-legend">';
27 
-	foreach($owner_names as $value) {
27 
+	foreach ($owner_names as $value) {
28 28 
 		$firstLetter = $Common->remove_accents(strtoupper($Common->replace_mb_substr($value['owner_name'], 0, 1)));
29 
-		if($previous !== $firstLetter && $firstLetter != "'" && $firstLetter != '"')
29 
+		if ($previous !== $firstLetter && $firstLetter != "'" && $firstLetter != '"')
30 30 
 		{
31 
-			if ($previous !== null){
31 
+			if ($previous !== null) {
32 32 
 				print ' | ';
33 33 
 			}
34 34 
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
 
@@ -37,13 +37,13 @@  discard block
 
 block discarded – undo
37 37 
 	}
38 38 
 	print '</div>';
39 39 
 	$previous = null;
40 
-	foreach($owner_names as $value) {
40 
+	foreach ($owner_names as $value) {
41 41 
 		$firstLetter = $Common->remove_accents(strtoupper($Common->replace_mb_substr($value['owner_name'], 0, 1)));
42 42 
 		if ($firstLetter != "")
43 43 
 		{
44 
-			if($previous !== $firstLetter && $firstLetter != "'" && $firstLetter != '"')
44 
+			if ($previous !== $firstLetter && $firstLetter != "'" && $firstLetter != '"')
45 45 
 			{
46 
-				if ($previous !== null){
46 
+				if ($previous !== null) {
47 47 
 					print '</div>';
48 48 
 				}
49 49 
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
Please login to merge, or discard this patch.
require/class.Accident.php 1 patch
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch 
@@ -28,20 +28,20 @@  discard block
 
 block discarded – undo
28 28 
 	* @param String $date get data for a date
29 29 
 	* @return Array Return Accidents data in array
30 30 
 	*/
31 
-	public function getAccidentData($limit = '',$type = '',$date = '') {
31 
+	public function getAccidentData($limit = '', $type = '', $date = '') {
32 32 
 		global $globalURL, $globalDBdriver;
33 33 
 		$Image = new Image($this->db);
34 34 
 		$Spotter = new Spotter($this->db);
35 35 
 		$Translation = new Translation($this->db);
36 
-		$date = filter_var($date,FILTER_SANITIZE_STRING);
36 
+		$date = filter_var($date, FILTER_SANITIZE_STRING);
37 37 
 		date_default_timezone_set('UTC');
38 38 
 		$result = array();
39 39 
 		$limit_query = '';
40 40 
 		if ($limit != "")
41 41 
 		{
42 42 
 			$limit_array = explode(",", $limit);
43 
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
44 
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
43 
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
44 
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
45 45 
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
46 46 
 			{
47 47 
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
 
@@ -50,29 +50,29 @@  discard block
 
 block discarded – undo
50 50
51 51 
 		if ($type != '') {
52 52 
 			if ($date != '') {
53 
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
53 
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
54 54 
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
55 55 
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
56 
-					$query_values = array(':type' => $type,':date' => $date);
57 
-				} elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/",$date)) {
56 
+					$query_values = array(':type' => $type, ':date' => $date);
57 
+				} elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/", $date)) {
58 58 
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date BETWEEN :dated AND :datef GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
59 
-					$query_values = array(':type' => $type,':dated' => $date.'-01', ':datef' => $date.'-31');
60 
-				} elseif (preg_match("/^[0-9]{4}$/",$date)) {
59 
+					$query_values = array(':type' => $type, ':dated' => $date.'-01', ':datef' => $date.'-31');
60 
+				} elseif (preg_match("/^[0-9]{4}$/", $date)) {
61 61 
 					if ($globalDBdriver == 'mysql') {
62 62 
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND YEAR(date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
63 63 
 					} else {
64 64 
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND EXTRACT(YEAR FROM date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
65 65 
 					}
66 
-					$query_values = array(':type' => $type,':date' => $date);
66 
+					$query_values = array(':type' => $type, ':date' => $date);
67 67 
 				} else {
68 68 
 					$date = $date.'%';
69 69 
 					if ($globalDBdriver == 'mysql') {
70 70 
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND DATE_FORMAT(date,'%Y-%m-%d') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
71 
-						$query_values = array(':type' => $type,':date' => $date);
71 
+						$query_values = array(':type' => $type, ':date' => $date);
72 72 
 					} else {
73 73 
 						$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
74 74 
 						//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
75 
-						$query_values = array(':type' => $type,':date' => $date);
75 
+						$query_values = array(':type' => $type, ':date' => $date);
76 76 
 					}
77 77 
 				}
78 78 
 			} else {
 
@@ -82,7 +82,7 @@  discard block
 
 block discarded – undo
82 82 
 			}
83 83 
 		} else {
84 84 
 			if ($date != '') {
85 
-				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) {
85 
+				if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) {
86 86 
 					$query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
87 87 
 					//$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query;
88 88 
 				} else {
 
@@ -100,17 +100,17 @@  discard block
 
 block discarded – undo
100 100 
 		try {
101 101 
 			$sth = $this->db->prepare($query);
102 102 
 			$sth->execute($query_values);
103 
-		} catch(PDOException $e) {
103 
+		} catch (PDOException $e) {
104 104 
 			echo "error : ".$e->getMessage();
105 105 
 		}
106 106 
 		$i = 0;
107 107 
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
108 
-			if (preg_match('/^[\w\-]+$/',$row['registration'])) {
108 
+			if (preg_match('/^[\w\-]+$/', $row['registration'])) {
109 109 
 				$data = array();
110 110 
 				if ($row['registration'] != '') {
111 111 
 					$image_array = $Image->getSpotterImage($row['registration']);
112 
-					if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
113 
-					else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
112 
+					if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
113 
+					else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
114 114 
 					$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
115 115 
 					$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
116 116 
 					if (!empty($aircraft_info)) {
 
@@ -118,7 +118,7 @@  discard block
 
 block discarded – undo
118 118 
 						$data['aircraft_name'] = $aircraft_info[0]['type'];
119 119 
 						$data['aircraft_manufacturer'] = $aircraft_info[0]['manufacturer'];
120 120 
 					} else {
121 
-						$data = array_merge($data,array('aircraft_type' => 'NA'));
121 
+						$data = array_merge($data, array('aircraft_type' => 'NA'));
122 122 
 					}
123 123 
 					$owner_data = $Spotter->getAircraftOwnerByRegistration($row['registration']);
124 124 
 					if (!empty($owner_data)) {
 
@@ -126,18 +126,18 @@  discard block
 
 block discarded – undo
126 126 
 						$data['aircraft_base'] = $owner_data['base'];
127 127 
 						$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
128 128 
 					}
129 
-				} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
129 
+				} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
130 130 
 				if ($row['registration'] == '') $row['registration'] = 'NA';
131 131 
 				if ($row['ident'] == '') $row['ident'] = 'NA';
132 
-				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
132 
+				$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 3));
133 133 
 				if (isset($identicao[0])) {
134 
-					if (substr($row['ident'],0,2) == 'AF') {
135 
-						if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
136 
-						else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
137 
-					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
138 
-					$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
134 
+					if (substr($row['ident'], 0, 2) == 'AF') {
135 
+						if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
136 
+						else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
137 
+					} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
138 
+					$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
139 139 
 				} else $icao = $row['ident'];
140 
-				$icao = $Translation->checkTranslation($icao,false);
140 
+				$icao = $Translation->checkTranslation($icao, false);
141 141 
 				//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
142 142 
 				if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
143 143 
 					//echo 'Check airline info... for '.$row['airline_name'].' ';
 
@@ -146,16 +146,16 @@  discard block
 
 block discarded – undo
146 146 
 					if (!empty($airline_info)) {
147 147 
 						//echo 'data found !'."\n";
148 148 
 						//print_r($airline_info);
149 
-						$data = array_merge($data,$airline_info);
149 
+						$data = array_merge($data, $airline_info);
150 150 
 					}
151 151 
 					//else echo 'No data...'."\n";
152 152 
 				}
153 
-				$data = array_merge($row,$data);
153 
+				$data = array_merge($row, $data);
154 154 
 				if ($data['ident'] == null) $data['ident'] = $icao;
155 155 
 				if ($data['title'] == null) {
156 156 
 					$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
157 157 
 				} else $data['message'] = strtolower($data['title']);
158 
-				$ids = $Spotter->getAllIDByRegistration($data['registration'],true);
158 
+				$ids = $Spotter->getAllIDByRegistration($data['registration'], true);
159 159 
 				$date = $data['date'];
160 160 
 				if (isset($ids[$date])) {
161 161 
 					$data['spotted'] = TRUE;
 
@@ -187,7 +187,7 @@  discard block
 
 block discarded – undo
187 187 
 		try {
188 188 
 			$sth = $this->db->prepare($query);
189 189 
 			$sth->execute();
190 
-		} catch(PDOException $e) {
190 
+		} catch (PDOException $e) {
191 191 
 			echo "Error : ".$e->getMessage();
192 192 
 		}
193 193 
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -207,7 +207,7 @@  discard block
 
 block discarded – undo
207 207 
 		try {
208 208 
 			$sth = $this->db->prepare($query);
209 209 
 			$sth->execute();
210 
-		} catch(PDOException $e) {
210 
+		} catch (PDOException $e) {
211 211 
 			echo "Error : ".$e->getMessage();
212 212 
 		}
213 213 
 		return $sth->fetchAll(PDO::FETCH_ASSOC);
 
@@ -222,15 +222,15 @@  discard block
 
 block discarded – undo
222 222 
 		if ($globalDebug) echo 'Import '.$file."\n";
223 223 
 		$result = array();
224 224 
 		if (file_exists($file)) {
225 
-			if (($handle = fopen($file,'r')) !== FALSE) {
226 
-				while (($data = fgetcsv($handle,2000,",")) !== FALSE) {
225 
+			if (($handle = fopen($file, 'r')) !== FALSE) {
226 
+				while (($data = fgetcsv($handle, 2000, ",")) !== FALSE) {
227 227 
 					if (isset($data[1]) && $data[1] != '0000-00-00 00:00:00') {
228 
-						$result[] = array('registration' => $data[0],'date' => strtotime($data[1]),'url' => $data[2],'country' => $data[3],'place' => $data[4],'title' => $data[5],'fatalities' => $data[6],'latitude' => $data[7],'longitude' => $data[8],'type' => $data[9],'ident' => $data[10],'aircraft_manufacturer' => $data[11],'aircraft_name' => $data[12],'operator' => $data[13],'source' => 'website_fam');
228 
+						$result[] = array('registration' => $data[0], 'date' => strtotime($data[1]), 'url' => $data[2], 'country' => $data[3], 'place' => $data[4], 'title' => $data[5], 'fatalities' => $data[6], 'latitude' => $data[7], 'longitude' => $data[8], 'type' => $data[9], 'ident' => $data[10], 'aircraft_manufacturer' => $data[11], 'aircraft_name' => $data[12], 'operator' => $data[13], 'source' => 'website_fam');
229 229 
 					}
230 230 
 				}
231 231 
 				fclose($handle);
232 232 
 			}
233 
-			if (!empty($result)) $this->add($result,true);
233 
+			if (!empty($result)) $this->add($result, true);
234 234 
 			elseif ($globalDebug) echo 'Nothing to import';
235 235 
 		}
236 236 
 	}
 
@@ -246,8 +246,8 @@  discard block
 
 block discarded – undo
246 246 
 		$all_md5_new = array();
247 247 
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
248 248 
 			if ($this->check_accidents_nb() > 0) {
249 
-				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
250 
-					while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
249 
+				if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
250 
+					while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
251 251 
 						if (isset($data[1])) {
252 252 
 							$year = $data[0];
253 253 
 							$all_md5[$year] = $data[1];
 
@@ -257,10 +257,10 @@  discard block
 
 block discarded – undo
257 257 
 				}
258 258 
 			}
259 259 
 		}
260 
-		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5',dirname(__FILE__).'/../install/tmp/cr-all.md5');
260 
+		$Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5', dirname(__FILE__).'/../install/tmp/cr-all.md5');
261 261 
 		if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) {
262 
-			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) {
263 
-				while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) {
262 
+			if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) {
263 
+				while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) {
264 264 
 					if (isset($data[1])) {
265 265 
 						$year = $data[0];
266 266 
 						$all_md5_new[$year] = $data[1];
 
@@ -269,10 +269,10 @@  discard block
 
 block discarded – undo
269 269 
 				fclose($handle);
270 270 
 			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
271 271 
 		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
272 
-		$result = $Common->arr_diff($all_md5_new,$all_md5);
272 
+		$result = $Common->arr_diff($all_md5_new, $all_md5);
273 273 
 		if (empty($result) && $globalDebug) echo 'Nothing to update';
274 274 
 		foreach ($result as $file => $md5) {
275 
-			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
275 
+			$Common->download('http://data.flightairmap.fr/data/cr/'.$file, dirname(__FILE__).'/../install/tmp/'.$file);
276 276 
 			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
277 277 
 			elseif ($globalDebug) echo 'Download '.$file.' failed';
278 278 
 		}
 
@@ -282,7 +282,7 @@  discard block
 
 block discarded – undo
282 282 
 	* Add data to DB
283 283 
 	* @param Array $crash An array with accidents/incidents data
284 284 
 	*/
285 
-	public function add($crash,$new = false) {
285 
+	public function add($crash, $new = false) {
286 286 
 		global $globalTransaction, $globalDebug;
287 287 
 		require_once('class.Connection.php');
288 288 
 		require_once('class.Image.php');
 
@@ -298,7 +298,7 @@  discard block
 
 block discarded – undo
298 298 
 			$sthd->execute(array(':source' => $crash[0]['source']));
299 299 
 		}
300 300 
 		if ($globalTransaction) $Connection->db->beginTransaction();
301 
-		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
301 
+		$initial_array = array('ident' => null, 'type' => 'accident', 'url' => null, 'registration' => null, 'date' => null, 'place' => null, 'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '', 'source' => '', 'aircraft_manufacturer' => null, 'aircraft_name' => null, 'operator' => null);
302 302 
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
303 303 
 		$sth_check = $Connection->db->prepare($query_check);
304 304 
 		$query = 'INSERT INTO accidents (aircraft_manufacturer,aircraft_name,ident,registration,date,url,country,place,title,fatalities,latitude,longitude,type,airline_name,source) VALUES (:aircraft_manufacturer,:aircraft_name,:ident,:registration,:date,:url,:country,:place,:title,:fatalities,:latitude,:longitude,:type,:airline_name,:source)';
 
@@ -311,15 +311,15 @@  discard block
 
 block discarded – undo
311 311 
 				$cr = array_map(function($value) {
312 312 
 					return $value === "" ? NULL : $value;
313 313 
 				}, $cr);
314 
-				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
315 
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
316 
-					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
314 
+				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/', $cr['registration'])) {
315 
+					if (strpos($cr['registration'], '-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
316 
+					$query_check_values = array(':registration' => $cr['registration'], ':date' => date('Y-m-d', $cr['date']), ':type' => $cr['type'], ':source' => $cr['source']);
317 317 
 					$sth_check->execute($query_check_values);
318 318 
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
319 319 
 					if ($result_check['nb'] == 0) {
320 
-						$query_values = array(':registration' => trim($cr['registration']),':date' => date('Y-m-d',$cr['date']),':url' => $cr['url'],':country' => $cr['country'],':place' => $cr['place'],':title' => $cr['title'],':fatalities' => $cr['fatalities'],':latitude' => $cr['latitude'],':longitude' => $cr['longitude'],':type' => $cr['type'],':source' => $cr['source'],':ident' => $cr['ident'],':aircraft_manufacturer' => $cr['aircraft_manufacturer'],':aircraft_name' => $cr['aircraft_name'],':airline_name' => $cr['operator']);
320 
+						$query_values = array(':registration' => trim($cr['registration']), ':date' => date('Y-m-d', $cr['date']), ':url' => $cr['url'], ':country' => $cr['country'], ':place' => $cr['place'], ':title' => $cr['title'], ':fatalities' => $cr['fatalities'], ':latitude' => $cr['latitude'], ':longitude' => $cr['longitude'], ':type' => $cr['type'], ':source' => $cr['source'], ':ident' => $cr['ident'], ':aircraft_manufacturer' => $cr['aircraft_manufacturer'], ':aircraft_name' => $cr['aircraft_name'], ':airline_name' => $cr['operator']);
321 321 
 						$sth->execute($query_values);
322 
-						if ($cr['date'] > time()-(30*86400)) {
322 
+						if ($cr['date'] > time() - (30*86400)) {
323 323 
 							if (empty($Image->getSpotterImage($cr['registration']))) {
324 324 
 								if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...';
325 325 
 								$Image->addSpotterImage($cr['registration']);
 
@@ -328,16 +328,16 @@  discard block
 
 block discarded – undo
328 328 
 							// elseif ($globalDebug) echo 'Image already in DB'."\n";
329 329 
 						}
330 330 
 						if ($cr['title'] == '') $cr['title'] = $cr['registration'].' '.$cr['type'];
331 
-						$Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date']));
331 
+						$Spotter->setHighlightFlightByRegistration($cr['registration'], $cr['title'], date('Y-m-d', $cr['date']));
332 332 
 					}
333 333 
 				}
334 
-				if ($globalTransaction && $j % 1000 == 0) {
334 
+				if ($globalTransaction && $j%1000 == 0) {
335 335 
 					$Connection->db->commit();
336 336 
 					$Connection->db->beginTransaction();
337 337 
 				}
338 338 
 			}
339 339 
 			if ($globalTransaction) $Connection->db->commit();
340 
-		} catch(PDOException $e) {
340 
+		} catch (PDOException $e) {
341 341 
 			if ($globalTransaction) $Connection->db->rollBack();
342 342 
 			echo $e->getMessage();
343 343 
 		}
 
@@ -355,7 +355,7 @@  discard block
 
 block discarded – undo
355 355 
 			$Connection = new Connection();
356 356 
 			$sth = $Connection->db->prepare($query);
357 357 
 			$sth->execute();
358 
-		} catch(PDOException $e) {
358 
+		} catch (PDOException $e) {
359 359 
 			return "error : ".$e->getMessage();
360 360 
 		}
361 361 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -373,7 +373,7 @@  discard block
 
 block discarded – undo
373 373 
 			$Connection = new Connection();
374 374 
 			$sth = $Connection->db->prepare($query);
375 375 
 			$sth->execute();
376 
-		} catch(PDOException $e) {
376 
+		} catch (PDOException $e) {
377 377 
 			return "error : ".$e->getMessage();
378 378 
 		}
379 379 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -388,7 +388,7 @@  discard block
 
 block discarded – undo
388 388 
 			$Connection = new Connection();
389 389 
 			$sth = $Connection->db->prepare($query);
390 390 
 			$sth->execute();
391 
-		} catch(PDOException $e) {
391 
+		} catch (PDOException $e) {
392 392 
 			return "error : ".$e->getMessage();
393 393 
 		}
394 394 
 	}
Please login to merge, or discard this patch.
accident-latest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -8,7 +8,7 @@  discard block
 
 block discarded – undo
8 8
9 9 
 $page_url = $globalURL.'/accident-latest';
10 10
11 
-if(!isset($_GET['limit']))
11 
+if (!isset($_GET['limit']))
12 12 
 {
13 13 
 	$limit_start = 0;
14 14 
 	$limit_end = 25;
 
@@ -33,7 +33,7 @@  discard block
 
 block discarded – undo
33 33
34 34 
 print '<div class="table column">';
35 35 
 print '<p>'._("The table below shows the latest Accidents.").'</p>';
36 
-$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference,'accident');
36 
+$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference, 'accident');
37 37 
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
38 38 
 	include('table-output.php');
39 39 
 	print '<div class="pagination">';
Please login to merge, or discard this patch.
js/map-satellite.2d.js.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -2,7 +2,7 @@  discard block
 
 block discarded – undo
2 2 
 require_once('../require/settings.php');
3 3 
 require_once('../require/class.Language.php');
4 4
5 
-setcookie("MapFormat",'2d');
5 
+setcookie("MapFormat", '2d');
6 6
7 7 
 // Compressed GeoJson is used if true
8 8 
 if (!isset($globalJsonCompress)) $compress = true;
 
@@ -18,10 +18,10 @@  discard block
 
 block discarded – undo
18 18
19 19 
 <?php
20 20 
 	if (isset($_GET['famsatid'])) {
21 
-		$famsatid = filter_input(INPUT_GET,'famsatid',FILTER_SANITIZE_STRING);
21 
+		$famsatid = filter_input(INPUT_GET, 'famsatid', FILTER_SANITIZE_STRING);
22 22 
 	}
23 23 
 	if (isset($_GET['ident'])) {
24 
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
24 
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
25 25 
 	}
26 26 
 	if (!isset($ident) && !isset($famsatid)) {
27 27 
 ?>
 
@@ -194,7 +194,7 @@  discard block
 
 block discarded – undo
194 194 
 <?php
195 195 
 		} else {
196 196 
 ?>
197 
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
197 
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
198 198 
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
199 199 
 <?php
200 200 
 		}
 
@@ -210,7 +210,7 @@  discard block
 
 block discarded – undo
210 210 
 			    /*
211 211 
 			    shadowUrl: iconURLShadowpath,
212 212 
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
213 
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
213 
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
214 214 
 			    */
215 215 
 			})
216 216 
 		    })
 
@@ -250,7 +250,7 @@  discard block
 
 block discarded – undo
250 250 
 <?php
251 251 
 		} else {
252 252 
 ?>
253 
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
253 
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
254 254 
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
255 255 
 <?php
256 256 
 		}
 
@@ -305,7 +305,7 @@  discard block
 
 block discarded – undo
305 305 
 <?php
306 306 
 		} else {
307 307 
 ?>
308 
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
308 
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
309 309 
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
310 310 
 <?php
311 311 
 		}
Please login to merge, or discard this patch.
airline.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -8,7 +8,7 @@  discard block
 
 block discarded – undo
8 8
9 9 
 if (isset($_POST['airline']))
10 10 
 {
11 
-	header('Location: '.$globalURL.'/airline/'.filter_input(INPUT_POST,'airline',FILTER_SANITIZE_STRING));
11 
+	header('Location: '.$globalURL.'/airline/'.filter_input(INPUT_POST, 'airline', FILTER_SANITIZE_STRING));
12 12 
 } else {
13 13 
 	$title = "Airlines";
14 14 
 	require_once('header.php');
 
@@ -17,7 +17,7 @@  discard block
 
 block discarded – undo
17 17 
 	print '<div class="column">';
18 18 
 	print '<h1>'._("Airlines").'</h1>';
19 19 
 	if (isset($_POST['airline_type'])) {
20 
-		$airline_type = filter_input(INPUT_POST,'airline_type',FILTER_SANITIZE_STRING);
20 
+		$airline_type = filter_input(INPUT_POST, 'airline_type', FILTER_SANITIZE_STRING);
21 21 
 		//$airline_names = $Spotter->getAllAirlineNames($airline_type);
22 22 
 	} else {
23 23 
 		//$airline_names = $Spotter->getAllAirlineNames();
 
@@ -29,10 +29,10 @@  discard block
 
 block discarded – undo
29 29 
 		print '<div class="alphabet">';
30 30 
 		foreach ($alliances as $alliance) {
31 31 
 			print '<div class="alphabet-airline alphabet-item">';
32 
-			print '<a href="'.$globalURL.'/airline/alliance_'.str_replace(' ','_',$alliance['alliance']).'">';
33 
-			if (file_exists('images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png'))
32 
+			print '<a href="'.$globalURL.'/airline/alliance_'.str_replace(' ', '_', $alliance['alliance']).'">';
33 
+			if (file_exists('images/airlines/'.str_replace(' ', '_', $alliance['alliance']).'.png'))
34 34 
 			{
35 
-				print '<img src="'.$globalURL.'/images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png" alt="'._("Click to see alliance activity").'" title="'._("Click to see alliance activity").'" /> ';
35 
+				print '<img src="'.$globalURL.'/images/airlines/'.str_replace(' ', '_', $alliance['alliance']).'.png" alt="'._("Click to see alliance activity").'" title="'._("Click to see alliance activity").'" /> ';
36 36 
 			} else print $alliance['alliance'];
37 37 
 			print '</a>';
38 38 
 			print '</div>';
 
@@ -55,7 +55,7 @@  discard block
 
 block discarded – undo
55 55 
 	$Stats = new Stats();
56 56 
 	if (isset($_POST['airline_type']))
57 57 
 	{
58 
-		$airline_type = filter_input(INPUT_POST,'airline_type',FILTER_SANITIZE_STRING);
58 
+		$airline_type = filter_input(INPUT_POST, 'airline_type', FILTER_SANITIZE_STRING);
59 59 
 		//$airline_names = $Stats->getAllAirlineNames($airline_type);
60 60 
 		$airline_names = $Spotter->getAllAirlineNames($airline_type);
61 61 
 	} else {
 
@@ -68,12 +68,12 @@  discard block
 
 block discarded – undo
68 68 
 	}
69 69 
 	$previous = null;
70 70 
 	print '<div class="alphabet-legend">';
71 
-	foreach($airline_names as $value)
71 
+	foreach ($airline_names as $value)
72 72 
 	{
73 73 
 		//echo $value['airline_name']."\n";
74 74 
 		//echo mb_substr($value['airline_name'],0,1).' - '.$value['airline_name']."\n";
75 75 
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['airline_name'], 0, 1));
76 
-		if($previous !== $firstLetter)
76 
+		if ($previous !== $firstLetter)
77 77 
 		{
78 78 
 			if ($previous !== null) print ' | ';
79 79 
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
 
@@ -82,11 +82,11 @@  discard block
 
 block discarded – undo
82 82 
 	}
83 83 
 	print '</div>';
84 84 
 	$previous = null;
85 
-	foreach($airline_names as $value) {
85 
+	foreach ($airline_names as $value) {
86 86 
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['airline_name'], 0, 1));
87 87 
 		if ($firstLetter != "")
88 88 
 		{
89 
-			if($previous !== $firstLetter)
89 
+			if ($previous !== $firstLetter)
90 90 
 			{
91 91 
 				if ($previous !== null) print '</div>';
92 92 
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
Please login to merge, or discard this patch.