Completed
Push — master ( f08fdc...55ae08 )
by Yannick
29:19
created
require/class.APRS.php 4 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -174,6 +174,10 @@
 block discarded – undo
174 174
 		'\|' => 'TNC Stream SW',
175 175
 		'\~' => 'TNC Stream SW');
176 176
 
177
+	/**
178
+	 * @param integer $n
179
+	 * @param integer $s
180
+	 */
177 181
 	private function urshift($n, $s) {
178 182
 		return ($n >= 0) ? ($n >> $s) :
179 183
 		    (($n & 0x7fffffff) >> $s) | 
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -176,8 +176,8 @@
 block discarded – undo
176 176
 
177 177
 	private function urshift($n, $s) {
178 178
 		return ($n >= 0) ? ($n >> $s) :
179
-		    (($n & 0x7fffffff) >> $s) | 
180
-		    (0x40000000 >> ($s - 1));
179
+			(($n & 0x7fffffff) >> $s) | 
180
+			(0x40000000 >> ($s - 1));
181 181
 	}
182 182
 
183 183
 	/*
Please login to merge, or discard this patch.
Spacing   +157 added lines, -158 removed lines patch added patch discarded remove patch
@@ -175,8 +175,7 @@  discard block
 block discarded – undo
175 175
 		'\~' => 'TNC Stream SW');
176 176
 
177 177
 	private function urshift($n, $s) {
178
-		return ($n >= 0) ? ($n >> $s) :
179
-		    (($n & 0x7fffffff) >> $s) | 
178
+		return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| 
180 179
 		    (0x40000000 >> ($s - 1));
181 180
 	}
182 181
 
@@ -192,7 +191,7 @@  discard block
 block discarded – undo
192 191
 		$input_len = strlen($input);
193 192
 		
194 193
 		/* Find the end of header checking for NULL bytes while doing it. */
195
-		$splitpos = strpos($input,':');
194
+		$splitpos = strpos($input, ':');
196 195
 		
197 196
 		/* Check that end was found and body has at least one byte. */
198 197
 		if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
@@ -202,14 +201,14 @@  discard block
 block discarded – undo
202 201
 		
203 202
 		if ($debug) echo 'input : '.$input."\n";
204 203
 		/* Save header and body. */
205
-		$body = substr($input,$splitpos+1,$input_len);
204
+		$body = substr($input, $splitpos + 1, $input_len);
206 205
 		$body_len = strlen($body);
207
-		$header = substr($input,0,$splitpos);
206
+		$header = substr($input, 0, $splitpos);
208 207
 		if ($debug) echo 'header : '.$header."\n";
209 208
 		
210 209
 		/* Parse source, target and path. */
211 210
 		//FLRDF0A52>APRS,qAS,LSTB
212
-		if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
211
+		if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/', $header, $matches)) {
213 212
 			$ident = $matches[1];
214 213
 			$all_elements = $matches[2];
215 214
 			if ($ident == 'AIRCRAFT') {
@@ -226,13 +225,13 @@  discard block
 block discarded – undo
226 225
 			if ($debug) 'No ident'."\n";
227 226
 			return false;
228 227
 		}
229
-		$elements = explode(',',$all_elements);
228
+		$elements = explode(',', $all_elements);
230 229
 		$source = end($elements);
231 230
 		$result['source'] = $source;
232 231
 		foreach ($elements as $element) {
233
-			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
232
+			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/', $element)) {
234 233
 			//if ($element == 'TCPIP*') return false;
235
-			} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
234
+			} elseif (!preg_match('/^([0-9A-F]{32})$/', $element)) {
236 235
 				if ($debug) echo 'element : '.$element."\n";
237 236
 				return false;
238 237
 			}
@@ -245,14 +244,14 @@  discard block
 block discarded – undo
245 244
 			*/
246 245
 		}
247 246
 		
248
-		$type = substr($body,0,1);
247
+		$type = substr($body, 0, 1);
249 248
 		if ($debug) echo 'type : '.$type."\n";
250 249
 		if ($type == ';') {
251 250
 			if (isset($result['source_type']) && $result['source_type'] == 'modes') {
252
-				$result['address'] = trim(substr($body,1,9));
251
+				$result['address'] = trim(substr($body, 1, 9));
253 252
 			} elseif (isset($result['source_type']) && $result['source_type'] == 'ais') {
254
-				$result['mmsi'] = trim(substr($body,1,9));
255
-			} else $result['ident'] = trim(substr($body,1,9));
253
+				$result['mmsi'] = trim(substr($body, 1, 9));
254
+			} else $result['ident'] = trim(substr($body, 1, 9));
256 255
 		} elseif ($type == ',') {
257 256
 			// Invalid data or test data
258 257
 			return false;
@@ -260,20 +259,20 @@  discard block
 block discarded – undo
260 259
 		
261 260
 		// Check for Timestamp
262 261
 		$find = false;
263
-		$body_parse = substr($body,1);
264
-		if (preg_match('/^;(.){9}\*/',$body,$matches)) {
265
-			$body_parse = substr($body_parse,10);
262
+		$body_parse = substr($body, 1);
263
+		if (preg_match('/^;(.){9}\*/', $body, $matches)) {
264
+			$body_parse = substr($body_parse, 10);
266 265
 			$find = true;
267 266
 		}
268
-		if (preg_match('/^`(.*)\//',$body,$matches)) {
269
-			$body_parse = substr($body_parse,strlen($matches[1])-1);
267
+		if (preg_match('/^`(.*)\//', $body, $matches)) {
268
+			$body_parse = substr($body_parse, strlen($matches[1]) - 1);
270 269
 			$find = true;
271 270
 		}
272
-		if (preg_match("/^'(.*)\//",$body,$matches)) {
273
-			$body_parse = substr($body_parse,strlen($matches[1])-1);
271
+		if (preg_match("/^'(.*)\//", $body, $matches)) {
272
+			$body_parse = substr($body_parse, strlen($matches[1]) - 1);
274 273
 			$find = true;
275 274
 		}
276
-		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
275
+		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) {
277 276
 			$find = true;
278 277
 			$timestamp = $matches[0];
279 278
 			if ($matches[4] == 'h') {
@@ -286,17 +285,17 @@  discard block
 block discarded – undo
286 285
 				// This work or not ?
287 286
 				$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
288 287
 			}
289
-			$body_parse = substr($body_parse,7);
288
+			$body_parse = substr($body_parse, 7);
290 289
 			$result['timestamp'] = $timestamp;
291 290
 		}
292
-		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
291
+		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $body_parse, $matches)) {
293 292
 			$find = true;
294 293
 			$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
295
-			$body_parse = substr($body_parse,8);
294
+			$body_parse = substr($body_parse, 8);
296 295
 			$result['timestamp'] = $timestamp;
297 296
 		}
298 297
 		//if (strlen($body_parse) > 19) {
299
-		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
+		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)) {
300 299
 			$find = true;
301 300
 			// 4658.70N/00707.78Ez
302 301
 			$sind = strtoupper($matches[3]);
@@ -318,11 +317,11 @@  discard block
 block discarded – undo
318 317
 			    */
319 318
 			$latitude = $lat + floatval($lat_min)/60;
320 319
 			$longitude = $lon + floatval($lon_min)/60;
321
-			if ($sind == 'S') $latitude = 0-$latitude;
322
-			if ($wind == 'W') $longitude = 0-$longitude;
320
+			if ($sind == 'S') $latitude = 0 - $latitude;
321
+			if ($wind == 'W') $longitude = 0 - $longitude;
323 322
 			$result['latitude'] = $latitude;
324 323
 			$result['longitude'] = $longitude;
325
-			$body_parse = substr($body_parse,18);
324
+			$body_parse = substr($body_parse, 18);
326 325
 			$body_parse_len = strlen($body_parse);
327 326
 		}
328 327
 		$body_parse_len = strlen($body_parse);
@@ -349,22 +348,22 @@  discard block
 block discarded – undo
349 348
 				//'
350 349
 				//if ($type != ';' && $type != '>') {
351 350
 				if ($type != '') {
352
-					$body_parse = substr($body_parse,1);
351
+					$body_parse = substr($body_parse, 1);
353 352
 					$body_parse_len = strlen($body_parse);
354 353
 					$result['symbol_code'] = $symbol_code;
355 354
 					if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
356 355
 					if ($symbol_code != '_') {
357 356
 					}
358 357
 					if ($body_parse_len >= 7) {
359
-						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
360
-							$course = substr($body_parse,0,3);
358
+						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/', $body_parse)) {
359
+							$course = substr($body_parse, 0, 3);
361 360
 							$tmp_s = intval($course);
362 361
 							if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
363
-							$speed = substr($body_parse,4,3);
362
+							$speed = substr($body_parse, 4, 3);
364 363
 							if ($speed != '...') {
365 364
 								$result['speed'] = intval($speed);
366 365
 							}
367
-							$body_parse = substr($body_parse,7);
366
+							$body_parse = substr($body_parse, 7);
368 367
 						}
369 368
 						// Check PHGR, PHG, RNG
370 369
 					} 
@@ -374,11 +373,11 @@  discard block
 block discarded – undo
374 373
 					}
375 374
 					*/
376 375
 					if (strlen($body_parse) > 0) {
377
-						if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
376
+						if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/', $body_parse, $matches)) {
378 377
 							$altitude = intval($matches[1]);
379 378
 							$result['altitude'] = $altitude;
380 379
 							//$body_parse = trim(substr($body_parse,strlen($matches[0])));
381
-							$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
380
+							$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/', '', $body_parse));
382 381
 						}
383 382
 					}
384 383
 					// Telemetry
@@ -388,58 +387,58 @@  discard block
 block discarded – undo
388 387
 					}
389 388
 					*/
390 389
 					// DAO
391
-					if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
390
+					if (preg_match('/^!([0-9A-Z]{3})/', $body_parse, $matches)) {
392 391
 						$dao = $matches[1];
393
-						if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
392
+						if (preg_match('/^([A-Z])([0-9]{2})/', $dao)) {
394 393
 							$dao_split = str_split($dao);
395
-							$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
396
-							$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
394
+							$lat_off = (($dao_split[1]) - 48.0)*0.001/60.0;
395
+							$lon_off = (($dao_split[2]) - 48.0)*0.001/60.0;
397 396
 							if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
398 397
 							else $result['latitude'] += $lat_off;
399 398
 							if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
400 399
 							else $result['longitude'] += $lon_off;
401 400
 						}
402
-						$body_parse = substr($body_parse,6);
401
+						$body_parse = substr($body_parse, 6);
403 402
 					}
404
-					if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
405
-						$result['ident'] = str_replace('_',' ',$matches[1]);
403
+					if (preg_match('/CS=([0-9A-Z_]*)/', $body_parse, $matches)) {
404
+						$result['ident'] = str_replace('_', ' ', $matches[1]);
406 405
 					}
407
-					if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
406
+					if (preg_match('/SQ=([0-9]{4})/', $body_parse, $matches)) {
408 407
 						$result['squawk'] = $matches[1];
409 408
 					}
410
-					if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
409
+					if (preg_match('/AI=([0-9A-Z]{4})/', $body_parse, $matches)) {
411 410
 						$result['aircraft_icao'] = $matches[1];
412 411
 					}
413
-					if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) {
412
+					if (preg_match('/VR=([0-9]*)/', $body_parse, $matches)) {
414 413
 						$result['verticalrate'] = $matches[1];
415 414
 					}
416
-					if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
415
+					if (preg_match('/TI=([0-9]*)/', $body_parse, $matches)) {
417 416
 						$result['typeid'] = $matches[1];
418 417
 					}
419
-					if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
418
+					if (preg_match('/SI=([0-9]*)/', $body_parse, $matches)) {
420 419
 						$result['statusid'] = $matches[1];
421 420
 					}
422
-					if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
421
+					if (preg_match('/IMO=([0-9]{7})/', $body_parse, $matches)) {
423 422
 						$result['imo'] = $matches[1];
424 423
 					}
425
-					if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
424
+					if (preg_match('/AD=([0-9]*)/', $body_parse, $matches)) {
426 425
 						$result['arrival_date'] = $matches[1];
427 426
 					}
428
-					if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
429
-						$result['arrival_code'] = str_replace('_',' ',$matches[1]);
427
+					if (preg_match('/AC=([0-9A-Z_]*)/', $body_parse, $matches)) {
428
+						$result['arrival_code'] = str_replace('_', ' ', $matches[1]);
430 429
 					}
431 430
 					// OGN comment
432 431
 					//if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
433
-					if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
432
+					if (preg_match('/^id([0-9A-F]{8})/', $body_parse, $matches)) {
434 433
 						$id = $matches[1];
435 434
 						//$mode = substr($id,0,2);
436
-						$address = substr($id,2);
437
-						$addressType = (intval(substr($id,0,2),16))&3;
435
+						$address = substr($id, 2);
436
+						$addressType = (intval(substr($id, 0, 2), 16))&3;
438 437
 						if ($addressType == 0) $result['addresstype'] = "RANDOM";
439 438
 						elseif ($addressType == 1) $result['addresstype'] = "ICAO";
440 439
 						elseif ($addressType == 2) $result['addresstype'] = "FLARM";
441 440
 						elseif ($addressType == 3) $result['addresstype'] = "OGN";
442
-						$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
441
+						$aircraftType = $this->urshift(((intval(substr($id, 0, 2), 16))&0b1111100), 2);
443 442
 						$result['aircrafttype_code'] = $aircraftType;
444 443
 						if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
445 444
 						elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
@@ -456,110 +455,110 @@  discard block
 block discarded – undo
456 455
 						elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
457 456
 						elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
458 457
 						elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
459
-						$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
458
+						$stealth = (intval(substr($id, 0, 2), 16)&0b10000000) != 0;
460 459
 						$result['stealth'] = $stealth;
461 460
 						$result['address'] = $address;
462 461
 					}
463 462
 					//Comment
464 463
 					$result['comment'] = trim($body_parse);
465 464
 					// parse weather
466
-					if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
465
+					if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
467 466
 						$result['wind_dir'] = intval($matches[1]);
468
-						$result['wind_speed'] = round(intval($matches[2])*1.60934,1);
469
-						$result['wind_gust'] = round(intval($matches[3])*1.60934,1);
470
-						$result['temp'] = round(5/9*((intval($matches[4]))-32),1);
471
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
472
-					} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
467
+						$result['wind_speed'] = round(intval($matches[2])*1.60934, 1);
468
+						$result['wind_gust'] = round(intval($matches[3])*1.60934, 1);
469
+						$result['temp'] = round(5/9*((intval($matches[4])) - 32), 1);
470
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
471
+					} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
473 472
 						$result['wind_dir'] = intval($matches[1]);
474
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
475
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
476
-						$result['temp'] = round(5/9*(($matches[4])-32),1);
477
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
478
-					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
473
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
474
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
475
+						$result['temp'] = round(5/9*(($matches[4]) - 32), 1);
476
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
477
+					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
479 478
 						$result['wind_dir'] = intval($matches[1]);
480
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
481
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
482
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
483
-					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
479
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
480
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
481
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
482
+					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/', $body_parse, $matches)) {
484 483
 						$result['wind_dir'] = intval($matches[1]);
485
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
486
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
487
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
484
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
485
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
486
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
488 487
 					}
489 488
 					// temperature
490 489
 					//g012t088r000p000P000h38b10110
491 490
 					//g011t086r000p000P000h29b10198
492
-					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)) {
493
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
494
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
495
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
496
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
497
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
491
+					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)) {
492
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
493
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
494
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
495
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
496
+						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
498 497
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
499
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
500
-						$body_parse = substr($body_parse,strlen($matches[0]));
501
-					} 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)) {
502
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
503
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
504
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
505
-						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
506
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
498
+						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
499
+						$body_parse = substr($body_parse, strlen($matches[0]));
500
+					} 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)) {
501
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
502
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
503
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
504
+						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1, 1);
505
+						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
507 506
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
508
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
509
-						$body_parse = substr($body_parse,strlen($matches[0]));
510
-					} 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)) {
511
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
512
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
513
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
514
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
515
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
507
+						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
508
+						$body_parse = substr($body_parse, strlen($matches[0]));
509
+					} 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)) {
510
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
511
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
512
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
513
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
514
+						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
516 515
 						if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
517
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
518
-						$body_parse = substr($body_parse,strlen($matches[0]));
519
-					} 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)) {
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['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
516
+						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
517
+						$body_parse = substr($body_parse, strlen($matches[0]));
518
+					} 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)) {
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['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
524 523
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
525
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/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})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$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[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
524
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
525
+						$body_parse = substr($body_parse, strlen($matches[0]));
526
+					} 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)) {
527
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
528
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
529
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
530
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
532 531
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
533
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
534
-						$body_parse = substr($body_parse,strlen($matches[0]));
535
-					} 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)) {
536
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
537
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
538
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
539
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
532
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
533
+						$body_parse = substr($body_parse, strlen($matches[0]));
534
+					} 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)) {
535
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
536
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
537
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
538
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
540 539
 						if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
541
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
542
-						$body_parse = substr($body_parse,strlen($matches[0]));
543
-					} 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)) {
544
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
545
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
540
+						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
541
+						$body_parse = substr($body_parse, strlen($matches[0]));
542
+					} 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)) {
543
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
544
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
546 545
 						if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
547
-						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
548
-						$body_parse = substr($body_parse,strlen($matches[0]));
549
-					} 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)) {
550
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
551
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
552
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
546
+						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10), 1);
547
+						$body_parse = substr($body_parse, strlen($matches[0]));
548
+					} 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)) {
549
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
550
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
551
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
553 552
 						if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
554
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
555
-						$body_parse = substr($body_parse,strlen($matches[0]));
553
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
554
+						$body_parse = substr($body_parse, strlen($matches[0]));
556 555
 					}
557 556
 					$result['comment'] = trim($body_parse);
558 557
 				}
559 558
 			} else $result['comment'] = trim($body_parse);
560 559
 		}
561
-		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
562
-		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
560
+		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'], 4);
561
+		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'], 4);
563 562
 		if ($debug) print_r($result);
564 563
 		return $result;
565 564
 	}
@@ -568,34 +567,34 @@  discard block
 block discarded – undo
568 567
 	 * Connect to APRS server
569 568
 	*/
570 569
 	public function connect() {
571
-		global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
570
+		global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass, $globalName, $globalServerAPRShost, $globalServerAPRSport;
572 571
 		$aprs_connect = 0;
573 572
 		$aprs_keep = 120;
574 573
 		$aprs_last_tx = time();
575 574
 		if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
576
-		else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
575
+		else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
577 576
 		if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
578
-		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
577
+		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
579 578
 		if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
580 579
 		else $aprs_pass = '-1';
581
-		$aprs_filter  = '';
580
+		$aprs_filter = '';
582 581
 		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
583 582
 		$Common = new Common();
584
-		$s = $Common->create_socket($globalServerAPRShost,$globalServerAPRSport,$errno,$errstr);
583
+		$s = $Common->create_socket($globalServerAPRShost, $globalServerAPRSport, $errno, $errstr);
585 584
 		if ($s !== false) {
586 585
 			echo 'Connected to APRS server! '."\n";
587 586
 			$authstart = time();
588 587
 			$this->socket = $s;
589
-			$send = socket_send( $this->socket  , $aprs_login , strlen($aprs_login) , 0 );
590
-			socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1);
591
-			while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
588
+			$send = socket_send($this->socket, $aprs_login, strlen($aprs_login), 0);
589
+			socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE, 1);
590
+			while ($msgin = socket_read($this->socket, 1000, PHP_NORMAL_READ)) {
592 591
 				if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
593 592
 					echo 'APRS user verified !'."\n";
594 593
 					$this->connected = true;
595 594
 					return true;
596 595
 					break;
597 596
 				}
598
-				if (time()-$authstart > 5) {
597
+				if (time() - $authstart > 5) {
599 598
 					echo 'APRS timeout'."\n";
600 599
 					break;
601 600
 				}
@@ -617,7 +616,7 @@  discard block
 block discarded – undo
617 616
 	public function send($data) {
618 617
 		global $globalDebug;
619 618
 		if ($this->connected === false) $this->connect();
620
-		$send = socket_send( $this->socket  , $data , strlen($data),0);
619
+		$send = socket_send($this->socket, $data, strlen($data), 0);
621 620
 		if ($send === FALSE) {
622 621
 			if ($globalDebug) echo 'Reconnect...';
623 622
 			socket_close($this->socket);
@@ -627,17 +626,17 @@  discard block
 block discarded – undo
627 626
 }
628 627
 
629 628
 class APRSSpotter extends APRS {
630
-	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) {
629
+	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) {
631 630
 		$Common = new Common();
632 631
 		date_default_timezone_set('UTC');
633 632
 		if ($latitude != '' && $longitude != '') {
634 633
 			$lat = $latitude;
635 634
 			$long = $longitude;
636
-			$latitude = $Common->convertDM($latitude,'latitude');
637
-			$longitude = $Common->convertDM($longitude,'longitude');
638
-			$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'];
639
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
640
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
635
+			$latitude = $Common->convertDM($latitude, 'latitude');
636
+			$longitude = $Common->convertDM($longitude, 'longitude');
637
+			$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'];
638
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
639
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
641 640
 			$w = $w1.$w2;
642 641
 			//$w = '00';
643 642
 			$custom = '';
@@ -664,26 +663,26 @@  discard block
 block discarded – undo
664 663
 			$geoid= round($GeoidClass->get($lat,$long)*3.28084,2);
665 664
 			$altitude_real = round($altitude_real + $geoid);
666 665
 			*/
667
-			$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");
666
+			$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");
668 667
 		}
669 668
 	}
670 669
 }
671 670
 class APRSMarine extends APRS {
672
-	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) {
671
+	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) {
673 672
 		$Common = new Common();
674 673
 		date_default_timezone_set('UTC');
675 674
 		if ($latitude != '' && $longitude != '') {
676
-			$latitude = $Common->convertDM($latitude,'latitude');
677
-			$longitude = $Common->convertDM($longitude,'longitude');
678
-			$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'];
679
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
680
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
675
+			$latitude = $Common->convertDM($latitude, 'latitude');
676
+			$longitude = $Common->convertDM($longitude, 'longitude');
677
+			$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'];
678
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
679
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
681 680
 			$w = $w1.$w2;
682 681
 			//$w = '00';
683 682
 			$custom = '';
684 683
 			if ($ident != '') {
685 684
 				if ($custom != '') $custom .= '/';
686
-				$custom .= 'CS='.str_replace(' ','_',$ident);
685
+				$custom .= 'CS='.str_replace(' ', '_', $ident);
687 686
 			}
688 687
 			if ($typeid != '') {
689 688
 				if ($custom != '') $custom .= '/';
@@ -703,11 +702,11 @@  discard block
 block discarded – undo
703 702
 			}
704 703
 			if ($arrival_code != '') {
705 704
 				if ($custom != '') $custom .= '/';
706
-				$custom .= 'AC='.str_replace(' ','_',$arrival_code);
705
+				$custom .= 'AC='.str_replace(' ', '_', $arrival_code);
707 706
 			}
708 707
 			if ($custom != '') $custom = ' '.$custom;
709 708
 			$altitude = 0;
710
-			$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");
709
+			$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");
711 710
 		}
712 711
 	}
713 712
 }
Please login to merge, or discard this patch.
Braces   +307 added lines, -110 removed lines patch added patch discarded remove patch
@@ -196,16 +196,22 @@  discard block
 block discarded – undo
196 196
 		
197 197
 		/* Check that end was found and body has at least one byte. */
198 198
 		if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
199
-			if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
199
+			if ($globalDebug) {
200
+				echo '!!! APRS invalid : '.$input."\n";
201
+			}
200 202
 			return false;
201 203
 		}
202 204
 		
203
-		if ($debug) echo 'input : '.$input."\n";
205
+		if ($debug) {
206
+			echo 'input : '.$input."\n";
207
+		}
204 208
 		/* Save header and body. */
205 209
 		$body = substr($input,$splitpos+1,$input_len);
206 210
 		$body_len = strlen($body);
207 211
 		$header = substr($input,0,$splitpos);
208
-		if ($debug) echo 'header : '.$header."\n";
212
+		if ($debug) {
213
+			echo 'header : '.$header."\n";
214
+		}
209 215
 		
210 216
 		/* Parse source, target and path. */
211 217
 		//FLRDF0A52>APRS,qAS,LSTB
@@ -219,11 +225,15 @@  discard block
 block discarded – undo
219 225
 				$result['format_source'] = 'famaprs';
220 226
 				$result['source_type'] = 'ais';
221 227
 			} else {
222
-				if ($debug) echo 'ident : '.$ident."\n";
228
+				if ($debug) {
229
+					echo 'ident : '.$ident."\n";
230
+				}
223 231
 				$result['ident'] = $ident;
224 232
 			}
225 233
 		} else {
226
-			if ($debug) 'No ident'."\n";
234
+			if ($debug) {
235
+				'No ident'."\n";
236
+			}
227 237
 			return false;
228 238
 		}
229 239
 		$elements = explode(',',$all_elements);
@@ -233,7 +243,9 @@  discard block
 block discarded – undo
233 243
 			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
234 244
 			//if ($element == 'TCPIP*') return false;
235 245
 			} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
236
-				if ($debug) echo 'element : '.$element."\n";
246
+				if ($debug) {
247
+					echo 'element : '.$element."\n";
248
+				}
237 249
 				return false;
238 250
 			}
239 251
 			/*
@@ -246,13 +258,17 @@  discard block
 block discarded – undo
246 258
 		}
247 259
 		
248 260
 		$type = substr($body,0,1);
249
-		if ($debug) echo 'type : '.$type."\n";
261
+		if ($debug) {
262
+			echo 'type : '.$type."\n";
263
+		}
250 264
 		if ($type == ';') {
251 265
 			if (isset($result['source_type']) && $result['source_type'] == 'modes') {
252 266
 				$result['address'] = trim(substr($body,1,9));
253 267
 			} elseif (isset($result['source_type']) && $result['source_type'] == 'ais') {
254 268
 				$result['mmsi'] = trim(substr($body,1,9));
255
-			} else $result['ident'] = trim(substr($body,1,9));
269
+			} else {
270
+				$result['ident'] = trim(substr($body,1,9));
271
+			}
256 272
 		} elseif ($type == ',') {
257 273
 			// Invalid data or test data
258 274
 			return false;
@@ -309,7 +325,9 @@  discard block
 block discarded – undo
309 325
 			//$symbol_table = $matches[4];
310 326
 			$lat = intval($lat_deg);
311 327
 			$lon = intval($lon_deg);
312
-			if ($lat > 89 || $lon > 179) return false;
328
+			if ($lat > 89 || $lon > 179) {
329
+				return false;
330
+			}
313 331
 			/*
314 332
 			    $tmp_5b = str_replace('.','',$lat_min);
315 333
 			    if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) {
@@ -318,8 +336,12 @@  discard block
 block discarded – undo
318 336
 			    */
319 337
 			$latitude = $lat + floatval($lat_min)/60;
320 338
 			$longitude = $lon + floatval($lon_min)/60;
321
-			if ($sind == 'S') $latitude = 0-$latitude;
322
-			if ($wind == 'W') $longitude = 0-$longitude;
339
+			if ($sind == 'S') {
340
+				$latitude = 0-$latitude;
341
+			}
342
+			if ($wind == 'W') {
343
+				$longitude = 0-$longitude;
344
+			}
323 345
 			$result['latitude'] = $latitude;
324 346
 			$result['longitude'] = $longitude;
325 347
 			$body_parse = substr($body_parse,18);
@@ -344,22 +366,29 @@  discard block
 block discarded – undo
344 366
 			if ($find) {
345 367
 				$body_split = str_split($body_parse);
346 368
 				$symbol_code = $body_split[0];
347
-				if (!isset($symbolll) || $symbolll == '/') $symbol_code = '/'.$symbol_code;
348
-				else $symbol_code = '\\'.$symbol_code;
369
+				if (!isset($symbolll) || $symbolll == '/') {
370
+					$symbol_code = '/'.$symbol_code;
371
+				} else {
372
+					$symbol_code = '\\'.$symbol_code;
373
+				}
349 374
 				//'
350 375
 				//if ($type != ';' && $type != '>') {
351 376
 				if ($type != '') {
352 377
 					$body_parse = substr($body_parse,1);
353 378
 					$body_parse_len = strlen($body_parse);
354 379
 					$result['symbol_code'] = $symbol_code;
355
-					if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
380
+					if (isset($this->symbols[$symbol_code])) {
381
+						$result['symbol'] = $this->symbols[$symbol_code];
382
+					}
356 383
 					if ($symbol_code != '_') {
357 384
 					}
358 385
 					if ($body_parse_len >= 7) {
359 386
 						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
360 387
 							$course = substr($body_parse,0,3);
361 388
 							$tmp_s = intval($course);
362
-							if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
389
+							if ($tmp_s >= 1 && $tmp_s <= 360) {
390
+								$result['heading'] = intval($course);
391
+							}
363 392
 							$speed = substr($body_parse,4,3);
364 393
 							if ($speed != '...') {
365 394
 								$result['speed'] = intval($speed);
@@ -394,10 +423,16 @@  discard block
 block discarded – undo
394 423
 							$dao_split = str_split($dao);
395 424
 							$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
396 425
 							$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
397
-							if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
398
-							else $result['latitude'] += $lat_off;
399
-							if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
400
-							else $result['longitude'] += $lon_off;
426
+							if ($result['latitude'] < 0) {
427
+								$result['latitude'] -= $lat_off;
428
+							} else {
429
+								$result['latitude'] += $lat_off;
430
+							}
431
+							if ($result['longitude'] < 0) {
432
+								$result['longitude'] -= $lon_off;
433
+							} else {
434
+								$result['longitude'] += $lon_off;
435
+							}
401 436
 						}
402 437
 						$body_parse = substr($body_parse,6);
403 438
 					}
@@ -435,27 +470,48 @@  discard block
 block discarded – undo
435 470
 						//$mode = substr($id,0,2);
436 471
 						$address = substr($id,2);
437 472
 						$addressType = (intval(substr($id,0,2),16))&3;
438
-						if ($addressType == 0) $result['addresstype'] = "RANDOM";
439
-						elseif ($addressType == 1) $result['addresstype'] = "ICAO";
440
-						elseif ($addressType == 2) $result['addresstype'] = "FLARM";
441
-						elseif ($addressType == 3) $result['addresstype'] = "OGN";
473
+						if ($addressType == 0) {
474
+							$result['addresstype'] = "RANDOM";
475
+						} elseif ($addressType == 1) {
476
+							$result['addresstype'] = "ICAO";
477
+						} elseif ($addressType == 2) {
478
+							$result['addresstype'] = "FLARM";
479
+						} elseif ($addressType == 3) {
480
+							$result['addresstype'] = "OGN";
481
+						}
442 482
 						$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
443 483
 						$result['aircrafttype_code'] = $aircraftType;
444
-						if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
445
-						elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
446
-						elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE";
447
-						elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
448
-						elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE";
449
-						elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE";
450
-						elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER";
451
-						elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER";
452
-						elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT";
453
-						elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT";
454
-						elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO";
455
-						elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON";
456
-						elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
457
-						elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
458
-						elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
484
+						if ($aircraftType == 0) {
485
+							$result['aircrafttype'] = "UNKNOWN";
486
+						} elseif ($aircraftType == 1) {
487
+							$result['aircrafttype'] = "GLIDER";
488
+						} elseif ($aircraftType == 2) {
489
+							$result['aircrafttype'] = "TOW_PLANE";
490
+						} elseif ($aircraftType == 3) {
491
+							$result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
492
+						} elseif ($aircraftType == 4) {
493
+							$result['aircrafttype'] = "PARACHUTE";
494
+						} elseif ($aircraftType == 5) {
495
+							$result['aircrafttype'] = "DROP_PLANE";
496
+						} elseif ($aircraftType == 6) {
497
+							$result['aircrafttype'] = "HANG_GLIDER";
498
+						} elseif ($aircraftType == 7) {
499
+							$result['aircrafttype'] = "PARA_GLIDER";
500
+						} elseif ($aircraftType == 8) {
501
+							$result['aircrafttype'] = "POWERED_AIRCRAFT";
502
+						} elseif ($aircraftType == 9) {
503
+							$result['aircrafttype'] = "JET_AIRCRAFT";
504
+						} elseif ($aircraftType == 10) {
505
+							$result['aircrafttype'] = "UFO";
506
+						} elseif ($aircraftType == 11) {
507
+							$result['aircrafttype'] = "BALLOON";
508
+						} elseif ($aircraftType == 12) {
509
+							$result['aircrafttype'] = "AIRSHIP";
510
+						} elseif ($aircraftType == 13) {
511
+							$result['aircrafttype'] = "UAV";
512
+						} elseif ($aircraftType == 15) {
513
+							$result['aircrafttype'] = "STATIC_OBJECT";
514
+						}
459 515
 						$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
460 516
 						$result['stealth'] = $stealth;
461 517
 						$result['address'] = $address;
@@ -490,77 +546,181 @@  discard block
 block discarded – undo
490 546
 					//g012t088r000p000P000h38b10110
491 547
 					//g011t086r000p000P000h29b10198
492 548
 					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)) {
493
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
494
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
495
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
496
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
497
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
498
-						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
499
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
549
+						if ($matches[1] != '...') {
550
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
551
+						}
552
+						if ($matches[2] != '...') {
553
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
554
+						}
555
+						if ($matches[3] != '...') {
556
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
557
+						}
558
+						if ($matches[4] != '...') {
559
+							$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
560
+						}
561
+						if ($matches[5] != '...') {
562
+							$result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
563
+						}
564
+						if ($matches[6] != '...') {
565
+							$result['humidity'] = intval($matches[6]);
566
+						}
567
+						if ($matches[7] != '...') {
568
+							$result['pressure'] = round((intval($matches[7])/10),1);
569
+						}
500 570
 						$body_parse = substr($body_parse,strlen($matches[0]));
501 571
 					} 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)) {
502
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
503
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
504
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
505
-						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
506
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
507
-						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
508
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
572
+						if ($matches[1] != '...') {
573
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
574
+						}
575
+						if ($matches[2] != '...') {
576
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
577
+						}
578
+						if ($matches[3] != '...') {
579
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
580
+						}
581
+						if ($matches[5] != '...') {
582
+							$result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
583
+						}
584
+						if ($matches[4] != '...') {
585
+							$result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
586
+						}
587
+						if ($matches[6] != '...') {
588
+							$result['humidity'] = intval($matches[6]);
589
+						}
590
+						if ($matches[7] != '...') {
591
+							$result['pressure'] = round((intval($matches[7])/10),1);
592
+						}
509 593
 						$body_parse = substr($body_parse,strlen($matches[0]));
510 594
 					} 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)) {
511
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
512
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
513
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
514
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
515
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
516
-						if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
517
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
595
+						if ($matches[1] != '...') {
596
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
597
+						}
598
+						if ($matches[2] != '...') {
599
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
600
+						}
601
+						if ($matches[3] != '...') {
602
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
603
+						}
604
+						if ($matches[4] != '...') {
605
+							$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
606
+						}
607
+						if ($matches[5] != '...') {
608
+							$result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
609
+						}
610
+						if ($matches[7] != '...') {
611
+							$result['humidity'] = intval($matches[7]);
612
+						}
613
+						if ($matches[6] != '...') {
614
+							$result['pressure'] = round((intval($matches[6])/10),1);
615
+						}
518 616
 						$body_parse = substr($body_parse,strlen($matches[0]));
519 617
 					} 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)) {
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['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
524
-						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
525
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
618
+						if ($matches[1] != '...') {
619
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
620
+						}
621
+						if ($matches[2] != '...') {
622
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
623
+						}
624
+						if ($matches[3] != '...') {
625
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
626
+						}
627
+						if ($matches[4] != '...') {
628
+							$result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
629
+						}
630
+						if ($matches[6] != '...') {
631
+							$result['humidity'] = intval($matches[6]);
632
+						}
633
+						if ($matches[5] != '...') {
634
+							$result['pressure'] = round((intval($matches[5])/10),1);
635
+						}
526 636
 						$body_parse = substr($body_parse,strlen($matches[0]));
527 637
 					} 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)) {
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[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
532
-						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
533
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
638
+						if ($matches[1] != '...') {
639
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
640
+						}
641
+						if ($matches[2] != '...') {
642
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
643
+						}
644
+						if ($matches[3] != '...') {
645
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
646
+						}
647
+						if ($matches[4] != '...') {
648
+							$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
649
+						}
650
+						if ($matches[6] != '...') {
651
+							$result['humidity'] = intval($matches[6]);
652
+						}
653
+						if ($matches[5] != '...') {
654
+							$result['pressure'] = round((intval($matches[5])/10),1);
655
+						}
534 656
 						$body_parse = substr($body_parse,strlen($matches[0]));
535 657
 					} 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)) {
536
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
537
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
538
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
539
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
540
-						if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
541
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
658
+						if ($matches[1] != '...') {
659
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
660
+						}
661
+						if ($matches[2] != '...') {
662
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
663
+						}
664
+						if ($matches[3] != '...') {
665
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
666
+						}
667
+						if ($matches[4] != '...') {
668
+							$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
669
+						}
670
+						if ($matches[5] != '...') {
671
+							$result['humidity'] = intval($matches[5]);
672
+						}
673
+						if ($matches[6] != '...') {
674
+							$result['pressure'] = round((intval($matches[6])/10),1);
675
+						}
542 676
 						$body_parse = substr($body_parse,strlen($matches[0]));
543 677
 					} 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)) {
544
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
545
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
546
-						if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
547
-						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
678
+						if ($matches[1] != '...') {
679
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
680
+						}
681
+						if ($matches[2] != '...') {
682
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
683
+						}
684
+						if ($matches[2] != '...') {
685
+							$result['humidity'] = intval($matches[3]);
686
+						}
687
+						if ($matches[4] != '...') {
688
+							$result['pressure'] = round((intval($matches[4])/10),1);
689
+						}
548 690
 						$body_parse = substr($body_parse,strlen($matches[0]));
549 691
 					} 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)) {
550
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
551
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
552
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
553
-						if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
554
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
692
+						if ($matches[1] != '...') {
693
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
694
+						}
695
+						if ($matches[2] != '...') {
696
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
697
+						}
698
+						if ($matches[3] != '...') {
699
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
700
+						}
701
+						if ($matches[4] != '...') {
702
+							$result['humidity'] = intval($matches[4]);
703
+						}
704
+						if ($matches[5] != '...') {
705
+							$result['pressure'] = round((intval($matches[5])/10),1);
706
+						}
555 707
 						$body_parse = substr($body_parse,strlen($matches[0]));
556 708
 					}
557 709
 					$result['comment'] = trim($body_parse);
558 710
 				}
559
-			} else $result['comment'] = trim($body_parse);
711
+			} else {
712
+				$result['comment'] = trim($body_parse);
713
+			}
714
+		}
715
+		if (isset($result['latitude'])) {
716
+			$result['latitude'] = round($result['latitude'],4);
717
+		}
718
+		if (isset($result['longitude'])) {
719
+			$result['longitude'] = round($result['longitude'],4);
720
+		}
721
+		if ($debug) {
722
+			print_r($result);
560 723
 		}
561
-		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
562
-		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
563
-		if ($debug) print_r($result);
564 724
 		return $result;
565 725
 	}
566 726
 
@@ -572,12 +732,21 @@  discard block
 block discarded – undo
572 732
 		$aprs_connect = 0;
573 733
 		$aprs_keep = 120;
574 734
 		$aprs_last_tx = time();
575
-		if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
576
-		else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
577
-		if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
578
-		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
579
-		if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
580
-		else $aprs_pass = '-1';
735
+		if (isset($globalAPRSversion)) {
736
+			$aprs_version = $globalAPRSversion;
737
+		} else {
738
+			$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
739
+		}
740
+		if (isset($globalServerAPRSssid)) {
741
+			$aprs_ssid = $globalServerAPRSssid;
742
+		} else {
743
+			$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
744
+		}
745
+		if (isset($globalServerAPRSpass)) {
746
+			$aprs_pass = $globalServerAPRSpass;
747
+		} else {
748
+			$aprs_pass = '-1';
749
+		}
581 750
 		$aprs_filter  = '';
582 751
 		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
583 752
 		$Common = new Common();
@@ -616,10 +785,14 @@  discard block
 block discarded – undo
616 785
 	*/
617 786
 	public function send($data) {
618 787
 		global $globalDebug;
619
-		if ($this->connected === false) $this->connect();
788
+		if ($this->connected === false) {
789
+			$this->connect();
790
+		}
620 791
 		$send = socket_send( $this->socket  , $data , strlen($data),0);
621 792
 		if ($send === FALSE) {
622
-			if ($globalDebug) echo 'Reconnect...';
793
+			if ($globalDebug) {
794
+				echo 'Reconnect...';
795
+			}
623 796
 			socket_close($this->socket);
624 797
 			$this->connect();
625 798
 		}
@@ -642,22 +815,32 @@  discard block
 block discarded – undo
642 815
 			//$w = '00';
643 816
 			$custom = '';
644 817
 			if ($ident != '') {
645
-				if ($custom != '') $custom .= '/';
818
+				if ($custom != '') {
819
+					$custom .= '/';
820
+				}
646 821
 				$custom .= 'CS='.$ident;
647 822
 			}
648 823
 			if ($squawk != '') {
649
-				if ($custom != '') $custom .= '/';
824
+				if ($custom != '') {
825
+					$custom .= '/';
826
+				}
650 827
 				$custom .= 'SQ='.$squawk;
651 828
 			}
652 829
 			if ($verticalrate != '') {
653
-				if ($custom != '') $custom .= '/';
830
+				if ($custom != '') {
831
+					$custom .= '/';
832
+				}
654 833
 				$custom .= 'VR='.$verticalrate;
655 834
 			}
656 835
 			if ($aircraft_icao != '' && $aircraft_icao != 'NA') {
657
-				if ($custom != '') $custom .= '/';
836
+				if ($custom != '') {
837
+					$custom .= '/';
838
+				}
658 839
 				$custom .= 'AI='.$aircraft_icao;
659 840
 			}
660
-			if ($custom != '') $custom = ' '.$custom;
841
+			if ($custom != '') {
842
+				$custom = ' '.$custom;
843
+			}
661 844
 			/*
662 845
 			// Use AMSL altitude
663 846
 			$GeoidClass = new GeoidHeight();
@@ -682,30 +865,44 @@  discard block
 block discarded – undo
682 865
 			//$w = '00';
683 866
 			$custom = '';
684 867
 			if ($ident != '') {
685
-				if ($custom != '') $custom .= '/';
868
+				if ($custom != '') {
869
+					$custom .= '/';
870
+				}
686 871
 				$custom .= 'CS='.str_replace(' ','_',$ident);
687 872
 			}
688 873
 			if ($typeid != '') {
689
-				if ($custom != '') $custom .= '/';
874
+				if ($custom != '') {
875
+					$custom .= '/';
876
+				}
690 877
 				$custom .= 'TI='.$typeid;
691 878
 			}
692 879
 			if ($statusid != '') {
693
-				if ($custom != '') $custom .= '/';
880
+				if ($custom != '') {
881
+					$custom .= '/';
882
+				}
694 883
 				$custom .= 'SI='.$statusid;
695 884
 			}
696 885
 			if ($imo != '') {
697
-				if ($custom != '') $custom .= '/';
886
+				if ($custom != '') {
887
+					$custom .= '/';
888
+				}
698 889
 				$custom .= 'IMO='.$imo;
699 890
 			}
700 891
 			if ($arrival_date != '') {
701
-				if ($custom != '') $custom .= '/';
892
+				if ($custom != '') {
893
+					$custom .= '/';
894
+				}
702 895
 				$custom .= 'AD='.strtotime($arrival_date);
703 896
 			}
704 897
 			if ($arrival_code != '') {
705
-				if ($custom != '') $custom .= '/';
898
+				if ($custom != '') {
899
+					$custom .= '/';
900
+				}
706 901
 				$custom .= 'AC='.str_replace(' ','_',$arrival_code);
707 902
 			}
708
-			if ($custom != '') $custom = ' '.$custom;
903
+			if ($custom != '') {
904
+				$custom = ' '.$custom;
905
+			}
709 906
 			$altitude = 0;
710 907
 			$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");
711 908
 		}
Please login to merge, or discard this patch.
require/class.Connection.php 2 patches
Doc Comments   +20 added lines patch added patch discarded remove patch
@@ -6,6 +6,9 @@  discard block
 block discarded – undo
6 6
 	public $dbs = array();
7 7
 	public $latest_schema = 50;
8 8
 
9
+	/**
10
+	 * @param string $dbname
11
+	 */
9 12
 	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
10 13
 		global $globalNoDB;
11 14
 		if (isset($globalNoDB) && $globalNoDB === TRUE) {
@@ -142,6 +145,9 @@  discard block
 block discarded – undo
142 145
 		return true;
143 146
 	}
144 147
 
148
+	/**
149
+	 * @param string $table
150
+	 */
145 151
 	public function tableExists($table)
146 152
 	{
147 153
 		global $globalDBdriver, $globalDBname;
@@ -192,6 +198,11 @@  discard block
 block discarded – undo
192 198
 	/*
193 199
 	* Check if index exist
194 200
 	*/
201
+
202
+	/**
203
+	 * @param string $table
204
+	 * @param string $index
205
+	 */
195 206
 	public function indexExists($table,$index)
196 207
 	{
197 208
 		global $globalDBdriver, $globalDBname;
@@ -234,6 +245,10 @@  discard block
 block discarded – undo
234 245
 		return $columns;
235 246
 	}
236 247
 
248
+	/**
249
+	 * @param string $table
250
+	 * @param string $column
251
+	 */
237 252
 	public function getColumnType($table,$column) {
238 253
 		$select = $this->db->query('SELECT '.$column.' FROM '.$table);
239 254
 		$tomet = $select->getColumnMeta(0);
@@ -244,6 +259,11 @@  discard block
 block discarded – undo
244 259
 	* Check if a column name exist in a table
245 260
 	* @return Boolean column exist or not
246 261
 	*/
262
+
263
+	/**
264
+	 * @param string $table
265
+	 * @param string $name
266
+	 */
247 267
 	public function checkColumnName($table,$name)
248 268
 	{
249 269
 		global $globalDBdriver, $globalDBname;
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 require_once(dirname(__FILE__).'/settings.php');
3 3
 
4
-class Connection{
4
+class Connection {
5 5
 	public $db = null;
6 6
 	public $dbs = array();
7 7
 	public $latest_schema = 50;
8 8
 
9
-	public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) {
9
+	public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) {
10 10
 		global $globalNoDB;
11 11
 		if (isset($globalNoDB) && $globalNoDB === TRUE) {
12 12
 			$this->db = null;
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 					if ($user === null && $pass === null) {
17 17
 						$this->createDBConnection();
18 18
 					} else {
19
-						$this->createDBConnection(null,$user,$pass);
19
+						$this->createDBConnection(null, $user, $pass);
20 20
 					}
21 21
 				} else {
22 22
 					$this->createDBConnection($dbname);
@@ -100,14 +100,14 @@  discard block
 block discarded – undo
100 100
 		while (true) {
101 101
 			try {
102 102
 				if ($globalDBSdriver == 'mysql') {
103
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser,  $globalDBSpass);
103
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass);
104 104
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
105 105
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
106
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
107
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500);
108
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
109
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
110
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
106
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
107
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500);
108
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
109
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
110
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
111 111
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
112 112
 					$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
113 113
 					// Workaround against "ONLY_FULL_GROUP_BY" mode
@@ -117,19 +117,19 @@  discard block
 block discarded – undo
117 117
 					$this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"');
118 118
 					//$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"');
119 119
 				} else {
120
-					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser,  $globalDBSpass);
120
+					$this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass);
121 121
 					//$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'");
122 122
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
123
-					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER);
124
-					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200);
125
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut);
126
-					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true);
127
-					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent);
123
+					$this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
124
+					if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200);
125
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut);
126
+					if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true);
127
+					else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent);
128 128
 					$this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
129 129
 					$this->dbs[$DBname]->exec('SET timezone="UTC"');
130 130
 				}
131 131
 				break;
132
-			} catch(PDOException $e) {
132
+			} catch (PDOException $e) {
133 133
 				$i++;
134 134
 				if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n";
135 135
 				//exit;
@@ -154,10 +154,10 @@  discard block
 block discarded – undo
154 154
 		try {
155 155
 			//$Connection = new Connection();
156 156
 			$results = $this->db->query($query);
157
-		} catch(PDOException $e) {
157
+		} catch (PDOException $e) {
158 158
 			return false;
159 159
 		}
160
-		if($results->rowCount()>0) {
160
+		if ($results->rowCount() > 0) {
161 161
 		    return true; 
162 162
 		}
163 163
 		else return false;
@@ -179,8 +179,8 @@  discard block
 block discarded – undo
179 179
 			     return false;
180 180
 			}
181 181
 			
182
-		} catch(PDOException $e) {
183
-			if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
182
+		} catch (PDOException $e) {
183
+			if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) {
184 184
             			throw $e;
185 185
 	                }
186 186
 	                //echo 'error ! '.$e->getMessage();
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 	/*
193 193
 	* Check if index exist
194 194
 	*/
195
-	public function indexExists($table,$index)
195
+	public function indexExists($table, $index)
196 196
 	{
197 197
 		global $globalDBdriver, $globalDBname;
198 198
 		if ($globalDBdriver == 'mysql') {
@@ -203,11 +203,11 @@  discard block
 block discarded – undo
203 203
 		try {
204 204
 			//$Connection = new Connection();
205 205
 			$results = $this->db->query($query);
206
-		} catch(PDOException $e) {
206
+		} catch (PDOException $e) {
207 207
 			return false;
208 208
 		}
209 209
 		$nb = $results->fetchAll(PDO::FETCH_ASSOC);
210
-		if($nb[0]['nb'] > 0) {
210
+		if ($nb[0]['nb'] > 0) {
211 211
 			return true; 
212 212
 		}
213 213
 		else return false;
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 		$query = "SELECT * FROM ".$table." LIMIT 0";
223 223
 		try {
224 224
 			$results = $this->db->query($query);
225
-		} catch(PDOException $e) {
225
+		} catch (PDOException $e) {
226 226
 			return "error : ".$e->getMessage()."\n";
227 227
 		}
228 228
 		$columns = array();
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 		return $columns;
235 235
 	}
236 236
 
237
-	public function getColumnType($table,$column) {
237
+	public function getColumnType($table, $column) {
238 238
 		$select = $this->db->query('SELECT '.$column.' FROM '.$table);
239 239
 		$tomet = $select->getColumnMeta(0);
240 240
 		return $tomet['native_type'];
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 	* Check if a column name exist in a table
245 245
 	* @return Boolean column exist or not
246 246
 	*/
247
-	public function checkColumnName($table,$name)
247
+	public function checkColumnName($table, $name)
248 248
 	{
249 249
 		global $globalDBdriver, $globalDBname;
250 250
 		if ($globalDBdriver == 'mysql') {
@@ -254,8 +254,8 @@  discard block
 block discarded – undo
254 254
 		}
255 255
 			try {
256 256
 				$sth = $this->db()->prepare($query);
257
-				$sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name));
258
-			} catch(PDOException $e) {
257
+				$sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name));
258
+			} catch (PDOException $e) {
259 259
 				echo "error : ".$e->getMessage()."\n";
260 260
 			}
261 261
 			$result = $sth->fetch(PDO::FETCH_ASSOC);
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 				try {
295 295
 					$sth = $this->db->prepare($query);
296 296
 					$sth->execute();
297
-				} catch(PDOException $e) {
297
+				} catch (PDOException $e) {
298 298
 					return "error : ".$e->getMessage()."\n";
299 299
 				}
300 300
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
Please login to merge, or discard this patch.
require/class.SBS.php 4 patches
Doc Comments   +8 added lines patch added patch discarded remove patch
@@ -190,12 +190,20 @@
 block discarded – undo
190 190
 		return 1;
191 191
 	}
192 192
 
193
+	/**
194
+	 * @param double $lat
195
+	 * @param integer $isodd
196
+	 */
193 197
 	private function cprN($lat,$isodd) {
194 198
 		$nl = $this->cprNL($lat) - $isodd;
195 199
 		if ($nl > 1) return $nl;
196 200
 		else return 1;
197 201
 	}
198 202
 
203
+	/**
204
+	 * @param string $msg
205
+	 * @param string $bin
206
+	 */
199 207
 	private function parityCheck($msg, $bin) {
200 208
 		$modes_checksum_table = array(
201 209
 		    0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,
Please login to merge, or discard this patch.
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -198,20 +198,20 @@
 block discarded – undo
198 198
 
199 199
 	private function parityCheck($msg, $bin) {
200 200
 		$modes_checksum_table = array(
201
-		    0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,
202
-		    0x2c38bc, 0x161c5e, 0x0b0e2f, 0xfa7d13, 0x82c48d, 0xbe9842, 0x5f4c21, 0xd05c14,
203
-		    0x682e0a, 0x341705, 0xe5f186, 0x72f8c3, 0xc68665, 0x9cb936, 0x4e5c9b, 0xd8d449,
204
-		    0x939020, 0x49c810, 0x24e408, 0x127204, 0x093902, 0x049c81, 0xfdb444, 0x7eda22,
205
-		    0x3f6d11, 0xe04c8c, 0x702646, 0x381323, 0xe3f395, 0x8e03ce, 0x4701e7, 0xdc7af7,
206
-		    0x91c77f, 0xb719bb, 0xa476d9, 0xadc168, 0x56e0b4, 0x2b705a, 0x15b82d, 0xf52612,
207
-		    0x7a9309, 0xc2b380, 0x6159c0, 0x30ace0, 0x185670, 0x0c2b38, 0x06159c, 0x030ace,
208
-		    0x018567, 0xff38b7, 0x80665f, 0xbfc92b, 0xa01e91, 0xaff54c, 0x57faa6, 0x2bfd53,
209
-		    0xea04ad, 0x8af852, 0x457c29, 0xdd4410, 0x6ea208, 0x375104, 0x1ba882, 0x0dd441,
210
-		    0xf91024, 0x7c8812, 0x3e4409, 0xe0d800, 0x706c00, 0x383600, 0x1c1b00, 0x0e0d80,
211
-		    0x0706c0, 0x038360, 0x01c1b0, 0x00e0d8, 0x00706c, 0x003836, 0x001c1b, 0xfff409,
212
-		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
213
-		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
214
-		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000
201
+			0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,
202
+			0x2c38bc, 0x161c5e, 0x0b0e2f, 0xfa7d13, 0x82c48d, 0xbe9842, 0x5f4c21, 0xd05c14,
203
+			0x682e0a, 0x341705, 0xe5f186, 0x72f8c3, 0xc68665, 0x9cb936, 0x4e5c9b, 0xd8d449,
204
+			0x939020, 0x49c810, 0x24e408, 0x127204, 0x093902, 0x049c81, 0xfdb444, 0x7eda22,
205
+			0x3f6d11, 0xe04c8c, 0x702646, 0x381323, 0xe3f395, 0x8e03ce, 0x4701e7, 0xdc7af7,
206
+			0x91c77f, 0xb719bb, 0xa476d9, 0xadc168, 0x56e0b4, 0x2b705a, 0x15b82d, 0xf52612,
207
+			0x7a9309, 0xc2b380, 0x6159c0, 0x30ace0, 0x185670, 0x0c2b38, 0x06159c, 0x030ace,
208
+			0x018567, 0xff38b7, 0x80665f, 0xbfc92b, 0xa01e91, 0xaff54c, 0x57faa6, 0x2bfd53,
209
+			0xea04ad, 0x8af852, 0x457c29, 0xdd4410, 0x6ea208, 0x375104, 0x1ba882, 0x0dd441,
210
+			0xf91024, 0x7c8812, 0x3e4409, 0xe0d800, 0x706c00, 0x383600, 0x1c1b00, 0x0e0d80,
211
+			0x0706c0, 0x038360, 0x01c1b0, 0x00e0d8, 0x00706c, 0x003836, 0x001c1b, 0xfff409,
212
+			0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
213
+			0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
214
+			0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000
215 215
 		);
216 216
 		$crc = 0;
217 217
 		$checksum = intval(substr($msg,22,6),16);
Please login to merge, or discard this patch.
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -18,82 +18,82 @@  discard block
 block discarded – undo
18 18
 	public function parse($buffer) {
19 19
 		// Not yet finished, no CRC checks
20 20
 		$data = array();
21
-		$typehex = substr($buffer,0,1);
22
-		if ($typehex == '*' || $typehex == ':') $hex = substr($buffer,1,-1);
23
-		elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-13);
24
-		else $hex = substr($buffer,1,-1);
25
-		$bin = gmp_strval( gmp_init($hex,16), 2);
21
+		$typehex = substr($buffer, 0, 1);
22
+		if ($typehex == '*' || $typehex == ':') $hex = substr($buffer, 1, -1);
23
+		elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer, 13, -13);
24
+		else $hex = substr($buffer, 1, -1);
25
+		$bin = gmp_strval(gmp_init($hex, 16), 2);
26 26
 		//if (strlen($hex) == 28 && $this->parityCheck($hex,$bin)) {
27 27
 		if (strlen($hex) == 28) {
28
-			$df = intval(substr($bin,0,5),2);
28
+			$df = intval(substr($bin, 0, 5), 2);
29 29
 			//$ca = intval(substr($bin,5,3),2);
30 30
 			// Only support DF17 for now
31 31
 			//if ($df == 17 || ($df == 18 && ($ca == 0 || $ca == 1 || $ca == 6))) {
32
-			if (($df == 17 || $df == 18) && ($this->parityCheck($hex,$bin) || $typehex == '@')) {
33
-				$icao = substr($hex,2,6);
32
+			if (($df == 17 || $df == 18) && ($this->parityCheck($hex, $bin) || $typehex == '@')) {
33
+				$icao = substr($hex, 2, 6);
34 34
 				$data['hex'] = $icao;
35
-				$tc = intval(substr($bin,32,5),2);
35
+				$tc = intval(substr($bin, 32, 5), 2);
36 36
 				if ($tc >= 1 && $tc <= 4) {
37 37
 					//callsign
38
-					$csbin = substr($bin,40,56);
38
+					$csbin = substr($bin, 40, 56);
39 39
 					$charset = str_split('#ABCDEFGHIJKLMNOPQRSTUVWXYZ#####_###############0123456789######');
40 40
 					$cs = '';
41
-					$cs .= $charset[intval(substr($csbin,0,6),2)];
42
-					$cs .= $charset[intval(substr($csbin,6,6),2)];
43
-					$cs .= $charset[intval(substr($csbin,12,6),2)];
44
-					$cs .= $charset[intval(substr($csbin,18,6),2)];
45
-					$cs .= $charset[intval(substr($csbin,24,6),2)];
46
-					$cs .= $charset[intval(substr($csbin,30,6),2)];
47
-					$cs .= $charset[intval(substr($csbin,36,6),2)];
48
-					$cs .= $charset[intval(substr($csbin,42,6),2)];
49
-					$cs = str_replace('_','',$cs);
50
-					$cs = str_replace('#','',$cs);
41
+					$cs .= $charset[intval(substr($csbin, 0, 6), 2)];
42
+					$cs .= $charset[intval(substr($csbin, 6, 6), 2)];
43
+					$cs .= $charset[intval(substr($csbin, 12, 6), 2)];
44
+					$cs .= $charset[intval(substr($csbin, 18, 6), 2)];
45
+					$cs .= $charset[intval(substr($csbin, 24, 6), 2)];
46
+					$cs .= $charset[intval(substr($csbin, 30, 6), 2)];
47
+					$cs .= $charset[intval(substr($csbin, 36, 6), 2)];
48
+					$cs .= $charset[intval(substr($csbin, 42, 6), 2)];
49
+					$cs = str_replace('_', '', $cs);
50
+					$cs = str_replace('#', '', $cs);
51 51
 					$callsign = $cs;
52 52
 					$data['ident'] = $callsign;
53 53
 				} elseif ($tc >= 9 && $tc <= 18) {
54 54
 					// Check Q-bit
55
-					$q = substr($bin,47,1);
55
+					$q = substr($bin, 47, 1);
56 56
 					if ($q) {
57
-						$n = intval(substr($bin,40,7).substr($bin,48,4),2);
58
-						$alt = $n*25-1000;
57
+						$n = intval(substr($bin, 40, 7).substr($bin, 48, 4), 2);
58
+						$alt = $n*25 - 1000;
59 59
 						$data['altitude'] = $alt;
60 60
 					}
61 61
 					// Check odd/even flag
62
-					$oe = substr($bin,53,1);
62
+					$oe = substr($bin, 53, 1);
63 63
 					//if ($oe) => odd else even
64 64
 					//  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
65
-					$cprlat = intval(substr($bin,54,17),2)/131072.0;
66
-					$cprlon = intval(substr($bin,71,17),2)/131072.0;
67
-					if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
65
+					$cprlat = intval(substr($bin, 54, 17), 2)/131072.0;
66
+					$cprlon = intval(substr($bin, 71, 17), 2)/131072.0;
67
+					if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat, 'longitude' => $cprlon, 'created' => time());
68 68
 					elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
69 69
 						$cprlat_odd = $cprlat;
70 70
 						$cprlon_odd = $cprlon;
71 71
 						$cprlat_even = $this::$latlon[$icao]['latitude'];
72 72
 						$cprlon_even = $this::$latlon[$icao]['longitude'];
73
-						$j = 59*$cprlat_even-60*$cprlat_odd+0.5;
74
-						$lat_even = (360.0/60)*($j%60+$cprlat_even);
75
-						$lat_odd = (360.0/59)*($j%59+$cprlat_odd);
73
+						$j = 59*$cprlat_even - 60*$cprlat_odd + 0.5;
74
+						$lat_even = (360.0/60)*($j%60 + $cprlat_even);
75
+						$lat_odd = (360.0/59)*($j%59 + $cprlat_odd);
76 76
 						if ($lat_even >= 270) $lat_even = $lat_even - 360;
77 77
 						if ($lat_odd >= 270) $lat_odd = $lat_odd - 360;
78 78
 						// check latitude zone
79 79
 						if ($this->cprNL($lat_even) == $this->cprNL($lat_odd)) {
80 80
 							if ($this::$latlon[$icao]['created'] > time()) {
81
-								$ni = $this->cprN($lat_even,0);
82
-								$m = floor($cprlon_even*($this->cprNL($lat_even)-1) - $cprlon_odd * $this->cprNL($lat_even)+0.5);
83
-								$lon = (360.0/$ni)*($m%$ni+$cprlon_even);
81
+								$ni = $this->cprN($lat_even, 0);
82
+								$m = floor($cprlon_even*($this->cprNL($lat_even) - 1) - $cprlon_odd*$this->cprNL($lat_even) + 0.5);
83
+								$lon = (360.0/$ni)*($m%$ni + $cprlon_even);
84 84
 								$lat = $lat_even;
85
-								if ($lon > 180) $lon = $lon -360;
85
+								if ($lon > 180) $lon = $lon - 360;
86 86
 								if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
87 87
 									//if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
88 88
 									$data['latitude'] = $lat;
89 89
 									$data['longitude'] = $lon;
90 90
 								}
91 91
 							} else {
92
-								$ni = $this->cprN($lat_odd,1);
93
-								$m = floor($cprlon_even*($this->cprNL($lat_odd)-1) - $cprlon_odd * $this->cprNL($lat_odd)+0.5);
94
-								$lon = (360.0/$ni)*($m%$ni+$cprlon_odd);
92
+								$ni = $this->cprN($lat_odd, 1);
93
+								$m = floor($cprlon_even*($this->cprNL($lat_odd) - 1) - $cprlon_odd*$this->cprNL($lat_odd) + 0.5);
94
+								$lon = (360.0/$ni)*($m%$ni + $cprlon_odd);
95 95
 								$lat = $lat_odd;
96
-								if ($lon > 180) $lon = $lon -360;
96
+								if ($lon > 180) $lon = $lon - 360;
97 97
 								if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
98 98
 									//if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
99 99
 									$data['latitude'] = $lat;
@@ -105,15 +105,15 @@  discard block
 block discarded – undo
105 105
 					}
106 106
 				} elseif ($tc == 19) {
107 107
 					// speed & heading
108
-					$v_ew_dir = intval(substr($bin,45,1));
109
-					$v_ew = intval(substr($bin,46,10),2);
110
-					$v_ns_dir = intval(substr($bin,56,1));
111
-					$v_ns = intval(substr($bin,57,10),2);
108
+					$v_ew_dir = intval(substr($bin, 45, 1));
109
+					$v_ew = intval(substr($bin, 46, 10), 2);
110
+					$v_ns_dir = intval(substr($bin, 56, 1));
111
+					$v_ns = intval(substr($bin, 57, 10), 2);
112 112
 					if ($v_ew_dir) $v_ew = -1*$v_ew;
113 113
 					if ($v_ns_dir) $v_ns = -1*$v_ns;
114
-					$speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
115
-					$heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
116
-					if ($heading <0) $heading = $heading+360;
114
+					$speed = sqrt($v_ns*$v_ns + $v_ew*$v_ew);
115
+					$heading = atan2($v_ew, $v_ns)*360.0/(2*pi());
116
+					if ($heading < 0) $heading = $heading + 360;
117 117
 					$data['speed'] = $speed;
118 118
 					$data['heading'] = $heading;
119 119
 				}
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 * Lookup table to convert the latitude to index.
129 129
 	*/
130 130
 	private function cprNL($lat) {
131
-		if ($lat < 0) $lat = -$lat;             // Table is simmetric about the equator.
131
+		if ($lat < 0) $lat = -$lat; // Table is simmetric about the equator.
132 132
 		if ($lat < 10.47047130) return 59;
133 133
 		if ($lat < 14.82817437) return 58;
134 134
 		if ($lat < 18.18626357) return 57;
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 		return 1;
191 191
 	}
192 192
 
193
-	private function cprN($lat,$isodd) {
193
+	private function cprN($lat, $isodd) {
194 194
 		$nl = $this->cprNL($lat) - $isodd;
195 195
 		if ($nl > 1) return $nl;
196 196
 		else return 1;
@@ -214,9 +214,9 @@  discard block
 block discarded – undo
214 214
 		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000
215 215
 		);
216 216
 		$crc = 0;
217
-		$checksum = intval(substr($msg,22,6),16);
217
+		$checksum = intval(substr($msg, 22, 6), 16);
218 218
 		for ($j = 0; $j < strlen($bin); $j++) {
219
-			if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
219
+			if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j], 0);
220 220
 		}
221 221
 		if ($crc == $checksum) return true;
222 222
 		else {
@@ -238,10 +238,10 @@  discard block
 block discarded – undo
238 238
 			$msg['aircraftid'] = hexdec($data['address']);
239 239
 			$msg['hex'] = $data['address'];
240 240
 			$msg['flightid'] = hexdec($data['address']);
241
-			$msg['date_gen'] = date('Y/m/d',$data['timestamp']);
242
-			$msg['time_gen'] = date('H:i:s',$data['timestamp']).'.180';
243
-			$msg['date_log'] = date('Y/m/d',$data['timestamp']);
244
-			$msg['time_log'] = date('H:i:s',$data['timestamp']).'.180';
241
+			$msg['date_gen'] = date('Y/m/d', $data['timestamp']);
242
+			$msg['time_gen'] = date('H:i:s', $data['timestamp']).'.180';
243
+			$msg['date_log'] = date('Y/m/d', $data['timestamp']);
244
+			$msg['time_log'] = date('H:i:s', $data['timestamp']).'.180';
245 245
 			$msg['callsign'] = $data['ident'];
246 246
 			$msg['altitude'] = '';
247 247
 			$msg['speed'] = '';
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 			$msg['emergency'] = '';
255 255
 			$msg['SPI'] = '';
256 256
 			$msg['ground'] = '';
257
-			$result[] = implode(',',$msg);
257
+			$result[] = implode(',', $msg);
258 258
 		}
259 259
 		if (isset($data['latitude']) && $data['latitude'] != 0) {
260 260
 			$msg = array();
@@ -264,10 +264,10 @@  discard block
 block discarded – undo
264 264
 			$msg['aircraftid'] = hexdec($data['address']);
265 265
 			$msg['hex'] = $data['address'];
266 266
 			$msg['flightid'] = hexdec($data['address']);
267
-			$msg['date_gen'] = date('Y/m/d',$data['timestamp']);
268
-			$msg['time_gen'] = date('H:i:s',$data['timestamp']).'.180';
269
-			$msg['date_log'] = date('Y/m/d',$data['timestamp']);
270
-			$msg['time_log'] = date('H:i:s',$data['timestamp']).'.180';
267
+			$msg['date_gen'] = date('Y/m/d', $data['timestamp']);
268
+			$msg['time_gen'] = date('H:i:s', $data['timestamp']).'.180';
269
+			$msg['date_log'] = date('Y/m/d', $data['timestamp']);
270
+			$msg['time_log'] = date('H:i:s', $data['timestamp']).'.180';
271 271
 			$msg['callsign'] = '';
272 272
 			if (isset($data['altitude'])) $msg['altitude'] = $data['altitude'];
273 273
 			else $msg['altitude'] = '';
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 			$msg['SPI'] = 0;
286 286
 			if (isset($data['ground'])) $msg['ground'] = 1;
287 287
 			else $msg['ground'] = 0;
288
-			$result[] = implode(',',$msg);
288
+			$result[] = implode(',', $msg);
289 289
 		}
290 290
 		return $result;
291 291
 	}
Please login to merge, or discard this patch.
Braces   +248 added lines, -87 removed lines patch added patch discarded remove patch
@@ -19,9 +19,13 @@  discard block
 block discarded – undo
19 19
 		// Not yet finished, no CRC checks
20 20
 		$data = array();
21 21
 		$typehex = substr($buffer,0,1);
22
-		if ($typehex == '*' || $typehex == ':') $hex = substr($buffer,1,-1);
23
-		elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-13);
24
-		else $hex = substr($buffer,1,-1);
22
+		if ($typehex == '*' || $typehex == ':') {
23
+			$hex = substr($buffer,1,-1);
24
+		} elseif ($typehex == '@' || $typehex == '%') {
25
+			$hex = substr($buffer,13,-13);
26
+		} else {
27
+			$hex = substr($buffer,1,-1);
28
+		}
25 29
 		$bin = gmp_strval( gmp_init($hex,16), 2);
26 30
 		//if (strlen($hex) == 28 && $this->parityCheck($hex,$bin)) {
27 31
 		if (strlen($hex) == 28) {
@@ -64,8 +68,9 @@  discard block
 block discarded – undo
64 68
 					//  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
65 69
 					$cprlat = intval(substr($bin,54,17),2)/131072.0;
66 70
 					$cprlon = intval(substr($bin,71,17),2)/131072.0;
67
-					if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
68
-					elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
71
+					if ($oe == 0) {
72
+						$this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
73
+					} elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
69 74
 						$cprlat_odd = $cprlat;
70 75
 						$cprlon_odd = $cprlon;
71 76
 						$cprlat_even = $this::$latlon[$icao]['latitude'];
@@ -73,8 +78,12 @@  discard block
 block discarded – undo
73 78
 						$j = 59*$cprlat_even-60*$cprlat_odd+0.5;
74 79
 						$lat_even = (360.0/60)*($j%60+$cprlat_even);
75 80
 						$lat_odd = (360.0/59)*($j%59+$cprlat_odd);
76
-						if ($lat_even >= 270) $lat_even = $lat_even - 360;
77
-						if ($lat_odd >= 270) $lat_odd = $lat_odd - 360;
81
+						if ($lat_even >= 270) {
82
+							$lat_even = $lat_even - 360;
83
+						}
84
+						if ($lat_odd >= 270) {
85
+							$lat_odd = $lat_odd - 360;
86
+						}
78 87
 						// check latitude zone
79 88
 						if ($this->cprNL($lat_even) == $this->cprNL($lat_odd)) {
80 89
 							if ($this::$latlon[$icao]['created'] > time()) {
@@ -82,7 +91,9 @@  discard block
 block discarded – undo
82 91
 								$m = floor($cprlon_even*($this->cprNL($lat_even)-1) - $cprlon_odd * $this->cprNL($lat_even)+0.5);
83 92
 								$lon = (360.0/$ni)*($m%$ni+$cprlon_even);
84 93
 								$lat = $lat_even;
85
-								if ($lon > 180) $lon = $lon -360;
94
+								if ($lon > 180) {
95
+									$lon = $lon -360;
96
+								}
86 97
 								if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
87 98
 									//if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
88 99
 									$data['latitude'] = $lat;
@@ -93,14 +104,18 @@  discard block
 block discarded – undo
93 104
 								$m = floor($cprlon_even*($this->cprNL($lat_odd)-1) - $cprlon_odd * $this->cprNL($lat_odd)+0.5);
94 105
 								$lon = (360.0/$ni)*($m%$ni+$cprlon_odd);
95 106
 								$lat = $lat_odd;
96
-								if ($lon > 180) $lon = $lon -360;
107
+								if ($lon > 180) {
108
+									$lon = $lon -360;
109
+								}
97 110
 								if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
98 111
 									//if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
99 112
 									$data['latitude'] = $lat;
100 113
 									$data['longitude'] = $lon;
101 114
 								}
102 115
 							}
103
-						} else echo "Not cprNL";
116
+						} else {
117
+							echo "Not cprNL";
118
+						}
104 119
 						unset($this::$latlon[$icao]);
105 120
 					}
106 121
 				} elseif ($tc == 19) {
@@ -109,11 +124,17 @@  discard block
 block discarded – undo
109 124
 					$v_ew = intval(substr($bin,46,10),2);
110 125
 					$v_ns_dir = intval(substr($bin,56,1));
111 126
 					$v_ns = intval(substr($bin,57,10),2);
112
-					if ($v_ew_dir) $v_ew = -1*$v_ew;
113
-					if ($v_ns_dir) $v_ns = -1*$v_ns;
127
+					if ($v_ew_dir) {
128
+						$v_ew = -1*$v_ew;
129
+					}
130
+					if ($v_ns_dir) {
131
+						$v_ns = -1*$v_ns;
132
+					}
114 133
 					$speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
115 134
 					$heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
116
-					if ($heading <0) $heading = $heading+360;
135
+					if ($heading <0) {
136
+						$heading = $heading+360;
137
+					}
117 138
 					$data['speed'] = $speed;
118 139
 					$data['heading'] = $heading;
119 140
 				}
@@ -128,72 +149,194 @@  discard block
 block discarded – undo
128 149
 	 * Lookup table to convert the latitude to index.
129 150
 	*/
130 151
 	private function cprNL($lat) {
131
-		if ($lat < 0) $lat = -$lat;             // Table is simmetric about the equator.
132
-		if ($lat < 10.47047130) return 59;
133
-		if ($lat < 14.82817437) return 58;
134
-		if ($lat < 18.18626357) return 57;
135
-		if ($lat < 21.02939493) return 56;
136
-		if ($lat < 23.54504487) return 55;
137
-		if ($lat < 25.82924707) return 54;
138
-		if ($lat < 27.93898710) return 53;
139
-		if ($lat < 29.91135686) return 52;
140
-		if ($lat < 31.77209708) return 51;
141
-		if ($lat < 33.53993436) return 50;
142
-		if ($lat < 35.22899598) return 49;
143
-		if ($lat < 36.85025108) return 48;
144
-		if ($lat < 38.41241892) return 47;
145
-		if ($lat < 39.92256684) return 46;
146
-		if ($lat < 41.38651832) return 45;
147
-		if ($lat < 42.80914012) return 44;
148
-		if ($lat < 44.19454951) return 43;
149
-		if ($lat < 45.54626723) return 42;
150
-		if ($lat < 46.86733252) return 41;
151
-		if ($lat < 48.16039128) return 40;
152
-		if ($lat < 49.42776439) return 39;
153
-		if ($lat < 50.67150166) return 38;
154
-		if ($lat < 51.89342469) return 37;
155
-		if ($lat < 53.09516153) return 36;
156
-		if ($lat < 54.27817472) return 35;
157
-		if ($lat < 55.44378444) return 34;
158
-		if ($lat < 56.59318756) return 33;
159
-		if ($lat < 57.72747354) return 32;
160
-		if ($lat < 58.84763776) return 31;
161
-		if ($lat < 59.95459277) return 30;
162
-		if ($lat < 61.04917774) return 29;
163
-		if ($lat < 62.13216659) return 28;
164
-		if ($lat < 63.20427479) return 27;
165
-		if ($lat < 64.26616523) return 26;
166
-		if ($lat < 65.31845310) return 25;
167
-		if ($lat < 66.36171008) return 24;
168
-		if ($lat < 67.39646774) return 23;
169
-		if ($lat < 68.42322022) return 22;
170
-		if ($lat < 69.44242631) return 21;
171
-		if ($lat < 70.45451075) return 20;
172
-		if ($lat < 71.45986473) return 19;
173
-		if ($lat < 72.45884545) return 18;
174
-		if ($lat < 73.45177442) return 17;
175
-		if ($lat < 74.43893416) return 16;
176
-		if ($lat < 75.42056257) return 15;
177
-		if ($lat < 76.39684391) return 14;
178
-		if ($lat < 77.36789461) return 13;
179
-		if ($lat < 78.33374083) return 12;
180
-		if ($lat < 79.29428225) return 11;
181
-		if ($lat < 80.24923213) return 10;
182
-		if ($lat < 81.19801349) return 9;
183
-		if ($lat < 82.13956981) return 8;
184
-		if ($lat < 83.07199445) return 7;
185
-		if ($lat < 83.99173563) return 6;
186
-		if ($lat < 84.89166191) return 5;
187
-		if ($lat < 85.75541621) return 4;
188
-		if ($lat < 86.53536998) return 3;
189
-		if ($lat < 87.00000000) return 2;
152
+		if ($lat < 0) {
153
+			$lat = -$lat;
154
+		}
155
+		// Table is simmetric about the equator.
156
+		if ($lat < 10.47047130) {
157
+			return 59;
158
+		}
159
+		if ($lat < 14.82817437) {
160
+			return 58;
161
+		}
162
+		if ($lat < 18.18626357) {
163
+			return 57;
164
+		}
165
+		if ($lat < 21.02939493) {
166
+			return 56;
167
+		}
168
+		if ($lat < 23.54504487) {
169
+			return 55;
170
+		}
171
+		if ($lat < 25.82924707) {
172
+			return 54;
173
+		}
174
+		if ($lat < 27.93898710) {
175
+			return 53;
176
+		}
177
+		if ($lat < 29.91135686) {
178
+			return 52;
179
+		}
180
+		if ($lat < 31.77209708) {
181
+			return 51;
182
+		}
183
+		if ($lat < 33.53993436) {
184
+			return 50;
185
+		}
186
+		if ($lat < 35.22899598) {
187
+			return 49;
188
+		}
189
+		if ($lat < 36.85025108) {
190
+			return 48;
191
+		}
192
+		if ($lat < 38.41241892) {
193
+			return 47;
194
+		}
195
+		if ($lat < 39.92256684) {
196
+			return 46;
197
+		}
198
+		if ($lat < 41.38651832) {
199
+			return 45;
200
+		}
201
+		if ($lat < 42.80914012) {
202
+			return 44;
203
+		}
204
+		if ($lat < 44.19454951) {
205
+			return 43;
206
+		}
207
+		if ($lat < 45.54626723) {
208
+			return 42;
209
+		}
210
+		if ($lat < 46.86733252) {
211
+			return 41;
212
+		}
213
+		if ($lat < 48.16039128) {
214
+			return 40;
215
+		}
216
+		if ($lat < 49.42776439) {
217
+			return 39;
218
+		}
219
+		if ($lat < 50.67150166) {
220
+			return 38;
221
+		}
222
+		if ($lat < 51.89342469) {
223
+			return 37;
224
+		}
225
+		if ($lat < 53.09516153) {
226
+			return 36;
227
+		}
228
+		if ($lat < 54.27817472) {
229
+			return 35;
230
+		}
231
+		if ($lat < 55.44378444) {
232
+			return 34;
233
+		}
234
+		if ($lat < 56.59318756) {
235
+			return 33;
236
+		}
237
+		if ($lat < 57.72747354) {
238
+			return 32;
239
+		}
240
+		if ($lat < 58.84763776) {
241
+			return 31;
242
+		}
243
+		if ($lat < 59.95459277) {
244
+			return 30;
245
+		}
246
+		if ($lat < 61.04917774) {
247
+			return 29;
248
+		}
249
+		if ($lat < 62.13216659) {
250
+			return 28;
251
+		}
252
+		if ($lat < 63.20427479) {
253
+			return 27;
254
+		}
255
+		if ($lat < 64.26616523) {
256
+			return 26;
257
+		}
258
+		if ($lat < 65.31845310) {
259
+			return 25;
260
+		}
261
+		if ($lat < 66.36171008) {
262
+			return 24;
263
+		}
264
+		if ($lat < 67.39646774) {
265
+			return 23;
266
+		}
267
+		if ($lat < 68.42322022) {
268
+			return 22;
269
+		}
270
+		if ($lat < 69.44242631) {
271
+			return 21;
272
+		}
273
+		if ($lat < 70.45451075) {
274
+			return 20;
275
+		}
276
+		if ($lat < 71.45986473) {
277
+			return 19;
278
+		}
279
+		if ($lat < 72.45884545) {
280
+			return 18;
281
+		}
282
+		if ($lat < 73.45177442) {
283
+			return 17;
284
+		}
285
+		if ($lat < 74.43893416) {
286
+			return 16;
287
+		}
288
+		if ($lat < 75.42056257) {
289
+			return 15;
290
+		}
291
+		if ($lat < 76.39684391) {
292
+			return 14;
293
+		}
294
+		if ($lat < 77.36789461) {
295
+			return 13;
296
+		}
297
+		if ($lat < 78.33374083) {
298
+			return 12;
299
+		}
300
+		if ($lat < 79.29428225) {
301
+			return 11;
302
+		}
303
+		if ($lat < 80.24923213) {
304
+			return 10;
305
+		}
306
+		if ($lat < 81.19801349) {
307
+			return 9;
308
+		}
309
+		if ($lat < 82.13956981) {
310
+			return 8;
311
+		}
312
+		if ($lat < 83.07199445) {
313
+			return 7;
314
+		}
315
+		if ($lat < 83.99173563) {
316
+			return 6;
317
+		}
318
+		if ($lat < 84.89166191) {
319
+			return 5;
320
+		}
321
+		if ($lat < 85.75541621) {
322
+			return 4;
323
+		}
324
+		if ($lat < 86.53536998) {
325
+			return 3;
326
+		}
327
+		if ($lat < 87.00000000) {
328
+			return 2;
329
+		}
190 330
 		return 1;
191 331
 	}
192 332
 
193 333
 	private function cprN($lat,$isodd) {
194 334
 		$nl = $this->cprNL($lat) - $isodd;
195
-		if ($nl > 1) return $nl;
196
-		else return 1;
335
+		if ($nl > 1) {
336
+			return $nl;
337
+		} else {
338
+			return 1;
339
+		}
197 340
 	}
198 341
 
199 342
 	private function parityCheck($msg, $bin) {
@@ -216,10 +359,13 @@  discard block
 block discarded – undo
216 359
 		$crc = 0;
217 360
 		$checksum = intval(substr($msg,22,6),16);
218 361
 		for ($j = 0; $j < strlen($bin); $j++) {
219
-			if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
362
+			if ($bin[$j]) {
363
+				$crc = $crc^intval($modes_checksum_table[$j],0);
364
+			}
220 365
 		}
221
-		if ($crc == $checksum) return true;
222
-		else {
366
+		if ($crc == $checksum) {
367
+			return true;
368
+		} else {
223 369
 			//echo "**** CRC ERROR ****\n";
224 370
 			return false;
225 371
 		}
@@ -269,22 +415,37 @@  discard block
 block discarded – undo
269 415
 			$msg['date_log'] = date('Y/m/d',$data['timestamp']);
270 416
 			$msg['time_log'] = date('H:i:s',$data['timestamp']).'.180';
271 417
 			$msg['callsign'] = '';
272
-			if (isset($data['altitude'])) $msg['altitude'] = $data['altitude'];
273
-			else $msg['altitude'] = '';
418
+			if (isset($data['altitude'])) {
419
+				$msg['altitude'] = $data['altitude'];
420
+			} else {
421
+				$msg['altitude'] = '';
422
+			}
274 423
 			$msg['speed'] = $data['speed'];
275
-			if (isset($data['heading'])) $msg['track'] = $data['heading'];
276
-			else $msg['track'] = '';
424
+			if (isset($data['heading'])) {
425
+				$msg['track'] = $data['heading'];
426
+			} else {
427
+				$msg['track'] = '';
428
+			}
277 429
 			$msg['latitude'] = $data['latitude'];
278 430
 			$msg['longitude'] = $data['longitude'];
279
-			if (isset($data['verticalrate'])) $msg['verticalrate'] = $data['verticalrate'];
280
-			else $msg['verticalrate'] = '';
281
-			if (isset($data['squawk'])) $msg['squawk'] = $data['squawk'];
282
-			else $msg['squawk'] = 0;
431
+			if (isset($data['verticalrate'])) {
432
+				$msg['verticalrate'] = $data['verticalrate'];
433
+			} else {
434
+				$msg['verticalrate'] = '';
435
+			}
436
+			if (isset($data['squawk'])) {
437
+				$msg['squawk'] = $data['squawk'];
438
+			} else {
439
+				$msg['squawk'] = 0;
440
+			}
283 441
 			$msg['alert'] = 0;
284 442
 			$msg['emergency'] = 0;
285 443
 			$msg['SPI'] = 0;
286
-			if (isset($data['ground'])) $msg['ground'] = 1;
287
-			else $msg['ground'] = 0;
444
+			if (isset($data['ground'])) {
445
+				$msg['ground'] = 1;
446
+			} else {
447
+				$msg['ground'] = 0;
448
+			}
288 449
 			$result[] = implode(',',$msg);
289 450
 		}
290 451
 		return $result;
Please login to merge, or discard this patch.
js/map.2d.js.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 	};
376 376
 
377 377
 <?php
378
-    if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) {
378
+	if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) {
379 379
 ?>
380 380
 	function tskPopup (feature, layer) {
381 381
 		var output = '';
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
 	};
411 411
 	update_tsk();
412 412
 <?php
413
-    }
413
+	}
414 414
 ?>
415 415
 	map.on('moveend', function() {
416 416
 		//if (map.getZoom() > 7) {
@@ -426,10 +426,10 @@  discard block
 block discarded – undo
426 426
 setInterval(function(){if (noTimeout) update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
427 427
 
428 428
 <?php
429
-    // Add support for custom json via $globalMapJson
430
-    if (isset($globalMapJson) && is_array($globalMapJson)) {
429
+	// Add support for custom json via $globalMapJson
430
+	if (isset($globalMapJson) && is_array($globalMapJson)) {
431 431
 	foreach ($globalMapJson as $json) {
432
-	    if (isset($json['url'])) {
432
+		if (isset($json['url'])) {
433 433
 ?>
434 434
 update_genLayer('<?php print $json['url']; ?>');
435 435
 <?php
@@ -438,9 +438,9 @@  discard block
 block discarded – undo
438 438
 setInterval(function(){if (noTimeout) update_genLayer('<?php print $json['url']; ?>')}, <?php print $json['refresh']; ?>);
439 439
 <?php
440 440
 		}
441
-	    }
441
+		}
442
+	}
442 443
 	}
443
-    }
444 444
 
445 445
 ?>
446 446
 //adds the bootstrap tooltip to the map icons
Please login to merge, or discard this patch.
Braces   +109 added lines, -27 removed lines patch added patch discarded remove patch
@@ -4,10 +4,15 @@  discard block
 block discarded – undo
4 4
 
5 5
 setcookie("MapFormat",'2d');
6 6
 
7
-if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = '';
7
+if (!isset($globalOpenWeatherMapKey)) {
8
+	$globalOpenWeatherMapKey = '';
9
+}
8 10
 // Compressed GeoJson is used if true
9
-if (!isset($globalJsonCompress)) $compress = true;
10
-else $compress = $globalJsonCompress;
11
+if (!isset($globalJsonCompress)) {
12
+	$compress = true;
13
+} else {
14
+	$compress = $globalJsonCompress;
15
+}
11 16
 if (isset($_GET['archive'])) {
12 17
 	$archive = true;
13 18
 	//$archiveupdatetime = 50;
@@ -18,8 +23,11 @@  discard block
 block discarded – undo
18 23
 	//$lastupd = round(($_GET['enddate']-$_GET['begindate'])/(($_GET['during']*60)/10));
19 24
 	//$lastupd = 20;
20 25
 	$lastupd = $_GET['archivespeed']*$archiveupdatetime;
21
-	if (isset($_GET['enddate']) && $_GET['enddate'] != '') $enddate = $_GET['enddate'];
22
-	else $enddate = time();
26
+	if (isset($_GET['enddate']) && $_GET['enddate'] != '') {
27
+		$enddate = $_GET['enddate'];
28
+	} else {
29
+		$enddate = time();
30
+	}
23 31
 	setcookie("archive_begin",$begindate);
24 32
 	setcookie("archive_end",$enddate);
25 33
 	setcookie("archive_update",$lastupd);
@@ -107,7 +115,17 @@  discard block
 block discarded – undo
107 115
 	}
108 116
 
109 117
 	//create the map
110
-	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) print $latitude; else print $globalCenterLatitude; ?>,<?php if (isset($longitude)) print $longitude; else print $globalCenterLongitude; ?>], zoom);
118
+	map = L.map('archive-map', { zoomControl:false }).setView([<?php if (isset($latitude)) {
119
+	print $latitude;
120
+} else {
121
+	print $globalCenterLatitude;
122
+}
123
+?>,<?php if (isset($longitude)) {
124
+	print $longitude;
125
+} else {
126
+	print $globalCenterLongitude;
127
+}
128
+?>], zoom);
111 129
 <?php
112 130
 	} else {
113 131
 		if ((isset($globalCenterLatitude) && $globalCenterLatitude != '' && isset($globalCenterLongitude) && $globalCenterLongitude != '') || isset($_COOKIE['lastcentercoord'])) {
@@ -133,9 +151,21 @@  discard block
 block discarded – undo
133 151
 	     || navigator.userAgent.match(/BlackBerry/i)
134 152
 	     || navigator.userAgent.match(/Windows Phone/i))
135 153
 	{
136
-		var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) print $viewzoom-1; elseif (isset($viewzoom)) print $viewzoom; else print '8'; ?>;
154
+		var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) {
155
+	print $viewzoom-1;
156
+} elseif (isset($viewzoom)) {
157
+	print $viewzoom;
158
+} else {
159
+	print '8';
160
+}
161
+?>;
137 162
 	} else {
138
-		var zoom = <?php if (isset($viewzoom)) print $viewzoom; else print '9'; ?>;
163
+		var zoom = <?php if (isset($viewzoom)) {
164
+	print $viewzoom;
165
+} else {
166
+	print '9';
167
+}
168
+?>;
139 169
 	}
140 170
 
141 171
 	//create the map
@@ -161,16 +191,27 @@  discard block
 block discarded – undo
161 191
 	bounds = L.latLngBounds(southWest,northEast);
162 192
 	//a few title layers
163 193
 <?php
164
-	if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
165
-	else $MapType = $globalMapProvider;
194
+	if (isset($_COOKIE['MapType'])) {
195
+		$MapType = $_COOKIE['MapType'];
196
+	} else {
197
+		$MapType = $globalMapProvider;
198
+	}
166 199
 
167 200
 	if ($MapType == 'Mapbox') {
168
-		if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
169
-		else $MapBoxId = $_COOKIE['MapTypeId'];
170
-?>
201
+		if ($_COOKIE['MapTypeId'] == 'default') {
202
+			$MapBoxId = $globalMapboxId;
203
+		} else {
204
+			$MapBoxId = $_COOKIE['MapTypeId'];
205
+		}
206
+		?>
171 207
 	L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
172 208
 	    maxZoom: 18,
173
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
209
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
210
+	print 'false';
211
+} else {
212
+	print 'true';
213
+}
214
+?>,
174 215
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
175 216
 	      '<a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, ' +
176 217
 	      'Imagery © <a href="http://mapbox.com">Mapbox</a>',
@@ -193,7 +234,12 @@  discard block
 block discarded – undo
193 234
 ?>
194 235
 	L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
195 236
 	    maxZoom: 18,
196
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
237
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
238
+	print 'false';
239
+} else {
240
+	print 'true';
241
+}
242
+?>,
197 243
 	    attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, ' +
198 244
 	      '<a href="www.openstreetmap.org/copyright">Open Database Licence</a>'
199 245
 	}).addTo(map);
@@ -239,20 +285,26 @@  discard block
 block discarded – undo
239 285
 	map.addLayer(yandexLayer);
240 286
 <?php
241 287
 	} elseif ($MapType == 'Bing-Aerial') {
242
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
243
-?>
288
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
289
+			setcookie('MapType','OpenStreetMap');
290
+		}
291
+		?>
244 292
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
245 293
 	map.addLayer(bingLayer);
246 294
 <?php
247 295
 	} elseif ($MapType == 'Bing-Hybrid') {
248
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
249
-?>
296
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
297
+			setcookie('MapType','OpenStreetMap');
298
+		}
299
+		?>
250 300
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
251 301
 	map.addLayer(bingLayer);
252 302
 <?php
253 303
 	} elseif ($MapType == 'Bing-Road') {
254
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
255
-?>
304
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') {
305
+			setcookie('MapType','OpenStreetMap');
306
+		}
307
+		?>
256 308
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
257 309
 	map.addLayer(bingLayer);
258 310
 <?php
@@ -281,7 +333,12 @@  discard block
 block discarded – undo
281 333
 	    maxZoom: 5,
282 334
 	    tms : true,
283 335
 	    zindex : 3,
284
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
336
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
337
+	print 'false';
338
+} else {
339
+	print 'true';
340
+}
341
+?>,
285 342
 	    attribution: 'Natural Earth'
286 343
 	}).addTo(map);
287 344
 <?php
@@ -289,9 +346,24 @@  discard block
 block discarded – undo
289 346
 		$customid = $MapType;
290 347
 ?>
291 348
 	L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
292
-	    maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>,
293
-	    minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
294
-	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
349
+	    maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
350
+	print $globalMapCustomLayer[$customid]['maxZoom'];
351
+} else {
352
+	print '18';
353
+}
354
+?>,
355
+	    minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
356
+	print $globalMapCustomLayer[$customid]['minZoom'];
357
+} else {
358
+	print '0';
359
+}
360
+?>,
361
+	    noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
362
+	print 'false';
363
+} else {
364
+	print 'true';
365
+}
366
+?>,
295 367
 	    attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
296 368
 	}).addTo(map);
297 369
 
@@ -331,7 +403,12 @@  discard block
 block discarded – undo
331 403
 		}
332 404
 	} elseif ($globalBounding == 'circle') {
333 405
 ?>
334
-	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) print $globalBoundingCircleSize; else print '70000'; ?>,{
406
+	var circle = L.circle([<?php print $globalCenterLatitude; ?>, <?php print $globalCenterLongitude; ?>],<?php if (isset($globalBoundingCircleSize)) {
407
+	print $globalBoundingCircleSize;
408
+} else {
409
+	print '70000';
410
+}
411
+?>,{
335 412
 	    color: '#92C7D1',
336 413
 	    fillColor: '#92C7D1',
337 414
 	    fillOpacity: 0.3,
@@ -423,7 +500,12 @@  discard block
 block discarded – undo
423 500
 		createCookie('lastcentercoord',map.getCenter().lat+','+map.getCenter().lng+','+map.getZoom(),2);
424 501
 	});
425 502
 update_locationsLayer();
426
-setInterval(function(){if (noTimeout) update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
503
+setInterval(function(){if (noTimeout) update_locationsLayer()},<?php if (isset($globalMapRefresh)) {
504
+	print $globalMapRefresh*1000*2;
505
+} else {
506
+	print '60000';
507
+}
508
+?>);
427 509
 
428 510
 <?php
429 511
     // Add support for custom json via $globalMapJson
Please login to merge, or discard this patch.
require/class.METAR.php 3 patches
Indentation   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -14,35 +14,35 @@  discard block
 block discarded – undo
14 14
 	public $db;
15 15
 	
16 16
 	protected $texts = Array(
17
-	    'MI' => 'Shallow',
18
-	    'PR' => 'Partial',
19
-	    'BC' => 'Low drifting',
20
-	    'BL' => 'Blowing',
21
-	    'SH' => 'Showers',
22
-	    'TS' => 'Thunderstorm',
23
-	    'FZ' => 'Freezing',
24
-	    'DZ' => 'Drizzle',
25
-	    'RA' => 'Rain',
26
-	    'SN' => 'Snow',
27
-	    'SG' => 'Snow Grains',
28
-	    'IC' => 'Ice crystals',
29
-	    'PL' => 'Ice pellets',
30
-	    'GR' => 'Hail',
31
-	    'GS' => 'Small hail',
32
-	    'UP' => 'Unknown',
33
-	    'BR' => 'Mist',
34
-	    'FG' => 'Fog',
35
-	    'FU' => 'Smoke',
36
-	    'VA' => 'Volcanic ash',
37
-	    'DU' => 'Widespread dust',
38
-	    'SA' => 'Sand',
39
-	    'HZ' => 'Haze',
40
-	    'PY' => 'Spray',
41
-	    'PO' => 'Well developed dust / sand whirls',
42
-	    'SQ' => 'Squalls',
43
-	    'FC' => 'Funnel clouds inc tornadoes or waterspouts',
44
-	    'SS' => 'Sandstorm',
45
-	    'DS' => 'Duststorm'
17
+		'MI' => 'Shallow',
18
+		'PR' => 'Partial',
19
+		'BC' => 'Low drifting',
20
+		'BL' => 'Blowing',
21
+		'SH' => 'Showers',
22
+		'TS' => 'Thunderstorm',
23
+		'FZ' => 'Freezing',
24
+		'DZ' => 'Drizzle',
25
+		'RA' => 'Rain',
26
+		'SN' => 'Snow',
27
+		'SG' => 'Snow Grains',
28
+		'IC' => 'Ice crystals',
29
+		'PL' => 'Ice pellets',
30
+		'GR' => 'Hail',
31
+		'GS' => 'Small hail',
32
+		'UP' => 'Unknown',
33
+		'BR' => 'Mist',
34
+		'FG' => 'Fog',
35
+		'FU' => 'Smoke',
36
+		'VA' => 'Volcanic ash',
37
+		'DU' => 'Widespread dust',
38
+		'SA' => 'Sand',
39
+		'HZ' => 'Haze',
40
+		'PY' => 'Spray',
41
+		'PO' => 'Well developed dust / sand whirls',
42
+		'SQ' => 'Squalls',
43
+		'FC' => 'Funnel clouds inc tornadoes or waterspouts',
44
+		'SS' => 'Sandstorm',
45
+		'DS' => 'Duststorm'
46 46
 	);
47 47
 
48 48
 	/*
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
     				$result['QNH_format'] = $matches[1] == 'Q' ? 'hPa' : 'inHg';
178 178
     				*/
179 179
 			}
180
-                     /*
180
+					 /*
181 181
     			// Wind Direction
182 182
     			if (preg_match('#^([0-9]{3})V([0-9]{3})$#', $piece, $matches)) {
183 183
     				$result['wind_direction'] = $matches[1];
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
     				$result['speed_variable'] = $matches[1];
189 189
     			}
190 190
     			*/
191
-    			// Visibility
191
+				// Visibility
192 192
 			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
193 193
 				if (isset($matches[3]) && strlen($matches[3]) > 0) {
194 194
 					$result['visibility'] = (float)$matches[3] * 1609.34;
@@ -246,9 +246,9 @@  discard block
 block discarded – undo
246 246
 				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
247 247
 				if (isset($matches[3])) {
248 248
 					$range = Array(
249
-					    'from' => (float)$matches[2],
250
-					    'to'   => (float)$matches[4],
251
-					    'unit' => $matches[5] ? 'FT' : 'M'
249
+						'from' => (float)$matches[2],
250
+						'to'   => (float)$matches[4],
251
+						'unit' => $matches[5] ? 'FT' : 'M'
252 252
 					);
253 253
 				}
254 254
 				$result['RVR'] = $matches[1];
Please login to merge, or discard this patch.
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 			$Connection = new Connection();
69 69
 			$sth = $Connection->db->prepare($query);
70 70
 			$sth->execute();
71
-		} catch(PDOException $e) {
71
+		} catch (PDOException $e) {
72 72
 			return "error : ".$e->getMessage();
73 73
 		}
74 74
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 			$Connection = new Connection();
88 88
 			$sth = $Connection->db->prepare($query);
89 89
 			$sth->execute();
90
-		} catch(PDOException $e) {
90
+		} catch (PDOException $e) {
91 91
 			return "error : ".$e->getMessage();
92 92
 		}
93 93
 	}
@@ -100,9 +100,9 @@  discard block
 block discarded – undo
100 100
 	public function parse($data) {
101 101
 		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
102 102
 		$codes = implode('|', array_keys($this->texts));
103
-		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
103
+		$regWeather = '#^(\+|\-|VC)?('.$codes.')('.$codes.')?$#';
104 104
 		//$pieces = explode(' ',$data);
105
-		$pieces = preg_split('/\s/',$data);
105
+		$pieces = preg_split('/\s/', $data);
106 106
 		$pos = 0;
107 107
 		if ($pieces[0] == 'METAR') $pos++;
108 108
 		elseif ($pieces[0] == 'SPECI') $pos++;
@@ -112,25 +112,25 @@  discard block
 block discarded – undo
112 112
 		$result['location'] = $pieces[$pos];
113 113
 		$pos++;
114 114
 		if (!isset($pieces[$pos])) return $result;
115
-		$result['dayofmonth'] = substr($pieces[$pos],0,2);
116
-		$result['time'] = substr($pieces[$pos],2,4);
115
+		$result['dayofmonth'] = substr($pieces[$pos], 0, 2);
116
+		$result['time'] = substr($pieces[$pos], 2, 4);
117 117
 		$c = count($pieces);
118
-		for($pos++; $pos < $c; $pos++) {
118
+		for ($pos++; $pos < $c; $pos++) {
119 119
 			$piece = $pieces[$pos];
120 120
 			if ($piece == 'RMK') break;
121 121
 			if ($piece == 'AUTO') $result['auto'] = true;
122 122
 			if ($piece == 'COR') $result['correction'] = true;
123 123
 			// Wind Speed
124 124
 			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
125
-				$result['wind']['direction'] = (float)$matches[1];
125
+				$result['wind']['direction'] = (float) $matches[1];
126 126
 				$result['wind']['unit'] = $matches[4];
127
-				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
128
-				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
129
-				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
130
-				$result['wind']['gust'] = (float)$matches[3];
127
+				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float) $matches[2])*0.51444444444, 2);
128
+				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float) $matches[2])*1000, 2);
129
+				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float) $matches[2]), 2);
130
+				$result['wind']['gust'] = (float) $matches[3];
131 131
 				$result['wind']['unit'] = $matches[4];
132
-				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
133
-				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
132
+				$result['wind']['min_variation'] = array_key_exists(5, $matches) ? $matches[5] : 0;
133
+				$result['wind']['max_variation'] = array_key_exists(6, $matches) ? $matches[6] : 0;
134 134
 			}
135 135
 
136 136
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
@@ -151,14 +151,14 @@  discard block
 block discarded – undo
151 151
 
152 152
 			// Temperature
153 153
 			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
154
-				$temp = (float)$matches[1];
154
+				$temp = (float) $matches[1];
155 155
 				if ($matches[1]{0} == 'M') {
156
-					$temp = ((float)substr($matches[1], 1)) * -1;
156
+					$temp = ((float) substr($matches[1], 1))*-1;
157 157
 				}
158 158
 				$result['temperature'] = $temp;
159
-				$dew = (float)$matches[2];
159
+				$dew = (float) $matches[2];
160 160
 				if ($matches[2]{0} == 'M') {
161
-					$dew = ((float)substr($matches[2], 1)) * -1;
161
+					$dew = ((float) substr($matches[2], 1))*-1;
162 162
 				}
163 163
 				$result['dew'] = $dew;
164 164
 			}
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 					$result['QNH'] = $matches[2];
171 171
 				} else {
172 172
 					// inHg
173
-					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
173
+					$result['QNH'] = round(($matches[2]/100)*33.86389, 2);
174 174
 				}
175 175
 				/*
176 176
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
@@ -191,12 +191,12 @@  discard block
 block discarded – undo
191 191
     			// Visibility
192 192
 			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
193 193
 				if (isset($matches[3]) && strlen($matches[3]) > 0) {
194
-					$result['visibility'] = (float)$matches[3] * 1609.34;
194
+					$result['visibility'] = (float) $matches[3]*1609.34;
195 195
 				} else {
196 196
 					if ($matches[1] == '9999') {
197 197
 						$result['visibility'] = '> 10000';
198 198
 					} else {
199
-						$result['visibility'] = (float)$matches[1];
199
+						$result['visibility'] = (float) $matches[1];
200 200
 					}
201 201
 				}
202 202
 				if (preg_match('#^CAVOK$#', $piece, $matches)) {
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
219 219
 				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
220 220
 				$cloud['type_code'] = $type;
221
-				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
221
+				$cloud['level'] = round(((float) $matches[2])*100*0.3048);
222 222
 				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
223 223
 				$result['cloud'][] = $cloud;
224 224
 			}
@@ -228,8 +228,8 @@  discard block
 block discarded – undo
228 228
 				$rvr['runway'] = $matches[1];
229 229
 				$rvr['assessment'] = $matches[2];
230 230
 				$rvr['rvr'] = $matches[3];
231
-				$rvr['rvr_max'] = array_key_exists(4,$matches) ? $matches[4] : 0;
232
-				$rvr['unit'] = array_key_exists(5,$matches) ? $matches[5] : '';
231
+				$rvr['rvr_max'] = array_key_exists(4, $matches) ? $matches[4] : 0;
232
+				$rvr['unit'] = array_key_exists(5, $matches) ? $matches[5] : '';
233 233
 				$result['RVR'] = $rvr;
234 234
 			}
235 235
 			//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
@@ -242,12 +242,12 @@  discard block
 block discarded – undo
242 242
 				$result['RVR']['friction'] = $matches[5];
243 243
 			}
244 244
 			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
245
-				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
246
-				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
245
+				if (isset($matches[5])) $range = array('exact' => (float) $matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
246
+				else $range = array('exact' => (float) $matches[2], 'unit' => 'M');
247 247
 				if (isset($matches[3])) {
248 248
 					$range = Array(
249
-					    'from' => (float)$matches[2],
250
-					    'to'   => (float)$matches[4],
249
+					    'from' => (float) $matches[2],
250
+					    'to'   => (float) $matches[4],
251 251
 					    'unit' => $matches[5] ? 'FT' : 'M'
252 252
 					);
253 253
 				}
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 		try {
301 301
 			$sth = $this->db->prepare($query);
302 302
 			$sth->execute($query_values);
303
-		} catch(PDOException $e) {
303
+		} catch (PDOException $e) {
304 304
 			return "error : ".$e->getMessage();
305 305
 		}
306 306
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -316,19 +316,19 @@  discard block
 block discarded – undo
316 316
 	 * @param String $metar METAR text
317 317
 	 * @param String $date date of the METAR
318 318
 	*/
319
-	public function addMETAR($location,$metar,$date) {
319
+	public function addMETAR($location, $metar, $date) {
320 320
 		global $globalDBdriver;
321
-		$date = date('Y-m-d H:i:s',strtotime($date));
321
+		$date = date('Y-m-d H:i:s', strtotime($date));
322 322
 		if ($globalDBdriver == 'mysql') {
323 323
 			$query = "INSERT INTO metar (metar_location,metar_date,metar) VALUES (:location,:date,:metar) ON DUPLICATE KEY UPDATE metar_date = :date, metar = :metar";
324 324
 		} else {
325 325
 			$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);";
326 326
 		}
327
-		$query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar));
327
+		$query_values = array(':location' => $location, ':date' => $date, ':metar' => utf8_encode($metar));
328 328
 		try {
329 329
 			$sth = $this->db->prepare($query);
330 330
 			$sth->execute($query_values);
331
-		} catch(PDOException $e) {
331
+		} catch (PDOException $e) {
332 332
 			return "error : ".$e->getMessage();
333 333
 		}
334 334
 	}
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 		try {
344 344
 			$sth = $this->db->prepare($query);
345 345
 			$sth->execute($query_values);
346
-		} catch(PDOException $e) {
346
+		} catch (PDOException $e) {
347 347
 			return "error : ".$e->getMessage();
348 348
 		}
349 349
 	}
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 		try {
357 357
 			$sth = $this->db->prepare($query);
358 358
 			$sth->execute();
359
-		} catch(PDOException $e) {
359
+		} catch (PDOException $e) {
360 360
 			return "error : ".$e->getMessage();
361 361
 		}
362 362
 	}
@@ -370,27 +370,27 @@  discard block
 block discarded – undo
370 370
 		date_default_timezone_set("UTC");
371 371
 		$Common = new Common();
372 372
 		if (isset($globalIVAO) && $globalIVAO) {
373
-			$Common->download('http://wx.ivao.aero/metar.php',dirname(__FILE__).'/../install/tmp/ivaometar.txt');
374
-			$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r");
373
+			$Common->download('http://wx.ivao.aero/metar.php', dirname(__FILE__).'/../install/tmp/ivaometar.txt');
374
+			$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt', "r");
375 375
 		} else {
376
-			$Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT',dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT');
377
-			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
376
+			$Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT', dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT');
377
+			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT', "r");
378 378
 		}
379 379
 		if ($handle) {
380 380
 			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
381 381
 			$date = '';
382 382
 			if ($globalTransaction) $this->db->beginTransaction();
383
-			while(($line = fgets($handle,4096)) !== false) {
384
-				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
383
+			while (($line = fgets($handle, 4096)) !== false) {
384
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
385 385
 					$date = $line;
386 386
 				} elseif ($line != '') {
387 387
 					if ($date == '') $date = date('Y/m/d H:m');
388 388
 					$pos = 0;
389
-					$pieces = preg_split('/\s/',$line);
389
+					$pieces = preg_split('/\s/', $line);
390 390
 					if ($pieces[0] == 'METAR') $pos++;
391 391
 					if (strlen($pieces[$pos]) != 4) $pos++;
392 392
 					$location = $pieces[$pos];
393
-					echo $this->addMETAR($location,$line,$date);
393
+					echo $this->addMETAR($location, $line, $date);
394 394
 				}
395 395
 			}
396 396
 			fclose($handle);
@@ -409,22 +409,22 @@  discard block
 block discarded – undo
409 409
 		if ($globalMETARurl == '') return array();
410 410
 		date_default_timezone_set("UTC");
411 411
 		$Common = new Common();
412
-		$url = str_replace('{icao}',$icao,$globalMETARurl);
412
+		$url = str_replace('{icao}', $icao, $globalMETARurl);
413 413
 		$cycle = $Common->getData($url);
414 414
 		$date = '';
415
-		foreach(explode("\n",$cycle) as $line) {
416
-			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
415
+		foreach (explode("\n", $cycle) as $line) {
416
+			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
417 417
 				$date = $line;
418 418
 			} 
419 419
 			if ($line != '') {
420 420
 				if ($date == '') $date = date('Y/m/d H:m');
421 421
 				$pos = 0;
422
-				$pieces = preg_split('/\s/',$line);
422
+				$pieces = preg_split('/\s/', $line);
423 423
 				if ($pieces[0] == 'METAR') $pos++;
424 424
 				if (strlen($pieces[$pos]) != 4) $pos++;
425 425
 				$location = $pieces[$pos];
426 426
 				if (strlen($location == 4)) {
427
-					$this->addMETAR($location,$line,$date);
427
+					$this->addMETAR($location, $line, $date);
428 428
 					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
429 429
 				} else return array();
430 430
 			}
Please login to merge, or discard this patch.
Braces   +106 added lines, -40 removed lines patch added patch discarded remove patch
@@ -73,8 +73,11 @@  discard block
 block discarded – undo
73 73
 		}
74 74
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
75 75
 		$sth->closeCursor();
76
-		if ($row['nb'] > 0) return false;
77
-		else return true;
76
+		if ($row['nb'] > 0) {
77
+			return false;
78
+		} else {
79
+			return true;
80
+		}
78 81
 	}
79 82
 
80 83
 	/*
@@ -104,29 +107,48 @@  discard block
 block discarded – undo
104 107
 		//$pieces = explode(' ',$data);
105 108
 		$pieces = preg_split('/\s/',$data);
106 109
 		$pos = 0;
107
-		if ($pieces[0] == 'METAR') $pos++;
108
-		elseif ($pieces[0] == 'SPECI') $pos++;
109
-		if (strlen($pieces[$pos]) != 4) $pos++;
110
+		if ($pieces[0] == 'METAR') {
111
+			$pos++;
112
+		} elseif ($pieces[0] == 'SPECI') {
113
+			$pos++;
114
+		}
115
+		if (strlen($pieces[$pos]) != 4) {
116
+			$pos++;
117
+		}
110 118
 		$result = array();
111
-		if (!isset($pieces[$pos])) return $result;
119
+		if (!isset($pieces[$pos])) {
120
+			return $result;
121
+		}
112 122
 		$result['location'] = $pieces[$pos];
113 123
 		$pos++;
114
-		if (!isset($pieces[$pos])) return $result;
124
+		if (!isset($pieces[$pos])) {
125
+			return $result;
126
+		}
115 127
 		$result['dayofmonth'] = substr($pieces[$pos],0,2);
116 128
 		$result['time'] = substr($pieces[$pos],2,4);
117 129
 		$c = count($pieces);
118 130
 		for($pos++; $pos < $c; $pos++) {
119 131
 			$piece = $pieces[$pos];
120
-			if ($piece == 'RMK') break;
121
-			if ($piece == 'AUTO') $result['auto'] = true;
122
-			if ($piece == 'COR') $result['correction'] = true;
132
+			if ($piece == 'RMK') {
133
+				break;
134
+			}
135
+			if ($piece == 'AUTO') {
136
+				$result['auto'] = true;
137
+			}
138
+			if ($piece == 'COR') {
139
+				$result['correction'] = true;
140
+			}
123 141
 			// Wind Speed
124 142
 			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
125 143
 				$result['wind']['direction'] = (float)$matches[1];
126 144
 				$result['wind']['unit'] = $matches[4];
127
-				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
128
-				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
129
-				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
145
+				if ($result['wind']['unit'] == 'KT') {
146
+					$result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
147
+				} elseif ($result['wind']['unit'] == 'KPH') {
148
+					$result['wind']['speed'] = round(((float)$matches[2])*1000,2);
149
+				} elseif ($result['wind']['unit'] == 'MPS') {
150
+					$result['wind']['speed'] = round(((float)$matches[2]),2);
151
+				}
130 152
 				$result['wind']['gust'] = (float)$matches[3];
131 153
 				$result['wind']['unit'] = $matches[4];
132 154
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
@@ -209,14 +231,23 @@  discard block
 block discarded – undo
209 231
 				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
210 232
 				$type = $matches[1];
211 233
 				$cloud = array();
212
-				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
213
-				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
214
-				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
215
-				elseif ($type == 'FEW') $cloud['type'] = 'Few';
216
-				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
217
-				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
218
-				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
219
-				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
234
+				if ($type == 'SKC') {
235
+					$cloud['type'] = 'No cloud/Sky clear';
236
+				} elseif ($type == 'CLR') {
237
+					$cloud['type'] = 'No cloud below 12,000ft (3700m)';
238
+				} elseif ($type == 'NSC') {
239
+					$cloud['type'] = 'No significant cloud';
240
+				} elseif ($type == 'FEW') {
241
+					$cloud['type'] = 'Few';
242
+				} elseif ($type == 'SCT') {
243
+					$cloud['type'] = 'Scattered';
244
+				} elseif ($type == 'BKN') {
245
+					$cloud['type'] = 'Broken';
246
+				} elseif ($type == 'OVC') {
247
+					$cloud['type'] = 'Overcast/Full cloud coverage';
248
+				} elseif ($type == 'VV') {
249
+					$cloud['type'] = 'Vertical visibility';
250
+				}
220 251
 				$cloud['type_code'] = $type;
221 252
 				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
222 253
 				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
@@ -242,8 +273,11 @@  discard block
 block discarded – undo
242 273
 				$result['RVR']['friction'] = $matches[5];
243 274
 			}
244 275
 			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
245
-				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
246
-				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
276
+				if (isset($matches[5])) {
277
+					$range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
278
+				} else {
279
+					$range = array('exact' => (float)$matches[2], 'unit' => 'M');
280
+				}
247 281
 				if (isset($matches[3])) {
248 282
 					$range = Array(
249 283
 					    'from' => (float)$matches[2],
@@ -276,8 +310,11 @@  discard block
 block discarded – undo
276 310
 				if (isset($matches[3])) {
277 311
 					$text[] = $this->texts[$matches[3]];
278 312
 				}
279
-				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
280
-				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
313
+				if (!isset($result['weather'])) {
314
+					$result['weather'] = implode(' ', $text);
315
+				} else {
316
+					$result['weather'] = $result['weather'].' / '.implode(' ', $text);
317
+				}
281 318
 			}
282 319
 		}
283 320
 		return $result;
@@ -293,8 +330,11 @@  discard block
 block discarded – undo
293 330
 		if (isset($globalMETARcycle) && $globalMETARcycle) {
294 331
 			$query = "SELECT * FROM metar WHERE metar_location = :icao";
295 332
 		} else {
296
-			if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
297
-			else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
333
+			if ($globalDBdriver == 'mysql') {
334
+				$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
335
+			} else {
336
+				$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
337
+			}
298 338
 		}
299 339
 		$query_values = array(':icao' => $icao);
300 340
 		try {
@@ -366,7 +406,9 @@  discard block
 block discarded – undo
366 406
 	*/
367 407
 	public function addMETARCycle() {
368 408
 		global $globalDebug, $globalIVAO, $globalTransaction;
369
-		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
409
+		if (isset($globalDebug) && $globalDebug) {
410
+			echo "Downloading METAR cycle...";
411
+		}
370 412
 		date_default_timezone_set("UTC");
371 413
 		$Common = new Common();
372 414
 		if (isset($globalIVAO) && $globalIVAO) {
@@ -377,26 +419,40 @@  discard block
 block discarded – undo
377 419
 			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
378 420
 		}
379 421
 		if ($handle) {
380
-			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
422
+			if (isset($globalDebug) && $globalDebug) {
423
+				echo "Done - Updating DB...";
424
+			}
381 425
 			$date = '';
382
-			if ($globalTransaction) $this->db->beginTransaction();
426
+			if ($globalTransaction) {
427
+				$this->db->beginTransaction();
428
+			}
383 429
 			while(($line = fgets($handle,4096)) !== false) {
384 430
 				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
385 431
 					$date = $line;
386 432
 				} elseif ($line != '') {
387
-					if ($date == '') $date = date('Y/m/d H:m');
433
+					if ($date == '') {
434
+						$date = date('Y/m/d H:m');
435
+					}
388 436
 					$pos = 0;
389 437
 					$pieces = preg_split('/\s/',$line);
390
-					if ($pieces[0] == 'METAR') $pos++;
391
-					if (strlen($pieces[$pos]) != 4) $pos++;
438
+					if ($pieces[0] == 'METAR') {
439
+						$pos++;
440
+					}
441
+					if (strlen($pieces[$pos]) != 4) {
442
+						$pos++;
443
+					}
392 444
 					$location = $pieces[$pos];
393 445
 					echo $this->addMETAR($location,$line,$date);
394 446
 				}
395 447
 			}
396 448
 			fclose($handle);
397
-			if ($globalTransaction) $this->db->commit();
449
+			if ($globalTransaction) {
450
+				$this->db->commit();
451
+			}
452
+		}
453
+		if (isset($globalDebug) && $globalDebug) {
454
+			echo "Done\n";
398 455
 		}
399
-		if (isset($globalDebug) && $globalDebug) echo "Done\n";
400 456
 	}
401 457
 
402 458
 	/*
@@ -406,7 +462,9 @@  discard block
 block discarded – undo
406 462
 	*/
407 463
 	public function downloadMETAR($icao) {
408 464
 		global $globalMETARurl;
409
-		if ($globalMETARurl == '') return array();
465
+		if ($globalMETARurl == '') {
466
+			return array();
467
+		}
410 468
 		date_default_timezone_set("UTC");
411 469
 		$Common = new Common();
412 470
 		$url = str_replace('{icao}',$icao,$globalMETARurl);
@@ -417,16 +475,24 @@  discard block
 block discarded – undo
417 475
 				$date = $line;
418 476
 			} 
419 477
 			if ($line != '') {
420
-				if ($date == '') $date = date('Y/m/d H:m');
478
+				if ($date == '') {
479
+					$date = date('Y/m/d H:m');
480
+				}
421 481
 				$pos = 0;
422 482
 				$pieces = preg_split('/\s/',$line);
423
-				if ($pieces[0] == 'METAR') $pos++;
424
-				if (strlen($pieces[$pos]) != 4) $pos++;
483
+				if ($pieces[0] == 'METAR') {
484
+					$pos++;
485
+				}
486
+				if (strlen($pieces[$pos]) != 4) {
487
+					$pos++;
488
+				}
425 489
 				$location = $pieces[$pos];
426 490
 				if (strlen($location == 4)) {
427 491
 					$this->addMETAR($location,$line,$date);
428 492
 					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
429
-				} else return array();
493
+				} else {
494
+					return array();
495
+				}
430 496
 			}
431 497
 		}
432 498
 		return array();
Please login to merge, or discard this patch.
require/class.TrackerImport.php 3 patches
Indentation   +174 added lines, -174 removed lines patch added patch discarded remove patch
@@ -7,16 +7,16 @@  discard block
 block discarded – undo
7 7
 require_once(dirname(__FILE__).'/class.Source.php');
8 8
 
9 9
 class TrackerImport {
10
-    private $all_tracked = array();
11
-    private $last_delete_hourly = 0;
12
-    private $last_delete = 0;
13
-    private $stats = array();
14
-    private $tmd = 0;
15
-    private $source_location = array();
16
-    public $db = null;
17
-    public $nb = 0;
10
+	private $all_tracked = array();
11
+	private $last_delete_hourly = 0;
12
+	private $last_delete = 0;
13
+	private $stats = array();
14
+	private $tmd = 0;
15
+	private $source_location = array();
16
+	public $db = null;
17
+	public $nb = 0;
18 18
 
19
-    public function __construct($dbc = null) {
19
+	public function __construct($dbc = null) {
20 20
 	global $globalBeta;
21 21
 	$Connection = new Connection($dbc);
22 22
 	$this->db = $Connection->db();
@@ -38,50 +38,50 @@  discard block
 block discarded – undo
38 38
 	    }
39 39
 	}
40 40
 	*/
41
-    }
41
+	}
42 42
 
43
-    public function checkAll() {
43
+	public function checkAll() {
44 44
 	global $globalDebug;
45 45
 	if ($globalDebug) echo "Update last seen tracked data...\n";
46 46
 	foreach ($this->all_tracked as $key => $flight) {
47
-	    if (isset($this->all_tracked[$key]['id'])) {
47
+		if (isset($this->all_tracked[$key]['id'])) {
48 48
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
49
-    		$Tracker = new Tracker($this->db);
50
-        	$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
51
-            }
49
+			$Tracker = new Tracker($this->db);
50
+			$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
51
+			}
52
+	}
52 53
 	}
53
-    }
54 54
 
55
-    public function del() {
55
+	public function del() {
56 56
 	global $globalDebug;
57 57
 	// Delete old infos
58 58
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
59 59
 	foreach ($this->all_tracked as $key => $flight) {
60
-    	    if (isset($flight['lastupdate'])) {
61
-        	if ($flight['lastupdate'] < (time()-3000)) {
62
-            	    if (isset($this->all_tracked[$key]['id'])) {
63
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
60
+			if (isset($flight['lastupdate'])) {
61
+			if ($flight['lastupdate'] < (time()-3000)) {
62
+					if (isset($this->all_tracked[$key]['id'])) {
63
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
64 64
 			/*
65 65
 			$TrackerLive = new TrackerLive();
66 66
             		$TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']);
67 67
 			$TrackerLive->db = null;
68 68
 			*/
69
-            		//$real_arrival = $this->arrival($key);
70
-            		$Tracker = new Tracker($this->db);
71
-            		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
69
+					//$real_arrival = $this->arrival($key);
70
+					$Tracker = new Tracker($this->db);
71
+					if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
72 72
 				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
73 73
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
74 74
 			}
75 75
 			// Put in archive
76 76
 //			$Tracker->db = null;
77
-            	    }
78
-            	    unset($this->all_tracked[$key]);
79
-    	        }
80
-	    }
81
-        }
82
-    }
77
+					}
78
+					unset($this->all_tracked[$key]);
79
+				}
80
+		}
81
+		}
82
+	}
83 83
 
84
-    public function add($line) {
84
+	public function add($line) {
85 85
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChangeTracker, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked;
86 86
 	if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') $globalCoordMinChangeTracker = '0.015';
87 87
 	date_default_timezone_set('UTC');
@@ -90,47 +90,47 @@  discard block
 block discarded – undo
90 90
 	
91 91
 	// SBS format is CSV format
92 92
 	if(is_array($line) && isset($line['ident'])) {
93
-	    //print_r($line);
94
-  	    if (isset($line['ident'])) {
93
+		//print_r($line);
94
+  		if (isset($line['ident'])) {
95 95
 
96 96
 		
97 97
 		// Increment message number
98 98
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
99
-		    $current_date = date('Y-m-d');
100
-		    if (isset($line['source_name'])) $source = $line['source_name'];
101
-		    else $source = '';
102
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
103
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
104
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
105
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
106
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
99
+			$current_date = date('Y-m-d');
100
+			if (isset($line['source_name'])) $source = $line['source_name'];
101
+			else $source = '';
102
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
103
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
104
+				$this->stats[$current_date][$source]['msg']['date'] = time();
105
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
106
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
107 107
 		}
108 108
 		
109 109
 		
110 110
 		$Common = new Common();
111
-	        if (!isset($line['id'])) $id = trim($line['ident']);
112
-	        else $id = trim($line['id']);
111
+			if (!isset($line['id'])) $id = trim($line['ident']);
112
+			else $id = trim($line['id']);
113 113
 		
114 114
 		if (!isset($this->all_tracked[$id])) {
115
-		    $this->all_tracked[$id] = array();
116
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
117
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
118
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
119
-		    if (!isset($line['id'])) {
115
+			$this->all_tracked[$id] = array();
116
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
117
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
118
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
119
+			if (!isset($line['id'])) {
120 120
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
121 121
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
122
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
123
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
122
+			 } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
123
+			if ($globalAllTracked !== FALSE) $dataFound = true;
124 124
 		}
125 125
 		
126 126
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
127
-		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
127
+			if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
128 128
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
129
-		    } else {
129
+			} else {
130 130
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
131 131
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
132 132
 				return '';
133
-		    }
133
+			}
134 134
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
135 135
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
136 136
 			return '';
@@ -147,38 +147,38 @@  discard block
 block discarded – undo
147 147
 		
148 148
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
149 149
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
150
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
151
-		    if ($this->all_tracked[$id]['addedTracker'] == 1) {
150
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
151
+			if ($this->all_tracked[$id]['addedTracker'] == 1) {
152 152
 			$timeelapsed = microtime(true);
153
-            		$Tracker = new Tracker($this->db);
154
-            		$fromsource = NULL;
155
-            		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
153
+					$Tracker = new Tracker($this->db);
154
+					$fromsource = NULL;
155
+					$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
156 156
 			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
157 157
 			$Tracker->db = null;
158 158
 			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
159
-		    }
160
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
159
+			}
160
+			if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
161 161
 		}
162 162
 
163 163
 		if (isset($line['speed']) && $line['speed'] != '') {
164
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
165
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
164
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
165
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
166 166
 		} else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
167
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
168
-		    if ($distance > 100 && $distance < 10000) {
167
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
168
+			if ($distance > 100 && $distance < 10000) {
169 169
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
170 170
 			$speed = $speed*3.6;
171 171
 			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
172 172
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
173
-		    }
173
+			}
174 174
 		}
175 175
 
176
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
177
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
178
-	    	    else unset($timediff);
179
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
176
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
177
+				if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
178
+				else unset($timediff);
179
+				if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
180 180
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
181
-			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.08)) {
181
+				if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.08)) {
182 182
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
183 183
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
184 184
 				$this->all_tracked[$id]['putinarchive'] = true;
@@ -192,30 +192,30 @@  discard block
 block discarded – undo
192 192
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
193 193
 				$this->tmd = 0;
194 194
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
195
-			    }
195
+				}
196 196
 			}
197 197
 
198 198
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
199 199
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
200 200
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
201
-				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
202
-				    $dataFound = true;
203
-				    $this->all_tracked[$id]['time_last_coord'] = time();
201
+					$this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
202
+					$dataFound = true;
203
+					$this->all_tracked[$id]['time_last_coord'] = time();
204 204
 				}
205 205
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
206 206
 			}
207 207
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
208
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
208
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
209 209
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
210 210
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
211
-				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
212
-				    $dataFound = true;
213
-				    $this->all_tracked[$id]['time_last_coord'] = time();
211
+					$this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
212
+					$dataFound = true;
213
+					$this->all_tracked[$id]['time_last_coord'] = time();
214 214
 				}
215 215
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
216 216
 			}
217 217
 
218
-		    } else if ($globalDebug && $timediff > 20) {
218
+			} else if ($globalDebug && $timediff > 20) {
219 219
 			$this->tmd = $this->tmd + 1;
220 220
 			if ($line['latitude'] != $this->all_tracked[$id]['latitude'] && $line['longitude'] != $this->all_tracked[$id]['longitude']) {
221 221
 				echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
@@ -223,131 +223,131 @@  discard block
 block discarded – undo
223 223
 				echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
224 224
 				echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
225 225
 			}
226
-		    }
226
+			}
227 227
 		}
228 228
 		if (isset($line['last_update']) && $line['last_update'] != '') {
229
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
230
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
229
+			if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
230
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
231 231
 		}
232 232
 		if (isset($line['format_source']) && $line['format_source'] != '') {
233
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
233
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
234 234
 		}
235 235
 		if (isset($line['source_name']) && $line['source_name'] != '') {
236
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
236
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
237 237
 		}
238 238
 		if (isset($line['comment']) && $line['comment'] != '') {
239
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
240
-		    //$dataFound = true;
239
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
240
+			//$dataFound = true;
241 241
 		}
242 242
 		if (isset($line['type']) && $line['type'] != '') {
243
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
244
-		    //$dataFound = true;
243
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
244
+			//$dataFound = true;
245 245
 		}
246 246
 
247 247
 		if (isset($line['altitude']) && $line['altitude'] != '') {
248
-		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
248
+			//if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
249 249
 			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
250 250
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
251 251
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
252 252
 			//$dataFound = true;
253
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
253
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
254 254
   		}
255 255
 
256 256
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
257
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
257
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
258 258
 		}
259 259
 		
260 260
 		if (isset($line['heading']) && $line['heading'] != '') {
261
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
262
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
263
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
264
-		    //$dataFound = true;
261
+			if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
262
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
263
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
264
+			//$dataFound = true;
265 265
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
266
-  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
267
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
268
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
269
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
266
+  			$heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
267
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
268
+			if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
269
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
270 270
   		}
271 271
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
272 272
 
273 273
 		if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) {
274
-		    $this->all_tracked[$id]['lastupdate'] = time();
275
-		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
276
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
277
-			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
274
+			$this->all_tracked[$id]['lastupdate'] = time();
275
+			if ($this->all_tracked[$id]['addedTracker'] == 0) {
276
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
277
+				if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
278 278
 				if ($globalDebug) echo "Check if aircraft is already in DB...";
279 279
 				$timeelapsed = microtime(true);
280 280
 				$TrackerLive = new TrackerLive($this->db);
281 281
 				if (isset($line['id'])) {
282
-				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
283
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
282
+					$recent_ident = $TrackerLive->checkIdRecent($line['id']);
283
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
284 284
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
285
-				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
286
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
285
+					$recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
286
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
287 287
 				} else $recent_ident = '';
288 288
 				$TrackerLive->db=null;
289 289
 
290 290
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
291 291
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
292
-			    } else {
292
+				} else {
293 293
 				$recent_ident = '';
294 294
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
295
-			    }
296
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
297
-			    if($recent_ident == "")
298
-			    {
295
+				}
296
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
297
+				if($recent_ident == "")
298
+				{
299 299
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
300 300
 				//adds the spotter data for the archive
301
-				    $highlight = '';
302
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
303
-				    $timeelapsed = microtime(true);
304
-				    $Tracker = new Tracker($this->db);
305
-				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
306
-				    $Tracker->db = null;
307
-				    if ($globalDebug && isset($result)) echo $result."\n";
308
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
301
+					$highlight = '';
302
+					if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
303
+					$timeelapsed = microtime(true);
304
+					$Tracker = new Tracker($this->db);
305
+					$result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
306
+					$Tracker->db = null;
307
+					if ($globalDebug && isset($result)) echo $result."\n";
308
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
309 309
 				    
310 310
 				    
311
-				    // Add source stat in DB
312
-				    $Stats = new Stats($this->db);
313
-				    if (!empty($this->stats)) {
311
+					// Add source stat in DB
312
+					$Stats = new Stats($this->db);
313
+					if (!empty($this->stats)) {
314 314
 					if ($globalDebug) echo 'Add source stats : ';
315
-				        foreach($this->stats as $date => $data) {
316
-					    foreach($data as $source => $sourced) {
317
-					        //print_r($sourced);
318
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
319
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
320
-				    		if (isset($sourced['msg'])) {
321
-				    		    if (time() - $sourced['msg']['date'] > 10) {
322
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
323
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
324
-			    			        unset($this->stats[$date][$source]['msg']);
325
-			    			    }
326
-			    			}
327
-			    		    }
328
-			    		    if ($date != date('Y-m-d')) {
329
-			    			unset($this->stats[$date]);
330
-			    		    }
331
-				    	}
332
-				    	if ($globalDebug) echo 'Done'."\n";
315
+						foreach($this->stats as $date => $data) {
316
+						foreach($data as $source => $sourced) {
317
+							//print_r($sourced);
318
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
319
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
320
+							if (isset($sourced['msg'])) {
321
+								if (time() - $sourced['msg']['date'] > 10) {
322
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
323
+									echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
324
+									unset($this->stats[$date][$source]['msg']);
325
+								}
326
+							}
327
+							}
328
+							if ($date != date('Y-m-d')) {
329
+							unset($this->stats[$date]);
330
+							}
331
+						}
332
+						if ($globalDebug) echo 'Done'."\n";
333 333
 
334
-				    }
335
-				    $Stats->db = null;
334
+					}
335
+					$Stats->db = null;
336 336
 				    
337
-				    $this->del();
337
+					$this->del();
338 338
 				//$ignoreImport = false;
339 339
 				$this->all_tracked[$id]['addedTracker'] = 1;
340 340
 				//print_r($this->all_tracked[$id]);
341 341
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
342
-				    if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
343
-				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
344
-				    $TrackerLive = new TrackerLive($this->db);
345
-				    $TrackerLive->deleteLiveTrackerData();
346
-				    $TrackerLive->db=null;
347
-				    if ($globalDebug) echo " Done\n";
348
-				    $this->last_delete = time();
342
+					if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
343
+					//TrackerLive->deleteLiveTrackerDataNotUpdated();
344
+					$TrackerLive = new TrackerLive($this->db);
345
+					$TrackerLive->deleteLiveTrackerData();
346
+					$TrackerLive->db=null;
347
+					if ($globalDebug) echo " Done\n";
348
+					$this->last_delete = time();
349 349
 				}
350
-			    } else {
350
+				} else {
351 351
 				$this->all_tracked[$id]['id'] = $recent_ident;
352 352
 				$this->all_tracked[$id]['addedTracker'] = 1;
353 353
 				if (isset($globalDaemon) && !$globalDaemon) {
@@ -356,16 +356,16 @@  discard block
 block discarded – undo
356 356
 					$Tracker->db = null;
357 357
 				}
358 358
 				
359
-			    }
359
+				}
360 360
 			}
361
-		    }
362
-		    //adds the spotter LIVE data
363
-		    if ($globalDebug) {
361
+			}
362
+			//adds the spotter LIVE data
363
+			if ($globalDebug) {
364 364
 			echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Altitude : '.$this->all_tracked[$id]['altitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n";
365
-		    }
366
-		    $ignoreImport = false;
365
+			}
366
+			$ignoreImport = false;
367 367
 
368
-		    if (!$ignoreImport) {
368
+			if (!$ignoreImport) {
369 369
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
370 370
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
371 371
 				$timeelapsed = microtime(true);
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 					if ($stats_heading == 16) $stats_heading = 0;
404 404
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
405 405
 						for ($i=0;$i<=15;$i++) {
406
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
406
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
407 407
 						}
408 408
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
409 409
 					} else {
@@ -416,11 +416,11 @@  discard block
 block discarded – undo
416 416
 					//var_dump($this->stats);
417 417
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
418 418
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
419
-						    end($this->stats[$current_date][$source]['hist']);
420
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
419
+							end($this->stats[$current_date][$source]['hist']);
420
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
421 421
 						} else $mini = 0;
422 422
 						for ($i=$mini;$i<=$distance;$i+=10) {
423
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
423
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
424 424
 						}
425 425
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
426 426
 					} else {
@@ -436,22 +436,22 @@  discard block
 block discarded – undo
436 436
 			
437 437
 			
438 438
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
439
-			    if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
440
-			    $TrackerLive = new TrackerLive($this->db);
441
-			    $TrackerLive->deleteLiveTrackerDataNotUpdated();
442
-			    $TrackerLive->db = null;
443
-			    //TrackerLive->deleteLiveTrackerData();
444
-			    if ($globalDebug) echo " Done\n";
445
-			    $this->last_delete_hourly = time();
439
+				if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
440
+				$TrackerLive = new TrackerLive($this->db);
441
+				$TrackerLive->deleteLiveTrackerDataNotUpdated();
442
+				$TrackerLive->db = null;
443
+				//TrackerLive->deleteLiveTrackerData();
444
+				if ($globalDebug) echo " Done\n";
445
+				$this->last_delete_hourly = time();
446 446
 			}
447 447
 			
448
-		    }
449
-		    //$ignoreImport = false;
448
+			}
449
+			//$ignoreImport = false;
450 450
 		}
451 451
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
452 452
 		if ($send) return $this->all_tracked[$id];
453
-	    }
453
+		}
454
+	}
454 455
 	}
455
-    }
456 456
 }
457 457
 ?>
Please login to merge, or discard this patch.
Spacing   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 	    if (isset($this->all_tracked[$key]['id'])) {
48 48
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
49 49
     		$Tracker = new Tracker($this->db);
50
-        	$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
50
+        	$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['altitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']);
51 51
             }
52 52
 	}
53 53
     }
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
59 59
 	foreach ($this->all_tracked as $key => $flight) {
60 60
     	    if (isset($flight['lastupdate'])) {
61
-        	if ($flight['lastupdate'] < (time()-3000)) {
61
+        	if ($flight['lastupdate'] < (time() - 3000)) {
62 62
             	    if (isset($this->all_tracked[$key]['id'])) {
63 63
             		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
64 64
 			/*
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
             		//$real_arrival = $this->arrival($key);
70 70
             		$Tracker = new Tracker($this->db);
71 71
             		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
72
-				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
72
+				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['altitude'], $this->all_tracked[$key]['speed']);
73 73
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
74 74
 			}
75 75
 			// Put in archive
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	$send = false;
90 90
 	
91 91
 	// SBS format is CSV format
92
-	if(is_array($line) && isset($line['ident'])) {
92
+	if (is_array($line) && isset($line['ident'])) {
93 93
 	    //print_r($line);
94 94
   	    if (isset($line['ident'])) {
95 95
 
@@ -113,33 +113,33 @@  discard block
 block discarded – undo
113 113
 		
114 114
 		if (!isset($this->all_tracked[$id])) {
115 115
 		    $this->all_tracked[$id] = array();
116
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
117
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
118
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
116
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedTracker' => 0));
117
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => ''));
118
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time()));
119 119
 		    if (!isset($line['id'])) {
120 120
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
121
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
122
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
121
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi')));
122
+		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id']));
123 123
 		    if ($globalAllTracked !== FALSE) $dataFound = true;
124 124
 		}
125 125
 		
126
-		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
126
+		if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) {
127 127
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
128
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
128
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime']));
129 129
 		    } else {
130 130
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
131 131
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
132 132
 				return '';
133 133
 		    }
134
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
134
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) {
135 135
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
136 136
 			return '';
137
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
137
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) {
138 138
 			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
139 139
 			return '';
140 140
 		} elseif (!isset($line['datetime'])) {
141 141
 			date_default_timezone_set('UTC');
142
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
142
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s')));
143 143
 		} else {
144 144
 			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
145 145
 			return '';
@@ -147,38 +147,38 @@  discard block
 block discarded – undo
147 147
 		
148 148
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
149 149
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
150
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
150
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident'])));
151 151
 		    if ($this->all_tracked[$id]['addedTracker'] == 1) {
152 152
 			$timeelapsed = microtime(true);
153 153
             		$Tracker = new Tracker($this->db);
154 154
             		$fromsource = NULL;
155
-            		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
155
+            		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource);
156 156
 			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
157 157
 			$Tracker->db = null;
158
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
158
+			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
159 159
 		    }
160
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
160
+		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident']));
161 161
 		}
162 162
 
163 163
 		if (isset($line['speed']) && $line['speed'] != '') {
164
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
165
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
164
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed'])));
165
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true));
166 166
 		} else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
167
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
167
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm');
168 168
 		    if ($distance > 100 && $distance < 10000) {
169 169
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
170 170
 			$speed = $speed*3.6;
171
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
171
+			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed)));
172 172
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
173 173
 		    }
174 174
 		}
175 175
 
176 176
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
177
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
177
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']);
178 178
 	    	    else unset($timediff);
179
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
179
+	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')))) {
180 180
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
181
-			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.08)) {
181
+			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['livedb_latitude'], $this->all_tracked[$id]['livedb_longitude'], $line['latitude'], $line['longitude'], 0.08)) {
182 182
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
183 183
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
184 184
 				$this->all_tracked[$id]['putinarchive'] = true;
@@ -186,10 +186,10 @@  discard block
 block discarded – undo
186 186
 				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
187 187
 				$timeelapsed = microtime(true);
188 188
 				$Tracker = new Tracker($this->db);
189
-				$all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
189
+				$all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
190 190
 				if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
191 191
 				$Tracker->db = null;
192
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
192
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
193 193
 				$this->tmd = 0;
194 194
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
195 195
 			    }
@@ -197,75 +197,75 @@  discard block
 block discarded – undo
197 197
 
198 198
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
199 199
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
200
-				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
200
+				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
201 201
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
202 202
 				    $dataFound = true;
203 203
 				    $this->all_tracked[$id]['time_last_coord'] = time();
204 204
 				}
205
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
205
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude']));
206 206
 			}
207 207
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
208 208
 			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
209 209
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
210
-				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
210
+				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
211 211
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
212 212
 				    $dataFound = true;
213 213
 				    $this->all_tracked[$id]['time_last_coord'] = time();
214 214
 				}
215
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
215
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude']));
216 216
 			}
217 217
 
218 218
 		    } else if ($globalDebug && $timediff > 20) {
219 219
 			$this->tmd = $this->tmd + 1;
220 220
 			if ($line['latitude'] != $this->all_tracked[$id]['latitude'] && $line['longitude'] != $this->all_tracked[$id]['longitude']) {
221 221
 				echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
222
-				echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
223
-				echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
222
+				echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -";
223
+				echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
224 224
 				echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
225 225
 			}
226 226
 		    }
227 227
 		}
228 228
 		if (isset($line['last_update']) && $line['last_update'] != '') {
229 229
 		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
230
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
230
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update']));
231 231
 		}
232 232
 		if (isset($line['format_source']) && $line['format_source'] != '') {
233
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
233
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source']));
234 234
 		}
235 235
 		if (isset($line['source_name']) && $line['source_name'] != '') {
236
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
236
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name']));
237 237
 		}
238 238
 		if (isset($line['comment']) && $line['comment'] != '') {
239
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
239
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('comment' => $line['comment']));
240 240
 		    //$dataFound = true;
241 241
 		}
242 242
 		if (isset($line['type']) && $line['type'] != '') {
243
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
243
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type']));
244 244
 		    //$dataFound = true;
245 245
 		}
246 246
 
247 247
 		if (isset($line['altitude']) && $line['altitude'] != '') {
248 248
 		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
249
-			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
250
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
251
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
249
+			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
250
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('altitude' => $line['altitude']));
251
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('altitude_real' => $line['altitude']));
252 252
 			//$dataFound = true;
253 253
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
254 254
   		}
255 255
 
256 256
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
257
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
257
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true));
258 258
 		}
259 259
 		
260 260
 		if (isset($line['heading']) && $line['heading'] != '') {
261
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
262
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
263
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
261
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
262
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading'])));
263
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true));
264 264
 		    //$dataFound = true;
265 265
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
266
-  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
267
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
268
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
266
+  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
267
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading)));
268
+		    if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
269 269
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
270 270
   		}
271 271
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
@@ -273,54 +273,54 @@  discard block
 block discarded – undo
273 273
 		if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) {
274 274
 		    $this->all_tracked[$id]['lastupdate'] = time();
275 275
 		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
276
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
276
+		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
277 277
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
278 278
 				if ($globalDebug) echo "Check if aircraft is already in DB...";
279 279
 				$timeelapsed = microtime(true);
280 280
 				$TrackerLive = new TrackerLive($this->db);
281 281
 				if (isset($line['id'])) {
282 282
 				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
283
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
283
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
284 284
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
285 285
 				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
286
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
286
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
287 287
 				} else $recent_ident = '';
288
-				$TrackerLive->db=null;
288
+				$TrackerLive->db = null;
289 289
 
290 290
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
291 291
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
292 292
 			    } else {
293 293
 				$recent_ident = '';
294
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
294
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0));
295 295
 			    }
296 296
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
297
-			    if($recent_ident == "")
297
+			    if ($recent_ident == "")
298 298
 			    {
299 299
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
300 300
 				//adds the spotter data for the archive
301 301
 				    $highlight = '';
302
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
302
+				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
303 303
 				    $timeelapsed = microtime(true);
304 304
 				    $Tracker = new Tracker($this->db);
305
-				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
305
+				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']);
306 306
 				    $Tracker->db = null;
307 307
 				    if ($globalDebug && isset($result)) echo $result."\n";
308
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
308
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
309 309
 				    
310 310
 				    
311 311
 				    // Add source stat in DB
312 312
 				    $Stats = new Stats($this->db);
313 313
 				    if (!empty($this->stats)) {
314 314
 					if ($globalDebug) echo 'Add source stats : ';
315
-				        foreach($this->stats as $date => $data) {
316
-					    foreach($data as $source => $sourced) {
315
+				        foreach ($this->stats as $date => $data) {
316
+					    foreach ($data as $source => $sourced) {
317 317
 					        //print_r($sourced);
318
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
319
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
318
+				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar_tracker', $date);
319
+				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist_tracker', $date);
320 320
 				    		if (isset($sourced['msg'])) {
321 321
 				    		    if (time() - $sourced['msg']['date'] > 10) {
322 322
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
323
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
323
+				    		        echo $Stats->addStatSource($nbmsg, $source, 'msg_tracker', $date);
324 324
 			    			        unset($this->stats[$date][$source]['msg']);
325 325
 			    			    }
326 326
 			    			}
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
344 344
 				    $TrackerLive = new TrackerLive($this->db);
345 345
 				    $TrackerLive->deleteLiveTrackerData();
346
-				    $TrackerLive->db=null;
346
+				    $TrackerLive->db = null;
347 347
 				    if ($globalDebug) echo " Done\n";
348 348
 				    $this->last_delete = time();
349 349
 				}
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
352 352
 				$this->all_tracked[$id]['addedTracker'] = 1;
353 353
 				if (isset($globalDaemon) && !$globalDaemon) {
354 354
 					$Tracker = new Tracker($this->db);
355
-					$Tracker->updateLatestTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['altitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']);
355
+					$Tracker->updateLatestTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime']);
356 356
 					$Tracker->db = null;
357 357
 				}
358 358
 				
@@ -366,14 +366,14 @@  discard block
 block discarded – undo
366 366
 		    $ignoreImport = false;
367 367
 
368 368
 		    if (!$ignoreImport) {
369
-			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
369
+			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
370 370
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
371 371
 				$timeelapsed = microtime(true);
372 372
 				$TrackerLive = new TrackerLive($this->db);
373
-				$result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
373
+				$result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['comment'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']);
374 374
 				$TrackerLive->db = null;
375 375
 				$this->all_tracked[$id]['putinarchive'] = false;
376
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
376
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
377 377
 
378 378
 				// Put statistics in $this->stats variable
379 379
 				
@@ -390,19 +390,19 @@  discard block
 block discarded – undo
390 390
 							$latitude = $globalCenterLatitude;
391 391
 							$longitude = $globalCenterLongitude;
392 392
 						}
393
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
393
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
394 394
 					} else {
395 395
 						$latitude = $this->source_location[$source]['latitude'];
396 396
 						$longitude = $this->source_location[$source]['longitude'];
397 397
 					}
398
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
398
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
399 399
 					//$stats_heading = $stats_heading%22.5;
400 400
 					$stats_heading = round($stats_heading/22.5);
401
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
401
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
402 402
 					$current_date = date('Y-m-d');
403 403
 					if ($stats_heading == 16) $stats_heading = 0;
404 404
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
405
-						for ($i=0;$i<=15;$i++) {
405
+						for ($i = 0; $i <= 15; $i++) {
406 406
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
407 407
 						}
408 408
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
@@ -417,9 +417,9 @@  discard block
 block discarded – undo
417 417
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
418 418
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
419 419
 						    end($this->stats[$current_date][$source]['hist']);
420
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
420
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
421 421
 						} else $mini = 0;
422
-						for ($i=$mini;$i<=$distance;$i+=10) {
422
+						for ($i = $mini; $i <= $distance; $i += 10) {
423 423
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
424 424
 						}
425 425
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 				$this->all_tracked[$id]['lastupdate'] = time();
432 432
 				if ($this->all_tracked[$id]['putinarchive']) $send = true;
433 433
 				if ($globalDebug) echo $result."\n";
434
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
434
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
435 435
 			//$this->del();
436 436
 			
437 437
 			
Please login to merge, or discard this patch.
Braces   +190 added lines, -65 removed lines patch added patch discarded remove patch
@@ -42,7 +42,9 @@  discard block
 block discarded – undo
42 42
 
43 43
     public function checkAll() {
44 44
 	global $globalDebug;
45
-	if ($globalDebug) echo "Update last seen tracked data...\n";
45
+	if ($globalDebug) {
46
+		echo "Update last seen tracked data...\n";
47
+	}
46 48
 	foreach ($this->all_tracked as $key => $flight) {
47 49
 	    if (isset($this->all_tracked[$key]['id'])) {
48 50
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
@@ -55,12 +57,16 @@  discard block
 block discarded – undo
55 57
     public function del() {
56 58
 	global $globalDebug;
57 59
 	// Delete old infos
58
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
60
+	if ($globalDebug) {
61
+		echo 'Delete old values and update latest data...'."\n";
62
+	}
59 63
 	foreach ($this->all_tracked as $key => $flight) {
60 64
     	    if (isset($flight['lastupdate'])) {
61 65
         	if ($flight['lastupdate'] < (time()-3000)) {
62 66
             	    if (isset($this->all_tracked[$key]['id'])) {
63
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
67
+            		if ($globalDebug) {
68
+            			echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
69
+            		}
64 70
 			/*
65 71
 			$TrackerLive = new TrackerLive();
66 72
             		$TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']);
@@ -70,7 +76,9 @@  discard block
 block discarded – undo
70 76
             		$Tracker = new Tracker($this->db);
71 77
             		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
72 78
 				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
73
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
79
+				if ($globalDebug && $result != 'success') {
80
+					echo '!!! ERROR : '.$result."\n";
81
+				}
74 82
 			}
75 83
 			// Put in archive
76 84
 //			$Tracker->db = null;
@@ -83,7 +91,9 @@  discard block
 block discarded – undo
83 91
 
84 92
     public function add($line) {
85 93
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChangeTracker, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked;
86
-	if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') $globalCoordMinChangeTracker = '0.015';
94
+	if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') {
95
+		$globalCoordMinChangeTracker = '0.015';
96
+	}
87 97
 	date_default_timezone_set('UTC');
88 98
 	$dataFound = false;
89 99
 	$send = false;
@@ -97,19 +107,29 @@  discard block
 block discarded – undo
97 107
 		// Increment message number
98 108
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
99 109
 		    $current_date = date('Y-m-d');
100
-		    if (isset($line['source_name'])) $source = $line['source_name'];
101
-		    else $source = '';
102
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
110
+		    if (isset($line['source_name'])) {
111
+		    	$source = $line['source_name'];
112
+		    } else {
113
+		    	$source = '';
114
+		    }
115
+		    if ($source == '' || $line['format_source'] == 'aprs') {
116
+		    	$source = $line['format_source'];
117
+		    }
103 118
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
104 119
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
105 120
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
106
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
121
+		    } else {
122
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
123
+		    }
107 124
 		}
108 125
 		
109 126
 		
110 127
 		$Common = new Common();
111
-	        if (!isset($line['id'])) $id = trim($line['ident']);
112
-	        else $id = trim($line['id']);
128
+	        if (!isset($line['id'])) {
129
+	        	$id = trim($line['ident']);
130
+	        } else {
131
+	        	$id = trim($line['id']);
132
+	        }
113 133
 		
114 134
 		if (!isset($this->all_tracked[$id])) {
115 135
 		    $this->all_tracked[$id] = array();
@@ -117,31 +137,46 @@  discard block
 block discarded – undo
117 137
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
118 138
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
119 139
 		    if (!isset($line['id'])) {
120
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
140
+			if (!isset($globalDaemon)) {
141
+				$globalDaemon = TRUE;
142
+			}
121 143
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
122
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
123
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
144
+		     } else {
145
+		     	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
146
+		     }
147
+		    if ($globalAllTracked !== FALSE) {
148
+		    	$dataFound = true;
149
+		    }
124 150
 		}
125 151
 		
126 152
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
127 153
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
128 154
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
129 155
 		    } else {
130
-				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
131
-				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
156
+				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
157
+					echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
158
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
159
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
160
+				}
132 161
 				return '';
133 162
 		    }
134 163
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
135
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
164
+			if ($globalDebug) {
165
+				echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
166
+			}
136 167
 			return '';
137 168
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
138
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
169
+			if ($globalDebug) {
170
+				echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
171
+			}
139 172
 			return '';
140 173
 		} elseif (!isset($line['datetime'])) {
141 174
 			date_default_timezone_set('UTC');
142 175
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
143 176
 		} else {
144
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
177
+			if ($globalDebug) {
178
+				echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
179
+			}
145 180
 			return '';
146 181
 		}
147 182
 		
@@ -153,11 +188,17 @@  discard block
 block discarded – undo
153 188
             		$Tracker = new Tracker($this->db);
154 189
             		$fromsource = NULL;
155 190
             		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
156
-			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
191
+			if ($globalDebug && $result != 'success') {
192
+				echo '!!! ERROR : '.$result."\n";
193
+			}
157 194
 			$Tracker->db = null;
158
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
195
+			if ($globalDebugTimeElapsed) {
196
+				echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
197
+			}
198
+		    }
199
+		    if (!isset($this->all_tracked[$id]['id'])) {
200
+		    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
159 201
 		    }
160
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
161 202
 		}
162 203
 
163 204
 		if (isset($line['speed']) && $line['speed'] != '') {
@@ -168,14 +209,21 @@  discard block
 block discarded – undo
168 209
 		    if ($distance > 100 && $distance < 10000) {
169 210
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
170 211
 			$speed = $speed*3.6;
171
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
172
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
212
+			if ($speed < 1000) {
213
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
214
+			}
215
+  			if ($globalDebug) {
216
+  				echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
217
+  			}
173 218
 		    }
174 219
 		}
175 220
 
176 221
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
177
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
178
-	    	    else unset($timediff);
222
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) {
223
+	    	    	$timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
224
+	    	    } else {
225
+	    	    	unset($timediff);
226
+	    	    }
179 227
 	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
180 228
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
181 229
 			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.08)) {
@@ -183,20 +231,30 @@  discard block
 block discarded – undo
183 231
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
184 232
 				$this->all_tracked[$id]['putinarchive'] = true;
185 233
 				
186
-				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
234
+				if ($globalDebug) {
235
+					echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
236
+				}
187 237
 				$timeelapsed = microtime(true);
188 238
 				$Tracker = new Tracker($this->db);
189 239
 				$all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
190
-				if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
240
+				if (!empty($all_country)) {
241
+					$this->all_tracked[$id]['over_country'] = $all_country['iso2'];
242
+				}
191 243
 				$Tracker->db = null;
192
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
244
+				if ($globalDebugTimeElapsed) {
245
+					echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
246
+				}
193 247
 				$this->tmd = 0;
194
-				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
248
+				if ($globalDebug) {
249
+					echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
250
+				}
195 251
 			    }
196 252
 			}
197 253
 
198 254
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
199
-				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
255
+				if (!isset($this->all_tracked[$id]['archive_latitude'])) {
256
+					$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
257
+				}
200 258
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
201 259
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
202 260
 				    $dataFound = true;
@@ -205,8 +263,12 @@  discard block
 block discarded – undo
205 263
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
206 264
 			}
207 265
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
208
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
209
-				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
266
+			    if ($line['longitude'] > 180) {
267
+			    	$line['longitude'] = $line['longitude'] - 360;
268
+			    }
269
+				if (!isset($this->all_tracked[$id]['archive_longitude'])) {
270
+					$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
271
+				}
210 272
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
211 273
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
212 274
 				    $dataFound = true;
@@ -226,7 +288,9 @@  discard block
 block discarded – undo
226 288
 		    }
227 289
 		}
228 290
 		if (isset($line['last_update']) && $line['last_update'] != '') {
229
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
291
+		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) {
292
+		    	$dataFound = true;
293
+		    }
230 294
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
231 295
 		}
232 296
 		if (isset($line['format_source']) && $line['format_source'] != '') {
@@ -246,7 +310,9 @@  discard block
 block discarded – undo
246 310
 
247 311
 		if (isset($line['altitude']) && $line['altitude'] != '') {
248 312
 		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
249
-			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
313
+			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) {
314
+				$this->all_tracked[$id]['putinarchive'] = true;
315
+			}
250 316
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
251 317
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
252 318
 			//$dataFound = true;
@@ -258,15 +324,21 @@  discard block
 block discarded – undo
258 324
 		}
259 325
 		
260 326
 		if (isset($line['heading']) && $line['heading'] != '') {
261
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
327
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) {
328
+		    	$this->all_tracked[$id]['putinarchive'] = true;
329
+		    }
262 330
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
263 331
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
264 332
 		    //$dataFound = true;
265 333
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
266 334
   		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
267 335
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
268
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
269
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
336
+		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) {
337
+		    	$this->all_tracked[$id]['putinarchive'] = true;
338
+		    }
339
+  		    if ($globalDebug) {
340
+  		    	echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
341
+  		    }
270 342
   		}
271 343
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
272 344
 
@@ -275,20 +347,31 @@  discard block
 block discarded – undo
275 347
 		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
276 348
 		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
277 349
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
278
-				if ($globalDebug) echo "Check if aircraft is already in DB...";
350
+				if ($globalDebug) {
351
+					echo "Check if aircraft is already in DB...";
352
+				}
279 353
 				$timeelapsed = microtime(true);
280 354
 				$TrackerLive = new TrackerLive($this->db);
281 355
 				if (isset($line['id'])) {
282 356
 				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
283
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
357
+				    if ($globalDebugTimeElapsed) {
358
+				    	echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
359
+				    }
284 360
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
285 361
 				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
286
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
287
-				} else $recent_ident = '';
362
+				    if ($globalDebugTimeElapsed) {
363
+				    	echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
364
+				    }
365
+				} else {
366
+					$recent_ident = '';
367
+				}
288 368
 				$TrackerLive->db=null;
289 369
 
290
-				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
291
-				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
370
+				if ($globalDebug && $recent_ident == '') {
371
+					echo " Not in DB.\n";
372
+				} elseif ($globalDebug && $recent_ident != '') {
373
+					echo " Already in DB.\n";
374
+				}
292 375
 			    } else {
293 376
 				$recent_ident = '';
294 377
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
@@ -296,27 +379,41 @@  discard block
 block discarded – undo
296 379
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
297 380
 			    if($recent_ident == "")
298 381
 			    {
299
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
382
+				if ($globalDebug) {
383
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
384
+				}
300 385
 				//adds the spotter data for the archive
301 386
 				    $highlight = '';
302
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
387
+				    if (!isset($this->all_tracked[$id]['id'])) {
388
+				    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
389
+				    }
303 390
 				    $timeelapsed = microtime(true);
304 391
 				    $Tracker = new Tracker($this->db);
305 392
 				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
306 393
 				    $Tracker->db = null;
307
-				    if ($globalDebug && isset($result)) echo $result."\n";
308
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
394
+				    if ($globalDebug && isset($result)) {
395
+				    	echo $result."\n";
396
+				    }
397
+				    if ($globalDebugTimeElapsed) {
398
+				    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
399
+				    }
309 400
 				    
310 401
 				    
311 402
 				    // Add source stat in DB
312 403
 				    $Stats = new Stats($this->db);
313 404
 				    if (!empty($this->stats)) {
314
-					if ($globalDebug) echo 'Add source stats : ';
405
+					if ($globalDebug) {
406
+						echo 'Add source stats : ';
407
+					}
315 408
 				        foreach($this->stats as $date => $data) {
316 409
 					    foreach($data as $source => $sourced) {
317 410
 					        //print_r($sourced);
318
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
319
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
411
+				    	        if (isset($sourced['polar'])) {
412
+				    	        	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
413
+				    	        }
414
+				    	        if (isset($sourced['hist'])) {
415
+				    	        	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
416
+				    	        }
320 417
 				    		if (isset($sourced['msg'])) {
321 418
 				    		    if (time() - $sourced['msg']['date'] > 10) {
322 419
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -329,7 +426,9 @@  discard block
 block discarded – undo
329 426
 			    			unset($this->stats[$date]);
330 427
 			    		    }
331 428
 				    	}
332
-				    	if ($globalDebug) echo 'Done'."\n";
429
+				    	if ($globalDebug) {
430
+				    		echo 'Done'."\n";
431
+				    	}
333 432
 
334 433
 				    }
335 434
 				    $Stats->db = null;
@@ -339,12 +438,16 @@  discard block
 block discarded – undo
339 438
 				$this->all_tracked[$id]['addedTracker'] = 1;
340 439
 				//print_r($this->all_tracked[$id]);
341 440
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
342
-				    if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
441
+				    if ($globalDebug) {
442
+				    	echo "---- Deleting Live Tracker data older than 9 hours...";
443
+				    }
343 444
 				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
344 445
 				    $TrackerLive = new TrackerLive($this->db);
345 446
 				    $TrackerLive->deleteLiveTrackerData();
346 447
 				    $TrackerLive->db=null;
347
-				    if ($globalDebug) echo " Done\n";
448
+				    if ($globalDebug) {
449
+				    	echo " Done\n";
450
+				    }
348 451
 				    $this->last_delete = time();
349 452
 				}
350 453
 			    } else {
@@ -367,19 +470,25 @@  discard block
 block discarded – undo
367 470
 
368 471
 		    if (!$ignoreImport) {
369 472
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
370
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
473
+				if ($globalDebug) {
474
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
475
+				}
371 476
 				$timeelapsed = microtime(true);
372 477
 				$TrackerLive = new TrackerLive($this->db);
373 478
 				$result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
374 479
 				$TrackerLive->db = null;
375 480
 				$this->all_tracked[$id]['putinarchive'] = false;
376
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
481
+				if ($globalDebugTimeElapsed) {
482
+					echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
483
+				}
377 484
 
378 485
 				// Put statistics in $this->stats variable
379 486
 				
380 487
 				if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
381 488
 					$source = $this->all_tracked[$id]['source_name'];
382
-					if ($source == '') $source = $this->all_tracked[$id]['format_source'];
489
+					if ($source == '') {
490
+						$source = $this->all_tracked[$id]['format_source'];
491
+					}
383 492
 					if (!isset($this->source_location[$source])) {
384 493
 						$Location = new Source($this->db);
385 494
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -400,7 +509,9 @@  discard block
 block discarded – undo
400 509
 					$stats_heading = round($stats_heading/22.5);
401 510
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
402 511
 					$current_date = date('Y-m-d');
403
-					if ($stats_heading == 16) $stats_heading = 0;
512
+					if ($stats_heading == 16) {
513
+						$stats_heading = 0;
514
+					}
404 515
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
405 516
 						for ($i=0;$i<=15;$i++) {
406 517
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -418,7 +529,9 @@  discard block
 block discarded – undo
418 529
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
419 530
 						    end($this->stats[$current_date][$source]['hist']);
420 531
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
421
-						} else $mini = 0;
532
+						} else {
533
+							$mini = 0;
534
+						}
422 535
 						for ($i=$mini;$i<=$distance;$i+=10) {
423 536
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
424 537
 						}
@@ -429,19 +542,29 @@  discard block
 block discarded – undo
429 542
 				}
430 543
 
431 544
 				$this->all_tracked[$id]['lastupdate'] = time();
432
-				if ($this->all_tracked[$id]['putinarchive']) $send = true;
433
-				if ($globalDebug) echo $result."\n";
434
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
545
+				if ($this->all_tracked[$id]['putinarchive']) {
546
+					$send = true;
547
+				}
548
+				if ($globalDebug) {
549
+					echo $result."\n";
550
+				}
551
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
552
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
553
+			}
435 554
 			//$this->del();
436 555
 			
437 556
 			
438 557
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
439
-			    if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
558
+			    if ($globalDebug) {
559
+			    	echo "---- Deleting Live Tracker data Not updated since 2 hour...";
560
+			    }
440 561
 			    $TrackerLive = new TrackerLive($this->db);
441 562
 			    $TrackerLive->deleteLiveTrackerDataNotUpdated();
442 563
 			    $TrackerLive->db = null;
443 564
 			    //TrackerLive->deleteLiveTrackerData();
444
-			    if ($globalDebug) echo " Done\n";
565
+			    if ($globalDebug) {
566
+			    	echo " Done\n";
567
+			    }
445 568
 			    $this->last_delete_hourly = time();
446 569
 			}
447 570
 			
@@ -449,7 +572,9 @@  discard block
 block discarded – undo
449 572
 		    //$ignoreImport = false;
450 573
 		}
451 574
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
452
-		if ($send) return $this->all_tracked[$id];
575
+		if ($send) {
576
+			return $this->all_tracked[$id];
577
+		}
453 578
 	    }
454 579
 	}
455 580
     }
Please login to merge, or discard this patch.
require/class.TSK.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 	*/
16 16
 	public function parse_xml($url) {
17 17
 		$Common = new Common();
18
-		$filedata = $Common->getData($url,'get','','','','','','',true);
18
+		$filedata = $Common->getData($url, 'get', '', '', '', '', '', '', true);
19 19
 		if ($filedata != '' && $filedata !== false) {
20 20
 			$xml = simplexml_load_string($filedata);
21 21
 			if ($xml !== false) {
Please login to merge, or discard this patch.
require/class.ATC.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -26,22 +26,22 @@  discard block
 block discarded – undo
26 26
 	* @param Array $filter the filter
27 27
 	* @return Array the SQL part
28 28
 	*/
29
-	public function getFilter($filter = array(),$where = false,$and = false) {
29
+	public function getFilter($filter = array(), $where = false, $and = false) {
30 30
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
31 31
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
32 32
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
33
-				foreach($globalStatsFilters[$globalFilterName] as $source) {
33
+				foreach ($globalStatsFilters[$globalFilterName] as $source) {
34 34
 					if (isset($source['source'])) $filter['source'][] = $source['source'];
35 35
 				}
36 36
 			} else {
37 37
 				$filter = $globalStatsFilters[$globalFilterName];
38 38
 			}
39 39
 		}
40
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
40
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
41 41
 		$filter_query_join = '';
42 42
 		$filter_query_where = '';
43 43
 		if (isset($filter['source']) && !empty($filter['source'])) {
44
-			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
44
+			$filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
45 45
 		}
46 46
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
47 47
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 		try {
61 61
 			$sth = $this->db->prepare($query);
62 62
 			$sth->execute($query_values);
63
-		} catch(PDOException $e) {
63
+		} catch (PDOException $e) {
64 64
 			return "error : ".$e->getMessage();
65 65
 		}
66 66
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -73,13 +73,13 @@  discard block
 block discarded – undo
73 73
 	 * @return Array Return ATC
74 74
 	*/
75 75
 	public function getById($id) {
76
-		$filter_query = $this->getFilter(array(),true,true);
76
+		$filter_query = $this->getFilter(array(), true, true);
77 77
 		$query = "SELECT * FROM atc".$filter_query." atc_id = :id";
78 78
 		$query_values = array(':id' => $id);
79 79
 		try {
80 80
 			$sth = $this->db->prepare($query);
81 81
 			$sth->execute($query_values);
82
-		} catch(PDOException $e) {
82
+		} catch (PDOException $e) {
83 83
 			return "error : ".$e->getMessage();
84 84
 		}
85 85
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -92,19 +92,19 @@  discard block
 block discarded – undo
92 92
 	 * @param String $format_source Format source
93 93
 	 * @return Array Return ATC
94 94
 	*/
95
-	public function getByIdent($ident,$format_source = '') {
96
-		$filter_query = $this->getFilter(array(),true,true);
95
+	public function getByIdent($ident, $format_source = '') {
96
+		$filter_query = $this->getFilter(array(), true, true);
97 97
 		if ($format_source == '') {
98 98
 			$query = "SELECT * FROM atc".$filter_query." ident = :ident";
99 99
 			$query_values = array(':ident' => $ident);
100 100
 		} else {
101 101
 			$query = "SELECT * FROM atc".$filter_query." ident = :ident AND format_source = :format_source";
102
-			$query_values = array(':ident' => $ident,':format_source' => $format_source);
102
+			$query_values = array(':ident' => $ident, ':format_source' => $format_source);
103 103
 		}
104 104
 		try {
105 105
 			$sth = $this->db->prepare($query);
106 106
 			$sth->execute($query_values);
107
-		} catch(PDOException $e) {
107
+		} catch (PDOException $e) {
108 108
 			return "error : ".$e->getMessage();
109 109
 		}
110 110
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -126,18 +126,18 @@  discard block
 block discarded – undo
126 126
 	 * @param String $format_source Format source
127 127
 	 * @param String $source_name Source name
128 128
 	*/
129
-	public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
130
-		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
131
-		$info = str_replace('^','<br />',$info);
132
-		$info = str_replace('&amp;sect;','',$info);
133
-		$info = str_replace('"','',$info);
129
+	public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
130
+		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
131
+		$info = str_replace('^', '<br />', $info);
132
+		$info = str_replace('&amp;sect;', '', $info);
133
+		$info = str_replace('"', '', $info);
134 134
 		if ($type == '') $type = NULL;
135 135
 		$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)";
136
-		$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);
136
+		$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);
137 137
 		try {
138 138
 			$sth = $this->db->prepare($query);
139 139
 			$sth->execute($query_values);
140
-		} catch(PDOException $e) {
140
+		} catch (PDOException $e) {
141 141
 			return "error : ".$e->getMessage();
142 142
 		}
143 143
 	}
@@ -157,18 +157,18 @@  discard block
 block discarded – undo
157 157
 	 * @param String $format_source Format source
158 158
 	 * @param String $source_name Source name
159 159
 	*/
160
-	public function update($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
161
-		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
162
-		$info = str_replace('^','<br />',$info);
163
-		$info = str_replace('&amp;sect;','',$info);
164
-		$info = str_replace('"','',$info);
160
+	public function update($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
161
+		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
162
+		$info = str_replace('^', '<br />', $info);
163
+		$info = str_replace('&amp;sect;', '', $info);
164
+		$info = str_replace('"', '', $info);
165 165
 		if ($type == '') $type = NULL;
166 166
 		$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";
167
-		$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);
167
+		$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);
168 168
 		try {
169 169
 			$sth = $this->db->prepare($query);
170 170
 			$sth->execute($query_values);
171
-		} catch(PDOException $e) {
171
+		} catch (PDOException $e) {
172 172
 			return "error : ".$e->getMessage();
173 173
 		}
174 174
 	}
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 		try {
184 184
 			$sth = $this->db->prepare($query);
185 185
 			$sth->execute($query_values);
186
-		} catch(PDOException $e) {
186
+		} catch (PDOException $e) {
187 187
 			return "error : ".$e->getMessage();
188 188
 		}
189 189
 	}
@@ -193,13 +193,13 @@  discard block
 block discarded – undo
193 193
 	 * @param String $ident Flight ident
194 194
 	 * @param String $format_source Format source
195 195
 	*/
196
-	public function deleteByIdent($ident,$format_source) {
196
+	public function deleteByIdent($ident, $format_source) {
197 197
 		$query = "DELETE FROM atc WHERE ident = :ident AND format_source = :format_source";
198
-		$query_values = array(':ident' => $ident,':format_source' => $format_source);
198
+		$query_values = array(':ident' => $ident, ':format_source' => $format_source);
199 199
 		try {
200 200
 			$sth = $this->db->prepare($query);
201 201
 			$sth->execute($query_values);
202
-		} catch(PDOException $e) {
202
+		} catch (PDOException $e) {
203 203
 			return "error : ".$e->getMessage();
204 204
 		}
205 205
 	}
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
 		try {
214 214
 			$sth = $this->db->prepare($query);
215 215
 			$sth->execute($query_values);
216
-		} catch(PDOException $e) {
216
+		} catch (PDOException $e) {
217 217
 			return "error : ".$e->getMessage();
218 218
 		}
219 219
 	}
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 		try {
232 232
 			$sth = $this->db->prepare($query);
233 233
 			$sth->execute();
234
-		} catch(PDOException $e) {
234
+		} catch (PDOException $e) {
235 235
 			return "error";
236 236
 		}
237 237
 		return "success";
Please login to merge, or discard this patch.
require/class.NOTAM.php 2 patches
Spacing   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -988,7 +988,7 @@  discard block
 block discarded – undo
988 988
 		try {
989 989
 			$sth = $this->db->prepare($query);
990 990
 			$sth->execute($query_values);
991
-		} catch(PDOException $e) {
991
+		} catch (PDOException $e) {
992 992
 			echo "error : ".$e->getMessage();
993 993
 		}
994 994
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1005,19 +1005,19 @@  discard block
 block discarded – undo
1005 1005
 		try {
1006 1006
 			$sth = $this->db->prepare($query);
1007 1007
 			$sth->execute($query_values);
1008
-		} catch(PDOException $e) {
1008
+		} catch (PDOException $e) {
1009 1009
 			echo "error : ".$e->getMessage();
1010 1010
 		}
1011 1011
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1012 1012
 		return $all;
1013 1013
 	}
1014 1014
 	public function getAllNOTAMtext() {
1015
-		$query  = 'SELECT full_notam FROM notam';
1015
+		$query = 'SELECT full_notam FROM notam';
1016 1016
 		$query_values = array();
1017 1017
 		try {
1018 1018
 			$sth = $this->db->prepare($query);
1019 1019
 			$sth->execute($query_values);
1020
-		} catch(PDOException $e) {
1020
+		} catch (PDOException $e) {
1021 1021
 			echo "error : ".$e->getMessage();
1022 1022
 		}
1023 1023
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1026,12 +1026,12 @@  discard block
 block discarded – undo
1026 1026
 	public function createNOTAMtextFile($filename) {
1027 1027
 		$allnotam_result = $this->getAllNOTAMtext();
1028 1028
 		$notamtext = '';
1029
-		foreach($allnotam_result as $notam) {
1029
+		foreach ($allnotam_result as $notam) {
1030 1030
 			$notamtext .= '%%'."\n";
1031 1031
 			$notamtext .= $notam['full_notam'];
1032 1032
 			$notamtext .= "\n".'%%'."\n";
1033 1033
 		}
1034
-		file_put_contents($filename,$notamtext);
1034
+		file_put_contents($filename, $notamtext);
1035 1035
 	}
1036 1036
 	public function parseNOTAMtextFile($filename) {
1037 1037
 		$data = file_get_contents($filename);
@@ -1050,7 +1050,7 @@  discard block
 block discarded – undo
1050 1050
 		try {
1051 1051
 			$sth = $this->db->prepare($query);
1052 1052
 			$sth->execute($query_values);
1053
-		} catch(PDOException $e) {
1053
+		} catch (PDOException $e) {
1054 1054
 			echo "error : ".$e->getMessage();
1055 1055
 		}
1056 1056
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1059,10 +1059,10 @@  discard block
 block discarded – undo
1059 1059
 	public function getAllNOTAMbyCoord($coord) {
1060 1060
 		global $globalDBdriver;
1061 1061
 		if (is_array($coord)) {
1062
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1063
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1064
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1065
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1062
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1063
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1064
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1065
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1066 1066
 			if ($minlat > $maxlat) {
1067 1067
 				$tmplat = $minlat;
1068 1068
 				$minlat = $maxlat;
@@ -1083,19 +1083,19 @@  discard block
 block discarded – undo
1083 1083
 		try {
1084 1084
 			$sth = $this->db->prepare($query);
1085 1085
 			$sth->execute($query_values);
1086
-		} catch(PDOException $e) {
1086
+		} catch (PDOException $e) {
1087 1087
 			echo "error : ".$e->getMessage();
1088 1088
 		}
1089 1089
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1090 1090
 		return $all;
1091 1091
 	}
1092
-	public function getAllNOTAMbyCoordScope($coord,$scope) {
1092
+	public function getAllNOTAMbyCoordScope($coord, $scope) {
1093 1093
 		global $globalDBdriver;
1094 1094
 		if (is_array($coord)) {
1095
-			$minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1096
-			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1097
-			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1098
-			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1095
+			$minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1096
+			$minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1097
+			$maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1098
+			$maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
1099 1099
 		} else return array();
1100 1100
 		if ($globalDBdriver == 'mysql') {
1101 1101
 			$query  = 'SELECT * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP() AND scope = :scope';
@@ -1106,7 +1106,7 @@  discard block
 block discarded – undo
1106 1106
 		try {
1107 1107
 			$sth = $this->db->prepare($query);
1108 1108
 			$sth->execute($query_values);
1109
-		} catch(PDOException $e) {
1109
+		} catch (PDOException $e) {
1110 1110
 			echo "error : ".$e->getMessage();
1111 1111
 		}
1112 1112
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1118,7 +1118,7 @@  discard block
 block discarded – undo
1118 1118
 		try {
1119 1119
 			$sth = $this->db->prepare($query);
1120 1120
 			$sth->execute($query_values);
1121
-		} catch(PDOException $e) {
1121
+		} catch (PDOException $e) {
1122 1122
 			return "error : ".$e->getMessage();
1123 1123
 		}
1124 1124
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -1126,13 +1126,13 @@  discard block
 block discarded – undo
1126 1126
 		else return array();
1127 1127
 	}
1128 1128
 
1129
-	public function addNOTAM($ref,$title,$type,$fir,$code,$rules,$scope,$lower_limit,$upper_limit,$center_latitude,$center_longitude,$radius,$date_begin,$date_end,$permanent,$text,$full_notam) {
1129
+	public function addNOTAM($ref, $title, $type, $fir, $code, $rules, $scope, $lower_limit, $upper_limit, $center_latitude, $center_longitude, $radius, $date_begin, $date_end, $permanent, $text, $full_notam) {
1130 1130
 		$query = "INSERT INTO notam (ref,title,notam_type,fir,code,rules,scope,lower_limit,upper_limit,center_latitude,center_longitude,radius,date_begin,date_end,permanent,notam_text,full_notam) VALUES (:ref,:title,:type,:fir,:code,:rules,:scope,:lower_limit,:upper_limit,:center_latitude,:center_longitude,:radius,:date_begin,:date_end,:permanent,:text,:full_notam)";
1131
-		$query_values = array(':ref' => $ref,':title' => $title,':type' => $type,':fir' => $fir,':code' => $code,':rules' => $rules,':scope' => $scope,':lower_limit' => $lower_limit,':upper_limit' => $upper_limit,':center_latitude' => $center_latitude,':center_longitude' => $center_longitude,':radius' => $radius,':date_begin' => $date_begin,':date_end' => $date_end,':permanent' => $permanent,':text' => $text,':full_notam' => $full_notam);
1131
+		$query_values = array(':ref' => $ref, ':title' => $title, ':type' => $type, ':fir' => $fir, ':code' => $code, ':rules' => $rules, ':scope' => $scope, ':lower_limit' => $lower_limit, ':upper_limit' => $upper_limit, ':center_latitude' => $center_latitude, ':center_longitude' => $center_longitude, ':radius' => $radius, ':date_begin' => $date_begin, ':date_end' => $date_end, ':permanent' => $permanent, ':text' => $text, ':full_notam' => $full_notam);
1132 1132
 		try {
1133 1133
 			$sth = $this->db->prepare($query);
1134 1134
 			$sth->execute($query_values);
1135
-		} catch(PDOException $e) {
1135
+		} catch (PDOException $e) {
1136 1136
 			return "error : ".$e->getMessage();
1137 1137
 		}
1138 1138
 	}
@@ -1143,7 +1143,7 @@  discard block
 block discarded – undo
1143 1143
 		try {
1144 1144
 			$sth = $this->db->prepare($query);
1145 1145
 			$sth->execute($query_values);
1146
-		} catch(PDOException $e) {
1146
+		} catch (PDOException $e) {
1147 1147
 			return "error : ".$e->getMessage();
1148 1148
 		}
1149 1149
 	}
@@ -1158,7 +1158,7 @@  discard block
 block discarded – undo
1158 1158
 		try {
1159 1159
 			$sth = $this->db->prepare($query);
1160 1160
 			$sth->execute($query_values);
1161
-		} catch(PDOException $e) {
1161
+		} catch (PDOException $e) {
1162 1162
 			return "error : ".$e->getMessage();
1163 1163
 		}
1164 1164
 	}
@@ -1168,7 +1168,7 @@  discard block
 block discarded – undo
1168 1168
 		try {
1169 1169
 			$sth = $this->db->prepare($query);
1170 1170
 			$sth->execute($query_values);
1171
-		} catch(PDOException $e) {
1171
+		} catch (PDOException $e) {
1172 1172
 			return "error : ".$e->getMessage();
1173 1173
 		}
1174 1174
 	}
@@ -1177,7 +1177,7 @@  discard block
 block discarded – undo
1177 1177
 		try {
1178 1178
 			$sth = $this->db->prepare($query);
1179 1179
 			$sth->execute();
1180
-		} catch(PDOException $e) {
1180
+		} catch (PDOException $e) {
1181 1181
 			return "error : ".$e->getMessage();
1182 1182
 		}
1183 1183
 	}
@@ -1186,7 +1186,7 @@  discard block
 block discarded – undo
1186 1186
 		try {
1187 1187
 			$sth = $this->db->prepare($query);
1188 1188
 			$sth->execute();
1189
-		} catch(PDOException $e) {
1189
+		} catch (PDOException $e) {
1190 1190
 			return "error : ".$e->getMessage();
1191 1191
 		}
1192 1192
 	}
@@ -1194,14 +1194,14 @@  discard block
 block discarded – undo
1194 1194
 	public function updateNOTAM() {
1195 1195
 		global $globalNOTAMAirports;
1196 1196
 		if (isset($globalNOTAMAirports) && is_array($globalNOTAMAirports) && count($globalNOTAMAirports) > 0) {
1197
-			foreach (array_chunk($globalNOTAMAirports,10) as $airport) {
1198
-				$airport_icao = implode(',',$airport);
1197
+			foreach (array_chunk($globalNOTAMAirports, 10) as $airport) {
1198
+				$airport_icao = implode(',', $airport);
1199 1199
 				$alldata = $this->downloadNOTAM($airport_icao);
1200 1200
 				if (count($alldata) > 0) {
1201 1201
 					foreach ($alldata as $initial_data) {
1202 1202
 						$data = $this->parse($initial_data);
1203 1203
 						$notamref = $this->getNOTAMbyRef($data['ref']);
1204
-						if (count($notamref) == 0) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
1204
+						if (count($notamref) == 0) $this->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
1205 1205
 					}
1206 1206
 				}
1207 1207
 			}
@@ -1214,7 +1214,7 @@  discard block
 block discarded – undo
1214 1214
 			foreach ($alldata as $initial_data) {
1215 1215
 				$data = $this->parse($initial_data);
1216 1216
 				$notamref = $this->getNOTAMbyRef($data['ref']);
1217
-				if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
1217
+				if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
1218 1218
 			}
1219 1219
 		}
1220 1220
 	}
@@ -1223,12 +1223,12 @@  discard block
 block discarded – undo
1223 1223
 		global $globalTransaction;
1224 1224
 		$Spotter = new Spotter($this->db);
1225 1225
 		$allairports = $Spotter->getAllAirportInfo();
1226
-		foreach (array_chunk($allairports,20) as $airport) {
1226
+		foreach (array_chunk($allairports, 20) as $airport) {
1227 1227
 			$airports_icao = array();
1228
-			foreach($airport as $icao) {
1228
+			foreach ($airport as $icao) {
1229 1229
 				if (isset($icao['icao'])) $airports_icao[] = $icao['icao'];
1230 1230
 			}
1231
-			$airport_icao = implode(',',$airports_icao);
1231
+			$airport_icao = implode(',', $airports_icao);
1232 1232
 			$alldata = $this->downloadNOTAM($airport_icao);
1233 1233
 			if ($globalTransaction) $this->db->beginTransaction();
1234 1234
 			if (count($alldata) > 0) {
@@ -1241,7 +1241,7 @@  discard block
 block discarded – undo
1241 1241
 						if (count($notamref) == 0) {
1242 1242
 							if (isset($data['ref_replaced'])) $this->deleteNOTAMbyRef($data['ref_replaced']);
1243 1243
 							if (isset($data['ref_cancelled'])) $this->deleteNOTAMbyRef($data['ref_cancelled']);
1244
-							elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
1244
+							elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'], '', '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['latitude'], $data['longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']);
1245 1245
 						}
1246 1246
 					}
1247 1247
 				}
@@ -1255,7 +1255,7 @@  discard block
 block discarded – undo
1255 1255
 		date_default_timezone_set("UTC");
1256 1256
 		$Common = new Common();
1257 1257
 		//$url = str_replace('{icao}',$icao,'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=DOMESTIC&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
1258
-		$url = str_replace('{icao}',$icao,'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=ICAO&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
1258
+		$url = str_replace('{icao}', $icao, 'https://pilotweb.nas.faa.gov/PilotWeb/notamRetrievalByICAOAction.do?method=displayByICAOs&reportType=RAW&formatType=ICAO&retrieveLocId={icao}&actionType=notamRetrievalByICAOs');
1259 1259
 		$data = $Common->getData($url);
1260 1260
 		preg_match_all("/<pre>(.+?)<\/pre>/is", $data, $matches);
1261 1261
 		//print_r($matches);
@@ -1272,8 +1272,8 @@  discard block
 block discarded – undo
1272 1272
 		$result['permanent'] = '';
1273 1273
 		$result['date_begin'] = NULL;
1274 1274
 		$result['date_end'] = NULL;
1275
-		$data = str_ireplace(array("\r","\n",'\r','\n'),' ',$data);
1276
-		$data = preg_split('#\s(?=([A-Z]\)\s))#',$data);
1275
+		$data = str_ireplace(array("\r", "\n", '\r', '\n'), ' ', $data);
1276
+		$data = preg_split('#\s(?=([A-Z]\)\s))#', $data);
1277 1277
 		$q = false;
1278 1278
 		$a = false;
1279 1279
 		$b = false;
@@ -1281,9 +1281,9 @@  discard block
 block discarded – undo
1281 1281
 		$e = false;
1282 1282
 		foreach ($data as $line) {
1283 1283
 			$line = trim($line);
1284
-			if (preg_match('#(^|\s)Q\) (.*)#',$line,$matches) && $q === false) {
1285
-				$line = str_replace(' ','',$line);
1286
-				if (preg_match('#Q\)([A-Z]{3,4})\/([A-Z]{5})\/(IV|I|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N|S)([0-9]{5})(E|W)([0-9]{3}|)#',$line,$matches)) {
1284
+			if (preg_match('#(^|\s)Q\) (.*)#', $line, $matches) && $q === false) {
1285
+				$line = str_replace(' ', '', $line);
1286
+				if (preg_match('#Q\)([A-Z]{3,4})\/([A-Z]{5})\/(IV|I|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N|S)([0-9]{5})(E|W)([0-9]{3}|)#', $line, $matches)) {
1287 1287
 				//if (preg_match('#Q\)([A-Z]{4})\/([A-Z]{5})\/(IV|I|V)\/([A-Z]{1,3})\/([A-Z]{1,2})\/([0-9]{3})\/([0-9]{3})\/([0-9]{4})(N|S)([0-9]{5})(E|W)([0-9]{3})#',$line,$matches)) {
1288 1288
 					$result['fir'] = $matches[1];
1289 1289
 					$result['code'] = $matches[2];
@@ -1328,9 +1328,9 @@  discard block
 block discarded – undo
1328 1328
 					elseif ($matches[5] == 'AW') $result['scope'] = 'Airport/Navigation warning';
1329 1329
 					$result['lower_limit'] = $matches[6];
1330 1330
 					$result['upper_limit'] = $matches[7];
1331
-					$latitude = $Common->convertDec($matches[8],'latitude');
1331
+					$latitude = $Common->convertDec($matches[8], 'latitude');
1332 1332
 					if ($matches[9] == 'S') $latitude = -$latitude;
1333
-					$longitude = $Common->convertDec($matches[10],'longitude');
1333
+					$longitude = $Common->convertDec($matches[10], 'longitude');
1334 1334
 					if ($matches[11] == 'W') $longitude = -$longitude;
1335 1335
 					$result['latitude'] = $latitude;
1336 1336
 					$result['longitude'] = $longitude;
@@ -1342,24 +1342,24 @@  discard block
 block discarded – undo
1342 1342
 					echo "Can't parse : ".$line."\n";
1343 1343
 				}
1344 1344
 			}
1345
-			elseif (preg_match('#(^|\s)A\) (.*)#',$line,$matches) && $a === false) {
1345
+			elseif (preg_match('#(^|\s)A\) (.*)#', $line, $matches) && $a === false) {
1346 1346
 				$result['icao'] = $matches[2];
1347 1347
 				$a = true;
1348 1348
 			}
1349
-			elseif (preg_match('#(^|\s)B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches) && $b === false) {
1349
+			elseif (preg_match('#(^|\s)B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#', $line, $matches) && $b === false) {
1350 1350
 				if ($matches[1] > 50) $year = '19'.$matches[2];
1351 1351
 				else $year = '20'.$matches[2];
1352 1352
 				$result['date_begin'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
1353 1353
 				$b = true;
1354 1354
 			}
1355
-			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches) && $c === false) {
1355
+			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#', $line, $matches) && $c === false) {
1356 1356
 				if ($matches[2] > 50) $year = '19'.$matches[2];
1357 1357
 				else $year = '20'.$matches[2];
1358 1358
 				$result['date_end'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
1359 1359
 				$result['permanent'] = 0;
1360 1360
 				$c = true;
1361 1361
 			}
1362
-			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches) && $c === false) {
1362
+			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#', $line, $matches) && $c === false) {
1363 1363
 				if ($matches[2] > 50) $year = '19'.$matches[2];
1364 1364
 				else $year = '20'.$matches[2];
1365 1365
 				$result['date_end'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
@@ -1369,7 +1369,7 @@  discard block
 block discarded – undo
1369 1369
 				else $result['permanent'] = 0;
1370 1370
 				$c = true;
1371 1371
 			}
1372
-			elseif (preg_match('#(^|\s)C\) (EST|PERM)$#',$line,$matches) && $c === false) {
1372
+			elseif (preg_match('#(^|\s)C\) (EST|PERM)$#', $line, $matches) && $c === false) {
1373 1373
 				$result['date_end'] = '2030/12/20 12:00';
1374 1374
 				if ($matches[2] == 'EST') $result['estimated'] = 1;
1375 1375
 				else $result['estimated'] = 0;
@@ -1377,20 +1377,20 @@  discard block
 block discarded – undo
1377 1377
 				else $result['permanent'] = 0;
1378 1378
 				$c = true;
1379 1379
 			}
1380
-			elseif (preg_match('#(^|\s)E\) (.*)#',$line,$matches) && $e === false) {
1380
+			elseif (preg_match('#(^|\s)E\) (.*)#', $line, $matches) && $e === false) {
1381 1381
 				$rtext = array();
1382
-				$text = explode(' ',$matches[2]);
1382
+				$text = explode(' ', $matches[2]);
1383 1383
 				foreach ($text as $word) {
1384 1384
 					if (isset($this->abbr[$word])) $rtext[] = strtoupper($this->abbr[$word]);
1385
-					elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) $rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3);
1385
+					elseif (ctype_digit(strval(substr($word, 3))) && isset($this->abbr[substr($word, 0, 3)])) $rtext[] = strtoupper($this->abbr[substr($word, 0, 3)]).' '.substr($word, 3);
1386 1386
 					else $rtext[] = $word;
1387 1387
 				}
1388
-				$result['text'] = implode(' ',$rtext);
1388
+				$result['text'] = implode(' ', $rtext);
1389 1389
 				$e = true;
1390 1390
 			//} elseif (preg_match('#F\) (.*)#',$line,$matches)) {
1391 1391
 			//} elseif (preg_match('#G\) (.*)#',$line,$matches)) {
1392
-			} elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#',$line,$matches)) {
1393
-				$text = explode(' ',$line);
1392
+			} elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#', $line, $matches)) {
1393
+				$text = explode(' ', $line);
1394 1394
 				$result['ref'] = $text[0];
1395 1395
 				if ($matches[1] == 'NOTAMN') $result['type'] = 'new';
1396 1396
 				if ($matches[1] == 'NOTAMC') {
Please login to merge, or discard this patch.
Braces   +210 added lines, -89 removed lines patch added patch discarded remove patch
@@ -1036,8 +1036,11 @@  discard block
 block discarded – undo
1036 1036
 	public function parseNOTAMtextFile($filename) {
1037 1037
 		$data = file_get_contents($filename);
1038 1038
 		preg_match_all("/%%(.+?)%%/is", $data, $matches);
1039
-		if (isset($matches[1])) return $matches[1];
1040
-		else return array();
1039
+		if (isset($matches[1])) {
1040
+			return $matches[1];
1041
+		} else {
1042
+			return array();
1043
+		}
1041 1044
 	}
1042 1045
 	public function getAllNOTAMbyScope($scope) {
1043 1046
 		global $globalDBdriver;
@@ -1073,7 +1076,9 @@  discard block
 block discarded – undo
1073 1076
 				$minlong = $maxlong;
1074 1077
 				$maxlong = $tmplong;
1075 1078
 			}
1076
-		} else return array();
1079
+		} else {
1080
+			return array();
1081
+		}
1077 1082
 		if ($globalDBdriver == 'mysql') {
1078 1083
 			$query  = 'SELECT * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP()';
1079 1084
 		} else {
@@ -1096,7 +1101,9 @@  discard block
 block discarded – undo
1096 1101
 			$minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1097 1102
 			$maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1098 1103
 			$maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
1099
-		} else return array();
1104
+		} else {
1105
+			return array();
1106
+		}
1100 1107
 		if ($globalDBdriver == 'mysql') {
1101 1108
 			$query  = 'SELECT * FROM notam WHERE center_latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND center_longitude BETWEEN '.$minlong.' AND '.$maxlong.' AND radius > 0 AND date_end > UTC_TIMESTAMP() AND date_begin < UTC_TIMESTAMP() AND scope = :scope';
1102 1109
 		} else {
@@ -1122,8 +1129,11 @@  discard block
 block discarded – undo
1122 1129
 			return "error : ".$e->getMessage();
1123 1130
 		}
1124 1131
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
1125
-		if (isset($all[0])) return $all[0];
1126
-		else return array();
1132
+		if (isset($all[0])) {
1133
+			return $all[0];
1134
+		} else {
1135
+			return array();
1136
+		}
1127 1137
 	}
1128 1138
 
1129 1139
 	public function addNOTAM($ref,$title,$type,$fir,$code,$rules,$scope,$lower_limit,$upper_limit,$center_latitude,$center_longitude,$radius,$date_begin,$date_end,$permanent,$text,$full_notam) {
@@ -1201,7 +1211,9 @@  discard block
 block discarded – undo
1201 1211
 					foreach ($alldata as $initial_data) {
1202 1212
 						$data = $this->parse($initial_data);
1203 1213
 						$notamref = $this->getNOTAMbyRef($data['ref']);
1204
-						if (count($notamref) == 0) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
1214
+						if (count($notamref) == 0) {
1215
+							$this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
1216
+						}
1205 1217
 					}
1206 1218
 				}
1207 1219
 			}
@@ -1214,7 +1226,9 @@  discard block
 block discarded – undo
1214 1226
 			foreach ($alldata as $initial_data) {
1215 1227
 				$data = $this->parse($initial_data);
1216 1228
 				$notamref = $this->getNOTAMbyRef($data['ref']);
1217
-				if (!isset($notamref['notam_id'])) $this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
1229
+				if (!isset($notamref['notam_id'])) {
1230
+					$this->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
1231
+				}
1218 1232
 			}
1219 1233
 		}
1220 1234
 	}
@@ -1226,11 +1240,15 @@  discard block
 block discarded – undo
1226 1240
 		foreach (array_chunk($allairports,20) as $airport) {
1227 1241
 			$airports_icao = array();
1228 1242
 			foreach($airport as $icao) {
1229
-				if (isset($icao['icao'])) $airports_icao[] = $icao['icao'];
1243
+				if (isset($icao['icao'])) {
1244
+					$airports_icao[] = $icao['icao'];
1245
+				}
1230 1246
 			}
1231 1247
 			$airport_icao = implode(',',$airports_icao);
1232 1248
 			$alldata = $this->downloadNOTAM($airport_icao);
1233
-			if ($globalTransaction) $this->db->beginTransaction();
1249
+			if ($globalTransaction) {
1250
+				$this->db->beginTransaction();
1251
+			}
1234 1252
 			if (count($alldata) > 0) {
1235 1253
 				foreach ($alldata as $initial_data) {
1236 1254
 					//print_r($initial_data);
@@ -1239,14 +1257,23 @@  discard block
 block discarded – undo
1239 1257
 					if (isset($data['ref'])) {
1240 1258
 						$notamref = $this->getNOTAMbyRef($data['ref']);
1241 1259
 						if (count($notamref) == 0) {
1242
-							if (isset($data['ref_replaced'])) $this->deleteNOTAMbyRef($data['ref_replaced']);
1243
-							if (isset($data['ref_cancelled'])) $this->deleteNOTAMbyRef($data['ref_cancelled']);
1244
-							elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
1260
+							if (isset($data['ref_replaced'])) {
1261
+								$this->deleteNOTAMbyRef($data['ref_replaced']);
1262
+							}
1263
+							if (isset($data['ref_cancelled'])) {
1264
+								$this->deleteNOTAMbyRef($data['ref_cancelled']);
1265
+							} elseif (isset($data['latitude']) && isset($data['scope']) && isset($data['text']) && isset($data['permanent'])) {
1266
+								echo $this->addNOTAM($data['ref'],'','',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['latitude'],$data['longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
1267
+							}
1245 1268
 						}
1246 1269
 					}
1247 1270
 				}
1248
-			} else echo 'Error on download. Nothing matches for '.$airport_icao."\n";
1249
-			if ($globalTransaction) $this->db->commit();
1271
+			} else {
1272
+				echo 'Error on download. Nothing matches for '.$airport_icao."\n";
1273
+			}
1274
+			if ($globalTransaction) {
1275
+				$this->db->commit();
1276
+			}
1250 1277
 			sleep(5);
1251 1278
 		}
1252 1279
 	}
@@ -1259,8 +1286,11 @@  discard block
 block discarded – undo
1259 1286
 		$data = $Common->getData($url);
1260 1287
 		preg_match_all("/<pre>(.+?)<\/pre>/is", $data, $matches);
1261 1288
 		//print_r($matches);
1262
-		if (isset($matches[1])) return $matches[1];
1263
-		else return array();
1289
+		if (isset($matches[1])) {
1290
+			return $matches[1];
1291
+		} else {
1292
+			return array();
1293
+		}
1264 1294
 	}
1265 1295
 
1266 1296
 	public function parse($data) {
@@ -1291,99 +1321,156 @@  discard block
 block discarded – undo
1291 1321
 					$rules = str_split($matches[3]);
1292 1322
 					foreach ($rules as $rule) {
1293 1323
 						if ($rule == 'I') {
1294
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/IFR';
1295
-							else $result['rules'] = 'IFR';
1324
+							if (isset($result['rules'])) {
1325
+								$result['rules'] = $result['rules'].'/IFR';
1326
+							} else {
1327
+								$result['rules'] = 'IFR';
1328
+							}
1296 1329
 						} elseif ($rule == 'V') {
1297
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/VFR';
1298
-							else $result['rules'] = 'VFR';
1330
+							if (isset($result['rules'])) {
1331
+								$result['rules'] = $result['rules'].'/VFR';
1332
+							} else {
1333
+								$result['rules'] = 'VFR';
1334
+							}
1299 1335
 						} elseif ($rule == 'K') {
1300
-							if (isset($result['rules'])) $result['rules'] = $result['rules'].'/Checklist';
1301
-							else $result['rules'] = 'Checklist';
1336
+							if (isset($result['rules'])) {
1337
+								$result['rules'] = $result['rules'].'/Checklist';
1338
+							} else {
1339
+								$result['rules'] = 'Checklist';
1340
+							}
1302 1341
 						}
1303 1342
 					}
1304 1343
 					$attentions = str_split($matches[4]);
1305 1344
 					foreach ($attentions as $attention) {
1306 1345
 						if ($attention == 'N') {
1307
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Immediate attention';
1308
-							else $result['rules'] = 'Immediate attention';
1346
+							if (isset($result['attention'])) {
1347
+								$result['attention'] = $result['attention'].' / Immediate attention';
1348
+							} else {
1349
+								$result['rules'] = 'Immediate attention';
1350
+							}
1309 1351
 						} elseif ($attention == 'B') {
1310
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Operational significance';
1311
-							else $result['rules'] = 'Operational significance';
1352
+							if (isset($result['attention'])) {
1353
+								$result['attention'] = $result['attention'].' / Operational significance';
1354
+							} else {
1355
+								$result['rules'] = 'Operational significance';
1356
+							}
1312 1357
 						} elseif ($attention == 'O') {
1313
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Flight operations';
1314
-							else $result['rules'] = 'Flight operations';
1358
+							if (isset($result['attention'])) {
1359
+								$result['attention'] = $result['attention'].' / Flight operations';
1360
+							} else {
1361
+								$result['rules'] = 'Flight operations';
1362
+							}
1315 1363
 						} elseif ($attention == 'M') {
1316
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Misc';
1317
-							else $result['rules'] = 'Misc';
1364
+							if (isset($result['attention'])) {
1365
+								$result['attention'] = $result['attention'].' / Misc';
1366
+							} else {
1367
+								$result['rules'] = 'Misc';
1368
+							}
1318 1369
 						} elseif ($attention == 'K') {
1319
-							if (isset($result['attention'])) $result['attention'] = $result['attention'].' / Checklist';
1320
-							else $result['rules'] = 'Checklist';
1370
+							if (isset($result['attention'])) {
1371
+								$result['attention'] = $result['attention'].' / Checklist';
1372
+							} else {
1373
+								$result['rules'] = 'Checklist';
1374
+							}
1321 1375
 						}
1322 1376
 					}
1323
-					if ($matches[5] == 'A') $result['scope'] = 'Airport warning';
1324
-					elseif ($matches[5] == 'E') $result['scope'] = 'Enroute warning';
1325
-					elseif ($matches[5] == 'W') $result['scope'] = 'Navigation warning';
1326
-					elseif ($matches[5] == 'K') $result['scope'] = 'Checklist';
1327
-					elseif ($matches[5] == 'AE') $result['scope'] = 'Airport/Enroute warning';
1328
-					elseif ($matches[5] == 'AW') $result['scope'] = 'Airport/Navigation warning';
1377
+					if ($matches[5] == 'A') {
1378
+						$result['scope'] = 'Airport warning';
1379
+					} elseif ($matches[5] == 'E') {
1380
+						$result['scope'] = 'Enroute warning';
1381
+					} elseif ($matches[5] == 'W') {
1382
+						$result['scope'] = 'Navigation warning';
1383
+					} elseif ($matches[5] == 'K') {
1384
+						$result['scope'] = 'Checklist';
1385
+					} elseif ($matches[5] == 'AE') {
1386
+						$result['scope'] = 'Airport/Enroute warning';
1387
+					} elseif ($matches[5] == 'AW') {
1388
+						$result['scope'] = 'Airport/Navigation warning';
1389
+					}
1329 1390
 					$result['lower_limit'] = $matches[6];
1330 1391
 					$result['upper_limit'] = $matches[7];
1331 1392
 					$latitude = $Common->convertDec($matches[8],'latitude');
1332
-					if ($matches[9] == 'S') $latitude = -$latitude;
1393
+					if ($matches[9] == 'S') {
1394
+						$latitude = -$latitude;
1395
+					}
1333 1396
 					$longitude = $Common->convertDec($matches[10],'longitude');
1334
-					if ($matches[11] == 'W') $longitude = -$longitude;
1397
+					if ($matches[11] == 'W') {
1398
+						$longitude = -$longitude;
1399
+					}
1335 1400
 					$result['latitude'] = $latitude;
1336 1401
 					$result['longitude'] = $longitude;
1337
-					if ($matches[12] != '') $result['radius'] = intval($matches[12]);
1338
-					else $result['radius'] = 0;
1402
+					if ($matches[12] != '') {
1403
+						$result['radius'] = intval($matches[12]);
1404
+					} else {
1405
+						$result['radius'] = 0;
1406
+					}
1339 1407
 					$q = true;
1340 1408
 				} elseif ($globalDebug) {
1341 1409
 					echo 'NOTAM error : '.$result['full_notam']."\n";
1342 1410
 					echo "Can't parse : ".$line."\n";
1343 1411
 				}
1344
-			}
1345
-			elseif (preg_match('#(^|\s)A\) (.*)#',$line,$matches) && $a === false) {
1412
+			} elseif (preg_match('#(^|\s)A\) (.*)#',$line,$matches) && $a === false) {
1346 1413
 				$result['icao'] = $matches[2];
1347 1414
 				$a = true;
1348
-			}
1349
-			elseif (preg_match('#(^|\s)B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches) && $b === false) {
1350
-				if ($matches[1] > 50) $year = '19'.$matches[2];
1351
-				else $year = '20'.$matches[2];
1415
+			} elseif (preg_match('#(^|\s)B\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})#',$line,$matches) && $b === false) {
1416
+				if ($matches[1] > 50) {
1417
+					$year = '19'.$matches[2];
1418
+				} else {
1419
+					$year = '20'.$matches[2];
1420
+				}
1352 1421
 				$result['date_begin'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
1353 1422
 				$b = true;
1354
-			}
1355
-			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches) && $c === false) {
1356
-				if ($matches[2] > 50) $year = '19'.$matches[2];
1357
-				else $year = '20'.$matches[2];
1423
+			} elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})$#',$line,$matches) && $c === false) {
1424
+				if ($matches[2] > 50) {
1425
+					$year = '19'.$matches[2];
1426
+				} else {
1427
+					$year = '20'.$matches[2];
1428
+				}
1358 1429
 				$result['date_end'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
1359 1430
 				$result['permanent'] = 0;
1360 1431
 				$c = true;
1361
-			}
1362
-			elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches) && $c === false) {
1363
-				if ($matches[2] > 50) $year = '19'.$matches[2];
1364
-				else $year = '20'.$matches[2];
1432
+			} elseif (preg_match('#(^|\s)C\) ([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2}) (EST|PERM)$#',$line,$matches) && $c === false) {
1433
+				if ($matches[2] > 50) {
1434
+					$year = '19'.$matches[2];
1435
+				} else {
1436
+					$year = '20'.$matches[2];
1437
+				}
1365 1438
 				$result['date_end'] = $year.'/'.$matches[3].'/'.$matches[4].' '.$matches[5].':'.$matches[6];
1366
-				if ($matches[7] == 'EST') $result['estimated'] = 1;
1367
-				else $result['estimated'] = 0;
1368
-				if ($matches[7] == 'PERM') $result['permanent'] = 1;
1369
-				else $result['permanent'] = 0;
1439
+				if ($matches[7] == 'EST') {
1440
+					$result['estimated'] = 1;
1441
+				} else {
1442
+					$result['estimated'] = 0;
1443
+				}
1444
+				if ($matches[7] == 'PERM') {
1445
+					$result['permanent'] = 1;
1446
+				} else {
1447
+					$result['permanent'] = 0;
1448
+				}
1370 1449
 				$c = true;
1371
-			}
1372
-			elseif (preg_match('#(^|\s)C\) (EST|PERM)$#',$line,$matches) && $c === false) {
1450
+			} elseif (preg_match('#(^|\s)C\) (EST|PERM)$#',$line,$matches) && $c === false) {
1373 1451
 				$result['date_end'] = '2030/12/20 12:00';
1374
-				if ($matches[2] == 'EST') $result['estimated'] = 1;
1375
-				else $result['estimated'] = 0;
1376
-				if ($matches[2] == 'PERM') $result['permanent'] = 1;
1377
-				else $result['permanent'] = 0;
1452
+				if ($matches[2] == 'EST') {
1453
+					$result['estimated'] = 1;
1454
+				} else {
1455
+					$result['estimated'] = 0;
1456
+				}
1457
+				if ($matches[2] == 'PERM') {
1458
+					$result['permanent'] = 1;
1459
+				} else {
1460
+					$result['permanent'] = 0;
1461
+				}
1378 1462
 				$c = true;
1379
-			}
1380
-			elseif (preg_match('#(^|\s)E\) (.*)#',$line,$matches) && $e === false) {
1463
+			} elseif (preg_match('#(^|\s)E\) (.*)#',$line,$matches) && $e === false) {
1381 1464
 				$rtext = array();
1382 1465
 				$text = explode(' ',$matches[2]);
1383 1466
 				foreach ($text as $word) {
1384
-					if (isset($this->abbr[$word])) $rtext[] = strtoupper($this->abbr[$word]);
1385
-					elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) $rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3);
1386
-					else $rtext[] = $word;
1467
+					if (isset($this->abbr[$word])) {
1468
+						$rtext[] = strtoupper($this->abbr[$word]);
1469
+					} elseif (ctype_digit(strval(substr($word,3))) && isset($this->abbr[substr($word,0,3)])) {
1470
+						$rtext[] = strtoupper($this->abbr[substr($word,0,3)]).' '.substr($word,3);
1471
+					} else {
1472
+						$rtext[] = $word;
1473
+					}
1387 1474
 				}
1388 1475
 				$result['text'] = implode(' ',$rtext);
1389 1476
 				$e = true;
@@ -1392,7 +1479,9 @@  discard block
 block discarded – undo
1392 1479
 			} elseif (preg_match('#(NOTAMN|NOTAMR|NOTAMC)#',$line,$matches)) {
1393 1480
 				$text = explode(' ',$line);
1394 1481
 				$result['ref'] = $text[0];
1395
-				if ($matches[1] == 'NOTAMN') $result['type'] = 'new';
1482
+				if ($matches[1] == 'NOTAMN') {
1483
+					$result['type'] = 'new';
1484
+				}
1396 1485
 				if ($matches[1] == 'NOTAMC') {
1397 1486
 					$result['type'] = 'cancel';
1398 1487
 					$result['ref_cancelled'] = $text[2];
@@ -1414,69 +1503,101 @@  discard block
 block discarded – undo
1414 1503
 		switch ($code[1]) {
1415 1504
 			case 'A':
1416 1505
 				$result = 'Airspace organization ';
1417
-				if (isset($this->code_airspace[$code_fp])) $result .= $this->code_airspace[$code_fp];
1506
+				if (isset($this->code_airspace[$code_fp])) {
1507
+					$result .= $this->code_airspace[$code_fp];
1508
+				}
1418 1509
 				break;
1419 1510
 			case 'C':
1420 1511
 				$result = 'Communications and radar facilities ';
1421
-				if (isset($this->code_comradar[$code_fp])) $result .= $this->code_comradar[$code_fp];
1512
+				if (isset($this->code_comradar[$code_fp])) {
1513
+					$result .= $this->code_comradar[$code_fp];
1514
+				}
1422 1515
 				break;
1423 1516
 			case 'F':
1424 1517
 				$result = 'Facilities and services ';
1425
-				if (isset($this->code_facilities[$code_fp])) $result .= $this->code_facilities[$code_fp];
1518
+				if (isset($this->code_facilities[$code_fp])) {
1519
+					$result .= $this->code_facilities[$code_fp];
1520
+				}
1426 1521
 				break;
1427 1522
 			case 'I':
1428 1523
 				$result = 'Instrument and Microwave Landing System ';
1429
-				if (isset($this->code_instrumentlanding[$code_fp])) $result .= $this->code_instrumentlanding[$code_fp];
1524
+				if (isset($this->code_instrumentlanding[$code_fp])) {
1525
+					$result .= $this->code_instrumentlanding[$code_fp];
1526
+				}
1430 1527
 				break;
1431 1528
 			case 'L':
1432 1529
 				$result = 'Lighting facilities ';
1433
-				if (isset($this->code_lightingfacilities[$code_fp])) $result .= $this->code_lightingfacilities[$code_fp];
1530
+				if (isset($this->code_lightingfacilities[$code_fp])) {
1531
+					$result .= $this->code_lightingfacilities[$code_fp];
1532
+				}
1434 1533
 				break;
1435 1534
 			case 'M':
1436 1535
 				$result = 'Movement and landing areas ';
1437
-				if (isset($this->code_movementareas[$code_fp])) $result .= $this->code_movementareas[$code_fp];
1536
+				if (isset($this->code_movementareas[$code_fp])) {
1537
+					$result .= $this->code_movementareas[$code_fp];
1538
+				}
1438 1539
 				break;
1439 1540
 			case 'N':
1440 1541
 				$result = 'Terminal and En Route Navigation Facilities ';
1441
-				if (isset($this->code_terminalfacilities[$code_fp])) $result .= $this->code_terminalfacilities[$code_fp];
1542
+				if (isset($this->code_terminalfacilities[$code_fp])) {
1543
+					$result .= $this->code_terminalfacilities[$code_fp];
1544
+				}
1442 1545
 				break;
1443 1546
 			case 'O':
1444 1547
 				$result = 'Other information ';
1445
-				if (isset($this->code_information[$code_fp])) $result .= $this->code_information[$code_fp];
1548
+				if (isset($this->code_information[$code_fp])) {
1549
+					$result .= $this->code_information[$code_fp];
1550
+				}
1446 1551
 				break;
1447 1552
 			case 'P':
1448 1553
 				$result = 'Air Traffic procedures ';
1449
-				if (isset($this->code_airtraffic[$code_fp])) $result .= $this->code_airtraffic[$code_fp];
1554
+				if (isset($this->code_airtraffic[$code_fp])) {
1555
+					$result .= $this->code_airtraffic[$code_fp];
1556
+				}
1450 1557
 				break;
1451 1558
 			case 'R':
1452 1559
 				$result = 'Navigation Warnings: Airspace Restrictions ';
1453
-				if (isset($this->code_navigationw[$code_fp])) $result .= $this->code_navigationw[$code_fp];
1560
+				if (isset($this->code_navigationw[$code_fp])) {
1561
+					$result .= $this->code_navigationw[$code_fp];
1562
+				}
1454 1563
 				break;
1455 1564
 			case 'S':
1456 1565
 				$result = 'Air Traffic and VOLMET Services ';
1457
-				if (isset($this->code_volmet[$code_fp])) $result .= $this->code_volmet[$code_fp];
1566
+				if (isset($this->code_volmet[$code_fp])) {
1567
+					$result .= $this->code_volmet[$code_fp];
1568
+				}
1458 1569
 				break;
1459 1570
 			case 'W':
1460 1571
 				$result = 'Navigation Warnings: Warnings ';
1461
-				if (isset($this->code_warnings[$code_fp])) $result .= $this->code_warnings[$code_fp];
1572
+				if (isset($this->code_warnings[$code_fp])) {
1573
+					$result .= $this->code_warnings[$code_fp];
1574
+				}
1462 1575
 				break;
1463 1576
 		}
1464 1577
 		switch ($code[3]) {
1465 1578
 			case 'A':
1466 1579
 				// Availability
1467
-				if (isset($this->code_sp_availabity[$code_sp])) $result .= ' '.$this->code_sp_availabity[$code_sp];
1580
+				if (isset($this->code_sp_availabity[$code_sp])) {
1581
+					$result .= ' '.$this->code_sp_availabity[$code_sp];
1582
+				}
1468 1583
 				break;
1469 1584
 			case 'C':
1470 1585
 				// Changes
1471
-				if (isset($this->code_sp_changes[$code_sp])) $result .= ' '.$this->code_sp_changes[$code_sp];
1586
+				if (isset($this->code_sp_changes[$code_sp])) {
1587
+					$result .= ' '.$this->code_sp_changes[$code_sp];
1588
+				}
1472 1589
 				break;
1473 1590
 			case 'H':
1474 1591
 				// Hazardous conditions
1475
-				if (isset($this->code_sp_hazardous[$code_sp])) $result .= ' '.$this->code_sp_hazardous[$code_sp];
1592
+				if (isset($this->code_sp_hazardous[$code_sp])) {
1593
+					$result .= ' '.$this->code_sp_hazardous[$code_sp];
1594
+				}
1476 1595
 				break;
1477 1596
 			case 'L':
1478 1597
 				// Limitations
1479
-				if (isset($this->code_sp_limitations[$code_sp])) $result .= ' '.$this->code_sp_limitations[$code_sp];
1598
+				if (isset($this->code_sp_limitations[$code_sp])) {
1599
+					$result .= ' '.$this->code_sp_limitations[$code_sp];
1600
+				}
1480 1601
 				break;
1481 1602
 			case 'X':
1482 1603
 				// Other Information
Please login to merge, or discard this patch.