Completed
Push — master ( 597a61...2224b9 )
by Yannick
25:05
created
require/class.APRS.php 4 patches
Doc Comments   +7 added lines patch added patch discarded remove patch
@@ -165,6 +165,10 @@  discard block
 block discarded – undo
165 165
 	'\~' => 'TNC Stream SW');
166 166
 	
167 167
 
168
+    /**
169
+     * @param integer $n
170
+     * @param integer $s
171
+     */
168 172
     private function urshift($n, $s) {
169 173
 	return ($n >= 0) ? ($n >> $s) :
170 174
 	    (($n & 0x7fffffff) >> $s) | 
@@ -565,6 +569,9 @@  discard block
 block discarded – undo
565 569
 	socket_close($this->socket);
566 570
     }
567 571
     
572
+    /**
573
+     * @param string $data
574
+     */
568 575
     public function send($data) {
569 576
 	global $globalDebug;
570 577
 	if ($this->connected === false) $this->connect();
Please login to merge, or discard this patch.
Indentation   +165 added lines, -165 removed lines patch added patch discarded remove patch
@@ -3,10 +3,10 @@  discard block
 block discarded – undo
3 3
 require_once(dirname(__FILE__).'/class.Common.php');
4 4
 require_once(dirname(__FILE__).'/class.GeoidHeight.php');
5 5
 class aprs {
6
-    private $socket;
7
-    private $connected = false;
6
+	private $socket;
7
+	private $connected = false;
8 8
 
9
-    protected $symbols = array('/!' => 'Police',
9
+	protected $symbols = array('/!' => 'Police',
10 10
 	'/#' => 'DIGI',
11 11
 	'/$' => 'Phone',
12 12
 	'/%' => 'DX Cluster',
@@ -166,13 +166,13 @@  discard block
 block discarded – undo
166 166
 	'\~' => 'TNC Stream SW');
167 167
 	
168 168
 
169
-    private function urshift($n, $s) {
169
+	private function urshift($n, $s) {
170 170
 	return ($n >= 0) ? ($n >> $s) :
171
-	    (($n & 0x7fffffff) >> $s) | 
171
+		(($n & 0x7fffffff) >> $s) | 
172 172
 		(0x40000000 >> ($s - 1));
173
-    }
173
+	}
174 174
 
175
-    public function parse($input) {
175
+	public function parse($input) {
176 176
 	global $globalDebug;
177 177
 	$debug = false;
178 178
 	$result = array();
@@ -184,8 +184,8 @@  discard block
 block discarded – undo
184 184
 	
185 185
 	/* Check that end was found and body has at least one byte. */
186 186
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
187
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
188
-	    return false;
187
+		if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
188
+		return false;
189 189
 	}
190 190
 	
191 191
 	if ($debug) echo 'input : '.$input."\n";
@@ -199,34 +199,34 @@  discard block
 block discarded – undo
199 199
 	/* Parse source, target and path. */
200 200
 	//FLRDF0A52>APRS,qAS,LSTB
201 201
 	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
202
-	    $ident = $matches[1];
203
-	    $all_elements = $matches[2];
204
-	    if ($ident == 'AIRCRAFT') {
202
+		$ident = $matches[1];
203
+		$all_elements = $matches[2];
204
+		if ($ident == 'AIRCRAFT') {
205 205
 		$result['format_source'] = 'famaprs';
206 206
 		$result['source_type'] = 'modes';
207
-	    } elseif ($ident == 'MARINE') {
207
+		} elseif ($ident == 'MARINE') {
208 208
 		$result['format_source'] = 'famaprs';
209 209
 		$result['source_type'] = 'ais';
210
-	    } else {
210
+		} else {
211 211
 		if ($debug) echo 'ident : '.$ident."\n";
212 212
 		$result['ident'] = $ident;
213
-	    }
213
+		}
214 214
 	} else {
215
-	    if ($debug) 'No ident'."\n";
216
-	    return false;
215
+		if ($debug) 'No ident'."\n";
216
+		return false;
217 217
 	}
218 218
 	$elements = explode(',',$all_elements);
219 219
 	$source = end($elements);
220 220
 	$result['source'] = $source;
221 221
 	foreach ($elements as $element) {
222
-	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
223
-	        //echo "ok";
224
-	        //if ($element == 'TCPIP*') return false;
225
-	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
222
+		if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
223
+			//echo "ok";
224
+			//if ($element == 'TCPIP*') return false;
225
+		} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
226 226
 		if ($debug) echo 'element : '.$element."\n";
227 227
 		return false;
228
-	    }
229
-	    /*
228
+		}
229
+		/*
230 230
 	    } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) {
231 231
 		//echo "ok";
232 232
 	    } else {
@@ -253,48 +253,48 @@  discard block
 block discarded – undo
253 253
 	$body_parse = substr($body,1);
254 254
 	//echo 'Body : '.$body."\n";
255 255
 	if (preg_match('/^;(.){9}\*/',$body,$matches)) {
256
-	    $body_parse = substr($body_parse,10);
257
-	    $find = true;
258
-	    //echo $body_parse."\n";
256
+		$body_parse = substr($body_parse,10);
257
+		$find = true;
258
+		//echo $body_parse."\n";
259 259
 	}
260 260
 	if (preg_match('/^`(.*)\//',$body,$matches)) {
261
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
262
-	    $find = true;
263
-	    //echo $body_parse."\n";
261
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
262
+		$find = true;
263
+		//echo $body_parse."\n";
264 264
 	}
265 265
 	if (preg_match("/^'(.*)\//",$body,$matches)) {
266
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
267
-	    $find = true;
268
-	    //echo $body_parse."\n";
266
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
267
+		$find = true;
268
+		//echo $body_parse."\n";
269 269
 	}
270 270
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
271
-	    $find = true;
272
-	    //print_r($matches);
273
-	    $timestamp = $matches[0];
274
-	    if ($matches[4] == 'h') {
271
+		$find = true;
272
+		//print_r($matches);
273
+		$timestamp = $matches[0];
274
+		if ($matches[4] == 'h') {
275 275
 		$timestamp = strtotime(date('Ymd').' '.$matches[1].':'.$matches[2].':'.$matches[3]);
276 276
 		//echo 'timestamp : '.$timestamp.' - now : '.time()."\n";
277 277
 		/*
278 278
 		if (time() + 3900 < $timestamp) $timestamp -= 86400;
279 279
 		elseif (time() - 82500 > $timestamp) $timestamp += 86400;
280 280
 		*/
281
-	    } elseif ($matches[4] == 'z' || $matches[4] == '/') {
281
+		} elseif ($matches[4] == 'z' || $matches[4] == '/') {
282 282
 		// This work or not ?
283 283
 		$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
284
-	    }
285
-	    $body_parse = substr($body_parse,7);
286
-	    $result['timestamp'] = $timestamp;
287
-	    //echo date('Ymd H:i:s',$timestamp);
284
+		}
285
+		$body_parse = substr($body_parse,7);
286
+		$result['timestamp'] = $timestamp;
287
+		//echo date('Ymd H:i:s',$timestamp);
288 288
 	}
289 289
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
290
-	    $find = true;
291
-	    $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
292
-	    $body_parse = substr($body_parse,8);
293
-	    $result['timestamp'] = $timestamp;
294
-	    //echo date('Ymd H:i:s',$timestamp);
290
+		$find = true;
291
+		$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
292
+		$body_parse = substr($body_parse,8);
293
+		$result['timestamp'] = $timestamp;
294
+		//echo date('Ymd H:i:s',$timestamp);
295 295
 	}
296 296
 	//if (strlen($body_parse) > 19) {
297
-	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
297
+		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
298 298
 		$find = true;
299 299
 		// 4658.70N/00707.78Ez
300 300
 		//print_r(str_split($body_parse));
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 		$lon = intval($lon_deg);
314 314
 		if ($lat > 89 || $lon > 179) return false;
315 315
 	    
316
-	    /*
316
+		/*
317 317
 	    $tmp_5b = str_replace('.','',$lat_min);
318 318
 	    if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) {
319 319
 	        print_r($matches);
@@ -327,9 +327,9 @@  discard block
 block discarded – undo
327 327
 		$result['longitude'] = $longitude;
328 328
 		$body_parse = substr($body_parse,18);
329 329
 		$body_parse_len = strlen($body_parse);
330
-	    }
331
-	    $body_parse_len = strlen($body_parse);
332
-	    if ($body_parse_len > 0) {
330
+		}
331
+		$body_parse_len = strlen($body_parse);
332
+		if ($body_parse_len > 0) {
333 333
 		/*
334 334
 		if (!isset($result['timestamp']) && !isset($result['latitude'])) {
335 335
 			$body_split = str_split($body);
@@ -363,95 +363,95 @@  discard block
 block discarded – undo
363 363
 			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
364 364
 			if ($symbol_code != '_') {
365 365
 			}
366
-		    //$body_parse = substr($body_parse,1);
367
-		    //$body_parse = trim($body_parse);
368
-		    //$body_parse_len = strlen($body_parse);
369
-		    if ($body_parse_len >= 7) {
366
+			//$body_parse = substr($body_parse,1);
367
+			//$body_parse = trim($body_parse);
368
+			//$body_parse_len = strlen($body_parse);
369
+			if ($body_parse_len >= 7) {
370 370
 			
371
-		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
372
-		    	    $course = substr($body_parse,0,3);
373
-		    	    $tmp_s = intval($course);
374
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
375
-		    	    $speed = substr($body_parse,4,3);
376
-		    	    if ($speed != '...') {
377
-		    		//$result['speed'] = round($speed*1.852);
378
-		    		$result['speed'] = intval($speed);
379
-		    	    }
380
-		    	    $body_parse = substr($body_parse,7);
381
-		        }
382
-		        // Check PHGR, PHG, RNG
383
-		    } 
384
-		    /*
371
+				if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
372
+					$course = substr($body_parse,0,3);
373
+					$tmp_s = intval($course);
374
+					if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
375
+					$speed = substr($body_parse,4,3);
376
+					if ($speed != '...') {
377
+					//$result['speed'] = round($speed*1.852);
378
+					$result['speed'] = intval($speed);
379
+					}
380
+					$body_parse = substr($body_parse,7);
381
+				}
382
+				// Check PHGR, PHG, RNG
383
+			} 
384
+			/*
385 385
 		    else if ($body_parse_len > 0) {
386 386
 			$rest = $body_parse;
387 387
 		    }
388 388
 		    */
389
-		    if (strlen($body_parse) > 0) {
390
-		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
391
-		            $altitude = intval($matches[1]);
392
-		            //$result['altitude'] = round($altitude*0.3048);
393
-		            $result['altitude'] = $altitude;
394
-		            //$body_parse = trim(substr($body_parse,strlen($matches[0])));
395
-		            $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
396
-		        }
397
-		    }
389
+			if (strlen($body_parse) > 0) {
390
+				if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
391
+					$altitude = intval($matches[1]);
392
+					//$result['altitude'] = round($altitude*0.3048);
393
+					$result['altitude'] = $altitude;
394
+					//$body_parse = trim(substr($body_parse,strlen($matches[0])));
395
+					$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
396
+				}
397
+			}
398 398
 		    
399
-		    // Telemetry
400
-		    /*
399
+			// Telemetry
400
+			/*
401 401
 		    if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) {
402 402
 		        // Nothing yet...
403 403
 		    }
404 404
 		    */
405
-		    // DAO
405
+			// DAO
406 406
 		    
407
-		    if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
407
+			if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
408 408
 			    
409
-			    $dao = $matches[1];
410
-			    if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
409
+				$dao = $matches[1];
410
+				if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
411 411
 				$dao_split = str_split($dao);
412
-			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
413
-			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
412
+					$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
413
+					$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
414 414
 			    
415 415
 				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
416 416
 				else $result['latitude'] += $lat_off;
417 417
 				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
418 418
 				else $result['longitude'] += $lon_off;
419
-			    }
419
+				}
420 420
 			    
421
-		            $body_parse = substr($body_parse,6);
422
-		    }
421
+					$body_parse = substr($body_parse,6);
422
+			}
423 423
 		    
424
-		    if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
424
+			if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
425 425
 			$result['ident'] = str_replace('_',' ',$matches[1]);
426
-		    }
427
-		    if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
426
+			}
427
+			if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
428 428
 			$result['squawk'] = $matches[1];
429
-		    }
430
-		    if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
429
+			}
430
+			if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
431 431
 			$result['aircraft_icao'] = $matches[1];
432
-		    }
433
-		    if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) {
432
+			}
433
+			if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) {
434 434
 			$result['verticalrate'] = $matches[1];
435
-		    }
436
-		    if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
435
+			}
436
+			if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
437 437
 			$result['typeid'] = $matches[1];
438
-		    }
439
-		    if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
438
+			}
439
+			if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
440 440
 			$result['statusid'] = $matches[1];
441
-		    }
442
-		    if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
441
+			}
442
+			if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
443 443
 			$result['imo'] = $matches[1];
444
-		    }
445
-		    if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
444
+			}
445
+			if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
446 446
 			$result['arrival_date'] = $matches[1];
447
-		    }
448
-		    if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
447
+			}
448
+			if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
449 449
 			$result['arrival_code'] = str_replace('_',' ',$matches[1]);
450
-		    }
451
-		    // OGN comment
450
+			}
451
+			// OGN comment
452 452
 		   // echo "Before OGN : ".$body_parse."\n";
453
-		    //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
454
-		    if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
453
+			//if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
454
+			if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
455 455
 			$id = $matches[1];
456 456
 			//$mode = substr($id,0,2);
457 457
 			$address = substr($id,2);
@@ -481,42 +481,42 @@  discard block
 block discarded – undo
481 481
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
482 482
 			$result['stealth'] = $stealth;
483 483
 			$result['address'] = $address;
484
-		    }
484
+			}
485 485
 		    
486
-		    //Comment
487
-		    $result['comment'] = trim($body_parse);
486
+			//Comment
487
+			$result['comment'] = trim($body_parse);
488 488
 		//} else {
489
-		    // parse weather
490
-		    //$body_parse = substr($body_parse,1);
491
-		    //$body_parse_len = strlen($body_parse);
492
-		    //echo 'weather'."\n";
493
-		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
494
-			    $result['wind_dir'] = intval($matches[1]);
495
-			    $result['wind_speed'] = round(intval($matches[2])*1.60934,1);
496
-			    $result['wind_gust'] = round(intval($matches[3])*1.60934,1);
497
-			    $result['temp'] = round(5/9*((intval($matches[4]))-32),1);
498
-		    	    $body_parse = substr($body_parse,strlen($matches[0])+1);
499
-		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
489
+			// parse weather
490
+			//$body_parse = substr($body_parse,1);
491
+			//$body_parse_len = strlen($body_parse);
492
+			//echo 'weather'."\n";
493
+			if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
494
+				$result['wind_dir'] = intval($matches[1]);
495
+				$result['wind_speed'] = round(intval($matches[2])*1.60934,1);
496
+				$result['wind_gust'] = round(intval($matches[3])*1.60934,1);
497
+				$result['temp'] = round(5/9*((intval($matches[4]))-32),1);
498
+					$body_parse = substr($body_parse,strlen($matches[0])+1);
499
+			} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
500 500
 			$result['wind_dir'] = intval($matches[1]);
501 501
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
502 502
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
503 503
 			$result['temp'] = round(5/9*(($matches[4])-32),1);
504
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
505
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
504
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
505
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
506 506
 			$result['wind_dir'] = intval($matches[1]);
507 507
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
508 508
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
509
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
510
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
509
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
510
+			} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
511 511
 			$result['wind_dir'] = intval($matches[1]);
512 512
 			$result['wind_speed'] = round($matches[2]*1.60934,1);
513 513
 			$result['wind_gust'] = round($matches[3]*1.60934,1);
514
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
515
-		    }
516
-		    //if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
517
-		    //g012t088r000p000P000h38b10110
518
-		    //g011t086r000p000P000h29b10198
519
-		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
514
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
515
+			}
516
+			//if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
517
+			//g012t088r000p000P000h38b10110
518
+			//g011t086r000p000P000h29b10198
519
+			if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
520 520
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
521 521
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
522 522
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
@@ -524,8 +524,8 @@  discard block
 block discarded – undo
524 524
 			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
525 525
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
526 526
 			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
527
-		        $body_parse = substr($body_parse,strlen($matches[0]));
528
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
527
+				$body_parse = substr($body_parse,strlen($matches[0]));
528
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
529 529
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
530 530
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
531 531
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
@@ -533,8 +533,8 @@  discard block
 block discarded – undo
533 533
 			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
534 534
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
535 535
 			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
536
-		        $body_parse = substr($body_parse,strlen($matches[0]));
537
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
536
+				$body_parse = substr($body_parse,strlen($matches[0]));
537
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
538 538
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
539 539
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
540 540
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
@@ -542,58 +542,58 @@  discard block
 block discarded – undo
542 542
 			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
543 543
 			if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
544 544
 			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
545
-		        $body_parse = substr($body_parse,strlen($matches[0]));
546
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
545
+				$body_parse = substr($body_parse,strlen($matches[0]));
546
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
547 547
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
548 548
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
549 549
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
550 550
 			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
551 551
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
552 552
 			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
553
-		        $body_parse = substr($body_parse,strlen($matches[0]));
554
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
553
+				$body_parse = substr($body_parse,strlen($matches[0]));
554
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
555 555
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
556 556
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
557 557
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
558 558
 			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
559 559
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
560 560
 			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
561
-		        $body_parse = substr($body_parse,strlen($matches[0]));
562
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
561
+				$body_parse = substr($body_parse,strlen($matches[0]));
562
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
563 563
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
564 564
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
565 565
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
566 566
 			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
567 567
 			if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
568 568
 			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
569
-		        $body_parse = substr($body_parse,strlen($matches[0]));
570
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
569
+				$body_parse = substr($body_parse,strlen($matches[0]));
570
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
571 571
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
572 572
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
573 573
 			if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
574 574
 			if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
575
-		        $body_parse = substr($body_parse,strlen($matches[0]));
576
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
575
+				$body_parse = substr($body_parse,strlen($matches[0]));
576
+			} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
577 577
 			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
578 578
 			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
579 579
 			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
580 580
 			if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
581 581
 			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
582
-		        $body_parse = substr($body_parse,strlen($matches[0]));
583
-		    }
584
-		    $result['comment'] = trim($body_parse);
582
+				$body_parse = substr($body_parse,strlen($matches[0]));
583
+			}
584
+			$result['comment'] = trim($body_parse);
585 585
 		}
586 586
 		} else $result['comment'] = trim($body_parse);
587 587
 
588
-	    }
588
+		}
589 589
 	//}
590 590
 	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
591 591
 	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
592 592
 	if ($debug) print_r($result);
593 593
 	return $result;
594
-    }
594
+	}
595 595
     
596
-    public function connect() {
596
+	public function connect() {
597 597
 	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
598 598
 	$aprs_connect = 0;
599 599
 	$aprs_keep = 120;
@@ -617,24 +617,24 @@  discard block
 block discarded – undo
617 617
 		socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1);
618 618
 		while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
619 619
 			if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
620
-			    echo 'APRS user verified !'."\n";
621
-			    $this->connected = true;
622
-			    return true;
623
-			    break;
620
+				echo 'APRS user verified !'."\n";
621
+				$this->connected = true;
622
+				return true;
623
+				break;
624 624
 			}
625 625
 			if (time()-$authstart > 5) {
626
-			    echo 'APRS timeout'."\n";
627
-			    break;
626
+				echo 'APRS timeout'."\n";
627
+				break;
628 628
 			}
629 629
 		}
630 630
 	}
631
-    }
631
+	}
632 632
 
633
-    public function disconnect() {
633
+	public function disconnect() {
634 634
 	socket_close($this->socket);
635
-    }
635
+	}
636 636
     
637
-    public function send($data) {
637
+	public function send($data) {
638 638
 	global $globalDebug;
639 639
 	if ($this->connected === false) $this->connect();
640 640
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
@@ -643,7 +643,7 @@  discard block
 block discarded – undo
643 643
 		socket_close($this->socket);
644 644
 		$this->connect();
645 645
 	}
646
-    }
646
+	}
647 647
 }
648 648
 
649 649
 class APRSSpotter extends APRS {
Please login to merge, or discard this patch.
Spacing   +157 added lines, -158 removed lines patch added patch discarded remove patch
@@ -167,8 +167,7 @@  discard block
 block discarded – undo
167 167
 	
168 168
 
169 169
     private function urshift($n, $s) {
170
-	return ($n >= 0) ? ($n >> $s) :
171
-	    (($n & 0x7fffffff) >> $s) | 
170
+	return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| 
172 171
 		(0x40000000 >> ($s - 1));
173 172
     }
174 173
 
@@ -180,7 +179,7 @@  discard block
 block discarded – undo
180 179
 	//$split_input = str_split($input);
181 180
 
182 181
 	/* Find the end of header checking for NULL bytes while doing it. */
183
-	$splitpos = strpos($input,':');
182
+	$splitpos = strpos($input, ':');
184 183
 	
185 184
 	/* Check that end was found and body has at least one byte. */
186 185
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
@@ -190,15 +189,15 @@  discard block
 block discarded – undo
190 189
 	
191 190
 	if ($debug) echo 'input : '.$input."\n";
192 191
 	/* Save header and body. */
193
-	$body = substr($input,$splitpos+1,$input_len);
192
+	$body = substr($input, $splitpos + 1, $input_len);
194 193
 	$body_len = strlen($body);
195
-	$header = substr($input,0,$splitpos);
194
+	$header = substr($input, 0, $splitpos);
196 195
 	//$header_len = strlen($header);
197 196
 	if ($debug) echo 'header : '.$header."\n";
198 197
 	
199 198
 	/* Parse source, target and path. */
200 199
 	//FLRDF0A52>APRS,qAS,LSTB
201
-	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
200
+	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/', $header, $matches)) {
202 201
 	    $ident = $matches[1];
203 202
 	    $all_elements = $matches[2];
204 203
 	    if ($ident == 'AIRCRAFT') {
@@ -215,14 +214,14 @@  discard block
 block discarded – undo
215 214
 	    if ($debug) 'No ident'."\n";
216 215
 	    return false;
217 216
 	}
218
-	$elements = explode(',',$all_elements);
217
+	$elements = explode(',', $all_elements);
219 218
 	$source = end($elements);
220 219
 	$result['source'] = $source;
221 220
 	foreach ($elements as $element) {
222
-	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
221
+	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/', $element)) {
223 222
 	        //echo "ok";
224 223
 	        //if ($element == 'TCPIP*') return false;
225
-	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
224
+	    } elseif (!preg_match('/^([0-9A-F]{32})$/', $element)) {
226 225
 		if ($debug) echo 'element : '.$element."\n";
227 226
 		return false;
228 227
 	    }
@@ -235,14 +234,14 @@  discard block
 block discarded – undo
235 234
 	    */
236 235
 	}
237 236
 	
238
-	$type = substr($body,0,1);
237
+	$type = substr($body, 0, 1);
239 238
 	if ($debug) echo 'type : '.$type."\n";
240 239
 	if ($type == ';') {
241 240
 		if (isset($result['source_type']) && $result['source_type'] == 'modes') {
242
-			$result['address'] = trim(substr($body,1,9));
241
+			$result['address'] = trim(substr($body, 1, 9));
243 242
 		} elseif (isset($result['source_type']) && $result['source_type'] == 'ais') {
244
-			$result['mmsi'] = trim(substr($body,1,9));
245
-		} else $result['ident'] = trim(substr($body,1,9));
243
+			$result['mmsi'] = trim(substr($body, 1, 9));
244
+		} else $result['ident'] = trim(substr($body, 1, 9));
246 245
 	} elseif ($type == ',') {
247 246
 		// Invalid data or test data
248 247
 		return false;
@@ -250,24 +249,24 @@  discard block
 block discarded – undo
250 249
 	
251 250
 	// Check for Timestamp
252 251
 	$find = false;
253
-	$body_parse = substr($body,1);
252
+	$body_parse = substr($body, 1);
254 253
 	//echo 'Body : '.$body."\n";
255
-	if (preg_match('/^;(.){9}\*/',$body,$matches)) {
256
-	    $body_parse = substr($body_parse,10);
254
+	if (preg_match('/^;(.){9}\*/', $body, $matches)) {
255
+	    $body_parse = substr($body_parse, 10);
257 256
 	    $find = true;
258 257
 	    //echo $body_parse."\n";
259 258
 	}
260
-	if (preg_match('/^`(.*)\//',$body,$matches)) {
261
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
259
+	if (preg_match('/^`(.*)\//', $body, $matches)) {
260
+	    $body_parse = substr($body_parse, strlen($matches[1]) - 1);
262 261
 	    $find = true;
263 262
 	    //echo $body_parse."\n";
264 263
 	}
265
-	if (preg_match("/^'(.*)\//",$body,$matches)) {
266
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
264
+	if (preg_match("/^'(.*)\//", $body, $matches)) {
265
+	    $body_parse = substr($body_parse, strlen($matches[1]) - 1);
267 266
 	    $find = true;
268 267
 	    //echo $body_parse."\n";
269 268
 	}
270
-	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
269
+	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) {
271 270
 	    $find = true;
272 271
 	    //print_r($matches);
273 272
 	    $timestamp = $matches[0];
@@ -282,19 +281,19 @@  discard block
 block discarded – undo
282 281
 		// This work or not ?
283 282
 		$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
284 283
 	    }
285
-	    $body_parse = substr($body_parse,7);
284
+	    $body_parse = substr($body_parse, 7);
286 285
 	    $result['timestamp'] = $timestamp;
287 286
 	    //echo date('Ymd H:i:s',$timestamp);
288 287
 	}
289
-	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
288
+	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $body_parse, $matches)) {
290 289
 	    $find = true;
291 290
 	    $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
292
-	    $body_parse = substr($body_parse,8);
291
+	    $body_parse = substr($body_parse, 8);
293 292
 	    $result['timestamp'] = $timestamp;
294 293
 	    //echo date('Ymd H:i:s',$timestamp);
295 294
 	}
296 295
 	//if (strlen($body_parse) > 19) {
297
-	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
296
+	    if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/', $body_parse, $matches)) {
298 297
 		$find = true;
299 298
 		// 4658.70N/00707.78Ez
300 299
 		//print_r(str_split($body_parse));
@@ -321,11 +320,11 @@  discard block
 block discarded – undo
321 320
 	    */
322 321
 		$latitude = $lat + floatval($lat_min)/60;
323 322
 		$longitude = $lon + floatval($lon_min)/60;
324
-		if ($sind == 'S') $latitude = 0-$latitude;
325
-		if ($wind == 'W') $longitude = 0-$longitude;
323
+		if ($sind == 'S') $latitude = 0 - $latitude;
324
+		if ($wind == 'W') $longitude = 0 - $longitude;
326 325
 		$result['latitude'] = $latitude;
327 326
 		$result['longitude'] = $longitude;
328
-		$body_parse = substr($body_parse,18);
327
+		$body_parse = substr($body_parse, 18);
329 328
 		$body_parse_len = strlen($body_parse);
330 329
 	    }
331 330
 	    $body_parse_len = strlen($body_parse);
@@ -357,7 +356,7 @@  discard block
 block discarded – undo
357 356
 		//echo $body_parse;
358 357
 			//if ($type != ';' && $type != '>') {
359 358
 			if ($type != '') {
360
-			$body_parse = substr($body_parse,1);
359
+			$body_parse = substr($body_parse, 1);
361 360
 			$body_parse_len = strlen($body_parse);
362 361
 			$result['symbol_code'] = $symbol_code;
363 362
 			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
@@ -368,16 +367,16 @@  discard block
 block discarded – undo
368 367
 		    //$body_parse_len = strlen($body_parse);
369 368
 		    if ($body_parse_len >= 7) {
370 369
 			
371
-		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
372
-		    	    $course = substr($body_parse,0,3);
370
+		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/', $body_parse)) {
371
+		    	    $course = substr($body_parse, 0, 3);
373 372
 		    	    $tmp_s = intval($course);
374 373
 		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
375
-		    	    $speed = substr($body_parse,4,3);
374
+		    	    $speed = substr($body_parse, 4, 3);
376 375
 		    	    if ($speed != '...') {
377 376
 		    		//$result['speed'] = round($speed*1.852);
378 377
 		    		$result['speed'] = intval($speed);
379 378
 		    	    }
380
-		    	    $body_parse = substr($body_parse,7);
379
+		    	    $body_parse = substr($body_parse, 7);
381 380
 		        }
382 381
 		        // Check PHGR, PHG, RNG
383 382
 		    } 
@@ -387,12 +386,12 @@  discard block
 block discarded – undo
387 386
 		    }
388 387
 		    */
389 388
 		    if (strlen($body_parse) > 0) {
390
-		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
389
+		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/', $body_parse, $matches)) {
391 390
 		            $altitude = intval($matches[1]);
392 391
 		            //$result['altitude'] = round($altitude*0.3048);
393 392
 		            $result['altitude'] = $altitude;
394 393
 		            //$body_parse = trim(substr($body_parse,strlen($matches[0])));
395
-		            $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
394
+		            $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/', '', $body_parse));
396 395
 		        }
397 396
 		    }
398 397
 		    
@@ -404,13 +403,13 @@  discard block
 block discarded – undo
404 403
 		    */
405 404
 		    // DAO
406 405
 		    
407
-		    if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
406
+		    if (preg_match('/^!([0-9A-Z]{3})/', $body_parse, $matches)) {
408 407
 			    
409 408
 			    $dao = $matches[1];
410
-			    if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
409
+			    if (preg_match('/^([A-Z])([0-9]{2})/', $dao)) {
411 410
 				$dao_split = str_split($dao);
412
-			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
413
-			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
411
+			        $lat_off = (($dao_split[1]) - 48.0)*0.001/60.0;
412
+			        $lon_off = (($dao_split[2]) - 48.0)*0.001/60.0;
414 413
 			    
415 414
 				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
416 415
 				else $result['latitude'] += $lat_off;
@@ -418,50 +417,50 @@  discard block
 block discarded – undo
418 417
 				else $result['longitude'] += $lon_off;
419 418
 			    }
420 419
 			    
421
-		            $body_parse = substr($body_parse,6);
420
+		            $body_parse = substr($body_parse, 6);
422 421
 		    }
423 422
 		    
424
-		    if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
425
-			$result['ident'] = str_replace('_',' ',$matches[1]);
423
+		    if (preg_match('/CS=([0-9A-Z_]*)/', $body_parse, $matches)) {
424
+			$result['ident'] = str_replace('_', ' ', $matches[1]);
426 425
 		    }
427
-		    if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
426
+		    if (preg_match('/SQ=([0-9]{4})/', $body_parse, $matches)) {
428 427
 			$result['squawk'] = $matches[1];
429 428
 		    }
430
-		    if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
429
+		    if (preg_match('/AI=([0-9A-Z]{4})/', $body_parse, $matches)) {
431 430
 			$result['aircraft_icao'] = $matches[1];
432 431
 		    }
433
-		    if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) {
432
+		    if (preg_match('/VR=([0-9]*)/', $body_parse, $matches)) {
434 433
 			$result['verticalrate'] = $matches[1];
435 434
 		    }
436
-		    if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
435
+		    if (preg_match('/TI=([0-9]*)/', $body_parse, $matches)) {
437 436
 			$result['typeid'] = $matches[1];
438 437
 		    }
439
-		    if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
438
+		    if (preg_match('/SI=([0-9]*)/', $body_parse, $matches)) {
440 439
 			$result['statusid'] = $matches[1];
441 440
 		    }
442
-		    if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
441
+		    if (preg_match('/IMO=([0-9]{7})/', $body_parse, $matches)) {
443 442
 			$result['imo'] = $matches[1];
444 443
 		    }
445
-		    if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
444
+		    if (preg_match('/AD=([0-9]*)/', $body_parse, $matches)) {
446 445
 			$result['arrival_date'] = $matches[1];
447 446
 		    }
448
-		    if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
449
-			$result['arrival_code'] = str_replace('_',' ',$matches[1]);
447
+		    if (preg_match('/AC=([0-9A-Z_]*)/', $body_parse, $matches)) {
448
+			$result['arrival_code'] = str_replace('_', ' ', $matches[1]);
450 449
 		    }
451 450
 		    // OGN comment
452 451
 		   // echo "Before OGN : ".$body_parse."\n";
453 452
 		    //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
454
-		    if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
453
+		    if (preg_match('/^id([0-9A-F]{8})/', $body_parse, $matches)) {
455 454
 			$id = $matches[1];
456 455
 			//$mode = substr($id,0,2);
457
-			$address = substr($id,2);
456
+			$address = substr($id, 2);
458 457
 			//print_r($matches);
459
-			$addressType = (intval(substr($id,0,2),16))&3;
458
+			$addressType = (intval(substr($id, 0, 2), 16))&3;
460 459
 			if ($addressType == 0) $result['addresstype'] = "RANDOM";
461 460
 			elseif ($addressType == 1) $result['addresstype'] = "ICAO";
462 461
 			elseif ($addressType == 2) $result['addresstype'] = "FLARM";
463 462
 			elseif ($addressType == 3) $result['addresstype'] = "OGN";
464
-			$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
463
+			$aircraftType = $this->urshift(((intval(substr($id, 0, 2), 16))&0b1111100), 2);
465 464
 			$result['aircrafttype_code'] = $aircraftType;
466 465
 			if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
467 466
 			elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
@@ -478,7 +477,7 @@  discard block
 block discarded – undo
478 477
 			elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
479 478
 			elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
480 479
 			elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
481
-			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
480
+			$stealth = (intval(substr($id, 0, 2), 16)&0b10000000) != 0;
482 481
 			$result['stealth'] = $stealth;
483 482
 			$result['address'] = $address;
484 483
 		    }
@@ -490,96 +489,96 @@  discard block
 block discarded – undo
490 489
 		    //$body_parse = substr($body_parse,1);
491 490
 		    //$body_parse_len = strlen($body_parse);
492 491
 		    //echo 'weather'."\n";
493
-		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
492
+		    if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
494 493
 			    $result['wind_dir'] = intval($matches[1]);
495
-			    $result['wind_speed'] = round(intval($matches[2])*1.60934,1);
496
-			    $result['wind_gust'] = round(intval($matches[3])*1.60934,1);
497
-			    $result['temp'] = round(5/9*((intval($matches[4]))-32),1);
498
-		    	    $body_parse = substr($body_parse,strlen($matches[0])+1);
499
-		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
494
+			    $result['wind_speed'] = round(intval($matches[2])*1.60934, 1);
495
+			    $result['wind_gust'] = round(intval($matches[3])*1.60934, 1);
496
+			    $result['temp'] = round(5/9*((intval($matches[4])) - 32), 1);
497
+		    	    $body_parse = substr($body_parse, strlen($matches[0]) + 1);
498
+		    } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
500 499
 			$result['wind_dir'] = intval($matches[1]);
501
-			$result['wind_speed'] = round($matches[2]*1.60934,1);
502
-			$result['wind_gust'] = round($matches[3]*1.60934,1);
503
-			$result['temp'] = round(5/9*(($matches[4])-32),1);
504
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
505
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
500
+			$result['wind_speed'] = round($matches[2]*1.60934, 1);
501
+			$result['wind_gust'] = round($matches[3]*1.60934, 1);
502
+			$result['temp'] = round(5/9*(($matches[4]) - 32), 1);
503
+		        $body_parse = substr($body_parse, strlen($matches[0]) + 1);
504
+		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
506 505
 			$result['wind_dir'] = intval($matches[1]);
507
-			$result['wind_speed'] = round($matches[2]*1.60934,1);
508
-			$result['wind_gust'] = round($matches[3]*1.60934,1);
509
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
510
-		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
506
+			$result['wind_speed'] = round($matches[2]*1.60934, 1);
507
+			$result['wind_gust'] = round($matches[3]*1.60934, 1);
508
+		        $body_parse = substr($body_parse, strlen($matches[0]) + 1);
509
+		    } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/', $body_parse, $matches)) {
511 510
 			$result['wind_dir'] = intval($matches[1]);
512
-			$result['wind_speed'] = round($matches[2]*1.60934,1);
513
-			$result['wind_gust'] = round($matches[3]*1.60934,1);
514
-		        $body_parse = substr($body_parse,strlen($matches[0])+1);
511
+			$result['wind_speed'] = round($matches[2]*1.60934, 1);
512
+			$result['wind_gust'] = round($matches[3]*1.60934, 1);
513
+		        $body_parse = substr($body_parse, strlen($matches[0]) + 1);
515 514
 		    }
516 515
 		    //if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
517 516
 		    //g012t088r000p000P000h38b10110
518 517
 		    //g011t086r000p000P000h29b10198
519
-		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
520
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
521
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
522
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
523
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
524
-			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
518
+		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/', $body_parse, $matches)) {
519
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
520
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
521
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
522
+			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
523
+			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
525 524
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
526
-			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
527
-		        $body_parse = substr($body_parse,strlen($matches[0]));
528
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
529
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
530
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
531
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
532
-			if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
533
-			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
525
+			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
526
+		        $body_parse = substr($body_parse, strlen($matches[0]));
527
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/', $body_parse, $matches)) {
528
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
529
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
530
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
531
+			if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1, 1);
532
+			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
534 533
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
535
-			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
536
-		        $body_parse = substr($body_parse,strlen($matches[0]));
537
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
538
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
539
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
540
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
541
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
542
-			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
534
+			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
535
+		        $body_parse = substr($body_parse, strlen($matches[0]));
536
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
537
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
538
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
539
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
540
+			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
541
+			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
543 542
 			if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
544
-			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
545
-		        $body_parse = substr($body_parse,strlen($matches[0]));
546
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
547
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
548
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
549
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
550
-			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
543
+			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
544
+		        $body_parse = substr($body_parse, strlen($matches[0]));
545
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
546
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
547
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
548
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
549
+			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
551 550
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
552
-			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
553
-		        $body_parse = substr($body_parse,strlen($matches[0]));
554
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
555
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
556
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
557
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
558
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
551
+			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
552
+		        $body_parse = substr($body_parse, strlen($matches[0]));
553
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
554
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
555
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
556
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
557
+			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
559 558
 			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
560
-			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
561
-		        $body_parse = substr($body_parse,strlen($matches[0]));
562
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
563
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
564
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
565
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
566
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
559
+			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
560
+		        $body_parse = substr($body_parse, strlen($matches[0]));
561
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
562
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
563
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
564
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
565
+			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
567 566
 			if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
568
-			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
569
-		        $body_parse = substr($body_parse,strlen($matches[0]));
570
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
571
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
572
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
567
+			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
568
+		        $body_parse = substr($body_parse, strlen($matches[0]));
569
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
570
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
571
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
573 572
 			if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
574
-			if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
575
-		        $body_parse = substr($body_parse,strlen($matches[0]));
576
-		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
577
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
578
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
579
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
573
+			if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10), 1);
574
+		        $body_parse = substr($body_parse, strlen($matches[0]));
575
+		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
576
+			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
577
+			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
578
+			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
580 579
 			if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
581
-			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
582
-		        $body_parse = substr($body_parse,strlen($matches[0]));
580
+			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
581
+		        $body_parse = substr($body_parse, strlen($matches[0]));
583 582
 		    }
584 583
 		    $result['comment'] = trim($body_parse);
585 584
 		}
@@ -587,42 +586,42 @@  discard block
 block discarded – undo
587 586
 
588 587
 	    }
589 588
 	//}
590
-	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
591
-	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
589
+	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'], 4);
590
+	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'], 4);
592 591
 	if ($debug) print_r($result);
593 592
 	return $result;
594 593
     }
595 594
     
596 595
     public function connect() {
597
-	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
596
+	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass, $globalName, $globalServerAPRShost, $globalServerAPRSport;
598 597
 	$aprs_connect = 0;
599 598
 	$aprs_keep = 120;
600 599
 	$aprs_last_tx = time();
601 600
 	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
602
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
601
+	else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
603 602
 	if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
604
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
603
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
605 604
 	if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
606 605
 	else $aprs_pass = '-1';
607 606
 	
608
-	$aprs_filter  = '';
607
+	$aprs_filter = '';
609 608
 	$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
610 609
 	$Common = new Common();
611
-	$s = $Common->create_socket($globalServerAPRShost,$globalServerAPRSport,$errno,$errstr);
610
+	$s = $Common->create_socket($globalServerAPRShost, $globalServerAPRSport, $errno, $errstr);
612 611
 	if ($s !== false) {
613 612
 		echo 'Connected to APRS server! '."\n";
614 613
 		$authstart = time();
615 614
 		$this->socket = $s;
616
-		$send = socket_send( $this->socket  , $aprs_login , strlen($aprs_login) , 0 );
617
-		socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1);
618
-		while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
615
+		$send = socket_send($this->socket, $aprs_login, strlen($aprs_login), 0);
616
+		socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE, 1);
617
+		while ($msgin = socket_read($this->socket, 1000, PHP_NORMAL_READ)) {
619 618
 			if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
620 619
 			    echo 'APRS user verified !'."\n";
621 620
 			    $this->connected = true;
622 621
 			    return true;
623 622
 			    break;
624 623
 			}
625
-			if (time()-$authstart > 5) {
624
+			if (time() - $authstart > 5) {
626 625
 			    echo 'APRS timeout'."\n";
627 626
 			    break;
628 627
 			}
@@ -637,7 +636,7 @@  discard block
 block discarded – undo
637 636
     public function send($data) {
638 637
 	global $globalDebug;
639 638
 	if ($this->connected === false) $this->connect();
640
-	$send = socket_send( $this->socket  , $data , strlen($data),0);
639
+	$send = socket_send($this->socket, $data, strlen($data), 0);
641 640
 	if ($send === FALSE) {
642 641
 		if ($globalDebug) echo 'Reconnect...';
643 642
 		socket_close($this->socket);
@@ -647,16 +646,16 @@  discard block
 block discarded – undo
647 646
 }
648 647
 
649 648
 class APRSSpotter extends APRS {
650
-	public function addLiveSpotterData($id,$ident,$aircraft_icao,$departure_airport,$arrival_airport,$latitude,$longitude,$waypoints,$altitude,$altitude_real,$heading,$speed,$datetime,$departure_airport_time,$arrival_airport_time,$squawk,$route_stop,$hex,$putinarchive,$registration,$pilot_id,$pilot_name, $verticalrate, $noarchive, $ground,$format_source,$source_name,$over_country) {
649
+	public function addLiveSpotterData($id, $ident, $aircraft_icao, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $speed, $datetime, $departure_airport_time, $arrival_airport_time, $squawk, $route_stop, $hex, $putinarchive, $registration, $pilot_id, $pilot_name, $verticalrate, $noarchive, $ground, $format_source, $source_name, $over_country) {
651 650
 		$Common = new Common();
652 651
 		if ($latitude != '' && $longitude != '') {
653 652
 			$lat = $latitude;
654 653
 			$long = $longitude;
655
-			$latitude = $Common->convertDM($latitude,'latitude');
656
-			$longitude = $Common->convertDM($longitude,'longitude');
657
-			$coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW'];
658
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
659
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
654
+			$latitude = $Common->convertDM($latitude, 'latitude');
655
+			$longitude = $Common->convertDM($longitude, 'longitude');
656
+			$coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW'];
657
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
658
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
660 659
 			$w = $w1.$w2;
661 660
 			//$w = '00';
662 661
 			$custom = '';
@@ -683,25 +682,25 @@  discard block
 block discarded – undo
683 682
 			$geoid= round($GeoidClass->get($lat,$long)*3.28084,2);
684 683
 			$altitude_real = round($altitude_real + $geoid);
685 684
 			*/
686
-			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
685
+			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His', strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude_real, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
687 686
 		}
688 687
 	}
689 688
 }
690 689
 class APRSMarine extends APRS {
691
-	public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed,$datetime, $putinarchive,$mmsi,$type,$typeid,$imo,$callsign,$arrival_code,$arrival_date,$status,$statusid,$noarchive,$format_source,$source_name,$over_country) {
690
+	public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed, $datetime, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $statusid, $noarchive, $format_source, $source_name, $over_country) {
692 691
 		$Common = new Common();
693 692
 		if ($latitude != '' && $longitude != '') {
694
-			$latitude = $Common->convertDM($latitude,'latitude');
695
-			$longitude = $Common->convertDM($longitude,'longitude');
696
-			$coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW'];
697
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
698
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
693
+			$latitude = $Common->convertDM($latitude, 'latitude');
694
+			$longitude = $Common->convertDM($longitude, 'longitude');
695
+			$coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW'];
696
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
697
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
699 698
 			$w = $w1.$w2;
700 699
 			//$w = '00';
701 700
 			$custom = '';
702 701
 			if ($ident != '') {
703 702
 				if ($custom != '') $custom .= '/';
704
-				$custom .= 'CS='.str_replace(' ','_',$ident);
703
+				$custom .= 'CS='.str_replace(' ', '_', $ident);
705 704
 			}
706 705
 			if ($typeid != '') {
707 706
 				if ($custom != '') $custom .= '/';
@@ -721,11 +720,11 @@  discard block
 block discarded – undo
721 720
 			}
722 721
 			if ($arrival_code != '') {
723 722
 				if ($custom != '') $custom .= '/';
724
-				$custom .= 'AC='.str_replace(' ','_',$arrival_code);
723
+				$custom .= 'AC='.str_replace(' ', '_', $arrival_code);
725 724
 			}
726 725
 			if ($custom != '') $custom = ' '.$custom;
727 726
 			$altitude = 0;
728
-			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
727
+			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His', strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
729 728
 		}
730 729
 	}
731 730
 }
Please login to merge, or discard this patch.
Braces   +307 added lines, -110 removed lines patch added patch discarded remove patch
@@ -184,17 +184,23 @@  discard block
 block discarded – undo
184 184
 	
185 185
 	/* Check that end was found and body has at least one byte. */
186 186
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
187
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
187
+	    if ($globalDebug) {
188
+	    	echo '!!! APRS invalid : '.$input."\n";
189
+	    }
188 190
 	    return false;
189 191
 	}
190 192
 	
191
-	if ($debug) echo 'input : '.$input."\n";
193
+	if ($debug) {
194
+		echo 'input : '.$input."\n";
195
+	}
192 196
 	/* Save header and body. */
193 197
 	$body = substr($input,$splitpos+1,$input_len);
194 198
 	$body_len = strlen($body);
195 199
 	$header = substr($input,0,$splitpos);
196 200
 	//$header_len = strlen($header);
197
-	if ($debug) echo 'header : '.$header."\n";
201
+	if ($debug) {
202
+		echo 'header : '.$header."\n";
203
+	}
198 204
 	
199 205
 	/* Parse source, target and path. */
200 206
 	//FLRDF0A52>APRS,qAS,LSTB
@@ -208,11 +214,15 @@  discard block
 block discarded – undo
208 214
 		$result['format_source'] = 'famaprs';
209 215
 		$result['source_type'] = 'ais';
210 216
 	    } else {
211
-		if ($debug) echo 'ident : '.$ident."\n";
217
+		if ($debug) {
218
+			echo 'ident : '.$ident."\n";
219
+		}
212 220
 		$result['ident'] = $ident;
213 221
 	    }
214 222
 	} else {
215
-	    if ($debug) 'No ident'."\n";
223
+	    if ($debug) {
224
+	    	'No ident'."\n";
225
+	    }
216 226
 	    return false;
217 227
 	}
218 228
 	$elements = explode(',',$all_elements);
@@ -223,7 +233,9 @@  discard block
 block discarded – undo
223 233
 	        //echo "ok";
224 234
 	        //if ($element == 'TCPIP*') return false;
225 235
 	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
226
-		if ($debug) echo 'element : '.$element."\n";
236
+		if ($debug) {
237
+			echo 'element : '.$element."\n";
238
+		}
227 239
 		return false;
228 240
 	    }
229 241
 	    /*
@@ -236,13 +248,17 @@  discard block
 block discarded – undo
236 248
 	}
237 249
 	
238 250
 	$type = substr($body,0,1);
239
-	if ($debug) echo 'type : '.$type."\n";
251
+	if ($debug) {
252
+		echo 'type : '.$type."\n";
253
+	}
240 254
 	if ($type == ';') {
241 255
 		if (isset($result['source_type']) && $result['source_type'] == 'modes') {
242 256
 			$result['address'] = trim(substr($body,1,9));
243 257
 		} elseif (isset($result['source_type']) && $result['source_type'] == 'ais') {
244 258
 			$result['mmsi'] = trim(substr($body,1,9));
245
-		} else $result['ident'] = trim(substr($body,1,9));
259
+		} else {
260
+			$result['ident'] = trim(substr($body,1,9));
261
+		}
246 262
 	} elseif ($type == ',') {
247 263
 		// Invalid data or test data
248 264
 		return false;
@@ -311,7 +327,9 @@  discard block
 block discarded – undo
311 327
 		//$symbol_table = $matches[4];
312 328
 		$lat = intval($lat_deg);
313 329
 		$lon = intval($lon_deg);
314
-		if ($lat > 89 || $lon > 179) return false;
330
+		if ($lat > 89 || $lon > 179) {
331
+			return false;
332
+		}
315 333
 	    
316 334
 	    /*
317 335
 	    $tmp_5b = str_replace('.','',$lat_min);
@@ -321,8 +339,12 @@  discard block
 block discarded – undo
321 339
 	    */
322 340
 		$latitude = $lat + floatval($lat_min)/60;
323 341
 		$longitude = $lon + floatval($lon_min)/60;
324
-		if ($sind == 'S') $latitude = 0-$latitude;
325
-		if ($wind == 'W') $longitude = 0-$longitude;
342
+		if ($sind == 'S') {
343
+			$latitude = 0-$latitude;
344
+		}
345
+		if ($wind == 'W') {
346
+			$longitude = 0-$longitude;
347
+		}
326 348
 		$result['latitude'] = $latitude;
327 349
 		$result['longitude'] = $longitude;
328 350
 		$body_parse = substr($body_parse,18);
@@ -350,8 +372,11 @@  discard block
 block discarded – undo
350 372
 			//echo 'find'."\n";
351 373
 			$body_split = str_split($body_parse);
352 374
 			$symbol_code = $body_split[0];
353
-			if (!isset($symbolll) || $symbolll == '/') $symbol_code = '/'.$symbol_code;
354
-			else $symbol_code = '\\'.$symbol_code;
375
+			if (!isset($symbolll) || $symbolll == '/') {
376
+				$symbol_code = '/'.$symbol_code;
377
+			} else {
378
+				$symbol_code = '\\'.$symbol_code;
379
+			}
355 380
 		//'
356 381
 		//}
357 382
 		//echo $body_parse;
@@ -360,7 +385,9 @@  discard block
 block discarded – undo
360 385
 			$body_parse = substr($body_parse,1);
361 386
 			$body_parse_len = strlen($body_parse);
362 387
 			$result['symbol_code'] = $symbol_code;
363
-			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
388
+			if (isset($this->symbols[$symbol_code])) {
389
+				$result['symbol'] = $this->symbols[$symbol_code];
390
+			}
364 391
 			if ($symbol_code != '_') {
365 392
 			}
366 393
 		    //$body_parse = substr($body_parse,1);
@@ -371,7 +398,9 @@  discard block
 block discarded – undo
371 398
 		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
372 399
 		    	    $course = substr($body_parse,0,3);
373 400
 		    	    $tmp_s = intval($course);
374
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
401
+		    	    if ($tmp_s >= 1 && $tmp_s <= 360) {
402
+		    	    	$result['heading'] = intval($course);
403
+		    	    }
375 404
 		    	    $speed = substr($body_parse,4,3);
376 405
 		    	    if ($speed != '...') {
377 406
 		    		//$result['speed'] = round($speed*1.852);
@@ -412,10 +441,16 @@  discard block
 block discarded – undo
412 441
 			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
413 442
 			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
414 443
 			    
415
-				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
416
-				else $result['latitude'] += $lat_off;
417
-				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
418
-				else $result['longitude'] += $lon_off;
444
+				if ($result['latitude'] < 0) {
445
+					$result['latitude'] -= $lat_off;
446
+				} else {
447
+					$result['latitude'] += $lat_off;
448
+				}
449
+				if ($result['longitude'] < 0) {
450
+					$result['longitude'] -= $lon_off;
451
+				} else {
452
+					$result['longitude'] += $lon_off;
453
+				}
419 454
 			    }
420 455
 			    
421 456
 		            $body_parse = substr($body_parse,6);
@@ -457,27 +492,48 @@  discard block
 block discarded – undo
457 492
 			$address = substr($id,2);
458 493
 			//print_r($matches);
459 494
 			$addressType = (intval(substr($id,0,2),16))&3;
460
-			if ($addressType == 0) $result['addresstype'] = "RANDOM";
461
-			elseif ($addressType == 1) $result['addresstype'] = "ICAO";
462
-			elseif ($addressType == 2) $result['addresstype'] = "FLARM";
463
-			elseif ($addressType == 3) $result['addresstype'] = "OGN";
495
+			if ($addressType == 0) {
496
+				$result['addresstype'] = "RANDOM";
497
+			} elseif ($addressType == 1) {
498
+				$result['addresstype'] = "ICAO";
499
+			} elseif ($addressType == 2) {
500
+				$result['addresstype'] = "FLARM";
501
+			} elseif ($addressType == 3) {
502
+				$result['addresstype'] = "OGN";
503
+			}
464 504
 			$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
465 505
 			$result['aircrafttype_code'] = $aircraftType;
466
-			if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
467
-			elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
468
-			elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE";
469
-			elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
470
-			elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE";
471
-			elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE";
472
-			elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER";
473
-			elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER";
474
-			elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT";
475
-			elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT";
476
-			elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO";
477
-			elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON";
478
-			elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
479
-			elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
480
-			elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
506
+			if ($aircraftType == 0) {
507
+				$result['aircrafttype'] = "UNKNOWN";
508
+			} elseif ($aircraftType == 1) {
509
+				$result['aircrafttype'] = "GLIDER";
510
+			} elseif ($aircraftType == 2) {
511
+				$result['aircrafttype'] = "TOW_PLANE";
512
+			} elseif ($aircraftType == 3) {
513
+				$result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
514
+			} elseif ($aircraftType == 4) {
515
+				$result['aircrafttype'] = "PARACHUTE";
516
+			} elseif ($aircraftType == 5) {
517
+				$result['aircrafttype'] = "DROP_PLANE";
518
+			} elseif ($aircraftType == 6) {
519
+				$result['aircrafttype'] = "HANG_GLIDER";
520
+			} elseif ($aircraftType == 7) {
521
+				$result['aircrafttype'] = "PARA_GLIDER";
522
+			} elseif ($aircraftType == 8) {
523
+				$result['aircrafttype'] = "POWERED_AIRCRAFT";
524
+			} elseif ($aircraftType == 9) {
525
+				$result['aircrafttype'] = "JET_AIRCRAFT";
526
+			} elseif ($aircraftType == 10) {
527
+				$result['aircrafttype'] = "UFO";
528
+			} elseif ($aircraftType == 11) {
529
+				$result['aircrafttype'] = "BALLOON";
530
+			} elseif ($aircraftType == 12) {
531
+				$result['aircrafttype'] = "AIRSHIP";
532
+			} elseif ($aircraftType == 13) {
533
+				$result['aircrafttype'] = "UAV";
534
+			} elseif ($aircraftType == 15) {
535
+				$result['aircrafttype'] = "STATIC_OBJECT";
536
+			}
481 537
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
482 538
 			$result['stealth'] = $stealth;
483 539
 			$result['address'] = $address;
@@ -517,79 +573,183 @@  discard block
 block discarded – undo
517 573
 		    //g012t088r000p000P000h38b10110
518 574
 		    //g011t086r000p000P000h29b10198
519 575
 		    if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
520
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
521
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
522
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
523
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
524
-			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
525
-			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
526
-			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
576
+			if ($matches[1] != '...') {
577
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
578
+			}
579
+			if ($matches[2] != '...') {
580
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
581
+			}
582
+			if ($matches[3] != '...') {
583
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
584
+			}
585
+			if ($matches[4] != '...') {
586
+				$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
587
+			}
588
+			if ($matches[5] != '...') {
589
+				$result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
590
+			}
591
+			if ($matches[6] != '...') {
592
+				$result['humidity'] = intval($matches[6]);
593
+			}
594
+			if ($matches[7] != '...') {
595
+				$result['pressure'] = round((intval($matches[7])/10),1);
596
+			}
527 597
 		        $body_parse = substr($body_parse,strlen($matches[0]));
528 598
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
529
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
530
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
531
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
532
-			if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
533
-			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
534
-			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
535
-			if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
599
+			if ($matches[1] != '...') {
600
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
601
+			}
602
+			if ($matches[2] != '...') {
603
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
604
+			}
605
+			if ($matches[3] != '...') {
606
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
607
+			}
608
+			if ($matches[5] != '...') {
609
+				$result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
610
+			}
611
+			if ($matches[4] != '...') {
612
+				$result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
613
+			}
614
+			if ($matches[6] != '...') {
615
+				$result['humidity'] = intval($matches[6]);
616
+			}
617
+			if ($matches[7] != '...') {
618
+				$result['pressure'] = round((intval($matches[7])/10),1);
619
+			}
536 620
 		        $body_parse = substr($body_parse,strlen($matches[0]));
537 621
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
538
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
539
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
540
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
541
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
542
-			if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
543
-			if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
544
-			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
622
+			if ($matches[1] != '...') {
623
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
624
+			}
625
+			if ($matches[2] != '...') {
626
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
627
+			}
628
+			if ($matches[3] != '...') {
629
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
630
+			}
631
+			if ($matches[4] != '...') {
632
+				$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
633
+			}
634
+			if ($matches[5] != '...') {
635
+				$result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
636
+			}
637
+			if ($matches[7] != '...') {
638
+				$result['humidity'] = intval($matches[7]);
639
+			}
640
+			if ($matches[6] != '...') {
641
+				$result['pressure'] = round((intval($matches[6])/10),1);
642
+			}
545 643
 		        $body_parse = substr($body_parse,strlen($matches[0]));
546 644
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
547
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
548
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
549
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
550
-			if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
551
-			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
552
-			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
645
+			if ($matches[1] != '...') {
646
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
647
+			}
648
+			if ($matches[2] != '...') {
649
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
650
+			}
651
+			if ($matches[3] != '...') {
652
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
653
+			}
654
+			if ($matches[4] != '...') {
655
+				$result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
656
+			}
657
+			if ($matches[6] != '...') {
658
+				$result['humidity'] = intval($matches[6]);
659
+			}
660
+			if ($matches[5] != '...') {
661
+				$result['pressure'] = round((intval($matches[5])/10),1);
662
+			}
553 663
 		        $body_parse = substr($body_parse,strlen($matches[0]));
554 664
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
555
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
556
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
557
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
558
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
559
-			if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
560
-			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
665
+			if ($matches[1] != '...') {
666
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
667
+			}
668
+			if ($matches[2] != '...') {
669
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
670
+			}
671
+			if ($matches[3] != '...') {
672
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
673
+			}
674
+			if ($matches[4] != '...') {
675
+				$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
676
+			}
677
+			if ($matches[6] != '...') {
678
+				$result['humidity'] = intval($matches[6]);
679
+			}
680
+			if ($matches[5] != '...') {
681
+				$result['pressure'] = round((intval($matches[5])/10),1);
682
+			}
561 683
 		        $body_parse = substr($body_parse,strlen($matches[0]));
562 684
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
563
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
564
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
565
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
566
-			if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
567
-			if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
568
-			if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
685
+			if ($matches[1] != '...') {
686
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
687
+			}
688
+			if ($matches[2] != '...') {
689
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
690
+			}
691
+			if ($matches[3] != '...') {
692
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
693
+			}
694
+			if ($matches[4] != '...') {
695
+				$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
696
+			}
697
+			if ($matches[5] != '...') {
698
+				$result['humidity'] = intval($matches[5]);
699
+			}
700
+			if ($matches[6] != '...') {
701
+				$result['pressure'] = round((intval($matches[6])/10),1);
702
+			}
569 703
 		        $body_parse = substr($body_parse,strlen($matches[0]));
570 704
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
571
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
572
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
573
-			if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
574
-			if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
705
+			if ($matches[1] != '...') {
706
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
707
+			}
708
+			if ($matches[2] != '...') {
709
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
710
+			}
711
+			if ($matches[2] != '...') {
712
+				$result['humidity'] = intval($matches[3]);
713
+			}
714
+			if ($matches[4] != '...') {
715
+				$result['pressure'] = round((intval($matches[4])/10),1);
716
+			}
575 717
 		        $body_parse = substr($body_parse,strlen($matches[0]));
576 718
 		    } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
577
-			if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
578
-			if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
579
-			if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
580
-			if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
581
-			if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
719
+			if ($matches[1] != '...') {
720
+				$result['wind_gust'] = round($matches[1]*1.60934,1);
721
+			}
722
+			if ($matches[2] != '...') {
723
+				$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
724
+			}
725
+			if ($matches[3] != '...') {
726
+				$result['rain'] = round((intval($matches[3])/100)*25.1,1);
727
+			}
728
+			if ($matches[4] != '...') {
729
+				$result['humidity'] = intval($matches[4]);
730
+			}
731
+			if ($matches[5] != '...') {
732
+				$result['pressure'] = round((intval($matches[5])/10),1);
733
+			}
582 734
 		        $body_parse = substr($body_parse,strlen($matches[0]));
583 735
 		    }
584 736
 		    $result['comment'] = trim($body_parse);
585 737
 		}
586
-		} else $result['comment'] = trim($body_parse);
738
+		} else {
739
+			$result['comment'] = trim($body_parse);
740
+		}
587 741
 
588 742
 	    }
589 743
 	//}
590
-	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
591
-	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
592
-	if ($debug) print_r($result);
744
+	if (isset($result['latitude'])) {
745
+		$result['latitude'] = round($result['latitude'],4);
746
+	}
747
+	if (isset($result['longitude'])) {
748
+		$result['longitude'] = round($result['longitude'],4);
749
+	}
750
+	if ($debug) {
751
+		print_r($result);
752
+	}
593 753
 	return $result;
594 754
     }
595 755
     
@@ -598,12 +758,21 @@  discard block
 block discarded – undo
598 758
 	$aprs_connect = 0;
599 759
 	$aprs_keep = 120;
600 760
 	$aprs_last_tx = time();
601
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
602
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
603
-	if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
604
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
605
-	if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
606
-	else $aprs_pass = '-1';
761
+	if (isset($globalAPRSversion)) {
762
+		$aprs_version = $globalAPRSversion;
763
+	} else {
764
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
765
+	}
766
+	if (isset($globalServerAPRSssid)) {
767
+		$aprs_ssid = $globalServerAPRSssid;
768
+	} else {
769
+		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
770
+	}
771
+	if (isset($globalServerAPRSpass)) {
772
+		$aprs_pass = $globalServerAPRSpass;
773
+	} else {
774
+		$aprs_pass = '-1';
775
+	}
607 776
 	
608 777
 	$aprs_filter  = '';
609 778
 	$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
@@ -636,10 +805,14 @@  discard block
 block discarded – undo
636 805
     
637 806
     public function send($data) {
638 807
 	global $globalDebug;
639
-	if ($this->connected === false) $this->connect();
808
+	if ($this->connected === false) {
809
+		$this->connect();
810
+	}
640 811
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
641 812
 	if ($send === FALSE) {
642
-		if ($globalDebug) echo 'Reconnect...';
813
+		if ($globalDebug) {
814
+			echo 'Reconnect...';
815
+		}
643 816
 		socket_close($this->socket);
644 817
 		$this->connect();
645 818
 	}
@@ -661,22 +834,32 @@  discard block
 block discarded – undo
661 834
 			//$w = '00';
662 835
 			$custom = '';
663 836
 			if ($ident != '') {
664
-				if ($custom != '') $custom .= '/';
837
+				if ($custom != '') {
838
+					$custom .= '/';
839
+				}
665 840
 				$custom .= 'CS='.$ident;
666 841
 			}
667 842
 			if ($squawk != '') {
668
-				if ($custom != '') $custom .= '/';
843
+				if ($custom != '') {
844
+					$custom .= '/';
845
+				}
669 846
 				$custom .= 'SQ='.$squawk;
670 847
 			}
671 848
 			if ($verticalrate != '') {
672
-				if ($custom != '') $custom .= '/';
849
+				if ($custom != '') {
850
+					$custom .= '/';
851
+				}
673 852
 				$custom .= 'VR='.$verticalrate;
674 853
 			}
675 854
 			if ($aircraft_icao != '' && $aircraft_icao != 'NA') {
676
-				if ($custom != '') $custom .= '/';
855
+				if ($custom != '') {
856
+					$custom .= '/';
857
+				}
677 858
 				$custom .= 'AI='.$aircraft_icao;
678 859
 			}
679
-			if ($custom != '') $custom = ' '.$custom;
860
+			if ($custom != '') {
861
+				$custom = ' '.$custom;
862
+			}
680 863
 			/*
681 864
 			// Use AMSL altitude
682 865
 			$GeoidClass = new GeoidHeight();
@@ -700,30 +883,44 @@  discard block
 block discarded – undo
700 883
 			//$w = '00';
701 884
 			$custom = '';
702 885
 			if ($ident != '') {
703
-				if ($custom != '') $custom .= '/';
886
+				if ($custom != '') {
887
+					$custom .= '/';
888
+				}
704 889
 				$custom .= 'CS='.str_replace(' ','_',$ident);
705 890
 			}
706 891
 			if ($typeid != '') {
707
-				if ($custom != '') $custom .= '/';
892
+				if ($custom != '') {
893
+					$custom .= '/';
894
+				}
708 895
 				$custom .= 'TI='.$typeid;
709 896
 			}
710 897
 			if ($statusid != '') {
711
-				if ($custom != '') $custom .= '/';
898
+				if ($custom != '') {
899
+					$custom .= '/';
900
+				}
712 901
 				$custom .= 'SI='.$statusid;
713 902
 			}
714 903
 			if ($imo != '') {
715
-				if ($custom != '') $custom .= '/';
904
+				if ($custom != '') {
905
+					$custom .= '/';
906
+				}
716 907
 				$custom .= 'IMO='.$imo;
717 908
 			}
718 909
 			if ($arrival_date != '') {
719
-				if ($custom != '') $custom .= '/';
910
+				if ($custom != '') {
911
+					$custom .= '/';
912
+				}
720 913
 				$custom .= 'AD='.strtotime($arrival_date);
721 914
 			}
722 915
 			if ($arrival_code != '') {
723
-				if ($custom != '') $custom .= '/';
916
+				if ($custom != '') {
917
+					$custom .= '/';
918
+				}
724 919
 				$custom .= 'AC='.str_replace(' ','_',$arrival_code);
725 920
 			}
726
-			if ($custom != '') $custom = ' '.$custom;
921
+			if ($custom != '') {
922
+				$custom = ' '.$custom;
923
+			}
727 924
 			$altitude = 0;
728 925
 			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
729 926
 		}
Please login to merge, or discard this patch.
require/class.ATC.php 4 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 	/**
15 15
 	* Get SQL query part for filter used
16 16
 	* @param Array $filter the filter
17
-	* @return Array the SQL part
17
+	* @return string the SQL part
18 18
 	*/
19 19
 	public function getFilter($filter = array(),$where = false,$and = false) {
20 20
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
Please login to merge, or discard this patch.
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,10 +10,10 @@
 block discarded – undo
10 10
 	}
11 11
 
12 12
 	/**
13
-	* Get SQL query part for filter used
14
-	* @param Array $filter the filter
15
-	* @return Array the SQL part
16
-	*/
13
+	 * Get SQL query part for filter used
14
+	 * @param Array $filter the filter
15
+	 * @return Array the SQL part
16
+	 */
17 17
 	public function getFilter($filter = array(),$where = false,$and = false) {
18 18
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
19 19
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
Please login to merge, or discard this patch.
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -14,22 +14,22 @@  discard block
 block discarded – undo
14 14
 	* @param Array $filter the filter
15 15
 	* @return Array the SQL part
16 16
 	*/
17
-	public function getFilter($filter = array(),$where = false,$and = false) {
17
+	public function getFilter($filter = array(), $where = false, $and = false) {
18 18
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
19 19
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
20 20
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
21
-				foreach($globalStatsFilters[$globalFilterName] as $source) {
21
+				foreach ($globalStatsFilters[$globalFilterName] as $source) {
22 22
 					if (isset($source['source'])) $filter['source'][] = $source['source'];
23 23
 				}
24 24
 			} else {
25 25
 				$filter = $globalStatsFilters[$globalFilterName];
26 26
 			}
27 27
 		}
28
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
28
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
29 29
 		$filter_query_join = '';
30 30
 		$filter_query_where = '';
31 31
 		if (isset($filter['source']) && !empty($filter['source'])) {
32
-			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
32
+			$filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
33 33
 		}
34 34
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
35 35
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		try {
45 45
 			$sth = $this->db->prepare($query);
46 46
 			$sth->execute($query_values);
47
-		} catch(PDOException $e) {
47
+		} catch (PDOException $e) {
48 48
 			return "error : ".$e->getMessage();
49 49
 		}
50 50
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -52,66 +52,66 @@  discard block
 block discarded – undo
52 52
 	}
53 53
 
54 54
 	public function getById($id) {
55
-		$filter_query = $this->getFilter(array(),true);
55
+		$filter_query = $this->getFilter(array(), true);
56 56
 		$query = "SELECT * FROM atc".$filter_query." atc_id = :id";
57 57
 		$query_values = array(':id' => $id);
58 58
 		try {
59 59
 			$sth = $this->db->prepare($query);
60 60
 			$sth->execute($query_values);
61
-		} catch(PDOException $e) {
61
+		} catch (PDOException $e) {
62 62
 			return "error : ".$e->getMessage();
63 63
 		}
64 64
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
65 65
 		return $all;
66 66
 	}
67 67
 
68
-	public function getByIdent($ident,$format_source = '') {
69
-		$filter_query = $this->getFilter(array(),true);
68
+	public function getByIdent($ident, $format_source = '') {
69
+		$filter_query = $this->getFilter(array(), true);
70 70
 		if ($format_source == '') {
71 71
 			$query = "SELECT * FROM atc".$filter_query." ident = :ident";
72 72
 			$query_values = array(':ident' => $ident);
73 73
 		} else {
74 74
 			$query = "SELECT * FROM atc".$filter_query." ident = :ident AND format_source = :format_source";
75
-			$query_values = array(':ident' => $ident,':format_source' => $format_source);
75
+			$query_values = array(':ident' => $ident, ':format_source' => $format_source);
76 76
 		}
77 77
 		try {
78 78
 			$sth = $this->db->prepare($query);
79 79
 			$sth->execute($query_values);
80
-		} catch(PDOException $e) {
80
+		} catch (PDOException $e) {
81 81
 			return "error : ".$e->getMessage();
82 82
 		}
83 83
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
84 84
 		return $all;
85 85
 	}
86 86
 
87
-	public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
88
-		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
89
-		$info = str_replace('^','<br />',$info);
90
-		$info = str_replace('&amp;sect;','',$info);
91
-		$info = str_replace('"','',$info);
87
+	public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
88
+		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
89
+		$info = str_replace('^', '<br />', $info);
90
+		$info = str_replace('&amp;sect;', '', $info);
91
+		$info = str_replace('"', '', $info);
92 92
 		if ($type == '') $type = NULL;
93 93
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
94
-		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
94
+		$query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name);
95 95
 		try {
96 96
 			$sth = $this->db->prepare($query);
97 97
 			$sth->execute($query_values);
98
-		} catch(PDOException $e) {
98
+		} catch (PDOException $e) {
99 99
 			return "error : ".$e->getMessage();
100 100
 		}
101 101
 	}
102 102
 
103
-	public function update($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
104
-		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
105
-		$info = str_replace('^','<br />',$info);
106
-		$info = str_replace('&amp;sect;','',$info);
107
-		$info = str_replace('"','',$info);
103
+	public function update($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
104
+		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
105
+		$info = str_replace('^', '<br />', $info);
106
+		$info = str_replace('&amp;sect;', '', $info);
107
+		$info = str_replace('"', '', $info);
108 108
 		if ($type == '') $type = NULL;
109 109
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
110
-		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
110
+		$query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name);
111 111
 		try {
112 112
 			$sth = $this->db->prepare($query);
113 113
 			$sth->execute($query_values);
114
-		} catch(PDOException $e) {
114
+		} catch (PDOException $e) {
115 115
 			return "error : ".$e->getMessage();
116 116
 		}
117 117
 	}
@@ -122,18 +122,18 @@  discard block
 block discarded – undo
122 122
 		try {
123 123
 			$sth = $this->db->prepare($query);
124 124
 			$sth->execute($query_values);
125
-		} catch(PDOException $e) {
125
+		} catch (PDOException $e) {
126 126
 			return "error : ".$e->getMessage();
127 127
 		}
128 128
 	}
129 129
 
130
-	public function deleteByIdent($ident,$format_source) {
130
+	public function deleteByIdent($ident, $format_source) {
131 131
 		$query = "DELETE FROM atc WHERE ident = :ident AND format_source = :format_source";
132
-		$query_values = array(':ident' => $ident,':format_source' => $format_source);
132
+		$query_values = array(':ident' => $ident, ':format_source' => $format_source);
133 133
 		try {
134 134
 			$sth = $this->db->prepare($query);
135 135
 			$sth->execute($query_values);
136
-		} catch(PDOException $e) {
136
+		} catch (PDOException $e) {
137 137
 			return "error : ".$e->getMessage();
138 138
 		}
139 139
 	}
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 		try {
145 145
 			$sth = $this->db->prepare($query);
146 146
 			$sth->execute($query_values);
147
-		} catch(PDOException $e) {
147
+		} catch (PDOException $e) {
148 148
 			return "error : ".$e->getMessage();
149 149
 		}
150 150
 	}
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 		try {
160 160
 			$sth = $this->db->prepare($query);
161 161
 			$sth->execute();
162
-		} catch(PDOException $e) {
162
+		} catch (PDOException $e) {
163 163
 			return "error";
164 164
 		}
165 165
 		return "success";
Please login to merge, or discard this patch.
Braces   +17 added lines, -6 removed lines patch added patch discarded remove patch
@@ -19,20 +19,27 @@  discard block
 block discarded – undo
19 19
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
20 20
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
21 21
 				foreach($globalStatsFilters[$globalFilterName] as $source) {
22
-					if (isset($source['source'])) $filter['source'][] = $source['source'];
22
+					if (isset($source['source'])) {
23
+						$filter['source'][] = $source['source'];
24
+					}
23 25
 				}
24 26
 			} else {
25 27
 				$filter = $globalStatsFilters[$globalFilterName];
26 28
 			}
27 29
 		}
28
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
30
+		if (is_array($globalFilter)) {
31
+			$filter = array_merge($filter,$globalFilter);
32
+		}
29 33
 		$filter_query_join = '';
30 34
 		$filter_query_where = '';
31 35
 		if (isset($filter['source']) && !empty($filter['source'])) {
32 36
 			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
33 37
 		}
34
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
35
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
38
+		if ($filter_query_where == '' && $where) {
39
+			$filter_query_where = ' WHERE';
40
+		} elseif ($filter_query_where != '' && $and) {
41
+			$filter_query_where .= ' AND';
42
+		}
36 43
 		$filter_query = $filter_query_join.$filter_query_where;
37 44
 		return $filter_query;
38 45
 	}
@@ -89,7 +96,9 @@  discard block
 block discarded – undo
89 96
 		$info = str_replace('^','<br />',$info);
90 97
 		$info = str_replace('&amp;sect;','',$info);
91 98
 		$info = str_replace('"','',$info);
92
-		if ($type == '') $type = NULL;
99
+		if ($type == '') {
100
+			$type = NULL;
101
+		}
93 102
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
94 103
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
95 104
 		try {
@@ -105,7 +114,9 @@  discard block
 block discarded – undo
105 114
 		$info = str_replace('^','<br />',$info);
106 115
 		$info = str_replace('&amp;sect;','',$info);
107 116
 		$info = str_replace('"','',$info);
108
-		if ($type == '') $type = NULL;
117
+		if ($type == '') {
118
+			$type = NULL;
119
+		}
109 120
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
110 121
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
111 122
 		try {
Please login to merge, or discard this patch.
tools-geoid.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 try {
6 6
 $GeoidHeight = new GeoidHeight();
7 7
 } catch (Exception $e) {
8
-    echo $e;
8
+	echo $e;
9 9
 }
10 10
 $title = _("Geoid Height Calculator");
11 11
 require_once('header.php');
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -12,9 +12,9 @@  discard block
 block discarded – undo
12 12
 
13 13
 $page_url = $globalURL.'/tools-geoid';
14 14
 
15
-$latitude = filter_input(INPUT_POST,'latitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
16
-$longitude = filter_input(INPUT_POST,'longitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
17
-$altitude = filter_input(INPUT_POST,'altitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
15
+$latitude = filter_input(INPUT_POST, 'latitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
16
+$longitude = filter_input(INPUT_POST, 'longitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
17
+$altitude = filter_input(INPUT_POST, 'altitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
18 18
 
19 19
 print '<div class="info column">';
20 20
 print '<h1>'._("Geoid Height Calculator").'</h1>';
@@ -51,14 +51,14 @@  discard block
 block discarded – undo
51 51
 
52 52
 if ($latitude != '' && $longitude != '') {
53 53
 	$globalDebug = FALSE;
54
-	$geoid = $GeoidHeight->get($latitude,$longitude);
54
+	$geoid = $GeoidHeight->get($latitude, $longitude);
55 55
 	print '<div class="row">';
56 56
 	print '<div class="col-md-3 col-md-offset-5">';
57 57
 	print '<div class="col-sm-6"><b>Geoid</b></div>';
58 58
 	print '<div class="col-sm-6">'.$geoid.'</div>';
59 59
 	if ($altitude != '') {
60 60
 		print '<div class="col-sm-6"><b>AMSL Elevation</b></div>';
61
-		print '<div class="col-sm-6">'.round($altitude-$geoid,3).'</div>';
61
+		print '<div class="col-sm-6">'.round($altitude - $geoid, 3).'</div>';
62 62
 	}
63 63
 	print '<div class="col-sm-6"><b>Earth Gravity Model</b></div>';
64 64
 	if (isset($globalGeoidSource) && $globalGeoidSource != '') $geoidsource = $globalGeoidSource;
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,8 +61,11 @@
 block discarded – undo
61 61
 		print '<div class="col-sm-6">'.round($altitude-$geoid,3).'</div>';
62 62
 	}
63 63
 	print '<div class="col-sm-6"><b>Earth Gravity Model</b></div>';
64
-	if (isset($globalGeoidSource) && $globalGeoidSource != '') $geoidsource = $globalGeoidSource;
65
-	else $geoidsource = 'EGM96-15';
64
+	if (isset($globalGeoidSource) && $globalGeoidSource != '') {
65
+		$geoidsource = $globalGeoidSource;
66
+	} else {
67
+		$geoidsource = 'EGM96-15';
68
+	}
66 69
 	print '<div class="col-sm-6">'.$geoidsource.'</div>';
67 70
 	print '</div>';
68 71
 }
Please login to merge, or discard this patch.
require/class.ACARS.php 3 patches
Indentation   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -16,11 +16,11 @@  discard block
 block discarded – undo
16 16
 		$this->SI = new SpotterImport($this->db);
17 17
 	}
18 18
 	/**
19
-	* Change IATA to ICAO value for ident
20
-	*
21
-	* @param String $ident ident
22
-	* @return String the icao
23
-	*/
19
+	 * Change IATA to ICAO value for ident
20
+	 *
21
+	 * @param String $ident ident
22
+	 * @return String the icao
23
+	 */
24 24
 	public function ident2icao($ident) {
25 25
 		if (substr($ident,0,2) == 'AF') {
26 26
 			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
@@ -36,11 +36,11 @@  discard block
 block discarded – undo
36 36
 	}
37 37
 
38 38
 	/**
39
-	* Deletes all info in the live table
40
-	*
41
-	* @return String success or false
42
-	*
43
-	*/
39
+	 * Deletes all info in the live table
40
+	 *
41
+	 * @return String success or false
42
+	 *
43
+	 */
44 44
 	public function deleteLiveAcarsData()
45 45
 	{
46 46
 		global $globalDBdriver;
@@ -60,11 +60,11 @@  discard block
 block discarded – undo
60 60
 	}
61 61
 
62 62
 	/**
63
-	* Deletes all info in the archive table
64
-	*
65
-	* @return String success or false
66
-	*
67
-	*/
63
+	 * Deletes all info in the archive table
64
+	 *
65
+	 * @return String success or false
66
+	 *
67
+	 */
68 68
 	public function deleteArchiveAcarsData()
69 69
 	{
70 70
 		global $globalACARSArchiveKeepMonths, $globalDBdriver;
@@ -85,11 +85,11 @@  discard block
 block discarded – undo
85 85
 
86 86
 
87 87
 	/**
88
-	* Parse ACARS data
89
-	*
90
-	* @param String ACARS data in acarsdec data
91
-	*
92
-	*/
88
+	 * Parse ACARS data
89
+	 *
90
+	 * @param String ACARS data in acarsdec data
91
+	 *
92
+	 */
93 93
 	public function parse($data) {
94 94
 		global $globalDebug, $globalACARSArchive;
95 95
 		//$Image = new Image($this->db);
@@ -719,11 +719,11 @@  discard block
 block discarded – undo
719 719
 	}
720 720
 
721 721
 	/**
722
-	* Add ACARS data
723
-	*
724
-	* @param String ACARS data in acarsdec data
725
-	*
726
-	*/
722
+	 * Add ACARS data
723
+	 *
724
+	 * @param String ACARS data in acarsdec data
725
+	 *
726
+	 */
727 727
 	function add($data) {
728 728
 		global $globalDebug, $globalACARSArchive;
729 729
 		$Image = new Image($this->db);
@@ -770,15 +770,15 @@  discard block
 block discarded – undo
770 770
 	}
771 771
 
772 772
 	/**
773
-	* Add Live ACARS data in DB
774
-	*
775
-	* @param String $ident ident
776
-	* @param String $registration Registration of the aircraft
777
-	* @param String $label Label of the ACARS message
778
-	* @param String $block_id Block id of the ACARS message
779
-	* @param String $msg_no Number of the ACARS message
780
-	* @param String $message ACARS message
781
-	*/
773
+	 * Add Live ACARS data in DB
774
+	 *
775
+	 * @param String $ident ident
776
+	 * @param String $registration Registration of the aircraft
777
+	 * @param String $label Label of the ACARS message
778
+	 * @param String $block_id Block id of the ACARS message
779
+	 * @param String $msg_no Number of the ACARS message
780
+	 * @param String $message ACARS message
781
+	 */
782 782
 	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
783 783
 		global $globalDebug;
784 784
 		date_default_timezone_set('UTC');
@@ -814,15 +814,15 @@  discard block
 block discarded – undo
814 814
 	}
815 815
 
816 816
 	/**
817
-	* Add Archive ACARS data in DB
818
-	*
819
-	* @param String $ident ident
820
-	* @param String $registration Registration of the aircraft
821
-	* @param String $label Label of the ACARS message
822
-	* @param String $block_id Block id of the ACARS message
823
-	* @param String $msg_no Number of the ACARS message
824
-	* @param String $message ACARS message
825
-	*/
817
+	 * Add Archive ACARS data in DB
818
+	 *
819
+	 * @param String $ident ident
820
+	 * @param String $registration Registration of the aircraft
821
+	 * @param String $label Label of the ACARS message
822
+	 * @param String $block_id Block id of the ACARS message
823
+	 * @param String $msg_no Number of the ACARS message
824
+	 * @param String $message ACARS message
825
+	 */
826 826
 	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
827 827
 		global $globalDebug;
828 828
 		date_default_timezone_set('UTC');
@@ -853,11 +853,11 @@  discard block
 block discarded – undo
853 853
 	}
854 854
 
855 855
 	/**
856
-	* Get Message title from label from DB
857
-	*
858
-	* @param String $label
859
-	* @return String Return ACARS title
860
-	*/
856
+	 * Get Message title from label from DB
857
+	 *
858
+	 * @param String $label
859
+	 * @return String Return ACARS title
860
+	 */
861 861
 	public function getTitlefromLabel($label) {
862 862
 		$Connection = new Connection($this->db);
863 863
 		$this->db = $Connection->db;
@@ -876,10 +876,10 @@  discard block
 block discarded – undo
876 876
 	}
877 877
 
878 878
 	/**
879
-	* List all Message title & label from DB
880
-	*
881
-	* @return Array Return ACARS data in array
882
-	*/
879
+	 * List all Message title & label from DB
880
+	 *
881
+	 * @return Array Return ACARS data in array
882
+	 */
883 883
 	public function getAllTitleLabel() {
884 884
 		$query = "SELECT * FROM acars_label ORDER BY title";
885 885
 		$query_values = array();
@@ -896,11 +896,11 @@  discard block
 block discarded – undo
896 896
 	}
897 897
 
898 898
 	/**
899
-	* Get Live ACARS data from DB
900
-	*
901
-	* @param String $ident
902
-	* @return Array Return ACARS data in array
903
-	*/
899
+	 * Get Live ACARS data from DB
900
+	 *
901
+	 * @param String $ident
902
+	 * @return Array Return ACARS data in array
903
+	 */
904 904
 	public function getLiveAcarsData($ident) {
905 905
 		$query = "SELECT * FROM acars_live WHERE ident = :ident ORDER BY acars_live_id DESC";
906 906
 		$query_values = array(':ident' => $ident);
@@ -917,10 +917,10 @@  discard block
 block discarded – undo
917 917
 	}
918 918
 
919 919
 	/**
920
-	* Get Latest ACARS data from DB
921
-	*
922
-	* @return Array Return ACARS data in array
923
-	*/
920
+	 * Get Latest ACARS data from DB
921
+	 *
922
+	 * @return Array Return ACARS data in array
923
+	 */
924 924
 	public function getLatestAcarsData($limit = '',$label = '') {
925 925
 		global $globalURL, $globalDBdriver;
926 926
 		$Image = new Image($this->db);
@@ -1008,10 +1008,10 @@  discard block
 block discarded – undo
1008 1008
 	}
1009 1009
 
1010 1010
 	/**
1011
-	* Get Archive ACARS data from DB
1012
-	*
1013
-	* @return Array Return ACARS data in array
1014
-	*/
1011
+	 * Get Archive ACARS data from DB
1012
+	 *
1013
+	 * @return Array Return ACARS data in array
1014
+	 */
1015 1015
 	public function getArchiveAcarsData($limit = '',$label = '') {
1016 1016
 		global $globalURL, $globalDBdriver;
1017 1017
 		$Image = new Image($this->db);
@@ -1099,13 +1099,13 @@  discard block
 block discarded – undo
1099 1099
 	}
1100 1100
 
1101 1101
 	/**
1102
-	* Add ModeS data to DB
1103
-	*
1104
-	* @param String $ident ident
1105
-	* @param String $registration Registration of the aircraft
1106
-	* @param String $icao
1107
-	* @param String $ICAOTypeCode
1108
-	*/
1102
+	 * Add ModeS data to DB
1103
+	 *
1104
+	 * @param String $ident ident
1105
+	 * @param String $registration Registration of the aircraft
1106
+	 * @param String $icao
1107
+	 * @param String $ICAOTypeCode
1108
+	 */
1109 1109
 	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
1110 1110
 		global $globalDebug, $globalDBdriver;
1111 1111
 		$ident = trim($ident);
Please login to merge, or discard this patch.
Spacing   +255 added lines, -255 removed lines patch added patch discarded remove patch
@@ -22,14 +22,14 @@  discard block
 block discarded – undo
22 22
 	* @return String the icao
23 23
 	*/
24 24
 	public function ident2icao($ident) {
25
-		if (substr($ident,0,2) == 'AF') {
26
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
27
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
25
+		if (substr($ident, 0, 2) == 'AF') {
26
+			if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
27
+			else $icao = 'AFR'.ltrim(substr($ident, 2), '0');
28 28
 		} else {
29 29
 			$Spotter = new Spotter($this->db);
30
-			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
30
+			$identicao = $Spotter->getAllAirlineInfo(substr($ident, 0, 2));
31 31
 			if (isset($identicao[0])) {
32
-				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
32
+				$icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0');
33 33
 			} else $icao = $ident;
34 34
 		}
35 35
 		return $icao;
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 			$sth = $this->db->prepare($query);
55 55
 			$sth->execute();
56
-		} catch(PDOException $e) {
56
+		} catch (PDOException $e) {
57 57
 			return "error";
58 58
 		}
59 59
 		return "success";
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 
78 78
 			$sth = $this->db->prepare($query);
79 79
 			$sth->execute();
80
-		} catch(PDOException $e) {
80
+		} catch (PDOException $e) {
81 81
 			return "error";
82 82
 		}
83 83
 		return "success";
@@ -102,13 +102,13 @@  discard block
 block discarded – undo
102 102
 		$ident = '';
103 103
 		$message = '';
104 104
 		$result = array();
105
-		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
106
-		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);
107
-		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);
108
-		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);
105
+		$n = sscanf($data, '(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
106
+		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);
107
+		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);
108
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
109 109
 		if ($n != 0) {
110
-			$registration = str_replace('.','',$registration);
111
-			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
110
+			$registration = str_replace('.', '', $registration);
111
+			$result = array('registration' => $registration, 'ident' => $ident, 'label' => $label, 'block_id' => $block_id, 'msg_no' => $msg_no, 'message' => $message);
112 112
 			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
113 113
 		} else $message = $data;
114 114
 		$decode = array();
@@ -128,14 +128,14 @@  discard block
 block discarded – undo
128 128
 				$temp = '';
129 129
 				$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);
130 130
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
131
-					$latitude = $la / 10000.0;
132
-					$longitude = $ln / 10000.0;
131
+					$latitude = $la/10000.0;
132
+					$longitude = $ln/10000.0;
133 133
 					if ($lac == 'S') $latitude = '-'.$latitude;
134 134
 					if ($lnc == 'W') $longitude = '-'.$longitude;
135 135
 					// Temp not always available
136 136
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
137
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
138
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
137
+					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => $alt);
138
+					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt, 'Temperature' => $temp.'°C');
139 139
 
140 140
 					//$icao = $Translation->checkTranslation($ident);
141 141
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -147,19 +147,19 @@  discard block
 block discarded – undo
147 147
 				$dhour = '';
148 148
 				$darr = '';
149 149
 				$ahour = '';
150
-				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
150
+				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr, $ahour);
151 151
 				if ($n == 4 && strlen($darr) == 4) {
152
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
153
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
154
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
152
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
153
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
154
+					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '.$darr.' - departure hour : '.$dhour.' - arrival hour : '.$ahour."\n";
155 155
 					//$icao = ACARS->ident2icao($ident);
156 156
 					//$icao = $Translation->checkTranslation($ident);
157 157
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
158 158
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
159 159
 					$found = true;
160 160
 				}
161
-				elseif ($n == 2 || $n  == 4) {
162
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
161
+				elseif ($n == 2 || $n == 4) {
162
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
163 163
 					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
164 164
 					//$icao = ACARS->ident2icao($ident);
165 165
 					//$icao = $Translation->checkTranslation($ident);
@@ -217,11 +217,11 @@  discard block
 block discarded – undo
217 217
 				$ahour = '';
218 218
 				$aair = '';
219 219
 				$apiste = '';
220
-				$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);
220
+				$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);
221 221
 				if ($n > 8) {
222
-					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";
223
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
224
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
222
+					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";
223
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
224
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
225 225
 					$icao = trim($aident);
226 226
 
227 227
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
@@ -246,8 +246,8 @@  discard block
 block discarded – undo
246 246
 				if ($n == 10 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
247 247
 					$las = $las.'.'.$lass;
248 248
 					$lns = $lns.'.'.$lns;
249
-					$latitude = $las / 1000.0;
250
-					$longitude = $lns / 1000.0;
249
+					$latitude = $las/1000.0;
250
+					$longitude = $lns/1000.0;
251 251
 					if ($lac == 'S') $latitude = '-'.$latitude;
252 252
 					if ($lnc == 'W') $longitude = '-'.$longitude;
253 253
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
@@ -342,17 +342,17 @@  discard block
 block discarded – undo
342 342
 				$alt = '';
343 343
 				$fuel = '';
344 344
 				$speed = '';
345
-				$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);
345
+				$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);
346 346
 				if ($n == 9) {
347 347
 					//if (self->$debug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
348 348
 					$icao = trim($aident);
349 349
 					$decode['icao'] = $icao;
350
-					$latitude = $las / 100.0;
351
-					$longitude = $lns / 100.0;
350
+					$latitude = $las/100.0;
351
+					$longitude = $lns/100.0;
352 352
 					if ($lac == 'S') $latitude = '-'.$latitude;
353 353
 					if ($lnc == 'W') $longitude = '-'.$longitude;
354 354
 
355
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
355
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Altitude' => 'FL'.$alt, 'Fuel' => $fuel, 'speed' => $speed);
356 356
 					$found = true;
357 357
 				}
358 358
 			}
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
 					if ($lac == 'S') $latitude = '-'.$latitude;
372 372
 					if ($lnc == 'W') $longitude = '-'.$longitude;
373 373
 
374
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
374
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
375 375
 					$found = true;
376 376
 				}
377 377
 			}
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
 				$dair = '';
405 405
 				$darr = '';
406 406
 				$aident = '';
407
-				$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);
407
+				$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);
408 408
 				if ($n == 8) {
409 409
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
410 410
 					$icao = trim($aident);
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
 				*/
437 437
 				$dair = '';
438 438
 				$darr = '';
439
-				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
439
+				$n = sscanf($message, '%4[A-Z]%4[A-Z]%*4d', $dair, $darr);
440 440
 				if ($n == 3) {
441 441
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
442 442
 					//$icao = $Translation->checkTranslation($ident);
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
 				*/
452 452
 				$dair = '';
453 453
 				$darr = '';
454
-				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
454
+				$n = sscanf($message, '3J01 DSPTCH %*d/%*d %4s/%4s .%*6s', $dair, $darr);
455 455
 				if ($n == 3) {
456 456
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
457 457
 					//$icao = $Translation->checkTranslation($ident);
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 				}
462 462
 			}
463 463
 			if (!$found) {
464
-				$n = sscanf($message,'MET01%4c',$airport);
464
+				$n = sscanf($message, 'MET01%4c', $airport);
465 465
 				if ($n == 1) {
466 466
 					if ($globalDebug) echo 'airport name : '.$airport;
467 467
 					$decode = array('Airport/Waypoint name' => $airport);
@@ -469,241 +469,241 @@  discard block
 block discarded – undo
469 469
 				}
470 470
 			}
471 471
 			if ($label == 'H1') {
472
-				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
473
-					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
472
+				if (preg_match('/^#CFBFLR/', $message) || preg_match('/^#CFBWRN/', $message)) {
473
+					$decode = array_merge(array('Message nature' => 'Equipment failure'), $decode);
474 474
 				}
475
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
476
-					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
475
+				elseif (preg_match('/^#DFB\*TKO/', $message) || preg_match('/^#DFBTKO/', $message)) {
476
+					$decode = array_merge(array('Message nature' => 'Take off performance data'), $decode);
477 477
 				}
478
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
479
-					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
478
+				elseif (preg_match('/^#DFB\*CRZ/', $message) || preg_match('/^#DFBCRZ/', $message)) {
479
+					$decode = array_merge(array('Message nature' => 'Cruise performance data'), $decode);
480 480
 				}
481
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
482
-					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
481
+				elseif (preg_match('/^#DFB\*WOB/', $message) || preg_match('/^#DFBWOB/', $message)) {
482
+					$decode = array_merge(array('Message nature' => 'Weather observation'), $decode);
483 483
 				}
484
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
485
-					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
484
+				elseif (preg_match(':^#DFB/PIREP:', $message)) {
485
+					$decode = array_merge(array('Message nature' => 'Pilot Report'), $decode);
486 486
 				}
487
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
488
-					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
487
+				elseif (preg_match('/^#DFBEDA/', $message) || preg_match('/^#DFBENG/', $message)) {
488
+					$decode = array_merge(array('Message nature' => 'Engine Data'), $decode);
489 489
 				}
490
-				elseif (preg_match(':^#M1AAEP:',$message)) {
491
-					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
490
+				elseif (preg_match(':^#M1AAEP:', $message)) {
491
+					$decode = array_merge(array('Message nature' => 'Position/Weather Report'), $decode);
492 492
 				}
493
-				elseif (preg_match(':^#M2APWD:',$message)) {
494
-					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
493
+				elseif (preg_match(':^#M2APWD:', $message)) {
494
+					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'), $decode);
495 495
 				}
496
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
497
-					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
496
+				elseif (preg_match(':^#M1BREQPWI:', $message)) {
497
+					$decode = array_merge(array('Message nature' => 'Predicted wind info request'), $decode);
498 498
 				}
499
-				elseif (preg_match(':^#CF:',$message)) {
500
-					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
499
+				elseif (preg_match(':^#CF:', $message)) {
500
+					$decode = array_merge(array('Message nature' => 'Central Fault Display'), $decode);
501 501
 				}
502
-				elseif (preg_match(':^#DF:',$message)) {
503
-					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
502
+				elseif (preg_match(':^#DF:', $message)) {
503
+					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'), $decode);
504 504
 				}
505
-				elseif (preg_match(':^#EC:',$message)) {
506
-					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
505
+				elseif (preg_match(':^#EC:', $message)) {
506
+					$decode = array_merge(array('Message nature' => 'Engine Display System'), $decode);
507 507
 				}
508
-				elseif (preg_match(':^#EI:',$message)) {
509
-					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
508
+				elseif (preg_match(':^#EI:', $message)) {
509
+					$decode = array_merge(array('Message nature' => 'Engine Report'), $decode);
510 510
 				}
511
-				elseif (preg_match(':^#H1:',$message)) {
512
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
511
+				elseif (preg_match(':^#H1:', $message)) {
512
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'), $decode);
513 513
 				}
514
-				elseif (preg_match(':^#H2:',$message)) {
515
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
514
+				elseif (preg_match(':^#H2:', $message)) {
515
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'), $decode);
516 516
 				}
517
-				elseif (preg_match(':^#HD:',$message)) {
518
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
517
+				elseif (preg_match(':^#HD:', $message)) {
518
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'), $decode);
519 519
 				}
520
-				elseif (preg_match(':^#M1:',$message)) {
521
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
520
+				elseif (preg_match(':^#M1:', $message)) {
521
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'), $decode);
522 522
 				}
523
-				elseif (preg_match(':^#M2:',$message)) {
524
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
523
+				elseif (preg_match(':^#M2:', $message)) {
524
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'), $decode);
525 525
 				}
526
-				elseif (preg_match(':^#M3:',$message)) {
527
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
526
+				elseif (preg_match(':^#M3:', $message)) {
527
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'), $decode);
528 528
 				}
529
-				elseif (preg_match(':^#MD:',$message)) {
530
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
529
+				elseif (preg_match(':^#MD:', $message)) {
530
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'), $decode);
531 531
 				}
532
-				elseif (preg_match(':^#PS:',$message)) {
533
-					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
532
+				elseif (preg_match(':^#PS:', $message)) {
533
+					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'), $decode);
534 534
 				}
535
-				elseif (preg_match(':^#S1:',$message)) {
536
-					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
535
+				elseif (preg_match(':^#S1:', $message)) {
536
+					$decode = array_merge(array('Message nature' => 'SDU - Left'), $decode);
537 537
 				}
538
-				elseif (preg_match(':^#S2:',$message)) {
539
-					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
538
+				elseif (preg_match(':^#S2:', $message)) {
539
+					$decode = array_merge(array('Message nature' => 'SDU - Right'), $decode);
540 540
 				}
541
-				elseif (preg_match(':^#SD:',$message)) {
542
-					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
541
+				elseif (preg_match(':^#SD:', $message)) {
542
+					$decode = array_merge(array('Message nature' => 'SDU - Selected'), $decode);
543 543
 				}
544
-				elseif (preg_match(':^#T[0-8]:',$message)) {
545
-					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
544
+				elseif (preg_match(':^#T[0-8]:', $message)) {
545
+					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'), $decode);
546 546
 				}
547
-				elseif (preg_match(':^#WO:',$message)) {
548
-					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
547
+				elseif (preg_match(':^#WO:', $message)) {
548
+					$decode = array_merge(array('Message nature' => 'Weather Observation Report'), $decode);
549 549
 				}
550
-				elseif (preg_match(':^#A1:',$message)) {
551
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
550
+				elseif (preg_match(':^#A1:', $message)) {
551
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'), $decode);
552 552
 				}
553
-				elseif (preg_match(':^#A3:',$message)) {
554
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
553
+				elseif (preg_match(':^#A3:', $message)) {
554
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'), $decode);
555 555
 				}
556
-				elseif (preg_match(':^#A4:',$message)) {
557
-					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
556
+				elseif (preg_match(':^#A4:', $message)) {
557
+					$decode = array_merge(array('Message nature' => 'Flight Systems Message'), $decode);
558 558
 				}
559
-				elseif (preg_match(':^#A6:',$message)) {
560
-					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
559
+				elseif (preg_match(':^#A6:', $message)) {
560
+					$decode = array_merge(array('Message nature' => 'Request ADS Reports'), $decode);
561 561
 				}
562
-				elseif (preg_match(':^#A8:',$message)) {
563
-					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
562
+				elseif (preg_match(':^#A8:', $message)) {
563
+					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'), $decode);
564 564
 				}
565
-				elseif (preg_match(':^#A9:',$message)) {
566
-					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
565
+				elseif (preg_match(':^#A9:', $message)) {
566
+					$decode = array_merge(array('Message nature' => 'ATIS report'), $decode);
567 567
 				}
568
-				elseif (preg_match(':^#A0:',$message)) {
569
-					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
568
+				elseif (preg_match(':^#A0:', $message)) {
569
+					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'), $decode);
570 570
 				}
571
-				elseif (preg_match(':^#AA:',$message)) {
572
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
571
+				elseif (preg_match(':^#AA:', $message)) {
572
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
573 573
 				}
574
-				elseif (preg_match(':^#AB:',$message)) {
575
-					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
574
+				elseif (preg_match(':^#AB:', $message)) {
575
+					$decode = array_merge(array('Message nature' => 'TWIP Report'), $decode);
576 576
 				}
577
-				elseif (preg_match(':^#AC:',$message)) {
578
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
577
+				elseif (preg_match(':^#AC:', $message)) {
578
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance'), $decode);
579 579
 				}
580
-				elseif (preg_match(':^#AD:',$message)) {
581
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
580
+				elseif (preg_match(':^#AD:', $message)) {
581
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'), $decode);
582 582
 				}
583
-				elseif (preg_match(':^#AF:',$message)) {
584
-					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
583
+				elseif (preg_match(':^#AF:', $message)) {
584
+					$decode = array_merge(array('Message nature' => 'CPC Command/Response'), $decode);
585 585
 				}
586
-				elseif (preg_match(':^#B1:',$message)) {
587
-					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
586
+				elseif (preg_match(':^#B1:', $message)) {
587
+					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'), $decode);
588 588
 				}
589
-				elseif (preg_match(':^#B2:',$message)) {
590
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
589
+				elseif (preg_match(':^#B2:', $message)) {
590
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'), $decode);
591 591
 				}
592
-				elseif (preg_match(':^#B3:',$message)) {
593
-					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
592
+				elseif (preg_match(':^#B3:', $message)) {
593
+					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'), $decode);
594 594
 				}
595
-				elseif (preg_match(':^#B4:',$message)) {
596
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
595
+				elseif (preg_match(':^#B4:', $message)) {
596
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'), $decode);
597 597
 				}
598
-				elseif (preg_match(':^#B6:',$message)) {
599
-					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
598
+				elseif (preg_match(':^#B6:', $message)) {
599
+					$decode = array_merge(array('Message nature' => 'Provide ADS Report'), $decode);
600 600
 				}
601
-				elseif (preg_match(':^#B8:',$message)) {
602
-					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
601
+				elseif (preg_match(':^#B8:', $message)) {
602
+					$decode = array_merge(array('Message nature' => 'Request Departure Slot'), $decode);
603 603
 				}
604
-				elseif (preg_match(':^#B9:',$message)) {
605
-					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
604
+				elseif (preg_match(':^#B9:', $message)) {
605
+					$decode = array_merge(array('Message nature' => 'Request ATIS Report'), $decode);
606 606
 				}
607
-				elseif (preg_match(':^#B0:',$message)) {
608
-					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
607
+				elseif (preg_match(':^#B0:', $message)) {
608
+					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'), $decode);
609 609
 				}
610
-				elseif (preg_match(':^#BA:',$message)) {
611
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
610
+				elseif (preg_match(':^#BA:', $message)) {
611
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
612 612
 				}
613
-				elseif (preg_match(':^#BB:',$message)) {
614
-					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
613
+				elseif (preg_match(':^#BB:', $message)) {
614
+					$decode = array_merge(array('Message nature' => 'Request TWIP Report'), $decode);
615 615
 				}
616
-				elseif (preg_match(':^#BC:',$message)) {
617
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
616
+				elseif (preg_match(':^#BC:', $message)) {
617
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'), $decode);
618 618
 				}
619
-				elseif (preg_match(':^#BD:',$message)) {
620
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
619
+				elseif (preg_match(':^#BD:', $message)) {
620
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'), $decode);
621 621
 				}
622
-				elseif (preg_match(':^#BE:',$message)) {
623
-					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
622
+				elseif (preg_match(':^#BE:', $message)) {
623
+					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'), $decode);
624 624
 				}
625
-				elseif (preg_match(':^#BF:',$message)) {
626
-					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
625
+				elseif (preg_match(':^#BF:', $message)) {
626
+					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'), $decode);
627 627
 				}
628
-				elseif (preg_match(':^#H3:',$message)) {
629
-					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
628
+				elseif (preg_match(':^#H3:', $message)) {
629
+					$decode = array_merge(array('Message nature' => 'Icing Report'), $decode);
630 630
 				}
631 631
 			}
632 632
 			if ($label == '10') {
633
-				if (preg_match(':^DTO01:',$message)) {
634
-					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
633
+				if (preg_match(':^DTO01:', $message)) {
634
+					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'), $decode);
635 635
 				}
636
-				elseif (preg_match(':^AIS01:',$message)) {
637
-					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
636
+				elseif (preg_match(':^AIS01:', $message)) {
637
+					$decode = array_merge(array('Message nature' => 'AIS Request'), $decode);
638 638
 				}
639
-				elseif (preg_match(':^FTX01:',$message)) {
640
-					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
639
+				elseif (preg_match(':^FTX01:', $message)) {
640
+					$decode = array_merge(array('Message nature' => 'Free Text Downlink'), $decode);
641 641
 				}
642
-				elseif (preg_match(':^FPL01:',$message)) {
643
-					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
642
+				elseif (preg_match(':^FPL01:', $message)) {
643
+					$decode = array_merge(array('Message nature' => 'Flight Plan Request'), $decode);
644 644
 				}
645
-				elseif (preg_match(':^WAB01:',$message)) {
646
-					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
645
+				elseif (preg_match(':^WAB01:', $message)) {
646
+					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'), $decode);
647 647
 				}
648
-				elseif (preg_match(':^MET01:',$message)) {
649
-					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
648
+				elseif (preg_match(':^MET01:', $message)) {
649
+					$decode = array_merge(array('Message nature' => 'Weather Data Request'), $decode);
650 650
 				}
651
-				elseif (preg_match(':^WAB02:',$message)) {
652
-					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
651
+				elseif (preg_match(':^WAB02:', $message)) {
652
+					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'), $decode);
653 653
 				}
654 654
 			}
655 655
 			if ($label == '15') {
656
-				if (preg_match(':^FST01:',$message)) {
657
-					$decode = array_merge(array('Message nature' => 'Flight Status Report'),$decode);
656
+				if (preg_match(':^FST01:', $message)) {
657
+					$decode = array_merge(array('Message nature' => 'Flight Status Report'), $decode);
658 658
 				}
659 659
 			}
660 660
 			if (!$found && $label == 'SA') {
661
-				$n = sscanf($message, "%d%c%c%6[0-9]", $version,$state,$type,$at);
661
+				$n = sscanf($message, "%d%c%c%6[0-9]", $version, $state, $type, $at);
662 662
 				if ($n == 4) {
663 663
 					$vsta = array('Version' => $version);
664 664
 					if ($state == 'E') {
665
-						$vsta = array_merge($vsta,array('Link state' => 'Established'));
665
+						$vsta = array_merge($vsta, array('Link state' => 'Established'));
666 666
 					}
667 667
 					elseif ($state == 'L') {
668
-						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
668
+						$vsta = array_merge($vsta, array('Link state' => 'Lost'));
669 669
 					}
670 670
 					else {
671
-						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
671
+						$vsta = array_merge($vsta, array('Link state' => 'Unknown'));
672 672
 					}
673 673
 					if ($type == 'V') {
674
-						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
674
+						$vsta = array_merge($vsta, array('Link type' => 'VHF ACARS'));
675 675
 					}
676 676
 					elseif ($type == 'S') {
677
-						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
677
+						$vsta = array_merge($vsta, array('Link type' => 'Generic SATCOM'));
678 678
 					}
679 679
 					elseif ($type == 'H') {
680
-						$vsta = array_merge($vsta,array('Link type' => 'HF'));
680
+						$vsta = array_merge($vsta, array('Link type' => 'HF'));
681 681
 					}
682 682
 					elseif ($type == 'G') {
683
-						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
683
+						$vsta = array_merge($vsta, array('Link type' => 'GlobalStar SATCOM'));
684 684
 					}
685 685
 					elseif ($type == 'C') {
686
-						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
686
+						$vsta = array_merge($vsta, array('Link type' => 'ICO SATCOM'));
687 687
 					}
688 688
 					elseif ($type == '2') {
689
-						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
689
+						$vsta = array_merge($vsta, array('Link type' => 'VDL Mode 2'));
690 690
 					}
691 691
 					elseif ($type == 'X') {
692
-						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
692
+						$vsta = array_merge($vsta, array('Link type' => 'Inmarsat Aero'));
693 693
 					}
694 694
 					elseif ($type == 'I') {
695
-						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
695
+						$vsta = array_merge($vsta, array('Link type' => 'Irridium SATCOM'));
696 696
 					}
697 697
 					else {
698
-						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
698
+						$vsta = array_merge($vsta, array('Link type' => 'Unknown'));
699 699
 					}
700
-					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
701
-					$decode = array_merge($vsta,$decode);
700
+					$vsta = array_merge($vsta, array('Event occured at' => implode(':', str_split($at, 2))));
701
+					$decode = array_merge($vsta, $decode);
702 702
 				}
703 703
 			}
704 704
 
705 705
 			$title = $this->getTitlefromLabel($label);
706
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
706
+			if ($title != '') $decode = array_merge(array('Message title' => $title), $decode);
707 707
 			/*
708 708
 			// Business jets always use GS0001
709 709
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
@@ -731,13 +731,13 @@  discard block
 block discarded – undo
731 731
 		$Translation = new Translation($this->db);
732 732
 		$message = $this->parse($data);
733 733
 		if (isset($message['registration']) && $message['registration'] != '' && $message['ident'] != '' && $message['registration'] != '!') {
734
-			$ident = (string)$message['ident'];
734
+			$ident = (string) $message['ident'];
735 735
 			$label = $message['label'];
736 736
 			$block_id = $message['block_id'];
737 737
 			$msg_no = $message['msg_no'];
738 738
 			$msg = $message['message'];
739 739
 			$decode = $message['decode'];
740
-			$registration = (string)$message['registration'];
740
+			$registration = (string) $message['registration'];
741 741
 			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
742 742
 			else $latitude = '';
743 743
 			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
@@ -751,20 +751,20 @@  discard block
 block discarded – undo
751 751
 				$Image->addSpotterImage($registration);
752 752
 			}
753 753
 			// Business jets always use GS0001
754
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
754
+			if ($ident != 'GS0001') $info = $this->addModeSData($ident, $registration, $icao, $airicao, $latitude, $longitude);
755 755
 			if ($globalDebug && isset($info) && $info != '') echo $info;
756 756
 			if (count($decode) > 0) $decode_json = json_encode($decode);
757 757
 			else $decode_json = '';
758 758
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
759
-				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
759
+				$Schedule->addSchedule($icao, $decode['Departure airport'], $decode['Departure hour'], $decode['Arrival airport'], $decode['Arrival hour'], 'ACARS');
760 760
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
761
-				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
761
+				$Schedule->addSchedule($icao, $decode['Departure airport'], '', $decode['Arrival airport'], '', 'ACARS');
762 762
 			}
763
-			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
764
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
765
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
763
+			$result = $this->addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
764
+			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10', '80', '81', '82', '3F');
765
+			if ($result && in_array($label, $globalACARSArchive)) $this->addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
766 766
 			if ($globalDebug && count($decode) > 0) {
767
-				echo "Human readable data : ".implode(' - ',$decode)."\n";
767
+				echo "Human readable data : ".implode(' - ', $decode)."\n";
768 768
 			}
769 769
 		}
770 770
 	}
@@ -779,7 +779,7 @@  discard block
 block discarded – undo
779 779
 	* @param String $msg_no Number of the ACARS message
780 780
 	* @param String $message ACARS message
781 781
 	*/
782
-	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
782
+	public function addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
783 783
 		global $globalDebug;
784 784
 		date_default_timezone_set('UTC');
785 785
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
@@ -787,21 +787,21 @@  discard block
 block discarded – undo
787 787
 			$this->db = $Connection->db;
788 788
 			if ($globalDebug) echo "Test if not already in Live ACARS table...";
789 789
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
790
-			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
790
+			$query_test_values = array(':ident' => $ident, ':registration' => $registration, ':message' => $message);
791 791
 			try {
792 792
 				$stht = $this->db->prepare($query_test);
793 793
 				$stht->execute($query_test_values);
794
-			} catch(PDOException $e) {
794
+			} catch (PDOException $e) {
795 795
 				return "error : ".$e->getMessage();
796 796
 			}
797 797
 			if ($stht->fetchColumn() == 0) {
798 798
 				if ($globalDebug) echo "Add Live ACARS data...";
799 799
 				$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)";
800
-				$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"));
800
+				$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"));
801 801
 				try {
802 802
 					$sth = $this->db->prepare($query);
803 803
 					$sth->execute($query_values);
804
-				} catch(PDOException $e) {
804
+				} catch (PDOException $e) {
805 805
 					return "error : ".$e->getMessage();
806 806
 				}
807 807
 			} else {
@@ -823,10 +823,10 @@  discard block
 block discarded – undo
823 823
 	* @param String $msg_no Number of the ACARS message
824 824
 	* @param String $message ACARS message
825 825
 	*/
826
-	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
826
+	public function addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
827 827
 		global $globalDebug;
828 828
 		date_default_timezone_set('UTC');
829
-		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) {
829
+		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) {
830 830
 			/*
831 831
 				    if ($globalDebug) echo "Test if not already in Archive ACARS table...";
832 832
 			    	    $query_test = "SELECT COUNT(*) as nb FROM acars_archive WHERE ident = :ident AND registration = :registration AND message = :message";
@@ -841,11 +841,11 @@  discard block
 block discarded – undo
841 841
 			*/
842 842
 			if ($globalDebug) echo "Add Live ACARS data...";
843 843
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
844
-			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
844
+			$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
845 845
 			try {
846 846
 				$sth = $this->db->prepare($query);
847 847
 				$sth->execute($query_values);
848
-			} catch(PDOException $e) {
848
+			} catch (PDOException $e) {
849 849
 				return "error : ".$e->getMessage();
850 850
 			}
851 851
 			if ($globalDebug) echo "Done\n";
@@ -866,7 +866,7 @@  discard block
 block discarded – undo
866 866
 		try {
867 867
 			$sth = $this->db->prepare($query);
868 868
 			$sth->execute($query_values);
869
-		} catch(PDOException $e) {
869
+		} catch (PDOException $e) {
870 870
 			echo "error : ".$e->getMessage();
871 871
 			die;
872 872
 		}
@@ -886,7 +886,7 @@  discard block
 block discarded – undo
886 886
 		try {
887 887
 			$sth = $this->db->prepare($query);
888 888
 			$sth->execute($query_values);
889
-		} catch(PDOException $e) {
889
+		} catch (PDOException $e) {
890 890
 			echo "error : ".$e->getMessage();
891 891
 			die;
892 892
 		}
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
 		try {
908 908
 			$sth = $this->db->prepare($query);
909 909
 			$sth->execute($query_values);
910
-		} catch(PDOException $e) {
910
+		} catch (PDOException $e) {
911 911
 			echo "error : ".$e->getMessage();
912 912
 			die;
913 913
 		}
@@ -921,7 +921,7 @@  discard block
 block discarded – undo
921 921
 	*
922 922
 	* @return Array Return ACARS data in array
923 923
 	*/
924
-	public function getLatestAcarsData($limit = '',$label = '') {
924
+	public function getLatestAcarsData($limit = '', $label = '') {
925 925
 		global $globalURL, $globalDBdriver;
926 926
 		$Image = new Image($this->db);
927 927
 		$Spotter = new Spotter($this->db);
@@ -932,8 +932,8 @@  discard block
 block discarded – undo
932 932
 		if ($limit != "")
933 933
 		{
934 934
 			$limit_array = explode(",", $limit);
935
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
936
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
935
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
936
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
937 937
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
938 938
 			{
939 939
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -949,46 +949,46 @@  discard block
 block discarded – undo
949 949
 		try {
950 950
 			$sth = $this->db->prepare($query);
951 951
 			$sth->execute($query_values);
952
-		} catch(PDOException $e) {
952
+		} catch (PDOException $e) {
953 953
 			return "error : ".$e->getMessage();
954 954
 		}
955 955
 		$i = 0;
956 956
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
957 957
 			$data = array();
958 958
 			if ($row['registration'] != '') {
959
-				$row['registration'] = str_replace('.','',$row['registration']);
959
+				$row['registration'] = str_replace('.', '', $row['registration']);
960 960
 				$image_array = $Image->getSpotterImage($row['registration']);
961
-				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']));
962
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
963
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
961
+				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']));
962
+				else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
963
+			} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
964 964
 			if ($row['registration'] == '') $row['registration'] = 'NA';
965 965
 			if ($row['ident'] == '') $row['ident'] = 'NA';
966
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
966
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
967 967
 			if (isset($identicao[0])) {
968
-				if (substr($row['ident'],0,2) == 'AF') {
969
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
970
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
971
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
972
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
968
+				if (substr($row['ident'], 0, 2) == 'AF') {
969
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
970
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
971
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
972
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
973 973
 			} else $icao = $row['ident'];
974
-			$icao = $Translation->checkTranslation($icao,false);
975
-			$decode = json_decode($row['decode'],true);
974
+			$icao = $Translation->checkTranslation($icao, false);
975
+			$decode = json_decode($row['decode'], true);
976 976
 			$found = false;
977
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
977
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
978 978
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
979 979
 				if (isset($airport_info[0]['icao'])) {
980 980
 					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
981 981
 					$found = true;
982 982
 				}
983 983
 			}
984
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
984
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
985 985
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
986 986
 				if (isset($airport_info[0]['icao'])) {
987 987
 					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
988 988
 					$found = true;
989 989
 				}
990 990
 			}
991
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
991
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
992 992
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
993 993
 				if (isset($airport_info[0]['icao'])) {
994 994
 					$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>';
@@ -996,7 +996,7 @@  discard block
 block discarded – undo
996 996
 				}
997 997
 			}
998 998
 			if ($found) $row['decode'] = json_encode($decode);
999
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
999
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1000 1000
 			$result[] = $data;
1001 1001
 			$i++;
1002 1002
 		}
@@ -1012,7 +1012,7 @@  discard block
 block discarded – undo
1012 1012
 	*
1013 1013
 	* @return Array Return ACARS data in array
1014 1014
 	*/
1015
-	public function getArchiveAcarsData($limit = '',$label = '') {
1015
+	public function getArchiveAcarsData($limit = '', $label = '') {
1016 1016
 		global $globalURL, $globalDBdriver;
1017 1017
 		$Image = new Image($this->db);
1018 1018
 		$Spotter = new Spotter($this->db);
@@ -1022,8 +1022,8 @@  discard block
 block discarded – undo
1022 1022
 		if ($limit != "")
1023 1023
 		{
1024 1024
 			$limit_array = explode(",", $limit);
1025
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
1026
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
1025
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
1026
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
1027 1027
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
1028 1028
 			{
1029 1029
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -1044,43 +1044,43 @@  discard block
 block discarded – undo
1044 1044
 		try {
1045 1045
 			$sth = $this->db->prepare($query);
1046 1046
 			$sth->execute($query_values);
1047
-		} catch(PDOException $e) {
1047
+		} catch (PDOException $e) {
1048 1048
 			return "error : ".$e->getMessage();
1049 1049
 		}
1050
-		$i=0;
1050
+		$i = 0;
1051 1051
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
1052 1052
 			$data = array();
1053 1053
 			if ($row['registration'] != '') {
1054
-				$row['registration'] = str_replace('.','',$row['registration']);
1054
+				$row['registration'] = str_replace('.', '', $row['registration']);
1055 1055
 				$image_array = $Image->getSpotterImage($row['registration']);
1056
-				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']));
1057
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1058
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1056
+				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']));
1057
+				else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
1058
+			} else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
1059 1059
 			$icao = '';
1060 1060
 			if ($row['registration'] == '') $row['registration'] = 'NA';
1061 1061
 			if ($row['ident'] == '') $row['ident'] = 'NA';
1062
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
1062
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
1063 1063
 			if (isset($identicao[0])) {
1064
-				if (substr($row['ident'],0,2) == 'AF') {
1065
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1066
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1067
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1068
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
1064
+				if (substr($row['ident'], 0, 2) == 'AF') {
1065
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1066
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
1067
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
1068
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
1069 1069
 			} else $icao = $row['ident'];
1070 1070
 			$icao = $Translation->checkTranslation($icao);
1071
-			$decode = json_decode($row['decode'],true);
1071
+			$decode = json_decode($row['decode'], true);
1072 1072
 			$found = false;
1073
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
1073
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
1074 1074
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
1075 1075
 				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>';
1076 1076
 				$found = true;
1077 1077
 			}
1078
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
1078
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
1079 1079
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
1080 1080
 				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>';
1081 1081
 				$found = true;
1082 1082
 			}
1083
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
1083
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
1084 1084
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
1085 1085
 				if (isset($airport_info[0]['icao'])) {
1086 1086
 					$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>';
@@ -1088,7 +1088,7 @@  discard block
 block discarded – undo
1088 1088
 				}
1089 1089
 			}
1090 1090
 			if ($found) $row['decode'] = json_encode($decode);
1091
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1091
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1092 1092
 			$result[] = $data;
1093 1093
 			$i++;
1094 1094
 		}
@@ -1106,7 +1106,7 @@  discard block
 block discarded – undo
1106 1106
 	* @param String $icao
1107 1107
 	* @param String $ICAOTypeCode
1108 1108
 	*/
1109
-	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
1109
+	public function addModeSData($ident, $registration, $icao = '', $ICAOTypeCode = '', $latitude = '', $longitude = '') {
1110 1110
 		global $globalDebug, $globalDBdriver;
1111 1111
 		$ident = trim($ident);
1112 1112
 		$Translation = new Translation($this->db);
@@ -1119,7 +1119,7 @@  discard block
 block discarded – undo
1119 1119
 			if ($globalDebug) echo "Ident or registration null, exit\n";
1120 1120
 			return '';
1121 1121
 		}
1122
-		$registration = str_replace('.','',$registration);
1122
+		$registration = str_replace('.', '', $registration);
1123 1123
 		$ident = $Translation->ident2icao($ident);
1124 1124
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
1125 1125
 		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
@@ -1128,7 +1128,7 @@  discard block
 block discarded – undo
1128 1128
 		try {
1129 1129
 			$sthsi = $this->db->prepare($querysi);
1130 1130
 			$sthsi->execute($querysi_values);
1131
-		} catch(PDOException $e) {
1131
+		} catch (PDOException $e) {
1132 1132
 			if ($globalDebug) echo $e->getMessage();
1133 1133
 			return "error : ".$e->getMessage();
1134 1134
 		}
@@ -1138,8 +1138,8 @@  discard block
 block discarded – undo
1138 1138
 			$Translation = new Translation($this->db);
1139 1139
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
1140 1140
 			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1141
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1142
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1141
+			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'], $ident, 'ACARS');
1142
+			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'], $ident, 'ACARS');
1143 1143
 		} else {
1144 1144
 			if ($registration != '' && $latitude != '' && $longitude != '') {
1145 1145
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1147,7 +1147,7 @@  discard block
 block discarded – undo
1147 1147
 				try {
1148 1148
 					$sth = $this->db->prepare($query);
1149 1149
 					$sth->execute($query_values);
1150
-				} catch(PDOException $e) {
1150
+				} catch (PDOException $e) {
1151 1151
 					if ($globalDebug) echo $e->getMessage();
1152 1152
 					return "error : ".$e->getMessage();
1153 1153
 				}
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
1155 1155
 				$sth->closeCursor();
1156 1156
 				if (isset($result['modes'])) $hex = $result['modes'];
1157 1157
 				else $hex = '';
1158
-				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
1158
+				$SI_data = array('hex' => $hex, 'ident' => $ident, 'aircraft_icao' => $ICAOTypeCode, 'registration' => $registration, 'latitude' => $latitude, '$longitude' => $longitude, 'format_source' => 'ACARS');
1159 1159
 				$this->SI->add($SI_data);
1160 1160
 			}
1161 1161
 		}
@@ -1165,7 +1165,7 @@  discard block
 block discarded – undo
1165 1165
 		try {
1166 1166
 			$sth = $this->db->prepare($query);
1167 1167
 			$sth->execute($query_values);
1168
-		} catch(PDOException $e) {
1168
+		} catch (PDOException $e) {
1169 1169
 			if ($globalDebug) echo $e->getMessage();
1170 1170
 			return "error : ".$e->getMessage();
1171 1171
 		}
@@ -1175,7 +1175,7 @@  discard block
 block discarded – undo
1175 1175
 			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
1176 1176
 			else $ModeS = '';
1177 1177
 			if ($ModeS == '') {
1178
-				$id = explode('-',$result['flightaware_id']);
1178
+				$id = explode('-', $result['flightaware_id']);
1179 1179
 				$ModeS = $id[0];
1180 1180
 			}
1181 1181
 			if ($ModeS != '') {
@@ -1185,20 +1185,20 @@  discard block
 block discarded – undo
1185 1185
 				try {
1186 1186
 					$sthc = $this->db->prepare($queryc);
1187 1187
 					$sthc->execute($queryc_values);
1188
-				} catch(PDOException $e) {
1188
+				} catch (PDOException $e) {
1189 1189
 					if ($globalDebug) echo $e->getMessage();
1190 1190
 					return "error : ".$e->getMessage();
1191 1191
 				}
1192 1192
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
1193 1193
 				$sthc->closeCursor();
1194
-				if (count($row) ==  0) {
1194
+				if (count($row) == 0) {
1195 1195
 					if ($globalDebug) echo " Add to ModeS table - ";
1196 1196
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
1197
-					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1197
+					$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1198 1198
 					try {
1199 1199
 						$sthi = $this->db->prepare($queryi);
1200 1200
 						$sthi->execute($queryi_values);
1201
-					} catch(PDOException $e) {
1201
+					} catch (PDOException $e) {
1202 1202
 						if ($globalDebug) echo $e->getMessage();
1203 1203
 						return "error : ".$e->getMessage();
1204 1204
 					}
@@ -1206,15 +1206,15 @@  discard block
 block discarded – undo
1206 1206
 					if ($globalDebug) echo " Update ModeS table - ";
1207 1207
 					if ($ICAOTypeCode != '') {
1208 1208
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1209
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1209
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1210 1210
 					} else {
1211 1211
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1212
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration);
1212
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration);
1213 1213
 					}
1214 1214
 					try {
1215 1215
 						$sthi = $this->db->prepare($queryi);
1216 1216
 						$sthi->execute($queryi_values);
1217
-					} catch(PDOException $e) {
1217
+					} catch (PDOException $e) {
1218 1218
 						if ($globalDebug) echo $e->getMessage();
1219 1219
 						return "error : ".$e->getMessage();
1220 1220
 					}
@@ -1251,12 +1251,12 @@  discard block
 block discarded – undo
1251 1251
 					elseif ($globalDBdriver == 'pgsql') {
1252 1252
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
1253 1253
 					}
1254
-					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
1254
+					$queryi_values = array(':Registration' => $registration, ':ident' => $icao);
1255 1255
 				}
1256 1256
 				try {
1257 1257
 					$sthi = $this->db->prepare($queryi);
1258 1258
 					$sthi->execute($queryi_values);
1259
-				} catch(PDOException $e) {
1259
+				} catch (PDOException $e) {
1260 1260
 					if ($globalDebug) echo $e->getMessage();
1261 1261
 					return "error : ".$e->getMessage();
1262 1262
 				}
Please login to merge, or discard this patch.
Braces   +409 added lines, -261 removed lines patch added patch discarded remove patch
@@ -23,14 +23,19 @@  discard block
 block discarded – undo
23 23
 	*/
24 24
 	public function ident2icao($ident) {
25 25
 		if (substr($ident,0,2) == 'AF') {
26
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
27
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
26
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
27
+				$icao = $ident;
28
+			} else {
29
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
30
+			}
28 31
 		} else {
29 32
 			$Spotter = new Spotter($this->db);
30 33
 			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
31 34
 			if (isset($identicao[0])) {
32 35
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
33
-			} else $icao = $ident;
36
+			} else {
37
+				$icao = $ident;
38
+			}
34 39
 		}
35 40
 		return $icao;
36 41
 	}
@@ -103,14 +108,24 @@  discard block
 block discarded – undo
103 108
 		$message = '';
104 109
 		$result = array();
105 110
 		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
106
-		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);
107
-		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);
108
-		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);
111
+		if ($n == 0) {
112
+			$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);
113
+		}
114
+		if ($n == 0) {
115
+			$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);
116
+		}
117
+		if ($n == 0) {
118
+			$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);
119
+		}
109 120
 		if ($n != 0) {
110 121
 			$registration = str_replace('.','',$registration);
111 122
 			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
112
-			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
113
-		} else $message = $data;
123
+			if ($globalDebug) {
124
+				echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
125
+			}
126
+		} else {
127
+			$message = $data;
128
+		}
114 129
 		$decode = array();
115 130
 		$found = false;
116 131
 //		if ($registration != '' && $ident != '' && $registration != '!') {
@@ -130,12 +145,21 @@  discard block
 block discarded – undo
130 145
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
131 146
 					$latitude = $la / 10000.0;
132 147
 					$longitude = $ln / 10000.0;
133
-					if ($lac == 'S') $latitude = '-'.$latitude;
134
-					if ($lnc == 'W') $longitude = '-'.$longitude;
148
+					if ($lac == 'S') {
149
+						$latitude = '-'.$latitude;
150
+					}
151
+					if ($lnc == 'W') {
152
+						$longitude = '-'.$longitude;
153
+					}
135 154
 					// Temp not always available
136
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
137
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
138
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
155
+					if ($globalDebug) {
156
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
157
+					}
158
+					if ($temp == '') {
159
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
160
+					} else {
161
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
162
+					}
139 163
 
140 164
 					//$icao = $Translation->checkTranslation($ident);
141 165
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -149,25 +173,35 @@  discard block
 block discarded – undo
149 173
 				$ahour = '';
150 174
 				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
151 175
 				if ($n == 4 && strlen($darr) == 4) {
152
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
153
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
154
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
176
+					if ($dhour != '') {
177
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
178
+					}
179
+					if ($ahour != '') {
180
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
181
+					}
182
+					if ($globalDebug) {
183
+						echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
184
+					}
155 185
 					//$icao = ACARS->ident2icao($ident);
156 186
 					//$icao = $Translation->checkTranslation($ident);
157 187
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
158 188
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
159 189
 					$found = true;
160
-				}
161
-				elseif ($n == 2 || $n  == 4) {
162
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
163
-					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
190
+				} elseif ($n == 2 || $n  == 4) {
191
+					if ($dhour != '') {
192
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
193
+					}
194
+					if ($globalDebug) {
195
+						echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
196
+					}
164 197
 					//$icao = ACARS->ident2icao($ident);
165 198
 					//$icao = $Translation->checkTranslation($ident);
166 199
 					$decode = array('Arrival airport' => $dair, 'Arrival hour' => $dhour);
167 200
 					$found = true;
168
-				}
169
-				elseif ($n == 1) {
170
-					if ($globalDebug) echo 'airport arrival : '.$darr."\n";
201
+				} elseif ($n == 1) {
202
+					if ($globalDebug) {
203
+						echo 'airport arrival : '.$darr."\n";
204
+					}
171 205
 					//$icao = ACARS->ident2icao($ident);
172 206
 					//$icao = $Translation->checkTranslation($ident);
173 207
 					$decode = array('Arrival airport' => $darr);
@@ -185,7 +219,9 @@  discard block
 block discarded – undo
185 219
 				$darr = '';
186 220
 				$n = sscanf($message, "%4c,%4c,%*7s,%*d", $dair, $darr);
187 221
 				if ($n == 4) {
188
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
222
+					if ($globalDebug) {
223
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
224
+					}
189 225
 					//$icao = ACARS->ident2icao($ident);
190 226
 					//$icao = $Translation->checkTranslation($ident);
191 227
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -219,14 +255,23 @@  discard block
 block discarded – undo
219 255
 				$apiste = '';
220 256
 				$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);
221 257
 				if ($n > 8) {
222
-					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";
223
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
224
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
258
+					if ($globalDebug) {
259
+						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";
260
+					}
261
+					if ($dhour != '') {
262
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
263
+					}
264
+					if ($ahour != '') {
265
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
266
+					}
225 267
 					$icao = trim($aident);
226 268
 
227 269
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
228
-					if ($ahour == '') $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
229
-					else $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
270
+					if ($ahour == '') {
271
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
272
+					} else {
273
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
274
+					}
230 275
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
231 276
 					$decode['icao'] = $icao;
232 277
 					$found = true;
@@ -248,9 +293,15 @@  discard block
 block discarded – undo
248 293
 					$lns = $lns.'.'.$lns;
249 294
 					$latitude = $las / 1000.0;
250 295
 					$longitude = $lns / 1000.0;
251
-					if ($lac == 'S') $latitude = '-'.$latitude;
252
-					if ($lnc == 'W') $longitude = '-'.$longitude;
253
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
296
+					if ($lac == 'S') {
297
+						$latitude = '-'.$latitude;
298
+					}
299
+					if ($lnc == 'W') {
300
+						$longitude = '-'.$longitude;
301
+					}
302
+					if ($globalDebug) {
303
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
304
+					}
254 305
 					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
255 306
 					$found = true;
256 307
 				}
@@ -268,7 +319,9 @@  discard block
 block discarded – undo
268 319
 				$darr = '';
269 320
 				$n = sscanf($message, "%*[0-9A-Z ]/%*s %4c/%4c .", $dair, $darr);
270 321
 				if ($n == 4) {
271
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
322
+					if ($globalDebug) {
323
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
324
+					}
272 325
 					//$icao = $Translation->checkTranslation($ident);
273 326
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
274 327
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -281,7 +334,9 @@  discard block
 block discarded – undo
281 334
 				$darr = '';
282 335
 				$n = sscanf($message, "%*[0-9],%4c,%4c,", $dair, $darr);
283 336
 				if ($n == 4) {
284
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
337
+					if ($globalDebug) {
338
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
339
+					}
285 340
 					//$icao = $Translation->checkTranslation($ident);
286 341
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
287 342
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -294,7 +349,9 @@  discard block
 block discarded – undo
294 349
 				$darr = '';
295 350
 				$n = sscanf($message, "002AF %4c %4c ", $dair, $darr);
296 351
 				if ($n == 2) {
297
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
352
+					if ($globalDebug) {
353
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
354
+					}
298 355
 					//$icao = $Translation->checkTranslation($ident);
299 356
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
300 357
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -308,7 +365,9 @@  discard block
 block discarded – undo
308 365
 				$darr = '';
309 366
 				$n = sscanf($message, "#DFBA%*02d/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
310 367
 				if ($n == 6) {
311
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
368
+					if ($globalDebug) {
369
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
370
+					}
312 371
 					//$icao = $Translation->checkTranslation($ident);
313 372
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
314 373
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -321,7 +380,9 @@  discard block
 block discarded – undo
321 380
 				$darr = '';
322 381
 				$n = sscanf($message, "#DFBA%*02d/%*[0-9A-Z,]/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
323 382
 				if ($n == 7) {
324
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
383
+					if ($globalDebug) {
384
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
385
+					}
325 386
 					//$icao = $Translation->checkTranslation($ident);
326 387
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
327 388
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -349,8 +410,12 @@  discard block
 block discarded – undo
349 410
 					$decode['icao'] = $icao;
350 411
 					$latitude = $las / 100.0;
351 412
 					$longitude = $lns / 100.0;
352
-					if ($lac == 'S') $latitude = '-'.$latitude;
353
-					if ($lnc == 'W') $longitude = '-'.$longitude;
413
+					if ($lac == 'S') {
414
+						$latitude = '-'.$latitude;
415
+					}
416
+					if ($lnc == 'W') {
417
+						$longitude = '-'.$longitude;
418
+					}
354 419
 
355 420
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
356 421
 					$found = true;
@@ -368,8 +433,12 @@  discard block
 block discarded – undo
368 433
 				if ($n == 4) {
369 434
 					$latitude = $las;
370 435
 					$longitude = $lns;
371
-					if ($lac == 'S') $latitude = '-'.$latitude;
372
-					if ($lnc == 'W') $longitude = '-'.$longitude;
436
+					if ($lac == 'S') {
437
+						$latitude = '-'.$latitude;
438
+					}
439
+					if ($lnc == 'W') {
440
+						$longitude = '-'.$longitude;
441
+					}
373 442
 
374 443
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
375 444
 					$found = true;
@@ -385,7 +454,9 @@  discard block
 block discarded – undo
385 454
 				$darr = '';
386 455
 				$n = sscanf($message, "%*[0-9A-Z] NLINFO %*d/%*d %4c/%4c .", $dair, $darr);
387 456
 				if ($n == 5) {
388
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
457
+					if ($globalDebug) {
458
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
459
+					}
389 460
 					//$icao = $Translation->checkTranslation($ident);
390 461
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
391 462
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -406,7 +477,9 @@  discard block
 block discarded – undo
406 477
 				$aident = '';
407 478
 				$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);
408 479
 				if ($n == 8) {
409
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
480
+					if ($globalDebug) {
481
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
482
+					}
410 483
 					$icao = trim($aident);
411 484
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
412 485
 					$decode['icao'] = $icao;
@@ -423,7 +496,9 @@  discard block
 block discarded – undo
423 496
 				$darr = '';
424 497
 				$n = sscanf($message, "%*d/%*d %4s/%4s .%*6s", $dair, $darr);
425 498
 				if ($n == 5) {
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 = $Translation->checkTranslation($ident);
428 503
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
429 504
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -438,7 +513,9 @@  discard block
 block discarded – undo
438 513
 				$darr = '';
439 514
 				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
440 515
 				if ($n == 3) {
441
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
516
+					if ($globalDebug) {
517
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
518
+					}
442 519
 					//$icao = $Translation->checkTranslation($ident);
443 520
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
444 521
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -453,7 +530,9 @@  discard block
 block discarded – undo
453 530
 				$darr = '';
454 531
 				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
455 532
 				if ($n == 3) {
456
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
533
+					if ($globalDebug) {
534
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
535
+					}
457 536
 					//$icao = $Translation->checkTranslation($ident);
458 537
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
459 538
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -463,7 +542,9 @@  discard block
 block discarded – undo
463 542
 			if (!$found) {
464 543
 				$n = sscanf($message,'MET01%4c',$airport);
465 544
 				if ($n == 1) {
466
-					if ($globalDebug) echo 'airport name : '.$airport;
545
+					if ($globalDebug) {
546
+						echo 'airport name : '.$airport;
547
+					}
467 548
 					$decode = array('Airport/Waypoint name' => $airport);
468 549
 					$found = true;
469 550
 				}
@@ -471,184 +552,126 @@  discard block
 block discarded – undo
471 552
 			if ($label == 'H1') {
472 553
 				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
473 554
 					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
474
-				}
475
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
555
+				} elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
476 556
 					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
477
-				}
478
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
557
+				} elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
479 558
 					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
480
-				}
481
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
559
+				} elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
482 560
 					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
483
-				}
484
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
561
+				} elseif (preg_match(':^#DFB/PIREP:',$message)) {
485 562
 					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
486
-				}
487
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
563
+				} elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
488 564
 					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
489
-				}
490
-				elseif (preg_match(':^#M1AAEP:',$message)) {
565
+				} elseif (preg_match(':^#M1AAEP:',$message)) {
491 566
 					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
492
-				}
493
-				elseif (preg_match(':^#M2APWD:',$message)) {
567
+				} elseif (preg_match(':^#M2APWD:',$message)) {
494 568
 					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
495
-				}
496
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
569
+				} elseif (preg_match(':^#M1BREQPWI:',$message)) {
497 570
 					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
498
-				}
499
-				elseif (preg_match(':^#CF:',$message)) {
571
+				} elseif (preg_match(':^#CF:',$message)) {
500 572
 					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
501
-				}
502
-				elseif (preg_match(':^#DF:',$message)) {
573
+				} elseif (preg_match(':^#DF:',$message)) {
503 574
 					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
504
-				}
505
-				elseif (preg_match(':^#EC:',$message)) {
575
+				} elseif (preg_match(':^#EC:',$message)) {
506 576
 					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
507
-				}
508
-				elseif (preg_match(':^#EI:',$message)) {
577
+				} elseif (preg_match(':^#EI:',$message)) {
509 578
 					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
510
-				}
511
-				elseif (preg_match(':^#H1:',$message)) {
579
+				} elseif (preg_match(':^#H1:',$message)) {
512 580
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
513
-				}
514
-				elseif (preg_match(':^#H2:',$message)) {
581
+				} elseif (preg_match(':^#H2:',$message)) {
515 582
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
516
-				}
517
-				elseif (preg_match(':^#HD:',$message)) {
583
+				} elseif (preg_match(':^#HD:',$message)) {
518 584
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
519
-				}
520
-				elseif (preg_match(':^#M1:',$message)) {
585
+				} elseif (preg_match(':^#M1:',$message)) {
521 586
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
522
-				}
523
-				elseif (preg_match(':^#M2:',$message)) {
587
+				} elseif (preg_match(':^#M2:',$message)) {
524 588
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
525
-				}
526
-				elseif (preg_match(':^#M3:',$message)) {
589
+				} elseif (preg_match(':^#M3:',$message)) {
527 590
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
528
-				}
529
-				elseif (preg_match(':^#MD:',$message)) {
591
+				} elseif (preg_match(':^#MD:',$message)) {
530 592
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
531
-				}
532
-				elseif (preg_match(':^#PS:',$message)) {
593
+				} elseif (preg_match(':^#PS:',$message)) {
533 594
 					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
534
-				}
535
-				elseif (preg_match(':^#S1:',$message)) {
595
+				} elseif (preg_match(':^#S1:',$message)) {
536 596
 					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
537
-				}
538
-				elseif (preg_match(':^#S2:',$message)) {
597
+				} elseif (preg_match(':^#S2:',$message)) {
539 598
 					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
540
-				}
541
-				elseif (preg_match(':^#SD:',$message)) {
599
+				} elseif (preg_match(':^#SD:',$message)) {
542 600
 					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
543
-				}
544
-				elseif (preg_match(':^#T[0-8]:',$message)) {
601
+				} elseif (preg_match(':^#T[0-8]:',$message)) {
545 602
 					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
546
-				}
547
-				elseif (preg_match(':^#WO:',$message)) {
603
+				} elseif (preg_match(':^#WO:',$message)) {
548 604
 					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
549
-				}
550
-				elseif (preg_match(':^#A1:',$message)) {
605
+				} elseif (preg_match(':^#A1:',$message)) {
551 606
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
552
-				}
553
-				elseif (preg_match(':^#A3:',$message)) {
607
+				} elseif (preg_match(':^#A3:',$message)) {
554 608
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
555
-				}
556
-				elseif (preg_match(':^#A4:',$message)) {
609
+				} elseif (preg_match(':^#A4:',$message)) {
557 610
 					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
558
-				}
559
-				elseif (preg_match(':^#A6:',$message)) {
611
+				} elseif (preg_match(':^#A6:',$message)) {
560 612
 					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
561
-				}
562
-				elseif (preg_match(':^#A8:',$message)) {
613
+				} elseif (preg_match(':^#A8:',$message)) {
563 614
 					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
564
-				}
565
-				elseif (preg_match(':^#A9:',$message)) {
615
+				} elseif (preg_match(':^#A9:',$message)) {
566 616
 					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
567
-				}
568
-				elseif (preg_match(':^#A0:',$message)) {
617
+				} elseif (preg_match(':^#A0:',$message)) {
569 618
 					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
570
-				}
571
-				elseif (preg_match(':^#AA:',$message)) {
619
+				} elseif (preg_match(':^#AA:',$message)) {
572 620
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
573
-				}
574
-				elseif (preg_match(':^#AB:',$message)) {
621
+				} elseif (preg_match(':^#AB:',$message)) {
575 622
 					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
576
-				}
577
-				elseif (preg_match(':^#AC:',$message)) {
623
+				} elseif (preg_match(':^#AC:',$message)) {
578 624
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
579
-				}
580
-				elseif (preg_match(':^#AD:',$message)) {
625
+				} elseif (preg_match(':^#AD:',$message)) {
581 626
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
582
-				}
583
-				elseif (preg_match(':^#AF:',$message)) {
627
+				} elseif (preg_match(':^#AF:',$message)) {
584 628
 					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
585
-				}
586
-				elseif (preg_match(':^#B1:',$message)) {
629
+				} elseif (preg_match(':^#B1:',$message)) {
587 630
 					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
588
-				}
589
-				elseif (preg_match(':^#B2:',$message)) {
631
+				} elseif (preg_match(':^#B2:',$message)) {
590 632
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
591
-				}
592
-				elseif (preg_match(':^#B3:',$message)) {
633
+				} elseif (preg_match(':^#B3:',$message)) {
593 634
 					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
594
-				}
595
-				elseif (preg_match(':^#B4:',$message)) {
635
+				} elseif (preg_match(':^#B4:',$message)) {
596 636
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
597
-				}
598
-				elseif (preg_match(':^#B6:',$message)) {
637
+				} elseif (preg_match(':^#B6:',$message)) {
599 638
 					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
600
-				}
601
-				elseif (preg_match(':^#B8:',$message)) {
639
+				} elseif (preg_match(':^#B8:',$message)) {
602 640
 					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
603
-				}
604
-				elseif (preg_match(':^#B9:',$message)) {
641
+				} elseif (preg_match(':^#B9:',$message)) {
605 642
 					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
606
-				}
607
-				elseif (preg_match(':^#B0:',$message)) {
643
+				} elseif (preg_match(':^#B0:',$message)) {
608 644
 					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
609
-				}
610
-				elseif (preg_match(':^#BA:',$message)) {
645
+				} elseif (preg_match(':^#BA:',$message)) {
611 646
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
612
-				}
613
-				elseif (preg_match(':^#BB:',$message)) {
647
+				} elseif (preg_match(':^#BB:',$message)) {
614 648
 					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
615
-				}
616
-				elseif (preg_match(':^#BC:',$message)) {
649
+				} elseif (preg_match(':^#BC:',$message)) {
617 650
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
618
-				}
619
-				elseif (preg_match(':^#BD:',$message)) {
651
+				} elseif (preg_match(':^#BD:',$message)) {
620 652
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
621
-				}
622
-				elseif (preg_match(':^#BE:',$message)) {
653
+				} elseif (preg_match(':^#BE:',$message)) {
623 654
 					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
624
-				}
625
-				elseif (preg_match(':^#BF:',$message)) {
655
+				} elseif (preg_match(':^#BF:',$message)) {
626 656
 					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
627
-				}
628
-				elseif (preg_match(':^#H3:',$message)) {
657
+				} elseif (preg_match(':^#H3:',$message)) {
629 658
 					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
630 659
 				}
631 660
 			}
632 661
 			if ($label == '10') {
633 662
 				if (preg_match(':^DTO01:',$message)) {
634 663
 					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
635
-				}
636
-				elseif (preg_match(':^AIS01:',$message)) {
664
+				} elseif (preg_match(':^AIS01:',$message)) {
637 665
 					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
638
-				}
639
-				elseif (preg_match(':^FTX01:',$message)) {
666
+				} elseif (preg_match(':^FTX01:',$message)) {
640 667
 					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
641
-				}
642
-				elseif (preg_match(':^FPL01:',$message)) {
668
+				} elseif (preg_match(':^FPL01:',$message)) {
643 669
 					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
644
-				}
645
-				elseif (preg_match(':^WAB01:',$message)) {
670
+				} elseif (preg_match(':^WAB01:',$message)) {
646 671
 					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
647
-				}
648
-				elseif (preg_match(':^MET01:',$message)) {
672
+				} elseif (preg_match(':^MET01:',$message)) {
649 673
 					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
650
-				}
651
-				elseif (preg_match(':^WAB02:',$message)) {
674
+				} elseif (preg_match(':^WAB02:',$message)) {
652 675
 					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
653 676
 				}
654 677
 			}
@@ -663,38 +686,28 @@  discard block
 block discarded – undo
663 686
 					$vsta = array('Version' => $version);
664 687
 					if ($state == 'E') {
665 688
 						$vsta = array_merge($vsta,array('Link state' => 'Established'));
666
-					}
667
-					elseif ($state == 'L') {
689
+					} elseif ($state == 'L') {
668 690
 						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
669
-					}
670
-					else {
691
+					} else {
671 692
 						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
672 693
 					}
673 694
 					if ($type == 'V') {
674 695
 						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
675
-					}
676
-					elseif ($type == 'S') {
696
+					} elseif ($type == 'S') {
677 697
 						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
678
-					}
679
-					elseif ($type == 'H') {
698
+					} elseif ($type == 'H') {
680 699
 						$vsta = array_merge($vsta,array('Link type' => 'HF'));
681
-					}
682
-					elseif ($type == 'G') {
700
+					} elseif ($type == 'G') {
683 701
 						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
684
-					}
685
-					elseif ($type == 'C') {
702
+					} elseif ($type == 'C') {
686 703
 						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
687
-					}
688
-					elseif ($type == '2') {
704
+					} elseif ($type == '2') {
689 705
 						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
690
-					}
691
-					elseif ($type == 'X') {
706
+					} elseif ($type == 'X') {
692 707
 						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
693
-					}
694
-					elseif ($type == 'I') {
708
+					} elseif ($type == 'I') {
695 709
 						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
696
-					}
697
-					else {
710
+					} else {
698 711
 						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
699 712
 					}
700 713
 					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
@@ -703,7 +716,9 @@  discard block
 block discarded – undo
703 716
 			}
704 717
 
705 718
 			$title = $this->getTitlefromLabel($label);
706
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
719
+			if ($title != '') {
720
+				$decode = array_merge(array('Message title' => $title),$decode);
721
+			}
707 722
 			/*
708 723
 			// Business jets always use GS0001
709 724
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
@@ -738,31 +753,54 @@  discard block
 block discarded – undo
738 753
 			$msg = $message['message'];
739 754
 			$decode = $message['decode'];
740 755
 			$registration = (string)$message['registration'];
741
-			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
742
-			else $latitude = '';
743
-			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
744
-			else $longitude = '';
745
-			if (isset($decode['airicao'])) $airicao = $decode['airicao'];
746
-			else $airicao = '';
747
-			if (isset($decode['icao'])) $icao = $decode['icao'];
748
-			else $icao = $Translation->checkTranslation($ident);
756
+			if (isset($decode['latitude'])) {
757
+				$latitude = $decode['latitude'];
758
+			} else {
759
+				$latitude = '';
760
+			}
761
+			if (isset($decode['longitude'])) {
762
+				$longitude = $decode['longitude'];
763
+			} else {
764
+				$longitude = '';
765
+			}
766
+			if (isset($decode['airicao'])) {
767
+				$airicao = $decode['airicao'];
768
+			} else {
769
+				$airicao = '';
770
+			}
771
+			if (isset($decode['icao'])) {
772
+				$icao = $decode['icao'];
773
+			} else {
774
+				$icao = $Translation->checkTranslation($ident);
775
+			}
749 776
 			$image_array = $Image->getSpotterImage($registration);
750 777
 			if (!isset($image_array[0]['registration'])) {
751 778
 				$Image->addSpotterImage($registration);
752 779
 			}
753 780
 			// Business jets always use GS0001
754
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
755
-			if ($globalDebug && isset($info) && $info != '') echo $info;
756
-			if (count($decode) > 0) $decode_json = json_encode($decode);
757
-			else $decode_json = '';
781
+			if ($ident != 'GS0001') {
782
+				$info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
783
+			}
784
+			if ($globalDebug && isset($info) && $info != '') {
785
+				echo $info;
786
+			}
787
+			if (count($decode) > 0) {
788
+				$decode_json = json_encode($decode);
789
+			} else {
790
+				$decode_json = '';
791
+			}
758 792
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
759 793
 				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
760 794
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
761 795
 				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
762 796
 			}
763 797
 			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
764
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
765
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
798
+			if (!isset($globalACARSArchive)) {
799
+				$globalACARSArchive = array('10','80','81','82','3F');
800
+			}
801
+			if ($result && in_array($label,$globalACARSArchive)) {
802
+				$this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
803
+			}
766 804
 			if ($globalDebug && count($decode) > 0) {
767 805
 				echo "Human readable data : ".implode(' - ',$decode)."\n";
768 806
 			}
@@ -785,7 +823,9 @@  discard block
 block discarded – undo
785 823
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
786 824
 			$Connection = new Connection($this->db);
787 825
 			$this->db = $Connection->db;
788
-			if ($globalDebug) echo "Test if not already in Live ACARS table...";
826
+			if ($globalDebug) {
827
+				echo "Test if not already in Live ACARS table...";
828
+			}
789 829
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
790 830
 			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
791 831
 			try {
@@ -795,7 +835,9 @@  discard block
 block discarded – undo
795 835
 				return "error : ".$e->getMessage();
796 836
 			}
797 837
 			if ($stht->fetchColumn() == 0) {
798
-				if ($globalDebug) echo "Add Live ACARS data...";
838
+				if ($globalDebug) {
839
+					echo "Add Live ACARS data...";
840
+				}
799 841
 				$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)";
800 842
 				$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"));
801 843
 				try {
@@ -805,10 +847,14 @@  discard block
 block discarded – undo
805 847
 					return "error : ".$e->getMessage();
806 848
 				}
807 849
 			} else {
808
-				if ($globalDebug) echo "Data already in DB...\n";
850
+				if ($globalDebug) {
851
+					echo "Data already in DB...\n";
852
+				}
809 853
 				return false;
810 854
 			}
811
-			if ($globalDebug) echo "Done\n";
855
+			if ($globalDebug) {
856
+				echo "Done\n";
857
+			}
812 858
 			return true;
813 859
 		}
814 860
 	}
@@ -839,7 +885,9 @@  discard block
 block discarded – undo
839 885
 			    	    }
840 886
 				    if ($stht->fetchColumn() == 0) {
841 887
 			*/
842
-			if ($globalDebug) echo "Add Live ACARS data...";
888
+			if ($globalDebug) {
889
+				echo "Add Live ACARS data...";
890
+			}
843 891
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
844 892
 			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
845 893
 			try {
@@ -848,7 +896,9 @@  discard block
 block discarded – undo
848 896
 			} catch(PDOException $e) {
849 897
 				return "error : ".$e->getMessage();
850 898
 			}
851
-			if ($globalDebug) echo "Done\n";
899
+			if ($globalDebug) {
900
+				echo "Done\n";
901
+			}
852 902
 		}
853 903
 	}
854 904
 
@@ -871,8 +921,11 @@  discard block
 block discarded – undo
871 921
 			die;
872 922
 		}
873 923
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
874
-		if (count($row) > 0) return $row[0]['title'];
875
-		else return '';
924
+		if (count($row) > 0) {
925
+			return $row[0]['title'];
926
+		} else {
927
+			return '';
928
+		}
876 929
 	}
877 930
 
878 931
 	/**
@@ -891,8 +944,11 @@  discard block
 block discarded – undo
891 944
 			die;
892 945
 		}
893 946
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
894
-		if (count($row) > 0) return $row;
895
-		else return array();
947
+		if (count($row) > 0) {
948
+			return $row;
949
+		} else {
950
+			return array();
951
+		}
896 952
 	}
897 953
 
898 954
 	/**
@@ -912,8 +968,11 @@  discard block
 block discarded – undo
912 968
 			die;
913 969
 		}
914 970
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
915
-		if (count($row) > 0) return $row[0];
916
-		else return array();
971
+		if (count($row) > 0) {
972
+			return $row[0];
973
+		} else {
974
+			return array();
975
+		}
917 976
 	}
918 977
 
919 978
 	/**
@@ -958,19 +1017,35 @@  discard block
 block discarded – undo
958 1017
 			if ($row['registration'] != '') {
959 1018
 				$row['registration'] = str_replace('.','',$row['registration']);
960 1019
 				$image_array = $Image->getSpotterImage($row['registration']);
961
-				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']));
962
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
963
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
964
-			if ($row['registration'] == '') $row['registration'] = 'NA';
965
-			if ($row['ident'] == '') $row['ident'] = 'NA';
1020
+				if (count($image_array) > 0) {
1021
+					$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']));
1022
+				} else {
1023
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1024
+				}
1025
+			} else {
1026
+				$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1027
+			}
1028
+			if ($row['registration'] == '') {
1029
+				$row['registration'] = 'NA';
1030
+			}
1031
+			if ($row['ident'] == '') {
1032
+				$row['ident'] = 'NA';
1033
+			}
966 1034
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
967 1035
 			if (isset($identicao[0])) {
968 1036
 				if (substr($row['ident'],0,2) == 'AF') {
969
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
970
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
971
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1037
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
1038
+						$icao = $row['ident'];
1039
+					} else {
1040
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1041
+					}
1042
+				} else {
1043
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1044
+				}
972 1045
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
973
-			} else $icao = $row['ident'];
1046
+			} else {
1047
+				$icao = $row['ident'];
1048
+			}
974 1049
 			$icao = $Translation->checkTranslation($icao,false);
975 1050
 			$decode = json_decode($row['decode'],true);
976 1051
 			$found = false;
@@ -995,7 +1070,9 @@  discard block
 block discarded – undo
995 1070
 					$found = true;
996 1071
 				}
997 1072
 			}
998
-			if ($found) $row['decode'] = json_encode($decode);
1073
+			if ($found) {
1074
+				$row['decode'] = json_encode($decode);
1075
+			}
999 1076
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1000 1077
 			$result[] = $data;
1001 1078
 			$i++;
@@ -1003,8 +1080,9 @@  discard block
 block discarded – undo
1003 1080
 		if (isset($result)) {
1004 1081
 			$result[0]['query_number_rows'] = $i;
1005 1082
 			return $result;
1083
+		} else {
1084
+			return array();
1006 1085
 		}
1007
-		else return array();
1008 1086
 	}
1009 1087
 
1010 1088
 	/**
@@ -1053,31 +1131,51 @@  discard block
 block discarded – undo
1053 1131
 			if ($row['registration'] != '') {
1054 1132
 				$row['registration'] = str_replace('.','',$row['registration']);
1055 1133
 				$image_array = $Image->getSpotterImage($row['registration']);
1056
-				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']));
1057
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1058
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1134
+				if (count($image_array) > 0) {
1135
+					$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']));
1136
+				} else {
1137
+					$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1138
+				}
1139
+			} else {
1140
+				$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
1141
+			}
1059 1142
 			$icao = '';
1060
-			if ($row['registration'] == '') $row['registration'] = 'NA';
1061
-			if ($row['ident'] == '') $row['ident'] = 'NA';
1143
+			if ($row['registration'] == '') {
1144
+				$row['registration'] = 'NA';
1145
+			}
1146
+			if ($row['ident'] == '') {
1147
+				$row['ident'] = 'NA';
1148
+			}
1062 1149
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
1063 1150
 			if (isset($identicao[0])) {
1064 1151
 				if (substr($row['ident'],0,2) == 'AF') {
1065
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
1066
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1067
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1152
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
1153
+						$icao = $row['ident'];
1154
+					} else {
1155
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
1156
+					}
1157
+				} else {
1158
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
1159
+				}
1068 1160
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
1069
-			} else $icao = $row['ident'];
1161
+			} else {
1162
+				$icao = $row['ident'];
1163
+			}
1070 1164
 			$icao = $Translation->checkTranslation($icao);
1071 1165
 			$decode = json_decode($row['decode'],true);
1072 1166
 			$found = false;
1073 1167
 			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
1074 1168
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
1075
-				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>';
1169
+				if (isset($airport_info[0]['icao'])) {
1170
+					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1171
+				}
1076 1172
 				$found = true;
1077 1173
 			}
1078 1174
 			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
1079 1175
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
1080
-				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>';
1176
+				if (isset($airport_info[0]['icao'])) {
1177
+					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
1178
+				}
1081 1179
 				$found = true;
1082 1180
 			}
1083 1181
 			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
@@ -1087,7 +1185,9 @@  discard block
 block discarded – undo
1087 1185
 					$found = true;
1088 1186
 				}
1089 1187
 			}
1090
-			if ($found) $row['decode'] = json_encode($decode);
1188
+			if ($found) {
1189
+				$row['decode'] = json_encode($decode);
1190
+			}
1091 1191
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
1092 1192
 			$result[] = $data;
1093 1193
 			$i++;
@@ -1095,7 +1195,9 @@  discard block
 block discarded – undo
1095 1195
 		if (isset($result)) {
1096 1196
 			$result[0]['query_number_rows'] = $i;
1097 1197
 			return $result;
1098
-		} else return array();
1198
+		} else {
1199
+			return array();
1200
+		}
1099 1201
 	}
1100 1202
 
1101 1203
 	/**
@@ -1111,25 +1213,37 @@  discard block
 block discarded – undo
1111 1213
 		$ident = trim($ident);
1112 1214
 		$Translation = new Translation($this->db);
1113 1215
 		$Spotter = new Spotter($this->db);
1114
-		if ($globalDebug) echo "Test if we add ModeS data...";
1216
+		if ($globalDebug) {
1217
+			echo "Test if we add ModeS data...";
1218
+		}
1115 1219
 		//if ($icao == '') $icao = ACARS->ident2icao($ident);
1116
-		if ($icao == '') $icao = $Translation->checkTranslation($ident);
1117
-		if ($globalDebug) echo '- Ident : '.$icao.' - ';
1220
+		if ($icao == '') {
1221
+			$icao = $Translation->checkTranslation($ident);
1222
+		}
1223
+		if ($globalDebug) {
1224
+			echo '- Ident : '.$icao.' - ';
1225
+		}
1118 1226
 		if ($ident == '' || $registration == '') {
1119
-			if ($globalDebug) echo "Ident or registration null, exit\n";
1227
+			if ($globalDebug) {
1228
+				echo "Ident or registration null, exit\n";
1229
+			}
1120 1230
 			return '';
1121 1231
 		}
1122 1232
 		$registration = str_replace('.','',$registration);
1123 1233
 		$ident = $Translation->ident2icao($ident);
1124 1234
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
1125
-		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
1235
+		if ($globalDebug) {
1236
+			echo "Check if needed to add translation ".$ident.'... ';
1237
+		}
1126 1238
 		$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";
1127 1239
 		$querysi_values = array(':registration' => $registration);
1128 1240
 		try {
1129 1241
 			$sthsi = $this->db->prepare($querysi);
1130 1242
 			$sthsi->execute($querysi_values);
1131 1243
 		} catch(PDOException $e) {
1132
-			if ($globalDebug) echo $e->getMessage();
1244
+			if ($globalDebug) {
1245
+				echo $e->getMessage();
1246
+			}
1133 1247
 			return "error : ".$e->getMessage();
1134 1248
 		}
1135 1249
 		$resultsi = $sthsi->fetch(PDO::FETCH_ASSOC);
@@ -1137,9 +1251,14 @@  discard block
 block discarded – undo
1137 1251
 		if (count($resultsi) > 0 && $resultsi['ident'] != $ident && $resultsi['ident'] != '') {
1138 1252
 			$Translation = new Translation($this->db);
1139 1253
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
1140
-			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1141
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1142
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1254
+			if ($globalDebug) {
1255
+				echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
1256
+			}
1257
+			if ($ident != $trans_ident) {
1258
+				$Translation->addOperator($resultsi['ident'],$ident,'ACARS');
1259
+			} elseif ($trans_ident == $ident) {
1260
+				$Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
1261
+			}
1143 1262
 		} else {
1144 1263
 			if ($registration != '' && $latitude != '' && $longitude != '') {
1145 1264
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1148,32 +1267,44 @@  discard block
 block discarded – undo
1148 1267
 					$sth = $this->db->prepare($query);
1149 1268
 					$sth->execute($query_values);
1150 1269
 				} catch(PDOException $e) {
1151
-					if ($globalDebug) echo $e->getMessage();
1270
+					if ($globalDebug) {
1271
+						echo $e->getMessage();
1272
+					}
1152 1273
 					return "error : ".$e->getMessage();
1153 1274
 				}
1154 1275
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
1155 1276
 				$sth->closeCursor();
1156
-				if (isset($result['modes'])) $hex = $result['modes'];
1157
-				else $hex = '';
1277
+				if (isset($result['modes'])) {
1278
+					$hex = $result['modes'];
1279
+				} else {
1280
+					$hex = '';
1281
+				}
1158 1282
 				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
1159 1283
 				$this->SI->add($SI_data);
1160 1284
 			}
1161 1285
 		}
1162
-		if ($globalDebug) echo 'Done'."\n";
1286
+		if ($globalDebug) {
1287
+			echo 'Done'."\n";
1288
+		}
1163 1289
 		$query = "SELECT flightaware_id, ModeS FROM spotter_output WHERE ident = :ident AND format_source <> 'ACARS' ORDER BY spotter_id DESC LIMIT 1";
1164 1290
 		$query_values = array(':ident' => $icao);
1165 1291
 		try {
1166 1292
 			$sth = $this->db->prepare($query);
1167 1293
 			$sth->execute($query_values);
1168 1294
 		} catch(PDOException $e) {
1169
-			if ($globalDebug) echo $e->getMessage();
1295
+			if ($globalDebug) {
1296
+				echo $e->getMessage();
1297
+			}
1170 1298
 			return "error : ".$e->getMessage();
1171 1299
 		}
1172 1300
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
1173 1301
 		$sth->closeCursor();
1174 1302
 		if (isset($result['flightaware_id'])) {
1175
-			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
1176
-			else $ModeS = '';
1303
+			if (isset($result['ModeS'])) {
1304
+				$ModeS = $result['ModeS'];
1305
+			} else {
1306
+				$ModeS = '';
1307
+			}
1177 1308
 			if ($ModeS == '') {
1178 1309
 				$id = explode('-',$result['flightaware_id']);
1179 1310
 				$ModeS = $id[0];
@@ -1186,24 +1317,32 @@  discard block
 block discarded – undo
1186 1317
 					$sthc = $this->db->prepare($queryc);
1187 1318
 					$sthc->execute($queryc_values);
1188 1319
 				} catch(PDOException $e) {
1189
-					if ($globalDebug) echo $e->getMessage();
1320
+					if ($globalDebug) {
1321
+						echo $e->getMessage();
1322
+					}
1190 1323
 					return "error : ".$e->getMessage();
1191 1324
 				}
1192 1325
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
1193 1326
 				$sthc->closeCursor();
1194 1327
 				if (count($row) ==  0) {
1195
-					if ($globalDebug) echo " Add to ModeS table - ";
1328
+					if ($globalDebug) {
1329
+						echo " Add to ModeS table - ";
1330
+					}
1196 1331
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
1197 1332
 					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
1198 1333
 					try {
1199 1334
 						$sthi = $this->db->prepare($queryi);
1200 1335
 						$sthi->execute($queryi_values);
1201 1336
 					} catch(PDOException $e) {
1202
-						if ($globalDebug) echo $e->getMessage();
1337
+						if ($globalDebug) {
1338
+							echo $e->getMessage();
1339
+						}
1203 1340
 						return "error : ".$e->getMessage();
1204 1341
 					}
1205 1342
 				} else {
1206
-					if ($globalDebug) echo " Update ModeS table - ";
1343
+					if ($globalDebug) {
1344
+						echo " Update ModeS table - ";
1345
+					}
1207 1346
 					if ($ICAOTypeCode != '') {
1208 1347
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
1209 1348
 						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
@@ -1215,7 +1354,9 @@  discard block
 block discarded – undo
1215 1354
 						$sthi = $this->db->prepare($queryi);
1216 1355
 						$sthi->execute($queryi_values);
1217 1356
 					} catch(PDOException $e) {
1218
-						if ($globalDebug) echo $e->getMessage();
1357
+						if ($globalDebug) {
1358
+							echo $e->getMessage();
1359
+						}
1219 1360
 						return "error : ".$e->getMessage();
1220 1361
 					}
1221 1362
 				}
@@ -1236,7 +1377,9 @@  discard block
 block discarded – undo
1236 1377
 					    return "error : ".$e->getMessage();
1237 1378
 				}
1238 1379
 				*/
1239
-				if ($globalDebug) echo " Update Spotter_output table - ";
1380
+				if ($globalDebug) {
1381
+					echo " Update Spotter_output table - ";
1382
+				}
1240 1383
 				if ($ICAOTypeCode != '') {
1241 1384
 					if ($globalDBdriver == 'mysql') {
1242 1385
 						$queryi = "UPDATE spotter_output SET registration = :Registration,aircraft_icao = :ICAOTypeCode WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
@@ -1247,8 +1390,7 @@  discard block
 block discarded – undo
1247 1390
 				} else {
1248 1391
 					if ($globalDBdriver == 'mysql') {
1249 1392
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
1250
-					}
1251
-					elseif ($globalDBdriver == 'pgsql') {
1393
+					} elseif ($globalDBdriver == 'pgsql') {
1252 1394
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
1253 1395
 					}
1254 1396
 					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
@@ -1257,14 +1399,20 @@  discard block
 block discarded – undo
1257 1399
 					$sthi = $this->db->prepare($queryi);
1258 1400
 					$sthi->execute($queryi_values);
1259 1401
 				} catch(PDOException $e) {
1260
-					if ($globalDebug) echo $e->getMessage();
1402
+					if ($globalDebug) {
1403
+						echo $e->getMessage();
1404
+					}
1261 1405
 					return "error : ".$e->getMessage();
1262 1406
 				}
1263 1407
 			}
1264 1408
 		} else {
1265
-			if ($globalDebug) echo " Can't find ModeS in spotter_output - ";
1409
+			if ($globalDebug) {
1410
+				echo " Can't find ModeS in spotter_output - ";
1411
+			}
1412
+		}
1413
+		if ($globalDebug) {
1414
+			echo "Done\n";
1266 1415
 		}
1267
-		if ($globalDebug) echo "Done\n";
1268 1416
 	}
1269 1417
 }
1270 1418
 ?>
Please login to merge, or discard this patch.
require/class.METAR.php 3 patches
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -7,35 +7,35 @@  discard block
 block discarded – undo
7 7
 	public $db;
8 8
 	
9 9
 	protected $texts = Array(
10
-	    'MI' => 'Shallow',
11
-	    'PR' => 'Partial',
12
-	    'BC' => 'Low drifting',
13
-	    'BL' => 'Blowing',
14
-	    'SH' => 'Showers',
15
-	    'TS' => 'Thunderstorm',
16
-	    'FZ' => 'Freezing',
17
-	    'DZ' => 'Drizzle',
18
-	    'RA' => 'Rain',
19
-	    'SN' => 'Snow',
20
-	    'SG' => 'Snow Grains',
21
-	    'IC' => 'Ice crystals',
22
-	    'PL' => 'Ice pellets',
23
-	    'GR' => 'Hail',
24
-	    'GS' => 'Small hail',
25
-	    'UP' => 'Unknown',
26
-	    'BR' => 'Mist',
27
-	    'FG' => 'Fog',
28
-	    'FU' => 'Smoke',
29
-	    'VA' => 'Volcanic ash',
30
-	    'DU' => 'Widespread dust',
31
-	    'SA' => 'Sand',
32
-	    'HZ' => 'Haze',
33
-	    'PY' => 'Spray',
34
-	    'PO' => 'Well developed dust / sand whirls',
35
-	    'SQ' => 'Squalls',
36
-	    'FC' => 'Funnel clouds inc tornadoes or waterspouts',
37
-	    'SS' => 'Sandstorm',
38
-	    'DS' => 'Duststorm'
10
+		'MI' => 'Shallow',
11
+		'PR' => 'Partial',
12
+		'BC' => 'Low drifting',
13
+		'BL' => 'Blowing',
14
+		'SH' => 'Showers',
15
+		'TS' => 'Thunderstorm',
16
+		'FZ' => 'Freezing',
17
+		'DZ' => 'Drizzle',
18
+		'RA' => 'Rain',
19
+		'SN' => 'Snow',
20
+		'SG' => 'Snow Grains',
21
+		'IC' => 'Ice crystals',
22
+		'PL' => 'Ice pellets',
23
+		'GR' => 'Hail',
24
+		'GS' => 'Small hail',
25
+		'UP' => 'Unknown',
26
+		'BR' => 'Mist',
27
+		'FG' => 'Fog',
28
+		'FU' => 'Smoke',
29
+		'VA' => 'Volcanic ash',
30
+		'DU' => 'Widespread dust',
31
+		'SA' => 'Sand',
32
+		'HZ' => 'Haze',
33
+		'PY' => 'Spray',
34
+		'PO' => 'Well developed dust / sand whirls',
35
+		'SQ' => 'Squalls',
36
+		'FC' => 'Funnel clouds inc tornadoes or waterspouts',
37
+		'SS' => 'Sandstorm',
38
+		'DS' => 'Duststorm'
39 39
 	);
40 40
 
41 41
 	public function __construct($dbc = null) {
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
     				$result['QNH_format'] = $matches[1] == 'Q' ? 'hPa' : 'inHg';
154 154
     				*/
155 155
 			}
156
-                     /*
156
+					 /*
157 157
     			// Wind Direction
158 158
     			if (preg_match('#^([0-9]{3})V([0-9]{3})$#', $piece, $matches)) {
159 159
     				$result['wind_direction'] = $matches[1];
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
     				$result['speed_variable'] = $matches[1];
165 165
     			}
166 166
     			*/
167
-    			// Visibility
167
+				// Visibility
168 168
 			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
169 169
 				if (isset($matches[3]) && strlen($matches[3]) > 0) {
170 170
 					$result['visibility'] = (float)$matches[3] * 1609.34;
@@ -222,9 +222,9 @@  discard block
 block discarded – undo
222 222
 				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
223 223
 				if (isset($matches[3])) {
224 224
 					$range = Array(
225
-					    'from' => (float)$matches[2],
226
-					    'to'   => (float)$matches[4],
227
-					    'unit' => $matches[5] ? 'FT' : 'M'
225
+						'from' => (float)$matches[2],
226
+						'to'   => (float)$matches[4],
227
+						'unit' => $matches[5] ? 'FT' : 'M'
228 228
 					);
229 229
 				}
230 230
 				$result['RVR'] = $matches[1];
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 			}
258 258
 		}
259 259
 		return $result;
260
-        }
260
+		}
261 261
 
262 262
 	public function getMETAR($icao) {
263 263
 		global $globalMETARcycle, $globalDBdriver;
Please login to merge, or discard this patch.
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 			$Connection = new Connection();
55 55
 			$sth = $Connection->db->prepare($query);
56 56
 			$sth->execute();
57
-		} catch(PDOException $e) {
57
+		} catch (PDOException $e) {
58 58
 			return "error : ".$e->getMessage();
59 59
 		}
60 60
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 			$Connection = new Connection();
71 71
 			$sth = $Connection->db->prepare($query);
72 72
 			$sth->execute();
73
-		} catch(PDOException $e) {
73
+		} catch (PDOException $e) {
74 74
 			return "error : ".$e->getMessage();
75 75
 		}
76 76
 	}
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
78 78
 	public function parse($data) {
79 79
 		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
80 80
 		$codes = implode('|', array_keys($this->texts));
81
-		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
81
+		$regWeather = '#^(\+|\-|VC)?('.$codes.')('.$codes.')?$#';
82 82
 		//$pieces = explode(' ',$data);
83
-		$pieces = preg_split('/\s/',$data);
83
+		$pieces = preg_split('/\s/', $data);
84 84
 		$pos = 0;
85 85
 		if ($pieces[0] == 'METAR') $pos++;
86 86
 		elseif ($pieces[0] == 'SPECI') $pos++;
@@ -88,25 +88,25 @@  discard block
 block discarded – undo
88 88
 		$result = array();
89 89
 		$result['location'] = $pieces[$pos];
90 90
 		$pos++;
91
-		$result['dayofmonth'] = substr($pieces[$pos],0,2);
92
-		$result['time'] = substr($pieces[$pos],2,4);
91
+		$result['dayofmonth'] = substr($pieces[$pos], 0, 2);
92
+		$result['time'] = substr($pieces[$pos], 2, 4);
93 93
 		$c = count($pieces);
94
-		for($pos++; $pos < $c; $pos++) {
94
+		for ($pos++; $pos < $c; $pos++) {
95 95
 			$piece = $pieces[$pos];
96 96
 			if ($piece == 'RMK') break;
97 97
 			if ($piece == 'AUTO') $result['auto'] = true;
98 98
 			if ($piece == 'COR') $result['correction'] = true;
99 99
 			// Wind Speed
100 100
 			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
101
-				$result['wind']['direction'] = (float)$matches[1];
101
+				$result['wind']['direction'] = (float) $matches[1];
102 102
 				$result['wind']['unit'] = $matches[4];
103
-				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
104
-				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
105
-				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
106
-				$result['wind']['gust'] = (float)$matches[3];
103
+				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float) $matches[2])*0.51444444444, 2);
104
+				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float) $matches[2])*1000, 2);
105
+				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float) $matches[2]), 2);
106
+				$result['wind']['gust'] = (float) $matches[3];
107 107
 				$result['wind']['unit'] = $matches[4];
108
-				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
109
-				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
108
+				$result['wind']['min_variation'] = array_key_exists(5, $matches) ? $matches[5] : 0;
109
+				$result['wind']['max_variation'] = array_key_exists(6, $matches) ? $matches[6] : 0;
110 110
 			}
111 111
 
112 112
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
@@ -127,14 +127,14 @@  discard block
 block discarded – undo
127 127
 
128 128
 			// Temperature
129 129
 			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
130
-				$temp = (float)$matches[1];
130
+				$temp = (float) $matches[1];
131 131
 				if ($matches[1]{0} == 'M') {
132
-					$temp = ((float)substr($matches[1], 1)) * -1;
132
+					$temp = ((float) substr($matches[1], 1))*-1;
133 133
 				}
134 134
 				$result['temperature'] = $temp;
135
-				$dew = (float)$matches[2];
135
+				$dew = (float) $matches[2];
136 136
 				if ($matches[2]{0} == 'M') {
137
-					$dew = ((float)substr($matches[2], 1)) * -1;
137
+					$dew = ((float) substr($matches[2], 1))*-1;
138 138
 				}
139 139
 				$result['dew'] = $dew;
140 140
 			}
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 					$result['QNH'] = $matches[2];
147 147
 				} else {
148 148
 					// inHg
149
-					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
149
+					$result['QNH'] = round(($matches[2]/100)*33.86389, 2);
150 150
 				}
151 151
 				/*
152 152
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
@@ -167,12 +167,12 @@  discard block
 block discarded – undo
167 167
     			// Visibility
168 168
 			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
169 169
 				if (isset($matches[3]) && strlen($matches[3]) > 0) {
170
-					$result['visibility'] = (float)$matches[3] * 1609.34;
170
+					$result['visibility'] = (float) $matches[3]*1609.34;
171 171
 				} else {
172 172
 					if ($matches[1] == '9999') {
173 173
 						$result['visibility'] = '> 10000';
174 174
 					} else {
175
-						$result['visibility'] = (float)$matches[1];
175
+						$result['visibility'] = (float) $matches[1];
176 176
 					}
177 177
 				}
178 178
 				if (preg_match('#^CAVOK$#', $piece, $matches)) {
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
195 195
 				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
196 196
 				$cloud['type_code'] = $type;
197
-				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
197
+				$cloud['level'] = round(((float) $matches[2])*100*0.3048);
198 198
 				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
199 199
 				$result['cloud'][] = $cloud;
200 200
 			}
@@ -204,8 +204,8 @@  discard block
 block discarded – undo
204 204
 				$rvr['runway'] = $matches[1];
205 205
 				$rvr['assessment'] = $matches[2];
206 206
 				$rvr['rvr'] = $matches[3];
207
-				$rvr['rvr_max'] = array_key_exists(4,$matches) ? $matches[4] : 0;
208
-				$rvr['unit'] = array_key_exists(5,$matches) ? $matches[5] : '';
207
+				$rvr['rvr_max'] = array_key_exists(4, $matches) ? $matches[4] : 0;
208
+				$rvr['unit'] = array_key_exists(5, $matches) ? $matches[5] : '';
209 209
 				$result['RVR'] = $rvr;
210 210
 			}
211 211
 			//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
@@ -218,12 +218,12 @@  discard block
 block discarded – undo
218 218
 				$result['RVR']['friction'] = $matches[5];
219 219
 			}
220 220
 			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
221
-				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
222
-				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
221
+				if (isset($matches[5])) $range = array('exact' => (float) $matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
222
+				else $range = array('exact' => (float) $matches[2], 'unit' => 'M');
223 223
 				if (isset($matches[3])) {
224 224
 					$range = Array(
225
-					    'from' => (float)$matches[2],
226
-					    'to'   => (float)$matches[4],
225
+					    'from' => (float) $matches[2],
226
+					    'to'   => (float) $matches[4],
227 227
 					    'unit' => $matches[5] ? 'FT' : 'M'
228 228
 					);
229 229
 				}
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 		try {
272 272
 			$sth = $this->db->prepare($query);
273 273
 			$sth->execute($query_values);
274
-		} catch(PDOException $e) {
274
+		} catch (PDOException $e) {
275 275
 			return "error : ".$e->getMessage();
276 276
 		}
277 277
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -281,19 +281,19 @@  discard block
 block discarded – undo
281 281
 		return $all;
282 282
 	}
283 283
 
284
-	public function addMETAR($location,$metar,$date) {
284
+	public function addMETAR($location, $metar, $date) {
285 285
 		global $globalDBdriver;
286
-		$date = date('Y-m-d H:i:s',strtotime($date));
286
+		$date = date('Y-m-d H:i:s', strtotime($date));
287 287
 		if ($globalDBdriver == 'mysql') {
288 288
 			$query = "INSERT INTO metar (metar_location,metar_date,metar) VALUES (:location,:date,:metar) ON DUPLICATE KEY UPDATE metar_date = :date, metar = :metar";
289 289
 		} else {
290 290
 			$query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);";
291 291
 		}
292
-		$query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar));
292
+		$query_values = array(':location' => $location, ':date' => $date, ':metar' => utf8_encode($metar));
293 293
 		try {
294 294
 			$sth = $this->db->prepare($query);
295 295
 			$sth->execute($query_values);
296
-		} catch(PDOException $e) {
296
+		} catch (PDOException $e) {
297 297
 			return "error : ".$e->getMessage();
298 298
 		}
299 299
 	}
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
 		try {
305 305
 			$sth = $this->db->prepare($query);
306 306
 			$sth->execute($query_values);
307
-		} catch(PDOException $e) {
307
+		} catch (PDOException $e) {
308 308
 			return "error : ".$e->getMessage();
309 309
 		}
310 310
 	}
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 		try {
315 315
 			$sth = $this->db->prepare($query);
316 316
 			$sth->execute();
317
-		} catch(PDOException $e) {
317
+		} catch (PDOException $e) {
318 318
 			return "error : ".$e->getMessage();
319 319
 		}
320 320
 	}
@@ -325,27 +325,27 @@  discard block
 block discarded – undo
325 325
 		date_default_timezone_set("UTC");
326 326
 		$Common = new Common();
327 327
 		if (isset($globalIVAO) && $globalIVAO) {
328
-			$Common->download('http://wx.ivao.aero/metar.php',dirname(__FILE__).'/../install/tmp/ivaometar.txt');
329
-			$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r");
328
+			$Common->download('http://wx.ivao.aero/metar.php', dirname(__FILE__).'/../install/tmp/ivaometar.txt');
329
+			$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt', "r");
330 330
 		} else {
331
-			$Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT',dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT');
332
-			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
331
+			$Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT', dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT');
332
+			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT', "r");
333 333
 		}
334 334
 		if ($handle) {
335 335
 			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
336 336
 			$date = '';
337 337
 			if ($globalTransaction) $this->db->beginTransaction();
338
-			while(($line = fgets($handle,4096)) !== false) {
339
-				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
338
+			while (($line = fgets($handle, 4096)) !== false) {
339
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
340 340
 					$date = $line;
341 341
 				} elseif ($line != '') {
342 342
 					if ($date == '') $date = date('Y/m/d H:m');
343 343
 					$pos = 0;
344
-					$pieces = preg_split('/\s/',$line);
344
+					$pieces = preg_split('/\s/', $line);
345 345
 					if ($pieces[0] == 'METAR') $pos++;
346 346
 					if (strlen($pieces[$pos]) != 4) $pos++;
347 347
 					$location = $pieces[$pos];
348
-					echo $this->addMETAR($location,$line,$date);
348
+					echo $this->addMETAR($location, $line, $date);
349 349
 				}
350 350
 			}
351 351
 			fclose($handle);
@@ -359,22 +359,22 @@  discard block
 block discarded – undo
359 359
 		if ($globalMETARurl == '') return array();
360 360
 		date_default_timezone_set("UTC");
361 361
 		$Common = new Common();
362
-		$url = str_replace('{icao}',$icao,$globalMETARurl);
362
+		$url = str_replace('{icao}', $icao, $globalMETARurl);
363 363
 		$cycle = $Common->getData($url);
364 364
 		$date = '';
365
-		foreach(explode("\n",$cycle) as $line) {
366
-			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
365
+		foreach (explode("\n", $cycle) as $line) {
366
+			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
367 367
 				$date = $line;
368 368
 			} 
369 369
 			if ($line != '') {
370 370
 				if ($date == '') $date = date('Y/m/d H:m');
371 371
 				$pos = 0;
372
-				$pieces = preg_split('/\s/',$line);
372
+				$pieces = preg_split('/\s/', $line);
373 373
 				if ($pieces[0] == 'METAR') $pos++;
374 374
 				if (strlen($pieces[$pos]) != 4) $pos++;
375 375
 				$location = $pieces[$pos];
376 376
 				if (strlen($location == 4)) {
377
-					$this->addMETAR($location,$line,$date);
377
+					$this->addMETAR($location, $line, $date);
378 378
 					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
379 379
 				} else return array();
380 380
 			}
Please login to merge, or discard this patch.
Braces   +100 added lines, -38 removed lines patch added patch discarded remove patch
@@ -59,8 +59,11 @@  discard block
 block discarded – undo
59 59
 		}
60 60
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
61 61
 		$sth->closeCursor();
62
-		if ($row['nb'] > 0) return false;
63
-		else return true;
62
+		if ($row['nb'] > 0) {
63
+			return false;
64
+		} else {
65
+			return true;
66
+		}
64 67
 	}
65 68
 
66 69
 	public static function insert_last_update() {
@@ -82,9 +85,14 @@  discard block
 block discarded – undo
82 85
 		//$pieces = explode(' ',$data);
83 86
 		$pieces = preg_split('/\s/',$data);
84 87
 		$pos = 0;
85
-		if ($pieces[0] == 'METAR') $pos++;
86
-		elseif ($pieces[0] == 'SPECI') $pos++;
87
-		if (strlen($pieces[$pos]) != 4) $pos++;
88
+		if ($pieces[0] == 'METAR') {
89
+			$pos++;
90
+		} elseif ($pieces[0] == 'SPECI') {
91
+			$pos++;
92
+		}
93
+		if (strlen($pieces[$pos]) != 4) {
94
+			$pos++;
95
+		}
88 96
 		$result = array();
89 97
 		$result['location'] = $pieces[$pos];
90 98
 		$pos++;
@@ -93,16 +101,26 @@  discard block
 block discarded – undo
93 101
 		$c = count($pieces);
94 102
 		for($pos++; $pos < $c; $pos++) {
95 103
 			$piece = $pieces[$pos];
96
-			if ($piece == 'RMK') break;
97
-			if ($piece == 'AUTO') $result['auto'] = true;
98
-			if ($piece == 'COR') $result['correction'] = true;
104
+			if ($piece == 'RMK') {
105
+				break;
106
+			}
107
+			if ($piece == 'AUTO') {
108
+				$result['auto'] = true;
109
+			}
110
+			if ($piece == 'COR') {
111
+				$result['correction'] = true;
112
+			}
99 113
 			// Wind Speed
100 114
 			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
101 115
 				$result['wind']['direction'] = (float)$matches[1];
102 116
 				$result['wind']['unit'] = $matches[4];
103
-				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
104
-				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
105
-				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
117
+				if ($result['wind']['unit'] == 'KT') {
118
+					$result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
119
+				} elseif ($result['wind']['unit'] == 'KPH') {
120
+					$result['wind']['speed'] = round(((float)$matches[2])*1000,2);
121
+				} elseif ($result['wind']['unit'] == 'MPS') {
122
+					$result['wind']['speed'] = round(((float)$matches[2]),2);
123
+				}
106 124
 				$result['wind']['gust'] = (float)$matches[3];
107 125
 				$result['wind']['unit'] = $matches[4];
108 126
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
@@ -185,14 +203,23 @@  discard block
 block discarded – undo
185 203
 				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
186 204
 				$type = $matches[1];
187 205
 				$cloud = array();
188
-				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
189
-				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
190
-				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
191
-				elseif ($type == 'FEW') $cloud['type'] = 'Few';
192
-				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
193
-				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
194
-				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
195
-				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
206
+				if ($type == 'SKC') {
207
+					$cloud['type'] = 'No cloud/Sky clear';
208
+				} elseif ($type == 'CLR') {
209
+					$cloud['type'] = 'No cloud below 12,000ft (3700m)';
210
+				} elseif ($type == 'NSC') {
211
+					$cloud['type'] = 'No significant cloud';
212
+				} elseif ($type == 'FEW') {
213
+					$cloud['type'] = 'Few';
214
+				} elseif ($type == 'SCT') {
215
+					$cloud['type'] = 'Scattered';
216
+				} elseif ($type == 'BKN') {
217
+					$cloud['type'] = 'Broken';
218
+				} elseif ($type == 'OVC') {
219
+					$cloud['type'] = 'Overcast/Full cloud coverage';
220
+				} elseif ($type == 'VV') {
221
+					$cloud['type'] = 'Vertical visibility';
222
+				}
196 223
 				$cloud['type_code'] = $type;
197 224
 				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
198 225
 				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
@@ -218,8 +245,11 @@  discard block
 block discarded – undo
218 245
 				$result['RVR']['friction'] = $matches[5];
219 246
 			}
220 247
 			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
221
-				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
222
-				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
248
+				if (isset($matches[5])) {
249
+					$range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
250
+				} else {
251
+					$range = array('exact' => (float)$matches[2], 'unit' => 'M');
252
+				}
223 253
 				if (isset($matches[3])) {
224 254
 					$range = Array(
225 255
 					    'from' => (float)$matches[2],
@@ -252,8 +282,11 @@  discard block
 block discarded – undo
252 282
 				if (isset($matches[3])) {
253 283
 					$text[] = $this->texts[$matches[3]];
254 284
 				}
255
-				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
256
-				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
285
+				if (!isset($result['weather'])) {
286
+					$result['weather'] = implode(' ', $text);
287
+				} else {
288
+					$result['weather'] = $result['weather'].' / '.implode(' ', $text);
289
+				}
257 290
 			}
258 291
 		}
259 292
 		return $result;
@@ -264,8 +297,11 @@  discard block
 block discarded – undo
264 297
 		if (isset($globalMETARcycle) && $globalMETARcycle) {
265 298
 			$query = "SELECT * FROM metar WHERE metar_location = :icao";
266 299
 		} else {
267
-			if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
268
-			else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
300
+			if ($globalDBdriver == 'mysql') {
301
+				$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
302
+			} else {
303
+				$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
304
+			}
269 305
 		}
270 306
 		$query_values = array(':icao' => $icao);
271 307
 		try {
@@ -321,7 +357,9 @@  discard block
 block discarded – undo
321 357
 
322 358
 	public function addMETARCycle() {
323 359
 		global $globalDebug, $globalIVAO, $globalTransaction;
324
-		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
360
+		if (isset($globalDebug) && $globalDebug) {
361
+			echo "Downloading METAR cycle...";
362
+		}
325 363
 		date_default_timezone_set("UTC");
326 364
 		$Common = new Common();
327 365
 		if (isset($globalIVAO) && $globalIVAO) {
@@ -332,31 +370,47 @@  discard block
 block discarded – undo
332 370
 			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
333 371
 		}
334 372
 		if ($handle) {
335
-			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
373
+			if (isset($globalDebug) && $globalDebug) {
374
+				echo "Done - Updating DB...";
375
+			}
336 376
 			$date = '';
337
-			if ($globalTransaction) $this->db->beginTransaction();
377
+			if ($globalTransaction) {
378
+				$this->db->beginTransaction();
379
+			}
338 380
 			while(($line = fgets($handle,4096)) !== false) {
339 381
 				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
340 382
 					$date = $line;
341 383
 				} elseif ($line != '') {
342
-					if ($date == '') $date = date('Y/m/d H:m');
384
+					if ($date == '') {
385
+						$date = date('Y/m/d H:m');
386
+					}
343 387
 					$pos = 0;
344 388
 					$pieces = preg_split('/\s/',$line);
345
-					if ($pieces[0] == 'METAR') $pos++;
346
-					if (strlen($pieces[$pos]) != 4) $pos++;
389
+					if ($pieces[0] == 'METAR') {
390
+						$pos++;
391
+					}
392
+					if (strlen($pieces[$pos]) != 4) {
393
+						$pos++;
394
+					}
347 395
 					$location = $pieces[$pos];
348 396
 					echo $this->addMETAR($location,$line,$date);
349 397
 				}
350 398
 			}
351 399
 			fclose($handle);
352
-			if ($globalTransaction) $this->db->commit();
400
+			if ($globalTransaction) {
401
+				$this->db->commit();
402
+			}
403
+		}
404
+		if (isset($globalDebug) && $globalDebug) {
405
+			echo "Done\n";
353 406
 		}
354
-		if (isset($globalDebug) && $globalDebug) echo "Done\n";
355 407
 	}
356 408
 
357 409
 	public function downloadMETAR($icao) {
358 410
 		global $globalMETARurl;
359
-		if ($globalMETARurl == '') return array();
411
+		if ($globalMETARurl == '') {
412
+			return array();
413
+		}
360 414
 		date_default_timezone_set("UTC");
361 415
 		$Common = new Common();
362 416
 		$url = str_replace('{icao}',$icao,$globalMETARurl);
@@ -367,16 +421,24 @@  discard block
 block discarded – undo
367 421
 				$date = $line;
368 422
 			} 
369 423
 			if ($line != '') {
370
-				if ($date == '') $date = date('Y/m/d H:m');
424
+				if ($date == '') {
425
+					$date = date('Y/m/d H:m');
426
+				}
371 427
 				$pos = 0;
372 428
 				$pieces = preg_split('/\s/',$line);
373
-				if ($pieces[0] == 'METAR') $pos++;
374
-				if (strlen($pieces[$pos]) != 4) $pos++;
429
+				if ($pieces[0] == 'METAR') {
430
+					$pos++;
431
+				}
432
+				if (strlen($pieces[$pos]) != 4) {
433
+					$pos++;
434
+				}
375 435
 				$location = $pieces[$pos];
376 436
 				if (strlen($location == 4)) {
377 437
 					$this->addMETAR($location,$line,$date);
378 438
 					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
379
-				} else return array();
439
+				} else {
440
+					return array();
441
+				}
380 442
 			}
381 443
 		}
382 444
 		return array();
Please login to merge, or discard this patch.
flightid-overview.php 2 patches
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-$id = filter_input(INPUT_GET,'id',FILTER_SANITIZE_STRING);
2
+$id = filter_input(INPUT_GET, 'id', FILTER_SANITIZE_STRING);
3 3
 if ($id == "")
4 4
 {
5 5
 	header('Location: /');
@@ -16,30 +16,30 @@  discard block
 block discarded – undo
16 16
 
17 17
 if (!empty($spotter_array))
18 18
 {
19
-	if(isset($spotter_array[0]['flightaware_id'])) {
19
+	if (isset($spotter_array[0]['flightaware_id'])) {
20 20
 		$flightaware_id = $spotter_array[0]['flightaware_id'];
21 21
 	}
22
-	if(isset($spotter_array[0]['last_latitude']) && $spotter_array[0]['last_latitude'] != '') {
22
+	if (isset($spotter_array[0]['last_latitude']) && $spotter_array[0]['last_latitude'] != '') {
23 23
 		$latitude = $spotter_array[0]['last_latitude'];
24
-	} elseif(isset($spotter_array[0]['latitude'])) {
24
+	} elseif (isset($spotter_array[0]['latitude'])) {
25 25
 		$latitude = $spotter_array[0]['latitude'];
26 26
 	}
27
-	if(isset($spotter_array[0]['last_longitude']) && $spotter_array[0]['last_longitude'] != '') {
27
+	if (isset($spotter_array[0]['last_longitude']) && $spotter_array[0]['last_longitude'] != '') {
28 28
 		$longitude = $spotter_array[0]['last_longitude'];
29
-	} elseif(isset($spotter_array[0]['longitude'])) {
29
+	} elseif (isset($spotter_array[0]['longitude'])) {
30 30
 		$longitude = $spotter_array[0]['longitude'];
31 31
 	}
32 32
 	$title = '';
33
-	if(isset($spotter_array[0]['ident'])) {
33
+	if (isset($spotter_array[0]['ident'])) {
34 34
 		$title .= $spotter_array[0]['ident'];
35 35
 	}
36
-	if(isset($spotter_array[0]['airline_name'])) {
36
+	if (isset($spotter_array[0]['airline_name'])) {
37 37
 		$title .= ' - '.$spotter_array[0]['airline_name'];
38 38
 	}
39
-	if(isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
39
+	if (isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
40 40
 		$title .= ' - '.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')';
41 41
 	}
42
-	if(isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA' && $spotter_array[0]['registration'] != 'N/A') {
42
+	if (isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA' && $spotter_array[0]['registration'] != 'N/A') {
43 43
 		$title .= ' - '.$spotter_array[0]['registration'];
44 44
 	}
45 45
 	//$facebook_meta_image = $spotter_array[0]['image'];
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 			$altitude_data = '';
60 60
 			$hour_data = '';
61 61
 			$speed_data = '';
62
-			foreach($all_data as $data)
62
+			foreach ($all_data as $data)
63 63
 			{
64 64
 				$hour_data .= '"'.$data['date'].'",';
65 65
 				if (isset($data['real_altitude']) && $data['real_altitude'] != '') {
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 				$speed_data .= $speed.',';
88 88
 			}
89 89
 			$hour_data = "['x',".substr($hour_data, 0, -1)."]";
90
-			$altitude_data = "['altitude',".substr($altitude_data,0,-1)."]";
91
-			$speed_data = "['speed',".substr($speed_data,0,-1)."]";
90
+			$altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]";
91
+			$speed_data = "['speed',".substr($speed_data, 0, -1)."]";
92 92
 			print 'c3.generate({
93 93
 			    bindto: "#chart",
94 94
 			    data: {
@@ -134,16 +134,16 @@  discard block
 block discarded – undo
134 134
 			print '<a href="'.$globalURL.'/airline/'.$spotter_array[0]['airline_icao'].'">'.$spotter_array[0]['airline_name'].'</a> ';
135 135
 		}
136 136
 	}
137
-	if(isset($spotter_array[0]['ident'])) {
137
+	if (isset($spotter_array[0]['ident'])) {
138 138
 		print $spotter_array[0]['ident'];
139 139
 	}
140
-	if(isset($spotter_array[0]['airline_name'])) {
140
+	if (isset($spotter_array[0]['airline_name'])) {
141 141
 		print ' - '.$spotter_array[0]['airline_name'];
142 142
 	}
143
-	if(isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
143
+	if (isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
144 144
 		print ' - '.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')';
145 145
 	}
146
-	if(isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA') {
146
+	if (isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA') {
147 147
 		print ' - '.$spotter_array[0]['registration'];
148 148
 	}
149 149
 	print '</h1>';
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 	 print '</div>';
298 298
 */
299 299
 
300
-	foreach($spotter_array as $spotter_item)
300
+	foreach ($spotter_array as $spotter_item)
301 301
 	{
302 302
 		print '<div class="details">';
303 303
 		print '<h3>'._("Flight Information").'</h3>';
@@ -397,7 +397,7 @@  discard block
 block discarded – undo
397 397
 			if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != '') {
398 398
 				if ($spotter_item['departure_airport_time'] > 2460) {
399 399
 					print '<div class="time">';
400
-					print 'at '.date('H:m',$spotter_item['departure_airport_time']);
400
+					print 'at '.date('H:m', $spotter_item['departure_airport_time']);
401 401
 					print '</div>';
402 402
 				} else {
403 403
 					print '<div class="time">';
@@ -546,19 +546,19 @@  discard block
 block discarded – undo
546 546
 			$departure_airport_info = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
547 547
 			if (isset($spotter_item['last_latitude']) && $spotter_item['last_latitude'] != '') {
548 548
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
549
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'nm').' nm';
549
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'nm').' nm';
550 550
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
551
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'mi').' mi';
551
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'mi').' mi';
552 552
 				} else {
553
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'km').' km';
553
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'km').' km';
554 554
 				}
555 555
 			} else {
556 556
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
557
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'nm').' nm';
557
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'nm').' nm';
558 558
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
559
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'mi').' mi';
559
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'mi').' mi';
560 560
 				} else {
561
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'km').' km';
561
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'km').' km';
562 562
 				}
563 563
 			}
564 564
 			print '</div>';
@@ -572,19 +572,19 @@  discard block
 block discarded – undo
572 572
 			$arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
573 573
 			if (isset($spotter_item['last_latitude']) && $spotter_item['last_latitude'] != '') {
574 574
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
575
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'nm').' nm';
575
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'nm').' nm';
576 576
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
577
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'mi').' mi';
577
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'mi').' mi';
578 578
 				} else {
579
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'km').' km';
579
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'km').' km';
580 580
 				}
581 581
 			} else {
582 582
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
583
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'nm').' nm';
583
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'nm').' nm';
584 584
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
585
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'mi').' mi';
585
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'mi').' mi';
586 586
 				} else {
587
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'km').' km';
587
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'km').' km';
588 588
 				}
589 589
 			}
590 590
 			print '</div>';
@@ -603,7 +603,7 @@  discard block
 block discarded – undo
603 603
 		print '<div class="last-flights">';
604 604
 		print '<h3>'._("Last 5 Flights of this Aircraft").' ('.$spotter_array[0]['registration'].')</h3>';
605 605
 		$hide_th_links = true;
606
-		$spotter_array = $Spotter->getSpotterDataByRegistration($spotter_array[0]['registration'],"0,5", "");
606
+		$spotter_array = $Spotter->getSpotterDataByRegistration($spotter_array[0]['registration'], "0,5", "");
607 607
 		include('table-output.php'); 
608 608
 		print '<div class="more">';
609 609
 		print '<a href="'.$globalURL.'/registration/'.$spotter_array[0]['registration'].'" class="btn btn-default btn" role="button">See all Flights&raquo;</a>';
Please login to merge, or discard this patch.
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -48,7 +48,9 @@  discard block
 block discarded – undo
48 48
 		$all_data = $SpotterArchive->getAltitudeSpeedArchiveSpotterDataById($spotter_array[0]['flightaware_id']);
49 49
 		if (isset($globalTimezone)) {
50 50
 			date_default_timezone_set($globalTimezone);
51
-		} else date_default_timezone_set('UTC');
51
+		} else {
52
+			date_default_timezone_set('UTC');
53
+		}
52 54
 		
53 55
 		if (is_array($all_data) && count($all_data) > 1) {
54 56
 			print '<br/>';
@@ -327,9 +329,13 @@  discard block
 block discarded – undo
327 329
 			print '<div>';
328 330
 			if (isset($spotter_item['pilot_id']) && $spotter_item['pilot_id'] != "")
329 331
 			{
330
-				if ($spotter_item['format_source'] == 'whazzup') print '<a href="https://www.ivao.aero/Member.aspx?ID='.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
331
-				elseif ($spotter_item['format_source'] == 'vatsimtxt') print '<a href="http://www.vataware.com/pilot/'.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
332
-				else print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
332
+				if ($spotter_item['format_source'] == 'whazzup') {
333
+					print '<a href="https://www.ivao.aero/Member.aspx?ID='.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
334
+				} elseif ($spotter_item['format_source'] == 'vatsimtxt') {
335
+					print '<a href="http://www.vataware.com/pilot/'.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
336
+				} else {
337
+					print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
338
+				}
333 339
 			} else {
334 340
 				if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != "")
335 341
 				{
Please login to merge, or discard this patch.
ident-detailed.php 2 patches
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 require_once('require/class.Language.php');
4 4
 require_once('require/class.Translation.php');
5 5
 $type = '';
6
-$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
6
+$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
7 7
 if (isset($_GET['marine'])) {
8 8
 	require_once('require/class.Marine.php');
9 9
 	require_once('require/class.MarineLive.php');
@@ -30,12 +30,12 @@  discard block
 block discarded – undo
30 30
 	$page_url = $globalURL.'/ident/'.$_GET['ident'];
31 31
 }
32 32
 
33
-if (!isset($_GET['ident'])){
33
+if (!isset($_GET['ident'])) {
34 34
 	header('Location: '.$globalURL.'');
35 35
 } else {
36 36
 	$Translation = new Translation();
37 37
 	//calculuation for the pagination
38
-	if(!isset($_GET['limit']))
38
+	if (!isset($_GET['limit']))
39 39
 	{
40 40
 		$limit_start = 0;
41 41
 		$limit_end = 25;
@@ -54,18 +54,18 @@  discard block
 block discarded – undo
54 54
 	$limit_previous_1 = $limit_start - $absolute_difference;
55 55
 	$limit_previous_2 = $limit_end - $absolute_difference;
56 56
 	
57
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
57
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
58 58
 	if ($type == 'aircraft') {
59 59
 		if ($sort != '') 
60 60
 		{
61
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
61
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
62 62
 			if (empty($spotter_array)) {
63
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
63
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
64 64
 			}
65 65
 		} else {
66
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
66
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
67 67
 			if (empty($spotter_array)) {
68
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
68
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
69 69
 			}
70 70
 		}
71 71
 		if (empty($spotter_array)) {
@@ -74,14 +74,14 @@  discard block
 block discarded – undo
74 74
 				$ident = $new_ident;
75 75
 				if ($sort != '') 
76 76
 				{
77
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
77
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
78 78
 					if (empty($spotter_array)) {
79
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
79
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
80 80
 					}
81 81
 				} else {
82
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
82
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
83 83
 					if (empty($spotter_array)) {
84
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
84
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
85 85
 					}
86 86
 				}
87 87
 			}
@@ -89,34 +89,34 @@  discard block
 block discarded – undo
89 89
 	} elseif ($type == 'marine') {
90 90
 		if ($sort != '') 
91 91
 		{
92
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
92
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
93 93
 			if (empty($spotter_array)) {
94
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
94
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
95 95
 			}
96 96
 		} else {
97
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
97
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
98 98
 			if (empty($spotter_array)) {
99
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
99
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
100 100
 			}
101 101
 		}
102 102
 	} elseif ($type == 'tracker') {
103 103
 		if ($sort != '') 
104 104
 		{
105
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
105
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
106 106
 			if (empty($spotter_array)) {
107
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
107
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
108 108
 			}
109 109
 		} else {
110
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
110
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
111 111
 			if (empty($spotter_array)) {
112
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
112
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
113 113
 			}
114 114
 		}
115 115
 	}
116 116
 
117 117
 	if (!empty($spotter_array))
118 118
 	{
119
-		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
119
+		$title = sprintf(_("Detailed View for %s"), $spotter_array[0]['ident']);
120 120
 		$ident = $spotter_array[0]['ident'];
121 121
 		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
122 122
 		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 				$altitude_data = '';
137 137
 				$hour_data = '';
138 138
 				$speed_data = '';
139
-				foreach($all_data as $data)
139
+				foreach ($all_data as $data)
140 140
 				{
141 141
 					$hour_data .= '"'.$data['date'].'",';
142 142
 					if (isset($data['real_altitude']) && $data['real_altitude'] != '') {
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 					$speed_data .= $speed.',';
165 165
 				}
166 166
 				$hour_data = "['x',".substr($hour_data, 0, -1)."]";
167
-				$altitude_data = "['altitude',".substr($altitude_data,0,-1)."]";
168
-				$speed_data = "['speed',".substr($speed_data,0,-1)."]";
167
+				$altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]";
168
+				$speed_data = "['speed',".substr($speed_data, 0, -1)."]";
169 169
 				print 'c3.generate({
170 170
 				    bindto: "#chart",
171 171
 				    data: {
@@ -209,9 +209,9 @@  discard block
 block discarded – undo
209 209
 	
210 210
 		if ($type == 'aircraft') include('ident-sub-menu.php');
211 211
 		print '<div class="table column">';
212
-		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
213
-		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
214
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
212
+		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
213
+		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
214
+		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
215 215
 
216 216
 		include('table-output.php'); 
217 217
 		print '<div class="pagination">';
Please login to merge, or discard this patch.
Braces   +22 added lines, -8 removed lines patch added patch discarded remove patch
@@ -118,8 +118,12 @@  discard block
 block discarded – undo
118 118
 	{
119 119
 		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
120 120
 		$ident = $spotter_array[0]['ident'];
121
-		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
122
-		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
121
+		if (isset($spotter_array[0]['latitude'])) {
122
+			$latitude = $spotter_array[0]['latitude'];
123
+		}
124
+		if (isset($spotter_array[0]['longitude'])) {
125
+			$longitude = $spotter_array[0]['longitude'];
126
+		}
123 127
 		require_once('header.php');
124 128
 		if (isset($globalArchive) && $globalArchive && $type == 'aircraft') {
125 129
 			// Requirement for altitude graph
@@ -127,7 +131,9 @@  discard block
 block discarded – undo
127 131
 			$all_data = $SpotterArchive->getAltitudeSpeedArchiveSpotterDataById($spotter_array[0]['flightaware_id']);
128 132
 			if (isset($globalTimezone)) {
129 133
 				date_default_timezone_set($globalTimezone);
130
-			} else date_default_timezone_set('UTC');
134
+			} else {
135
+				date_default_timezone_set('UTC');
136
+			}
131 137
 			if (is_array($all_data) && count($all_data) > 1) {
132 138
 				print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
133 139
 				print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -204,14 +210,22 @@  discard block
 block discarded – undo
204 210
 		if (isset($spotter_array[0]['airline_icao'])) {
205 211
 			print '<div><span class="label">'._("Airline").'</span><a href="'.$globalURL.'/airline/'.$spotter_array[0]['airline_icao'].'">'.$spotter_array[0]['airline_name'].'</a></div>'; 
206 212
 		}
207
-		if ($type == 'aircraft') print '<div><span class="label">'._("Flight History").'</span><a href="http://flightaware.com/live/flight/'.$spotter_array[0]['ident'].'" target="_blank">'._("View the Flight History of this callsign").'</a></div>';
213
+		if ($type == 'aircraft') {
214
+			print '<div><span class="label">'._("Flight History").'</span><a href="http://flightaware.com/live/flight/'.$spotter_array[0]['ident'].'" target="_blank">'._("View the Flight History of this callsign").'</a></div>';
215
+		}
208 216
 		print '</div>';
209 217
 	
210
-		if ($type == 'aircraft') include('ident-sub-menu.php');
218
+		if ($type == 'aircraft') {
219
+			include('ident-sub-menu.php');
220
+		}
211 221
 		print '<div class="table column">';
212
-		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
213
-		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
214
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
222
+		if ($type == 'aircraft') {
223
+			print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
224
+		} elseif ($type == 'marine') {
225
+			print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
226
+		} elseif ($type == 'tracker') {
227
+			print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
228
+		}
215 229
 
216 230
 		include('table-output.php'); 
217 231
 		print '<div class="pagination">';
Please login to merge, or discard this patch.
registration-sub-menu.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,9 +15,9 @@  discard block
 block discarded – undo
15 15
 </span>
16 16
 <div class="sub-menu sub-menu-container">
17 17
 	<ul class="nav nav-pills">
18
-		<li><a href="<?php print $globalURL; ?>/registration/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
18
+		<li><a href="<?php print $globalURL; ?>/registration/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
19 19
 		<li class="dropdown">
20
-		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "registration-statistics-departure-airport" || strtolower($current_page) == "registration-statistics-departure-airport-country" || strtolower($current_page) == "registration-statistics-arrival-airport" || strtolower($current_page) == "registration-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
20
+		    <a class="dropdown-toggle <?php if (strtolower($current_page) == "registration-statistics-departure-airport" || strtolower($current_page) == "registration-statistics-departure-airport-country" || strtolower($current_page) == "registration-statistics-arrival-airport" || strtolower($current_page) == "registration-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#">
21 21
 		      <?php _("Airport"); ?> <span class="caret"></span>
22 22
 		    </a>
23 23
 		    <ul class="dropdown-menu" role="menu">
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 			  <li><a href="<?php print $globalURL; ?>/registration/statistics/arrival-airport-country/<?php print $_GET['registration']; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
28 28
 		    </ul>
29 29
 		</li>
30
-		<li><a href="<?php print $globalURL; ?>/registration/statistics/route/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
31
-		<li><a href="<?php print $globalURL; ?>/registration/statistics/time/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
30
+		<li><a href="<?php print $globalURL; ?>/registration/statistics/route/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-statistics-route") { print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
31
+		<li><a href="<?php print $globalURL; ?>/registration/statistics/time/<?php print $_GET['registration']; ?>" <?php if (strtolower($current_page) == "registration-statistics-time") { print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
32 32
 	</ul>
33 33
 </div>
34 34
\ No newline at end of file
Please login to merge, or discard this patch.
airport-detailed.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 			$metar_info = $METAR->getMETAR($airport_icao);
49 49
 			//print_r($metar_info);
50 50
 			if (isset($metar_info[0]['metar'])) $metar_parse = $METAR->parse($metar_info[0]['metar']);
51
-            		//print_r($metar_parse);
51
+					//print_r($metar_parse);
52 52
 		}
53 53
 		
54 54
 		$title = sprintf(_("Detailed View for %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -5,17 +5,17 @@  discard block
 block discarded – undo
5 5
 require_once('require/class.Stats.php');
6 6
 require_once('require/class.METAR.php');
7 7
 
8
-if (!isset($_GET['airport'])){
8
+if (!isset($_GET['airport'])) {
9 9
 	header('Location: '.$globalURL.'/airport');
10 10
 } else {
11 11
 	$Spotter = new Spotter();
12 12
 	//calculation for the pagination
13
-	if(!isset($_GET['limit']))
13
+	if (!isset($_GET['limit']))
14 14
 	{
15 15
 		$limit_start = 0;
16 16
 		$limit_end = 25;
17 17
 		$absolute_difference = 25;
18
-	}  else {
18
+	} else {
19 19
 		$limit_explode = explode(",", $_GET['limit']);
20 20
 		$limit_start = $limit_explode[0];
21 21
 		$limit_end = $limit_explode[1];
@@ -28,15 +28,15 @@  discard block
 block discarded – undo
28 28
 	$limit_next = $limit_end + $absolute_difference;
29 29
 	$limit_previous_1 = $limit_start - $absolute_difference;
30 30
 	$limit_previous_2 = $limit_end - $absolute_difference;
31
-	$airport_icao = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING);
31
+	$airport_icao = filter_input(INPUT_GET, 'airport', FILTER_SANITIZE_STRING);
32 32
 	$airport = $airport_icao;
33 33
 	$page_url = $globalURL.'/airport/'.$airport_icao;
34 34
 	
35 35
 	if (isset($_GET['sort'])) {
36
-		$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
37
-		$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao,$limit_start.",".$absolute_difference, $sort);
36
+		$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
37
+		$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao, $limit_start.",".$absolute_difference, $sort);
38 38
 	} else {
39
-		$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao,$limit_start.",".$absolute_difference, '');
39
+		$spotter_array = $Spotter->getSpotterDataByAirport($airport_icao, $limit_start.",".$absolute_difference, '');
40 40
 	}
41 41
 	$airport_array = $Spotter->getAllAirportInfo($airport_icao);
42 42
 	
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
             		//print_r($metar_parse);
52 52
 		}
53 53
 		
54
-		$title = sprintf(_("Detailed View for %s, %s (%s)"),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']);
54
+		$title = sprintf(_("Detailed View for %s, %s (%s)"), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']);
55 55
 
56 56
 		require_once('header.php');
57 57
 		
@@ -63,9 +63,9 @@  discard block
 block discarded – undo
63 63
 		$airport_names = $Stats->getAllAirportNames();
64 64
 		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
65 65
 		ksort($airport_names);
66
-		foreach($airport_names as $airport_name)
66
+		foreach ($airport_names as $airport_name)
67 67
 		{
68
-			if($airport_icao == $airport_name['airport_icao'])
68
+			if ($airport_icao == $airport_name['airport_icao'])
69 69
 			{
70 70
 				print '<option value="'.$airport_name['airport_icao'].'" selected="selected">'.$airport_name['airport_city'].', '.$airport_name['airport_name'].', '.$airport_name['airport_country'].' ('.$airport_name['airport_icao'].')</option>';
71 71
 			} else {
@@ -111,15 +111,15 @@  discard block
 block discarded – undo
111 111
 				$date_data = '';
112 112
 				$departure_data = '';
113 113
 				$arrival_data = '';
114
-				foreach($all_data as $data)
114
+				foreach ($all_data as $data)
115 115
 				{
116 116
 					$date_data .= '"'.$data['date'].'",';
117 117
 					$departure_data .= $data['departure'].',';
118 118
 					$arrival_data .= $data['arrival'].',';
119 119
 				}
120
-				$date_data = "['x',".substr($date_data,0,-1)."]";
121
-				$departure_data = "['departure',".substr($departure_data,0,-1)."]";
122
-				$arrival_data = "['arrival',".substr($arrival_data,0,-1)."]";
120
+				$date_data = "['x',".substr($date_data, 0, -1)."]";
121
+				$departure_data = "['departure',".substr($departure_data, 0, -1)."]";
122
+				$arrival_data = "['arrival',".substr($arrival_data, 0, -1)."]";
123 123
 				print 'c3.generate({
124 124
 				    bindto: "#chart",
125 125
 				    data: {
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 					print _("Dew point:").' '.$metar_parse['dew'].' °C'." - ";
177 177
 				}
178 178
 				if (isset($metar_parse['temperature']) && isset($metar_parse['dew'])) {
179
-					$humidity = round(100 * pow((112 - (0.1 * $metar_parse['temperature']) + $metar_parse['dew']) / (112 + (0.9 * $metar_parse['temperature'])), 8),1);
179
+					$humidity = round(100*pow((112 - (0.1*$metar_parse['temperature']) + $metar_parse['dew'])/(112 + (0.9*$metar_parse['temperature'])), 8), 1);
180 180
 					print _("Humidity:").' '.$humidity.'%'." - ";
181 181
 				}
182 182
 				if (isset($metar_parse['QNH'])) {
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 		print '<div class="table column">';
193 193
 		if ($airport_array[0]['iata'] != "NA")
194 194
 		{
195
-			print '<p>'.sprintf(_("The table below shows the detailed information of all flights to/from <strong>%s, %s (%s)</strong>."),$airport_array[0]['city'],$airport_array[0]['name'],$airport_array[0]['icao']).'</p>';
195
+			print '<p>'.sprintf(_("The table below shows the detailed information of all flights to/from <strong>%s, %s (%s)</strong>."), $airport_array[0]['city'], $airport_array[0]['name'], $airport_array[0]['icao']).'</p>';
196 196
 		}
197 197
 		include('table-output.php');  
198 198
 		print '<div class="pagination">';
Please login to merge, or discard this patch.
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 		$limit_start = 0;
16 16
 		$limit_end = 25;
17 17
 		$absolute_difference = 25;
18
-	}  else {
18
+	} else {
19 19
 		$limit_explode = explode(",", $_GET['limit']);
20 20
 		$limit_start = $limit_explode[0];
21 21
 		$limit_end = $limit_explode[1];
@@ -47,7 +47,9 @@  discard block
 block discarded – undo
47 47
 			$METAR = new METAR();
48 48
 			$metar_info = $METAR->getMETAR($airport_icao);
49 49
 			//print_r($metar_info);
50
-			if (isset($metar_info[0]['metar'])) $metar_parse = $METAR->parse($metar_info[0]['metar']);
50
+			if (isset($metar_info[0]['metar'])) {
51
+				$metar_parse = $METAR->parse($metar_info[0]['metar']);
52
+			}
51 53
             		//print_r($metar_parse);
52 54
 		}
53 55
 		
@@ -61,7 +63,9 @@  discard block
 block discarded – undo
61 63
 		print '<option></option>';
62 64
 		$Stats = new Stats();
63 65
 		$airport_names = $Stats->getAllAirportNames();
64
-		if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
66
+		if (empty($airport_names)) {
67
+			$airport_names = $Spotter->getAllAirportNames();
68
+		}
65 69
 		ksort($airport_names);
66 70
 		foreach($airport_names as $airport_name)
67 71
 		{
@@ -102,7 +106,9 @@  discard block
 block discarded – undo
102 106
 			// Use spotter also
103 107
 			if (isset($globalTimezone)) {
104 108
 				date_default_timezone_set($globalTimezone);
105
-			} else date_default_timezone_set('UTC');
109
+			} else {
110
+				date_default_timezone_set('UTC');
111
+			}
106 112
 			if (count($all_data) > 0) {
107 113
 				print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
108 114
 				print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
Please login to merge, or discard this patch.