Completed
Push — master ( e66237...aed4ca )
by Yannick
31:21
created
require/class.ACARS.php 2 patches
Spacing   +258 added lines, -258 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	/*
22 22
 	 * Initialize DB connection
23 23
 	*/
24
-	public function __construct($dbc = null,$fromACARSscript = false) {
24
+	public function __construct($dbc = null, $fromACARSscript = false) {
25 25
 		$Connection = new Connection($dbc);
26 26
 		$this->db = $Connection->db();
27 27
 		if ($this->db === null) die('Error: No DB connection. (ACARS)');
@@ -38,14 +38,14 @@  discard block
 block discarded – undo
38 38
 	* @return String the icao
39 39
 	*/
40 40
 	public function ident2icao($ident) {
41
-		if (substr($ident,0,2) == 'AF') {
42
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
43
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
41
+		if (substr($ident, 0, 2) == 'AF') {
42
+			if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
43
+			else $icao = 'AFR'.ltrim(substr($ident, 2), '0');
44 44
 		} else {
45 45
 			$Spotter = new Spotter($this->db);
46
-			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
46
+			$identicao = $Spotter->getAllAirlineInfo(substr($ident, 0, 2));
47 47
 			if (isset($identicao[0])) {
48
-				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
48
+				$icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0');
49 49
 			} else $icao = $ident;
50 50
 		}
51 51
 		return $icao;
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 
70 70
 			$sth = $this->db->prepare($query);
71 71
 			$sth->execute();
72
-		} catch(PDOException $e) {
72
+		} catch (PDOException $e) {
73 73
 			return "error";
74 74
 		}
75 75
 		return "success";
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 
94 94
 			$sth = $this->db->prepare($query);
95 95
 			$sth->execute();
96
-		} catch(PDOException $e) {
96
+		} catch (PDOException $e) {
97 97
 			return "error";
98 98
 		}
99 99
 		return "success";
@@ -119,13 +119,13 @@  discard block
 block discarded – undo
119 119
 		$ident = '';
120 120
 		$message = '';
121 121
 		$result = array();
122
-		$n = sscanf($data,'%*[0-9a-z.] %*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);
123
-		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);
124
-		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);
125
-		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);
122
+		$n = sscanf($data, '%*[0-9a-z.] %*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);
123
+		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);
124
+		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);
125
+		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);
126 126
 		if ($n != 0 && ($registration != '' || $ident != '' || $label != '' || $block_id != '' || $msg_no != '')) {
127
-			$registration = str_replace('.','',$registration);
128
-			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
127
+			$registration = str_replace('.', '', $registration);
128
+			$result = array('registration' => $registration, 'ident' => $ident, 'label' => $label, 'block_id' => $block_id, 'msg_no' => $msg_no, 'message' => $message);
129 129
 			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
130 130
 		} else $message = $data;
131 131
 		$decode = array();
@@ -145,14 +145,14 @@  discard block
 block discarded – undo
145 145
 				$temp = '';
146 146
 				$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);
147 147
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
148
-					$latitude = $la / 10000.0;
149
-					$longitude = $ln / 10000.0;
148
+					$latitude = $la/10000.0;
149
+					$longitude = $ln/10000.0;
150 150
 					if ($lac == 'S') $latitude = '-'.$latitude;
151 151
 					if ($lnc == 'W') $longitude = '-'.$longitude;
152 152
 					// Temp not always available
153 153
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
154
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
155
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
154
+					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => $alt);
155
+					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt, 'Temperature' => $temp.'°C');
156 156
 
157 157
 					//$icao = $Translation->checkTranslation($ident);
158 158
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -164,19 +164,19 @@  discard block
 block discarded – undo
164 164
 				$dhour = '';
165 165
 				$darr = '';
166 166
 				$ahour = '';
167
-				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
167
+				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr, $ahour);
168 168
 				if ($n == 4 && strlen($darr) == 4) {
169
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
170
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
171
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
169
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
170
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
171
+					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '.$darr.' - departure hour : '.$dhour.' - arrival hour : '.$ahour."\n";
172 172
 					//$icao = ACARS->ident2icao($ident);
173 173
 					//$icao = $Translation->checkTranslation($ident);
174 174
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
175 175
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
176 176
 					$found = true;
177 177
 				}
178
-				elseif ($n == 2 || $n  == 4) {
179
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
178
+				elseif ($n == 2 || $n == 4) {
179
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
180 180
 					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
181 181
 					//$icao = ACARS->ident2icao($ident);
182 182
 					//$icao = $Translation->checkTranslation($ident);
@@ -234,11 +234,11 @@  discard block
 block discarded – undo
234 234
 				$ahour = '';
235 235
 				$aair = '';
236 236
 				$apiste = '';
237
-				$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);
237
+				$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);
238 238
 				if ($n > 8) {
239
-					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";
240
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
241
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
239
+					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";
240
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
241
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
242 242
 					$icao = trim($aident);
243 243
 
244 244
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
@@ -263,8 +263,8 @@  discard block
 block discarded – undo
263 263
 				if ($n == 10 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
264 264
 					$las = $las.'.'.$lass;
265 265
 					$lns = $lns.'.'.$lns;
266
-					$latitude = $las / 1000.0;
267
-					$longitude = $lns / 1000.0;
266
+					$latitude = $las/1000.0;
267
+					$longitude = $lns/1000.0;
268 268
 					if ($lac == 'S') $latitude = '-'.$latitude;
269 269
 					if ($lnc == 'W') $longitude = '-'.$longitude;
270 270
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
@@ -359,17 +359,17 @@  discard block
 block discarded – undo
359 359
 				$alt = '';
360 360
 				$fuel = '';
361 361
 				$speed = '';
362
-				$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);
362
+				$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);
363 363
 				if ($n == 9) {
364 364
 					//if (self->$debug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
365 365
 					$icao = trim($aident);
366 366
 					$decode['icao'] = $icao;
367
-					$latitude = $las / 100.0;
368
-					$longitude = $lns / 100.0;
367
+					$latitude = $las/100.0;
368
+					$longitude = $lns/100.0;
369 369
 					if ($lac == 'S') $latitude = '-'.$latitude;
370 370
 					if ($lnc == 'W') $longitude = '-'.$longitude;
371 371
 
372
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
372
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Altitude' => 'FL'.$alt, 'Fuel' => $fuel, 'speed' => $speed);
373 373
 					$found = true;
374 374
 				}
375 375
 			}
@@ -388,7 +388,7 @@  discard block
 block discarded – undo
388 388
 					if ($lac == 'S') $latitude = '-'.$latitude;
389 389
 					if ($lnc == 'W') $longitude = '-'.$longitude;
390 390
 
391
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
391
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
392 392
 					$found = true;
393 393
 				}
394 394
 			}
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
 				$dair = '';
422 422
 				$darr = '';
423 423
 				$aident = '';
424
-				$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);
424
+				$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);
425 425
 				if ($n == 8) {
426 426
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
427 427
 					$icao = trim($aident);
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
 				*/
454 454
 				$dair = '';
455 455
 				$darr = '';
456
-				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
456
+				$n = sscanf($message, '%4[A-Z]%4[A-Z]%*4d', $dair, $darr);
457 457
 				if ($n == 3) {
458 458
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
459 459
 					//$icao = $Translation->checkTranslation($ident);
@@ -468,7 +468,7 @@  discard block
 block discarded – undo
468 468
 				*/
469 469
 				$dair = '';
470 470
 				$darr = '';
471
-				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
471
+				$n = sscanf($message, '3J01 DSPTCH %*d/%*d %4s/%4s .%*6s', $dair, $darr);
472 472
 				if ($n == 3) {
473 473
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
474 474
 					//$icao = $Translation->checkTranslation($ident);
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 				}
479 479
 			}
480 480
 			if (!$found) {
481
-				$n = sscanf($message,'MET01%4c',$airport);
481
+				$n = sscanf($message, 'MET01%4c', $airport);
482 482
 				if ($n == 1) {
483 483
 					if ($globalDebug) echo 'airport name : '.$airport;
484 484
 					$decode = array('Airport/Waypoint name' => $airport);
@@ -486,241 +486,241 @@  discard block
 block discarded – undo
486 486
 				}
487 487
 			}
488 488
 			if ($label == 'H1') {
489
-				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
490
-					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
489
+				if (preg_match('/^#CFBFLR/', $message) || preg_match('/^#CFBWRN/', $message)) {
490
+					$decode = array_merge(array('Message nature' => 'Equipment failure'), $decode);
491 491
 				}
492
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
493
-					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
492
+				elseif (preg_match('/^#DFB\*TKO/', $message) || preg_match('/^#DFBTKO/', $message)) {
493
+					$decode = array_merge(array('Message nature' => 'Take off performance data'), $decode);
494 494
 				}
495
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
496
-					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
495
+				elseif (preg_match('/^#DFB\*CRZ/', $message) || preg_match('/^#DFBCRZ/', $message)) {
496
+					$decode = array_merge(array('Message nature' => 'Cruise performance data'), $decode);
497 497
 				}
498
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
499
-					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
498
+				elseif (preg_match('/^#DFB\*WOB/', $message) || preg_match('/^#DFBWOB/', $message)) {
499
+					$decode = array_merge(array('Message nature' => 'Weather observation'), $decode);
500 500
 				}
501
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
502
-					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
501
+				elseif (preg_match(':^#DFB/PIREP:', $message)) {
502
+					$decode = array_merge(array('Message nature' => 'Pilot Report'), $decode);
503 503
 				}
504
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
505
-					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
504
+				elseif (preg_match('/^#DFBEDA/', $message) || preg_match('/^#DFBENG/', $message)) {
505
+					$decode = array_merge(array('Message nature' => 'Engine Data'), $decode);
506 506
 				}
507
-				elseif (preg_match(':^#M1AAEP:',$message)) {
508
-					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
507
+				elseif (preg_match(':^#M1AAEP:', $message)) {
508
+					$decode = array_merge(array('Message nature' => 'Position/Weather Report'), $decode);
509 509
 				}
510
-				elseif (preg_match(':^#M2APWD:',$message)) {
511
-					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
510
+				elseif (preg_match(':^#M2APWD:', $message)) {
511
+					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'), $decode);
512 512
 				}
513
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
514
-					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
513
+				elseif (preg_match(':^#M1BREQPWI:', $message)) {
514
+					$decode = array_merge(array('Message nature' => 'Predicted wind info request'), $decode);
515 515
 				}
516
-				elseif (preg_match(':^#CF:',$message)) {
517
-					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
516
+				elseif (preg_match(':^#CF:', $message)) {
517
+					$decode = array_merge(array('Message nature' => 'Central Fault Display'), $decode);
518 518
 				}
519
-				elseif (preg_match(':^#DF:',$message)) {
520
-					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
519
+				elseif (preg_match(':^#DF:', $message)) {
520
+					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'), $decode);
521 521
 				}
522
-				elseif (preg_match(':^#EC:',$message)) {
523
-					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
522
+				elseif (preg_match(':^#EC:', $message)) {
523
+					$decode = array_merge(array('Message nature' => 'Engine Display System'), $decode);
524 524
 				}
525
-				elseif (preg_match(':^#EI:',$message)) {
526
-					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
525
+				elseif (preg_match(':^#EI:', $message)) {
526
+					$decode = array_merge(array('Message nature' => 'Engine Report'), $decode);
527 527
 				}
528
-				elseif (preg_match(':^#H1:',$message)) {
529
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
528
+				elseif (preg_match(':^#H1:', $message)) {
529
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'), $decode);
530 530
 				}
531
-				elseif (preg_match(':^#H2:',$message)) {
532
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
531
+				elseif (preg_match(':^#H2:', $message)) {
532
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'), $decode);
533 533
 				}
534
-				elseif (preg_match(':^#HD:',$message)) {
535
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
534
+				elseif (preg_match(':^#HD:', $message)) {
535
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'), $decode);
536 536
 				}
537
-				elseif (preg_match(':^#M1:',$message)) {
538
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
537
+				elseif (preg_match(':^#M1:', $message)) {
538
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'), $decode);
539 539
 				}
540
-				elseif (preg_match(':^#M2:',$message)) {
541
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
540
+				elseif (preg_match(':^#M2:', $message)) {
541
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'), $decode);
542 542
 				}
543
-				elseif (preg_match(':^#M3:',$message)) {
544
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
543
+				elseif (preg_match(':^#M3:', $message)) {
544
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'), $decode);
545 545
 				}
546
-				elseif (preg_match(':^#MD:',$message)) {
547
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
546
+				elseif (preg_match(':^#MD:', $message)) {
547
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'), $decode);
548 548
 				}
549
-				elseif (preg_match(':^#PS:',$message)) {
550
-					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
549
+				elseif (preg_match(':^#PS:', $message)) {
550
+					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'), $decode);
551 551
 				}
552
-				elseif (preg_match(':^#S1:',$message)) {
553
-					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
552
+				elseif (preg_match(':^#S1:', $message)) {
553
+					$decode = array_merge(array('Message nature' => 'SDU - Left'), $decode);
554 554
 				}
555
-				elseif (preg_match(':^#S2:',$message)) {
556
-					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
555
+				elseif (preg_match(':^#S2:', $message)) {
556
+					$decode = array_merge(array('Message nature' => 'SDU - Right'), $decode);
557 557
 				}
558
-				elseif (preg_match(':^#SD:',$message)) {
559
-					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
558
+				elseif (preg_match(':^#SD:', $message)) {
559
+					$decode = array_merge(array('Message nature' => 'SDU - Selected'), $decode);
560 560
 				}
561
-				elseif (preg_match(':^#T[0-8]:',$message)) {
562
-					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
561
+				elseif (preg_match(':^#T[0-8]:', $message)) {
562
+					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'), $decode);
563 563
 				}
564
-				elseif (preg_match(':^#WO:',$message)) {
565
-					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
564
+				elseif (preg_match(':^#WO:', $message)) {
565
+					$decode = array_merge(array('Message nature' => 'Weather Observation Report'), $decode);
566 566
 				}
567
-				elseif (preg_match(':^#A1:',$message)) {
568
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
567
+				elseif (preg_match(':^#A1:', $message)) {
568
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'), $decode);
569 569
 				}
570
-				elseif (preg_match(':^#A3:',$message)) {
571
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
570
+				elseif (preg_match(':^#A3:', $message)) {
571
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'), $decode);
572 572
 				}
573
-				elseif (preg_match(':^#A4:',$message)) {
574
-					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
573
+				elseif (preg_match(':^#A4:', $message)) {
574
+					$decode = array_merge(array('Message nature' => 'Flight Systems Message'), $decode);
575 575
 				}
576
-				elseif (preg_match(':^#A6:',$message)) {
577
-					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
576
+				elseif (preg_match(':^#A6:', $message)) {
577
+					$decode = array_merge(array('Message nature' => 'Request ADS Reports'), $decode);
578 578
 				}
579
-				elseif (preg_match(':^#A8:',$message)) {
580
-					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
579
+				elseif (preg_match(':^#A8:', $message)) {
580
+					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'), $decode);
581 581
 				}
582
-				elseif (preg_match(':^#A9:',$message)) {
583
-					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
582
+				elseif (preg_match(':^#A9:', $message)) {
583
+					$decode = array_merge(array('Message nature' => 'ATIS report'), $decode);
584 584
 				}
585
-				elseif (preg_match(':^#A0:',$message)) {
586
-					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
585
+				elseif (preg_match(':^#A0:', $message)) {
586
+					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'), $decode);
587 587
 				}
588
-				elseif (preg_match(':^#AA:',$message)) {
589
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
588
+				elseif (preg_match(':^#AA:', $message)) {
589
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
590 590
 				}
591
-				elseif (preg_match(':^#AB:',$message)) {
592
-					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
591
+				elseif (preg_match(':^#AB:', $message)) {
592
+					$decode = array_merge(array('Message nature' => 'TWIP Report'), $decode);
593 593
 				}
594
-				elseif (preg_match(':^#AC:',$message)) {
595
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
594
+				elseif (preg_match(':^#AC:', $message)) {
595
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance'), $decode);
596 596
 				}
597
-				elseif (preg_match(':^#AD:',$message)) {
598
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
597
+				elseif (preg_match(':^#AD:', $message)) {
598
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'), $decode);
599 599
 				}
600
-				elseif (preg_match(':^#AF:',$message)) {
601
-					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
600
+				elseif (preg_match(':^#AF:', $message)) {
601
+					$decode = array_merge(array('Message nature' => 'CPC Command/Response'), $decode);
602 602
 				}
603
-				elseif (preg_match(':^#B1:',$message)) {
604
-					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
603
+				elseif (preg_match(':^#B1:', $message)) {
604
+					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'), $decode);
605 605
 				}
606
-				elseif (preg_match(':^#B2:',$message)) {
607
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
606
+				elseif (preg_match(':^#B2:', $message)) {
607
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'), $decode);
608 608
 				}
609
-				elseif (preg_match(':^#B3:',$message)) {
610
-					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
609
+				elseif (preg_match(':^#B3:', $message)) {
610
+					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'), $decode);
611 611
 				}
612
-				elseif (preg_match(':^#B4:',$message)) {
613
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
612
+				elseif (preg_match(':^#B4:', $message)) {
613
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'), $decode);
614 614
 				}
615
-				elseif (preg_match(':^#B6:',$message)) {
616
-					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
615
+				elseif (preg_match(':^#B6:', $message)) {
616
+					$decode = array_merge(array('Message nature' => 'Provide ADS Report'), $decode);
617 617
 				}
618
-				elseif (preg_match(':^#B8:',$message)) {
619
-					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
618
+				elseif (preg_match(':^#B8:', $message)) {
619
+					$decode = array_merge(array('Message nature' => 'Request Departure Slot'), $decode);
620 620
 				}
621
-				elseif (preg_match(':^#B9:',$message)) {
622
-					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
621
+				elseif (preg_match(':^#B9:', $message)) {
622
+					$decode = array_merge(array('Message nature' => 'Request ATIS Report'), $decode);
623 623
 				}
624
-				elseif (preg_match(':^#B0:',$message)) {
625
-					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
624
+				elseif (preg_match(':^#B0:', $message)) {
625
+					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'), $decode);
626 626
 				}
627
-				elseif (preg_match(':^#BA:',$message)) {
628
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
627
+				elseif (preg_match(':^#BA:', $message)) {
628
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
629 629
 				}
630
-				elseif (preg_match(':^#BB:',$message)) {
631
-					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
630
+				elseif (preg_match(':^#BB:', $message)) {
631
+					$decode = array_merge(array('Message nature' => 'Request TWIP Report'), $decode);
632 632
 				}
633
-				elseif (preg_match(':^#BC:',$message)) {
634
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
633
+				elseif (preg_match(':^#BC:', $message)) {
634
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'), $decode);
635 635
 				}
636
-				elseif (preg_match(':^#BD:',$message)) {
637
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
636
+				elseif (preg_match(':^#BD:', $message)) {
637
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'), $decode);
638 638
 				}
639
-				elseif (preg_match(':^#BE:',$message)) {
640
-					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
639
+				elseif (preg_match(':^#BE:', $message)) {
640
+					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'), $decode);
641 641
 				}
642
-				elseif (preg_match(':^#BF:',$message)) {
643
-					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
642
+				elseif (preg_match(':^#BF:', $message)) {
643
+					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'), $decode);
644 644
 				}
645
-				elseif (preg_match(':^#H3:',$message)) {
646
-					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
645
+				elseif (preg_match(':^#H3:', $message)) {
646
+					$decode = array_merge(array('Message nature' => 'Icing Report'), $decode);
647 647
 				}
648 648
 			}
649 649
 			if ($label == '10') {
650
-				if (preg_match(':^DTO01:',$message)) {
651
-					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
650
+				if (preg_match(':^DTO01:', $message)) {
651
+					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'), $decode);
652 652
 				}
653
-				elseif (preg_match(':^AIS01:',$message)) {
654
-					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
653
+				elseif (preg_match(':^AIS01:', $message)) {
654
+					$decode = array_merge(array('Message nature' => 'AIS Request'), $decode);
655 655
 				}
656
-				elseif (preg_match(':^FTX01:',$message)) {
657
-					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
656
+				elseif (preg_match(':^FTX01:', $message)) {
657
+					$decode = array_merge(array('Message nature' => 'Free Text Downlink'), $decode);
658 658
 				}
659
-				elseif (preg_match(':^FPL01:',$message)) {
660
-					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
659
+				elseif (preg_match(':^FPL01:', $message)) {
660
+					$decode = array_merge(array('Message nature' => 'Flight Plan Request'), $decode);
661 661
 				}
662
-				elseif (preg_match(':^WAB01:',$message)) {
663
-					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
662
+				elseif (preg_match(':^WAB01:', $message)) {
663
+					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'), $decode);
664 664
 				}
665
-				elseif (preg_match(':^MET01:',$message)) {
666
-					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
665
+				elseif (preg_match(':^MET01:', $message)) {
666
+					$decode = array_merge(array('Message nature' => 'Weather Data Request'), $decode);
667 667
 				}
668
-				elseif (preg_match(':^WAB02:',$message)) {
669
-					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
668
+				elseif (preg_match(':^WAB02:', $message)) {
669
+					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'), $decode);
670 670
 				}
671 671
 			}
672 672
 			if ($label == '15') {
673
-				if (preg_match(':^FST01:',$message)) {
674
-					$decode = array_merge(array('Message nature' => 'Flight Status Report'),$decode);
673
+				if (preg_match(':^FST01:', $message)) {
674
+					$decode = array_merge(array('Message nature' => 'Flight Status Report'), $decode);
675 675
 				}
676 676
 			}
677 677
 			if (!$found && $label == 'SA') {
678
-				$n = sscanf($message, "%d%c%c%6[0-9]", $version,$state,$type,$at);
678
+				$n = sscanf($message, "%d%c%c%6[0-9]", $version, $state, $type, $at);
679 679
 				if ($n == 4) {
680 680
 					$vsta = array('Version' => $version);
681 681
 					if ($state == 'E') {
682
-						$vsta = array_merge($vsta,array('Link state' => 'Established'));
682
+						$vsta = array_merge($vsta, array('Link state' => 'Established'));
683 683
 					}
684 684
 					elseif ($state == 'L') {
685
-						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
685
+						$vsta = array_merge($vsta, array('Link state' => 'Lost'));
686 686
 					}
687 687
 					else {
688
-						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
688
+						$vsta = array_merge($vsta, array('Link state' => 'Unknown'));
689 689
 					}
690 690
 					if ($type == 'V') {
691
-						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
691
+						$vsta = array_merge($vsta, array('Link type' => 'VHF ACARS'));
692 692
 					}
693 693
 					elseif ($type == 'S') {
694
-						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
694
+						$vsta = array_merge($vsta, array('Link type' => 'Generic SATCOM'));
695 695
 					}
696 696
 					elseif ($type == 'H') {
697
-						$vsta = array_merge($vsta,array('Link type' => 'HF'));
697
+						$vsta = array_merge($vsta, array('Link type' => 'HF'));
698 698
 					}
699 699
 					elseif ($type == 'G') {
700
-						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
700
+						$vsta = array_merge($vsta, array('Link type' => 'GlobalStar SATCOM'));
701 701
 					}
702 702
 					elseif ($type == 'C') {
703
-						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
703
+						$vsta = array_merge($vsta, array('Link type' => 'ICO SATCOM'));
704 704
 					}
705 705
 					elseif ($type == '2') {
706
-						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
706
+						$vsta = array_merge($vsta, array('Link type' => 'VDL Mode 2'));
707 707
 					}
708 708
 					elseif ($type == 'X') {
709
-						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
709
+						$vsta = array_merge($vsta, array('Link type' => 'Inmarsat Aero'));
710 710
 					}
711 711
 					elseif ($type == 'I') {
712
-						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
712
+						$vsta = array_merge($vsta, array('Link type' => 'Irridium SATCOM'));
713 713
 					}
714 714
 					else {
715
-						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
715
+						$vsta = array_merge($vsta, array('Link type' => 'Unknown'));
716 716
 					}
717
-					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
718
-					$decode = array_merge($vsta,$decode);
717
+					$vsta = array_merge($vsta, array('Event occured at' => implode(':', str_split($at, 2))));
718
+					$decode = array_merge($vsta, $decode);
719 719
 				}
720 720
 			}
721 721
 
722 722
 			$title = $this->getTitlefromLabel($label);
723
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
723
+			if ($title != '') $decode = array_merge(array('Message title' => $title), $decode);
724 724
 			/*
725 725
 			// Business jets always use GS0001
726 726
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
@@ -741,21 +741,21 @@  discard block
 block discarded – undo
741 741
 	* @param String ACARS data in acarsdec data
742 742
 	*
743 743
 	*/
744
-	public function add($data,$message = array()) {
744
+	public function add($data, $message = array()) {
745 745
 		global $globalDebug, $globalACARSArchive;
746 746
 		$Image = new Image($this->db);
747 747
 		$Schedule = new Schedule($this->db);
748 748
 		$Translation = new Translation($this->db);
749 749
 
750
-		$message = array_merge($message,$this->parse($data));
750
+		$message = array_merge($message, $this->parse($data));
751 751
 		if (isset($message['registration']) && $message['registration'] != '' && $message['ident'] != '' && $message['registration'] != '!') {
752
-			$ident = (string)$message['ident'];
752
+			$ident = (string) $message['ident'];
753 753
 			$label = $message['label'];
754 754
 			$block_id = $message['block_id'];
755 755
 			$msg_no = $message['msg_no'];
756 756
 			$msg = $message['message'];
757 757
 			$decode = $message['decode'];
758
-			$registration = (string)$message['registration'];
758
+			$registration = (string) $message['registration'];
759 759
 			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
760 760
 			else $latitude = '';
761 761
 			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
@@ -769,20 +769,20 @@  discard block
 block discarded – undo
769 769
 				$Image->addSpotterImage($registration);
770 770
 			}
771 771
 			// Business jets always use GS0001
772
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
772
+			if ($ident != 'GS0001') $info = $this->addModeSData($ident, $registration, $icao, $airicao, $latitude, $longitude);
773 773
 			if ($globalDebug && isset($info) && $info != '') echo $info;
774 774
 			if (count($decode) > 0) $decode_json = json_encode($decode);
775 775
 			else $decode_json = '';
776 776
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
777
-				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
777
+				$Schedule->addSchedule($icao, $decode['Departure airport'], $decode['Departure hour'], $decode['Arrival airport'], $decode['Arrival hour'], 'ACARS');
778 778
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
779
-				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
779
+				$Schedule->addSchedule($icao, $decode['Departure airport'], '', $decode['Arrival airport'], '', 'ACARS');
780 780
 			}
781
-			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
782
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
783
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
781
+			$result = $this->addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
782
+			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10', '80', '81', '82', '3F');
783
+			if ($result && in_array($label, $globalACARSArchive)) $this->addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
784 784
 			if ($globalDebug && count($decode) > 0) {
785
-				echo "Human readable data : ".implode(' - ',$decode)."\n";
785
+				echo "Human readable data : ".implode(' - ', $decode)."\n";
786 786
 			}
787 787
 		}
788 788
 	}
@@ -799,7 +799,7 @@  discard block
 block discarded – undo
799 799
      * @param string $decode
800 800
      * @return bool
801 801
      */
802
-	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
802
+	public function addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
803 803
 		global $globalDebug;
804 804
 		date_default_timezone_set('UTC');
805 805
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
@@ -807,22 +807,22 @@  discard block
 block discarded – undo
807 807
 			$this->db = $Connection->db;
808 808
 			if ($globalDebug) echo "Test if not already in Live ACARS table...";
809 809
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
810
-			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
810
+			$query_test_values = array(':ident' => $ident, ':registration' => $registration, ':message' => $message);
811 811
 			try {
812 812
 				$stht = $this->db->prepare($query_test);
813 813
 				$stht->execute($query_test_values);
814
-			} catch(PDOException $e) {
814
+			} catch (PDOException $e) {
815 815
 				echo "error : ".$e->getMessage();
816 816
 				return false;
817 817
 			}
818 818
 			if ($stht->fetchColumn() == 0) {
819 819
 				if ($globalDebug) echo "Add Live ACARS data...";
820 820
 				$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)";
821
-				$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"));
821
+				$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"));
822 822
 				try {
823 823
 					$sth = $this->db->prepare($query);
824 824
 					$sth->execute($query_values);
825
-				} catch(PDOException $e) {
825
+				} catch (PDOException $e) {
826 826
 					echo "error : ".$e->getMessage();
827 827
 					return false;
828 828
 				}
@@ -848,10 +848,10 @@  discard block
 block discarded – undo
848 848
      * @param string $decode
849 849
      * @return string
850 850
      */
851
-	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
851
+	public function addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
852 852
 		global $globalDebug;
853 853
 		date_default_timezone_set('UTC');
854
-		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) {
854
+		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) {
855 855
 			/*
856 856
 				    if ($globalDebug) echo "Test if not already in Archive ACARS table...";
857 857
 			    	    $query_test = "SELECT COUNT(*) as nb FROM acars_archive WHERE ident = :ident AND registration = :registration AND message = :message";
@@ -866,11 +866,11 @@  discard block
 block discarded – undo
866 866
 			*/
867 867
 			if ($globalDebug) echo "Add Live ACARS data...";
868 868
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
869
-			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
869
+			$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
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
 				return "error : ".$e->getMessage();
875 875
 			}
876 876
 			if ($globalDebug) echo "Done\n";
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
892 892
 		try {
893 893
 			$sth = $this->db->prepare($query);
894 894
 			$sth->execute($query_values);
895
-		} catch(PDOException $e) {
895
+		} catch (PDOException $e) {
896 896
 			echo "error : ".$e->getMessage();
897 897
 			return '';
898 898
 		}
@@ -912,7 +912,7 @@  discard block
 block discarded – undo
912 912
 		try {
913 913
 			$sth = $this->db->prepare($query);
914 914
 			$sth->execute($query_values);
915
-		} catch(PDOException $e) {
915
+		} catch (PDOException $e) {
916 916
 			echo "error : ".$e->getMessage();
917 917
 			return array();
918 918
 		}
@@ -933,7 +933,7 @@  discard block
 block discarded – undo
933 933
 		try {
934 934
 			$sth = $this->db->prepare($query);
935 935
 			$sth->execute($query_values);
936
-		} catch(PDOException $e) {
936
+		} catch (PDOException $e) {
937 937
 			echo "error : ".$e->getMessage();
938 938
 			return array();
939 939
 		}
@@ -949,7 +949,7 @@  discard block
 block discarded – undo
949 949
      * @param string $label
950 950
      * @return array Return ACARS data in array
951 951
      */
952
-	public function getLatestAcarsData($limit = '',$label = '') {
952
+	public function getLatestAcarsData($limit = '', $label = '') {
953 953
 		global $globalURL;
954 954
 		$Image = new Image($this->db);
955 955
 		$Spotter = new Spotter($this->db);
@@ -960,8 +960,8 @@  discard block
 block discarded – undo
960 960
 		if ($limit != "")
961 961
 		{
962 962
 			$limit_array = explode(",", $limit);
963
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
964
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
963
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
964
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
965 965
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
966 966
 			{
967 967
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -977,7 +977,7 @@  discard block
 block discarded – undo
977 977
 		try {
978 978
 			$sth = $this->db->prepare($query);
979 979
 			$sth->execute($query_values);
980
-		} catch(PDOException $e) {
980
+		} catch (PDOException $e) {
981 981
 			echo "error : ".$e->getMessage();
982 982
 			return array();
983 983
 		}
@@ -985,39 +985,39 @@  discard block
 block discarded – undo
985 985
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
986 986
 			$data = array();
987 987
 			if ($row['registration'] != '') {
988
-				$row['registration'] = str_replace('.','',$row['registration']);
988
+				$row['registration'] = str_replace('.', '', $row['registration']);
989 989
 				$image_array = $Image->getSpotterImage($row['registration']);
990
-				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']));
991
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
992
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
990
+				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']));
991
+				else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
992
+			} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
993 993
 			if ($row['registration'] == '') $row['registration'] = 'NA';
994 994
 			if ($row['ident'] == '') $row['ident'] = 'NA';
995
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
995
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
996 996
 			if (isset($identicao[0])) {
997
-				if (substr($row['ident'],0,2) == 'AF') {
998
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
999
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1000
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1001
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
997
+				if (substr($row['ident'], 0, 2) == 'AF') {
998
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
999
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
1000
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
1001
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
1002 1002
 			} else $icao = $row['ident'];
1003
-			$icao = $Translation->checkTranslation($icao,false);
1004
-			$decode = json_decode($row['decode'],true);
1003
+			$icao = $Translation->checkTranslation($icao, false);
1004
+			$decode = json_decode($row['decode'], true);
1005 1005
 			$found = false;
1006
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
1006
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
1007 1007
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
1008 1008
 				if (isset($airport_info[0]['icao'])) {
1009 1009
 					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1010 1010
 					$found = true;
1011 1011
 				}
1012 1012
 			}
1013
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
1013
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
1014 1014
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
1015 1015
 				if (isset($airport_info[0]['icao'])) {
1016 1016
 					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1017 1017
 					$found = true;
1018 1018
 				}
1019 1019
 			}
1020
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
1020
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
1021 1021
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
1022 1022
 				if (isset($airport_info[0]['icao'])) {
1023 1023
 					$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>';
@@ -1025,7 +1025,7 @@  discard block
 block discarded – undo
1025 1025
 				}
1026 1026
 			}
1027 1027
 			if ($found) $row['decode'] = json_encode($decode);
1028
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1028
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1029 1029
 			$result[] = $data;
1030 1030
 			$i++;
1031 1031
 		}
@@ -1043,7 +1043,7 @@  discard block
 block discarded – undo
1043 1043
      * @param string $label
1044 1044
      * @return array Return ACARS data in array
1045 1045
      */
1046
-	public function getArchiveAcarsData($limit = '',$label = '') {
1046
+	public function getArchiveAcarsData($limit = '', $label = '') {
1047 1047
 		global $globalURL;
1048 1048
 		$Image = new Image($this->db);
1049 1049
 		$Spotter = new Spotter($this->db);
@@ -1053,8 +1053,8 @@  discard block
 block discarded – undo
1053 1053
 		if ($limit != "")
1054 1054
 		{
1055 1055
 			$limit_array = explode(",", $limit);
1056
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1057
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1056
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1057
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1058 1058
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1059 1059
 			{
1060 1060
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -1075,45 +1075,45 @@  discard block
 block discarded – undo
1075 1075
 		try {
1076 1076
 			$sth = $this->db->prepare($query);
1077 1077
 			$sth->execute($query_values);
1078
-		} catch(PDOException $e) {
1078
+		} catch (PDOException $e) {
1079 1079
 			echo "error : ".$e->getMessage();
1080 1080
 			return array();
1081 1081
 		}
1082
-		$i=0;
1082
+		$i = 0;
1083 1083
 		$result = array();
1084 1084
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
1085 1085
 			$data = array();
1086 1086
 			if ($row['registration'] != '') {
1087
-				$row['registration'] = str_replace('.','',$row['registration']);
1087
+				$row['registration'] = str_replace('.', '', $row['registration']);
1088 1088
 				$image_array = $Image->getSpotterImage($row['registration']);
1089
-				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']));
1090
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1091
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1089
+				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']));
1090
+				else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
1091
+			} else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
1092 1092
 			$icao = '';
1093 1093
 			if ($row['registration'] == '') $row['registration'] = 'NA';
1094 1094
 			if ($row['ident'] == '') $row['ident'] = 'NA';
1095
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
1095
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
1096 1096
 			if (isset($identicao[0])) {
1097
-				if (substr($row['ident'],0,2) == 'AF') {
1098
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1099
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1100
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1101
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
1097
+				if (substr($row['ident'], 0, 2) == 'AF') {
1098
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1099
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
1100
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
1101
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
1102 1102
 			} else $icao = $row['ident'];
1103 1103
 			$icao = $Translation->checkTranslation($icao);
1104
-			$decode = json_decode($row['decode'],true);
1104
+			$decode = json_decode($row['decode'], true);
1105 1105
 			$found = false;
1106
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
1106
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
1107 1107
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
1108 1108
 				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>';
1109 1109
 				$found = true;
1110 1110
 			}
1111
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
1111
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
1112 1112
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
1113 1113
 				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>';
1114 1114
 				$found = true;
1115 1115
 			}
1116
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
1116
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
1117 1117
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
1118 1118
 				if (isset($airport_info[0]['icao'])) {
1119 1119
 					$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>';
@@ -1121,7 +1121,7 @@  discard block
 block discarded – undo
1121 1121
 				}
1122 1122
 			}
1123 1123
 			if ($found) $row['decode'] = json_encode($decode);
1124
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1124
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1125 1125
 			$result[] = $data;
1126 1126
 			$i++;
1127 1127
 		}
@@ -1142,7 +1142,7 @@  discard block
 block discarded – undo
1142 1142
      * @param string $longitude
1143 1143
      * @return string
1144 1144
      */
1145
-	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
1145
+	public function addModeSData($ident, $registration, $icao = '', $ICAOTypeCode = '', $latitude = '', $longitude = '') {
1146 1146
 		global $globalDebug, $globalDBdriver;
1147 1147
 		$ident = trim($ident);
1148 1148
 		$Translation = new Translation($this->db);
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
1155 1155
 			if ($globalDebug) echo "Ident or registration null, exit\n";
1156 1156
 			return '';
1157 1157
 		}
1158
-		$registration = str_replace('.','',$registration);
1158
+		$registration = str_replace('.', '', $registration);
1159 1159
 		$ident = $Translation->ident2icao($ident);
1160 1160
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
1161 1161
 		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
@@ -1164,7 +1164,7 @@  discard block
 block discarded – undo
1164 1164
 		try {
1165 1165
 			$sthsi = $this->db->prepare($querysi);
1166 1166
 			$sthsi->execute($querysi_values);
1167
-		} catch(PDOException $e) {
1167
+		} catch (PDOException $e) {
1168 1168
 			if ($globalDebug) echo $e->getMessage();
1169 1169
 			return "error : ".$e->getMessage();
1170 1170
 		}
@@ -1174,8 +1174,8 @@  discard block
 block discarded – undo
1174 1174
 			$Translation = new Translation($this->db);
1175 1175
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
1176 1176
 			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1177
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1178
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1177
+			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'], $ident, 'ACARS');
1178
+			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'], $ident, 'ACARS');
1179 1179
 		} else {
1180 1180
 			if ($registration != '' && $latitude != '' && $longitude != '') {
1181 1181
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1183,7 +1183,7 @@  discard block
 block discarded – undo
1183 1183
 				try {
1184 1184
 					$sth = $this->db->prepare($query);
1185 1185
 					$sth->execute($query_values);
1186
-				} catch(PDOException $e) {
1186
+				} catch (PDOException $e) {
1187 1187
 					if ($globalDebug) echo $e->getMessage();
1188 1188
 					return "error : ".$e->getMessage();
1189 1189
 				}
@@ -1191,7 +1191,7 @@  discard block
 block discarded – undo
1191 1191
 				$sth->closeCursor();
1192 1192
 				if (isset($result['modes'])) $hex = $result['modes'];
1193 1193
 				else $hex = '';
1194
-				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
1194
+				$SI_data = array('hex' => $hex, 'ident' => $ident, 'aircraft_icao' => $ICAOTypeCode, 'registration' => $registration, 'latitude' => $latitude, '$longitude' => $longitude, 'format_source' => 'ACARS');
1195 1195
 				if ($this->fromACARSscript) $this->SI->add($SI_data);
1196 1196
 			}
1197 1197
 		}
@@ -1201,7 +1201,7 @@  discard block
 block discarded – undo
1201 1201
 		try {
1202 1202
 			$sth = $this->db->prepare($query);
1203 1203
 			$sth->execute($query_values);
1204
-		} catch(PDOException $e) {
1204
+		} catch (PDOException $e) {
1205 1205
 			if ($globalDebug) echo $e->getMessage();
1206 1206
 			return "error : ".$e->getMessage();
1207 1207
 		}
@@ -1211,7 +1211,7 @@  discard block
 block discarded – undo
1211 1211
 			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
1212 1212
 			else $ModeS = '';
1213 1213
 			if ($ModeS == '') {
1214
-				$id = explode('-',$result['flightaware_id']);
1214
+				$id = explode('-', $result['flightaware_id']);
1215 1215
 				$ModeS = $id[0];
1216 1216
 			}
1217 1217
 			if ($ModeS != '') {
@@ -1221,20 +1221,20 @@  discard block
 block discarded – undo
1221 1221
 				try {
1222 1222
 					$sthc = $this->db->prepare($queryc);
1223 1223
 					$sthc->execute($queryc_values);
1224
-				} catch(PDOException $e) {
1224
+				} catch (PDOException $e) {
1225 1225
 					if ($globalDebug) echo $e->getMessage();
1226 1226
 					return "error : ".$e->getMessage();
1227 1227
 				}
1228 1228
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
1229 1229
 				$sthc->closeCursor();
1230
-				if (count($row) ==  0) {
1230
+				if (count($row) == 0) {
1231 1231
 					if ($globalDebug) echo " Add to ModeS table - ";
1232 1232
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
1233
-					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1233
+					$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1234 1234
 					try {
1235 1235
 						$sthi = $this->db->prepare($queryi);
1236 1236
 						$sthi->execute($queryi_values);
1237
-					} catch(PDOException $e) {
1237
+					} catch (PDOException $e) {
1238 1238
 						if ($globalDebug) echo $e->getMessage();
1239 1239
 						return "error : ".$e->getMessage();
1240 1240
 					}
@@ -1242,15 +1242,15 @@  discard block
 block discarded – undo
1242 1242
 					if ($globalDebug) echo " Update ModeS table - ";
1243 1243
 					if ($ICAOTypeCode != '') {
1244 1244
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1245
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1245
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1246 1246
 					} else {
1247 1247
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1248
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration);
1248
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration);
1249 1249
 					}
1250 1250
 					try {
1251 1251
 						$sthi = $this->db->prepare($queryi);
1252 1252
 						$sthi->execute($queryi_values);
1253
-					} catch(PDOException $e) {
1253
+					} catch (PDOException $e) {
1254 1254
 						if ($globalDebug) echo $e->getMessage();
1255 1255
 						return "error : ".$e->getMessage();
1256 1256
 					}
@@ -1287,12 +1287,12 @@  discard block
 block discarded – undo
1287 1287
 					elseif ($globalDBdriver == 'pgsql') {
1288 1288
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
1289 1289
 					}
1290
-					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
1290
+					$queryi_values = array(':Registration' => $registration, ':ident' => $icao);
1291 1291
 				}
1292 1292
 				try {
1293 1293
 					$sthi = $this->db->prepare($queryi);
1294 1294
 					$sthi->execute($queryi_values);
1295
-				} catch(PDOException $e) {
1295
+				} catch (PDOException $e) {
1296 1296
 					if ($globalDebug) echo $e->getMessage();
1297 1297
 					return "error : ".$e->getMessage();
1298 1298
 				}
Please login to merge, or discard this patch.
Braces   +415 added lines, -263 removed lines patch added patch discarded remove patch
@@ -24,7 +24,9 @@  discard block
 block discarded – undo
24 24
 	public function __construct($dbc = null,$fromACARSscript = false) {
25 25
 		$Connection = new Connection($dbc);
26 26
 		$this->db = $Connection->db();
27
-		if ($this->db === null) die('Error: No DB connection. (ACARS)');
27
+		if ($this->db === null) {
28
+			die('Error: No DB connection. (ACARS)');
29
+		}
28 30
 		if ($fromACARSscript) {
29 31
 			$this->fromACARSscript = true;
30 32
 			$this->SI = new SpotterImport($this->db);
@@ -39,14 +41,19 @@  discard block
 block discarded – undo
39 41
 	*/
40 42
 	public function ident2icao($ident) {
41 43
 		if (substr($ident,0,2) == 'AF') {
42
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
43
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
44
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
45
+				$icao = $ident;
46
+			} else {
47
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
48
+			}
44 49
 		} else {
45 50
 			$Spotter = new Spotter($this->db);
46 51
 			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
47 52
 			if (isset($identicao[0])) {
48 53
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
49
-			} else $icao = $ident;
54
+			} else {
55
+				$icao = $ident;
56
+			}
50 57
 		}
51 58
 		return $icao;
52 59
 	}
@@ -120,14 +127,24 @@  discard block
 block discarded – undo
120 127
 		$message = '';
121 128
 		$result = array();
122 129
 		$n = sscanf($data,'%*[0-9a-z.] %*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);
123
-		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);
124
-		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);
125
-		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);
130
+		if ($n == 0) {
131
+			$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);
132
+		}
133
+		if ($n == 0) {
134
+			$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);
135
+		}
136
+		if ($n == 0) {
137
+			$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);
138
+		}
126 139
 		if ($n != 0 && ($registration != '' || $ident != '' || $label != '' || $block_id != '' || $msg_no != '')) {
127 140
 			$registration = str_replace('.','',$registration);
128 141
 			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
129
-			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
130
-		} else $message = $data;
142
+			if ($globalDebug) {
143
+				echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
144
+			}
145
+		} else {
146
+			$message = $data;
147
+		}
131 148
 		$decode = array();
132 149
 		$found = false;
133 150
 //		if ($registration != '' && $ident != '' && $registration != '!') {
@@ -147,12 +164,21 @@  discard block
 block discarded – undo
147 164
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
148 165
 					$latitude = $la / 10000.0;
149 166
 					$longitude = $ln / 10000.0;
150
-					if ($lac == 'S') $latitude = '-'.$latitude;
151
-					if ($lnc == 'W') $longitude = '-'.$longitude;
167
+					if ($lac == 'S') {
168
+						$latitude = '-'.$latitude;
169
+					}
170
+					if ($lnc == 'W') {
171
+						$longitude = '-'.$longitude;
172
+					}
152 173
 					// Temp not always available
153
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
154
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
155
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
174
+					if ($globalDebug) {
175
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
176
+					}
177
+					if ($temp == '') {
178
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
179
+					} else {
180
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
181
+					}
156 182
 
157 183
 					//$icao = $Translation->checkTranslation($ident);
158 184
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -166,25 +192,35 @@  discard block
 block discarded – undo
166 192
 				$ahour = '';
167 193
 				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
168 194
 				if ($n == 4 && strlen($darr) == 4) {
169
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
170
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
171
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
195
+					if ($dhour != '') {
196
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
197
+					}
198
+					if ($ahour != '') {
199
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
200
+					}
201
+					if ($globalDebug) {
202
+						echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
203
+					}
172 204
 					//$icao = ACARS->ident2icao($ident);
173 205
 					//$icao = $Translation->checkTranslation($ident);
174 206
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
175 207
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
176 208
 					$found = true;
177
-				}
178
-				elseif ($n == 2 || $n  == 4) {
179
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
180
-					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
209
+				} elseif ($n == 2 || $n  == 4) {
210
+					if ($dhour != '') {
211
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
212
+					}
213
+					if ($globalDebug) {
214
+						echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
215
+					}
181 216
 					//$icao = ACARS->ident2icao($ident);
182 217
 					//$icao = $Translation->checkTranslation($ident);
183 218
 					$decode = array('Arrival airport' => $dair, 'Arrival hour' => $dhour);
184 219
 					$found = true;
185
-				}
186
-				elseif ($n == 1) {
187
-					if ($globalDebug) echo 'airport arrival : '.$darr."\n";
220
+				} elseif ($n == 1) {
221
+					if ($globalDebug) {
222
+						echo 'airport arrival : '.$darr."\n";
223
+					}
188 224
 					//$icao = ACARS->ident2icao($ident);
189 225
 					//$icao = $Translation->checkTranslation($ident);
190 226
 					$decode = array('Arrival airport' => $darr);
@@ -202,7 +238,9 @@  discard block
 block discarded – undo
202 238
 				$darr = '';
203 239
 				$n = sscanf($message, "%4c,%4c,%*7s,%*d", $dair, $darr);
204 240
 				if ($n == 4) {
205
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
241
+					if ($globalDebug) {
242
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
243
+					}
206 244
 					//$icao = ACARS->ident2icao($ident);
207 245
 					//$icao = $Translation->checkTranslation($ident);
208 246
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -236,14 +274,23 @@  discard block
 block discarded – undo
236 274
 				$apiste = '';
237 275
 				$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);
238 276
 				if ($n > 8) {
239
-					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";
240
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
241
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
277
+					if ($globalDebug) {
278
+						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";
279
+					}
280
+					if ($dhour != '') {
281
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
282
+					}
283
+					if ($ahour != '') {
284
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
285
+					}
242 286
 					$icao = trim($aident);
243 287
 
244 288
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
245
-					if ($ahour == '') $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
246
-					else $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
289
+					if ($ahour == '') {
290
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
291
+					} else {
292
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
293
+					}
247 294
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
248 295
 					$decode['icao'] = $icao;
249 296
 					$found = true;
@@ -265,9 +312,15 @@  discard block
 block discarded – undo
265 312
 					$lns = $lns.'.'.$lns;
266 313
 					$latitude = $las / 1000.0;
267 314
 					$longitude = $lns / 1000.0;
268
-					if ($lac == 'S') $latitude = '-'.$latitude;
269
-					if ($lnc == 'W') $longitude = '-'.$longitude;
270
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
315
+					if ($lac == 'S') {
316
+						$latitude = '-'.$latitude;
317
+					}
318
+					if ($lnc == 'W') {
319
+						$longitude = '-'.$longitude;
320
+					}
321
+					if ($globalDebug) {
322
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
323
+					}
271 324
 					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
272 325
 					$found = true;
273 326
 				}
@@ -285,7 +338,9 @@  discard block
 block discarded – undo
285 338
 				$darr = '';
286 339
 				$n = sscanf($message, "%*[0-9A-Z ]/%*s %4c/%4c .", $dair, $darr);
287 340
 				if ($n == 4) {
288
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
341
+					if ($globalDebug) {
342
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
343
+					}
289 344
 					//$icao = $Translation->checkTranslation($ident);
290 345
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
291 346
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -298,7 +353,9 @@  discard block
 block discarded – undo
298 353
 				$darr = '';
299 354
 				$n = sscanf($message, "%*[0-9],%4c,%4c,", $dair, $darr);
300 355
 				if ($n == 4) {
301
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
356
+					if ($globalDebug) {
357
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
358
+					}
302 359
 					//$icao = $Translation->checkTranslation($ident);
303 360
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
304 361
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -311,7 +368,9 @@  discard block
 block discarded – undo
311 368
 				$darr = '';
312 369
 				$n = sscanf($message, "002AF %4c %4c ", $dair, $darr);
313 370
 				if ($n == 2) {
314
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
371
+					if ($globalDebug) {
372
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
373
+					}
315 374
 					//$icao = $Translation->checkTranslation($ident);
316 375
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
317 376
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -325,7 +384,9 @@  discard block
 block discarded – undo
325 384
 				$darr = '';
326 385
 				$n = sscanf($message, "#DFBA%*02d/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
327 386
 				if ($n == 6) {
328
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
387
+					if ($globalDebug) {
388
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
389
+					}
329 390
 					//$icao = $Translation->checkTranslation($ident);
330 391
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
331 392
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -338,7 +399,9 @@  discard block
 block discarded – undo
338 399
 				$darr = '';
339 400
 				$n = sscanf($message, "#DFBA%*02d/%*[0-9A-Z,]/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
340 401
 				if ($n == 7) {
341
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
402
+					if ($globalDebug) {
403
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
404
+					}
342 405
 					//$icao = $Translation->checkTranslation($ident);
343 406
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
344 407
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -366,8 +429,12 @@  discard block
 block discarded – undo
366 429
 					$decode['icao'] = $icao;
367 430
 					$latitude = $las / 100.0;
368 431
 					$longitude = $lns / 100.0;
369
-					if ($lac == 'S') $latitude = '-'.$latitude;
370
-					if ($lnc == 'W') $longitude = '-'.$longitude;
432
+					if ($lac == 'S') {
433
+						$latitude = '-'.$latitude;
434
+					}
435
+					if ($lnc == 'W') {
436
+						$longitude = '-'.$longitude;
437
+					}
371 438
 
372 439
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
373 440
 					$found = true;
@@ -385,8 +452,12 @@  discard block
 block discarded – undo
385 452
 				if ($n == 4) {
386 453
 					$latitude = $las;
387 454
 					$longitude = $lns;
388
-					if ($lac == 'S') $latitude = '-'.$latitude;
389
-					if ($lnc == 'W') $longitude = '-'.$longitude;
455
+					if ($lac == 'S') {
456
+						$latitude = '-'.$latitude;
457
+					}
458
+					if ($lnc == 'W') {
459
+						$longitude = '-'.$longitude;
460
+					}
390 461
 
391 462
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
392 463
 					$found = true;
@@ -402,7 +473,9 @@  discard block
 block discarded – undo
402 473
 				$darr = '';
403 474
 				$n = sscanf($message, "%*[0-9A-Z] NLINFO %*d/%*d %4c/%4c .", $dair, $darr);
404 475
 				if ($n == 5) {
405
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
476
+					if ($globalDebug) {
477
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
478
+					}
406 479
 					//$icao = $Translation->checkTranslation($ident);
407 480
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
408 481
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -423,7 +496,9 @@  discard block
 block discarded – undo
423 496
 				$aident = '';
424 497
 				$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);
425 498
 				if ($n == 8) {
426
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
499
+					if ($globalDebug) {
500
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
501
+					}
427 502
 					$icao = trim($aident);
428 503
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
429 504
 					$decode['icao'] = $icao;
@@ -440,7 +515,9 @@  discard block
 block discarded – undo
440 515
 				$darr = '';
441 516
 				$n = sscanf($message, "%*d/%*d %4s/%4s .%*6s", $dair, $darr);
442 517
 				if ($n == 5) {
443
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
518
+					if ($globalDebug) {
519
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
520
+					}
444 521
 					//$icao = $Translation->checkTranslation($ident);
445 522
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
446 523
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -455,7 +532,9 @@  discard block
 block discarded – undo
455 532
 				$darr = '';
456 533
 				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
457 534
 				if ($n == 3) {
458
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
535
+					if ($globalDebug) {
536
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
537
+					}
459 538
 					//$icao = $Translation->checkTranslation($ident);
460 539
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
461 540
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -470,7 +549,9 @@  discard block
 block discarded – undo
470 549
 				$darr = '';
471 550
 				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
472 551
 				if ($n == 3) {
473
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
552
+					if ($globalDebug) {
553
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
554
+					}
474 555
 					//$icao = $Translation->checkTranslation($ident);
475 556
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
476 557
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -480,7 +561,9 @@  discard block
 block discarded – undo
480 561
 			if (!$found) {
481 562
 				$n = sscanf($message,'MET01%4c',$airport);
482 563
 				if ($n == 1) {
483
-					if ($globalDebug) echo 'airport name : '.$airport;
564
+					if ($globalDebug) {
565
+						echo 'airport name : '.$airport;
566
+					}
484 567
 					$decode = array('Airport/Waypoint name' => $airport);
485 568
 					$found = true;
486 569
 				}
@@ -488,184 +571,126 @@  discard block
 block discarded – undo
488 571
 			if ($label == 'H1') {
489 572
 				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
490 573
 					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
491
-				}
492
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
574
+				} elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
493 575
 					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
494
-				}
495
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
576
+				} elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
496 577
 					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
497
-				}
498
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
578
+				} elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
499 579
 					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
500
-				}
501
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
580
+				} elseif (preg_match(':^#DFB/PIREP:',$message)) {
502 581
 					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
503
-				}
504
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
582
+				} elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
505 583
 					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
506
-				}
507
-				elseif (preg_match(':^#M1AAEP:',$message)) {
584
+				} elseif (preg_match(':^#M1AAEP:',$message)) {
508 585
 					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
509
-				}
510
-				elseif (preg_match(':^#M2APWD:',$message)) {
586
+				} elseif (preg_match(':^#M2APWD:',$message)) {
511 587
 					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
512
-				}
513
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
588
+				} elseif (preg_match(':^#M1BREQPWI:',$message)) {
514 589
 					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
515
-				}
516
-				elseif (preg_match(':^#CF:',$message)) {
590
+				} elseif (preg_match(':^#CF:',$message)) {
517 591
 					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
518
-				}
519
-				elseif (preg_match(':^#DF:',$message)) {
592
+				} elseif (preg_match(':^#DF:',$message)) {
520 593
 					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
521
-				}
522
-				elseif (preg_match(':^#EC:',$message)) {
594
+				} elseif (preg_match(':^#EC:',$message)) {
523 595
 					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
524
-				}
525
-				elseif (preg_match(':^#EI:',$message)) {
596
+				} elseif (preg_match(':^#EI:',$message)) {
526 597
 					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
527
-				}
528
-				elseif (preg_match(':^#H1:',$message)) {
598
+				} elseif (preg_match(':^#H1:',$message)) {
529 599
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
530
-				}
531
-				elseif (preg_match(':^#H2:',$message)) {
600
+				} elseif (preg_match(':^#H2:',$message)) {
532 601
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
533
-				}
534
-				elseif (preg_match(':^#HD:',$message)) {
602
+				} elseif (preg_match(':^#HD:',$message)) {
535 603
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
536
-				}
537
-				elseif (preg_match(':^#M1:',$message)) {
604
+				} elseif (preg_match(':^#M1:',$message)) {
538 605
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
539
-				}
540
-				elseif (preg_match(':^#M2:',$message)) {
606
+				} elseif (preg_match(':^#M2:',$message)) {
541 607
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
542
-				}
543
-				elseif (preg_match(':^#M3:',$message)) {
608
+				} elseif (preg_match(':^#M3:',$message)) {
544 609
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
545
-				}
546
-				elseif (preg_match(':^#MD:',$message)) {
610
+				} elseif (preg_match(':^#MD:',$message)) {
547 611
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
548
-				}
549
-				elseif (preg_match(':^#PS:',$message)) {
612
+				} elseif (preg_match(':^#PS:',$message)) {
550 613
 					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
551
-				}
552
-				elseif (preg_match(':^#S1:',$message)) {
614
+				} elseif (preg_match(':^#S1:',$message)) {
553 615
 					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
554
-				}
555
-				elseif (preg_match(':^#S2:',$message)) {
616
+				} elseif (preg_match(':^#S2:',$message)) {
556 617
 					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
557
-				}
558
-				elseif (preg_match(':^#SD:',$message)) {
618
+				} elseif (preg_match(':^#SD:',$message)) {
559 619
 					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
560
-				}
561
-				elseif (preg_match(':^#T[0-8]:',$message)) {
620
+				} elseif (preg_match(':^#T[0-8]:',$message)) {
562 621
 					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
563
-				}
564
-				elseif (preg_match(':^#WO:',$message)) {
622
+				} elseif (preg_match(':^#WO:',$message)) {
565 623
 					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
566
-				}
567
-				elseif (preg_match(':^#A1:',$message)) {
624
+				} elseif (preg_match(':^#A1:',$message)) {
568 625
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
569
-				}
570
-				elseif (preg_match(':^#A3:',$message)) {
626
+				} elseif (preg_match(':^#A3:',$message)) {
571 627
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
572
-				}
573
-				elseif (preg_match(':^#A4:',$message)) {
628
+				} elseif (preg_match(':^#A4:',$message)) {
574 629
 					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
575
-				}
576
-				elseif (preg_match(':^#A6:',$message)) {
630
+				} elseif (preg_match(':^#A6:',$message)) {
577 631
 					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
578
-				}
579
-				elseif (preg_match(':^#A8:',$message)) {
632
+				} elseif (preg_match(':^#A8:',$message)) {
580 633
 					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
581
-				}
582
-				elseif (preg_match(':^#A9:',$message)) {
634
+				} elseif (preg_match(':^#A9:',$message)) {
583 635
 					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
584
-				}
585
-				elseif (preg_match(':^#A0:',$message)) {
636
+				} elseif (preg_match(':^#A0:',$message)) {
586 637
 					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
587
-				}
588
-				elseif (preg_match(':^#AA:',$message)) {
638
+				} elseif (preg_match(':^#AA:',$message)) {
589 639
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
590
-				}
591
-				elseif (preg_match(':^#AB:',$message)) {
640
+				} elseif (preg_match(':^#AB:',$message)) {
592 641
 					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
593
-				}
594
-				elseif (preg_match(':^#AC:',$message)) {
642
+				} elseif (preg_match(':^#AC:',$message)) {
595 643
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
596
-				}
597
-				elseif (preg_match(':^#AD:',$message)) {
644
+				} elseif (preg_match(':^#AD:',$message)) {
598 645
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
599
-				}
600
-				elseif (preg_match(':^#AF:',$message)) {
646
+				} elseif (preg_match(':^#AF:',$message)) {
601 647
 					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
602
-				}
603
-				elseif (preg_match(':^#B1:',$message)) {
648
+				} elseif (preg_match(':^#B1:',$message)) {
604 649
 					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
605
-				}
606
-				elseif (preg_match(':^#B2:',$message)) {
650
+				} elseif (preg_match(':^#B2:',$message)) {
607 651
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
608
-				}
609
-				elseif (preg_match(':^#B3:',$message)) {
652
+				} elseif (preg_match(':^#B3:',$message)) {
610 653
 					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
611
-				}
612
-				elseif (preg_match(':^#B4:',$message)) {
654
+				} elseif (preg_match(':^#B4:',$message)) {
613 655
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
614
-				}
615
-				elseif (preg_match(':^#B6:',$message)) {
656
+				} elseif (preg_match(':^#B6:',$message)) {
616 657
 					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
617
-				}
618
-				elseif (preg_match(':^#B8:',$message)) {
658
+				} elseif (preg_match(':^#B8:',$message)) {
619 659
 					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
620
-				}
621
-				elseif (preg_match(':^#B9:',$message)) {
660
+				} elseif (preg_match(':^#B9:',$message)) {
622 661
 					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
623
-				}
624
-				elseif (preg_match(':^#B0:',$message)) {
662
+				} elseif (preg_match(':^#B0:',$message)) {
625 663
 					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
626
-				}
627
-				elseif (preg_match(':^#BA:',$message)) {
664
+				} elseif (preg_match(':^#BA:',$message)) {
628 665
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
629
-				}
630
-				elseif (preg_match(':^#BB:',$message)) {
666
+				} elseif (preg_match(':^#BB:',$message)) {
631 667
 					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
632
-				}
633
-				elseif (preg_match(':^#BC:',$message)) {
668
+				} elseif (preg_match(':^#BC:',$message)) {
634 669
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
635
-				}
636
-				elseif (preg_match(':^#BD:',$message)) {
670
+				} elseif (preg_match(':^#BD:',$message)) {
637 671
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
638
-				}
639
-				elseif (preg_match(':^#BE:',$message)) {
672
+				} elseif (preg_match(':^#BE:',$message)) {
640 673
 					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
641
-				}
642
-				elseif (preg_match(':^#BF:',$message)) {
674
+				} elseif (preg_match(':^#BF:',$message)) {
643 675
 					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
644
-				}
645
-				elseif (preg_match(':^#H3:',$message)) {
676
+				} elseif (preg_match(':^#H3:',$message)) {
646 677
 					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
647 678
 				}
648 679
 			}
649 680
 			if ($label == '10') {
650 681
 				if (preg_match(':^DTO01:',$message)) {
651 682
 					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
652
-				}
653
-				elseif (preg_match(':^AIS01:',$message)) {
683
+				} elseif (preg_match(':^AIS01:',$message)) {
654 684
 					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
655
-				}
656
-				elseif (preg_match(':^FTX01:',$message)) {
685
+				} elseif (preg_match(':^FTX01:',$message)) {
657 686
 					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
658
-				}
659
-				elseif (preg_match(':^FPL01:',$message)) {
687
+				} elseif (preg_match(':^FPL01:',$message)) {
660 688
 					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
661
-				}
662
-				elseif (preg_match(':^WAB01:',$message)) {
689
+				} elseif (preg_match(':^WAB01:',$message)) {
663 690
 					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
664
-				}
665
-				elseif (preg_match(':^MET01:',$message)) {
691
+				} elseif (preg_match(':^MET01:',$message)) {
666 692
 					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
667
-				}
668
-				elseif (preg_match(':^WAB02:',$message)) {
693
+				} elseif (preg_match(':^WAB02:',$message)) {
669 694
 					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
670 695
 				}
671 696
 			}
@@ -680,38 +705,28 @@  discard block
 block discarded – undo
680 705
 					$vsta = array('Version' => $version);
681 706
 					if ($state == 'E') {
682 707
 						$vsta = array_merge($vsta,array('Link state' => 'Established'));
683
-					}
684
-					elseif ($state == 'L') {
708
+					} elseif ($state == 'L') {
685 709
 						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
686
-					}
687
-					else {
710
+					} else {
688 711
 						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
689 712
 					}
690 713
 					if ($type == 'V') {
691 714
 						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
692
-					}
693
-					elseif ($type == 'S') {
715
+					} elseif ($type == 'S') {
694 716
 						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
695
-					}
696
-					elseif ($type == 'H') {
717
+					} elseif ($type == 'H') {
697 718
 						$vsta = array_merge($vsta,array('Link type' => 'HF'));
698
-					}
699
-					elseif ($type == 'G') {
719
+					} elseif ($type == 'G') {
700 720
 						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
701
-					}
702
-					elseif ($type == 'C') {
721
+					} elseif ($type == 'C') {
703 722
 						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
704
-					}
705
-					elseif ($type == '2') {
723
+					} elseif ($type == '2') {
706 724
 						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
707
-					}
708
-					elseif ($type == 'X') {
725
+					} elseif ($type == 'X') {
709 726
 						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
710
-					}
711
-					elseif ($type == 'I') {
727
+					} elseif ($type == 'I') {
712 728
 						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
713
-					}
714
-					else {
729
+					} else {
715 730
 						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
716 731
 					}
717 732
 					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
@@ -720,7 +735,9 @@  discard block
 block discarded – undo
720 735
 			}
721 736
 
722 737
 			$title = $this->getTitlefromLabel($label);
723
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
738
+			if ($title != '') {
739
+				$decode = array_merge(array('Message title' => $title),$decode);
740
+			}
724 741
 			/*
725 742
 			// Business jets always use GS0001
726 743
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
@@ -756,31 +773,54 @@  discard block
 block discarded – undo
756 773
 			$msg = $message['message'];
757 774
 			$decode = $message['decode'];
758 775
 			$registration = (string)$message['registration'];
759
-			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
760
-			else $latitude = '';
761
-			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
762
-			else $longitude = '';
763
-			if (isset($decode['airicao'])) $airicao = $decode['airicao'];
764
-			else $airicao = '';
765
-			if (isset($decode['icao'])) $icao = $decode['icao'];
766
-			else $icao = $Translation->checkTranslation($ident);
776
+			if (isset($decode['latitude'])) {
777
+				$latitude = $decode['latitude'];
778
+			} else {
779
+				$latitude = '';
780
+			}
781
+			if (isset($decode['longitude'])) {
782
+				$longitude = $decode['longitude'];
783
+			} else {
784
+				$longitude = '';
785
+			}
786
+			if (isset($decode['airicao'])) {
787
+				$airicao = $decode['airicao'];
788
+			} else {
789
+				$airicao = '';
790
+			}
791
+			if (isset($decode['icao'])) {
792
+				$icao = $decode['icao'];
793
+			} else {
794
+				$icao = $Translation->checkTranslation($ident);
795
+			}
767 796
 			$image_array = $Image->getSpotterImage($registration);
768 797
 			if (!isset($image_array[0]['registration'])) {
769 798
 				$Image->addSpotterImage($registration);
770 799
 			}
771 800
 			// Business jets always use GS0001
772
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
773
-			if ($globalDebug && isset($info) && $info != '') echo $info;
774
-			if (count($decode) > 0) $decode_json = json_encode($decode);
775
-			else $decode_json = '';
801
+			if ($ident != 'GS0001') {
802
+				$info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
803
+			}
804
+			if ($globalDebug && isset($info) && $info != '') {
805
+				echo $info;
806
+			}
807
+			if (count($decode) > 0) {
808
+				$decode_json = json_encode($decode);
809
+			} else {
810
+				$decode_json = '';
811
+			}
776 812
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
777 813
 				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
778 814
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
779 815
 				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
780 816
 			}
781 817
 			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
782
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
783
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
818
+			if (!isset($globalACARSArchive)) {
819
+				$globalACARSArchive = array('10','80','81','82','3F');
820
+			}
821
+			if ($result && in_array($label,$globalACARSArchive)) {
822
+				$this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
823
+			}
784 824
 			if ($globalDebug && count($decode) > 0) {
785 825
 				echo "Human readable data : ".implode(' - ',$decode)."\n";
786 826
 			}
@@ -805,7 +845,9 @@  discard block
 block discarded – undo
805 845
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
806 846
 			$Connection = new Connection($this->db);
807 847
 			$this->db = $Connection->db;
808
-			if ($globalDebug) echo "Test if not already in Live ACARS table...";
848
+			if ($globalDebug) {
849
+				echo "Test if not already in Live ACARS table...";
850
+			}
809 851
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
810 852
 			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
811 853
 			try {
@@ -816,7 +858,9 @@  discard block
 block discarded – undo
816 858
 				return false;
817 859
 			}
818 860
 			if ($stht->fetchColumn() == 0) {
819
-				if ($globalDebug) echo "Add Live ACARS data...";
861
+				if ($globalDebug) {
862
+					echo "Add Live ACARS data...";
863
+				}
820 864
 				$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)";
821 865
 				$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"));
822 866
 				try {
@@ -827,10 +871,14 @@  discard block
 block discarded – undo
827 871
 					return false;
828 872
 				}
829 873
 			} else {
830
-				if ($globalDebug) echo "Data already in DB...\n";
874
+				if ($globalDebug) {
875
+					echo "Data already in DB...\n";
876
+				}
831 877
 				return false;
832 878
 			}
833
-			if ($globalDebug) echo "Done\n";
879
+			if ($globalDebug) {
880
+				echo "Done\n";
881
+			}
834 882
 			return true;
835 883
 		}
836 884
 		return false;
@@ -864,7 +912,9 @@  discard block
 block discarded – undo
864 912
 			    	    }
865 913
 				    if ($stht->fetchColumn() == 0) {
866 914
 			*/
867
-			if ($globalDebug) echo "Add Live ACARS data...";
915
+			if ($globalDebug) {
916
+				echo "Add Live ACARS data...";
917
+			}
868 918
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
869 919
 			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
870 920
 			try {
@@ -873,7 +923,9 @@  discard block
 block discarded – undo
873 923
 			} catch(PDOException $e) {
874 924
 				return "error : ".$e->getMessage();
875 925
 			}
876
-			if ($globalDebug) echo "Done\n";
926
+			if ($globalDebug) {
927
+				echo "Done\n";
928
+			}
877 929
 		}
878 930
 		return '';
879 931
 	}
@@ -897,8 +949,11 @@  discard block
 block discarded – undo
897 949
 			return '';
898 950
 		}
899 951
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
900
-		if (count($row) > 0) return $row[0]['title'];
901
-		else return '';
952
+		if (count($row) > 0) {
953
+			return $row[0]['title'];
954
+		} else {
955
+			return '';
956
+		}
902 957
 	}
903 958
 
904 959
 	/**
@@ -917,8 +972,11 @@  discard block
 block discarded – undo
917 972
 			return array();
918 973
 		}
919 974
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
920
-		if (count($row) > 0) return $row;
921
-		else return array();
975
+		if (count($row) > 0) {
976
+			return $row;
977
+		} else {
978
+			return array();
979
+		}
922 980
 	}
923 981
 
924 982
 	/**
@@ -938,8 +996,11 @@  discard block
 block discarded – undo
938 996
 			return array();
939 997
 		}
940 998
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
941
-		if (count($row) > 0) return $row[0];
942
-		else return array();
999
+		if (count($row) > 0) {
1000
+			return $row[0];
1001
+		} else {
1002
+			return array();
1003
+		}
943 1004
 	}
944 1005
 
945 1006
     /**
@@ -987,19 +1048,35 @@  discard block
 block discarded – undo
987 1048
 			if ($row['registration'] != '') {
988 1049
 				$row['registration'] = str_replace('.','',$row['registration']);
989 1050
 				$image_array = $Image->getSpotterImage($row['registration']);
990
-				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']));
991
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
992
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
993
-			if ($row['registration'] == '') $row['registration'] = 'NA';
994
-			if ($row['ident'] == '') $row['ident'] = 'NA';
1051
+				if (count($image_array) > 0) {
1052
+					$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']));
1053
+				} else {
1054
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1055
+				}
1056
+			} else {
1057
+				$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1058
+			}
1059
+			if ($row['registration'] == '') {
1060
+				$row['registration'] = 'NA';
1061
+			}
1062
+			if ($row['ident'] == '') {
1063
+				$row['ident'] = 'NA';
1064
+			}
995 1065
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
996 1066
 			if (isset($identicao[0])) {
997 1067
 				if (substr($row['ident'],0,2) == 'AF') {
998
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
999
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1000
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1068
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
1069
+						$icao = $row['ident'];
1070
+					} else {
1071
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1072
+					}
1073
+				} else {
1074
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1075
+				}
1001 1076
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
1002
-			} else $icao = $row['ident'];
1077
+			} else {
1078
+				$icao = $row['ident'];
1079
+			}
1003 1080
 			$icao = $Translation->checkTranslation($icao,false);
1004 1081
 			$decode = json_decode($row['decode'],true);
1005 1082
 			$found = false;
@@ -1024,7 +1101,9 @@  discard block
 block discarded – undo
1024 1101
 					$found = true;
1025 1102
 				}
1026 1103
 			}
1027
-			if ($found) $row['decode'] = json_encode($decode);
1104
+			if ($found) {
1105
+				$row['decode'] = json_encode($decode);
1106
+			}
1028 1107
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1029 1108
 			$result[] = $data;
1030 1109
 			$i++;
@@ -1032,8 +1111,9 @@  discard block
 block discarded – undo
1032 1111
 		if (isset($result)) {
1033 1112
 			$result[0]['query_number_rows'] = $i;
1034 1113
 			return $result;
1114
+		} else {
1115
+			return array();
1035 1116
 		}
1036
-		else return array();
1037 1117
 	}
1038 1118
 
1039 1119
     /**
@@ -1086,31 +1166,51 @@  discard block
 block discarded – undo
1086 1166
 			if ($row['registration'] != '') {
1087 1167
 				$row['registration'] = str_replace('.','',$row['registration']);
1088 1168
 				$image_array = $Image->getSpotterImage($row['registration']);
1089
-				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']));
1090
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1091
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1169
+				if (count($image_array) > 0) {
1170
+					$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']));
1171
+				} else {
1172
+					$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1173
+				}
1174
+			} else {
1175
+				$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1176
+			}
1092 1177
 			$icao = '';
1093
-			if ($row['registration'] == '') $row['registration'] = 'NA';
1094
-			if ($row['ident'] == '') $row['ident'] = 'NA';
1178
+			if ($row['registration'] == '') {
1179
+				$row['registration'] = 'NA';
1180
+			}
1181
+			if ($row['ident'] == '') {
1182
+				$row['ident'] = 'NA';
1183
+			}
1095 1184
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
1096 1185
 			if (isset($identicao[0])) {
1097 1186
 				if (substr($row['ident'],0,2) == 'AF') {
1098
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1099
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1100
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1187
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
1188
+						$icao = $row['ident'];
1189
+					} else {
1190
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1191
+					}
1192
+				} else {
1193
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1194
+				}
1101 1195
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
1102
-			} else $icao = $row['ident'];
1196
+			} else {
1197
+				$icao = $row['ident'];
1198
+			}
1103 1199
 			$icao = $Translation->checkTranslation($icao);
1104 1200
 			$decode = json_decode($row['decode'],true);
1105 1201
 			$found = false;
1106 1202
 			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
1107 1203
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
1108
-				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>';
1204
+				if (isset($airport_info[0]['icao'])) {
1205
+					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1206
+				}
1109 1207
 				$found = true;
1110 1208
 			}
1111 1209
 			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
1112 1210
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
1113
-				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>';
1211
+				if (isset($airport_info[0]['icao'])) {
1212
+					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1213
+				}
1114 1214
 				$found = true;
1115 1215
 			}
1116 1216
 			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
@@ -1120,7 +1220,9 @@  discard block
 block discarded – undo
1120 1220
 					$found = true;
1121 1221
 				}
1122 1222
 			}
1123
-			if ($found) $row['decode'] = json_encode($decode);
1223
+			if ($found) {
1224
+				$row['decode'] = json_encode($decode);
1225
+			}
1124 1226
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1125 1227
 			$result[] = $data;
1126 1228
 			$i++;
@@ -1128,7 +1230,9 @@  discard block
 block discarded – undo
1128 1230
 		if (!empty($result)) {
1129 1231
 			$result[0]['query_number_rows'] = $i;
1130 1232
 			return $result;
1131
-		} else return array();
1233
+		} else {
1234
+			return array();
1235
+		}
1132 1236
 	}
1133 1237
 
1134 1238
     /**
@@ -1147,25 +1251,37 @@  discard block
 block discarded – undo
1147 1251
 		$ident = trim($ident);
1148 1252
 		$Translation = new Translation($this->db);
1149 1253
 		$Spotter = new Spotter($this->db);
1150
-		if ($globalDebug) echo "Test if we add ModeS data...";
1254
+		if ($globalDebug) {
1255
+			echo "Test if we add ModeS data...";
1256
+		}
1151 1257
 		//if ($icao == '') $icao = ACARS->ident2icao($ident);
1152
-		if ($icao == '') $icao = $Translation->checkTranslation($ident);
1153
-		if ($globalDebug) echo '- Ident : '.$icao.' - ';
1258
+		if ($icao == '') {
1259
+			$icao = $Translation->checkTranslation($ident);
1260
+		}
1261
+		if ($globalDebug) {
1262
+			echo '- Ident : '.$icao.' - ';
1263
+		}
1154 1264
 		if ($ident == '' || $registration == '') {
1155
-			if ($globalDebug) echo "Ident or registration null, exit\n";
1265
+			if ($globalDebug) {
1266
+				echo "Ident or registration null, exit\n";
1267
+			}
1156 1268
 			return '';
1157 1269
 		}
1158 1270
 		$registration = str_replace('.','',$registration);
1159 1271
 		$ident = $Translation->ident2icao($ident);
1160 1272
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
1161
-		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
1273
+		if ($globalDebug) {
1274
+			echo "Check if needed to add translation ".$ident.'... ';
1275
+		}
1162 1276
 		$querysi = "SELECT ident FROM spotter_live s,aircraft_modes a WHERE a.ModeS = s.ModeS AND a.Registration = :registration AND s.format_source <> 'ACARS' LIMIT 1";
1163 1277
 		$querysi_values = array(':registration' => $registration);
1164 1278
 		try {
1165 1279
 			$sthsi = $this->db->prepare($querysi);
1166 1280
 			$sthsi->execute($querysi_values);
1167 1281
 		} catch(PDOException $e) {
1168
-			if ($globalDebug) echo $e->getMessage();
1282
+			if ($globalDebug) {
1283
+				echo $e->getMessage();
1284
+			}
1169 1285
 			return "error : ".$e->getMessage();
1170 1286
 		}
1171 1287
 		$resultsi = $sthsi->fetch(PDO::FETCH_ASSOC);
@@ -1173,9 +1289,14 @@  discard block
 block discarded – undo
1173 1289
 		if (count($resultsi) > 0 && $resultsi['ident'] != $ident && $resultsi['ident'] != '') {
1174 1290
 			$Translation = new Translation($this->db);
1175 1291
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
1176
-			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1177
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1178
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1292
+			if ($globalDebug) {
1293
+				echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1294
+			}
1295
+			if ($ident != $trans_ident) {
1296
+				$Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1297
+			} elseif ($trans_ident == $ident) {
1298
+				$Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1299
+			}
1179 1300
 		} else {
1180 1301
 			if ($registration != '' && $latitude != '' && $longitude != '') {
1181 1302
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1184,32 +1305,46 @@  discard block
 block discarded – undo
1184 1305
 					$sth = $this->db->prepare($query);
1185 1306
 					$sth->execute($query_values);
1186 1307
 				} catch(PDOException $e) {
1187
-					if ($globalDebug) echo $e->getMessage();
1308
+					if ($globalDebug) {
1309
+						echo $e->getMessage();
1310
+					}
1188 1311
 					return "error : ".$e->getMessage();
1189 1312
 				}
1190 1313
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
1191 1314
 				$sth->closeCursor();
1192
-				if (isset($result['modes'])) $hex = $result['modes'];
1193
-				else $hex = '';
1315
+				if (isset($result['modes'])) {
1316
+					$hex = $result['modes'];
1317
+				} else {
1318
+					$hex = '';
1319
+				}
1194 1320
 				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
1195
-				if ($this->fromACARSscript) $this->SI->add($SI_data);
1321
+				if ($this->fromACARSscript) {
1322
+					$this->SI->add($SI_data);
1323
+				}
1196 1324
 			}
1197 1325
 		}
1198
-		if ($globalDebug) echo 'Done'."\n";
1326
+		if ($globalDebug) {
1327
+			echo 'Done'."\n";
1328
+		}
1199 1329
 		$query = "SELECT flightaware_id, ModeS FROM spotter_output WHERE ident = :ident AND format_source <> 'ACARS' ORDER BY spotter_id DESC LIMIT 1";
1200 1330
 		$query_values = array(':ident' => $icao);
1201 1331
 		try {
1202 1332
 			$sth = $this->db->prepare($query);
1203 1333
 			$sth->execute($query_values);
1204 1334
 		} catch(PDOException $e) {
1205
-			if ($globalDebug) echo $e->getMessage();
1335
+			if ($globalDebug) {
1336
+				echo $e->getMessage();
1337
+			}
1206 1338
 			return "error : ".$e->getMessage();
1207 1339
 		}
1208 1340
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
1209 1341
 		$sth->closeCursor();
1210 1342
 		if (isset($result['flightaware_id'])) {
1211
-			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
1212
-			else $ModeS = '';
1343
+			if (isset($result['ModeS'])) {
1344
+				$ModeS = $result['ModeS'];
1345
+			} else {
1346
+				$ModeS = '';
1347
+			}
1213 1348
 			if ($ModeS == '') {
1214 1349
 				$id = explode('-',$result['flightaware_id']);
1215 1350
 				$ModeS = $id[0];
@@ -1222,24 +1357,32 @@  discard block
 block discarded – undo
1222 1357
 					$sthc = $this->db->prepare($queryc);
1223 1358
 					$sthc->execute($queryc_values);
1224 1359
 				} catch(PDOException $e) {
1225
-					if ($globalDebug) echo $e->getMessage();
1360
+					if ($globalDebug) {
1361
+						echo $e->getMessage();
1362
+					}
1226 1363
 					return "error : ".$e->getMessage();
1227 1364
 				}
1228 1365
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
1229 1366
 				$sthc->closeCursor();
1230 1367
 				if (count($row) ==  0) {
1231
-					if ($globalDebug) echo " Add to ModeS table - ";
1368
+					if ($globalDebug) {
1369
+						echo " Add to ModeS table - ";
1370
+					}
1232 1371
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
1233 1372
 					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1234 1373
 					try {
1235 1374
 						$sthi = $this->db->prepare($queryi);
1236 1375
 						$sthi->execute($queryi_values);
1237 1376
 					} catch(PDOException $e) {
1238
-						if ($globalDebug) echo $e->getMessage();
1377
+						if ($globalDebug) {
1378
+							echo $e->getMessage();
1379
+						}
1239 1380
 						return "error : ".$e->getMessage();
1240 1381
 					}
1241 1382
 				} else {
1242
-					if ($globalDebug) echo " Update ModeS table - ";
1383
+					if ($globalDebug) {
1384
+						echo " Update ModeS table - ";
1385
+					}
1243 1386
 					if ($ICAOTypeCode != '') {
1244 1387
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1245 1388
 						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
@@ -1251,7 +1394,9 @@  discard block
 block discarded – undo
1251 1394
 						$sthi = $this->db->prepare($queryi);
1252 1395
 						$sthi->execute($queryi_values);
1253 1396
 					} catch(PDOException $e) {
1254
-						if ($globalDebug) echo $e->getMessage();
1397
+						if ($globalDebug) {
1398
+							echo $e->getMessage();
1399
+						}
1255 1400
 						return "error : ".$e->getMessage();
1256 1401
 					}
1257 1402
 				}
@@ -1272,7 +1417,9 @@  discard block
 block discarded – undo
1272 1417
 					    return "error : ".$e->getMessage();
1273 1418
 				}
1274 1419
 				*/
1275
-				if ($globalDebug) echo " Update Spotter_output table - ";
1420
+				if ($globalDebug) {
1421
+					echo " Update Spotter_output table - ";
1422
+				}
1276 1423
 				if ($ICAOTypeCode != '') {
1277 1424
 					if ($globalDBdriver == 'mysql') {
1278 1425
 						$queryi = "UPDATE spotter_output SET registration = :Registration,aircraft_icao = :ICAOTypeCode WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
@@ -1283,8 +1430,7 @@  discard block
 block discarded – undo
1283 1430
 				} else {
1284 1431
 					if ($globalDBdriver == 'mysql') {
1285 1432
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
1286
-					}
1287
-					elseif ($globalDBdriver == 'pgsql') {
1433
+					} elseif ($globalDBdriver == 'pgsql') {
1288 1434
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
1289 1435
 					}
1290 1436
 					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
@@ -1293,14 +1439,20 @@  discard block
 block discarded – undo
1293 1439
 					$sthi = $this->db->prepare($queryi);
1294 1440
 					$sthi->execute($queryi_values);
1295 1441
 				} catch(PDOException $e) {
1296
-					if ($globalDebug) echo $e->getMessage();
1442
+					if ($globalDebug) {
1443
+						echo $e->getMessage();
1444
+					}
1297 1445
 					return "error : ".$e->getMessage();
1298 1446
 				}
1299 1447
 			}
1300 1448
 		} else {
1301
-			if ($globalDebug) echo " Can't find ModeS in spotter_output - ";
1449
+			if ($globalDebug) {
1450
+				echo " Can't find ModeS in spotter_output - ";
1451
+			}
1452
+		}
1453
+		if ($globalDebug) {
1454
+			echo "Done\n";
1302 1455
 		}
1303
-		if ($globalDebug) echo "Done\n";
1304 1456
 		return '';
1305 1457
 	}
1306 1458
 }
Please login to merge, or discard this patch.
scripts/daemon-spotter.php 3 patches
Indentation   +1204 added lines, -1204 removed lines patch added patch discarded remove patch
@@ -15,65 +15,65 @@  discard block
 block discarded – undo
15 15
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
16 16
 require_once(dirname(__FILE__).'/../require/class.Common.php');
17 17
 if (isset($globalTracker) && $globalTracker) {
18
-    require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
18
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
19 19
 }
20 20
 if (isset($globalMarine) && $globalMarine) {
21
-    require_once(dirname(__FILE__).'/../require/class.AIS.php');
22
-    require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
21
+	require_once(dirname(__FILE__).'/../require/class.AIS.php');
22
+	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
23 23
 }
24 24
 
25 25
 if (!isset($globalDebug)) $globalDebug = FALSE;
26 26
 
27 27
 if ($globalInstalled === FALSE) {
28
-    echo "This script MUST be run after install script. Use your web browser to run install/index.php";
29
-    sleep(5);
30
-    die();
28
+	echo "This script MUST be run after install script. Use your web browser to run install/index.php";
29
+	sleep(5);
30
+	die();
31 31
 }
32 32
 
33 33
 
34 34
 // Check if schema is at latest version
35 35
 $Connection = new Connection();
36 36
 if ($Connection->connectionExists() === false) {
37
-    echo "Can't connect to your database. Check DB is running, user/password and database logs.";
38
-    exit();
37
+	echo "Can't connect to your database. Check DB is running, user/password and database logs.";
38
+	exit();
39 39
 }
40 40
 if ($Connection->latest() === false) {
41
-    echo "You MUST update to latest schema. Use your web browser to run install/index.php";
42
-    exit();
41
+	echo "You MUST update to latest schema. Use your web browser to run install/index.php";
42
+	exit();
43 43
 }
44 44
 if (PHP_SAPI != 'cli') {
45
-    echo "This script MUST be called from console, not a web browser.";
45
+	echo "This script MUST be called from console, not a web browser.";
46 46
 //    exit();
47 47
 }
48 48
 
49 49
 // This is to be compatible with old version of settings.php
50 50
 if (!isset($globalSources)) {
51
-    if (isset($globalSBS1Hosts)) {
52
-        //$hosts = $globalSBS1Hosts;
53
-        foreach ($globalSBS1Hosts as $host) {
54
-	    $globalSources[] = array('host' => $host);
55
-    	}
56
-    } else {
57
-        if (!isset($globalSBS1Host)) {
58
-	    echo '$globalSources MUST be defined !';
59
-	    die;
51
+	if (isset($globalSBS1Hosts)) {
52
+		//$hosts = $globalSBS1Hosts;
53
+		foreach ($globalSBS1Hosts as $host) {
54
+		$globalSources[] = array('host' => $host);
55
+		}
56
+	} else {
57
+		if (!isset($globalSBS1Host)) {
58
+		echo '$globalSources MUST be defined !';
59
+		die;
60 60
 	}
61 61
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
62 62
 	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
63
-    }
63
+	}
64 64
 }
65 65
 
66 66
 $options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver','enable-aircraft','disable-aircraft','enable-tracker','disable-tracker','enable-marine','disable-marine'));
67 67
 //if (isset($options['s'])) $hosts = array($options['s']);
68 68
 //elseif (isset($options['source'])) $hosts = array($options['source']);
69 69
 if (isset($options['s'])) {
70
-    $globalSources = array();
71
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
72
-    else $globalSources[] = array('host' => $options['s']);
70
+	$globalSources = array();
71
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
72
+	else $globalSources[] = array('host' => $options['s']);
73 73
 } elseif (isset($options['source'])) {
74
-    $globalSources = array();
75
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
76
-    else $globalSources[] = array('host' => $options['source']);
74
+	$globalSources = array();
75
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
76
+	else $globalSources[] = array('host' => $options['source']);
77 77
 }
78 78
 if (isset($options['aprsserverhost'])) {
79 79
 	$globalServerAPRS = TRUE;
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 if (isset($options['idsource'])) $id_source = $options['idsource'];
113 113
 else $id_source = 1;
114 114
 if (isset($globalServer) && $globalServer) {
115
-    if ($globalDebug) echo "Using Server Mode\n";
116
-    $SI=new SpotterServer();
115
+	if ($globalDebug) echo "Using Server Mode\n";
116
+	$SI=new SpotterServer();
117 117
 /*
118 118
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
119 119
     $SI = new adsb2aprs();
@@ -123,14 +123,14 @@  discard block
 block discarded – undo
123 123
 
124 124
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
125 125
 if (isset($globalMarine) && $globalMarine) {
126
-    require_once(dirname(__FILE__).'/../require/class.AIS.php');
127
-    require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
126
+	require_once(dirname(__FILE__).'/../require/class.AIS.php');
127
+	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
128 128
 }
129 129
 
130 130
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
131 131
 if (isset($globalMarine) && $globalMarine) {
132
-    $AIS = new AIS();
133
-    $MI = new MarineImport($Connection->db);
132
+	$AIS = new AIS();
133
+	$MI = new MarineImport($Connection->db);
134 134
 }
135 135
 //$APRS=new APRS($Connection->db);
136 136
 $SBS=new SBS();
@@ -143,12 +143,12 @@  discard block
 block discarded – undo
143 143
 //$servertz = system('date +%Z');
144 144
 // signal handler - playing nice with sockets and dump1090
145 145
 if (function_exists('pcntl_fork')) {
146
-    pcntl_signal(SIGINT,  function() {
147
-        global $sockets;
148
-        echo "\n\nctrl-c or kill signal received. Tidying up ... ";
149
-        die("Bye!\n");
150
-    });
151
-    pcntl_signal_dispatch();
146
+	pcntl_signal(SIGINT,  function() {
147
+		global $sockets;
148
+		echo "\n\nctrl-c or kill signal received. Tidying up ... ";
149
+		die("Bye!\n");
150
+	});
151
+	pcntl_signal_dispatch();
152 152
 }
153 153
 
154 154
 // let's try and connect
@@ -158,47 +158,47 @@  discard block
 block discarded – undo
158 158
 $reset = 0;
159 159
 
160 160
 function connect_all($hosts) {
161
-    //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
162
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
163
-    $reset++;
164
-    if ($globalDebug) echo 'Connect to all...'."\n";
165
-    foreach ($hosts as $id => $value) {
161
+	//global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
162
+	global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
163
+	$reset++;
164
+	if ($globalDebug) echo 'Connect to all...'."\n";
165
+	foreach ($hosts as $id => $value) {
166 166
 	$host = $value['host'];
167 167
 	$udp = false;
168 168
 	$globalSources[$id]['last_exec'] = 0;
169 169
 	// Here we check type of source(s)
170 170
 	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
171
-            if (preg_match('/deltadb.txt$/i',$host)) {
172
-        	//$formats[$id] = 'deltadbtxt';
173
-        	$globalSources[$id]['format'] = 'deltadbtxt';
174
-        	//$last_exec['deltadbtxt'] = 0;
175
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
176
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
177
-        	//$formats[$id] = 'vatsimtxt';
178
-        	$globalSources[$id]['format'] = 'vatsimtxt';
179
-        	//$last_exec['vatsimtxt'] = 0;
180
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
181
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
182
-        	//$formats[$id] = 'aircraftlistjson';
183
-        	$globalSources[$id]['format'] = 'aircraftlistjson';
184
-        	//$last_exec['aircraftlistjson'] = 0;
185
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
186
-    	    } else if (preg_match('/aircraft.json$/i',$host)) {
187
-        	//$formats[$id] = 'aircraftjson';
188
-        	$globalSources[$id]['format'] = 'aircraftjson';
189
-        	//$last_exec['aircraftlistjson'] = 0;
190
-        	if ($globalDebug) echo "Connect to aircraft.json source (".$host.")...\n";
191
-    	    } else if (preg_match('/aircraft$/i',$host)) {
192
-        	//$formats[$id] = 'planefinderclient';
193
-        	$globalSources[$id]['format'] = 'planefinderclient';
194
-        	//$last_exec['aircraftlistjson'] = 0;
195
-        	if ($globalDebug) echo "Connect to planefinderclient source (".$host.")...\n";
196
-    	    } else if (preg_match('/opensky/i',$host)) {
197
-        	//$formats[$id] = 'aircraftlistjson';
198
-        	$globalSources[$id]['format'] = 'opensky';
199
-        	//$last_exec['aircraftlistjson'] = 0;
200
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
201
-    	    /*
171
+			if (preg_match('/deltadb.txt$/i',$host)) {
172
+			//$formats[$id] = 'deltadbtxt';
173
+			$globalSources[$id]['format'] = 'deltadbtxt';
174
+			//$last_exec['deltadbtxt'] = 0;
175
+			if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
176
+			} else if (preg_match('/vatsim-data.txt$/i',$host)) {
177
+			//$formats[$id] = 'vatsimtxt';
178
+			$globalSources[$id]['format'] = 'vatsimtxt';
179
+			//$last_exec['vatsimtxt'] = 0;
180
+			if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
181
+			} else if (preg_match('/aircraftlist.json$/i',$host)) {
182
+			//$formats[$id] = 'aircraftlistjson';
183
+			$globalSources[$id]['format'] = 'aircraftlistjson';
184
+			//$last_exec['aircraftlistjson'] = 0;
185
+			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
186
+			} else if (preg_match('/aircraft.json$/i',$host)) {
187
+			//$formats[$id] = 'aircraftjson';
188
+			$globalSources[$id]['format'] = 'aircraftjson';
189
+			//$last_exec['aircraftlistjson'] = 0;
190
+			if ($globalDebug) echo "Connect to aircraft.json source (".$host.")...\n";
191
+			} else if (preg_match('/aircraft$/i',$host)) {
192
+			//$formats[$id] = 'planefinderclient';
193
+			$globalSources[$id]['format'] = 'planefinderclient';
194
+			//$last_exec['aircraftlistjson'] = 0;
195
+			if ($globalDebug) echo "Connect to planefinderclient source (".$host.")...\n";
196
+			} else if (preg_match('/opensky/i',$host)) {
197
+			//$formats[$id] = 'aircraftlistjson';
198
+			$globalSources[$id]['format'] = 'opensky';
199
+			//$last_exec['aircraftlistjson'] = 0;
200
+			if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
201
+			/*
202 202
     	    // Disabled for now, site change source format
203 203
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
204 204
         	//$formats[$id] = 'radarvirtueljson';
@@ -210,130 +210,130 @@  discard block
 block discarded – undo
210 210
         	    exit(0);
211 211
         	}
212 212
     	    */
213
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
214
-        	//$formats[$id] = 'planeupdatefaa';
215
-        	$globalSources[$id]['format'] = 'planeupdatefaa';
216
-        	//$last_exec['planeupdatefaa'] = 0;
217
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
218
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
219
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
220
-        	    exit(0);
221
-        	}
222
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
223
-        	//$formats[$id] = 'phpvmacars';
224
-        	$globalSources[$id]['format'] = 'phpvmacars';
225
-        	//$last_exec['phpvmacars'] = 0;
226
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
227
-            } else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
228
-        	//$formats[$id] = 'phpvmacars';
229
-        	$globalSources[$id]['format'] = 'vaos';
230
-        	//$last_exec['phpvmacars'] = 0;
231
-        	if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
232
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
233
-        	//$formats[$id] = 'phpvmacars';
234
-        	$globalSources[$id]['format'] = 'vam';
235
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
236
-            } else if (preg_match('/whazzup/i',$host)) {
237
-        	//$formats[$id] = 'whazzup';
238
-        	$globalSources[$id]['format'] = 'whazzup';
239
-        	//$last_exec['whazzup'] = 0;
240
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
241
-            } else if (preg_match('/blitzortung/i',$host)) {
242
-        	$globalSources[$id]['format'] = 'blitzortung';
243
-        	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
244
-            } else if (preg_match('/airwhere/i',$host)) {
245
-        	$globalSources[$id]['format'] = 'airwhere';
246
-        	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
247
-            } else if (preg_match('/recentpireps/i',$host)) {
248
-        	//$formats[$id] = 'pirepsjson';
249
-        	$globalSources[$id]['format'] = 'pirepsjson';
250
-        	//$last_exec['pirepsjson'] = 0;
251
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
252
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
253
-        	//$formats[$id] = 'fr24json';
254
-        	$globalSources[$id]['format'] = 'fr24json';
255
-        	//$last_exec['fr24json'] = 0;
256
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
257
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
258
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
259
-        	    exit(0);
260
-        	}
261
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
262
-        	//$formats[$id] = 'fr24json';
263
-        	$globalSources[$id]['format'] = 'myshiptracking';
264
-        	//$last_exec['fr24json'] = 0;
265
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
266
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
267
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
268
-        	    exit(0);
269
-        	}
270
-            //} else if (preg_match('/10001/',$host)) {
271
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
272
-        	//$formats[$id] = 'tsv';
273
-        	$globalSources[$id]['format'] = 'tsv';
274
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
275
-            }
276
-        } elseif (filter_var($host,FILTER_VALIDATE_URL) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'acarsjson')) {
277
-    		if ($globalSources[$id]['format'] == 'aisnmeahttp' || $globalSources[$id]['format'] == 'acarsjson') {
278
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
279
-    		    if ($idf !== false) {
280
-    			$httpfeeds[$id] = $idf;
281
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
282
-    		    } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
283
-    		} elseif ($globalDebug && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\n";
284
-    		elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
285
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
286
-	    $hostport = explode(':',$host);
287
-	    if (isset($hostport[1])) {
213
+			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
214
+			//$formats[$id] = 'planeupdatefaa';
215
+			$globalSources[$id]['format'] = 'planeupdatefaa';
216
+			//$last_exec['planeupdatefaa'] = 0;
217
+			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
218
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
219
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
220
+				exit(0);
221
+			}
222
+			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
223
+			//$formats[$id] = 'phpvmacars';
224
+			$globalSources[$id]['format'] = 'phpvmacars';
225
+			//$last_exec['phpvmacars'] = 0;
226
+			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
227
+			} else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
228
+			//$formats[$id] = 'phpvmacars';
229
+			$globalSources[$id]['format'] = 'vaos';
230
+			//$last_exec['phpvmacars'] = 0;
231
+			if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
232
+			} else if (preg_match('/VAM-json.php$/i',$host)) {
233
+			//$formats[$id] = 'phpvmacars';
234
+			$globalSources[$id]['format'] = 'vam';
235
+			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
236
+			} else if (preg_match('/whazzup/i',$host)) {
237
+			//$formats[$id] = 'whazzup';
238
+			$globalSources[$id]['format'] = 'whazzup';
239
+			//$last_exec['whazzup'] = 0;
240
+			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
241
+			} else if (preg_match('/blitzortung/i',$host)) {
242
+			$globalSources[$id]['format'] = 'blitzortung';
243
+			if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
244
+			} else if (preg_match('/airwhere/i',$host)) {
245
+			$globalSources[$id]['format'] = 'airwhere';
246
+			if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
247
+			} else if (preg_match('/recentpireps/i',$host)) {
248
+			//$formats[$id] = 'pirepsjson';
249
+			$globalSources[$id]['format'] = 'pirepsjson';
250
+			//$last_exec['pirepsjson'] = 0;
251
+			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
252
+			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
253
+			//$formats[$id] = 'fr24json';
254
+			$globalSources[$id]['format'] = 'fr24json';
255
+			//$last_exec['fr24json'] = 0;
256
+			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
257
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
258
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
259
+				exit(0);
260
+			}
261
+			} else if (preg_match(':myshiptracking.com/:i',$host)) {
262
+			//$formats[$id] = 'fr24json';
263
+			$globalSources[$id]['format'] = 'myshiptracking';
264
+			//$last_exec['fr24json'] = 0;
265
+			if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
266
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
267
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
268
+				exit(0);
269
+			}
270
+			//} else if (preg_match('/10001/',$host)) {
271
+			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
272
+			//$formats[$id] = 'tsv';
273
+			$globalSources[$id]['format'] = 'tsv';
274
+			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
275
+			}
276
+		} elseif (filter_var($host,FILTER_VALIDATE_URL) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'acarsjson')) {
277
+			if ($globalSources[$id]['format'] == 'aisnmeahttp' || $globalSources[$id]['format'] == 'acarsjson') {
278
+				$idf = fopen($globalSources[$id]['host'],'r',false,$context);
279
+				if ($idf !== false) {
280
+				$httpfeeds[$id] = $idf;
281
+				if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
282
+				} elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
283
+			} elseif ($globalDebug && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\n";
284
+			elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
285
+		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
286
+		$hostport = explode(':',$host);
287
+		if (isset($hostport[1])) {
288 288
 		$port = $hostport[1];
289 289
 		$hostn = $hostport[0];
290
-	    } else {
290
+		} else {
291 291
 		$port = $globalSources[$id]['port'];
292 292
 		$hostn = $globalSources[$id]['host'];
293
-	    }
294
-	    $Common = new Common();
295
-	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acarsjsonudp' && $globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
296
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
297
-    	    } else {
298
-    		$udp = true;
299
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
300
-	    }
301
-	    if ($s) {
302
-    	        $sockets[$id] = $s;
303
-    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
304
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
293
+		}
294
+		$Common = new Common();
295
+		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acarsjsonudp' && $globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
296
+			$s = $Common->create_socket($hostn,$port, $errno, $errstr);
297
+			} else {
298
+			$udp = true;
299
+			$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
300
+		}
301
+		if ($s) {
302
+				$sockets[$id] = $s;
303
+				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
304
+			if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
305 305
 			//$formats[$id] = 'aprs';
306 306
 			$globalSources[$id]['format'] = 'aprs';
307 307
 			//$aprs_connect = 0;
308 308
 			//$use_aprs = true;
309
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
309
+			} elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
310 310
 			$globalSources[$id]['format'] = 'vrstcp';
311
-    		    } elseif ($port == '10001') {
312
-        		//$formats[$id] = 'tsv';
313
-        		$globalSources[$id]['format'] = 'tsv';
314
-		    } elseif ($port == '30002') {
315
-        		//$formats[$id] = 'raw';
316
-        		$globalSources[$id]['format'] = 'raw';
317
-		    } elseif ($port == '5001') {
318
-        		//$formats[$id] = 'raw';
319
-        		$globalSources[$id]['format'] = 'flightgearmp';
320
-		    } elseif ($port == '30005') {
311
+				} elseif ($port == '10001') {
312
+				//$formats[$id] = 'tsv';
313
+				$globalSources[$id]['format'] = 'tsv';
314
+			} elseif ($port == '30002') {
315
+				//$formats[$id] = 'raw';
316
+				$globalSources[$id]['format'] = 'raw';
317
+			} elseif ($port == '5001') {
318
+				//$formats[$id] = 'raw';
319
+				$globalSources[$id]['format'] = 'flightgearmp';
320
+			} elseif ($port == '30005') {
321 321
 			// Not yet supported
322
-        		//$formats[$id] = 'beast';
323
-        		$globalSources[$id]['format'] = 'beast';
324
-		    //} else $formats[$id] = 'sbs';
325
-		    } else $globalSources[$id]['format'] = 'sbs';
326
-		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
322
+				//$formats[$id] = 'beast';
323
+				$globalSources[$id]['format'] = 'beast';
324
+			//} else $formats[$id] = 'sbs';
325
+			} else $globalSources[$id]['format'] = 'sbs';
326
+			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
327 327
 		}
328 328
 		if ($globalDebug && $udp) echo 'Listening in UDP from '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
329 329
 		elseif ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
330
-            } else {
330
+			} else {
331 331
 		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
332 332
 		sleep(10);
333 333
 		connect_all($hosts);
334
-    	    }
335
-        }
336
-    }
334
+			}
335
+		}
336
+	}
337 337
 }
338 338
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
339 339
 
@@ -356,9 +356,9 @@  discard block
 block discarded – undo
356 356
 //connect_all($globalSources);
357 357
 
358 358
 if (isset($globalProxy) && $globalProxy) {
359
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
359
+	$context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
360 360
 } else {
361
-    $context = stream_context_create(array('http' => array('timeout' => $timeout)));
361
+	$context = stream_context_create(array('http' => array('timeout' => $timeout)));
362 362
 }
363 363
 
364 364
 // APRS Configuration
@@ -367,21 +367,21 @@  discard block
 block discarded – undo
367 367
 	die;
368 368
 }
369 369
 foreach ($globalSources as $key => $source) {
370
-    if (!isset($source['format'])) {
371
-        $globalSources[$key]['format'] = 'auto';
372
-    }
373
-    if (isset($source['callback']) && $source['callback'] === TRUE) {
374
-        unset($globalSources[$key]);
375
-    }
370
+	if (!isset($source['format'])) {
371
+		$globalSources[$key]['format'] = 'auto';
372
+	}
373
+	if (isset($source['callback']) && $source['callback'] === TRUE) {
374
+		unset($globalSources[$key]);
375
+	}
376 376
 }
377 377
 connect_all($globalSources);
378 378
 foreach ($globalSources as $key => $source) {
379
-    if (isset($source['format']) && $source['format'] == 'aprs') {
379
+	if (isset($source['format']) && $source['format'] == 'aprs') {
380 380
 	$aprs_connect = 0;
381 381
 	$use_aprs = true;
382 382
 	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
383 383
 	break;
384
-    }
384
+	}
385 385
 }
386 386
 
387 387
 if ($use_aprs) {
@@ -422,173 +422,173 @@  discard block
 block discarded – undo
422 422
 
423 423
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
424 424
 while ($i > 0) {
425
-    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
425
+	if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
426 426
 
427
-    if (!$globalDaemon) $i = $endtime-time();
428
-    // Delete old ATC
429
-    if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
427
+	if (!$globalDaemon) $i = $endtime-time();
428
+	// Delete old ATC
429
+	if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
430 430
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
431
-        $ATC->deleteOldATC();
432
-    }
431
+		$ATC->deleteOldATC();
432
+	}
433 433
     
434
-    if (count($last_exec) == count($globalSources)) {
434
+	if (count($last_exec) == count($globalSources)) {
435 435
 	$max = $globalMinFetch;
436 436
 	foreach ($last_exec as $last) {
437
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
437
+		if ((time() - $last['last']) < $max) $max = time() - $last['last'];
438 438
 	}
439 439
 	if ($max < $globalMinFetch) {
440
-	    if ($globalDebug) echo 'Sleeping...'."\n";
441
-	    sleep($globalMinFetch-$max+2);
440
+		if ($globalDebug) echo 'Sleeping...'."\n";
441
+		sleep($globalMinFetch-$max+2);
442
+	}
442 443
 	}
443
-    }
444 444
 
445 445
     
446
-    //foreach ($formats as $id => $value) {
447
-    foreach ($globalSources as $id => $value) {
446
+	//foreach ($formats as $id => $value) {
447
+	foreach ($globalSources as $id => $value) {
448 448
 	date_default_timezone_set('UTC');
449 449
 	//if ($globalDebug) echo 'Source host : '.$value['host'].' - Source format: '.$value['format']."\n";
450 450
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
451 451
 	if ($value['format'] === 'deltadbtxt' && 
452
-	    (
452
+		(
453 453
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
454 454
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
455
-	    )
455
+		)
456 456
 	) {
457
-        //$buffer = $Common->getData($hosts[$id]);
458
-        $buffer = $Common->getData($value['host']);
459
-        if ($buffer != '') $reset = 0;
460
-        $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
461
-        $buffer = explode('\n', $buffer);
462
-        foreach ($buffer as $line) {
463
-            if ($line != '' && count($line) > 7) {
464
-                $line = explode(',', $line);
465
-                $data = array();
466
-                $data['hex'] = $line[1]; // hex
467
-                $data['ident'] = $line[2]; // ident
468
-                if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
469
-                if (isset($line[4])) $data['speed'] = $line[4]; // speed
470
-                if (isset($line[5])) $data['heading'] = $line[5]; // heading
471
-                if (isset($line[6])) $data['latitude'] = $line[6]; // lat
472
-                if (isset($line[7])) $data['longitude'] = $line[7]; // long
473
-                $data['verticalrate'] = ''; // vertical rate
474
-                //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
475
-                $data['emergency'] = ''; // emergency
476
-                $data['datetime'] = date('Y-m-d H:i:s');
477
-                $data['format_source'] = 'deltadbtxt';
478
-                $data['id_source'] = $id_source;
479
-                if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
480
-                if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
481
-                if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
482
-                $SI->add($data);
483
-                unset($data);
484
-            }
485
-        }
486
-        $last_exec[$id]['last'] = time();
487
-    } elseif ($value['format'] === 'radarcapejson' &&
488
-            (
489
-                (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
490
-                (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
491
-            )
492
-        ) {
493
-            //$buffer = $Common->getData($hosts[$id]);
494
-            $buffer = $Common->getData($value['host']);
495
-            if ($buffer != '') {
496
-                $all_data = json_decode($buffer,true);
497
-                foreach ($all_data as $line) {
498
-                    $data = array();
499
-                    $data['datetime'] = date('Y-m-d H:i:s',$line['uti']);
500
-                    $data['hex'] = $line['hex']; // hex
501
-                    $data['ident'] = $line['fli']; // ident
502
-                    $data['altitude'] = $line['alt']; // altitude
503
-                    $data['speed'] = $line['spd']; // speed
504
-                    $data['heading'] = $line['trk']; // heading
505
-                    $data['latitude'] = $line['lat']; // lat
506
-                    $data['longitude'] = $line['lon']; // long
507
-                    $data['verticalrate'] = $line['vrt']; // vertical rate
508
-                    $data['squawk'] = $line['squ']; // squawk
509
-                    $data['ground'] = $line['gda']; // ground
510
-                    $data['registration'] = $line['reg'];
511
-                    //$data['emergency'] = ''; // emergency
512
-                    $data['datetime'] = date('Y-m-d H:i:s');
513
-                    $data['format_source'] = 'radarcapejson';
514
-                    $data['id_source'] = $id_source;
515
-                    if (isset($value['name']) && $value['name'] != '') {
516
-                        if (isset($line['src']) && !$line['src'] == 'M') $data['source_name'] = $value['name'].'_MLAT';
517
-                        else $data['source_name'] = $value['name'];
518
-                    } elseif (isset($line['src']) && $line['src'] == 'M') $data['source_name'] = 'MLAT';
519
-                    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
520
-                    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
457
+		//$buffer = $Common->getData($hosts[$id]);
458
+		$buffer = $Common->getData($value['host']);
459
+		if ($buffer != '') $reset = 0;
460
+		$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
461
+		$buffer = explode('\n', $buffer);
462
+		foreach ($buffer as $line) {
463
+			if ($line != '' && count($line) > 7) {
464
+				$line = explode(',', $line);
465
+				$data = array();
466
+				$data['hex'] = $line[1]; // hex
467
+				$data['ident'] = $line[2]; // ident
468
+				if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
469
+				if (isset($line[4])) $data['speed'] = $line[4]; // speed
470
+				if (isset($line[5])) $data['heading'] = $line[5]; // heading
471
+				if (isset($line[6])) $data['latitude'] = $line[6]; // lat
472
+				if (isset($line[7])) $data['longitude'] = $line[7]; // long
473
+				$data['verticalrate'] = ''; // vertical rate
474
+				//if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
475
+				$data['emergency'] = ''; // emergency
476
+				$data['datetime'] = date('Y-m-d H:i:s');
477
+				$data['format_source'] = 'deltadbtxt';
478
+				$data['id_source'] = $id_source;
479
+				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
480
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
481
+				if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
482
+				$SI->add($data);
483
+				unset($data);
484
+			}
485
+		}
486
+		$last_exec[$id]['last'] = time();
487
+	} elseif ($value['format'] === 'radarcapejson' &&
488
+			(
489
+				(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
490
+				(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
491
+			)
492
+		) {
493
+			//$buffer = $Common->getData($hosts[$id]);
494
+			$buffer = $Common->getData($value['host']);
495
+			if ($buffer != '') {
496
+				$all_data = json_decode($buffer,true);
497
+				foreach ($all_data as $line) {
498
+					$data = array();
499
+					$data['datetime'] = date('Y-m-d H:i:s',$line['uti']);
500
+					$data['hex'] = $line['hex']; // hex
501
+					$data['ident'] = $line['fli']; // ident
502
+					$data['altitude'] = $line['alt']; // altitude
503
+					$data['speed'] = $line['spd']; // speed
504
+					$data['heading'] = $line['trk']; // heading
505
+					$data['latitude'] = $line['lat']; // lat
506
+					$data['longitude'] = $line['lon']; // long
507
+					$data['verticalrate'] = $line['vrt']; // vertical rate
508
+					$data['squawk'] = $line['squ']; // squawk
509
+					$data['ground'] = $line['gda']; // ground
510
+					$data['registration'] = $line['reg'];
511
+					//$data['emergency'] = ''; // emergency
512
+					$data['datetime'] = date('Y-m-d H:i:s');
513
+					$data['format_source'] = 'radarcapejson';
514
+					$data['id_source'] = $id_source;
515
+					if (isset($value['name']) && $value['name'] != '') {
516
+						if (isset($line['src']) && !$line['src'] == 'M') $data['source_name'] = $value['name'].'_MLAT';
517
+						else $data['source_name'] = $value['name'];
518
+					} elseif (isset($line['src']) && $line['src'] == 'M') $data['source_name'] = 'MLAT';
519
+					if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
520
+					if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
521 521
 
522
-                    $SI->add($data);
523
-                    unset($data);
524
-                }
525
-            }
526
-            $last_exec[$id]['last'] = time();
522
+					$SI->add($data);
523
+					unset($data);
524
+				}
525
+			}
526
+			$last_exec[$id]['last'] = time();
527 527
 	} elseif ($value['format'] === 'aisnmeatxt' && 
528
-	    (
528
+		(
529 529
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
530 530
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
531
-	    )
531
+		)
532 532
 	) {
533
-	    date_default_timezone_set('CET');
534
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
535
-	    date_default_timezone_set('UTC');
536
-	    if ($buffer != '') $reset = 0;
537
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
538
-	    $buffer = explode('\n',$buffer);
539
-	    foreach ($buffer as $line) {
533
+		date_default_timezone_set('CET');
534
+		$buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
535
+		date_default_timezone_set('UTC');
536
+		if ($buffer != '') $reset = 0;
537
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
538
+		$buffer = explode('\n',$buffer);
539
+		foreach ($buffer as $line) {
540 540
 		if ($line != '') {
541
-		    //echo "'".$line."'\n";
542
-		    $add = false;
543
-		    $ais_data = $AIS->parse_line(trim($line));
544
-		    $data = array();
545
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
546
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
547
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
548
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
549
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
550
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
551
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
552
-		    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
553
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
554
-		    if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
555
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
556
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
557
-		    if (isset($ais_data['timestamp'])) {
541
+			//echo "'".$line."'\n";
542
+			$add = false;
543
+			$ais_data = $AIS->parse_line(trim($line));
544
+			$data = array();
545
+			if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
546
+			if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
547
+			if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
548
+			if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
549
+			if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
550
+			if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
551
+			if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
552
+			if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
553
+			if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
554
+			if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
555
+			if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
556
+			if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
557
+			if (isset($ais_data['timestamp'])) {
558 558
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
559 559
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
560
-			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
561
-			    $add = true;
560
+				$last_exec[$id]['timestamp'] = $ais_data['timestamp'];
561
+				$add = true;
562 562
 			}
563
-		    } else {
563
+			} else {
564 564
 			$data['datetime'] = date('Y-m-d H:i:s');
565 565
 			$add = true;
566
-		    }
567
-		    $data['format_source'] = 'aisnmeatxt';
568
-    		    $data['id_source'] = $id_source;
569
-		    //print_r($data);
570
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
571
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
572
-		    unset($data);
566
+			}
567
+			$data['format_source'] = 'aisnmeatxt';
568
+				$data['id_source'] = $id_source;
569
+			//print_r($data);
570
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
571
+			if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
572
+			unset($data);
573 573
 		}
574
-    	    }
575
-    	    $last_exec[$id]['last'] = time();
574
+			}
575
+			$last_exec[$id]['last'] = time();
576 576
 	} elseif ($value['format'] === 'aisnmeahttp') {
577
-	    $arr = $httpfeeds;
578
-	    $w = $e = null;
577
+		$arr = $httpfeeds;
578
+		$w = $e = null;
579 579
 	    
580
-	    if (isset($arr[$id])) {
580
+		if (isset($arr[$id])) {
581 581
 		$nn = stream_select($arr,$w,$e,$timeout);
582 582
 		if ($nn > 0) {
583
-		    foreach ($httpfeeds as $feed) {
583
+			foreach ($httpfeeds as $feed) {
584 584
 			$buffer = stream_get_line($feed,2000,"\n");
585 585
 			if ($buffer === FALSE) {
586
-			    connect_all($globalSources);
586
+				connect_all($globalSources);
587 587
 			}
588 588
 			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
589 589
 			$buffer = explode('\n',$buffer);
590 590
 			foreach ($buffer as $line) {
591
-			    if ($line != '') {
591
+				if ($line != '') {
592 592
 				$ais_data = $AIS->parse_line(trim($line));
593 593
 				$data = array();
594 594
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
@@ -606,117 +606,117 @@  discard block
 block discarded – undo
606 606
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
607 607
 				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
608 608
 				if (isset($ais_data['timestamp'])) {
609
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
609
+					$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
610 610
 				} else {
611
-				    $data['datetime'] = date('Y-m-d H:i:s');
611
+					$data['datetime'] = date('Y-m-d H:i:s');
612 612
 				}
613 613
 				$data['format_source'] = 'aisnmeahttp';
614 614
 				$data['id_source'] = $id_source;
615 615
 				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
616 616
 				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
617 617
 				unset($data);
618
-			    }
618
+				}
619
+			}
619 620
 			}
620
-		    }
621 621
 		} else {
622
-		    $format = $value['format'];
623
-		    if (isset($tt[$format])) $tt[$format]++;
624
-		    else $tt[$format] = 0;
625
-		    if ($tt[$format] > 30) {
622
+			$format = $value['format'];
623
+			if (isset($tt[$format])) $tt[$format]++;
624
+			else $tt[$format] = 0;
625
+			if ($tt[$format] > 30) {
626 626
 			if ($globalDebug) echo 'Reconnect...'."\n";
627 627
 			sleep(2);
628 628
 			//$sourceeen[] = $value;
629 629
 			//connect_all($sourceeen);
630 630
 			//$sourceeen = array();
631 631
 			connect_all($globalSources);
632
-		    }
632
+			}
633
+		}
633 634
 		}
634
-	    }
635 635
 	} elseif ($value['format'] === 'myshiptracking' && 
636
-	    (
636
+		(
637 637
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
638 638
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
639
-	    )
639
+		)
640 640
 	) {
641
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
642
-	    if ($buffer != '') {
641
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
642
+		if ($buffer != '') {
643 643
 		//echo $buffer;
644 644
 		$all_data = json_decode($buffer,true);
645 645
 		//print_r($all_data);
646 646
 		if (isset($all_data[0]['DATA'])) {
647
-		    foreach ($all_data[0]['DATA'] as $line) {
647
+			foreach ($all_data[0]['DATA'] as $line) {
648 648
 			if ($line != '') {
649
-			    $data = array();
650
-			    $data['ident'] = $line['NAME'];
651
-			    $data['mmsi'] = $line['MMSI'];
652
-			    if (strlen($data['mmsi']) > 9) {
649
+				$data = array();
650
+				$data['ident'] = $line['NAME'];
651
+				$data['mmsi'] = $line['MMSI'];
652
+				if (strlen($data['mmsi']) > 9) {
653 653
 				$data['mmsi'] = substr($data['mmsi'],-9);
654
-			    }
655
-			    $data['speed'] = $line['SOG'];
656
-			    $data['heading'] = $line['COG'];
657
-			    $data['latitude'] = $line['LAT'];
658
-			    $data['longitude'] = $line['LNG'];
659
-			    //    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
660
-			    //$data['type_id'] = $line['TYPE'];
661
-			    $data['imo'] = $line['IMO'];
662
-			    if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
663
-			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
664
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
665
-			    $data['format_source'] = 'myshiptracking';
666
-			    $data['id_source'] = $id_source;
667
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
668
-			    $MI->add($data);
669
-			    unset($data);
654
+				}
655
+				$data['speed'] = $line['SOG'];
656
+				$data['heading'] = $line['COG'];
657
+				$data['latitude'] = $line['LAT'];
658
+				$data['longitude'] = $line['LNG'];
659
+				//    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
660
+				//$data['type_id'] = $line['TYPE'];
661
+				$data['imo'] = $line['IMO'];
662
+				if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
663
+				if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
664
+				$data['datetime'] = date('Y-m-d H:i:s',$line['T']);
665
+				$data['format_source'] = 'myshiptracking';
666
+				$data['id_source'] = $id_source;
667
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
668
+				$MI->add($data);
669
+				unset($data);
670
+			}
670 671
 			}
671
-		    }
672 672
 		}
673
-	    }
674
-	    $last_exec[$id]['last'] = time();
673
+		}
674
+		$last_exec[$id]['last'] = time();
675 675
 	} elseif ($value['format'] === 'boatbeaconapp' && 
676
-	    (
676
+		(
677 677
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
678 678
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
679
-	    )
679
+		)
680 680
 	) {
681
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
682
-	    if ($buffer != '') {
681
+		$buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
682
+		if ($buffer != '') {
683 683
 		$all_data = json_decode($buffer,true);
684 684
 		if (isset($all_data[0]['mmsi'])) {
685
-		    foreach ($all_data as $line) {
685
+			foreach ($all_data as $line) {
686 686
 			if ($line != '') {
687
-			    $data = array();
688
-			    $data['ident'] = $line['shipname'];
689
-			    $data['callsign'] = $line['callsign'];
690
-			    $data['mmsi'] = substr($line['mmsi'],-9);
691
-			    $data['speed'] = $line['sog'];
692
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
693
-			    $data['latitude'] = $line['latitude'];
694
-			    $data['longitude'] = $line['longitude'];
695
-			    $data['type_id'] = $line['shiptype'];
696
-			    $data['arrival_code'] = $line['destination'];
697
-			    $data['datetime'] = $line['time'];
698
-			    $data['format_source'] = 'boatbeaconapp';
699
-			    $data['id_source'] = $id_source;
700
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
701
-			    $MI->add($data);
702
-			    unset($data);
687
+				$data = array();
688
+				$data['ident'] = $line['shipname'];
689
+				$data['callsign'] = $line['callsign'];
690
+				$data['mmsi'] = substr($line['mmsi'],-9);
691
+				$data['speed'] = $line['sog'];
692
+				if ($line['heading'] != '511') $data['heading'] = $line['heading'];
693
+				$data['latitude'] = $line['latitude'];
694
+				$data['longitude'] = $line['longitude'];
695
+				$data['type_id'] = $line['shiptype'];
696
+				$data['arrival_code'] = $line['destination'];
697
+				$data['datetime'] = $line['time'];
698
+				$data['format_source'] = 'boatbeaconapp';
699
+				$data['id_source'] = $id_source;
700
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
701
+				$MI->add($data);
702
+				unset($data);
703
+			}
703 704
 			}
704
-		    }
705 705
 		}
706 706
 		
707
-	    }
708
-    	    $last_exec[$id]['last'] = time();
707
+		}
708
+			$last_exec[$id]['last'] = time();
709 709
 	} elseif ($value['format'] === 'boatnerd' && 
710
-	    (
710
+		(
711 711
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
712 712
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
713
-	    )
713
+		)
714 714
 	) {
715
-	    $buffer = $Common->getData($value['host']);
716
-	    if ($buffer != '') {
715
+		$buffer = $Common->getData($value['host']);
716
+		if ($buffer != '') {
717 717
 		$all_data = json_decode($buffer,true);
718 718
 		if (isset($all_data['features'][0]['id'])) {
719
-		    foreach ($all_data['features'] as $line) {
719
+			foreach ($all_data['features'] as $line) {
720 720
 			print_r($line);
721 721
 			$data = array();
722 722
 			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
@@ -736,76 +736,76 @@  discard block
 block discarded – undo
736 736
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
737 737
 			if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);
738 738
 			unset($data);
739
-		    }
739
+			}
740 740
 		}
741 741
 		
742
-	    }
743
-    	    $last_exec[$id]['last'] = time();
742
+		}
743
+			$last_exec[$id]['last'] = time();
744 744
 	} elseif ($value['format'] === 'shipplotter' && 
745
-	    (
745
+		(
746 746
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
747 747
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
748
-	    )
748
+		)
749 749
 	) {
750
-	    if ($globalDebug) echo 'download...';
751
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
752
-	    if ($globalDebug) echo 'done !'."\n";
753
-	    // FIXME: Need more work
754
-	    if ($buffer != '') $reset = 0;
755
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
756
-	    $buffer = explode('\n',$buffer);
757
-	    foreach ($buffer as $line) {
750
+		if ($globalDebug) echo 'download...';
751
+		$buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
752
+		if ($globalDebug) echo 'done !'."\n";
753
+		// FIXME: Need more work
754
+		if ($buffer != '') $reset = 0;
755
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
756
+		$buffer = explode('\n',$buffer);
757
+		foreach ($buffer as $line) {
758 758
 		if ($line != '') {
759
-		    $data = array();
760
-		    //echo $line."\n";
761
-		    $data['mmsi'] = (int)substr($line,0,9);
762
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
763
-		    $data['status_id'] = substr($line,21,2);
764
-		    $data['type_id'] = substr($line,24,3);
765
-		    $data['latitude'] = substr($line,29,9);
766
-		    $data['longitude'] = substr($line,41,9);
767
-		    $data['speed'] = round(substr($line,51,5));
768
-		    //$data['course'] = substr($line,57,5);
769
-		    $data['heading'] = round(substr($line,63,3));
770
-		    //$data['draft'] = substr($line,67,4);
771
-		    //$data['length'] = substr($line,72,3);
772
-		    //$data['beam'] = substr($line,76,2);
773
-		    $data['ident'] = trim(utf8_encode(substr($line,78,20)));
774
-		    //$data['callsign'] = trim(substr($line,100,7);
775
-		    $data['arrival_code'] = substr($line,108,20);
776
-		    //$data['etaDate'] = substr($line,129,5);
777
-		    //$data['etaTime'] = substr($line,135,5);
778
-		    $data['format_source'] = 'shipplotter';
779
-    		    $data['id_source'] = $id_source;
780
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
781
-		    //print_r($data);
782
-		    //echo 'Add...'."\n";
783
-		    $MI->add($data);
784
-		    unset($data);
759
+			$data = array();
760
+			//echo $line."\n";
761
+			$data['mmsi'] = (int)substr($line,0,9);
762
+			$data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
763
+			$data['status_id'] = substr($line,21,2);
764
+			$data['type_id'] = substr($line,24,3);
765
+			$data['latitude'] = substr($line,29,9);
766
+			$data['longitude'] = substr($line,41,9);
767
+			$data['speed'] = round(substr($line,51,5));
768
+			//$data['course'] = substr($line,57,5);
769
+			$data['heading'] = round(substr($line,63,3));
770
+			//$data['draft'] = substr($line,67,4);
771
+			//$data['length'] = substr($line,72,3);
772
+			//$data['beam'] = substr($line,76,2);
773
+			$data['ident'] = trim(utf8_encode(substr($line,78,20)));
774
+			//$data['callsign'] = trim(substr($line,100,7);
775
+			$data['arrival_code'] = substr($line,108,20);
776
+			//$data['etaDate'] = substr($line,129,5);
777
+			//$data['etaTime'] = substr($line,135,5);
778
+			$data['format_source'] = 'shipplotter';
779
+				$data['id_source'] = $id_source;
780
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
781
+			//print_r($data);
782
+			//echo 'Add...'."\n";
783
+			$MI->add($data);
784
+			unset($data);
785 785
 		}
786
-    	    }
787
-    	    $last_exec[$id]['last'] = time();
786
+			}
787
+			$last_exec[$id]['last'] = time();
788 788
 	} elseif ($value['format'] === 'sailaway' && 
789
-	    (
789
+		(
790 790
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
791 791
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
792
-	    )
792
+		)
793 793
 	) {
794
-	    if (isset($globalSailaway['email']) && $globalSailaway['email'] != '' && isset($globalSailaway['password']) && $globalSailaway['password'] != '') {
794
+		if (isset($globalSailaway['email']) && $globalSailaway['email'] != '' && isset($globalSailaway['password']) && $globalSailaway['password'] != '') {
795 795
 		$authsailaway = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/weblogin.pl','post',array('submitlogin' => 'Login','email' => $globalSailaway['email'],'pwd' => $globalSailaway['password'], 'page' => 'http://sailaway.world/cgi-bin/sailaway/missions.pl'),'','','','','',false,false,true);
796 796
 		//echo $authsailaway;
797 797
 		preg_match_all('/^Set-Cookie:\s*([^;]*)/mi', $authsailaway, $setcookie);
798 798
 		if (isset($setcookie[1][0])) {
799
-		    $sailaway_authcookie = $setcookie[1][0];
799
+			$sailaway_authcookie = $setcookie[1][0];
800
+		}
800 801
 		}
801
-	    }
802 802
 
803
-	    if ($globalDebug) echo '! Download... ';
804
-	    for ($i =0; $i <= 1; $i++) {
803
+		if ($globalDebug) echo '! Download... ';
804
+		for ($i =0; $i <= 1; $i++) {
805 805
 		if ($globalDebug) echo 'Racetype: '.$i.' ';
806 806
 		$buffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetMissions.pl?race=1&tutorial=0&hist=1&racetype='.$i);
807
-	    if ($globalDebug) echo 'done'."\n";
808
-	    if ($buffer != '') {
807
+		if ($globalDebug) echo 'done'."\n";
808
+		if ($buffer != '') {
809 809
 		$all_data = json_decode($buffer,true);
810 810
 		if (isset($all_data['missions'])) {
811 811
 			foreach ($all_data['missions'] as $mission) {
@@ -824,19 +824,19 @@  discard block
 block discarded – undo
824 824
 					//print_r($race_data);
825 825
 					unset($racebuffer);
826 826
 					if (isset($race_data['mission'])) {
827
-					    $datar = array();
828
-					    $datar['id'] = $mission['misnr'];
829
-					    $datar['desc'] = $race_data['mission']['misdescr'];
830
-					    $datar['creator'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($race_data['mission']['usrname'])));
831
-					    $datar['name'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($race_data['mission']['mistitle'])));
832
-					    $datar['startdate'] = $race_data['mission']['misstartdatetime'];
833
-					    $markers = array();
834
-					    foreach ($race_data['mission']['course'] as $course) {
827
+						$datar = array();
828
+						$datar['id'] = $mission['misnr'];
829
+						$datar['desc'] = $race_data['mission']['misdescr'];
830
+						$datar['creator'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($race_data['mission']['usrname'])));
831
+						$datar['name'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($race_data['mission']['mistitle'])));
832
+						$datar['startdate'] = $race_data['mission']['misstartdatetime'];
833
+						$markers = array();
834
+						foreach ($race_data['mission']['course'] as $course) {
835 835
 						$markers[] = array('lat' => $course['miclat'],'lon' => $course['miclon'],'name' => $course['micname'],'type' => $course['mictype']);
836
-					    }
837
-					    $datar['markers'] = json_encode($markers);
838
-					    //print_r($datar);
839
-					    $MI->race_add($datar);
836
+						}
837
+						$datar['markers'] = json_encode($markers);
838
+						//print_r($datar);
839
+						$MI->race_add($datar);
840 840
 					}
841 841
 				}
842 842
 				if ($bufferm != '') {
@@ -900,34 +900,34 @@  discard block
 block discarded – undo
900 900
 				}
901 901
 			}
902 902
 		}
903
-	    }
904
-	    }
905
-    	    $last_exec[$id]['last'] = time();
903
+		}
904
+		}
905
+			$last_exec[$id]['last'] = time();
906 906
 	//} elseif (($value === 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value === 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
907 907
 	} elseif (
908
-	    (
908
+		(
909 909
 		$value['format'] === 'whazzup' && 
910 910
 		(
911
-		    (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
912
-		    (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
911
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
912
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
913 913
 		)
914
-	    ) || (
914
+		) || (
915 915
 		$value['format'] === 'vatsimtxt' && 
916 916
 		(
917
-		    (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
918
-		    (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
917
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
918
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
919
+		)
919 920
 		)
920
-	    )
921 921
 	) {
922
-	    //$buffer = $Common->getData($hosts[$id]);
923
-	    $buffer = $Common->getData($value['host']);
924
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
925
-	    $buffer = explode('\n',$buffer);
926
-	    $reset = 0;
927
-	    foreach ($buffer as $line) {
928
-    		if ($line != '') {
929
-    		    $line = explode(':', $line);
930
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
922
+		//$buffer = $Common->getData($hosts[$id]);
923
+		$buffer = $Common->getData($value['host']);
924
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
925
+		$buffer = explode('\n',$buffer);
926
+		$reset = 0;
927
+		foreach ($buffer as $line) {
928
+			if ($line != '') {
929
+				$line = explode(':', $line);
930
+				if (count($line) > 30 && $line[0] != 'callsign') {
931 931
 			$data = array();
932 932
 			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
933 933
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
@@ -940,37 +940,37 @@  discard block
 block discarded – undo
940 940
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
941 941
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
942 942
 			$data['latitude'] = $line[5]; // lat
943
-	        	$data['longitude'] = $line[6]; // long
944
-	        	$data['verticalrate'] = ''; // vertical rate
945
-	        	$data['squawk'] = ''; // squawk
946
-	        	$data['emergency'] = ''; // emergency
947
-	        	$data['waypoints'] = $line[30];
943
+				$data['longitude'] = $line[6]; // long
944
+				$data['verticalrate'] = ''; // vertical rate
945
+				$data['squawk'] = ''; // squawk
946
+				$data['emergency'] = ''; // emergency
947
+				$data['waypoints'] = $line[30];
948 948
 			$data['datetime'] = date('Y-m-d H:i:s');
949 949
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
950 950
 			//if (isset($line[37])) $data['last_update'] = $line[37];
951
-		        $data['departure_airport_icao'] = $line[11];
952
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
953
-		        $data['arrival_airport_icao'] = $line[13];
951
+				$data['departure_airport_icao'] = $line[11];
952
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
953
+				$data['arrival_airport_icao'] = $line[13];
954 954
 			$data['frequency'] = $line[4];
955 955
 			$data['type'] = $line[18];
956 956
 			$data['range'] = $line[19];
957 957
 			if (isset($line[35])) $data['info'] = $line[35];
958
-    			$data['id_source'] = $id_source;
959
-	    		//$data['arrival_airport_time'] = ;
960
-	    		if ($line[9] != '') {
961
-	    		    $aircraft_data = explode('/',$line[9]);
962
-	    		    if (isset($aircraft_data[1])) {
963
-	    			$data['aircraft_icao'] = $aircraft_data[1];
964
-	    		    }
965
-        		}
966
-	    		/*
958
+				$data['id_source'] = $id_source;
959
+				//$data['arrival_airport_time'] = ;
960
+				if ($line[9] != '') {
961
+					$aircraft_data = explode('/',$line[9]);
962
+					if (isset($aircraft_data[1])) {
963
+					$data['aircraft_icao'] = $aircraft_data[1];
964
+					}
965
+				}
966
+				/*
967 967
 	    		if ($value === 'whazzup') $data['format_source'] = 'whazzup';
968 968
 	    		elseif ($value === 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
969 969
 	    		*/
970
-	    		$data['format_source'] = $value['format'];
970
+				$data['format_source'] = $value['format'];
971 971
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
972 972
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
973
-    			if ($line[3] === 'PILOT') $SI->add($data);
973
+				if ($line[3] === 'PILOT') $SI->add($data);
974 974
 			elseif ($line[3] === 'ATC') {
975 975
 				//print_r($data);
976 976
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -991,21 +991,21 @@  discard block
 block discarded – undo
991 991
 					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
992 992
 				}
993 993
 			}
994
-    			unset($data);
995
-    		    }
996
-    		}
997
-    	    }
998
-    	    //if ($value === 'whazzup') $last_exec['whazzup'] = time();
999
-    	    //elseif ($value === 'vatsimtxt') $last_exec['vatsimtxt'] = time();
1000
-    	    $last_exec[$id]['last'] = time();
1001
-    	} elseif ($value['format'] === 'airwhere' && 
1002
-    	    (
1003
-    		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1004
-    		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1005
-    	    )
1006
-    	) {
1007
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
1008
-	    if ($buffer != '') {
994
+				unset($data);
995
+				}
996
+			}
997
+			}
998
+			//if ($value === 'whazzup') $last_exec['whazzup'] = time();
999
+			//elseif ($value === 'vatsimtxt') $last_exec['vatsimtxt'] = time();
1000
+			$last_exec[$id]['last'] = time();
1001
+		} elseif ($value['format'] === 'airwhere' && 
1002
+			(
1003
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1004
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1005
+			)
1006
+		) {
1007
+		$buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
1008
+		if ($buffer != '') {
1009 1009
 		$all_data = simplexml_load_string($buffer);
1010 1010
 		foreach($all_data->children() as $childdata) {
1011 1011
 			$data = array();
@@ -1027,10 +1027,10 @@  discard block
 block discarded – undo
1027 1027
 			$SI->add($data);
1028 1028
 			unset($data);
1029 1029
 		}
1030
-	    }
1031
-	    $Source->deleteOldLocationByType('gs');
1032
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
1033
-	    if ($buffer != '') {
1030
+		}
1031
+		$Source->deleteOldLocationByType('gs');
1032
+		$buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
1033
+		if ($buffer != '') {
1034 1034
 		$all_data = simplexml_load_string($buffer);
1035 1035
 		foreach($all_data->children() as $childdata) {
1036 1036
 			$data = array();
@@ -1048,8 +1048,8 @@  discard block
 block discarded – undo
1048 1048
 			}
1049 1049
 			unset($data);
1050 1050
 		}
1051
-	    }
1052
-	    $last_exec[$id]['last'] = time();
1051
+		}
1052
+		$last_exec[$id]['last'] = time();
1053 1053
 	/*
1054 1054
 	} if ($value['format'] === 'aircraftlistjson') {
1055 1055
 	    print_r($globalSources);
@@ -1057,17 +1057,17 @@  discard block
 block discarded – undo
1057 1057
 	    echo $globalMinFetch;
1058 1058
 	*/
1059 1059
 	} elseif ($value['format'] === 'aircraftlistjson' && 
1060
-	    (
1060
+		(
1061 1061
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1062 1062
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1063
-	    )
1063
+		)
1064 1064
 	) {
1065
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
1066
-	    if ($buffer != '') {
1067
-	        $all_data = json_decode($buffer,true);
1065
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
1066
+		if ($buffer != '') {
1067
+			$all_data = json_decode($buffer,true);
1068 1068
 		if (isset($all_data['acList'])) {
1069
-		    $reset = 0;
1070
-		    foreach ($all_data['acList'] as $line) {
1069
+			$reset = 0;
1070
+			foreach ($all_data['acList'] as $line) {
1071 1071
 			$data = array();
1072 1072
 			$data['hex'] = $line['Icao']; // hex
1073 1073
 			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -1090,10 +1090,10 @@  discard block
 block discarded – undo
1090 1090
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1091 1091
 			if (isset($data['latitude'])) $SI->add($data);
1092 1092
 			unset($data);
1093
-		    }
1093
+			}
1094 1094
 		} elseif (is_array($all_data)) {
1095
-		    $reset = 0;
1096
-		    foreach ($all_data as $line) {
1095
+			$reset = 0;
1096
+			foreach ($all_data as $line) {
1097 1097
 			$data = array();
1098 1098
 			$data['hex'] = $line['hex']; // hex
1099 1099
 			$data['ident'] = $line['flight']; // ident
@@ -1113,291 +1113,291 @@  discard block
 block discarded – undo
1113 1113
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1114 1114
 			$SI->add($data);
1115 1115
 			unset($data);
1116
-		    }
1116
+			}
1117 1117
 		}
1118
-	    } elseif ($globalDebug) echo 'No data'."\n";
1119
-    	    //$last_exec['aircraftlistjson'] = time();
1120
-    	    $last_exec[$id]['last'] = time();
1121
-    	//} elseif ($value === 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
1122
-    	} elseif ($value['format'] === 'planeupdatefaa' && 
1123
-    	    (
1124
-    		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1125
-    		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1126
-    	    )
1127
-    	) {
1128
-	    $buffer = $Common->getData($value['host']);
1129
-	    $all_data = json_decode($buffer,true);
1130
-	    if (isset($all_data['planes'])) {
1118
+		} elseif ($globalDebug) echo 'No data'."\n";
1119
+			//$last_exec['aircraftlistjson'] = time();
1120
+			$last_exec[$id]['last'] = time();
1121
+		//} elseif ($value === 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
1122
+		} elseif ($value['format'] === 'planeupdatefaa' && 
1123
+			(
1124
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1125
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1126
+			)
1127
+		) {
1128
+		$buffer = $Common->getData($value['host']);
1129
+		$all_data = json_decode($buffer,true);
1130
+		if (isset($all_data['planes'])) {
1131 1131
 		$reset = 0;
1132 1132
 		foreach ($all_data['planes'] as $key => $line) {
1133
-		    $data = array();
1134
-		    $data['hex'] = $key; // hex
1135
-		    $data['ident'] = $line[3]; // ident
1136
-		    $data['altitude'] = $line[6]; // altitude
1137
-		    $data['speed'] = $line[8]; // speed
1138
-		    $data['heading'] = $line[7]; // heading
1139
-		    $data['latitude'] = $line[4]; // lat
1140
-		    $data['longitude'] = $line[5]; // long
1141
-		    //$data['verticalrate'] = $line[]; // verticale rate
1142
-		    $data['squawk'] = $line[10]; // squawk
1143
-		    $data['emergency'] = ''; // emergency
1144
-		    $data['registration'] = $line[2];
1145
-		    $data['aircraft_icao'] = $line[0];
1146
-		    $deparr = explode('-',$line[1]);
1147
-		    if (count($deparr) === 2) {
1133
+			$data = array();
1134
+			$data['hex'] = $key; // hex
1135
+			$data['ident'] = $line[3]; // ident
1136
+			$data['altitude'] = $line[6]; // altitude
1137
+			$data['speed'] = $line[8]; // speed
1138
+			$data['heading'] = $line[7]; // heading
1139
+			$data['latitude'] = $line[4]; // lat
1140
+			$data['longitude'] = $line[5]; // long
1141
+			//$data['verticalrate'] = $line[]; // verticale rate
1142
+			$data['squawk'] = $line[10]; // squawk
1143
+			$data['emergency'] = ''; // emergency
1144
+			$data['registration'] = $line[2];
1145
+			$data['aircraft_icao'] = $line[0];
1146
+			$deparr = explode('-',$line[1]);
1147
+			if (count($deparr) === 2) {
1148 1148
 			$data['departure_airport_icao'] = $deparr[0];
1149 1149
 			$data['arrival_airport_icao'] = $deparr[1];
1150
-		    }
1151
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
1152
-	    	    $data['format_source'] = 'planeupdatefaa';
1153
-    		    $data['id_source'] = $id_source;
1154
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1155
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1156
-		    $SI->add($data);
1157
-		    unset($data);
1150
+			}
1151
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
1152
+				$data['format_source'] = 'planeupdatefaa';
1153
+				$data['id_source'] = $id_source;
1154
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1155
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1156
+			$SI->add($data);
1157
+			unset($data);
1158
+		}
1158 1159
 		}
1159
-	    }
1160
-	    //$last_exec['planeupdatefaa'] = time();
1161
-	    $last_exec[$id]['last'] = time();
1160
+		//$last_exec['planeupdatefaa'] = time();
1161
+		$last_exec[$id]['last'] = time();
1162 1162
 	} elseif ($value['format'] === 'opensky' && 
1163
-	    (
1163
+		(
1164 1164
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1165 1165
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1166
-	    )
1166
+		)
1167 1167
 	) {
1168
-	    $buffer = $Common->getData($value['host']);
1169
-	    $all_data = json_decode($buffer,true);
1170
-	    if (isset($all_data['states'])) {
1168
+		$buffer = $Common->getData($value['host']);
1169
+		$all_data = json_decode($buffer,true);
1170
+		if (isset($all_data['states'])) {
1171 1171
 		$reset = 0;
1172 1172
 		foreach ($all_data['states'] as $key => $line) {
1173
-		    $data = array();
1174
-		    $data['hex'] = $line[0]; // hex
1175
-		    $data['ident'] = trim($line[1]); // ident
1176
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
1177
-		    $data['speed'] = round($line[9]*1.94384); // speed
1178
-		    $data['heading'] = round($line[10]); // heading
1179
-		    $data['latitude'] = $line[6]; // lat
1180
-		    $data['longitude'] = $line[5]; // long
1181
-		    $data['verticalrate'] = $line[11]; // verticale rate
1182
-		    //$data['squawk'] = $line[10]; // squawk
1183
-		    //$data['emergency'] = ''; // emergency
1184
-		    //$data['registration'] = $line[2];
1185
-		    //$data['aircraft_icao'] = $line[0];
1186
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
1187
-		    $data['format_source'] = 'opensky';
1188
-		    $data['id_source'] = $id_source;
1189
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1190
-		    $SI->add($data);
1191
-		    unset($data);
1173
+			$data = array();
1174
+			$data['hex'] = $line[0]; // hex
1175
+			$data['ident'] = trim($line[1]); // ident
1176
+			$data['altitude'] = round($line[7]*3.28084); // altitude
1177
+			$data['speed'] = round($line[9]*1.94384); // speed
1178
+			$data['heading'] = round($line[10]); // heading
1179
+			$data['latitude'] = $line[6]; // lat
1180
+			$data['longitude'] = $line[5]; // long
1181
+			$data['verticalrate'] = $line[11]; // verticale rate
1182
+			//$data['squawk'] = $line[10]; // squawk
1183
+			//$data['emergency'] = ''; // emergency
1184
+			//$data['registration'] = $line[2];
1185
+			//$data['aircraft_icao'] = $line[0];
1186
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
1187
+			$data['format_source'] = 'opensky';
1188
+			$data['id_source'] = $id_source;
1189
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1190
+			$SI->add($data);
1191
+			unset($data);
1192 1192
 		}
1193
-	    }
1194
-	    //$last_exec['planeupdatefaa'] = time();
1195
-	    $last_exec[$id]['last'] = time();
1193
+		}
1194
+		//$last_exec['planeupdatefaa'] = time();
1195
+		$last_exec[$id]['last'] = time();
1196 1196
 	} elseif ($value['format'] === 'aircraftjson' && 
1197
-	    (
1197
+		(
1198 1198
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1199 1199
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1200
-	    )
1200
+		)
1201 1201
 	) {
1202
-	    $buffer = $Common->getData($value['host']);
1203
-	    $all_data = json_decode($buffer,true);
1204
-	    if (isset($all_data['aircraft']) && isset($all_data['now']) && $all_data['now'] > time()-1800) {
1202
+		$buffer = $Common->getData($value['host']);
1203
+		$all_data = json_decode($buffer,true);
1204
+		if (isset($all_data['aircraft']) && isset($all_data['now']) && $all_data['now'] > time()-1800) {
1205 1205
 		$reset = 0;
1206 1206
 		foreach ($all_data['aircraft'] as $key => $line) {
1207
-		    $data = array();
1208
-		    // add support for ground vehicule with ~ in front of hex
1209
-		    if (isset($line['hex'])) $data['hex'] = $line['hex']; // hex
1210
-		    if (isset($line['flight'])) $data['ident'] = trim($line['flight']); // ident
1211
-		    if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
1212
-		    if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
1213
-		    if (isset($line['track'])) $data['heading'] = $line['track']; // heading
1214
-		    if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
1215
-		    if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
1216
-		    if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
1217
-		    if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
1218
-		    //$data['emergency'] = ''; // emergency
1219
-		    //$data['registration'] = $line[2];
1220
-		    //$data['aircraft_icao'] = $line[0];
1221
-		    $data['datetime'] = date('Y-m-d H:i:s');
1222
-		    $data['format_source'] = 'aircraftjson';
1223
-		    $data['id_source'] = $id_source;
1224
-		    if (isset($value['name']) && $value['name'] != '') {
1225
-			    if (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = $value['name'].'_MLAT';
1226
-			    else $data['source_name'] = $value['name'];
1227
-		    } elseif (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = 'MLAT';
1228
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1229
-		    $SI->add($data);
1230
-		    unset($data);
1207
+			$data = array();
1208
+			// add support for ground vehicule with ~ in front of hex
1209
+			if (isset($line['hex'])) $data['hex'] = $line['hex']; // hex
1210
+			if (isset($line['flight'])) $data['ident'] = trim($line['flight']); // ident
1211
+			if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
1212
+			if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
1213
+			if (isset($line['track'])) $data['heading'] = $line['track']; // heading
1214
+			if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
1215
+			if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
1216
+			if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
1217
+			if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
1218
+			//$data['emergency'] = ''; // emergency
1219
+			//$data['registration'] = $line[2];
1220
+			//$data['aircraft_icao'] = $line[0];
1221
+			$data['datetime'] = date('Y-m-d H:i:s');
1222
+			$data['format_source'] = 'aircraftjson';
1223
+			$data['id_source'] = $id_source;
1224
+			if (isset($value['name']) && $value['name'] != '') {
1225
+				if (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = $value['name'].'_MLAT';
1226
+				else $data['source_name'] = $value['name'];
1227
+			} elseif (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = 'MLAT';
1228
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1229
+			$SI->add($data);
1230
+			unset($data);
1231
+		}
1231 1232
 		}
1232
-	    }
1233
-	    //$last_exec['planeupdatefaa'] = time();
1234
-	    $last_exec[$id]['last'] = time();
1233
+		//$last_exec['planeupdatefaa'] = time();
1234
+		$last_exec[$id]['last'] = time();
1235 1235
 	} elseif ($value['format'] === 'planefinderclient' && 
1236
-	    (
1236
+		(
1237 1237
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1238 1238
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1239
-	    )
1239
+		)
1240 1240
 	) {
1241
-	    $buffer = $Common->getData($value['host']);
1242
-	    $all_data = json_decode($buffer,true);
1243
-	    if (isset($all_data['aircraft'])) {
1241
+		$buffer = $Common->getData($value['host']);
1242
+		$all_data = json_decode($buffer,true);
1243
+		if (isset($all_data['aircraft'])) {
1244 1244
 		$reset = 0;
1245 1245
 		foreach ($all_data['aircraft'] as $key => $line) {
1246
-		    $data = array();
1247
-		    $data['hex'] = $key; // hex
1248
-		    if (isset($line['callsign'])) $data['ident'] = trim($line['callsign']); // ident
1249
-		    if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
1250
-		    if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
1251
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1252
-		    if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
1253
-		    if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
1254
-		    if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
1255
-		    if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
1256
-		    //$data['emergency'] = ''; // emergency
1257
-		    if (isset($line['reg'])) $data['registration'] = $line['reg'];
1258
-		    if (isset($line['type'])) $data['aircraft_icao'] = $line['type'];
1259
-		    $data['datetime'] = date('Y-m-d H:i:s',$line['pos_update_time']);
1260
-		    $data['format_source'] = 'planefinderclient';
1261
-		    $data['id_source'] = $id_source;
1262
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1263
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1264
-		    $SI->add($data);
1265
-		    unset($data);
1246
+			$data = array();
1247
+			$data['hex'] = $key; // hex
1248
+			if (isset($line['callsign'])) $data['ident'] = trim($line['callsign']); // ident
1249
+			if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
1250
+			if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
1251
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1252
+			if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
1253
+			if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
1254
+			if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
1255
+			if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
1256
+			//$data['emergency'] = ''; // emergency
1257
+			if (isset($line['reg'])) $data['registration'] = $line['reg'];
1258
+			if (isset($line['type'])) $data['aircraft_icao'] = $line['type'];
1259
+			$data['datetime'] = date('Y-m-d H:i:s',$line['pos_update_time']);
1260
+			$data['format_source'] = 'planefinderclient';
1261
+			$data['id_source'] = $id_source;
1262
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1263
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1264
+			$SI->add($data);
1265
+			unset($data);
1266 1266
 		}
1267
-	    }
1268
-	    $last_exec[$id]['last'] = time();
1267
+		}
1268
+		$last_exec[$id]['last'] = time();
1269 1269
 	//} elseif ($value === 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
1270 1270
 	} elseif ($value['format'] === 'fr24json' && 
1271
-	    (
1271
+		(
1272 1272
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1273 1273
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1274
-	    )
1274
+		)
1275 1275
 	) {
1276
-	    //$buffer = $Common->getData($hosts[$id]);
1277
-	    $buffer = $Common->getData($value['host']);
1278
-	    $all_data = json_decode($buffer,true);
1279
-	    if (!empty($all_data)) $reset = 0;
1280
-	    foreach ($all_data as $key => $line) {
1276
+		//$buffer = $Common->getData($hosts[$id]);
1277
+		$buffer = $Common->getData($value['host']);
1278
+		$all_data = json_decode($buffer,true);
1279
+		if (!empty($all_data)) $reset = 0;
1280
+		foreach ($all_data as $key => $line) {
1281 1281
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
1282
-		    $data = array();
1283
-		    $data['hex'] = $line[0];
1284
-		    $data['ident'] = $line[16]; //$line[13]
1285
-	    	    $data['altitude'] = $line[4]; // altitude
1286
-	    	    $data['speed'] = $line[5]; // speed
1287
-	    	    $data['heading'] = $line[3]; // heading
1288
-	    	    $data['latitude'] = $line[1]; // lat
1289
-	    	    $data['longitude'] = $line[2]; // long
1290
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
1291
-	    	    $data['squawk'] = $line[6]; // squawk
1292
-	    	    $data['aircraft_icao'] = $line[8];
1293
-	    	    $data['registration'] = $line[9];
1294
-		    $data['departure_airport_iata'] = $line[11];
1295
-		    $data['arrival_airport_iata'] = $line[12];
1296
-	    	    $data['emergency'] = ''; // emergency
1297
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
1298
-	    	    $data['format_source'] = 'fr24json';
1299
-    		    $data['id_source'] = $id_source;
1300
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1301
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1302
-		    $SI->add($data);
1303
-		    unset($data);
1282
+			$data = array();
1283
+			$data['hex'] = $line[0];
1284
+			$data['ident'] = $line[16]; //$line[13]
1285
+				$data['altitude'] = $line[4]; // altitude
1286
+				$data['speed'] = $line[5]; // speed
1287
+				$data['heading'] = $line[3]; // heading
1288
+				$data['latitude'] = $line[1]; // lat
1289
+				$data['longitude'] = $line[2]; // long
1290
+				$data['verticalrate'] = $line[15]; // verticale rate
1291
+				$data['squawk'] = $line[6]; // squawk
1292
+				$data['aircraft_icao'] = $line[8];
1293
+				$data['registration'] = $line[9];
1294
+			$data['departure_airport_iata'] = $line[11];
1295
+			$data['arrival_airport_iata'] = $line[12];
1296
+				$data['emergency'] = ''; // emergency
1297
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
1298
+				$data['format_source'] = 'fr24json';
1299
+				$data['id_source'] = $id_source;
1300
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1301
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1302
+			$SI->add($data);
1303
+			unset($data);
1304 1304
 		}
1305
-	    }
1306
-	    //$last_exec['fr24json'] = time();
1307
-	    $last_exec[$id]['last'] = time();
1305
+		}
1306
+		//$last_exec['fr24json'] = time();
1307
+		$last_exec[$id]['last'] = time();
1308 1308
 	//} elseif ($value === 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
1309 1309
 	} elseif ($value['format'] === 'radarvirtueljson' && 
1310
-	    (
1310
+		(
1311 1311
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1312 1312
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1313
-	    )
1313
+		)
1314 1314
 	) {
1315
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
1316
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
1317
-	    //echo $buffer;
1318
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
1319
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
1320
-	    $all_data = json_decode($buffer,true);
1321
-	    if (json_last_error() != JSON_ERROR_NONE) {
1315
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
1316
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
1317
+		//echo $buffer;
1318
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
1319
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
1320
+		$all_data = json_decode($buffer,true);
1321
+		if (json_last_error() != JSON_ERROR_NONE) {
1322 1322
 		die(json_last_error_msg());
1323
-	    }
1324
-	    if (isset($all_data['mrkrs'])) {
1323
+		}
1324
+		if (isset($all_data['mrkrs'])) {
1325 1325
 		$reset = 0;
1326 1326
 		foreach ($all_data['mrkrs'] as $key => $line) {
1327
-		    if (isset($line['inf'])) {
1327
+			if (isset($line['inf'])) {
1328 1328
 			$data = array();
1329 1329
 			$data['hex'] = $line['inf']['ia'];
1330 1330
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
1331
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
1332
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
1333
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
1334
-	    		$data['latitude'] = $line['pt'][0]; // lat
1335
-	    		$data['longitude'] = $line['pt'][1]; // long
1336
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
1337
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
1338
-	    		//$data['aircraft_icao'] = $line[8];
1339
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
1331
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
1332
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
1333
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
1334
+				$data['latitude'] = $line['pt'][0]; // lat
1335
+				$data['longitude'] = $line['pt'][1]; // long
1336
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
1337
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
1338
+				//$data['aircraft_icao'] = $line[8];
1339
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
1340 1340
 			//$data['departure_airport_iata'] = $line[11];
1341 1341
 			//$data['arrival_airport_iata'] = $line[12];
1342
-	    		//$data['emergency'] = ''; // emergency
1342
+				//$data['emergency'] = ''; // emergency
1343 1343
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
1344
-	    		$data['format_source'] = 'radarvirtueljson';
1345
-    			$data['id_source'] = $id_source;
1344
+				$data['format_source'] = 'radarvirtueljson';
1345
+				$data['id_source'] = $id_source;
1346 1346
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1347 1347
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1348 1348
 			$SI->add($data);
1349 1349
 			unset($data);
1350
-		    }
1350
+			}
1351 1351
 		}
1352
-	    }
1353
-	    //$last_exec['radarvirtueljson'] = time();
1354
-	    $last_exec[$id]['last'] = time();
1352
+		}
1353
+		//$last_exec['radarvirtueljson'] = time();
1354
+		$last_exec[$id]['last'] = time();
1355 1355
 	//} elseif ($value === 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
1356 1356
 	} elseif ($value['format'] === 'pirepsjson' && 
1357
-	    (
1357
+		(
1358 1358
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1359 1359
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1360
-	    )
1360
+		)
1361 1361
 	) {
1362
-	    //$buffer = $Common->getData($hosts[$id]);
1363
-	    $buffer = $Common->getData($value['host'].'?'.time());
1364
-	    $all_data = json_decode(utf8_encode($buffer),true);
1362
+		//$buffer = $Common->getData($hosts[$id]);
1363
+		$buffer = $Common->getData($value['host'].'?'.time());
1364
+		$all_data = json_decode(utf8_encode($buffer),true);
1365 1365
 	    
1366
-	    if (isset($all_data['pireps'])) {
1366
+		if (isset($all_data['pireps'])) {
1367 1367
 		$reset = 0;
1368
-	        foreach ($all_data['pireps'] as $line) {
1369
-		    $data = array();
1370
-		    $data['id'] = $line['id'];
1371
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
1372
-		    $data['ident'] = $line['callsign']; // ident
1373
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
1374
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
1375
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
1376
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
1377
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1378
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1379
-		    $data['latitude'] = $line['lat']; // lat
1380
-		    $data['longitude'] = $line['lon']; // long
1381
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
1382
-		    //$data['squawk'] = $line['squawk']; // squawk
1383
-		    //$data['emergency'] = ''; // emergency
1384
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
1385
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
1386
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
1387
-		    //$data['arrival_airport_time'] = $line['arrtime'];
1388
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
1389
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
1390
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
1391
-		    else $data['info'] = '';
1392
-		    $data['format_source'] = 'pireps';
1393
-    		    $data['id_source'] = $id_source;
1394
-		    $data['datetime'] = date('Y-m-d H:i:s');
1395
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1396
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1397
-		    if ($line['icon'] === 'plane') {
1368
+			foreach ($all_data['pireps'] as $line) {
1369
+			$data = array();
1370
+			$data['id'] = $line['id'];
1371
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
1372
+			$data['ident'] = $line['callsign']; // ident
1373
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
1374
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
1375
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
1376
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
1377
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1378
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1379
+			$data['latitude'] = $line['lat']; // lat
1380
+			$data['longitude'] = $line['lon']; // long
1381
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
1382
+			//$data['squawk'] = $line['squawk']; // squawk
1383
+			//$data['emergency'] = ''; // emergency
1384
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
1385
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
1386
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
1387
+			//$data['arrival_airport_time'] = $line['arrtime'];
1388
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
1389
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
1390
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
1391
+			else $data['info'] = '';
1392
+			$data['format_source'] = 'pireps';
1393
+				$data['id_source'] = $id_source;
1394
+			$data['datetime'] = date('Y-m-d H:i:s');
1395
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1396
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1397
+			if ($line['icon'] === 'plane') {
1398 1398
 			$SI->add($data);
1399
-		    //    print_r($data);
1400
-    		    } elseif ($line['icon'] === 'ct') {
1399
+			//    print_r($data);
1400
+				} elseif ($line['icon'] === 'ct') {
1401 1401
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
1402 1402
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
1403 1403
 			$typec = substr($data['ident'],-3);
@@ -1412,209 +1412,209 @@  discard block
 block discarded – undo
1412 1412
 			elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
1413 1413
 			else $data['type'] = 'Observer';
1414 1414
 			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
1415
-		    }
1416
-		    unset($data);
1415
+			}
1416
+			unset($data);
1417 1417
 		}
1418
-	    }
1419
-	    //$last_exec['pirepsjson'] = time();
1420
-	    $last_exec[$id]['last'] = time();
1418
+		}
1419
+		//$last_exec['pirepsjson'] = time();
1420
+		$last_exec[$id]['last'] = time();
1421 1421
 	//} elseif ($value === 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
1422 1422
 	} elseif ($value['format'] === 'phpvmacars' && 
1423
-	    (
1423
+		(
1424 1424
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1425 1425
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1426
-	    )
1426
+		)
1427 1427
 	) {
1428
-	    //$buffer = $Common->getData($hosts[$id]);
1429
-	    if ($globalDebug) echo 'Get Data...'."\n";
1430
-	    $buffer = $Common->getData($value['host']);
1431
-	    $all_data = json_decode($buffer,true);
1432
-	    if ($buffer != '' && is_array($all_data)) {
1428
+		//$buffer = $Common->getData($hosts[$id]);
1429
+		if ($globalDebug) echo 'Get Data...'."\n";
1430
+		$buffer = $Common->getData($value['host']);
1431
+		$all_data = json_decode($buffer,true);
1432
+		if ($buffer != '' && is_array($all_data)) {
1433 1433
 		$reset = 0;
1434 1434
 		foreach ($all_data as $line) {
1435
-	    	    $data = array();
1436
-	    	    //$data['id'] = $line['id']; // id not usable
1437
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1438
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1439
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1440
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1441
-	    	    $data['ident'] = $line['flightnum']; // ident
1442
-	    	    $data['altitude'] = $line['alt']; // altitude
1443
-	    	    $data['speed'] = $line['gs']; // speed
1444
-	    	    $data['heading'] = $line['heading']; // heading
1445
-	    	    $data['latitude'] = $line['lat']; // lat
1446
-	    	    $data['longitude'] = $line['lng']; // long
1447
-	    	    $data['verticalrate'] = ''; // verticale rate
1448
-	    	    $data['squawk'] = ''; // squawk
1449
-	    	    $data['emergency'] = ''; // emergency
1450
-	    	    //$data['datetime'] = $line['lastupdate'];
1451
-	    	    //$data['last_update'] = $line['lastupdate'];
1452
-	    	    if (isset($value['timezone'])) {
1453
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1454
-	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1455
-	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1456
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
1457
-	    	    $data['departure_airport_icao'] = $line['depicao'];
1458
-	    	    $data['departure_airport_time'] = $line['deptime'];
1459
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
1460
-    		    $data['arrival_airport_time'] = $line['arrtime'];
1461
-    		    if (isset($line['registration'])) {
1462
-    			$data['registration'] = $line['registration'];
1463
-    			//if (isset($line['aircraft'])) $data['id'] = $line['aircraft'];
1464
-    		    } else $data['registration'] = $line['aircraft'];
1465
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1466
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1467
-		    if (isset($line['aircraftname'])) {
1435
+				$data = array();
1436
+				//$data['id'] = $line['id']; // id not usable
1437
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1438
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1439
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1440
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1441
+				$data['ident'] = $line['flightnum']; // ident
1442
+				$data['altitude'] = $line['alt']; // altitude
1443
+				$data['speed'] = $line['gs']; // speed
1444
+				$data['heading'] = $line['heading']; // heading
1445
+				$data['latitude'] = $line['lat']; // lat
1446
+				$data['longitude'] = $line['lng']; // long
1447
+				$data['verticalrate'] = ''; // verticale rate
1448
+				$data['squawk'] = ''; // squawk
1449
+				$data['emergency'] = ''; // emergency
1450
+				//$data['datetime'] = $line['lastupdate'];
1451
+				//$data['last_update'] = $line['lastupdate'];
1452
+				if (isset($value['timezone'])) {
1453
+				$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1454
+				$datetime->setTimeZone(new DateTimeZone('UTC'));
1455
+				$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1456
+				} else $data['datetime'] = date('Y-m-d H:i:s');
1457
+				$data['departure_airport_icao'] = $line['depicao'];
1458
+				$data['departure_airport_time'] = $line['deptime'];
1459
+				$data['arrival_airport_icao'] = $line['arricao'];
1460
+				$data['arrival_airport_time'] = $line['arrtime'];
1461
+				if (isset($line['registration'])) {
1462
+				$data['registration'] = $line['registration'];
1463
+				//if (isset($line['aircraft'])) $data['id'] = $line['aircraft'];
1464
+				} else $data['registration'] = $line['aircraft'];
1465
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1466
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1467
+			if (isset($line['aircraftname'])) {
1468 1468
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
1469 1469
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
1470
-	    		$aircraft_data = explode('-',$line['aircraftname']);
1471
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1472
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1473
-	    		else {
1474
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
1475
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1476
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1477
-	    		}
1478
-	    	    }
1479
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
1480
-    		    $data['id_source'] = $id_source;
1481
-	    	    $data['format_source'] = 'phpvmacars';
1482
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1483
-		    $SI->add($data);
1484
-		    unset($data);
1470
+				$aircraft_data = explode('-',$line['aircraftname']);
1471
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1472
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1473
+				else {
1474
+					$aircraft_data = explode(' ',$line['aircraftname']);
1475
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1476
+					else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1477
+				}
1478
+				}
1479
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
1480
+				$data['id_source'] = $id_source;
1481
+				$data['format_source'] = 'phpvmacars';
1482
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1483
+			$SI->add($data);
1484
+			unset($data);
1485 1485
 		}
1486 1486
 		if ($globalDebug) echo 'No more data...'."\n";
1487 1487
 		unset($buffer);
1488 1488
 		unset($all_data);
1489
-	    }
1490
-	    //$last_exec['phpvmacars'] = time();
1491
-	    $last_exec[$id]['last'] = time();
1489
+		}
1490
+		//$last_exec['phpvmacars'] = time();
1491
+		$last_exec[$id]['last'] = time();
1492 1492
 	} elseif ($value['format'] === 'vaos' && 
1493
-	    (
1493
+		(
1494 1494
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1495 1495
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1496
-	    )
1496
+		)
1497 1497
 	) {
1498
-	    //$buffer = $Common->getData($hosts[$id]);
1499
-	    if ($globalDebug) echo 'Get Data...'."\n";
1500
-	    $buffer = $Common->getData($value['host']);
1501
-	    $all_data = json_decode($buffer,true);
1502
-	    if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
1498
+		//$buffer = $Common->getData($hosts[$id]);
1499
+		if ($globalDebug) echo 'Get Data...'."\n";
1500
+		$buffer = $Common->getData($value['host']);
1501
+		$all_data = json_decode($buffer,true);
1502
+		if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
1503 1503
 		$reset = 0;
1504 1504
 		foreach ($all_data['ACARSData'] as $line) {
1505
-		    //print_r($line);
1506
-	    	    $data = array();
1507
-	    	    //$data['id'] = $line['id']; // id not usable
1508
-	    	    $data['id'] = $line['id'];
1509
-	    	    //$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1510
-	    	    if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
1511
-	    	    if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
1512
-	    	    $data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
1513
-	    	    if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
1514
-	    	    $data['altitude'] = $line['altitude']; // altitude
1515
-	    	    $data['speed'] = $line['groundspeed']; // speed
1516
-	    	    $data['heading'] = $line['heading']; // heading
1517
-	    	    $data['latitude'] = $line['lat']; // lat
1518
-	    	    $data['longitude'] = $line['lon']; // long
1519
-	    	    //$data['verticalrate'] = ''; // verticale rate
1520
-	    	    //$data['squawk'] = ''; // squawk
1521
-	    	    //$data['emergency'] = ''; // emergency
1522
-	    	    if (isset($value['timezone'])) {
1523
-	    		$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
1524
-	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1525
-	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1526
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
1505
+			//print_r($line);
1506
+				$data = array();
1507
+				//$data['id'] = $line['id']; // id not usable
1508
+				$data['id'] = $line['id'];
1509
+				//$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1510
+				if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
1511
+				if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
1512
+				$data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
1513
+				if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
1514
+				$data['altitude'] = $line['altitude']; // altitude
1515
+				$data['speed'] = $line['groundspeed']; // speed
1516
+				$data['heading'] = $line['heading']; // heading
1517
+				$data['latitude'] = $line['lat']; // lat
1518
+				$data['longitude'] = $line['lon']; // long
1519
+				//$data['verticalrate'] = ''; // verticale rate
1520
+				//$data['squawk'] = ''; // squawk
1521
+				//$data['emergency'] = ''; // emergency
1522
+				if (isset($value['timezone'])) {
1523
+				$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
1524
+				$datetime->setTimeZone(new DateTimeZone('UTC'));
1525
+				$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1526
+				} else $data['datetime'] = date('Y-m-d H:i:s');
1527 1527
 	    	    
1528
-	    	    $data['departure_airport_icao'] = $line['bid']['depapt']['icao'];
1529
-	    	    $data['departure_airport_time'] = $line['bid']['deptime'];
1530
-	    	    $data['arrival_airport_icao'] = $line['bid']['arrapt']['icao'];
1531
-		    $data['arrival_airport_time'] = $line['bid']['arrtime'];
1532
-		    $data['registration'] = $line['bid']['aircraft']['registration'];
1528
+				$data['departure_airport_icao'] = $line['bid']['depapt']['icao'];
1529
+				$data['departure_airport_time'] = $line['bid']['deptime'];
1530
+				$data['arrival_airport_icao'] = $line['bid']['arrapt']['icao'];
1531
+			$data['arrival_airport_time'] = $line['bid']['arrtime'];
1532
+			$data['registration'] = $line['bid']['aircraft']['registration'];
1533 1533
 
1534
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1535
-		    if (isset($line['bid']['route']) && $line['bid']['route'] != '') $data['waypoints'] = $line['bid']['route']; // route
1536
-	    	    $data['aircraft_icao'] = $line['bid']['aircraft']['icao'];
1534
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1535
+			if (isset($line['bid']['route']) && $line['bid']['route'] != '') $data['waypoints'] = $line['bid']['route']; // route
1536
+				$data['aircraft_icao'] = $line['bid']['aircraft']['icao'];
1537 1537
 
1538
-    		    $data['id_source'] = $id_source;
1539
-	    	    $data['format_source'] = 'vaos';
1540
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1541
-		    $SI->add($data);
1542
-		    unset($data);
1538
+				$data['id_source'] = $id_source;
1539
+				$data['format_source'] = 'vaos';
1540
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1541
+			$SI->add($data);
1542
+			unset($data);
1543 1543
 		}
1544 1544
 		if ($globalDebug) echo 'No more data...'."\n";
1545 1545
 		unset($buffer);
1546 1546
 		unset($all_data);
1547
-	    }
1548
-	    //$last_exec['phpvmacars'] = time();
1549
-	    $last_exec[$id]['last'] = time();
1547
+		}
1548
+		//$last_exec['phpvmacars'] = time();
1549
+		$last_exec[$id]['last'] = time();
1550 1550
 	} elseif ($value['format'] === 'vam' && 
1551
-	    (
1551
+		(
1552 1552
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1553 1553
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1554
-	    )
1554
+		)
1555 1555
 	) {
1556
-	    //$buffer = $Common->getData($hosts[$id]);
1557
-	    if ($globalDebug) echo 'Get Data...'."\n";
1558
-	    $buffer = $Common->getData($value['host']);
1559
-	    $all_data = json_decode($buffer,true);
1560
-	    if ($buffer != '' && is_array($all_data)) {
1556
+		//$buffer = $Common->getData($hosts[$id]);
1557
+		if ($globalDebug) echo 'Get Data...'."\n";
1558
+		$buffer = $Common->getData($value['host']);
1559
+		$all_data = json_decode($buffer,true);
1560
+		if ($buffer != '' && is_array($all_data)) {
1561 1561
 		$reset = 0;
1562 1562
 		foreach ($all_data as $line) {
1563
-	    	    $data = array();
1564
-	    	    //$data['id'] = $line['id']; // id not usable
1565
-	    	    $data['id'] = trim($line['flight_id']);
1566
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1567
-	    	    $data['pilot_name'] = $line['pilot_name'];
1568
-	    	    $data['pilot_id'] = $line['pilot_id'];
1569
-	    	    $data['ident'] = trim($line['callsign']); // ident
1570
-	    	    $data['altitude'] = $line['altitude']; // altitude
1571
-	    	    $data['speed'] = $line['gs']; // speed
1572
-	    	    $data['heading'] = $line['heading']; // heading
1573
-	    	    $data['latitude'] = $line['latitude']; // lat
1574
-	    	    $data['longitude'] = $line['longitude']; // long
1575
-	    	    $data['verticalrate'] = ''; // verticale rate
1576
-	    	    $data['squawk'] = ''; // squawk
1577
-	    	    $data['emergency'] = ''; // emergency
1578
-	    	    //$data['datetime'] = $line['lastupdate'];
1579
-	    	    $data['last_update'] = $line['last_update'];
1580
-		    $data['datetime'] = date('Y-m-d H:i:s');
1581
-	    	    $data['departure_airport_icao'] = $line['departure'];
1582
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
1583
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
1584
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
1585
-    		    //$data['registration'] = $line['aircraft'];
1586
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1587
-	    	    $data['aircraft_icao'] = $line['plane_type'];
1588
-    		    $data['id_source'] = $id_source;
1589
-	    	    $data['format_source'] = 'vam';
1590
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1591
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1592
-		    $SI->add($data);
1593
-		    unset($data);
1563
+				$data = array();
1564
+				//$data['id'] = $line['id']; // id not usable
1565
+				$data['id'] = trim($line['flight_id']);
1566
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1567
+				$data['pilot_name'] = $line['pilot_name'];
1568
+				$data['pilot_id'] = $line['pilot_id'];
1569
+				$data['ident'] = trim($line['callsign']); // ident
1570
+				$data['altitude'] = $line['altitude']; // altitude
1571
+				$data['speed'] = $line['gs']; // speed
1572
+				$data['heading'] = $line['heading']; // heading
1573
+				$data['latitude'] = $line['latitude']; // lat
1574
+				$data['longitude'] = $line['longitude']; // long
1575
+				$data['verticalrate'] = ''; // verticale rate
1576
+				$data['squawk'] = ''; // squawk
1577
+				$data['emergency'] = ''; // emergency
1578
+				//$data['datetime'] = $line['lastupdate'];
1579
+				$data['last_update'] = $line['last_update'];
1580
+			$data['datetime'] = date('Y-m-d H:i:s');
1581
+				$data['departure_airport_icao'] = $line['departure'];
1582
+				//$data['departure_airport_time'] = $line['departure_time'];
1583
+				$data['arrival_airport_icao'] = $line['arrival'];
1584
+				//$data['arrival_airport_time'] = $line['arrival_time'];
1585
+				//$data['registration'] = $line['aircraft'];
1586
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1587
+				$data['aircraft_icao'] = $line['plane_type'];
1588
+				$data['id_source'] = $id_source;
1589
+				$data['format_source'] = 'vam';
1590
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1591
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1592
+			$SI->add($data);
1593
+			unset($data);
1594 1594
 		}
1595 1595
 		if ($globalDebug) echo 'No more data...'."\n";
1596 1596
 		unset($buffer);
1597 1597
 		unset($all_data);
1598
-	    }
1599
-	    //$last_exec['phpvmacars'] = time();
1600
-	    $last_exec[$id]['last'] = time();
1598
+		}
1599
+		//$last_exec['phpvmacars'] = time();
1600
+		$last_exec[$id]['last'] = time();
1601 1601
 	} elseif ($value['format'] === 'blitzortung' && 
1602
-	    (
1602
+		(
1603 1603
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1604 1604
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1605
-	    )
1605
+		)
1606 1606
 	) {
1607
-	    //$buffer = $Common->getData($hosts[$id]);
1608
-	    if ($globalDebug) echo 'Get Data...'."\n";
1609
-	    $buffer = $Common->getData($value['host']);
1610
-	    $all_data = json_decode($buffer,true);
1611
-	    if ($buffer != '') {
1607
+		//$buffer = $Common->getData($hosts[$id]);
1608
+		if ($globalDebug) echo 'Get Data...'."\n";
1609
+		$buffer = $Common->getData($value['host']);
1610
+		$all_data = json_decode($buffer,true);
1611
+		if ($buffer != '') {
1612 1612
 		$Source->deleteLocationBySource('blitzortung');
1613 1613
 		$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
1614 1614
 		$buffer = explode('\n',$buffer);
1615 1615
 		foreach ($buffer as $buffer_line) {
1616
-		    $line = json_decode($buffer_line,true);
1617
-		    if (isset($line['time'])) {
1616
+			$line = json_decode($buffer_line,true);
1617
+			if (isset($line['time'])) {
1618 1618
 			$data = array();
1619 1619
 			$data['altitude'] = $line['alt']; // altitude
1620 1620
 			$data['latitude'] = $line['lat']; // lat
@@ -1626,92 +1626,92 @@  discard block
 block discarded – undo
1626 1626
 			if ($globalDebug) echo '☈ Lightning added'."\n";
1627 1627
 			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
1628 1628
 			unset($data);
1629
-		    }
1629
+			}
1630 1630
 		}
1631 1631
 		if ($globalDebug) echo 'No more data...'."\n";
1632 1632
 		unset($buffer);
1633
-	    }
1634
-	    $last_exec[$id]['last'] = time();
1633
+		}
1634
+		$last_exec[$id]['last'] = time();
1635 1635
 	} elseif ($value['format'] === 'acarsjson') {
1636
-        $arr = $httpfeeds;
1637
-        $w = $e = null;
1638
-        if (isset($arr[$id])) {
1639
-            $nn = stream_select($arr,$w,$e,$timeout);
1640
-            if ($nn > 0) {
1641
-                foreach ($httpfeeds as $feed) {
1642
-                    $buffer = stream_get_line($feed,2000,"\n");
1643
-                    if ($buffer === FALSE) {
1644
-                        connect_all($globalSources);
1645
-                    }
1646
-                    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
1647
-                    $buffer = explode('\n',$buffer);
1648
-                    foreach ($buffer as $line) {
1649
-                        if ($line != '') {
1650
-                            $line = json_decode($line, true);
1651
-                            if (!empty($line)) {
1652
-                                $ACARS->add(isset($line['text']) ? $line['text'] : '', array('registration' => str_replace('.', '', $line['tail']), 'ident' => $line['flight'], 'label' => $line['label'], 'block_id' => $line['block_id'], 'msg_no' => $line['msgno'], 'message' => (isset($line['text']) ? $line['text'] : '')));
1653
-                                $ACARS->deleteLiveAcarsData();
1654
-                            }
1655
-                        }
1656
-                    }
1657
-                }
1658
-            } else {
1659
-                $format = $value['format'];
1660
-                if (isset($tt[$format])) $tt[$format]++;
1661
-                else $tt[$format] = 0;
1662
-                if ($tt[$format] > 30) {
1663
-                    if ($globalDebug) echo 'Reconnect...'."\n";
1664
-                    sleep(2);
1665
-                    //$sourceeen[] = $value;
1666
-                    //connect_all($sourceeen);
1667
-                    //$sourceeen = array();
1668
-                    connect_all($globalSources);
1669
-                }
1670
-            }
1671
-        }
1636
+		$arr = $httpfeeds;
1637
+		$w = $e = null;
1638
+		if (isset($arr[$id])) {
1639
+			$nn = stream_select($arr,$w,$e,$timeout);
1640
+			if ($nn > 0) {
1641
+				foreach ($httpfeeds as $feed) {
1642
+					$buffer = stream_get_line($feed,2000,"\n");
1643
+					if ($buffer === FALSE) {
1644
+						connect_all($globalSources);
1645
+					}
1646
+					$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
1647
+					$buffer = explode('\n',$buffer);
1648
+					foreach ($buffer as $line) {
1649
+						if ($line != '') {
1650
+							$line = json_decode($line, true);
1651
+							if (!empty($line)) {
1652
+								$ACARS->add(isset($line['text']) ? $line['text'] : '', array('registration' => str_replace('.', '', $line['tail']), 'ident' => $line['flight'], 'label' => $line['label'], 'block_id' => $line['block_id'], 'msg_no' => $line['msgno'], 'message' => (isset($line['text']) ? $line['text'] : '')));
1653
+								$ACARS->deleteLiveAcarsData();
1654
+							}
1655
+						}
1656
+					}
1657
+				}
1658
+			} else {
1659
+				$format = $value['format'];
1660
+				if (isset($tt[$format])) $tt[$format]++;
1661
+				else $tt[$format] = 0;
1662
+				if ($tt[$format] > 30) {
1663
+					if ($globalDebug) echo 'Reconnect...'."\n";
1664
+					sleep(2);
1665
+					//$sourceeen[] = $value;
1666
+					//connect_all($sourceeen);
1667
+					//$sourceeen = array();
1668
+					connect_all($globalSources);
1669
+				}
1670
+			}
1671
+		}
1672 1672
 	//} elseif ($value === 'sbs' || $value === 'tsv' || $value === 'raw' || $value === 'aprs' || $value === 'beast') {
1673 1673
 	} elseif ($value['format'] === 'sbs' || $value['format'] === 'tsv' || $value['format'] === 'raw' || $value['format'] === 'aprs' || $value['format'] === 'famaprs' || $value['format'] === 'beast' || $value['format'] === 'flightgearmp' || $value['format'] === 'flightgearsp' || $value['format'] === 'acars' || $value['format'] === 'acarsjsonudp' || $value['format'] === 'acarssbs3' || $value['format'] === 'ais' || $value['format'] === 'vrstcp') {
1674
-	    //$last_exec[$id]['last'] = time();
1675
-	    //$read = array( $sockets[$id] );
1676
-	    $read = $sockets;
1677
-	    $write = NULL;
1678
-	    $e = NULL;
1679
-	    $n = socket_select($read, $write, $e, $timeout);
1680
-	    if ($e != NULL) var_dump($e);
1681
-	    if ($n > 0) {
1674
+		//$last_exec[$id]['last'] = time();
1675
+		//$read = array( $sockets[$id] );
1676
+		$read = $sockets;
1677
+		$write = NULL;
1678
+		$e = NULL;
1679
+		$n = socket_select($read, $write, $e, $timeout);
1680
+		if ($e != NULL) var_dump($e);
1681
+		if ($n > 0) {
1682 1682
 		$reset = 0;
1683 1683
 		foreach ($read as $nb => $r) {
1684
-		    //$value = $formats[$nb];
1685
-		    $format = $globalSources[$nb]['format'];
1686
-		    if ($format === 'sbs' || $format === 'aprs' || $format === 'famaprs' || $format === 'raw' || $format === 'tsv' || $format === 'acarssbs3') {
1684
+			//$value = $formats[$nb];
1685
+			$format = $globalSources[$nb]['format'];
1686
+			if ($format === 'sbs' || $format === 'aprs' || $format === 'famaprs' || $format === 'raw' || $format === 'tsv' || $format === 'acarssbs3') {
1687 1687
 			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1688
-		    } elseif ($format === 'vrstcp') {
1688
+			} elseif ($format === 'vrstcp') {
1689 1689
 			$buffer = @socket_read($r, 6000);
1690
-		    } else {
1690
+			} else {
1691 1691
 			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1692
-		    }
1693
-		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1694
-		    //echo $buffer."\n";
1695
-		    // lets play nice and handle signals such as ctrl-c/kill properly
1696
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1697
-		    $error = false;
1698
-		    //$SI::del();
1699
-		    if ($buffer !== FALSE) {
1692
+			}
1693
+			//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1694
+			//echo $buffer."\n";
1695
+			// lets play nice and handle signals such as ctrl-c/kill properly
1696
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1697
+			$error = false;
1698
+			//$SI::del();
1699
+			if ($buffer !== FALSE) {
1700 1700
 			if ($format === 'vrstcp') {
1701
-			    $buffer = explode('},{',$buffer);
1701
+				$buffer = explode('},{',$buffer);
1702 1702
 			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1703
-		    }
1704
-		    // SBS format is CSV format
1705
-		    if ($buffer !== FALSE && $buffer !== '') {
1703
+			}
1704
+			// SBS format is CSV format
1705
+			if ($buffer !== FALSE && $buffer !== '') {
1706 1706
 			$tt[$format] = 0;
1707 1707
 			if ($format === 'acarssbs3') {
1708
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1709
-			    $ACARS->add(trim($buffer));
1710
-			    $ACARS->deleteLiveAcarsData();
1708
+				if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1709
+				$ACARS->add(trim($buffer));
1710
+				$ACARS->deleteLiveAcarsData();
1711 1711
 			} elseif ($format === 'raw') {
1712
-			    // AVR format
1713
-			    $data = $SBS->parse($buffer);
1714
-			    if (is_array($data)) {
1712
+				// AVR format
1713
+				$data = $SBS->parse($buffer);
1714
+				if (is_array($data)) {
1715 1715
 				//if (!empty($data)) print_r($data);
1716 1716
 				$data['datetime'] = date('Y-m-d H:i:s');
1717 1717
 				$data['format_source'] = 'raw';
@@ -1721,39 +1721,39 @@  discard block
 block discarded – undo
1721 1721
 				//if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1722 1722
 				$SI->add($data);
1723 1723
 				unset($data);
1724
-			    }
1724
+				}
1725 1725
 			} elseif ($format === 'ais') {
1726
-			    $ais_data = $AIS->parse_line(trim($buffer));
1727
-			    $data = array();
1728
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1729
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
1730
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1731
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1732
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1733
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1734
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1735
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1736
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1737
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1738
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1739
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1740
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1741
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1742
-			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1743
-			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1726
+				$ais_data = $AIS->parse_line(trim($buffer));
1727
+				$data = array();
1728
+				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1729
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
1730
+				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1731
+				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1732
+				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1733
+				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1734
+				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1735
+				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1736
+				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1737
+				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1738
+				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1739
+				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1740
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1741
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1742
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1743
+				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1744 1744
 
1745
-			    if (isset($ais_data['timestamp'])) {
1745
+				if (isset($ais_data['timestamp'])) {
1746 1746
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1747
-			    } else {
1747
+				} else {
1748 1748
 				$data['datetime'] = date('Y-m-d H:i:s');
1749
-			    }
1750
-			    $data['format_source'] = 'aisnmea';
1751
-    			    $data['id_source'] = $id_source;
1752
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
1753
-			    unset($data);
1754
-                        } elseif ($format === 'flightgearsp') {
1755
-                    	    //echo $buffer."\n";
1756
-                    	    if (strlen($buffer) > 5) {
1749
+				}
1750
+				$data['format_source'] = 'aisnmea';
1751
+					$data['id_source'] = $id_source;
1752
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
1753
+				unset($data);
1754
+						} elseif ($format === 'flightgearsp') {
1755
+							//echo $buffer."\n";
1756
+							if (strlen($buffer) > 5) {
1757 1757
 				$line = explode(',',$buffer);
1758 1758
 				$data = array();
1759 1759
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -1770,47 +1770,47 @@  discard block
 block discarded – undo
1770 1770
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1771 1771
 				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1772 1772
 				//$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1773
-			    }
1774
-                        } elseif ($format === 'acars') {
1775
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1776
-			    $ACARS->add(trim($buffer));
1777
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1778
-			    $ACARS->deleteLiveAcarsData();
1773
+				}
1774
+						} elseif ($format === 'acars') {
1775
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1776
+				$ACARS->add(trim($buffer));
1777
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1778
+				$ACARS->deleteLiveAcarsData();
1779 1779
 			} elseif ($format === 'acarsjsonudp') {
1780
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1781
-                            $line = json_decode(trim($buffer), true);
1782
-                            if (!empty($line)) {
1780
+				if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1781
+							$line = json_decode(trim($buffer), true);
1782
+							if (!empty($line)) {
1783 1783
 				$line = array_merge(array('text' => '','tail' => '','label' => '','block_id' => '','flight' => '','msgno' => ''),$line);
1784
-                                $ACARS->add(isset($line['text']) ? $line['text'] : '', array('registration' => str_replace('.', '', $line['tail']), 'ident' => $line['flight'], 'label' => $line['label'], 'block_id' => $line['block_id'], 'msg_no' => $line['msgno'], 'message' => (isset($line['text']) ? $line['text'] : '')));
1785
-                                $ACARS->deleteLiveAcarsData();
1786
-                            }
1787
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1784
+								$ACARS->add(isset($line['text']) ? $line['text'] : '', array('registration' => str_replace('.', '', $line['tail']), 'ident' => $line['flight'], 'label' => $line['label'], 'block_id' => $line['block_id'], 'msg_no' => $line['msgno'], 'message' => (isset($line['text']) ? $line['text'] : '')));
1785
+								$ACARS->deleteLiveAcarsData();
1786
+							}
1787
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1788 1788
 			} elseif ($format === 'flightgearmp') {
1789
-			    if (substr($buffer,0,1) != '#') {
1789
+				if (substr($buffer,0,1) != '#') {
1790 1790
 				$data = array();
1791 1791
 				//echo $buffer."\n";
1792 1792
 				$line = explode(' ',$buffer);
1793 1793
 				if (count($line) === 11) {
1794
-				    $userserver = explode('@',$line[0]);
1795
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1796
-				    $data['ident'] = $userserver[0];
1797
-				    $data['registration'] = $userserver[0];
1798
-				    $data['latitude'] = $line[4];
1799
-				    $data['longitude'] = $line[5];
1800
-				    $data['altitude'] = $line[6];
1801
-				    $data['datetime'] = date('Y-m-d H:i:s');
1802
-				    $aircraft_type = $line[10];
1803
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1804
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1805
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1806
-				    if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1794
+					$userserver = explode('@',$line[0]);
1795
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1796
+					$data['ident'] = $userserver[0];
1797
+					$data['registration'] = $userserver[0];
1798
+					$data['latitude'] = $line[4];
1799
+					$data['longitude'] = $line[5];
1800
+					$data['altitude'] = $line[6];
1801
+					$data['datetime'] = date('Y-m-d H:i:s');
1802
+					$aircraft_type = $line[10];
1803
+					$aircraft_type = preg_split(':/:',$aircraft_type);
1804
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1805
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1806
+					if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1807
+				}
1807 1808
 				}
1808
-			    }
1809 1809
 			} elseif ($format === 'beast') {
1810
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1811
-			    die;
1810
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1811
+				die;
1812 1812
 			} elseif ($format === 'vrstcp') {
1813
-			    foreach($buffer as $all_data) {
1813
+				foreach($buffer as $all_data) {
1814 1814
 				$line = json_decode('{'.$all_data.'}',true);
1815 1815
 				$data = array();
1816 1816
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
@@ -1830,158 +1830,158 @@  discard block
 block discarded – undo
1830 1830
 				*/
1831 1831
 				$data['datetime'] = date('Y-m-d H:i:s');
1832 1832
 				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1833
-		    		$data['format_source'] = 'vrstcp';
1833
+					$data['format_source'] = 'vrstcp';
1834 1834
 				$data['id_source'] = $id_source;
1835 1835
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1836 1836
 				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1837 1837
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1838 1838
 				unset($data);
1839
-			    }
1839
+				}
1840 1840
 			} elseif ($format === 'tsv' || substr($buffer,0,4) === 'clock') {
1841
-			    $line = explode("\t", $buffer);
1842
-			    for($k = 0; $k < count($line); $k=$k+2) {
1841
+				$line = explode("\t", $buffer);
1842
+				for($k = 0; $k < count($line); $k=$k+2) {
1843 1843
 				$key = $line[$k];
1844
-			        $lined[$key] = $line[$k+1];
1845
-			    }
1846
-    			    if (count($lined) > 3) {
1847
-    				$data['hex'] = $lined['hexid'];
1848
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1849
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1850
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1851
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1852
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1853
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1854
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1855
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1856
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1857
-    				$data['id_source'] = $id_source;
1858
-    				$data['format_source'] = 'tsv';
1859
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1860
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1844
+					$lined[$key] = $line[$k+1];
1845
+				}
1846
+					if (count($lined) > 3) {
1847
+					$data['hex'] = $lined['hexid'];
1848
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1849
+					$data['datetime'] = date('Y-m-d H:i:s');;
1850
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1851
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1852
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1853
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1854
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1855
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1856
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1857
+					$data['id_source'] = $id_source;
1858
+					$data['format_source'] = 'tsv';
1859
+					if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1860
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1861 1861
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1862
-    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1863
-    				unset($lined);
1864
-    				unset($data);
1865
-    			    } else $error = true;
1862
+					if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1863
+					unset($lined);
1864
+					unset($data);
1865
+					} else $error = true;
1866 1866
 			} elseif ($format === 'aprs' && $use_aprs) {
1867
-			    if ($aprs_connect === 0) {
1867
+				if ($aprs_connect === 0) {
1868 1868
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1869 1869
 				$aprs_connect = 1;
1870
-			    }
1870
+				}
1871 1871
 			    
1872
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1872
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1873 1873
 				$aprs_last_tx = time();
1874 1874
 				$data_aprs = "# Keep alive";
1875 1875
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1876
-			    }
1876
+				}
1877 1877
 			    
1878
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1879
-			    //echo 'APRS data : '.$buffer."\n";
1880
-			    $buffer = str_replace('APRS <- ','',$buffer);
1881
-			    $buffer = str_replace('APRS -> ','',$buffer);
1882
-			    //echo $buffer."\n";
1883
-			    date_default_timezone_set('UTC');
1884
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1878
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1879
+				//echo 'APRS data : '.$buffer."\n";
1880
+				$buffer = str_replace('APRS <- ','',$buffer);
1881
+				$buffer = str_replace('APRS -> ','',$buffer);
1882
+				//echo $buffer."\n";
1883
+				date_default_timezone_set('UTC');
1884
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1885 1885
 				$line = $APRS->parse($buffer);
1886 1886
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1887 1887
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
1888
-				    $aprs_last_tx = time();
1889
-				    $data = array();
1890
-				    //print_r($line);
1891
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1892
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1893
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
1894
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1895
-				    if (isset($line['arrival_code'])) $data['arrival_code'] = $line['arrival_code'];
1896
-				    if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
1897
-				    if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
1898
-				    if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
1899
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1900
-				    else $data['datetime'] = date('Y-m-d H:i:s');
1901
-				    //$data['datetime'] = date('Y-m-d H:i:s');
1902
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
1903
-				    $data['latitude'] = $line['latitude'];
1904
-				    $data['longitude'] = $line['longitude'];
1905
-				    //$data['verticalrate'] = $line[16];
1906
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
1907
-				    //else $data['speed'] = 0;
1908
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1909
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1910
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1911
-				    //if (isset($line['heading'])) $data['heading'] = $line['heading'];
1888
+					$aprs_last_tx = time();
1889
+					$data = array();
1890
+					//print_r($line);
1891
+					if (isset($line['address'])) $data['hex'] = $line['address'];
1892
+					if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1893
+					if (isset($line['imo'])) $data['imo'] = $line['imo'];
1894
+					if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1895
+					if (isset($line['arrival_code'])) $data['arrival_code'] = $line['arrival_code'];
1896
+					if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
1897
+					if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
1898
+					if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
1899
+					if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1900
+					else $data['datetime'] = date('Y-m-d H:i:s');
1901
+					//$data['datetime'] = date('Y-m-d H:i:s');
1902
+					if (isset($line['ident'])) $data['ident'] = $line['ident'];
1903
+					$data['latitude'] = $line['latitude'];
1904
+					$data['longitude'] = $line['longitude'];
1905
+					//$data['verticalrate'] = $line[16];
1906
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
1907
+					//else $data['speed'] = 0;
1908
+					if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1909
+					if (isset($line['comment'])) $data['comment'] = $line['comment'];
1910
+					if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1911
+					//if (isset($line['heading'])) $data['heading'] = $line['heading'];
1912 1912
 				    
1913
-				    if (isset($line['heading']) && isset($line['format_source'])) $data['heading'] = $line['heading'];
1914
-				    //else echo 'No heading...'."\n";
1915
-				    //else $data['heading'] = 0;
1916
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1917
-				    //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1918
-				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
1919
-				    elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
1920
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1921
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1922
-    				    $data['id_source'] = $id_source;
1923
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1924
-				    else $data['format_source'] = 'aprs';
1925
-				    $data['source_name'] = $line['source'];
1926
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1927
-				    else $data['source_type'] = 'flarm';
1928
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1929
-				    $currentdate = date('Y-m-d H:i:s');
1930
-				    $aprsdate = strtotime($data['datetime']);
1931
-				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
1932
-				    // Accept data if time <= system time + 20s
1933
-				    //if (($data['source_type'] === 'modes') || isset($line['stealth']) && ($line['stealth'] === 0 || $line['stealth'] === '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1934
-				    if (
1913
+					if (isset($line['heading']) && isset($line['format_source'])) $data['heading'] = $line['heading'];
1914
+					//else echo 'No heading...'."\n";
1915
+					//else $data['heading'] = 0;
1916
+					if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1917
+					//if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1918
+					if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
1919
+					elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
1920
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1921
+					elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1922
+						$data['id_source'] = $id_source;
1923
+						if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1924
+					else $data['format_source'] = 'aprs';
1925
+					$data['source_name'] = $line['source'];
1926
+					if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1927
+					else $data['source_type'] = 'flarm';
1928
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1929
+					$currentdate = date('Y-m-d H:i:s');
1930
+					$aprsdate = strtotime($data['datetime']);
1931
+					if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
1932
+					// Accept data if time <= system time + 20s
1933
+					//if (($data['source_type'] === 'modes') || isset($line['stealth']) && ($line['stealth'] === 0 || $line['stealth'] === '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1934
+					if (
1935 1935
 					($data['source_type'] === 'modes') || 
1936 1936
 					isset($line['stealth']) && 
1937 1937
 					(!isset($data['hex']) || $data['hex'] != 'FFFFFF') && 
1938 1938
 					 ($line['stealth'] === 0 || $line['stealth'] == '') && 
1939 1939
 					 (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1940 1940
 					$send = $SI->add($data);
1941
-				    } elseif ($data['source_type'] === 'ais') {
1941
+					} elseif ($data['source_type'] === 'ais') {
1942 1942
 					$data['type'] = '';
1943 1943
 					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
1944
-				    } elseif (isset($line['stealth']) && $line['stealth'] != 0) {
1944
+					} elseif (isset($line['stealth']) && $line['stealth'] != 0) {
1945 1945
 					 echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1946
-				    } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1947
-					    //$line['symbol'] === 'Balloon' ||
1948
-					    $line['symbol'] === 'Glider' || 
1949
-					    $line['symbol'] === 'No. Plane' || 
1950
-					    $line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter')) {
1951
-					    if ($line['symbol'] === 'Ballon') $data['aircraft_icao'] = 'BALL';
1952
-					    if ($line['symbol'] === 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
1953
-					    $send = $SI->add($data);
1954
-				    } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1955
-					    $line['symbol'] === 'Yacht (Sail)' || 
1956
-					    $line['symbol'] === 'Ship (Power Boat)')) {
1957
-					    $send = $MI->add($data);
1958
-				    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1959
-					    $line['symbol'] === 'Car' || 
1960
-					    $line['symbol'] === 'Ambulance' || 
1961
-					    $line['symbol'] === 'Van' || 
1962
-					    $line['symbol'] === 'Truck' || $line['symbol'] === 'Truck (18 Wheeler)' || 
1963
-					    $line['symbol'] === 'Motorcycle' || 
1964
-					    $line['symbol'] === 'Tractor' || 
1965
-					    $line['symbol'] === 'Police' || 
1966
-					    $line['symbol'] === 'Bike' || 
1967
-					    $line['symbol'] === 'Jogger' || 
1968
-					    $line['symbol'] === 'Horse' || 
1969
-					    $line['symbol'] === 'Bus' || 
1970
-					    $line['symbol'] === 'Jeep' || 
1971
-					    $line['symbol'] === 'Recreational Vehicle' || 
1972
-					    $line['symbol'] === 'Yacht (Sail)' || 
1973
-					    $line['symbol'] === 'Ship (Power Boat)' || 
1974
-					    $line['symbol'] === 'Firetruck' || 
1975
-					    $line['symbol'] === 'Balloon' || $line['symbol'] === 'Glider' || 
1976
-					    $line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter' || 
1977
-					    $line['symbol'] === 'SUV' ||
1978
-					    $line['symbol'] === 'Snowmobile' ||
1979
-					    $line['symbol'] === 'Mobile Satellite Station')) {
1980
-				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1946
+					} elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1947
+						//$line['symbol'] === 'Balloon' ||
1948
+						$line['symbol'] === 'Glider' || 
1949
+						$line['symbol'] === 'No. Plane' || 
1950
+						$line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter')) {
1951
+						if ($line['symbol'] === 'Ballon') $data['aircraft_icao'] = 'BALL';
1952
+						if ($line['symbol'] === 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
1953
+						$send = $SI->add($data);
1954
+					} elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1955
+						$line['symbol'] === 'Yacht (Sail)' || 
1956
+						$line['symbol'] === 'Ship (Power Boat)')) {
1957
+						$send = $MI->add($data);
1958
+					} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1959
+						$line['symbol'] === 'Car' || 
1960
+						$line['symbol'] === 'Ambulance' || 
1961
+						$line['symbol'] === 'Van' || 
1962
+						$line['symbol'] === 'Truck' || $line['symbol'] === 'Truck (18 Wheeler)' || 
1963
+						$line['symbol'] === 'Motorcycle' || 
1964
+						$line['symbol'] === 'Tractor' || 
1965
+						$line['symbol'] === 'Police' || 
1966
+						$line['symbol'] === 'Bike' || 
1967
+						$line['symbol'] === 'Jogger' || 
1968
+						$line['symbol'] === 'Horse' || 
1969
+						$line['symbol'] === 'Bus' || 
1970
+						$line['symbol'] === 'Jeep' || 
1971
+						$line['symbol'] === 'Recreational Vehicle' || 
1972
+						$line['symbol'] === 'Yacht (Sail)' || 
1973
+						$line['symbol'] === 'Ship (Power Boat)' || 
1974
+						$line['symbol'] === 'Firetruck' || 
1975
+						$line['symbol'] === 'Balloon' || $line['symbol'] === 'Glider' || 
1976
+						$line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter' || 
1977
+						$line['symbol'] === 'SUV' ||
1978
+						$line['symbol'] === 'Snowmobile' ||
1979
+						$line['symbol'] === 'Mobile Satellite Station')) {
1980
+					//} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1981 1981
 				//    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1982 1982
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1983 1983
 					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
1984
-				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1984
+					} elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1985 1985
 					if (!isset($data['altitude'])) $data['altitude'] = 0;
1986 1986
 					$Source->deleteOldLocationByType('gs');
1987 1987
 					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
@@ -1989,7 +1989,7 @@  discard block
 block discarded – undo
1989 1989
 					} else {
1990 1990
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1991 1991
 					}
1992
-				    } elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
1992
+					} elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
1993 1993
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1994 1994
 					if ($globalDebug) echo '# Weather Station added'."\n";
1995 1995
 					$Source->deleteOldLocationByType('wx');
@@ -1999,7 +1999,7 @@  discard block
 block discarded – undo
1999 1999
 					} else {
2000 2000
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
2001 2001
 					}
2002
-				    } elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
2002
+					} elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
2003 2003
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
2004 2004
 					if ($globalDebug) echo '☈ Lightning added'."\n";
2005 2005
 					$Source->deleteOldLocationByType('lightning');
@@ -2008,11 +2008,11 @@  discard block
 block discarded – undo
2008 2008
 					} else {
2009 2009
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
2010 2010
 					}
2011
-				    } elseif ($globalDebug) {
2012
-				    	echo '/!\ Not added: '.$buffer."\n";
2013
-				    	print_r($line);
2014
-				    }
2015
-				    unset($data);
2011
+					} elseif ($globalDebug) {
2012
+						echo '/!\ Not added: '.$buffer."\n";
2013
+						print_r($line);
2014
+					}
2015
+					unset($data);
2016 2016
 				}
2017 2017
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
2018 2018
 					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
@@ -2031,13 +2031,13 @@  discard block
 block discarded – undo
2031 2031
 				} elseif (!isset($globalSources[$nb]['last_weather_clean'])) {
2032 2032
 					$globalSources[$nb]['last_weather_clean'] = time();
2033 2033
 				}
2034
-			    }
2034
+				}
2035 2035
 			} else {
2036
-			    $line = explode(',', $buffer);
2037
-			    //print_r($line);
2038
-    			    if (count($line) > 20) {
2039
-    			    	$data['hex'] = $line[4];
2040
-    				/*
2036
+				$line = explode(',', $buffer);
2037
+				//print_r($line);
2038
+					if (count($line) > 20) {
2039
+						$data['hex'] = $line[4];
2040
+					/*
2041 2041
     				$data['datetime'] = $line[6].' '.$line[7];
2042 2042
     					date_default_timezone_set($globalTimezone);
2043 2043
     					$datetime = new DateTime($data['datetime']);
@@ -2045,31 +2045,31 @@  discard block
 block discarded – undo
2045 2045
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
2046 2046
     					date_default_timezone_set('UTC');
2047 2047
     				*/
2048
-    				// Force datetime to current UTC datetime
2049
-    				date_default_timezone_set('UTC');
2050
-    				$data['datetime'] = date('Y-m-d H:i:s');
2051
-    				$data['ident'] = trim($line[10]);
2052
-    				$data['latitude'] = $line[14];
2053
-    				$data['longitude'] = $line[15];
2054
-    				$data['verticalrate'] = $line[16];
2055
-    				$data['emergency'] = $line[20];
2056
-    				$data['speed'] = $line[12];
2057
-    				$data['squawk'] = $line[17];
2058
-    				$data['altitude'] = $line[11];
2059
-    				$data['heading'] = $line[13];
2060
-    				$data['ground'] = $line[21];
2061
-    				$data['emergency'] = $line[19];
2062
-    				$data['format_source'] = 'sbs';
2048
+					// Force datetime to current UTC datetime
2049
+					date_default_timezone_set('UTC');
2050
+					$data['datetime'] = date('Y-m-d H:i:s');
2051
+					$data['ident'] = trim($line[10]);
2052
+					$data['latitude'] = $line[14];
2053
+					$data['longitude'] = $line[15];
2054
+					$data['verticalrate'] = $line[16];
2055
+					$data['emergency'] = $line[20];
2056
+					$data['speed'] = $line[12];
2057
+					$data['squawk'] = $line[17];
2058
+					$data['altitude'] = $line[11];
2059
+					$data['heading'] = $line[13];
2060
+					$data['ground'] = $line[21];
2061
+					$data['emergency'] = $line[19];
2062
+					$data['format_source'] = 'sbs';
2063 2063
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
2064 2064
 				elseif ($line[0] == 'MLAT') $data['source_name'] = 'MLAT';
2065 2065
 				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2066 2066
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
2067
-    				$data['id_source'] = $id_source;
2068
-    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
2069
-    				else $error = true;
2070
-    				unset($data);
2071
-    			    } else $error = true;
2072
-			    if ($error) {
2067
+					$data['id_source'] = $id_source;
2068
+					if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
2069
+					else $error = true;
2070
+					unset($data);
2071
+					} else $error = true;
2072
+				if ($error) {
2073 2073
 				if (count($line) > 1 && ($line[0] === 'STA' || $line[0] === 'AIR' || $line[0] === 'SEL' || $line[0] === 'ID' || $line[0] === 'CLK')) { 
2074 2074
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
2075 2075
 				} else {
@@ -2085,13 +2085,13 @@  discard block
 block discarded – undo
2085 2085
 					connect_all($sourceer);
2086 2086
 					$sourceer = array();
2087 2087
 				}
2088
-			    }
2088
+				}
2089 2089
 			}
2090 2090
 			// Sleep for xxx microseconds
2091 2091
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
2092
-		    } else {
2092
+			} else {
2093 2093
 			if ($format === 'flightgearmp') {
2094
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
2094
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
2095 2095
 				//@socket_close($r);
2096 2096
 				sleep($globalMinFetch);
2097 2097
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -2100,9 +2100,9 @@  discard block
 block discarded – undo
2100 2100
 				break;
2101 2101
 				
2102 2102
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
2103
-			    if (isset($tt[$format])) $tt[$format]++;
2104
-			    else $tt[$format] = 0;
2105
-			    if ($tt[$format] > 30 || $buffer === FALSE) {
2103
+				if (isset($tt[$format])) $tt[$format]++;
2104
+				else $tt[$format] = 0;
2105
+				if ($tt[$format] > 30 || $buffer === FALSE) {
2106 2106
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
2107 2107
 				//@socket_close($r);
2108 2108
 				sleep(2);
@@ -2113,24 +2113,24 @@  discard block
 block discarded – undo
2113 2113
 				//connect_all($globalSources);
2114 2114
 				$tt[$format]=0;
2115 2115
 				break;
2116
-			    } 
2117
-			    //else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
2116
+				} 
2117
+				//else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
2118
+			}
2118 2119
 			}
2119
-		    }
2120 2120
 		}
2121
-	    } else {
2121
+		} else {
2122 2122
 		$error = socket_strerror(socket_last_error());
2123 2123
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
2124 2124
 			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
2125 2125
 			if (isset($globalDebug)) echo "Restarting...\n";
2126 2126
 			// Restart the script if possible
2127 2127
 			if (is_array($sockets)) {
2128
-			    if ($globalDebug) echo "Shutdown all sockets...";
2128
+				if ($globalDebug) echo "Shutdown all sockets...";
2129 2129
 			    
2130
-			    foreach ($sockets as $sock) {
2130
+				foreach ($sockets as $sock) {
2131 2131
 				@socket_shutdown($sock,2);
2132 2132
 				@socket_close($sock);
2133
-			    }
2133
+				}
2134 2134
 			    
2135 2135
 			}
2136 2136
 			if ($globalDebug) echo "Waiting...";
@@ -2145,15 +2145,15 @@  discard block
 block discarded – undo
2145 2145
 			if ($globalDebug) echo "Restart all connections...";
2146 2146
 			connect_all($globalSources);
2147 2147
 		}
2148
-	    }
2148
+		}
2149 2149
 	}
2150 2150
 	if ($globalDaemon === false) {
2151
-	    if ($globalDebug) echo 'Check all...'."\n";
2152
-	    if (isset($SI)) $SI->checkAll();
2153
-	    if (isset($TI)) $TI->checkAll();
2154
-	    if (isset($MI)) $MI->checkAll();
2151
+		if ($globalDebug) echo 'Check all...'."\n";
2152
+		if (isset($SI)) $SI->checkAll();
2153
+		if (isset($TI)) $TI->checkAll();
2154
+		if (isset($MI)) $MI->checkAll();
2155
+	}
2155 2156
 	}
2156
-    }
2157 2157
 }
2158 2158
 
2159 2159
 ?>
Please login to merge, or discard this patch.
Spacing   +225 added lines, -225 removed lines patch added patch discarded remove patch
@@ -59,20 +59,20 @@  discard block
 block discarded – undo
59 59
 	    die;
60 60
 	}
61 61
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
62
-	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
62
+	$globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port);
63 63
     }
64 64
 }
65 65
 
66
-$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver','enable-aircraft','disable-aircraft','enable-tracker','disable-tracker','enable-marine','disable-marine'));
66
+$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver', 'enable-aircraft', 'disable-aircraft', 'enable-tracker', 'disable-tracker', 'enable-marine', 'disable-marine'));
67 67
 //if (isset($options['s'])) $hosts = array($options['s']);
68 68
 //elseif (isset($options['source'])) $hosts = array($options['source']);
69 69
 if (isset($options['s'])) {
70 70
     $globalSources = array();
71
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
71
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']);
72 72
     else $globalSources[] = array('host' => $options['s']);
73 73
 } elseif (isset($options['source'])) {
74 74
     $globalSources = array();
75
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
75
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']);
76 76
     else $globalSources[] = array('host' => $options['source']);
77 77
 }
78 78
 if (isset($options['aprsserverhost'])) {
@@ -113,13 +113,13 @@  discard block
 block discarded – undo
113 113
 else $id_source = 1;
114 114
 if (isset($globalServer) && $globalServer) {
115 115
     if ($globalDebug) echo "Using Server Mode\n";
116
-    $SI=new SpotterServer();
116
+    $SI = new SpotterServer();
117 117
 /*
118 118
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
119 119
     $SI = new adsb2aprs();
120 120
     $SI->connect();
121 121
 */
122
-} else $SI=new SpotterImport($Connection->db);
122
+} else $SI = new SpotterImport($Connection->db);
123 123
 
124 124
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
125 125
 if (isset($globalMarine) && $globalMarine) {
@@ -133,17 +133,17 @@  discard block
 block discarded – undo
133 133
     $MI = new MarineImport($Connection->db);
134 134
 }
135 135
 //$APRS=new APRS($Connection->db);
136
-$SBS=new SBS();
136
+$SBS = new SBS();
137 137
 if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
138
-	$ACARS=new ACARS($Connection->db,true);
139
-	$Source=new Source($Connection->db);
138
+	$ACARS = new ACARS($Connection->db, true);
139
+	$Source = new Source($Connection->db);
140 140
 }
141
-$Common=new Common();
141
+$Common = new Common();
142 142
 date_default_timezone_set('UTC');
143 143
 //$servertz = system('date +%Z');
144 144
 // signal handler - playing nice with sockets and dump1090
145 145
 if (function_exists('pcntl_fork')) {
146
-    pcntl_signal(SIGINT,  function() {
146
+    pcntl_signal(SIGINT, function() {
147 147
         global $sockets;
148 148
         echo "\n\nctrl-c or kill signal received. Tidying up ... ";
149 149
         die("Bye!\n");
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 
160 160
 function connect_all($hosts) {
161 161
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
162
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
162
+    global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context;
163 163
     $reset++;
164 164
     if ($globalDebug) echo 'Connect to all...'."\n";
165 165
     foreach ($hosts as $id => $value) {
@@ -167,33 +167,33 @@  discard block
 block discarded – undo
167 167
 	$udp = false;
168 168
 	$globalSources[$id]['last_exec'] = 0;
169 169
 	// Here we check type of source(s)
170
-	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
171
-            if (preg_match('/deltadb.txt$/i',$host)) {
170
+	if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
171
+            if (preg_match('/deltadb.txt$/i', $host)) {
172 172
         	//$formats[$id] = 'deltadbtxt';
173 173
         	$globalSources[$id]['format'] = 'deltadbtxt';
174 174
         	//$last_exec['deltadbtxt'] = 0;
175 175
         	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
176
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
176
+            } else if (preg_match('/vatsim-data.txt$/i', $host)) {
177 177
         	//$formats[$id] = 'vatsimtxt';
178 178
         	$globalSources[$id]['format'] = 'vatsimtxt';
179 179
         	//$last_exec['vatsimtxt'] = 0;
180 180
         	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
181
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
181
+    	    } else if (preg_match('/aircraftlist.json$/i', $host)) {
182 182
         	//$formats[$id] = 'aircraftlistjson';
183 183
         	$globalSources[$id]['format'] = 'aircraftlistjson';
184 184
         	//$last_exec['aircraftlistjson'] = 0;
185 185
         	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
186
-    	    } else if (preg_match('/aircraft.json$/i',$host)) {
186
+    	    } else if (preg_match('/aircraft.json$/i', $host)) {
187 187
         	//$formats[$id] = 'aircraftjson';
188 188
         	$globalSources[$id]['format'] = 'aircraftjson';
189 189
         	//$last_exec['aircraftlistjson'] = 0;
190 190
         	if ($globalDebug) echo "Connect to aircraft.json source (".$host.")...\n";
191
-    	    } else if (preg_match('/aircraft$/i',$host)) {
191
+    	    } else if (preg_match('/aircraft$/i', $host)) {
192 192
         	//$formats[$id] = 'planefinderclient';
193 193
         	$globalSources[$id]['format'] = 'planefinderclient';
194 194
         	//$last_exec['aircraftlistjson'] = 0;
195 195
         	if ($globalDebug) echo "Connect to planefinderclient source (".$host.")...\n";
196
-    	    } else if (preg_match('/opensky/i',$host)) {
196
+    	    } else if (preg_match('/opensky/i', $host)) {
197 197
         	//$formats[$id] = 'aircraftlistjson';
198 198
         	$globalSources[$id]['format'] = 'opensky';
199 199
         	//$last_exec['aircraftlistjson'] = 0;
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
         	    exit(0);
211 211
         	}
212 212
     	    */
213
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
213
+    	    } else if (preg_match('/planeUpdateFAA.php$/i', $host)) {
214 214
         	//$formats[$id] = 'planeupdatefaa';
215 215
         	$globalSources[$id]['format'] = 'planeupdatefaa';
216 216
         	//$last_exec['planeupdatefaa'] = 0;
@@ -219,37 +219,37 @@  discard block
 block discarded – undo
219 219
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
220 220
         	    exit(0);
221 221
         	}
222
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
222
+            } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) {
223 223
         	//$formats[$id] = 'phpvmacars';
224 224
         	$globalSources[$id]['format'] = 'phpvmacars';
225 225
         	//$last_exec['phpvmacars'] = 0;
226 226
         	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
227
-            } else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
227
+            } else if (preg_match('/\/api\/v1\/acars\/data$/i', $host)) {
228 228
         	//$formats[$id] = 'phpvmacars';
229 229
         	$globalSources[$id]['format'] = 'vaos';
230 230
         	//$last_exec['phpvmacars'] = 0;
231 231
         	if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
232
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
232
+            } else if (preg_match('/VAM-json.php$/i', $host)) {
233 233
         	//$formats[$id] = 'phpvmacars';
234 234
         	$globalSources[$id]['format'] = 'vam';
235 235
         	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
236
-            } else if (preg_match('/whazzup/i',$host)) {
236
+            } else if (preg_match('/whazzup/i', $host)) {
237 237
         	//$formats[$id] = 'whazzup';
238 238
         	$globalSources[$id]['format'] = 'whazzup';
239 239
         	//$last_exec['whazzup'] = 0;
240 240
         	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
241
-            } else if (preg_match('/blitzortung/i',$host)) {
241
+            } else if (preg_match('/blitzortung/i', $host)) {
242 242
         	$globalSources[$id]['format'] = 'blitzortung';
243 243
         	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
244
-            } else if (preg_match('/airwhere/i',$host)) {
244
+            } else if (preg_match('/airwhere/i', $host)) {
245 245
         	$globalSources[$id]['format'] = 'airwhere';
246 246
         	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
247
-            } else if (preg_match('/recentpireps/i',$host)) {
247
+            } else if (preg_match('/recentpireps/i', $host)) {
248 248
         	//$formats[$id] = 'pirepsjson';
249 249
         	$globalSources[$id]['format'] = 'pirepsjson';
250 250
         	//$last_exec['pirepsjson'] = 0;
251 251
         	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
252
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
252
+            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) {
253 253
         	//$formats[$id] = 'fr24json';
254 254
         	$globalSources[$id]['format'] = 'fr24json';
255 255
         	//$last_exec['fr24json'] = 0;
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
259 259
         	    exit(0);
260 260
         	}
261
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
261
+            } else if (preg_match(':myshiptracking.com/:i', $host)) {
262 262
         	//$formats[$id] = 'fr24json';
263 263
         	$globalSources[$id]['format'] = 'myshiptracking';
264 264
         	//$last_exec['fr24json'] = 0;
@@ -268,22 +268,22 @@  discard block
 block discarded – undo
268 268
         	    exit(0);
269 269
         	}
270 270
             //} else if (preg_match('/10001/',$host)) {
271
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
271
+            } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
272 272
         	//$formats[$id] = 'tsv';
273 273
         	$globalSources[$id]['format'] = 'tsv';
274 274
         	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
275 275
             }
276
-        } elseif (filter_var($host,FILTER_VALIDATE_URL) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'acarsjson')) {
276
+        } elseif (filter_var($host, FILTER_VALIDATE_URL) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'acarsjson')) {
277 277
     		if ($globalSources[$id]['format'] == 'aisnmeahttp' || $globalSources[$id]['format'] == 'acarsjson') {
278
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
278
+    		    $idf = fopen($globalSources[$id]['host'], 'r', false, $context);
279 279
     		    if ($idf !== false) {
280 280
     			$httpfeeds[$id] = $idf;
281 281
         		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
282 282
     		    } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
283 283
     		} elseif ($globalDebug && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\n";
284 284
     		elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
285
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
286
-	    $hostport = explode(':',$host);
285
+        } elseif (!filter_var($host, FILTER_VALIDATE_URL)) {
286
+	    $hostport = explode(':', $host);
287 287
 	    if (isset($hostport[1])) {
288 288
 		$port = $hostport[1];
289 289
 		$hostn = $hostport[0];
@@ -293,20 +293,20 @@  discard block
 block discarded – undo
293 293
 	    }
294 294
 	    $Common = new Common();
295 295
 	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acarsjsonudp' && $globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
296
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
296
+        	$s = $Common->create_socket($hostn, $port, $errno, $errstr);
297 297
     	    } else {
298 298
     		$udp = true;
299
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
299
+        	$s = $Common->create_socket_udp($hostn, $port, $errno, $errstr);
300 300
 	    }
301 301
 	    if ($s) {
302 302
     	        $sockets[$id] = $s;
303 303
     	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
304
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
304
+		    if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') {
305 305
 			//$formats[$id] = 'aprs';
306 306
 			$globalSources[$id]['format'] = 'aprs';
307 307
 			//$aprs_connect = 0;
308 308
 			//$use_aprs = true;
309
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
309
+		    } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
310 310
 			$globalSources[$id]['format'] = 'vrstcp';
311 311
     		    } elseif ($port == '10001') {
312 312
         		//$formats[$id] = 'tsv';
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
 else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
349 349
 else $timeout = 20;
350 350
 $errno = '';
351
-$errstr='';
351
+$errstr = '';
352 352
 
353 353
 if (!isset($globalDaemon)) $globalDaemon = TRUE;
354 354
 /* Initiate connections to all the hosts simultaneously */
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 //connect_all($globalSources);
357 357
 
358 358
 if (isset($globalProxy) && $globalProxy) {
359
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
359
+    $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true)));
360 360
 } else {
361 361
     $context = stream_context_create(array('http' => array('timeout' => $timeout)));
362 362
 }
@@ -386,16 +386,16 @@  discard block
 block discarded – undo
386 386
 
387 387
 if ($use_aprs) {
388 388
 	require_once(dirname(__FILE__).'/../require/class.APRS.php');
389
-	$APRS=new APRS();
389
+	$APRS = new APRS();
390 390
 	$aprs_connect = 0;
391 391
 	$aprs_keep = 120;
392 392
 	$aprs_last_tx = time();
393 393
 	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
394
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
394
+	else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
395 395
 	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
396
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
396
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
397 397
 	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
398
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
398
+	else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
399 399
 	if ($aprs_full) $aprs_filter = '';
400 400
 	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
401 401
 	else $aprs_pass = '-1';
@@ -409,12 +409,12 @@  discard block
 block discarded – undo
409 409
 sleep(1);
410 410
 if ($globalDebug) echo "SCAN MODE \n\n";
411 411
 if (!isset($globalCronEnd)) $globalCronEnd = 60;
412
-$endtime = time()+$globalCronEnd;
412
+$endtime = time() + $globalCronEnd;
413 413
 $i = 1;
414 414
 $tt = array();
415 415
 // Delete all ATC
416 416
 if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
417
-	$ATC=new ATC($Connection->db);
417
+	$ATC = new ATC($Connection->db);
418 418
 }
419 419
 if (!$globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
420 420
 	$ATC->deleteAll();
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
424 424
 while ($i > 0) {
425 425
     if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
426 426
 
427
-    if (!$globalDaemon) $i = $endtime-time();
427
+    if (!$globalDaemon) $i = $endtime - time();
428 428
     // Delete old ATC
429 429
     if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
430 430
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 	}
439 439
 	if ($max < $globalMinFetch) {
440 440
 	    if ($globalDebug) echo 'Sleeping...'."\n";
441
-	    sleep($globalMinFetch-$max+2);
441
+	    sleep($globalMinFetch - $max + 2);
442 442
 	}
443 443
     }
444 444
 
@@ -493,10 +493,10 @@  discard block
 block discarded – undo
493 493
             //$buffer = $Common->getData($hosts[$id]);
494 494
             $buffer = $Common->getData($value['host']);
495 495
             if ($buffer != '') {
496
-                $all_data = json_decode($buffer,true);
496
+                $all_data = json_decode($buffer, true);
497 497
                 foreach ($all_data as $line) {
498 498
                     $data = array();
499
-                    $data['datetime'] = date('Y-m-d H:i:s',$line['uti']);
499
+                    $data['datetime'] = date('Y-m-d H:i:s', $line['uti']);
500 500
                     $data['hex'] = $line['hex']; // hex
501 501
                     $data['ident'] = $line['fli']; // ident
502 502
                     $data['altitude'] = $line['alt']; // altitude
@@ -531,11 +531,11 @@  discard block
 block discarded – undo
531 531
 	    )
532 532
 	) {
533 533
 	    date_default_timezone_set('CET');
534
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
534
+	    $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host']));
535 535
 	    date_default_timezone_set('UTC');
536 536
 	    if ($buffer != '') $reset = 0;
537
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
538
-	    $buffer = explode('\n',$buffer);
537
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
538
+	    $buffer = explode('\n', $buffer);
539 539
 	    foreach ($buffer as $line) {
540 540
 		if ($line != '') {
541 541
 		    //echo "'".$line."'\n";
@@ -543,7 +543,7 @@  discard block
 block discarded – undo
543 543
 		    $ais_data = $AIS->parse_line(trim($line));
544 544
 		    $data = array();
545 545
 		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
546
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
546
+		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9);
547 547
 		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
548 548
 		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
549 549
 		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
 		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
556 556
 		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
557 557
 		    if (isset($ais_data['timestamp'])) {
558
-			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
558
+			$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
559 559
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
560 560
 			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
561 561
 			    $add = true;
@@ -578,21 +578,21 @@  discard block
 block discarded – undo
578 578
 	    $w = $e = null;
579 579
 	    
580 580
 	    if (isset($arr[$id])) {
581
-		$nn = stream_select($arr,$w,$e,$timeout);
581
+		$nn = stream_select($arr, $w, $e, $timeout);
582 582
 		if ($nn > 0) {
583 583
 		    foreach ($httpfeeds as $feed) {
584
-			$buffer = stream_get_line($feed,2000,"\n");
584
+			$buffer = stream_get_line($feed, 2000, "\n");
585 585
 			if ($buffer === FALSE) {
586 586
 			    connect_all($globalSources);
587 587
 			}
588
-			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
589
-			$buffer = explode('\n',$buffer);
588
+			$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
589
+			$buffer = explode('\n', $buffer);
590 590
 			foreach ($buffer as $line) {
591 591
 			    if ($line != '') {
592 592
 				$ais_data = $AIS->parse_line(trim($line));
593 593
 				$data = array();
594 594
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
595
-				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
595
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9);
596 596
 				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
597 597
 				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
598 598
 				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
@@ -604,9 +604,9 @@  discard block
 block discarded – undo
604 604
 				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
605 605
 				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
606 606
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
607
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
607
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
608 608
 				if (isset($ais_data['timestamp'])) {
609
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
609
+				    $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
610 610
 				} else {
611 611
 				    $data['datetime'] = date('Y-m-d H:i:s');
612 612
 				}
@@ -638,10 +638,10 @@  discard block
 block discarded – undo
638 638
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
639 639
 	    )
640 640
 	) {
641
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
641
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
642 642
 	    if ($buffer != '') {
643 643
 		//echo $buffer;
644
-		$all_data = json_decode($buffer,true);
644
+		$all_data = json_decode($buffer, true);
645 645
 		//print_r($all_data);
646 646
 		if (isset($all_data[0]['DATA'])) {
647 647
 		    foreach ($all_data[0]['DATA'] as $line) {
@@ -650,7 +650,7 @@  discard block
 block discarded – undo
650 650
 			    $data['ident'] = $line['NAME'];
651 651
 			    $data['mmsi'] = $line['MMSI'];
652 652
 			    if (strlen($data['mmsi']) > 9) {
653
-				$data['mmsi'] = substr($data['mmsi'],-9);
653
+				$data['mmsi'] = substr($data['mmsi'], -9);
654 654
 			    }
655 655
 			    $data['speed'] = $line['SOG'];
656 656
 			    $data['heading'] = $line['COG'];
@@ -660,8 +660,8 @@  discard block
 block discarded – undo
660 660
 			    //$data['type_id'] = $line['TYPE'];
661 661
 			    $data['imo'] = $line['IMO'];
662 662
 			    if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
663
-			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
664
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
663
+			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s', strtotime($line['ARV']));
664
+			    $data['datetime'] = date('Y-m-d H:i:s', $line['T']);
665 665
 			    $data['format_source'] = 'myshiptracking';
666 666
 			    $data['id_source'] = $id_source;
667 667
 			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -678,16 +678,16 @@  discard block
 block discarded – undo
678 678
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
679 679
 	    )
680 680
 	) {
681
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
681
+	    $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host']));
682 682
 	    if ($buffer != '') {
683
-		$all_data = json_decode($buffer,true);
683
+		$all_data = json_decode($buffer, true);
684 684
 		if (isset($all_data[0]['mmsi'])) {
685 685
 		    foreach ($all_data as $line) {
686 686
 			if ($line != '') {
687 687
 			    $data = array();
688 688
 			    $data['ident'] = $line['shipname'];
689 689
 			    $data['callsign'] = $line['callsign'];
690
-			    $data['mmsi'] = substr($line['mmsi'],-9);
690
+			    $data['mmsi'] = substr($line['mmsi'], -9);
691 691
 			    $data['speed'] = $line['sog'];
692 692
 			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
693 693
 			    $data['latitude'] = $line['latitude'];
@@ -714,14 +714,14 @@  discard block
 block discarded – undo
714 714
 	) {
715 715
 	    $buffer = $Common->getData($value['host']);
716 716
 	    if ($buffer != '') {
717
-		$all_data = json_decode($buffer,true);
717
+		$all_data = json_decode($buffer, true);
718 718
 		if (isset($all_data['features'][0]['id'])) {
719 719
 		    foreach ($all_data['features'] as $line) {
720 720
 			print_r($line);
721 721
 			$data = array();
722 722
 			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
723 723
 			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
724
-			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'],-9);
724
+			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'], -9);
725 725
 			if (isset($line['properties']['imo'])) $data['imo'] = $line['properties']['imo'];
726 726
 			if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed'];
727 727
 			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) $data['heading'] = $line['properties']['heading'];
@@ -748,31 +748,31 @@  discard block
 block discarded – undo
748 748
 	    )
749 749
 	) {
750 750
 	    if ($globalDebug) echo 'download...';
751
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
751
+	    $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter');
752 752
 	    if ($globalDebug) echo 'done !'."\n";
753 753
 	    // FIXME: Need more work
754 754
 	    if ($buffer != '') $reset = 0;
755
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
756
-	    $buffer = explode('\n',$buffer);
755
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
756
+	    $buffer = explode('\n', $buffer);
757 757
 	    foreach ($buffer as $line) {
758 758
 		if ($line != '') {
759 759
 		    $data = array();
760 760
 		    //echo $line."\n";
761
-		    $data['mmsi'] = (int)substr($line,0,9);
762
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
763
-		    $data['status_id'] = substr($line,21,2);
764
-		    $data['type_id'] = substr($line,24,3);
765
-		    $data['latitude'] = substr($line,29,9);
766
-		    $data['longitude'] = substr($line,41,9);
767
-		    $data['speed'] = round(substr($line,51,5));
761
+		    $data['mmsi'] = (int) substr($line, 0, 9);
762
+		    $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10));
763
+		    $data['status_id'] = substr($line, 21, 2);
764
+		    $data['type_id'] = substr($line, 24, 3);
765
+		    $data['latitude'] = substr($line, 29, 9);
766
+		    $data['longitude'] = substr($line, 41, 9);
767
+		    $data['speed'] = round(substr($line, 51, 5));
768 768
 		    //$data['course'] = substr($line,57,5);
769
-		    $data['heading'] = round(substr($line,63,3));
769
+		    $data['heading'] = round(substr($line, 63, 3));
770 770
 		    //$data['draft'] = substr($line,67,4);
771 771
 		    //$data['length'] = substr($line,72,3);
772 772
 		    //$data['beam'] = substr($line,76,2);
773
-		    $data['ident'] = trim(utf8_encode(substr($line,78,20)));
773
+		    $data['ident'] = trim(utf8_encode(substr($line, 78, 20)));
774 774
 		    //$data['callsign'] = trim(substr($line,100,7);
775
-		    $data['arrival_code'] = substr($line,108,20);
775
+		    $data['arrival_code'] = substr($line, 108, 20);
776 776
 		    //$data['etaDate'] = substr($line,129,5);
777 777
 		    //$data['etaTime'] = substr($line,135,5);
778 778
 		    $data['format_source'] = 'shipplotter';
@@ -792,7 +792,7 @@  discard block
 block discarded – undo
792 792
 	    )
793 793
 	) {
794 794
 	    if (isset($globalSailaway['email']) && $globalSailaway['email'] != '' && isset($globalSailaway['password']) && $globalSailaway['password'] != '') {
795
-		$authsailaway = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/weblogin.pl','post',array('submitlogin' => 'Login','email' => $globalSailaway['email'],'pwd' => $globalSailaway['password'], 'page' => 'http://sailaway.world/cgi-bin/sailaway/missions.pl'),'','','','','',false,false,true);
795
+		$authsailaway = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/weblogin.pl', 'post', array('submitlogin' => 'Login', 'email' => $globalSailaway['email'], 'pwd' => $globalSailaway['password'], 'page' => 'http://sailaway.world/cgi-bin/sailaway/missions.pl'), '', '', '', '', '', false, false, true);
796 796
 		//echo $authsailaway;
797 797
 		preg_match_all('/^Set-Cookie:\s*([^;]*)/mi', $authsailaway, $setcookie);
798 798
 		if (isset($setcookie[1][0])) {
@@ -801,18 +801,18 @@  discard block
 block discarded – undo
801 801
 	    }
802 802
 
803 803
 	    if ($globalDebug) echo '! Download... ';
804
-	    for ($i =0; $i <= 1; $i++) {
804
+	    for ($i = 0; $i <= 1; $i++) {
805 805
 		if ($globalDebug) echo 'Racetype: '.$i.' ';
806 806
 		$buffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetMissions.pl?race=1&tutorial=0&hist=1&racetype='.$i);
807 807
 	    if ($globalDebug) echo 'done'."\n";
808 808
 	    if ($buffer != '') {
809
-		$all_data = json_decode($buffer,true);
809
+		$all_data = json_decode($buffer, true);
810 810
 		if (isset($all_data['missions'])) {
811 811
 			foreach ($all_data['missions'] as $mission) {
812 812
 				$mission_user = $mission['usrname'];
813
-				$mission_name = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($mission['mistitle']));
814
-				if (!isset($globalFilter['sailway']['race']) || (isset($globalFilter['sailway']['race']) && in_array($mission['misnr'],$globalFilter['sailway']['race']))) {
815
-					if (isset($sailaway_authcookie) && $sailaway_authcookie != '') $racebuffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetMission.pl?misnr='.$mission['misnr'],'get','','',$sailaway_authcookie);
813
+				$mission_name = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $Common->remove_accents($mission['mistitle']));
814
+				if (!isset($globalFilter['sailway']['race']) || (isset($globalFilter['sailway']['race']) && in_array($mission['misnr'], $globalFilter['sailway']['race']))) {
815
+					if (isset($sailaway_authcookie) && $sailaway_authcookie != '') $racebuffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetMission.pl?misnr='.$mission['misnr'], 'get', '', '', $sailaway_authcookie);
816 816
 					else $racebuffer = '';
817 817
 					$bufferm = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetLeaderboard.pl?misnr='.$mission['misnr']);
818 818
 				} else {
@@ -820,19 +820,19 @@  discard block
 block discarded – undo
820 820
 					$racebuffer = '';
821 821
 				}
822 822
 				if ($racebuffer != '') {
823
-					$race_data = json_decode($racebuffer,true);
823
+					$race_data = json_decode($racebuffer, true);
824 824
 					//print_r($race_data);
825 825
 					unset($racebuffer);
826 826
 					if (isset($race_data['mission'])) {
827 827
 					    $datar = array();
828 828
 					    $datar['id'] = $mission['misnr'];
829 829
 					    $datar['desc'] = $race_data['mission']['misdescr'];
830
-					    $datar['creator'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($race_data['mission']['usrname'])));
831
-					    $datar['name'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($race_data['mission']['mistitle'])));
830
+					    $datar['creator'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $Common->remove_accents($race_data['mission']['usrname'])));
831
+					    $datar['name'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $Common->remove_accents($race_data['mission']['mistitle'])));
832 832
 					    $datar['startdate'] = $race_data['mission']['misstartdatetime'];
833 833
 					    $markers = array();
834 834
 					    foreach ($race_data['mission']['course'] as $course) {
835
-						$markers[] = array('lat' => $course['miclat'],'lon' => $course['miclon'],'name' => $course['micname'],'type' => $course['mictype']);
835
+						$markers[] = array('lat' => $course['miclat'], 'lon' => $course['miclon'], 'name' => $course['micname'], 'type' => $course['mictype']);
836 836
 					    }
837 837
 					    $datar['markers'] = json_encode($markers);
838 838
 					    //print_r($datar);
@@ -840,7 +840,7 @@  discard block
 block discarded – undo
840 840
 					}
841 841
 				}
842 842
 				if ($bufferm != '') {
843
-					$mission_data = json_decode($bufferm,true);
843
+					$mission_data = json_decode($bufferm, true);
844 844
 					unset($bufferm);
845 845
 					if (isset($mission_data['leaderboard'][0]['results'])) {
846 846
 						foreach ($mission_data['leaderboard'][0]['results'] as $sail) {
@@ -853,7 +853,7 @@  discard block
 block discarded – undo
853 853
 								//$data['id'] = $sail['misnr'].'-'.$sail['usrnr'].'-'.$sail['ubtnr'];
854 854
 								$data['id'] = $sail['misnr'].'-'.$sail['usrnr'];
855 855
 								$data['datetime'] = date('Y-m-d H:i:s');
856
-								$data['race_begin'] = date('Y-m-d H:i:s',strtotime($mission_data['leaderboard'][0]['misstart']));
856
+								$data['race_begin'] = date('Y-m-d H:i:s', strtotime($mission_data['leaderboard'][0]['misstart']));
857 857
 								$data['last_update'] = date('Y-m-d H:i:s');
858 858
 								$data['status'] = $sail['status'];
859 859
 								$data['type'] = $sail['btptype'];
@@ -864,16 +864,16 @@  discard block
 block discarded – undo
864 864
 									$data['longitude'] = $pos['longitude'];
865 865
 								}
866 866
 								if ($sail['status'] == 'Racing' && $sail['resultdescr'] != '-') {
867
-									$resultdescr = explode(',',$sail['resultdescr']);
867
+									$resultdescr = explode(',', $sail['resultdescr']);
868 868
 									if (count($resultdescr) > 2) {
869
-										$data['speed'] = round(str_replace(array('Spd: ','kn.'),'',trim($resultdescr[2]))*1.852,2);
870
-										$data['heading'] = str_replace(array('Hdg: ','°'),'',trim($resultdescr[1]));
869
+										$data['speed'] = round(str_replace(array('Spd: ', 'kn.'), '', trim($resultdescr[2]))*1.852, 2);
870
+										$data['heading'] = str_replace(array('Hdg: ', '°'), '', trim($resultdescr[1]));
871 871
 										if (isset($resultdescr[3])) {
872
-											$data['distance'] = round(str_replace('nm.','',trim(explode(' ',$resultdescr[3])[1]))*1.852,3);
872
+											$data['distance'] = round(str_replace('nm.', '', trim(explode(' ', $resultdescr[3])[1]))*1.852, 3);
873 873
 										}
874 874
 									}
875 875
 								}
876
-								$data['ident'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($sail['ubtname'])));
876
+								$data['ident'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $Common->remove_accents($sail['ubtname'])));
877 877
 								$data['captain_id'] = $sail['usrnr'];
878 878
 								$data['captain_name'] = $sail['usrname'];
879 879
 								$data['race_id'] = $sail['misnr'];
@@ -921,8 +921,8 @@  discard block
 block discarded – undo
921 921
 	) {
922 922
 	    //$buffer = $Common->getData($hosts[$id]);
923 923
 	    $buffer = $Common->getData($value['host']);
924
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
925
-	    $buffer = explode('\n',$buffer);
924
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
925
+	    $buffer = explode('\n', $buffer);
926 926
 	    $reset = 0;
927 927
 	    foreach ($buffer as $line) {
928 928
     		if ($line != '') {
@@ -933,7 +933,7 @@  discard block
 block discarded – undo
933 933
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
934 934
 			$data['pilot_id'] = $line[1];
935 935
 			$data['pilot_name'] = $line[2];
936
-			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
936
+			$data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT);
937 937
 			$data['ident'] = $line[0]; // ident
938 938
 			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
939 939
 			$data['speed'] = $line[8]; // speed
@@ -949,7 +949,7 @@  discard block
 block discarded – undo
949 949
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
950 950
 			//if (isset($line[37])) $data['last_update'] = $line[37];
951 951
 		        $data['departure_airport_icao'] = $line[11];
952
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
952
+		        $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':');
953 953
 		        $data['arrival_airport_icao'] = $line[13];
954 954
 			$data['frequency'] = $line[4];
955 955
 			$data['type'] = $line[18];
@@ -958,7 +958,7 @@  discard block
 block discarded – undo
958 958
     			$data['id_source'] = $id_source;
959 959
 	    		//$data['arrival_airport_time'] = ;
960 960
 	    		if ($line[9] != '') {
961
-	    		    $aircraft_data = explode('/',$line[9]);
961
+	    		    $aircraft_data = explode('/', $line[9]);
962 962
 	    		    if (isset($aircraft_data[1])) {
963 963
 	    			$data['aircraft_icao'] = $aircraft_data[1];
964 964
 	    		    }
@@ -973,9 +973,9 @@  discard block
 block discarded – undo
973 973
     			if ($line[3] === 'PILOT') $SI->add($data);
974 974
 			elseif ($line[3] === 'ATC') {
975 975
 				//print_r($data);
976
-				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
977
-				$data['info'] = str_replace('&amp;sect;','',$data['info']);
978
-				$typec = substr($data['ident'],-3);
976
+				$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
977
+				$data['info'] = str_replace('&amp;sect;', '', $data['info']);
978
+				$typec = substr($data['ident'], -3);
979 979
 				if ($typec === 'APP') $data['type'] = 'Approach';
980 980
 				elseif ($typec === 'TWR') $data['type'] = 'Tower';
981 981
 				elseif ($typec === 'OBS') $data['type'] = 'Observer';
@@ -987,8 +987,8 @@  discard block
 block discarded – undo
987 987
 				elseif ($data['type'] === '') $data['type'] = 'Observer';
988 988
 				if (!isset($data['source_name'])) $data['source_name'] = '';
989 989
 				if (isset($ATC)) {
990
-					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
991
-					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
990
+					if (count($ATC->getByIdent($data['ident'], $data['format_source'])) > 0) echo $ATC->update($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']);
991
+					else echo $ATC->add($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']);
992 992
 				}
993 993
 			}
994 994
     			unset($data);
@@ -1004,24 +1004,24 @@  discard block
 block discarded – undo
1004 1004
     		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1005 1005
     	    )
1006 1006
     	) {
1007
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
1007
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php', 'get', '', '', '', '', '20');
1008 1008
 	    if ($buffer != '') {
1009 1009
 		$all_data = simplexml_load_string($buffer);
1010
-		foreach($all_data->children() as $childdata) {
1010
+		foreach ($all_data->children() as $childdata) {
1011 1011
 			$data = array();
1012 1012
 			$line = $childdata;
1013 1013
 			//$data['hex'] = str_pad(dechex((int)$line['pktPilotID']),6,'000000',STR_PAD_LEFT);
1014
-			$data['id'] = date('Ymd').(int)$line['pktPilotID'];
1015
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
1016
-			$data['latitude'] = (float)$line['pktLatitude'];
1017
-			$data['longitude'] = (float)$line['pktLongitude'];
1018
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
1019
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
1020
-			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
1014
+			$data['id'] = date('Ymd').(int) $line['pktPilotID'];
1015
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['entryTime'].' BST'));
1016
+			$data['latitude'] = (float) $line['pktLatitude'];
1017
+			$data['longitude'] = (float) $line['pktLongitude'];
1018
+			if ((float) $line['pktTrack'] != 0) $data['heading'] = (float) $line['pktTrack'];
1019
+			if ((int) $line['pktSpeed'] != 0) $data['speed'] = (int) $line['pktSpeed'];
1020
+			$data['altitude'] = round((int) $line['pktAltitude']*3.28084);
1021 1021
 			$data['altitude_relative'] = 'AMSL';
1022
-			$data['pilot_id'] = (int)$line['pktPilotID'];
1022
+			$data['pilot_id'] = (int) $line['pktPilotID'];
1023 1023
 			$data['aircraft_icao'] = 'PARAGLIDER';
1024
-			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
1024
+			$pilot_data = explode(',', $Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
1025 1025
 			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
1026 1026
 			$data['format_source'] = $value['format'];
1027 1027
 			$SI->add($data);
@@ -1029,22 +1029,22 @@  discard block
 block discarded – undo
1029 1029
 		}
1030 1030
 	    }
1031 1031
 	    $Source->deleteOldLocationByType('gs');
1032
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
1032
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php', 'get', '', '', '', '', '20');
1033 1033
 	    if ($buffer != '') {
1034 1034
 		$all_data = simplexml_load_string($buffer);
1035
-		foreach($all_data->children() as $childdata) {
1035
+		foreach ($all_data->children() as $childdata) {
1036 1036
 			$data = array();
1037 1037
 			$line = $childdata;
1038
-			$data['id'] = (int)$line['gsID'];
1039
-			$data['latitude'] = (float)$line['gsLatitude'];
1040
-			$data['longitude'] = (float)$line['gsLongitude'];
1041
-			$data['altitude'] = round((int)$line['gsHeight']*3.28084);
1038
+			$data['id'] = (int) $line['gsID'];
1039
+			$data['latitude'] = (float) $line['gsLatitude'];
1040
+			$data['longitude'] = (float) $line['gsLongitude'];
1041
+			$data['altitude'] = round((int) $line['gsHeight']*3.28084);
1042 1042
 			$data['altitude_relative'] = 'AMSL';
1043
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['gsLastUpdate'].' BST'));
1043
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['gsLastUpdate'].' BST'));
1044 1044
 			if (count($Source->getLocationInfoByLocationID($data['id'])) > 0) {
1045
-				$Source->updateLocationByLocationID('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
1045
+				$Source->updateLocationByLocationID('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
1046 1046
 			} else {
1047
-				$Source->addLocation('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
1047
+				$Source->addLocation('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
1048 1048
 			}
1049 1049
 			unset($data);
1050 1050
 		}
@@ -1062,9 +1062,9 @@  discard block
 block discarded – undo
1062 1062
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1063 1063
 	    )
1064 1064
 	) {
1065
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
1065
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
1066 1066
 	    if ($buffer != '') {
1067
-	        $all_data = json_decode($buffer,true);
1067
+	        $all_data = json_decode($buffer, true);
1068 1068
 		if (isset($all_data['acList'])) {
1069 1069
 		    $reset = 0;
1070 1070
 		    foreach ($all_data['acList'] as $line) {
@@ -1080,7 +1080,7 @@  discard block
 block discarded – undo
1080 1080
 			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
1081 1081
 			$data['emergency'] = ''; // emergency
1082 1082
 			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
1083
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1083
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
1084 1084
 			else $data['datetime'] = date('Y-m-d H:i:s');
1085 1085
 			//$data['datetime'] = date('Y-m-d H:i:s');
1086 1086
 			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
@@ -1105,7 +1105,7 @@  discard block
 block discarded – undo
1105 1105
 			$data['verticalrate'] = $line['vrt']; // verticale rate
1106 1106
 			$data['squawk'] = $line['squawk']; // squawk
1107 1107
 			$data['emergency'] = ''; // emergency
1108
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1108
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
1109 1109
 			else $data['datetime'] = date('Y-m-d H:i:s');
1110 1110
 			$data['format_source'] = 'aircraftlistjson';
1111 1111
 			$data['id_source'] = $id_source;
@@ -1126,7 +1126,7 @@  discard block
 block discarded – undo
1126 1126
     	    )
1127 1127
     	) {
1128 1128
 	    $buffer = $Common->getData($value['host']);
1129
-	    $all_data = json_decode($buffer,true);
1129
+	    $all_data = json_decode($buffer, true);
1130 1130
 	    if (isset($all_data['planes'])) {
1131 1131
 		$reset = 0;
1132 1132
 		foreach ($all_data['planes'] as $key => $line) {
@@ -1143,12 +1143,12 @@  discard block
 block discarded – undo
1143 1143
 		    $data['emergency'] = ''; // emergency
1144 1144
 		    $data['registration'] = $line[2];
1145 1145
 		    $data['aircraft_icao'] = $line[0];
1146
-		    $deparr = explode('-',$line[1]);
1146
+		    $deparr = explode('-', $line[1]);
1147 1147
 		    if (count($deparr) === 2) {
1148 1148
 			$data['departure_airport_icao'] = $deparr[0];
1149 1149
 			$data['arrival_airport_icao'] = $deparr[1];
1150 1150
 		    }
1151
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
1151
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[9]);
1152 1152
 	    	    $data['format_source'] = 'planeupdatefaa';
1153 1153
     		    $data['id_source'] = $id_source;
1154 1154
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1166,7 +1166,7 @@  discard block
 block discarded – undo
1166 1166
 	    )
1167 1167
 	) {
1168 1168
 	    $buffer = $Common->getData($value['host']);
1169
-	    $all_data = json_decode($buffer,true);
1169
+	    $all_data = json_decode($buffer, true);
1170 1170
 	    if (isset($all_data['states'])) {
1171 1171
 		$reset = 0;
1172 1172
 		foreach ($all_data['states'] as $key => $line) {
@@ -1183,7 +1183,7 @@  discard block
 block discarded – undo
1183 1183
 		    //$data['emergency'] = ''; // emergency
1184 1184
 		    //$data['registration'] = $line[2];
1185 1185
 		    //$data['aircraft_icao'] = $line[0];
1186
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
1186
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[3]);
1187 1187
 		    $data['format_source'] = 'opensky';
1188 1188
 		    $data['id_source'] = $id_source;
1189 1189
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1200,8 +1200,8 @@  discard block
 block discarded – undo
1200 1200
 	    )
1201 1201
 	) {
1202 1202
 	    $buffer = $Common->getData($value['host']);
1203
-	    $all_data = json_decode($buffer,true);
1204
-	    if (isset($all_data['aircraft']) && isset($all_data['now']) && $all_data['now'] > time()-1800) {
1203
+	    $all_data = json_decode($buffer, true);
1204
+	    if (isset($all_data['aircraft']) && isset($all_data['now']) && $all_data['now'] > time() - 1800) {
1205 1205
 		$reset = 0;
1206 1206
 		foreach ($all_data['aircraft'] as $key => $line) {
1207 1207
 		    $data = array();
@@ -1239,7 +1239,7 @@  discard block
 block discarded – undo
1239 1239
 	    )
1240 1240
 	) {
1241 1241
 	    $buffer = $Common->getData($value['host']);
1242
-	    $all_data = json_decode($buffer,true);
1242
+	    $all_data = json_decode($buffer, true);
1243 1243
 	    if (isset($all_data['aircraft'])) {
1244 1244
 		$reset = 0;
1245 1245
 		foreach ($all_data['aircraft'] as $key => $line) {
@@ -1256,7 +1256,7 @@  discard block
 block discarded – undo
1256 1256
 		    //$data['emergency'] = ''; // emergency
1257 1257
 		    if (isset($line['reg'])) $data['registration'] = $line['reg'];
1258 1258
 		    if (isset($line['type'])) $data['aircraft_icao'] = $line['type'];
1259
-		    $data['datetime'] = date('Y-m-d H:i:s',$line['pos_update_time']);
1259
+		    $data['datetime'] = date('Y-m-d H:i:s', $line['pos_update_time']);
1260 1260
 		    $data['format_source'] = 'planefinderclient';
1261 1261
 		    $data['id_source'] = $id_source;
1262 1262
 		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
@@ -1275,7 +1275,7 @@  discard block
 block discarded – undo
1275 1275
 	) {
1276 1276
 	    //$buffer = $Common->getData($hosts[$id]);
1277 1277
 	    $buffer = $Common->getData($value['host']);
1278
-	    $all_data = json_decode($buffer,true);
1278
+	    $all_data = json_decode($buffer, true);
1279 1279
 	    if (!empty($all_data)) $reset = 0;
1280 1280
 	    foreach ($all_data as $key => $line) {
1281 1281
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
@@ -1313,11 +1313,11 @@  discard block
 block discarded – undo
1313 1313
 	    )
1314 1314
 	) {
1315 1315
 	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
1316
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
1316
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150');
1317 1317
 	    //echo $buffer;
1318
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
1319
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
1320
-	    $all_data = json_decode($buffer,true);
1318
+	    $buffer = str_replace(array("\n", "\r"), "", $buffer);
1319
+	    $buffer = preg_replace('/,"num":(.+)/', '}', $buffer);
1320
+	    $all_data = json_decode($buffer, true);
1321 1321
 	    if (json_last_error() != JSON_ERROR_NONE) {
1322 1322
 		die(json_last_error_msg());
1323 1323
 	    }
@@ -1340,7 +1340,7 @@  discard block
 block discarded – undo
1340 1340
 			//$data['departure_airport_iata'] = $line[11];
1341 1341
 			//$data['arrival_airport_iata'] = $line[12];
1342 1342
 	    		//$data['emergency'] = ''; // emergency
1343
-			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
1343
+			$data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10]
1344 1344
 	    		$data['format_source'] = 'radarvirtueljson';
1345 1345
     			$data['id_source'] = $id_source;
1346 1346
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1361,14 +1361,14 @@  discard block
 block discarded – undo
1361 1361
 	) {
1362 1362
 	    //$buffer = $Common->getData($hosts[$id]);
1363 1363
 	    $buffer = $Common->getData($value['host'].'?'.time());
1364
-	    $all_data = json_decode(utf8_encode($buffer),true);
1364
+	    $all_data = json_decode(utf8_encode($buffer), true);
1365 1365
 	    
1366 1366
 	    if (isset($all_data['pireps'])) {
1367 1367
 		$reset = 0;
1368 1368
 	        foreach ($all_data['pireps'] as $line) {
1369 1369
 		    $data = array();
1370 1370
 		    $data['id'] = $line['id'];
1371
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
1371
+		    $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6);
1372 1372
 		    $data['ident'] = $line['callsign']; // ident
1373 1373
 		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
1374 1374
 		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
@@ -1398,9 +1398,9 @@  discard block
 block discarded – undo
1398 1398
 			$SI->add($data);
1399 1399
 		    //    print_r($data);
1400 1400
     		    } elseif ($line['icon'] === 'ct') {
1401
-			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
1402
-			$data['info'] = str_replace('&amp;sect;','',$data['info']);
1403
-			$typec = substr($data['ident'],-3);
1401
+			$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
1402
+			$data['info'] = str_replace('&amp;sect;', '', $data['info']);
1403
+			$typec = substr($data['ident'], -3);
1404 1404
 			$data['type'] = '';
1405 1405
 			if ($typec === 'APP') $data['type'] = 'Approach';
1406 1406
 			elseif ($typec === 'TWR') $data['type'] = 'Tower';
@@ -1411,7 +1411,7 @@  discard block
 block discarded – undo
1411 1411
 			elseif ($typec === 'FSS') $data['type'] = 'Flight Service Station';
1412 1412
 			elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
1413 1413
 			else $data['type'] = 'Observer';
1414
-			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
1414
+			if (isset($ATC)) echo $ATC->add($data['ident'], '', $data['latitude'], $data['longitude'], '0', $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source']);
1415 1415
 		    }
1416 1416
 		    unset($data);
1417 1417
 		}
@@ -1428,14 +1428,14 @@  discard block
 block discarded – undo
1428 1428
 	    //$buffer = $Common->getData($hosts[$id]);
1429 1429
 	    if ($globalDebug) echo 'Get Data...'."\n";
1430 1430
 	    $buffer = $Common->getData($value['host']);
1431
-	    $all_data = json_decode($buffer,true);
1431
+	    $all_data = json_decode($buffer, true);
1432 1432
 	    if ($buffer != '' && is_array($all_data)) {
1433 1433
 		$reset = 0;
1434 1434
 		foreach ($all_data as $line) {
1435 1435
 	    	    $data = array();
1436 1436
 	    	    //$data['id'] = $line['id']; // id not usable
1437 1437
 	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1438
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1438
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex
1439 1439
 	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1440 1440
 	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1441 1441
 	    	    $data['ident'] = $line['flightnum']; // ident
@@ -1450,7 +1450,7 @@  discard block
 block discarded – undo
1450 1450
 	    	    //$data['datetime'] = $line['lastupdate'];
1451 1451
 	    	    //$data['last_update'] = $line['lastupdate'];
1452 1452
 	    	    if (isset($value['timezone'])) {
1453
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1453
+	    		$datetime = new DateTime($line['lastupdate'], new DateTimeZone($value['timezone']));
1454 1454
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1455 1455
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1456 1456
 	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
@@ -1466,14 +1466,14 @@  discard block
 block discarded – undo
1466 1466
 		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1467 1467
 		    if (isset($line['aircraftname'])) {
1468 1468
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
1469
-			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
1470
-	    		$aircraft_data = explode('-',$line['aircraftname']);
1469
+			$line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']);
1470
+	    		$aircraft_data = explode('-', $line['aircraftname']);
1471 1471
 	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1472 1472
 	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1473 1473
 	    		else {
1474
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
1475
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1476
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1474
+	    		    $aircraft_data = explode(' ', $line['aircraftname']);
1475
+	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]);
1476
+	    		    else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']);
1477 1477
 	    		}
1478 1478
 	    	    }
1479 1479
     		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
@@ -1498,7 +1498,7 @@  discard block
 block discarded – undo
1498 1498
 	    //$buffer = $Common->getData($hosts[$id]);
1499 1499
 	    if ($globalDebug) echo 'Get Data...'."\n";
1500 1500
 	    $buffer = $Common->getData($value['host']);
1501
-	    $all_data = json_decode($buffer,true);
1501
+	    $all_data = json_decode($buffer, true);
1502 1502
 	    if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
1503 1503
 		$reset = 0;
1504 1504
 		foreach ($all_data['ACARSData'] as $line) {
@@ -1509,7 +1509,7 @@  discard block
 block discarded – undo
1509 1509
 	    	    //$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1510 1510
 	    	    if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
1511 1511
 	    	    if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
1512
-	    	    $data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
1512
+	    	    $data['ident'] = str_replace(' ', '', $line['bid']['flightnum']); // ident
1513 1513
 	    	    if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
1514 1514
 	    	    $data['altitude'] = $line['altitude']; // altitude
1515 1515
 	    	    $data['speed'] = $line['groundspeed']; // speed
@@ -1520,7 +1520,7 @@  discard block
 block discarded – undo
1520 1520
 	    	    //$data['squawk'] = ''; // squawk
1521 1521
 	    	    //$data['emergency'] = ''; // emergency
1522 1522
 	    	    if (isset($value['timezone'])) {
1523
-	    		$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
1523
+	    		$datetime = new DateTime($line['updated_at'], new DateTimeZone($value['timezone']));
1524 1524
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1525 1525
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1526 1526
 	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
@@ -1556,14 +1556,14 @@  discard block
 block discarded – undo
1556 1556
 	    //$buffer = $Common->getData($hosts[$id]);
1557 1557
 	    if ($globalDebug) echo 'Get Data...'."\n";
1558 1558
 	    $buffer = $Common->getData($value['host']);
1559
-	    $all_data = json_decode($buffer,true);
1559
+	    $all_data = json_decode($buffer, true);
1560 1560
 	    if ($buffer != '' && is_array($all_data)) {
1561 1561
 		$reset = 0;
1562 1562
 		foreach ($all_data as $line) {
1563 1563
 	    	    $data = array();
1564 1564
 	    	    //$data['id'] = $line['id']; // id not usable
1565 1565
 	    	    $data['id'] = trim($line['flight_id']);
1566
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1566
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex
1567 1567
 	    	    $data['pilot_name'] = $line['pilot_name'];
1568 1568
 	    	    $data['pilot_id'] = $line['pilot_id'];
1569 1569
 	    	    $data['ident'] = trim($line['callsign']); // ident
@@ -1607,24 +1607,24 @@  discard block
 block discarded – undo
1607 1607
 	    //$buffer = $Common->getData($hosts[$id]);
1608 1608
 	    if ($globalDebug) echo 'Get Data...'."\n";
1609 1609
 	    $buffer = $Common->getData($value['host']);
1610
-	    $all_data = json_decode($buffer,true);
1610
+	    $all_data = json_decode($buffer, true);
1611 1611
 	    if ($buffer != '') {
1612 1612
 		$Source->deleteLocationBySource('blitzortung');
1613
-		$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
1614
-		$buffer = explode('\n',$buffer);
1613
+		$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
1614
+		$buffer = explode('\n', $buffer);
1615 1615
 		foreach ($buffer as $buffer_line) {
1616
-		    $line = json_decode($buffer_line,true);
1616
+		    $line = json_decode($buffer_line, true);
1617 1617
 		    if (isset($line['time'])) {
1618 1618
 			$data = array();
1619 1619
 			$data['altitude'] = $line['alt']; // altitude
1620 1620
 			$data['latitude'] = $line['lat']; // lat
1621 1621
 			$data['longitude'] = $line['lon']; // long
1622
-			$data['datetime'] = date('Y-m-d H:i:s',substr($line['time'],0,10));
1622
+			$data['datetime'] = date('Y-m-d H:i:s', substr($line['time'], 0, 10));
1623 1623
 			$data['id_source'] = $id_source;
1624 1624
 			$data['format_source'] = 'blitzortung';
1625 1625
 			$SI->add($data);
1626 1626
 			if ($globalDebug) echo '☈ Lightning added'."\n";
1627
-			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
1627
+			$Source->addLocation('', $data['latitude'], $data['longitude'], 0, '', '', 'blitzortung', 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime']);
1628 1628
 			unset($data);
1629 1629
 		    }
1630 1630
 		}
@@ -1636,15 +1636,15 @@  discard block
 block discarded – undo
1636 1636
         $arr = $httpfeeds;
1637 1637
         $w = $e = null;
1638 1638
         if (isset($arr[$id])) {
1639
-            $nn = stream_select($arr,$w,$e,$timeout);
1639
+            $nn = stream_select($arr, $w, $e, $timeout);
1640 1640
             if ($nn > 0) {
1641 1641
                 foreach ($httpfeeds as $feed) {
1642
-                    $buffer = stream_get_line($feed,2000,"\n");
1642
+                    $buffer = stream_get_line($feed, 2000, "\n");
1643 1643
                     if ($buffer === FALSE) {
1644 1644
                         connect_all($globalSources);
1645 1645
                     }
1646
-                    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
1647
-                    $buffer = explode('\n',$buffer);
1646
+                    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
1647
+                    $buffer = explode('\n', $buffer);
1648 1648
                     foreach ($buffer as $line) {
1649 1649
                         if ($line != '') {
1650 1650
                             $line = json_decode($line, true);
@@ -1684,11 +1684,11 @@  discard block
 block discarded – undo
1684 1684
 		    //$value = $formats[$nb];
1685 1685
 		    $format = $globalSources[$nb]['format'];
1686 1686
 		    if ($format === 'sbs' || $format === 'aprs' || $format === 'famaprs' || $format === 'raw' || $format === 'tsv' || $format === 'acarssbs3') {
1687
-			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1687
+			$buffer = @socket_read($r, 6000, PHP_NORMAL_READ);
1688 1688
 		    } elseif ($format === 'vrstcp') {
1689 1689
 			$buffer = @socket_read($r, 6000);
1690 1690
 		    } else {
1691
-			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1691
+			$az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port);
1692 1692
 		    }
1693 1693
 		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1694 1694
 		    //echo $buffer."\n";
@@ -1698,8 +1698,8 @@  discard block
 block discarded – undo
1698 1698
 		    //$SI::del();
1699 1699
 		    if ($buffer !== FALSE) {
1700 1700
 			if ($format === 'vrstcp') {
1701
-			    $buffer = explode('},{',$buffer);
1702
-			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1701
+			    $buffer = explode('},{', $buffer);
1702
+			} else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer));
1703 1703
 		    }
1704 1704
 		    // SBS format is CSV format
1705 1705
 		    if ($buffer !== FALSE && $buffer !== '') {
@@ -1726,7 +1726,7 @@  discard block
 block discarded – undo
1726 1726
 			    $ais_data = $AIS->parse_line(trim($buffer));
1727 1727
 			    $data = array();
1728 1728
 			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1729
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
1729
+			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9);
1730 1730
 			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1731 1731
 			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1732 1732
 			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
@@ -1737,13 +1737,13 @@  discard block
 block discarded – undo
1737 1737
 			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1738 1738
 			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1739 1739
 			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1740
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1740
+			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
1741 1741
 			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1742 1742
 			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1743 1743
 			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1744 1744
 
1745 1745
 			    if (isset($ais_data['timestamp'])) {
1746
-				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1746
+				$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
1747 1747
 			    } else {
1748 1748
 				$data['datetime'] = date('Y-m-d H:i:s');
1749 1749
 			    }
@@ -1754,10 +1754,10 @@  discard block
 block discarded – undo
1754 1754
                         } elseif ($format === 'flightgearsp') {
1755 1755
                     	    //echo $buffer."\n";
1756 1756
                     	    if (strlen($buffer) > 5) {
1757
-				$line = explode(',',$buffer);
1757
+				$line = explode(',', $buffer);
1758 1758
 				$data = array();
1759 1759
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
1760
-				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6);
1760
+				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6);
1761 1761
 				$data['ident'] = $line[6];
1762 1762
 				$data['aircraft_name'] = $line[7];
1763 1763
 				$data['longitude'] = $line[1];
@@ -1774,25 +1774,25 @@  discard block
 block discarded – undo
1774 1774
                         } elseif ($format === 'acars') {
1775 1775
                     	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1776 1776
 			    $ACARS->add(trim($buffer));
1777
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1777
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
1778 1778
 			    $ACARS->deleteLiveAcarsData();
1779 1779
 			} elseif ($format === 'acarsjsonudp') {
1780 1780
 			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1781 1781
                             $line = json_decode(trim($buffer), true);
1782 1782
                             if (!empty($line)) {
1783
-				$line = array_merge(array('text' => '','tail' => '','label' => '','block_id' => '','flight' => '','msgno' => ''),$line);
1783
+				$line = array_merge(array('text' => '', 'tail' => '', 'label' => '', 'block_id' => '', 'flight' => '', 'msgno' => ''), $line);
1784 1784
                                 $ACARS->add(isset($line['text']) ? $line['text'] : '', array('registration' => str_replace('.', '', $line['tail']), 'ident' => $line['flight'], 'label' => $line['label'], 'block_id' => $line['block_id'], 'msg_no' => $line['msgno'], 'message' => (isset($line['text']) ? $line['text'] : '')));
1785 1785
                                 $ACARS->deleteLiveAcarsData();
1786 1786
                             }
1787
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1787
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
1788 1788
 			} elseif ($format === 'flightgearmp') {
1789
-			    if (substr($buffer,0,1) != '#') {
1789
+			    if (substr($buffer, 0, 1) != '#') {
1790 1790
 				$data = array();
1791 1791
 				//echo $buffer."\n";
1792
-				$line = explode(' ',$buffer);
1792
+				$line = explode(' ', $buffer);
1793 1793
 				if (count($line) === 11) {
1794
-				    $userserver = explode('@',$line[0]);
1795
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1794
+				    $userserver = explode('@', $line[0]);
1795
+				    $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex
1796 1796
 				    $data['ident'] = $userserver[0];
1797 1797
 				    $data['registration'] = $userserver[0];
1798 1798
 				    $data['latitude'] = $line[4];
@@ -1800,8 +1800,8 @@  discard block
 block discarded – undo
1800 1800
 				    $data['altitude'] = $line[6];
1801 1801
 				    $data['datetime'] = date('Y-m-d H:i:s');
1802 1802
 				    $aircraft_type = $line[10];
1803
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1804
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1803
+				    $aircraft_type = preg_split(':/:', $aircraft_type);
1804
+				    $data['aircraft_name'] = substr(end($aircraft_type), 0, -4);
1805 1805
 				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1806 1806
 				    if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1807 1807
 				}
@@ -1810,8 +1810,8 @@  discard block
 block discarded – undo
1810 1810
 			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1811 1811
 			    die;
1812 1812
 			} elseif ($format === 'vrstcp') {
1813
-			    foreach($buffer as $all_data) {
1814
-				$line = json_decode('{'.$all_data.'}',true);
1813
+			    foreach ($buffer as $all_data) {
1814
+				$line = json_decode('{'.$all_data.'}', true);
1815 1815
 				$data = array();
1816 1816
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
1817 1817
 				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -1837,16 +1837,16 @@  discard block
 block discarded – undo
1837 1837
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1838 1838
 				unset($data);
1839 1839
 			    }
1840
-			} elseif ($format === 'tsv' || substr($buffer,0,4) === 'clock') {
1840
+			} elseif ($format === 'tsv' || substr($buffer, 0, 4) === 'clock') {
1841 1841
 			    $line = explode("\t", $buffer);
1842
-			    for($k = 0; $k < count($line); $k=$k+2) {
1842
+			    for ($k = 0; $k < count($line); $k = $k + 2) {
1843 1843
 				$key = $line[$k];
1844
-			        $lined[$key] = $line[$k+1];
1844
+			        $lined[$key] = $line[$k + 1];
1845 1845
 			    }
1846 1846
     			    if (count($lined) > 3) {
1847 1847
     				$data['hex'] = $lined['hexid'];
1848 1848
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1849
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1849
+    				$data['datetime'] = date('Y-m-d H:i:s'); ;
1850 1850
     				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1851 1851
     				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1852 1852
     				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
@@ -1865,23 +1865,23 @@  discard block
 block discarded – undo
1865 1865
     			    } else $error = true;
1866 1866
 			} elseif ($format === 'aprs' && $use_aprs) {
1867 1867
 			    if ($aprs_connect === 0) {
1868
-				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1868
+				$send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0);
1869 1869
 				$aprs_connect = 1;
1870 1870
 			    }
1871 1871
 			    
1872
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1872
+			    if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) {
1873 1873
 				$aprs_last_tx = time();
1874 1874
 				$data_aprs = "# Keep alive";
1875
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1875
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
1876 1876
 			    }
1877 1877
 			    
1878 1878
 			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1879 1879
 			    //echo 'APRS data : '.$buffer."\n";
1880
-			    $buffer = str_replace('APRS <- ','',$buffer);
1881
-			    $buffer = str_replace('APRS -> ','',$buffer);
1880
+			    $buffer = str_replace('APRS <- ', '', $buffer);
1881
+			    $buffer = str_replace('APRS -> ', '', $buffer);
1882 1882
 			    //echo $buffer."\n";
1883 1883
 			    date_default_timezone_set('UTC');
1884
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1884
+			    if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') {
1885 1885
 				$line = $APRS->parse($buffer);
1886 1886
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1887 1887
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
@@ -1896,7 +1896,7 @@  discard block
 block discarded – undo
1896 1896
 				    if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
1897 1897
 				    if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
1898 1898
 				    if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
1899
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1899
+				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']);
1900 1900
 				    else $data['datetime'] = date('Y-m-d H:i:s');
1901 1901
 				    //$data['datetime'] = date('Y-m-d H:i:s');
1902 1902
 				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
@@ -1984,29 +1984,29 @@  discard block
 block discarded – undo
1984 1984
 				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1985 1985
 					if (!isset($data['altitude'])) $data['altitude'] = 0;
1986 1986
 					$Source->deleteOldLocationByType('gs');
1987
-					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
1988
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1987
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'gs')) > 0) {
1988
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
1989 1989
 					} else {
1990
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1990
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
1991 1991
 					}
1992 1992
 				    } elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
1993 1993
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1994 1994
 					if ($globalDebug) echo '# Weather Station added'."\n";
1995 1995
 					$Source->deleteOldLocationByType('wx');
1996 1996
 					$weather_data = json_encode($line);
1997
-					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
1998
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
1997
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'wx')) > 0) {
1998
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
1999 1999
 					} else {
2000
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
2000
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
2001 2001
 					}
2002 2002
 				    } elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
2003 2003
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
2004 2004
 					if ($globalDebug) echo '☈ Lightning added'."\n";
2005 2005
 					$Source->deleteOldLocationByType('lightning');
2006
-					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
2007
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
2006
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'lightning')) > 0) {
2007
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
2008 2008
 					} else {
2009
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
2009
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
2010 2010
 					}
2011 2011
 				    } elseif ($globalDebug) {
2012 2012
 				    	echo '/!\ Not added: '.$buffer."\n";
@@ -2015,7 +2015,7 @@  discard block
 block discarded – undo
2015 2015
 				    unset($data);
2016 2016
 				}
2017 2017
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
2018
-					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
2018
+					$Source->updateLocationDescByName($line['ident'], $line['source'], $id, $line['comment']);
2019 2019
 				}
2020 2020
 				/*
2021 2021
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] === 'Car' || $line['symbol'] === 'Ambulance' || $line['symbol'] === 'Van' || $line['symbol'] === 'Truck' || $line['symbol'] === 'Truck (18 Wheeler)' || $line['symbol'] === 'Motorcycle')) {
@@ -2024,7 +2024,7 @@  discard block
 block discarded – undo
2024 2024
 				*/
2025 2025
 				//elseif ($line === false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
2026 2026
 				elseif ($line === true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
2027
-				if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
2027
+				if (isset($globalSources[$nb]['last_weather_clean']) && time() - $globalSources[$nb]['last_weather_clean'] > 60*5) {
2028 2028
 					$Source->deleteOldLocationByType('lightning');
2029 2029
 					$Source->deleteOldLocationByType('wx');
2030 2030
 					$globalSources[$nb]['last_weather_clean'] = time();
@@ -2111,7 +2111,7 @@  discard block
 block discarded – undo
2111 2111
 				connect_all($sourceee);
2112 2112
 				$sourceee = array();
2113 2113
 				//connect_all($globalSources);
2114
-				$tt[$format]=0;
2114
+				$tt[$format] = 0;
2115 2115
 				break;
2116 2116
 			    } 
2117 2117
 			    //else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
@@ -2121,14 +2121,14 @@  discard block
 block discarded – undo
2121 2121
 	    } else {
2122 2122
 		$error = socket_strerror(socket_last_error());
2123 2123
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
2124
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
2124
+			if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n";
2125 2125
 			if (isset($globalDebug)) echo "Restarting...\n";
2126 2126
 			// Restart the script if possible
2127 2127
 			if (is_array($sockets)) {
2128 2128
 			    if ($globalDebug) echo "Shutdown all sockets...";
2129 2129
 			    
2130 2130
 			    foreach ($sockets as $sock) {
2131
-				@socket_shutdown($sock,2);
2131
+				@socket_shutdown($sock, 2);
2132 2132
 				@socket_close($sock);
2133 2133
 			    }
2134 2134
 			    
Please login to merge, or discard this patch.
Braces   +1236 added lines, -416 removed lines patch added patch discarded remove patch
@@ -22,7 +22,9 @@  discard block
 block discarded – undo
22 22
     require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
23 23
 }
24 24
 
25
-if (!isset($globalDebug)) $globalDebug = FALSE;
25
+if (!isset($globalDebug)) {
26
+	$globalDebug = FALSE;
27
+}
26 28
 
27 29
 if ($globalInstalled === FALSE) {
28 30
     echo "This script MUST be run after install script. Use your web browser to run install/index.php";
@@ -68,66 +70,107 @@  discard block
 block discarded – undo
68 70
 //elseif (isset($options['source'])) $hosts = array($options['source']);
69 71
 if (isset($options['s'])) {
70 72
     $globalSources = array();
71
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
72
-    else $globalSources[] = array('host' => $options['s']);
73
-} elseif (isset($options['source'])) {
73
+    if (isset($options['format'])) {
74
+    	$globalSources[] = array('host' => $options['s'],'format' => $options['format']);
75
+    } else {
76
+    	$globalSources[] = array('host' => $options['s']);
77
+    }
78
+    } elseif (isset($options['source'])) {
74 79
     $globalSources = array();
75
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
76
-    else $globalSources[] = array('host' => $options['source']);
77
-}
80
+    if (isset($options['format'])) {
81
+    	$globalSources[] = array('host' => $options['source'],'format' => $options['format']);
82
+    } else {
83
+    	$globalSources[] = array('host' => $options['source']);
84
+    }
85
+    }
78 86
 if (isset($options['aprsserverhost'])) {
79 87
 	$globalServerAPRS = TRUE;
80 88
 	$globalServerAPRShost = $options['aprsserverhost'];
81 89
 }
82
-if (isset($options['aprsserverport'])) $globalServerAPRSport = $options['aprsserverport'];
83
-if (isset($options['aprsserverssid'])) $globalServerAPRSssid = $options['aprsserverssid'];
84
-if (isset($options['aprsserverpass'])) $globalServerAPRSpass = $options['aprsserverpass'];
85
-if (isset($options['noaprsserver'])) $globalServerAPRS = FALSE; 
90
+if (isset($options['aprsserverport'])) {
91
+	$globalServerAPRSport = $options['aprsserverport'];
92
+}
93
+if (isset($options['aprsserverssid'])) {
94
+	$globalServerAPRSssid = $options['aprsserverssid'];
95
+}
96
+if (isset($options['aprsserverpass'])) {
97
+	$globalServerAPRSpass = $options['aprsserverpass'];
98
+}
99
+if (isset($options['noaprsserver'])) {
100
+	$globalServerAPRS = FALSE;
101
+}
86 102
 if (isset($options['enable-aircraft'])) {
87
-	if ($globalDebug) echo 'Enable Aircraft mode'."\n";
103
+	if ($globalDebug) {
104
+		echo 'Enable Aircraft mode'."\n";
105
+	}
88 106
 	$globalAircraft = TRUE; 
89 107
 }
90 108
 if (isset($options['disable-aircraft'])) {
91
-	if ($globalDebug) echo 'Disable Aircraft mode'."\n";
109
+	if ($globalDebug) {
110
+		echo 'Disable Aircraft mode'."\n";
111
+	}
92 112
 	$globalAircraft = FALSE;
93 113
 }
94 114
 if (isset($options['enable-tracker'])) {
95
-	if ($globalDebug) echo 'Enable Tracker mode'."\n";
115
+	if ($globalDebug) {
116
+		echo 'Enable Tracker mode'."\n";
117
+	}
96 118
 	$globalTracker = TRUE; 
97 119
 }
98 120
 if (isset($options['disable-tracker'])) {
99
-	if ($globalDebug) echo 'Disable Tracker mode'."\n";
121
+	if ($globalDebug) {
122
+		echo 'Disable Tracker mode'."\n";
123
+	}
100 124
 	$globalTracker = FALSE;
101 125
 }
102 126
 if (isset($options['enable-marine'])) {
103
-	if ($globalDebug) echo 'Enable Marine mode'."\n";
127
+	if ($globalDebug) {
128
+		echo 'Enable Marine mode'."\n";
129
+	}
104 130
 	$globalMarine = TRUE;
105 131
 }
106 132
 if (isset($options['disable-marine'])) {
107
-	if ($globalDebug) echo 'Disable Marine mode'."\n";
133
+	if ($globalDebug) {
134
+		echo 'Disable Marine mode'."\n";
135
+	}
108 136
 	$globalMarine = FALSE;
109 137
 }
110
-if (isset($options['nodaemon'])) $globalDaemon = FALSE;
111
-if (isset($options['server'])) $globalServer = TRUE;
112
-if (isset($options['idsource'])) $id_source = $options['idsource'];
113
-else $id_source = 1;
138
+if (isset($options['nodaemon'])) {
139
+	$globalDaemon = FALSE;
140
+}
141
+if (isset($options['server'])) {
142
+	$globalServer = TRUE;
143
+}
144
+if (isset($options['idsource'])) {
145
+	$id_source = $options['idsource'];
146
+} else {
147
+	$id_source = 1;
148
+}
114 149
 if (isset($globalServer) && $globalServer) {
115
-    if ($globalDebug) echo "Using Server Mode\n";
150
+    if ($globalDebug) {
151
+    	echo "Using Server Mode\n";
152
+    }
116 153
     $SI=new SpotterServer();
117 154
 /*
118 155
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
119 156
     $SI = new adsb2aprs();
120 157
     $SI->connect();
121 158
 */
122
-} else $SI=new SpotterImport($Connection->db);
159
+} else {
160
+	$SI=new SpotterImport($Connection->db);
161
+}
123 162
 
124
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
163
+if (isset($globalTracker) && $globalTracker) {
164
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
165
+}
125 166
 if (isset($globalMarine) && $globalMarine) {
126 167
     require_once(dirname(__FILE__).'/../require/class.AIS.php');
127 168
     require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
128 169
 }
129 170
 
130
-if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
171
+if (isset($globalTracker) && $globalTracker) {
172
+	$TI = new TrackerImport($Connection->db);
173
+}
131 174
 if (isset($globalMarine) && $globalMarine) {
132 175
     $AIS = new AIS();
133 176
     $MI = new MarineImport($Connection->db);
@@ -152,7 +195,9 @@  discard block
 block discarded – undo
152 195
 }
153 196
 
154 197
 // let's try and connect
155
-if ($globalDebug) echo "Connecting...\n";
198
+if ($globalDebug) {
199
+	echo "Connecting...\n";
200
+}
156 201
 $use_aprs = false;
157 202
 $aprs_full = false;
158 203
 $reset = 0;
@@ -161,7 +206,9 @@  discard block
 block discarded – undo
161 206
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
162 207
     global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
163 208
     $reset++;
164
-    if ($globalDebug) echo 'Connect to all...'."\n";
209
+    if ($globalDebug) {
210
+    	echo 'Connect to all...'."\n";
211
+    }
165 212
     foreach ($hosts as $id => $value) {
166 213
 	$host = $value['host'];
167 214
 	$udp = false;
@@ -172,32 +219,44 @@  discard block
 block discarded – undo
172 219
         	//$formats[$id] = 'deltadbtxt';
173 220
         	$globalSources[$id]['format'] = 'deltadbtxt';
174 221
         	//$last_exec['deltadbtxt'] = 0;
175
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
222
+        	if ($globalDebug) {
223
+        		echo "Connect to deltadb source (".$host.")...\n";
224
+        	}
176 225
             } else if (preg_match('/vatsim-data.txt$/i',$host)) {
177 226
         	//$formats[$id] = 'vatsimtxt';
178 227
         	$globalSources[$id]['format'] = 'vatsimtxt';
179 228
         	//$last_exec['vatsimtxt'] = 0;
180
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
229
+        	if ($globalDebug) {
230
+        		echo "Connect to vatsim source (".$host.")...\n";
231
+        	}
181 232
     	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
182 233
         	//$formats[$id] = 'aircraftlistjson';
183 234
         	$globalSources[$id]['format'] = 'aircraftlistjson';
184 235
         	//$last_exec['aircraftlistjson'] = 0;
185
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
236
+        	if ($globalDebug) {
237
+        		echo "Connect to aircraftlist.json source (".$host.")...\n";
238
+        	}
186 239
     	    } else if (preg_match('/aircraft.json$/i',$host)) {
187 240
         	//$formats[$id] = 'aircraftjson';
188 241
         	$globalSources[$id]['format'] = 'aircraftjson';
189 242
         	//$last_exec['aircraftlistjson'] = 0;
190
-        	if ($globalDebug) echo "Connect to aircraft.json source (".$host.")...\n";
243
+        	if ($globalDebug) {
244
+        		echo "Connect to aircraft.json source (".$host.")...\n";
245
+        	}
191 246
     	    } else if (preg_match('/aircraft$/i',$host)) {
192 247
         	//$formats[$id] = 'planefinderclient';
193 248
         	$globalSources[$id]['format'] = 'planefinderclient';
194 249
         	//$last_exec['aircraftlistjson'] = 0;
195
-        	if ($globalDebug) echo "Connect to planefinderclient source (".$host.")...\n";
250
+        	if ($globalDebug) {
251
+        		echo "Connect to planefinderclient source (".$host.")...\n";
252
+        	}
196 253
     	    } else if (preg_match('/opensky/i',$host)) {
197 254
         	//$formats[$id] = 'aircraftlistjson';
198 255
         	$globalSources[$id]['format'] = 'opensky';
199 256
         	//$last_exec['aircraftlistjson'] = 0;
200
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
257
+        	if ($globalDebug) {
258
+        		echo "Connect to opensky source (".$host.")...\n";
259
+        	}
201 260
     	    /*
202 261
     	    // Disabled for now, site change source format
203 262
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
@@ -214,7 +273,9 @@  discard block
 block discarded – undo
214 273
         	//$formats[$id] = 'planeupdatefaa';
215 274
         	$globalSources[$id]['format'] = 'planeupdatefaa';
216 275
         	//$last_exec['planeupdatefaa'] = 0;
217
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
276
+        	if ($globalDebug) {
277
+        		echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
278
+        	}
218 279
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
219 280
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
220 281
         	    exit(0);
@@ -223,37 +284,53 @@  discard block
 block discarded – undo
223 284
         	//$formats[$id] = 'phpvmacars';
224 285
         	$globalSources[$id]['format'] = 'phpvmacars';
225 286
         	//$last_exec['phpvmacars'] = 0;
226
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
287
+        	if ($globalDebug) {
288
+        		echo "Connect to phpvmacars source (".$host.")...\n";
289
+        	}
227 290
             } else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
228 291
         	//$formats[$id] = 'phpvmacars';
229 292
         	$globalSources[$id]['format'] = 'vaos';
230 293
         	//$last_exec['phpvmacars'] = 0;
231
-        	if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
294
+        	if ($globalDebug) {
295
+        		echo "Connect to vaos source (".$host.")...\n";
296
+        	}
232 297
             } else if (preg_match('/VAM-json.php$/i',$host)) {
233 298
         	//$formats[$id] = 'phpvmacars';
234 299
         	$globalSources[$id]['format'] = 'vam';
235
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
300
+        	if ($globalDebug) {
301
+        		echo "Connect to Vam source (".$host.")...\n";
302
+        	}
236 303
             } else if (preg_match('/whazzup/i',$host)) {
237 304
         	//$formats[$id] = 'whazzup';
238 305
         	$globalSources[$id]['format'] = 'whazzup';
239 306
         	//$last_exec['whazzup'] = 0;
240
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
307
+        	if ($globalDebug) {
308
+        		echo "Connect to whazzup source (".$host.")...\n";
309
+        	}
241 310
             } else if (preg_match('/blitzortung/i',$host)) {
242 311
         	$globalSources[$id]['format'] = 'blitzortung';
243
-        	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
312
+        	if ($globalDebug) {
313
+        		echo "Connect to blitzortung source (".$host.")...\n";
314
+        	}
244 315
             } else if (preg_match('/airwhere/i',$host)) {
245 316
         	$globalSources[$id]['format'] = 'airwhere';
246
-        	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
317
+        	if ($globalDebug) {
318
+        		echo "Connect to airwhere source (".$host.")...\n";
319
+        	}
247 320
             } else if (preg_match('/recentpireps/i',$host)) {
248 321
         	//$formats[$id] = 'pirepsjson';
249 322
         	$globalSources[$id]['format'] = 'pirepsjson';
250 323
         	//$last_exec['pirepsjson'] = 0;
251
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
324
+        	if ($globalDebug) {
325
+        		echo "Connect to pirepsjson source (".$host.")...\n";
326
+        	}
252 327
             } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
253 328
         	//$formats[$id] = 'fr24json';
254 329
         	$globalSources[$id]['format'] = 'fr24json';
255 330
         	//$last_exec['fr24json'] = 0;
256
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
331
+        	if ($globalDebug) {
332
+        		echo "Connect to fr24 source (".$host.")...\n";
333
+        	}
257 334
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
258 335
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
259 336
         	    exit(0);
@@ -262,7 +339,9 @@  discard block
 block discarded – undo
262 339
         	//$formats[$id] = 'fr24json';
263 340
         	$globalSources[$id]['format'] = 'myshiptracking';
264 341
         	//$last_exec['fr24json'] = 0;
265
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
342
+        	if ($globalDebug) {
343
+        		echo "Connect to myshiptracking source (".$host.")...\n";
344
+        	}
266 345
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
267 346
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
268 347
         	    exit(0);
@@ -271,17 +350,26 @@  discard block
 block discarded – undo
271 350
             } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
272 351
         	//$formats[$id] = 'tsv';
273 352
         	$globalSources[$id]['format'] = 'tsv';
274
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
353
+        	if ($globalDebug) {
354
+        		echo "Connect to tsv source (".$host.")...\n";
355
+        	}
275 356
             }
276 357
         } elseif (filter_var($host,FILTER_VALIDATE_URL) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'acarsjson')) {
277 358
     		if ($globalSources[$id]['format'] == 'aisnmeahttp' || $globalSources[$id]['format'] == 'acarsjson') {
278 359
     		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
279 360
     		    if ($idf !== false) {
280 361
     			$httpfeeds[$id] = $idf;
281
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
282
-    		    } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
283
-    		} elseif ($globalDebug && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\n";
284
-    		elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
362
+        		if ($globalDebug) {
363
+        			echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
364
+        		}
365
+    		    } elseif ($globalDebug) {
366
+    		    	echo "Can't connect to ".$globalSources[$id]['host']."\n";
367
+    		    }
368
+    		} elseif ($globalDebug && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') {
369
+    			echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\n";
370
+    		} elseif ($globalDebug) {
371
+    			echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
372
+    		}
285 373
         } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
286 374
 	    $hostport = explode(':',$host);
287 375
 	    if (isset($hostport[1])) {
@@ -322,20 +410,29 @@  discard block
 block discarded – undo
322 410
         		//$formats[$id] = 'beast';
323 411
         		$globalSources[$id]['format'] = 'beast';
324 412
 		    //} else $formats[$id] = 'sbs';
325
-		    } else $globalSources[$id]['format'] = 'sbs';
413
+		    } else {
414
+		    	$globalSources[$id]['format'] = 'sbs';
415
+		    }
326 416
 		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
327 417
 		}
328
-		if ($globalDebug && $udp) echo 'Listening in UDP from '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
329
-		elseif ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
418
+		if ($globalDebug && $udp) {
419
+			echo 'Listening in UDP from '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
420
+		} elseif ($globalDebug) {
421
+			echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
422
+		}
330 423
             } else {
331
-		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
424
+		if ($globalDebug) {
425
+			echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
426
+		}
332 427
 		sleep(10);
333 428
 		connect_all($hosts);
334 429
     	    }
335 430
         }
336 431
     }
337 432
 }
338
-if (!isset($globalMinFetch)) $globalMinFetch = 15;
433
+if (!isset($globalMinFetch)) {
434
+	$globalMinFetch = 15;
435
+}
339 436
 
340 437
 // Initialize all
341 438
 $status = array();
@@ -344,13 +441,19 @@  discard block
 block discarded – undo
344 441
 $formats = array();
345 442
 $last_exec = array();
346 443
 $time = time();
347
-if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut;
348
-else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
349
-else $timeout = 20;
444
+if (isset($globalSourcesTimeout)) {
445
+	$timeout = $globalSourcesTimeOut;
446
+} else if (isset($globalSBS1TimeOut)) {
447
+	$timeout = $globalSBS1TimeOut;
448
+} else {
449
+	$timeout = 20;
450
+}
350 451
 $errno = '';
351 452
 $errstr='';
352 453
 
353
-if (!isset($globalDaemon)) $globalDaemon = TRUE;
454
+if (!isset($globalDaemon)) {
455
+	$globalDaemon = TRUE;
456
+}
354 457
 /* Initiate connections to all the hosts simultaneously */
355 458
 //connect_all($hosts);
356 459
 //connect_all($globalSources);
@@ -379,7 +482,9 @@  discard block
 block discarded – undo
379 482
     if (isset($source['format']) && $source['format'] == 'aprs') {
380 483
 	$aprs_connect = 0;
381 484
 	$use_aprs = true;
382
-	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
485
+	if (isset($source['port']) && $source['port'] == '10152') {
486
+		$aprs_full = true;
487
+	}
383 488
 	break;
384 489
     }
385 490
 }
@@ -390,25 +495,46 @@  discard block
 block discarded – undo
390 495
 	$aprs_connect = 0;
391 496
 	$aprs_keep = 120;
392 497
 	$aprs_last_tx = time();
393
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
394
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
395
-	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
396
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
397
-	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
398
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
399
-	if ($aprs_full) $aprs_filter = '';
400
-	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
401
-	else $aprs_pass = '-1';
498
+	if (isset($globalAPRSversion)) {
499
+		$aprs_version = $globalAPRSversion;
500
+	} else {
501
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
502
+	}
503
+	if (isset($globalAPRSssid)) {
504
+		$aprs_ssid = $globalAPRSssid;
505
+	} else {
506
+		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
507
+	}
508
+	if (isset($globalAPRSfilter)) {
509
+		$aprs_filter = $globalAPRSfilter;
510
+	} else {
511
+		$aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
512
+	}
513
+	if ($aprs_full) {
514
+		$aprs_filter = '';
515
+	}
516
+	if (isset($globalAPRSpass)) {
517
+		$aprs_pass = $globalAPRSpass;
518
+	} else {
519
+		$aprs_pass = '-1';
520
+	}
402 521
 
403
-	if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
404
-	else $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
405
-}
522
+	if ($aprs_filter != '') {
523
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
524
+	} else {
525
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
526
+	}
527
+	}
406 528
 
407 529
 // connected - lets do some work
408 530
 //if ($globalDebug) echo "Connected!\n";
409 531
 sleep(1);
410
-if ($globalDebug) echo "SCAN MODE \n\n";
411
-if (!isset($globalCronEnd)) $globalCronEnd = 60;
532
+if ($globalDebug) {
533
+	echo "SCAN MODE \n\n";
534
+}
535
+if (!isset($globalCronEnd)) {
536
+	$globalCronEnd = 60;
537
+}
412 538
 $endtime = time()+$globalCronEnd;
413 539
 $i = 1;
414 540
 $tt = array();
@@ -422,22 +548,32 @@  discard block
 block discarded – undo
422 548
 
423 549
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
424 550
 while ($i > 0) {
425
-    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
551
+    if (function_exists('pcntl_fork')) {
552
+    	pcntl_signal_dispatch();
553
+    }
426 554
 
427
-    if (!$globalDaemon) $i = $endtime-time();
555
+    if (!$globalDaemon) {
556
+    	$i = $endtime-time();
557
+    }
428 558
     // Delete old ATC
429 559
     if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
430
-	if ($globalDebug) echo 'Delete old ATC...'."\n";
560
+	if ($globalDebug) {
561
+		echo 'Delete old ATC...'."\n";
562
+	}
431 563
         $ATC->deleteOldATC();
432 564
     }
433 565
     
434 566
     if (count($last_exec) == count($globalSources)) {
435 567
 	$max = $globalMinFetch;
436 568
 	foreach ($last_exec as $last) {
437
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
569
+	    if ((time() - $last['last']) < $max) {
570
+	    	$max = time() - $last['last'];
571
+	    }
438 572
 	}
439 573
 	if ($max < $globalMinFetch) {
440
-	    if ($globalDebug) echo 'Sleeping...'."\n";
574
+	    if ($globalDebug) {
575
+	    	echo 'Sleeping...'."\n";
576
+	    }
441 577
 	    sleep($globalMinFetch-$max+2);
442 578
 	}
443 579
     }
@@ -447,7 +583,9 @@  discard block
 block discarded – undo
447 583
     foreach ($globalSources as $id => $value) {
448 584
 	date_default_timezone_set('UTC');
449 585
 	//if ($globalDebug) echo 'Source host : '.$value['host'].' - Source format: '.$value['format']."\n";
450
-	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
586
+	if (!isset($last_exec[$id]['last'])) {
587
+		$last_exec[$id]['last'] = 0;
588
+	}
451 589
 	if ($value['format'] === 'deltadbtxt' && 
452 590
 	    (
453 591
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
@@ -456,7 +594,9 @@  discard block
 block discarded – undo
456 594
 	) {
457 595
         //$buffer = $Common->getData($hosts[$id]);
458 596
         $buffer = $Common->getData($value['host']);
459
-        if ($buffer != '') $reset = 0;
597
+        if ($buffer != '') {
598
+        	$reset = 0;
599
+        }
460 600
         $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
461 601
         $buffer = explode('\n', $buffer);
462 602
         foreach ($buffer as $line) {
@@ -465,20 +605,41 @@  discard block
 block discarded – undo
465 605
                 $data = array();
466 606
                 $data['hex'] = $line[1]; // hex
467 607
                 $data['ident'] = $line[2]; // ident
468
-                if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
469
-                if (isset($line[4])) $data['speed'] = $line[4]; // speed
470
-                if (isset($line[5])) $data['heading'] = $line[5]; // heading
471
-                if (isset($line[6])) $data['latitude'] = $line[6]; // lat
472
-                if (isset($line[7])) $data['longitude'] = $line[7]; // long
608
+                if (isset($line[3])) {
609
+                	$data['altitude'] = $line[3];
610
+                }
611
+                // altitude
612
+                if (isset($line[4])) {
613
+                	$data['speed'] = $line[4];
614
+                }
615
+                // speed
616
+                if (isset($line[5])) {
617
+                	$data['heading'] = $line[5];
618
+                }
619
+                // heading
620
+                if (isset($line[6])) {
621
+                	$data['latitude'] = $line[6];
622
+                }
623
+                // lat
624
+                if (isset($line[7])) {
625
+                	$data['longitude'] = $line[7];
626
+                }
627
+                // long
473 628
                 $data['verticalrate'] = ''; // vertical rate
474 629
                 //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
475 630
                 $data['emergency'] = ''; // emergency
476 631
                 $data['datetime'] = date('Y-m-d H:i:s');
477 632
                 $data['format_source'] = 'deltadbtxt';
478 633
                 $data['id_source'] = $id_source;
479
-                if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
480
-                if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
481
-                if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
634
+                if (isset($value['name']) && $value['name'] != '') {
635
+                	$data['source_name'] = $value['name'];
636
+                }
637
+                if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
638
+                	$data['noarchive'] = true;
639
+                }
640
+                if (isset($value['sourcestats'])) {
641
+                	$data['sourcestats'] = $value['sourcestats'];
642
+                }
482 643
                 $SI->add($data);
483 644
                 unset($data);
484 645
             }
@@ -513,11 +674,20 @@  discard block
 block discarded – undo
513 674
                     $data['format_source'] = 'radarcapejson';
514 675
                     $data['id_source'] = $id_source;
515 676
                     if (isset($value['name']) && $value['name'] != '') {
516
-                        if (isset($line['src']) && !$line['src'] == 'M') $data['source_name'] = $value['name'].'_MLAT';
517
-                        else $data['source_name'] = $value['name'];
518
-                    } elseif (isset($line['src']) && $line['src'] == 'M') $data['source_name'] = 'MLAT';
519
-                    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
520
-                    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
677
+                        if (isset($line['src']) && !$line['src'] == 'M') {
678
+                        	$data['source_name'] = $value['name'].'_MLAT';
679
+                        } else {
680
+                        	$data['source_name'] = $value['name'];
681
+                        }
682
+                    } elseif (isset($line['src']) && $line['src'] == 'M') {
683
+                    	$data['source_name'] = 'MLAT';
684
+                    }
685
+                    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
686
+                    	$data['noarchive'] = true;
687
+                    }
688
+                    if (isset($value['sourcestats'])) {
689
+                    	$data['sourcestats'] = $value['sourcestats'];
690
+                    }
521 691
 
522 692
                     $SI->add($data);
523 693
                     unset($data);
@@ -533,7 +703,9 @@  discard block
 block discarded – undo
533 703
 	    date_default_timezone_set('CET');
534 704
 	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
535 705
 	    date_default_timezone_set('UTC');
536
-	    if ($buffer != '') $reset = 0;
706
+	    if ($buffer != '') {
707
+	    	$reset = 0;
708
+	    }
537 709
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
538 710
 	    $buffer = explode('\n',$buffer);
539 711
 	    foreach ($buffer as $line) {
@@ -542,18 +714,42 @@  discard block
 block discarded – undo
542 714
 		    $add = false;
543 715
 		    $ais_data = $AIS->parse_line(trim($line));
544 716
 		    $data = array();
545
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
546
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
547
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
548
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
549
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
550
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
551
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
552
-		    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
553
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
554
-		    if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
555
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
556
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
717
+		    if (isset($ais_data['ident'])) {
718
+		    	$data['ident'] = $ais_data['ident'];
719
+		    }
720
+		    if (isset($ais_data['mmsi'])) {
721
+		    	$data['mmsi'] = substr($ais_data['mmsi'],-9);
722
+		    }
723
+		    if (isset($ais_data['speed'])) {
724
+		    	$data['speed'] = $ais_data['speed'];
725
+		    }
726
+		    if (isset($ais_data['heading'])) {
727
+		    	$data['heading'] = $ais_data['heading'];
728
+		    }
729
+		    if (isset($ais_data['latitude'])) {
730
+		    	$data['latitude'] = $ais_data['latitude'];
731
+		    }
732
+		    if (isset($ais_data['longitude'])) {
733
+		    	$data['longitude'] = $ais_data['longitude'];
734
+		    }
735
+		    if (isset($ais_data['status'])) {
736
+		    	$data['status'] = $ais_data['status'];
737
+		    }
738
+		    if (isset($ais_data['statusid'])) {
739
+		    	$data['status_id'] = $ais_data['statusid'];
740
+		    }
741
+		    if (isset($ais_data['type'])) {
742
+		    	$data['type'] = $ais_data['type'];
743
+		    }
744
+		    if (isset($ais_data['typeid'])) {
745
+		    	$data['type_id'] = $ais_data['typeid'];
746
+		    }
747
+		    if (isset($ais_data['imo'])) {
748
+		    	$data['imo'] = $ais_data['imo'];
749
+		    }
750
+		    if (isset($ais_data['callsign'])) {
751
+		    	$data['callsign'] = $ais_data['callsign'];
752
+		    }
557 753
 		    if (isset($ais_data['timestamp'])) {
558 754
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
559 755
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
@@ -567,8 +763,12 @@  discard block
 block discarded – undo
567 763
 		    $data['format_source'] = 'aisnmeatxt';
568 764
     		    $data['id_source'] = $id_source;
569 765
 		    //print_r($data);
570
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
571
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
766
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
767
+		    	$data['noarchive'] = true;
768
+		    }
769
+		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') {
770
+		    	$MI->add($data);
771
+		    }
572 772
 		    unset($data);
573 773
 		}
574 774
     	    }
@@ -591,20 +791,48 @@  discard block
 block discarded – undo
591 791
 			    if ($line != '') {
592 792
 				$ais_data = $AIS->parse_line(trim($line));
593 793
 				$data = array();
594
-				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
595
-				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
596
-				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
597
-				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
598
-				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
599
-				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
600
-				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
601
-				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
602
-				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
603
-				if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
604
-				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
605
-				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
606
-				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
607
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
794
+				if (isset($ais_data['ident'])) {
795
+					$data['ident'] = $ais_data['ident'];
796
+				}
797
+				if (isset($ais_data['mmsi'])) {
798
+					$data['mmsi'] = substr($ais_data['mmsi'],-9);
799
+				}
800
+				if (isset($ais_data['speed'])) {
801
+					$data['speed'] = $ais_data['speed'];
802
+				}
803
+				if (isset($ais_data['heading'])) {
804
+					$data['heading'] = $ais_data['heading'];
805
+				}
806
+				if (isset($ais_data['latitude'])) {
807
+					$data['latitude'] = $ais_data['latitude'];
808
+				}
809
+				if (isset($ais_data['longitude'])) {
810
+					$data['longitude'] = $ais_data['longitude'];
811
+				}
812
+				if (isset($ais_data['status'])) {
813
+					$data['status'] = $ais_data['status'];
814
+				}
815
+				if (isset($ais_data['statusid'])) {
816
+					$data['status_id'] = $ais_data['statusid'];
817
+				}
818
+				if (isset($ais_data['type'])) {
819
+					$data['type'] = $ais_data['type'];
820
+				}
821
+				if (isset($ais_data['typeid'])) {
822
+					$data['type_id'] = $ais_data['typeid'];
823
+				}
824
+				if (isset($ais_data['imo'])) {
825
+					$data['imo'] = $ais_data['imo'];
826
+				}
827
+				if (isset($ais_data['callsign'])) {
828
+					$data['callsign'] = $ais_data['callsign'];
829
+				}
830
+				if (isset($ais_data['destination'])) {
831
+					$data['arrival_code'] = $ais_data['destination'];
832
+				}
833
+				if (isset($ais_data['eta_ts'])) {
834
+					$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
835
+				}
608 836
 				if (isset($ais_data['timestamp'])) {
609 837
 				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
610 838
 				} else {
@@ -612,18 +840,27 @@  discard block
 block discarded – undo
612 840
 				}
613 841
 				$data['format_source'] = 'aisnmeahttp';
614 842
 				$data['id_source'] = $id_source;
615
-				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
616
-				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
843
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
844
+					$data['noarchive'] = true;
845
+				}
846
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') {
847
+					$MI->add($data);
848
+				}
617 849
 				unset($data);
618 850
 			    }
619 851
 			}
620 852
 		    }
621 853
 		} else {
622 854
 		    $format = $value['format'];
623
-		    if (isset($tt[$format])) $tt[$format]++;
624
-		    else $tt[$format] = 0;
855
+		    if (isset($tt[$format])) {
856
+		    	$tt[$format]++;
857
+		    } else {
858
+		    	$tt[$format] = 0;
859
+		    }
625 860
 		    if ($tt[$format] > 30) {
626
-			if ($globalDebug) echo 'Reconnect...'."\n";
861
+			if ($globalDebug) {
862
+				echo 'Reconnect...'."\n";
863
+			}
627 864
 			sleep(2);
628 865
 			//$sourceeen[] = $value;
629 866
 			//connect_all($sourceeen);
@@ -659,12 +896,18 @@  discard block
 block discarded – undo
659 896
 			    //    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
660 897
 			    //$data['type_id'] = $line['TYPE'];
661 898
 			    $data['imo'] = $line['IMO'];
662
-			    if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
663
-			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
899
+			    if ($line['DEST'] != '') {
900
+			    	$data['arrival_code'] = $line['DEST'];
901
+			    }
902
+			    if ($line['ARV'] != '') {
903
+			    	$data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
904
+			    }
664 905
 			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
665 906
 			    $data['format_source'] = 'myshiptracking';
666 907
 			    $data['id_source'] = $id_source;
667
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
908
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
909
+			    	$data['noarchive'] = true;
910
+			    }
668 911
 			    $MI->add($data);
669 912
 			    unset($data);
670 913
 			}
@@ -689,7 +932,9 @@  discard block
 block discarded – undo
689 932
 			    $data['callsign'] = $line['callsign'];
690 933
 			    $data['mmsi'] = substr($line['mmsi'],-9);
691 934
 			    $data['speed'] = $line['sog'];
692
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
935
+			    if ($line['heading'] != '511') {
936
+			    	$data['heading'] = $line['heading'];
937
+			    }
693 938
 			    $data['latitude'] = $line['latitude'];
694 939
 			    $data['longitude'] = $line['longitude'];
695 940
 			    $data['type_id'] = $line['shiptype'];
@@ -697,7 +942,9 @@  discard block
 block discarded – undo
697 942
 			    $data['datetime'] = $line['time'];
698 943
 			    $data['format_source'] = 'boatbeaconapp';
699 944
 			    $data['id_source'] = $id_source;
700
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
945
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
946
+			    	$data['noarchive'] = true;
947
+			    }
701 948
 			    $MI->add($data);
702 949
 			    unset($data);
703 950
 			}
@@ -719,22 +966,44 @@  discard block
 block discarded – undo
719 966
 		    foreach ($all_data['features'] as $line) {
720 967
 			print_r($line);
721 968
 			$data = array();
722
-			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
723
-			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
724
-			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'],-9);
725
-			if (isset($line['properties']['imo'])) $data['imo'] = $line['properties']['imo'];
726
-			if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed'];
727
-			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) $data['heading'] = $line['properties']['heading'];
969
+			if (isset($line['properties']['name'])) {
970
+				$data['ident'] = $line['properties']['name'];
971
+			}
972
+			if (isset($line['properties']['callsign'])) {
973
+				$data['callsign'] = $line['properties']['callsign'];
974
+			}
975
+			if (isset($line['properties']['mmsi'])) {
976
+				$data['mmsi'] = substr($line['properties']['mmsi'],-9);
977
+			}
978
+			if (isset($line['properties']['imo'])) {
979
+				$data['imo'] = $line['properties']['imo'];
980
+			}
981
+			if (isset($line['properties']['speed'])) {
982
+				$data['speed'] = $line['properties']['speed'];
983
+			}
984
+			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) {
985
+				$data['heading'] = $line['properties']['heading'];
986
+			}
728 987
 			$data['latitude'] = $line['geometry']['coordinates'][1];
729 988
 			$data['longitude'] = $line['geometry']['coordinates'][0];
730
-			if (isset($line['properties']['vesselType'])) $data['type'] = $line['properties']['vesselType'];
731
-			if (isset($line['properties']['destination'])) $data['arrival_code'] = $line['properties']['destination'];
732
-			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') $data['arrival_date'] = $line['properties']['eta'];
989
+			if (isset($line['properties']['vesselType'])) {
990
+				$data['type'] = $line['properties']['vesselType'];
991
+			}
992
+			if (isset($line['properties']['destination'])) {
993
+				$data['arrival_code'] = $line['properties']['destination'];
994
+			}
995
+			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') {
996
+				$data['arrival_date'] = $line['properties']['eta'];
997
+			}
733 998
 			$data['format_source'] = 'boatnerd';
734 999
 			$data['id_source'] = $id_source;
735 1000
 			$data['datetime'] = date('Y-m-d H:i:s');
736
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
737
-			if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);
1001
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1002
+				$data['noarchive'] = true;
1003
+			}
1004
+			if ($line['properties']['vesselType'] != 'Navigation Aid') {
1005
+				$MI->add($data);
1006
+			}
738 1007
 			unset($data);
739 1008
 		    }
740 1009
 		}
@@ -747,11 +1016,17 @@  discard block
 block discarded – undo
747 1016
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
748 1017
 	    )
749 1018
 	) {
750
-	    if ($globalDebug) echo 'download...';
1019
+	    if ($globalDebug) {
1020
+	    	echo 'download...';
1021
+	    }
751 1022
 	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
752
-	    if ($globalDebug) echo 'done !'."\n";
1023
+	    if ($globalDebug) {
1024
+	    	echo 'done !'."\n";
1025
+	    }
753 1026
 	    // FIXME: Need more work
754
-	    if ($buffer != '') $reset = 0;
1027
+	    if ($buffer != '') {
1028
+	    	$reset = 0;
1029
+	    }
755 1030
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
756 1031
 	    $buffer = explode('\n',$buffer);
757 1032
 	    foreach ($buffer as $line) {
@@ -777,7 +1052,9 @@  discard block
 block discarded – undo
777 1052
 		    //$data['etaTime'] = substr($line,135,5);
778 1053
 		    $data['format_source'] = 'shipplotter';
779 1054
     		    $data['id_source'] = $id_source;
780
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1055
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1056
+		    	$data['noarchive'] = true;
1057
+		    }
781 1058
 		    //print_r($data);
782 1059
 		    //echo 'Add...'."\n";
783 1060
 		    $MI->add($data);
@@ -800,11 +1077,17 @@  discard block
 block discarded – undo
800 1077
 		}
801 1078
 	    }
802 1079
 
803
-	    if ($globalDebug) echo '! Download... ';
1080
+	    if ($globalDebug) {
1081
+	    	echo '! Download... ';
1082
+	    }
804 1083
 	    for ($i =0; $i <= 1; $i++) {
805
-		if ($globalDebug) echo 'Racetype: '.$i.' ';
1084
+		if ($globalDebug) {
1085
+			echo 'Racetype: '.$i.' ';
1086
+		}
806 1087
 		$buffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetMissions.pl?race=1&tutorial=0&hist=1&racetype='.$i);
807
-	    if ($globalDebug) echo 'done'."\n";
1088
+	    if ($globalDebug) {
1089
+	    	echo 'done'."\n";
1090
+	    }
808 1091
 	    if ($buffer != '') {
809 1092
 		$all_data = json_decode($buffer,true);
810 1093
 		if (isset($all_data['missions'])) {
@@ -812,8 +1095,11 @@  discard block
 block discarded – undo
812 1095
 				$mission_user = $mission['usrname'];
813 1096
 				$mission_name = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$Common->remove_accents($mission['mistitle']));
814 1097
 				if (!isset($globalFilter['sailway']['race']) || (isset($globalFilter['sailway']['race']) && in_array($mission['misnr'],$globalFilter['sailway']['race']))) {
815
-					if (isset($sailaway_authcookie) && $sailaway_authcookie != '') $racebuffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetMission.pl?misnr='.$mission['misnr'],'get','','',$sailaway_authcookie);
816
-					else $racebuffer = '';
1098
+					if (isset($sailaway_authcookie) && $sailaway_authcookie != '') {
1099
+						$racebuffer = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetMission.pl?misnr='.$mission['misnr'],'get','','',$sailaway_authcookie);
1100
+					} else {
1101
+						$racebuffer = '';
1102
+					}
817 1103
 					$bufferm = $Common->getData('http://backend.sailaway.world/cgi-bin/sailaway/GetLeaderboard.pl?misnr='.$mission['misnr']);
818 1104
 				} else {
819 1105
 					$bufferm = '';
@@ -877,7 +1163,9 @@  discard block
 block discarded – undo
877 1163
 								$data['captain_id'] = $sail['usrnr'];
878 1164
 								$data['captain_name'] = $sail['usrname'];
879 1165
 								$data['race_id'] = $sail['misnr'];
880
-								if ($sail['rank'] != 'DNF') $data['race_rank'] = $sail['rank'];
1166
+								if ($sail['rank'] != 'DNF') {
1167
+									$data['race_rank'] = $sail['rank'];
1168
+								}
881 1169
 								$data['race_time'] = $sail['racetime'];
882 1170
 								if ($mission_user != '') {
883 1171
 									$data['race_name'] = $mission_name.' ('.$mission_user.')';
@@ -887,7 +1175,9 @@  discard block
 block discarded – undo
887 1175
 								//$data['callsign'] = trim(substr($line,100,7);
888 1176
 								$data['format_source'] = 'sailaway';
889 1177
 								$data['id_source'] = $id_source;
890
-								if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1178
+								if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1179
+									$data['noarchive'] = true;
1180
+								}
891 1181
 								//print_r($data);
892 1182
 								//if ($data['race_id'] == '48') print_r($data);
893 1183
 								//echo 'Add...'."\n";
@@ -929,16 +1219,28 @@  discard block
 block discarded – undo
929 1219
     		    $line = explode(':', $line);
930 1220
     		    if (count($line) > 30 && $line[0] != 'callsign') {
931 1221
 			$data = array();
932
-			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
933
-			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
1222
+			if (isset($line[37]) && $line[37] != '') {
1223
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
1224
+			} else {
1225
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
1226
+			}
934 1227
 			$data['pilot_id'] = $line[1];
935 1228
 			$data['pilot_name'] = $line[2];
936 1229
 			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
937 1230
 			$data['ident'] = $line[0]; // ident
938
-			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
1231
+			if ($line[7] != '' && $line[7] != 0) {
1232
+				$data['altitude'] = $line[7];
1233
+			}
1234
+			// altitude
939 1235
 			$data['speed'] = $line[8]; // speed
940
-			if (isset($line[45])) $data['heading'] = $line[45]; // heading
941
-			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
1236
+			if (isset($line[45])) {
1237
+				$data['heading'] = $line[45];
1238
+			}
1239
+			// heading
1240
+			elseif (isset($line[38])) {
1241
+				$data['heading'] = $line[38];
1242
+			}
1243
+			// heading
942 1244
 			$data['latitude'] = $line[5]; // lat
943 1245
 	        	$data['longitude'] = $line[6]; // long
944 1246
 	        	$data['verticalrate'] = ''; // vertical rate
@@ -954,7 +1256,9 @@  discard block
 block discarded – undo
954 1256
 			$data['frequency'] = $line[4];
955 1257
 			$data['type'] = $line[18];
956 1258
 			$data['range'] = $line[19];
957
-			if (isset($line[35])) $data['info'] = $line[35];
1259
+			if (isset($line[35])) {
1260
+				$data['info'] = $line[35];
1261
+			}
958 1262
     			$data['id_source'] = $id_source;
959 1263
 	    		//$data['arrival_airport_time'] = ;
960 1264
 	    		if ($line[9] != '') {
@@ -968,27 +1272,47 @@  discard block
 block discarded – undo
968 1272
 	    		elseif ($value === 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
969 1273
 	    		*/
970 1274
 	    		$data['format_source'] = $value['format'];
971
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
972
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
973
-    			if ($line[3] === 'PILOT') $SI->add($data);
974
-			elseif ($line[3] === 'ATC') {
1275
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1276
+				$data['noarchive'] = true;
1277
+			}
1278
+			if (isset($value['name']) && $value['name'] != '') {
1279
+				$data['source_name'] = $value['name'];
1280
+			}
1281
+    			if ($line[3] === 'PILOT') {
1282
+    				$SI->add($data);
1283
+    			} elseif ($line[3] === 'ATC') {
975 1284
 				//print_r($data);
976 1285
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
977 1286
 				$data['info'] = str_replace('&amp;sect;','',$data['info']);
978 1287
 				$typec = substr($data['ident'],-3);
979
-				if ($typec === 'APP') $data['type'] = 'Approach';
980
-				elseif ($typec === 'TWR') $data['type'] = 'Tower';
981
-				elseif ($typec === 'OBS') $data['type'] = 'Observer';
982
-				elseif ($typec === 'GND') $data['type'] = 'Ground';
983
-				elseif ($typec === 'DEL') $data['type'] = 'Delivery';
984
-				elseif ($typec === 'DEP') $data['type'] = 'Departure';
985
-				elseif ($typec === 'FSS') $data['type'] = 'Flight Service Station';
986
-				elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
987
-				elseif ($data['type'] === '') $data['type'] = 'Observer';
988
-				if (!isset($data['source_name'])) $data['source_name'] = '';
1288
+				if ($typec === 'APP') {
1289
+					$data['type'] = 'Approach';
1290
+				} elseif ($typec === 'TWR') {
1291
+					$data['type'] = 'Tower';
1292
+				} elseif ($typec === 'OBS') {
1293
+					$data['type'] = 'Observer';
1294
+				} elseif ($typec === 'GND') {
1295
+					$data['type'] = 'Ground';
1296
+				} elseif ($typec === 'DEL') {
1297
+					$data['type'] = 'Delivery';
1298
+				} elseif ($typec === 'DEP') {
1299
+					$data['type'] = 'Departure';
1300
+				} elseif ($typec === 'FSS') {
1301
+					$data['type'] = 'Flight Service Station';
1302
+				} elseif ($typec === 'CTR') {
1303
+					$data['type'] = 'Control Radar or Centre';
1304
+				} elseif ($data['type'] === '') {
1305
+					$data['type'] = 'Observer';
1306
+				}
1307
+				if (!isset($data['source_name'])) {
1308
+					$data['source_name'] = '';
1309
+				}
989 1310
 				if (isset($ATC)) {
990
-					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
991
-					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
1311
+					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) {
1312
+						echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
1313
+					} else {
1314
+						echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
1315
+					}
992 1316
 				}
993 1317
 			}
994 1318
     			unset($data);
@@ -1015,14 +1339,20 @@  discard block
 block discarded – undo
1015 1339
 			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
1016 1340
 			$data['latitude'] = (float)$line['pktLatitude'];
1017 1341
 			$data['longitude'] = (float)$line['pktLongitude'];
1018
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
1019
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
1342
+			if ((float)$line['pktTrack'] != 0) {
1343
+				$data['heading'] = (float)$line['pktTrack'];
1344
+			}
1345
+			if ((int)$line['pktSpeed'] != 0) {
1346
+				$data['speed'] = (int)$line['pktSpeed'];
1347
+			}
1020 1348
 			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
1021 1349
 			$data['altitude_relative'] = 'AMSL';
1022 1350
 			$data['pilot_id'] = (int)$line['pktPilotID'];
1023 1351
 			$data['aircraft_icao'] = 'PARAGLIDER';
1024 1352
 			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
1025
-			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
1353
+			if (isset($pilot_data[4])) {
1354
+				$data['pilot_name'] = $pilot_data[4];
1355
+			}
1026 1356
 			$data['format_source'] = $value['format'];
1027 1357
 			$SI->add($data);
1028 1358
 			unset($data);
@@ -1070,25 +1400,59 @@  discard block
 block discarded – undo
1070 1400
 		    foreach ($all_data['acList'] as $line) {
1071 1401
 			$data = array();
1072 1402
 			$data['hex'] = $line['Icao']; // hex
1073
-			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
1074
-			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
1075
-			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
1076
-			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
1077
-			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
1078
-			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
1403
+			if (isset($line['Call'])) {
1404
+				$data['ident'] = $line['Call'];
1405
+			}
1406
+			// ident
1407
+			if (isset($line['Alt'])) {
1408
+				$data['altitude'] = $line['Alt'];
1409
+			}
1410
+			// altitude
1411
+			if (isset($line['Spd'])) {
1412
+				$data['speed'] = $line['Spd'];
1413
+			}
1414
+			// speed
1415
+			if (isset($line['Trak'])) {
1416
+				$data['heading'] = $line['Trak'];
1417
+			}
1418
+			// heading
1419
+			if (isset($line['Lat'])) {
1420
+				$data['latitude'] = $line['Lat'];
1421
+			}
1422
+			// lat
1423
+			if (isset($line['Long'])) {
1424
+				$data['longitude'] = $line['Long'];
1425
+			}
1426
+			// long
1079 1427
 			//$data['verticalrate'] = $line['']; // verticale rate
1080
-			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
1428
+			if (isset($line['Sqk'])) {
1429
+				$data['squawk'] = $line['Sqk'];
1430
+			}
1431
+			// squawk
1081 1432
 			$data['emergency'] = ''; // emergency
1082
-			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
1083
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1084
-			else $data['datetime'] = date('Y-m-d H:i:s');
1433
+			if (isset($line['Reg'])) {
1434
+				$data['registration'] = $line['Reg'];
1435
+			}
1436
+			if (isset($line['PosTime'])) {
1437
+				$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1438
+			} else {
1439
+				$data['datetime'] = date('Y-m-d H:i:s');
1440
+			}
1085 1441
 			//$data['datetime'] = date('Y-m-d H:i:s');
1086
-			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1442
+			if (isset($line['Type'])) {
1443
+				$data['aircraft_icao'] = $line['Type'];
1444
+			}
1087 1445
 			$data['format_source'] = 'aircraftlistjson';
1088 1446
 			$data['id_source'] = $id_source;
1089
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1090
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1091
-			if (isset($data['latitude'])) $SI->add($data);
1447
+			if (isset($value['name']) && $value['name'] != '') {
1448
+				$data['source_name'] = $value['name'];
1449
+			}
1450
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1451
+				$data['noarchive'] = true;
1452
+			}
1453
+			if (isset($data['latitude'])) {
1454
+				$SI->add($data);
1455
+			}
1092 1456
 			unset($data);
1093 1457
 		    }
1094 1458
 		} elseif (is_array($all_data)) {
@@ -1105,17 +1469,26 @@  discard block
 block discarded – undo
1105 1469
 			$data['verticalrate'] = $line['vrt']; // verticale rate
1106 1470
 			$data['squawk'] = $line['squawk']; // squawk
1107 1471
 			$data['emergency'] = ''; // emergency
1108
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1109
-			else $data['datetime'] = date('Y-m-d H:i:s');
1472
+			if (isset($line['PosTime'])) {
1473
+				$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1474
+			} else {
1475
+				$data['datetime'] = date('Y-m-d H:i:s');
1476
+			}
1110 1477
 			$data['format_source'] = 'aircraftlistjson';
1111 1478
 			$data['id_source'] = $id_source;
1112
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1113
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1479
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1480
+				$data['noarchive'] = true;
1481
+			}
1482
+			if (isset($value['name']) && $value['name'] != '') {
1483
+				$data['source_name'] = $value['name'];
1484
+			}
1114 1485
 			$SI->add($data);
1115 1486
 			unset($data);
1116 1487
 		    }
1117 1488
 		}
1118
-	    } elseif ($globalDebug) echo 'No data'."\n";
1489
+	    } elseif ($globalDebug) {
1490
+	    	echo 'No data'."\n";
1491
+	    }
1119 1492
     	    //$last_exec['aircraftlistjson'] = time();
1120 1493
     	    $last_exec[$id]['last'] = time();
1121 1494
     	//} elseif ($value === 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
@@ -1151,8 +1524,12 @@  discard block
 block discarded – undo
1151 1524
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
1152 1525
 	    	    $data['format_source'] = 'planeupdatefaa';
1153 1526
     		    $data['id_source'] = $id_source;
1154
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1155
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1527
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1528
+		    	$data['noarchive'] = true;
1529
+		    }
1530
+		    if (isset($value['name']) && $value['name'] != '') {
1531
+		    	$data['source_name'] = $value['name'];
1532
+		    }
1156 1533
 		    $SI->add($data);
1157 1534
 		    unset($data);
1158 1535
 		}
@@ -1186,7 +1563,9 @@  discard block
 block discarded – undo
1186 1563
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
1187 1564
 		    $data['format_source'] = 'opensky';
1188 1565
 		    $data['id_source'] = $id_source;
1189
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1566
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1567
+		    	$data['noarchive'] = true;
1568
+		    }
1190 1569
 		    $SI->add($data);
1191 1570
 		    unset($data);
1192 1571
 		}
@@ -1206,15 +1585,42 @@  discard block
 block discarded – undo
1206 1585
 		foreach ($all_data['aircraft'] as $key => $line) {
1207 1586
 		    $data = array();
1208 1587
 		    // add support for ground vehicule with ~ in front of hex
1209
-		    if (isset($line['hex'])) $data['hex'] = $line['hex']; // hex
1210
-		    if (isset($line['flight'])) $data['ident'] = trim($line['flight']); // ident
1211
-		    if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
1212
-		    if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
1213
-		    if (isset($line['track'])) $data['heading'] = $line['track']; // heading
1214
-		    if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
1215
-		    if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
1216
-		    if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
1217
-		    if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
1588
+		    if (isset($line['hex'])) {
1589
+		    	$data['hex'] = $line['hex'];
1590
+		    }
1591
+		    // hex
1592
+		    if (isset($line['flight'])) {
1593
+		    	$data['ident'] = trim($line['flight']);
1594
+		    }
1595
+		    // ident
1596
+		    if (isset($line['altitude'])) {
1597
+		    	$data['altitude'] = $line['altitude'];
1598
+		    }
1599
+		    // altitude
1600
+		    if (isset($line['speed'])) {
1601
+		    	$data['speed'] = $line['speed'];
1602
+		    }
1603
+		    // speed
1604
+		    if (isset($line['track'])) {
1605
+		    	$data['heading'] = $line['track'];
1606
+		    }
1607
+		    // heading
1608
+		    if (isset($line['lat'])) {
1609
+		    	$data['latitude'] = $line['lat'];
1610
+		    }
1611
+		    // lat
1612
+		    if (isset($line['lon'])) {
1613
+		    	$data['longitude'] = $line['lon'];
1614
+		    }
1615
+		    // long
1616
+		    if (isset($line['vert_rate'])) {
1617
+		    	$data['verticalrate'] = $line['vert_rate'];
1618
+		    }
1619
+		    // verticale rate
1620
+		    if (isset($line['squawk'])) {
1621
+		    	$data['squawk'] = $line['squawk'];
1622
+		    }
1623
+		    // squawk
1218 1624
 		    //$data['emergency'] = ''; // emergency
1219 1625
 		    //$data['registration'] = $line[2];
1220 1626
 		    //$data['aircraft_icao'] = $line[0];
@@ -1222,10 +1628,17 @@  discard block
 block discarded – undo
1222 1628
 		    $data['format_source'] = 'aircraftjson';
1223 1629
 		    $data['id_source'] = $id_source;
1224 1630
 		    if (isset($value['name']) && $value['name'] != '') {
1225
-			    if (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = $value['name'].'_MLAT';
1226
-			    else $data['source_name'] = $value['name'];
1227
-		    } elseif (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = 'MLAT';
1228
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1631
+			    if (isset($line['mlat']) && !empty($line['mlat'])) {
1632
+			    	$data['source_name'] = $value['name'].'_MLAT';
1633
+			    } else {
1634
+			    	$data['source_name'] = $value['name'];
1635
+			    }
1636
+		    } elseif (isset($line['mlat']) && !empty($line['mlat'])) {
1637
+		    	$data['source_name'] = 'MLAT';
1638
+		    }
1639
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1640
+		    	$data['noarchive'] = true;
1641
+		    }
1229 1642
 		    $SI->add($data);
1230 1643
 		    unset($data);
1231 1644
 		}
@@ -1245,22 +1658,54 @@  discard block
 block discarded – undo
1245 1658
 		foreach ($all_data['aircraft'] as $key => $line) {
1246 1659
 		    $data = array();
1247 1660
 		    $data['hex'] = $key; // hex
1248
-		    if (isset($line['callsign'])) $data['ident'] = trim($line['callsign']); // ident
1249
-		    if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
1250
-		    if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
1251
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1252
-		    if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
1253
-		    if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
1254
-		    if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
1255
-		    if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
1661
+		    if (isset($line['callsign'])) {
1662
+		    	$data['ident'] = trim($line['callsign']);
1663
+		    }
1664
+		    // ident
1665
+		    if (isset($line['altitude'])) {
1666
+		    	$data['altitude'] = $line['altitude'];
1667
+		    }
1668
+		    // altitude
1669
+		    if (isset($line['speed'])) {
1670
+		    	$data['speed'] = $line['speed'];
1671
+		    }
1672
+		    // speed
1673
+		    if (isset($line['heading'])) {
1674
+		    	$data['heading'] = $line['heading'];
1675
+		    }
1676
+		    // heading
1677
+		    if (isset($line['lat'])) {
1678
+		    	$data['latitude'] = $line['lat'];
1679
+		    }
1680
+		    // lat
1681
+		    if (isset($line['lon'])) {
1682
+		    	$data['longitude'] = $line['lon'];
1683
+		    }
1684
+		    // long
1685
+		    if (isset($line['vert_rate'])) {
1686
+		    	$data['verticalrate'] = $line['vert_rate'];
1687
+		    }
1688
+		    // verticale rate
1689
+		    if (isset($line['squawk'])) {
1690
+		    	$data['squawk'] = $line['squawk'];
1691
+		    }
1692
+		    // squawk
1256 1693
 		    //$data['emergency'] = ''; // emergency
1257
-		    if (isset($line['reg'])) $data['registration'] = $line['reg'];
1258
-		    if (isset($line['type'])) $data['aircraft_icao'] = $line['type'];
1694
+		    if (isset($line['reg'])) {
1695
+		    	$data['registration'] = $line['reg'];
1696
+		    }
1697
+		    if (isset($line['type'])) {
1698
+		    	$data['aircraft_icao'] = $line['type'];
1699
+		    }
1259 1700
 		    $data['datetime'] = date('Y-m-d H:i:s',$line['pos_update_time']);
1260 1701
 		    $data['format_source'] = 'planefinderclient';
1261 1702
 		    $data['id_source'] = $id_source;
1262
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1263
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1703
+		    if (isset($value['name']) && $value['name'] != '') {
1704
+		    	$data['source_name'] = $value['name'];
1705
+		    }
1706
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1707
+		    	$data['noarchive'] = true;
1708
+		    }
1264 1709
 		    $SI->add($data);
1265 1710
 		    unset($data);
1266 1711
 		}
@@ -1276,7 +1721,9 @@  discard block
 block discarded – undo
1276 1721
 	    //$buffer = $Common->getData($hosts[$id]);
1277 1722
 	    $buffer = $Common->getData($value['host']);
1278 1723
 	    $all_data = json_decode($buffer,true);
1279
-	    if (!empty($all_data)) $reset = 0;
1724
+	    if (!empty($all_data)) {
1725
+	    	$reset = 0;
1726
+	    }
1280 1727
 	    foreach ($all_data as $key => $line) {
1281 1728
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
1282 1729
 		    $data = array();
@@ -1297,8 +1744,12 @@  discard block
 block discarded – undo
1297 1744
 		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
1298 1745
 	    	    $data['format_source'] = 'fr24json';
1299 1746
     		    $data['id_source'] = $id_source;
1300
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1301
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1747
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1748
+		    	$data['noarchive'] = true;
1749
+		    }
1750
+		    if (isset($value['name']) && $value['name'] != '') {
1751
+		    	$data['source_name'] = $value['name'];
1752
+		    }
1302 1753
 		    $SI->add($data);
1303 1754
 		    unset($data);
1304 1755
 		}
@@ -1327,24 +1778,42 @@  discard block
 block discarded – undo
1327 1778
 		    if (isset($line['inf'])) {
1328 1779
 			$data = array();
1329 1780
 			$data['hex'] = $line['inf']['ia'];
1330
-			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
1781
+			if (isset($line['inf']['cs'])) {
1782
+				$data['ident'] = $line['inf']['cs'];
1783
+			}
1784
+			//$line[13]
1331 1785
 	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
1332
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
1333
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
1786
+	    		if (isset($line['inf']['gs'])) {
1787
+	    			$data['speed'] = round($line['inf']['gs']*0.539957);
1788
+	    		}
1789
+	    		// speed
1790
+	    		if (isset($line['inf']['tr'])) {
1791
+	    			$data['heading'] = $line['inf']['tr'];
1792
+	    		}
1793
+	    		// heading
1334 1794
 	    		$data['latitude'] = $line['pt'][0]; // lat
1335 1795
 	    		$data['longitude'] = $line['pt'][1]; // long
1336 1796
 	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
1337
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
1797
+	    		if (isset($line['inf']['sq'])) {
1798
+	    			$data['squawk'] = $line['inf']['sq'];
1799
+	    		}
1800
+	    		// squawk
1338 1801
 	    		//$data['aircraft_icao'] = $line[8];
1339
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
1802
+	    		if (isset($line['inf']['rc'])) {
1803
+	    			$data['registration'] = $line['inf']['rc'];
1804
+	    		}
1340 1805
 			//$data['departure_airport_iata'] = $line[11];
1341 1806
 			//$data['arrival_airport_iata'] = $line[12];
1342 1807
 	    		//$data['emergency'] = ''; // emergency
1343 1808
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
1344 1809
 	    		$data['format_source'] = 'radarvirtueljson';
1345 1810
     			$data['id_source'] = $id_source;
1346
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1347
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1811
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1812
+				$data['noarchive'] = true;
1813
+			}
1814
+			if (isset($value['name']) && $value['name'] != '') {
1815
+				$data['source_name'] = $value['name'];
1816
+			}
1348 1817
 			$SI->add($data);
1349 1818
 			unset($data);
1350 1819
 		    }
@@ -1370,30 +1839,65 @@  discard block
 block discarded – undo
1370 1839
 		    $data['id'] = $line['id'];
1371 1840
 		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
1372 1841
 		    $data['ident'] = $line['callsign']; // ident
1373
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
1374
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
1375
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
1376
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
1377
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1378
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1842
+		    if (isset($line['pilotid'])) {
1843
+		    	$data['pilot_id'] = $line['pilotid'];
1844
+		    }
1845
+		    // pilot id
1846
+		    if (isset($line['name'])) {
1847
+		    	$data['pilot_name'] = $line['name'];
1848
+		    }
1849
+		    // pilot name
1850
+		    if (isset($line['alt'])) {
1851
+		    	$data['altitude'] = $line['alt'];
1852
+		    }
1853
+		    // altitude
1854
+		    if (isset($line['gs'])) {
1855
+		    	$data['speed'] = $line['gs'];
1856
+		    }
1857
+		    // speed
1858
+		    if (isset($line['heading'])) {
1859
+		    	$data['heading'] = $line['heading'];
1860
+		    }
1861
+		    // heading
1862
+		    if (isset($line['route'])) {
1863
+		    	$data['waypoints'] = $line['route'];
1864
+		    }
1865
+		    // route
1379 1866
 		    $data['latitude'] = $line['lat']; // lat
1380 1867
 		    $data['longitude'] = $line['lon']; // long
1381 1868
 		    //$data['verticalrate'] = $line['vrt']; // verticale rate
1382 1869
 		    //$data['squawk'] = $line['squawk']; // squawk
1383 1870
 		    //$data['emergency'] = ''; // emergency
1384
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
1385
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
1386
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
1871
+		    if (isset($line['depicao'])) {
1872
+		    	$data['departure_airport_icao'] = $line['depicao'];
1873
+		    }
1874
+		    if (isset($line['deptime'])) {
1875
+		    	$data['departure_airport_time'] = $line['deptime'];
1876
+		    }
1877
+		    if (isset($line['arricao'])) {
1878
+		    	$data['arrival_airport_icao'] = $line['arricao'];
1879
+		    }
1387 1880
 		    //$data['arrival_airport_time'] = $line['arrtime'];
1388
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
1389
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
1390
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
1391
-		    else $data['info'] = '';
1881
+		    if (isset($line['aircraft'])) {
1882
+		    	$data['aircraft_icao'] = $line['aircraft'];
1883
+		    }
1884
+		    if (isset($line['transponder'])) {
1885
+		    	$data['squawk'] = $line['transponder'];
1886
+		    }
1887
+		    if (isset($line['atis'])) {
1888
+		    	$data['info'] = $line['atis'];
1889
+		    } else {
1890
+		    	$data['info'] = '';
1891
+		    }
1392 1892
 		    $data['format_source'] = 'pireps';
1393 1893
     		    $data['id_source'] = $id_source;
1394 1894
 		    $data['datetime'] = date('Y-m-d H:i:s');
1395
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1396
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1895
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1896
+		    	$data['noarchive'] = true;
1897
+		    }
1898
+		    if (isset($value['name']) && $value['name'] != '') {
1899
+		    	$data['source_name'] = $value['name'];
1900
+		    }
1397 1901
 		    if ($line['icon'] === 'plane') {
1398 1902
 			$SI->add($data);
1399 1903
 		    //    print_r($data);
@@ -1402,16 +1906,28 @@  discard block
 block discarded – undo
1402 1906
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
1403 1907
 			$typec = substr($data['ident'],-3);
1404 1908
 			$data['type'] = '';
1405
-			if ($typec === 'APP') $data['type'] = 'Approach';
1406
-			elseif ($typec === 'TWR') $data['type'] = 'Tower';
1407
-			elseif ($typec === 'OBS') $data['type'] = 'Observer';
1408
-			elseif ($typec === 'GND') $data['type'] = 'Ground';
1409
-			elseif ($typec === 'DEL') $data['type'] = 'Delivery';
1410
-			elseif ($typec === 'DEP') $data['type'] = 'Departure';
1411
-			elseif ($typec === 'FSS') $data['type'] = 'Flight Service Station';
1412
-			elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
1413
-			else $data['type'] = 'Observer';
1414
-			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
1909
+			if ($typec === 'APP') {
1910
+				$data['type'] = 'Approach';
1911
+			} elseif ($typec === 'TWR') {
1912
+				$data['type'] = 'Tower';
1913
+			} elseif ($typec === 'OBS') {
1914
+				$data['type'] = 'Observer';
1915
+			} elseif ($typec === 'GND') {
1916
+				$data['type'] = 'Ground';
1917
+			} elseif ($typec === 'DEL') {
1918
+				$data['type'] = 'Delivery';
1919
+			} elseif ($typec === 'DEP') {
1920
+				$data['type'] = 'Departure';
1921
+			} elseif ($typec === 'FSS') {
1922
+				$data['type'] = 'Flight Service Station';
1923
+			} elseif ($typec === 'CTR') {
1924
+				$data['type'] = 'Control Radar or Centre';
1925
+			} else {
1926
+				$data['type'] = 'Observer';
1927
+			}
1928
+			if (isset($ATC)) {
1929
+				echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
1930
+			}
1415 1931
 		    }
1416 1932
 		    unset($data);
1417 1933
 		}
@@ -1426,7 +1942,9 @@  discard block
 block discarded – undo
1426 1942
 	    )
1427 1943
 	) {
1428 1944
 	    //$buffer = $Common->getData($hosts[$id]);
1429
-	    if ($globalDebug) echo 'Get Data...'."\n";
1945
+	    if ($globalDebug) {
1946
+	    	echo 'Get Data...'."\n";
1947
+	    }
1430 1948
 	    $buffer = $Common->getData($value['host']);
1431 1949
 	    $all_data = json_decode($buffer,true);
1432 1950
 	    if ($buffer != '' && is_array($all_data)) {
@@ -1434,10 +1952,16 @@  discard block
 block discarded – undo
1434 1952
 		foreach ($all_data as $line) {
1435 1953
 	    	    $data = array();
1436 1954
 	    	    //$data['id'] = $line['id']; // id not usable
1437
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1955
+	    	    if (isset($line['pilotid'])) {
1956
+	    	    	$data['id'] = $line['pilotid'].$line['flightnum'];
1957
+	    	    }
1438 1958
 	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1439
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1440
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1959
+	    	    if (isset($line['pilotname'])) {
1960
+	    	    	$data['pilot_name'] = $line['pilotname'];
1961
+	    	    }
1962
+	    	    if (isset($line['pilotid'])) {
1963
+	    	    	$data['pilot_id'] = $line['pilotid'];
1964
+	    	    }
1441 1965
 	    	    $data['ident'] = $line['flightnum']; // ident
1442 1966
 	    	    $data['altitude'] = $line['alt']; // altitude
1443 1967
 	    	    $data['speed'] = $line['gs']; // speed
@@ -1453,7 +1977,9 @@  discard block
 block discarded – undo
1453 1977
 	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1454 1978
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1455 1979
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1456
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
1980
+	    	    } else {
1981
+	    	    	$data['datetime'] = date('Y-m-d H:i:s');
1982
+	    	    }
1457 1983
 	    	    $data['departure_airport_icao'] = $line['depicao'];
1458 1984
 	    	    $data['departure_airport_time'] = $line['deptime'];
1459 1985
 	    	    $data['arrival_airport_icao'] = $line['arricao'];
@@ -1461,29 +1987,47 @@  discard block
 block discarded – undo
1461 1987
     		    if (isset($line['registration'])) {
1462 1988
     			$data['registration'] = $line['registration'];
1463 1989
     			//if (isset($line['aircraft'])) $data['id'] = $line['aircraft'];
1464
-    		    } else $data['registration'] = $line['aircraft'];
1465
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1466
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1990
+    		    } else {
1991
+    		    	$data['registration'] = $line['aircraft'];
1992
+    		    }
1993
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1994
+		    	$data['noarchive'] = true;
1995
+		    }
1996
+		    if (isset($line['route'])) {
1997
+		    	$data['waypoints'] = $line['route'];
1998
+		    }
1999
+		    // route
1467 2000
 		    if (isset($line['aircraftname'])) {
1468 2001
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
1469 2002
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
1470 2003
 	    		$aircraft_data = explode('-',$line['aircraftname']);
1471
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1472
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1473
-	    		else {
2004
+	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) {
2005
+	    			$data['aircraft_icao'] = $aircraft_data[0];
2006
+	    		} elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) {
2007
+	    			$data['aircraft_icao'] = $aircraft_data[1];
2008
+	    		} else {
1474 2009
 	    		    $aircraft_data = explode(' ',$line['aircraftname']);
1475
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1476
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
2010
+	    		    if (isset($aircraft_data[1])) {
2011
+	    		    	$data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
2012
+	    		    } else {
2013
+	    		    	$data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
2014
+	    		    }
1477 2015
 	    		}
1478 2016
 	    	    }
1479
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
2017
+    		    if (isset($line['route'])) {
2018
+    		    	$data['waypoints'] = $line['route'];
2019
+    		    }
1480 2020
     		    $data['id_source'] = $id_source;
1481 2021
 	    	    $data['format_source'] = 'phpvmacars';
1482
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
2022
+		    if (isset($value['name']) && $value['name'] != '') {
2023
+		    	$data['source_name'] = $value['name'];
2024
+		    }
1483 2025
 		    $SI->add($data);
1484 2026
 		    unset($data);
1485 2027
 		}
1486
-		if ($globalDebug) echo 'No more data...'."\n";
2028
+		if ($globalDebug) {
2029
+			echo 'No more data...'."\n";
2030
+		}
1487 2031
 		unset($buffer);
1488 2032
 		unset($all_data);
1489 2033
 	    }
@@ -1496,7 +2040,9 @@  discard block
 block discarded – undo
1496 2040
 	    )
1497 2041
 	) {
1498 2042
 	    //$buffer = $Common->getData($hosts[$id]);
1499
-	    if ($globalDebug) echo 'Get Data...'."\n";
2043
+	    if ($globalDebug) {
2044
+	    	echo 'Get Data...'."\n";
2045
+	    }
1500 2046
 	    $buffer = $Common->getData($value['host']);
1501 2047
 	    $all_data = json_decode($buffer,true);
1502 2048
 	    if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
@@ -1507,10 +2053,16 @@  discard block
 block discarded – undo
1507 2053
 	    	    //$data['id'] = $line['id']; // id not usable
1508 2054
 	    	    $data['id'] = $line['id'];
1509 2055
 	    	    //$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1510
-	    	    if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
1511
-	    	    if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
2056
+	    	    if (isset($line['user']['username'])) {
2057
+	    	    	$data['pilot_name'] = $line['user']['username'];
2058
+	    	    }
2059
+	    	    if (isset($line['user_id'])) {
2060
+	    	    	$data['pilot_id'] = $line['user_id'];
2061
+	    	    }
1512 2062
 	    	    $data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
1513
-	    	    if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
2063
+	    	    if (is_numeric($data['ident'])) {
2064
+	    	    	$data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
2065
+	    	    }
1514 2066
 	    	    $data['altitude'] = $line['altitude']; // altitude
1515 2067
 	    	    $data['speed'] = $line['groundspeed']; // speed
1516 2068
 	    	    $data['heading'] = $line['heading']; // heading
@@ -1523,7 +2075,9 @@  discard block
 block discarded – undo
1523 2075
 	    		$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
1524 2076
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1525 2077
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1526
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
2078
+	    	    } else {
2079
+	    	    	$data['datetime'] = date('Y-m-d H:i:s');
2080
+	    	    }
1527 2081
 	    	    
1528 2082
 	    	    $data['departure_airport_icao'] = $line['bid']['depapt']['icao'];
1529 2083
 	    	    $data['departure_airport_time'] = $line['bid']['deptime'];
@@ -1531,17 +2085,26 @@  discard block
 block discarded – undo
1531 2085
 		    $data['arrival_airport_time'] = $line['bid']['arrtime'];
1532 2086
 		    $data['registration'] = $line['bid']['aircraft']['registration'];
1533 2087
 
1534
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1535
-		    if (isset($line['bid']['route']) && $line['bid']['route'] != '') $data['waypoints'] = $line['bid']['route']; // route
2088
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
2089
+		    	$data['noarchive'] = true;
2090
+		    }
2091
+		    if (isset($line['bid']['route']) && $line['bid']['route'] != '') {
2092
+		    	$data['waypoints'] = $line['bid']['route'];
2093
+		    }
2094
+		    // route
1536 2095
 	    	    $data['aircraft_icao'] = $line['bid']['aircraft']['icao'];
1537 2096
 
1538 2097
     		    $data['id_source'] = $id_source;
1539 2098
 	    	    $data['format_source'] = 'vaos';
1540
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
2099
+		    if (isset($value['name']) && $value['name'] != '') {
2100
+		    	$data['source_name'] = $value['name'];
2101
+		    }
1541 2102
 		    $SI->add($data);
1542 2103
 		    unset($data);
1543 2104
 		}
1544
-		if ($globalDebug) echo 'No more data...'."\n";
2105
+		if ($globalDebug) {
2106
+			echo 'No more data...'."\n";
2107
+		}
1545 2108
 		unset($buffer);
1546 2109
 		unset($all_data);
1547 2110
 	    }
@@ -1554,7 +2117,9 @@  discard block
 block discarded – undo
1554 2117
 	    )
1555 2118
 	) {
1556 2119
 	    //$buffer = $Common->getData($hosts[$id]);
1557
-	    if ($globalDebug) echo 'Get Data...'."\n";
2120
+	    if ($globalDebug) {
2121
+	    	echo 'Get Data...'."\n";
2122
+	    }
1558 2123
 	    $buffer = $Common->getData($value['host']);
1559 2124
 	    $all_data = json_decode($buffer,true);
1560 2125
 	    if ($buffer != '' && is_array($all_data)) {
@@ -1583,16 +2148,25 @@  discard block
 block discarded – undo
1583 2148
 	    	    $data['arrival_airport_icao'] = $line['arrival'];
1584 2149
     		    //$data['arrival_airport_time'] = $line['arrival_time'];
1585 2150
     		    //$data['registration'] = $line['aircraft'];
1586
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
2151
+		    if (isset($line['route'])) {
2152
+		    	$data['waypoints'] = $line['route'];
2153
+		    }
2154
+		    // route
1587 2155
 	    	    $data['aircraft_icao'] = $line['plane_type'];
1588 2156
     		    $data['id_source'] = $id_source;
1589 2157
 	    	    $data['format_source'] = 'vam';
1590
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1591
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
2158
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
2159
+		    	$data['noarchive'] = true;
2160
+		    }
2161
+		    if (isset($value['name']) && $value['name'] != '') {
2162
+		    	$data['source_name'] = $value['name'];
2163
+		    }
1592 2164
 		    $SI->add($data);
1593 2165
 		    unset($data);
1594 2166
 		}
1595
-		if ($globalDebug) echo 'No more data...'."\n";
2167
+		if ($globalDebug) {
2168
+			echo 'No more data...'."\n";
2169
+		}
1596 2170
 		unset($buffer);
1597 2171
 		unset($all_data);
1598 2172
 	    }
@@ -1605,7 +2179,9 @@  discard block
 block discarded – undo
1605 2179
 	    )
1606 2180
 	) {
1607 2181
 	    //$buffer = $Common->getData($hosts[$id]);
1608
-	    if ($globalDebug) echo 'Get Data...'."\n";
2182
+	    if ($globalDebug) {
2183
+	    	echo 'Get Data...'."\n";
2184
+	    }
1609 2185
 	    $buffer = $Common->getData($value['host']);
1610 2186
 	    $all_data = json_decode($buffer,true);
1611 2187
 	    if ($buffer != '') {
@@ -1623,12 +2199,16 @@  discard block
 block discarded – undo
1623 2199
 			$data['id_source'] = $id_source;
1624 2200
 			$data['format_source'] = 'blitzortung';
1625 2201
 			$SI->add($data);
1626
-			if ($globalDebug) echo '☈ Lightning added'."\n";
2202
+			if ($globalDebug) {
2203
+				echo '☈ Lightning added'."\n";
2204
+			}
1627 2205
 			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
1628 2206
 			unset($data);
1629 2207
 		    }
1630 2208
 		}
1631
-		if ($globalDebug) echo 'No more data...'."\n";
2209
+		if ($globalDebug) {
2210
+			echo 'No more data...'."\n";
2211
+		}
1632 2212
 		unset($buffer);
1633 2213
 	    }
1634 2214
 	    $last_exec[$id]['last'] = time();
@@ -1657,10 +2237,15 @@  discard block
 block discarded – undo
1657 2237
                 }
1658 2238
             } else {
1659 2239
                 $format = $value['format'];
1660
-                if (isset($tt[$format])) $tt[$format]++;
1661
-                else $tt[$format] = 0;
2240
+                if (isset($tt[$format])) {
2241
+                	$tt[$format]++;
2242
+                } else {
2243
+                	$tt[$format] = 0;
2244
+                }
1662 2245
                 if ($tt[$format] > 30) {
1663
-                    if ($globalDebug) echo 'Reconnect...'."\n";
2246
+                    if ($globalDebug) {
2247
+                    	echo 'Reconnect...'."\n";
2248
+                    }
1664 2249
                     sleep(2);
1665 2250
                     //$sourceeen[] = $value;
1666 2251
                     //connect_all($sourceeen);
@@ -1677,7 +2262,9 @@  discard block
 block discarded – undo
1677 2262
 	    $write = NULL;
1678 2263
 	    $e = NULL;
1679 2264
 	    $n = socket_select($read, $write, $e, $timeout);
1680
-	    if ($e != NULL) var_dump($e);
2265
+	    if ($e != NULL) {
2266
+	    	var_dump($e);
2267
+	    }
1681 2268
 	    if ($n > 0) {
1682 2269
 		$reset = 0;
1683 2270
 		foreach ($read as $nb => $r) {
@@ -1699,13 +2286,17 @@  discard block
 block discarded – undo
1699 2286
 		    if ($buffer !== FALSE) {
1700 2287
 			if ($format === 'vrstcp') {
1701 2288
 			    $buffer = explode('},{',$buffer);
1702
-			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
2289
+			} else {
2290
+				$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
2291
+			}
1703 2292
 		    }
1704 2293
 		    // SBS format is CSV format
1705 2294
 		    if ($buffer !== FALSE && $buffer !== '') {
1706 2295
 			$tt[$format] = 0;
1707 2296
 			if ($format === 'acarssbs3') {
1708
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
2297
+			    if ($globalDebug) {
2298
+			    	echo 'ACARS : '.$buffer."\n";
2299
+			    }
1709 2300
 			    $ACARS->add(trim($buffer));
1710 2301
 			    $ACARS->deleteLiveAcarsData();
1711 2302
 			} elseif ($format === 'raw') {
@@ -1715,9 +2306,15 @@  discard block
 block discarded – undo
1715 2306
 				//if (!empty($data)) print_r($data);
1716 2307
 				$data['datetime'] = date('Y-m-d H:i:s');
1717 2308
 				$data['format_source'] = 'raw';
1718
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1719
-				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1720
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
2309
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
2310
+					$data['source_name'] = $globalSources[$nb]['name'];
2311
+				}
2312
+				if (isset($globalSources[$nb]['sourcestats'])) {
2313
+					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2314
+				}
2315
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2316
+					$data['noarchive'] = true;
2317
+				}
1721 2318
 				//if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1722 2319
 				$SI->add($data);
1723 2320
 				unset($data);
@@ -1725,22 +2322,54 @@  discard block
 block discarded – undo
1725 2322
 			} elseif ($format === 'ais') {
1726 2323
 			    $ais_data = $AIS->parse_line(trim($buffer));
1727 2324
 			    $data = array();
1728
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1729
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
1730
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1731
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1732
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1733
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1734
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1735
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1736
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1737
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1738
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1739
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1740
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1741
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1742
-			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1743
-			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2325
+			    if (isset($ais_data['ident'])) {
2326
+			    	$data['ident'] = $ais_data['ident'];
2327
+			    }
2328
+			    if (isset($ais_data['mmsi'])) {
2329
+			    	$data['mmsi'] = substr($ais_data['mmsi'],-9);
2330
+			    }
2331
+			    if (isset($ais_data['speed'])) {
2332
+			    	$data['speed'] = $ais_data['speed'];
2333
+			    }
2334
+			    if (isset($ais_data['heading'])) {
2335
+			    	$data['heading'] = $ais_data['heading'];
2336
+			    }
2337
+			    if (isset($ais_data['latitude'])) {
2338
+			    	$data['latitude'] = $ais_data['latitude'];
2339
+			    }
2340
+			    if (isset($ais_data['longitude'])) {
2341
+			    	$data['longitude'] = $ais_data['longitude'];
2342
+			    }
2343
+			    if (isset($ais_data['status'])) {
2344
+			    	$data['status'] = $ais_data['status'];
2345
+			    }
2346
+			    if (isset($ais_data['statusid'])) {
2347
+			    	$data['status_id'] = $ais_data['statusid'];
2348
+			    }
2349
+			    if (isset($ais_data['type'])) {
2350
+			    	$data['type'] = $ais_data['type'];
2351
+			    }
2352
+			    if (isset($ais_data['imo'])) {
2353
+			    	$data['imo'] = $ais_data['imo'];
2354
+			    }
2355
+			    if (isset($ais_data['callsign'])) {
2356
+			    	$data['callsign'] = $ais_data['callsign'];
2357
+			    }
2358
+			    if (isset($ais_data['destination'])) {
2359
+			    	$data['arrival_code'] = $ais_data['destination'];
2360
+			    }
2361
+			    if (isset($ais_data['eta_ts'])) {
2362
+			    	$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
2363
+			    }
2364
+			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2365
+			    	$data['noarchive'] = true;
2366
+			    }
2367
+			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
2368
+			    	$data['source_name'] = $globalSources[$nb]['name'];
2369
+			    }
2370
+			    if (isset($globalSources[$nb]['sourcestats'])) {
2371
+			    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2372
+			    }
1744 2373
 
1745 2374
 			    if (isset($ais_data['timestamp'])) {
1746 2375
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
@@ -1749,7 +2378,9 @@  discard block
 block discarded – undo
1749 2378
 			    }
1750 2379
 			    $data['format_source'] = 'aisnmea';
1751 2380
     			    $data['id_source'] = $id_source;
1752
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
2381
+			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') {
2382
+			    	$MI->add($data);
2383
+			    }
1753 2384
 			    unset($data);
1754 2385
                         } elseif ($format === 'flightgearsp') {
1755 2386
                     	    //echo $buffer."\n";
@@ -1767,17 +2398,25 @@  discard block
 block discarded – undo
1767 2398
 				$data['speed'] = round($line[5]*1.94384);
1768 2399
 				$data['datetime'] = date('Y-m-d H:i:s');
1769 2400
 				$data['format_source'] = 'flightgearsp';
1770
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1771
-				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
2401
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2402
+					$data['noarchive'] = true;
2403
+				}
2404
+				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
2405
+					$SI->add($data);
2406
+				}
1772 2407
 				//$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1773 2408
 			    }
1774 2409
                         } elseif ($format === 'acars') {
1775
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
2410
+                    	    if ($globalDebug) {
2411
+                    	    	echo 'ACARS : '.$buffer."\n";
2412
+                    	    }
1776 2413
 			    $ACARS->add(trim($buffer));
1777 2414
 			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1778 2415
 			    $ACARS->deleteLiveAcarsData();
1779 2416
 			} elseif ($format === 'acarsjsonudp') {
1780
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
2417
+			    if ($globalDebug) {
2418
+			    	echo 'ACARS : '.$buffer."\n";
2419
+			    }
1781 2420
                             $line = json_decode(trim($buffer), true);
1782 2421
                             if (!empty($line)) {
1783 2422
 				$line = array_merge(array('text' => '','tail' => '','label' => '','block_id' => '','flight' => '','msgno' => ''),$line);
@@ -1802,8 +2441,12 @@  discard block
 block discarded – undo
1802 2441
 				    $aircraft_type = $line[10];
1803 2442
 				    $aircraft_type = preg_split(':/:',$aircraft_type);
1804 2443
 				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1805
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1806
-				    if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
2444
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2445
+				    	$data['noarchive'] = true;
2446
+				    }
2447
+				    if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
2448
+				    	$SI->add($data);
2449
+				    }
1807 2450
 				}
1808 2451
 			    }
1809 2452
 			} elseif ($format === 'beast') {
@@ -1813,28 +2456,62 @@  discard block
 block discarded – undo
1813 2456
 			    foreach($buffer as $all_data) {
1814 2457
 				$line = json_decode('{'.$all_data.'}',true);
1815 2458
 				$data = array();
1816
-				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
1817
-				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
1818
-				if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
1819
-				if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
1820
-				if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
1821
-				if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
1822
-				if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
2459
+				if (isset($line['Icao'])) {
2460
+					$data['hex'] = $line['Icao'];
2461
+				}
2462
+				// hex
2463
+				if (isset($line['Call'])) {
2464
+					$data['ident'] = $line['Call'];
2465
+				}
2466
+				// ident
2467
+				if (isset($line['Alt'])) {
2468
+					$data['altitude'] = $line['Alt'];
2469
+				}
2470
+				// altitude
2471
+				if (isset($line['Spd'])) {
2472
+					$data['speed'] = $line['Spd'];
2473
+				}
2474
+				// speed
2475
+				if (isset($line['Trak'])) {
2476
+					$data['heading'] = $line['Trak'];
2477
+				}
2478
+				// heading
2479
+				if (isset($line['Lat'])) {
2480
+					$data['latitude'] = $line['Lat'];
2481
+				}
2482
+				// lat
2483
+				if (isset($line['Long'])) {
2484
+					$data['longitude'] = $line['Long'];
2485
+				}
2486
+				// long
1823 2487
 				//$data['verticalrate'] = $line['']; // verticale rate
1824
-				if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
2488
+				if (isset($line['Sqk'])) {
2489
+					$data['squawk'] = $line['Sqk'];
2490
+				}
2491
+				// squawk
1825 2492
 				$data['emergency'] = ''; // emergency
1826
-				if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
2493
+				if (isset($line['Reg'])) {
2494
+					$data['registration'] = $line['Reg'];
2495
+				}
1827 2496
 				/*
1828 2497
 				if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
1829 2498
 				else $data['datetime'] = date('Y-m-d H:i:s');
1830 2499
 				*/
1831 2500
 				$data['datetime'] = date('Y-m-d H:i:s');
1832
-				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
2501
+				if (isset($line['Type'])) {
2502
+					$data['aircraft_icao'] = $line['Type'];
2503
+				}
1833 2504
 		    		$data['format_source'] = 'vrstcp';
1834 2505
 				$data['id_source'] = $id_source;
1835
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1836
-				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1837
-				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
2506
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2507
+					$data['noarchive'] = true;
2508
+				}
2509
+				if (isset($value['name']) && $value['name'] != '') {
2510
+					$data['source_name'] = $value['name'];
2511
+				}
2512
+				if (isset($data['latitude']) && isset($data['hex'])) {
2513
+					$SI->add($data);
2514
+				}
1838 2515
 				unset($data);
1839 2516
 			    }
1840 2517
 			} elseif ($format === 'tsv' || substr($buffer,0,4) === 'clock') {
@@ -1847,22 +2524,46 @@  discard block
 block discarded – undo
1847 2524
     				$data['hex'] = $lined['hexid'];
1848 2525
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1849 2526
     				$data['datetime'] = date('Y-m-d H:i:s');;
1850
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1851
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1852
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1853
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1854
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1855
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1856
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
2527
+    				if (isset($lined['ident'])) {
2528
+    					$data['ident'] = $lined['ident'];
2529
+    				}
2530
+    				if (isset($lined['lat'])) {
2531
+    					$data['latitude'] = $lined['lat'];
2532
+    				}
2533
+    				if (isset($lined['lon'])) {
2534
+    					$data['longitude'] = $lined['lon'];
2535
+    				}
2536
+    				if (isset($lined['speed'])) {
2537
+    					$data['speed'] = $lined['speed'];
2538
+    				}
2539
+    				if (isset($lined['squawk'])) {
2540
+    					$data['squawk'] = $lined['squawk'];
2541
+    				}
2542
+    				if (isset($lined['alt'])) {
2543
+    					$data['altitude'] = $lined['alt'];
2544
+    				}
2545
+    				if (isset($lined['heading'])) {
2546
+    					$data['heading'] = $lined['heading'];
2547
+    				}
1857 2548
     				$data['id_source'] = $id_source;
1858 2549
     				$data['format_source'] = 'tsv';
1859
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1860
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1861
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1862
-    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
2550
+    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
2551
+    					$data['source_name'] = $globalSources[$nb]['name'];
2552
+    				}
2553
+    				if (isset($globalSources[$nb]['sourcestats'])) {
2554
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2555
+    				}
2556
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2557
+					$data['noarchive'] = true;
2558
+				}
2559
+    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
2560
+    					$SI->add($data);
2561
+    				}
1863 2562
     				unset($lined);
1864 2563
     				unset($data);
1865
-    			    } else $error = true;
2564
+    			    } else {
2565
+    			    	$error = true;
2566
+    			    }
1866 2567
 			} elseif ($format === 'aprs' && $use_aprs) {
1867 2568
 			    if ($aprs_connect === 0) {
1868 2569
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
@@ -1888,47 +2589,96 @@  discard block
 block discarded – undo
1888 2589
 				    $aprs_last_tx = time();
1889 2590
 				    $data = array();
1890 2591
 				    //print_r($line);
1891
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1892
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1893
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
1894
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1895
-				    if (isset($line['arrival_code'])) $data['arrival_code'] = $line['arrival_code'];
1896
-				    if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
1897
-				    if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
1898
-				    if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
1899
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1900
-				    else $data['datetime'] = date('Y-m-d H:i:s');
2592
+				    if (isset($line['address'])) {
2593
+				    	$data['hex'] = $line['address'];
2594
+				    }
2595
+				    if (isset($line['mmsi'])) {
2596
+				    	$data['mmsi'] = $line['mmsi'];
2597
+				    }
2598
+				    if (isset($line['imo'])) {
2599
+				    	$data['imo'] = $line['imo'];
2600
+				    }
2601
+				    if (isset($line['squawk'])) {
2602
+				    	$data['squawk'] = $line['squawk'];
2603
+				    }
2604
+				    if (isset($line['arrival_code'])) {
2605
+				    	$data['arrival_code'] = $line['arrival_code'];
2606
+				    }
2607
+				    if (isset($line['arrival_date'])) {
2608
+				    	$data['arrival_date'] = $line['arrival_date'];
2609
+				    }
2610
+				    if (isset($line['typeid'])) {
2611
+				    	$data['type_id'] = $line['typeid'];
2612
+				    }
2613
+				    if (isset($line['statusid'])) {
2614
+				    	$data['status_id'] = $line['statusid'];
2615
+				    }
2616
+				    if (isset($line['timestamp'])) {
2617
+				    	$data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
2618
+				    } else {
2619
+				    	$data['datetime'] = date('Y-m-d H:i:s');
2620
+				    }
1901 2621
 				    //$data['datetime'] = date('Y-m-d H:i:s');
1902
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
2622
+				    if (isset($line['ident'])) {
2623
+				    	$data['ident'] = $line['ident'];
2624
+				    }
1903 2625
 				    $data['latitude'] = $line['latitude'];
1904 2626
 				    $data['longitude'] = $line['longitude'];
1905 2627
 				    //$data['verticalrate'] = $line[16];
1906
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
2628
+				    if (isset($line['speed'])) {
2629
+				    	$data['speed'] = $line['speed'];
2630
+				    }
1907 2631
 				    //else $data['speed'] = 0;
1908
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1909
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1910
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
2632
+				    if (isset($line['altitude'])) {
2633
+				    	$data['altitude'] = $line['altitude'];
2634
+				    }
2635
+				    if (isset($line['comment'])) {
2636
+				    	$data['comment'] = $line['comment'];
2637
+				    }
2638
+				    if (isset($line['symbol'])) {
2639
+				    	$data['type'] = $line['symbol'];
2640
+				    }
1911 2641
 				    //if (isset($line['heading'])) $data['heading'] = $line['heading'];
1912 2642
 				    
1913
-				    if (isset($line['heading']) && isset($line['format_source'])) $data['heading'] = $line['heading'];
2643
+				    if (isset($line['heading']) && isset($line['format_source'])) {
2644
+				    	$data['heading'] = $line['heading'];
2645
+				    }
1914 2646
 				    //else echo 'No heading...'."\n";
1915 2647
 				    //else $data['heading'] = 0;
1916
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
2648
+				    if (isset($line['stealth'])) {
2649
+				    	$data['aircraft_type'] = $line['stealth'];
2650
+				    }
1917 2651
 				    //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1918
-				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
1919
-				    elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
1920
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1921
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
2652
+				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) {
2653
+				    	$data['noarchive'] = true;
2654
+				    } elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) {
2655
+				    	$data['noarchive'] = false;
2656
+				    }
2657
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2658
+				    	$data['noarchive'] = true;
2659
+				    } elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) {
2660
+				    	$data['noarchive'] = false;
2661
+				    }
1922 2662
     				    $data['id_source'] = $id_source;
1923
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1924
-				    else $data['format_source'] = 'aprs';
2663
+    				    if (isset($line['format_source'])) {
2664
+    				    	$data['format_source'] = $line['format_source'];
2665
+    				    } else {
2666
+				    	$data['format_source'] = 'aprs';
2667
+				    }
1925 2668
 				    $data['source_name'] = $line['source'];
1926
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1927
-				    else $data['source_type'] = 'flarm';
1928
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2669
+				    if (isset($line['source_type'])) {
2670
+				    	$data['source_type'] = $line['source_type'];
2671
+				    } else {
2672
+				    	$data['source_type'] = 'flarm';
2673
+				    }
2674
+    				    if (isset($globalSources[$nb]['sourcestats'])) {
2675
+    				    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2676
+    				    }
1929 2677
 				    $currentdate = date('Y-m-d H:i:s');
1930 2678
 				    $aprsdate = strtotime($data['datetime']);
1931
-				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
2679
+				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') {
2680
+				    	$data['altitude_relative'] = 'AMSL';
2681
+				    }
1932 2682
 				    // Accept data if time <= system time + 20s
1933 2683
 				    //if (($data['source_type'] === 'modes') || isset($line['stealth']) && ($line['stealth'] === 0 || $line['stealth'] === '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1934 2684
 				    if (
@@ -1940,7 +2690,9 @@  discard block
 block discarded – undo
1940 2690
 					$send = $SI->add($data);
1941 2691
 				    } elseif ($data['source_type'] === 'ais') {
1942 2692
 					$data['type'] = '';
1943
-					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
2693
+					if (isset($globalMarine) && $globalMarine) {
2694
+						$send = $MI->add($data);
2695
+					}
1944 2696
 				    } elseif (isset($line['stealth']) && $line['stealth'] != 0) {
1945 2697
 					 echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1946 2698
 				    } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
@@ -1948,8 +2700,12 @@  discard block
 block discarded – undo
1948 2700
 					    $line['symbol'] === 'Glider' || 
1949 2701
 					    $line['symbol'] === 'No. Plane' || 
1950 2702
 					    $line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter')) {
1951
-					    if ($line['symbol'] === 'Ballon') $data['aircraft_icao'] = 'BALL';
1952
-					    if ($line['symbol'] === 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
2703
+					    if ($line['symbol'] === 'Ballon') {
2704
+					    	$data['aircraft_icao'] = 'BALL';
2705
+					    }
2706
+					    if ($line['symbol'] === 'Glider') {
2707
+					    	$data['aircraft_icao'] = 'PARAGLIDER';
2708
+					    }
1953 2709
 					    $send = $SI->add($data);
1954 2710
 				    } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1955 2711
 					    $line['symbol'] === 'Yacht (Sail)' || 
@@ -1980,9 +2736,13 @@  discard block
 block discarded – undo
1980 2736
 				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1981 2737
 				//    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1982 2738
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1983
-					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
2739
+					if (isset($globalTracker) && $globalTracker) {
2740
+						$send = $TI->add($data);
2741
+					}
1984 2742
 				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1985
-					if (!isset($data['altitude'])) $data['altitude'] = 0;
2743
+					if (!isset($data['altitude'])) {
2744
+						$data['altitude'] = 0;
2745
+					}
1986 2746
 					$Source->deleteOldLocationByType('gs');
1987 2747
 					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
1988 2748
 						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
@@ -1991,7 +2751,9 @@  discard block
 block discarded – undo
1991 2751
 					}
1992 2752
 				    } elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
1993 2753
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1994
-					if ($globalDebug) echo '# Weather Station added'."\n";
2754
+					if ($globalDebug) {
2755
+						echo '# Weather Station added'."\n";
2756
+					}
1995 2757
 					$Source->deleteOldLocationByType('wx');
1996 2758
 					$weather_data = json_encode($line);
1997 2759
 					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
@@ -2001,7 +2763,9 @@  discard block
 block discarded – undo
2001 2763
 					}
2002 2764
 				    } elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
2003 2765
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
2004
-					if ($globalDebug) echo '☈ Lightning added'."\n";
2766
+					if ($globalDebug) {
2767
+						echo '☈ Lightning added'."\n";
2768
+					}
2005 2769
 					$Source->deleteOldLocationByType('lightning');
2006 2770
 					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
2007 2771
 						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
@@ -2013,8 +2777,7 @@  discard block
 block discarded – undo
2013 2777
 				    	print_r($line);
2014 2778
 				    }
2015 2779
 				    unset($data);
2016
-				}
2017
-				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
2780
+				} elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
2018 2781
 					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
2019 2782
 				}
2020 2783
 				/*
@@ -2023,7 +2786,9 @@  discard block
 block discarded – undo
2023 2786
 				}
2024 2787
 				*/
2025 2788
 				//elseif ($line === false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
2026
-				elseif ($line === true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
2789
+				elseif ($line === true && $globalDebug) {
2790
+					echo '!! Failed : '.$buffer."!!\n";
2791
+				}
2027 2792
 				if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
2028 2793
 					$Source->deleteOldLocationByType('lightning');
2029 2794
 					$Source->deleteOldLocationByType('wx');
@@ -2060,27 +2825,47 @@  discard block
 block discarded – undo
2060 2825
     				$data['ground'] = $line[21];
2061 2826
     				$data['emergency'] = $line[19];
2062 2827
     				$data['format_source'] = 'sbs';
2063
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
2064
-				elseif ($line[0] == 'MLAT') $data['source_name'] = 'MLAT';
2065
-				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2066
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
2828
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
2829
+					$data['source_name'] = $globalSources[$nb]['name'];
2830
+				} elseif ($line[0] == 'MLAT') {
2831
+					$data['source_name'] = 'MLAT';
2832
+				}
2833
+				if (isset($globalSources[$nb]['sourcestats'])) {
2834
+					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2835
+				}
2836
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2837
+					$data['noarchive'] = true;
2838
+				}
2067 2839
     				$data['id_source'] = $id_source;
2068
-    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
2069
-    				else $error = true;
2840
+    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
2841
+    					$send = $SI->add($data);
2842
+    				} else {
2843
+    					$error = true;
2844
+    				}
2070 2845
     				unset($data);
2071
-    			    } else $error = true;
2846
+    			    } else {
2847
+    			    	$error = true;
2848
+    			    }
2072 2849
 			    if ($error) {
2073 2850
 				if (count($line) > 1 && ($line[0] === 'STA' || $line[0] === 'AIR' || $line[0] === 'SEL' || $line[0] === 'ID' || $line[0] === 'CLK')) { 
2074
-					if ($globalDebug) echo "Not a message. Ignoring... \n";
2851
+					if ($globalDebug) {
2852
+						echo "Not a message. Ignoring... \n";
2853
+					}
2075 2854
 				} else {
2076
-					if ($globalDebug) echo "Wrong line format. Ignoring... \n";
2855
+					if ($globalDebug) {
2856
+						echo "Wrong line format. Ignoring... \n";
2857
+					}
2077 2858
 					if ($globalDebug) {
2078 2859
 						echo $buffer;
2079 2860
 						//print_r($line);
2080 2861
 					}
2081 2862
 					//socket_close($r);
2082
-					if ($globalDebug) echo "Reconnect after an error...\n";
2083
-					if ($format === 'aprs') $aprs_connect = 0;
2863
+					if ($globalDebug) {
2864
+						echo "Reconnect after an error...\n";
2865
+					}
2866
+					if ($format === 'aprs') {
2867
+						$aprs_connect = 0;
2868
+					}
2084 2869
 					$sourceer[$nb] = $globalSources[$nb];
2085 2870
 					connect_all($sourceer);
2086 2871
 					$sourceer = array();
@@ -2088,10 +2873,14 @@  discard block
 block discarded – undo
2088 2873
 			    }
2089 2874
 			}
2090 2875
 			// Sleep for xxx microseconds
2091
-			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
2876
+			if (isset($globalSBSSleep)) {
2877
+				usleep($globalSBSSleep);
2878
+			}
2092 2879
 		    } else {
2093 2880
 			if ($format === 'flightgearmp') {
2094
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
2881
+			    	if ($globalDebug) {
2882
+			    		echo "Reconnect FlightGear MP...";
2883
+			    	}
2095 2884
 				//@socket_close($r);
2096 2885
 				sleep($globalMinFetch);
2097 2886
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -2100,10 +2889,15 @@  discard block
 block discarded – undo
2100 2889
 				break;
2101 2890
 				
2102 2891
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
2103
-			    if (isset($tt[$format])) $tt[$format]++;
2104
-			    else $tt[$format] = 0;
2892
+			    if (isset($tt[$format])) {
2893
+			    	$tt[$format]++;
2894
+			    } else {
2895
+			    	$tt[$format] = 0;
2896
+			    }
2105 2897
 			    if ($tt[$format] > 30 || $buffer === FALSE) {
2106
-				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
2898
+				if ($globalDebug) {
2899
+					echo "ERROR : Reconnect ".$format."...";
2900
+				}
2107 2901
 				//@socket_close($r);
2108 2902
 				sleep(2);
2109 2903
 				$aprs_connect = 0;
@@ -2121,11 +2915,17 @@  discard block
 block discarded – undo
2121 2915
 	    } else {
2122 2916
 		$error = socket_strerror(socket_last_error());
2123 2917
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
2124
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
2125
-			if (isset($globalDebug)) echo "Restarting...\n";
2918
+			if ($globalDebug) {
2919
+				echo "ERROR : socket_select give this error ".$error . "\n";
2920
+			}
2921
+			if (isset($globalDebug)) {
2922
+				echo "Restarting...\n";
2923
+			}
2126 2924
 			// Restart the script if possible
2127 2925
 			if (is_array($sockets)) {
2128
-			    if ($globalDebug) echo "Shutdown all sockets...";
2926
+			    if ($globalDebug) {
2927
+			    	echo "Shutdown all sockets...";
2928
+			    }
2129 2929
 			    
2130 2930
 			    foreach ($sockets as $sock) {
2131 2931
 				@socket_shutdown($sock,2);
@@ -2133,25 +2933,45 @@  discard block
 block discarded – undo
2133 2933
 			    }
2134 2934
 			    
2135 2935
 			}
2136
-			if ($globalDebug) echo "Waiting...";
2936
+			if ($globalDebug) {
2937
+				echo "Waiting...";
2938
+			}
2137 2939
 			sleep(2);
2138 2940
 			$time = time();
2139 2941
 			//connect_all($hosts);
2140 2942
 			$aprs_connect = 0;
2141
-			if ($reset%5 === 0) sleep(20);
2142
-			if ($reset%10 === 0) sleep(100);
2143
-			if ($reset%20 === 0) sleep(200);
2144
-			if ($reset > 100) exit('Too many attempts...');
2145
-			if ($globalDebug) echo "Restart all connections...";
2943
+			if ($reset%5 === 0) {
2944
+				sleep(20);
2945
+			}
2946
+			if ($reset%10 === 0) {
2947
+				sleep(100);
2948
+			}
2949
+			if ($reset%20 === 0) {
2950
+				sleep(200);
2951
+			}
2952
+			if ($reset > 100) {
2953
+				exit('Too many attempts...');
2954
+			}
2955
+			if ($globalDebug) {
2956
+				echo "Restart all connections...";
2957
+			}
2146 2958
 			connect_all($globalSources);
2147 2959
 		}
2148 2960
 	    }
2149 2961
 	}
2150 2962
 	if ($globalDaemon === false) {
2151
-	    if ($globalDebug) echo 'Check all...'."\n";
2152
-	    if (isset($SI)) $SI->checkAll();
2153
-	    if (isset($TI)) $TI->checkAll();
2154
-	    if (isset($MI)) $MI->checkAll();
2963
+	    if ($globalDebug) {
2964
+	    	echo 'Check all...'."\n";
2965
+	    }
2966
+	    if (isset($SI)) {
2967
+	    	$SI->checkAll();
2968
+	    }
2969
+	    if (isset($TI)) {
2970
+	    	$TI->checkAll();
2971
+	    }
2972
+	    if (isset($MI)) {
2973
+	    	$MI->checkAll();
2974
+	    }
2155 2975
 	}
2156 2976
     }
2157 2977
 }
Please login to merge, or discard this patch.