Completed
Push — master ( 416413...2c5ccc )
by Yannick
16:48 queued 08:22
created
require/class.APRS.php 1 patch
Braces   +152 added lines, -58 removed lines patch added patch discarded remove patch
@@ -107,17 +107,23 @@  discard block
 block discarded – undo
107 107
 	
108 108
 	/* Check that end was found and body has at least one byte. */
109 109
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
110
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
110
+	    if ($globalDebug) {
111
+	    	echo '!!! APRS invalid : '.$input."\n";
112
+	    }
111 113
 	    return false;
112 114
 	}
113 115
 	
114
-	if ($debug) echo 'input : '.$input."\n";
116
+	if ($debug) {
117
+		echo 'input : '.$input."\n";
118
+	}
115 119
 	/* Save header and body. */
116 120
 	$body = substr($input,$splitpos+1,$input_len);
117 121
 	$body_len = strlen($body);
118 122
 	$header = substr($input,0,$splitpos);
119 123
 	//$header_len = strlen($header);
120
-	if ($debug) echo 'header : '.$header."\n";
124
+	if ($debug) {
125
+		echo 'header : '.$header."\n";
126
+	}
121 127
 	
122 128
 	/* Parse source, target and path. */
123 129
 	//FLRDF0A52>APRS,qAS,LSTB
@@ -131,10 +137,14 @@  discard block
 block discarded – undo
131 137
 		$result['format_source'] = 'famaprs';
132 138
 		$result['source_type'] = 'ais';
133 139
 	    } else {
134
-		if ($debug) echo 'ident : '.$ident."\n";
140
+		if ($debug) {
141
+			echo 'ident : '.$ident."\n";
142
+		}
135 143
 		$result['ident'] = $ident;
136 144
 	    }
137
-	} else return false;
145
+	} else {
146
+		return false;
147
+	}
138 148
 	$elements = explode(',',$all_elements);
139 149
 	$source = end($elements);
140 150
 	$result['source'] = $source;
@@ -143,7 +153,9 @@  discard block
 block discarded – undo
143 153
 	        //echo "ok";
144 154
 	        //if ($element == 'TCPIP*') return false;
145 155
 	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
146
-		if ($debug) echo 'element : '.$element."\n";
156
+		if ($debug) {
157
+			echo 'element : '.$element."\n";
158
+		}
147 159
 		return false;
148 160
 	    }
149 161
 	    /*
@@ -156,11 +168,15 @@  discard block
 block discarded – undo
156 168
 	}
157 169
 	
158 170
 	$type = substr($body,0,1);
159
-	if ($debug) echo 'type : '.$type."\n";
171
+	if ($debug) {
172
+		echo 'type : '.$type."\n";
173
+	}
160 174
 	if ($type == ';') {
161 175
 		if (isset($result['source_type']) && $result['source_type'] == 'sbs') {
162 176
 			$result['hex'] = trim(substr($body,1,9));
163
-		} else $result['ident'] = trim(substr($body,1,9));
177
+		} else {
178
+			$result['ident'] = trim(substr($body,1,9));
179
+		}
164 180
 	} elseif ($type == ',') {
165 181
 		// Invalid data or test data
166 182
 		return false;
@@ -228,7 +244,9 @@  discard block
 block discarded – undo
228 244
 		//$symbol_table = $matches[4];
229 245
 		$lat = intval($lat_deg);
230 246
 		$lon = intval($lon_deg);
231
-		if ($lat > 89 || $lon > 179) return false;
247
+		if ($lat > 89 || $lon > 179) {
248
+			return false;
249
+		}
232 250
 	    
233 251
 	    /*
234 252
 	    $tmp_5b = str_replace('.','',$lat_min);
@@ -238,8 +256,12 @@  discard block
 block discarded – undo
238 256
 	    */
239 257
 		$latitude = $lat + floatval($lat_min)/60;
240 258
 		$longitude = $lon + floatval($lon_min)/60;
241
-		if ($sind == 'S') $latitude = 0-$latitude;
242
-		if ($wind == 'W') $longitude = 0-$longitude;
259
+		if ($sind == 'S') {
260
+			$latitude = 0-$latitude;
261
+		}
262
+		if ($wind == 'W') {
263
+			$longitude = 0-$longitude;
264
+		}
243 265
 		$result['latitude'] = $latitude;
244 266
 		$result['longitude'] = $longitude;
245 267
 		$body_parse = substr($body_parse,18);
@@ -272,7 +294,9 @@  discard block
 block discarded – undo
272 294
 			$body_parse = substr($body_parse,1);
273 295
 			$body_parse_len = strlen($body_parse);
274 296
 			$result['symbol_code'] = $symbol_code;
275
-			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
297
+			if (isset($this->symbols[$symbol_code])) {
298
+				$result['symbol'] = $this->symbols[$symbol_code];
299
+			}
276 300
 			if ($symbol_code != '_') {
277 301
 			}
278 302
 		    //$body_parse = substr($body_parse,1);
@@ -283,7 +307,9 @@  discard block
 block discarded – undo
283 307
 		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
284 308
 		    	    $course = substr($body_parse,0,3);
285 309
 		    	    $tmp_s = intval($course);
286
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
310
+		    	    if ($tmp_s >= 1 && $tmp_s <= 360) {
311
+		    	    	$result['heading'] = intval($course);
312
+		    	    }
287 313
 		    	    $speed = substr($body_parse,4,3);
288 314
 		    	    if ($speed != '...') {
289 315
 		    		    $result['speed'] = round($speed*1.852);
@@ -321,10 +347,16 @@  discard block
 block discarded – undo
321 347
 			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
322 348
 			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
323 349
 			    
324
-				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
325
-				else $result['latitude'] += $lat_off;
326
-				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
327
-				else $result['longitude'] += $lon_off;
350
+				if ($result['latitude'] < 0) {
351
+					$result['latitude'] -= $lat_off;
352
+				} else {
353
+					$result['latitude'] += $lat_off;
354
+				}
355
+				if ($result['longitude'] < 0) {
356
+					$result['longitude'] -= $lon_off;
357
+				} else {
358
+					$result['longitude'] += $lon_off;
359
+				}
328 360
 			    }
329 361
 		            $body_parse = substr($body_parse,6);
330 362
 		    }
@@ -359,27 +391,48 @@  discard block
 block discarded – undo
359 391
 			$address = substr($id,2);
360 392
 			//print_r($matches);
361 393
 			$addressType = (intval(substr($id,0,2),16))&3;
362
-			if ($addressType == 0) $result['addresstype'] = "RANDOM";
363
-			elseif ($addressType == 1) $result['addresstype'] = "ICAO";
364
-			elseif ($addressType == 2) $result['addresstype'] = "FLARM";
365
-			elseif ($addressType == 3) $result['addresstype'] = "OGN";
394
+			if ($addressType == 0) {
395
+				$result['addresstype'] = "RANDOM";
396
+			} elseif ($addressType == 1) {
397
+				$result['addresstype'] = "ICAO";
398
+			} elseif ($addressType == 2) {
399
+				$result['addresstype'] = "FLARM";
400
+			} elseif ($addressType == 3) {
401
+				$result['addresstype'] = "OGN";
402
+			}
366 403
 			$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
367 404
 			$result['aircrafttype_code'] = $aircraftType;
368
-			if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
369
-			elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
370
-			elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE";
371
-			elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
372
-			elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE";
373
-			elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE";
374
-			elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER";
375
-			elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER";
376
-			elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT";
377
-			elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT";
378
-			elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO";
379
-			elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON";
380
-			elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
381
-			elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
382
-			elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
405
+			if ($aircraftType == 0) {
406
+				$result['aircrafttype'] = "UNKNOWN";
407
+			} elseif ($aircraftType == 1) {
408
+				$result['aircrafttype'] = "GLIDER";
409
+			} elseif ($aircraftType == 2) {
410
+				$result['aircrafttype'] = "TOW_PLANE";
411
+			} elseif ($aircraftType == 3) {
412
+				$result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
413
+			} elseif ($aircraftType == 4) {
414
+				$result['aircrafttype'] = "PARACHUTE";
415
+			} elseif ($aircraftType == 5) {
416
+				$result['aircrafttype'] = "DROP_PLANE";
417
+			} elseif ($aircraftType == 6) {
418
+				$result['aircrafttype'] = "HANG_GLIDER";
419
+			} elseif ($aircraftType == 7) {
420
+				$result['aircrafttype'] = "PARA_GLIDER";
421
+			} elseif ($aircraftType == 8) {
422
+				$result['aircrafttype'] = "POWERED_AIRCRAFT";
423
+			} elseif ($aircraftType == 9) {
424
+				$result['aircrafttype'] = "JET_AIRCRAFT";
425
+			} elseif ($aircraftType == 10) {
426
+				$result['aircrafttype'] = "UFO";
427
+			} elseif ($aircraftType == 11) {
428
+				$result['aircrafttype'] = "BALLOON";
429
+			} elseif ($aircraftType == 12) {
430
+				$result['aircrafttype'] = "AIRSHIP";
431
+			} elseif ($aircraftType == 13) {
432
+				$result['aircrafttype'] = "UAV";
433
+			} elseif ($aircraftType == 15) {
434
+				$result['aircrafttype'] = "STATIC_OBJECT";
435
+			}
383 436
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
384 437
 			$result['stealth'] = $stealth;
385 438
 			$result['address'] = $address;
@@ -419,13 +472,21 @@  discard block
 block discarded – undo
419 472
 			$result['temp'] = round(5/9*(($matches[1])-32),1);
420 473
 		    }
421 474
 		}
422
-		} else $result['comment'] = trim($body_parse);
475
+		} else {
476
+			$result['comment'] = trim($body_parse);
477
+		}
423 478
 
424 479
 	    }
425 480
 	//}
426
-	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
427
-	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
428
-	if ($debug) print_r($result);
481
+	if (isset($result['latitude'])) {
482
+		$result['latitude'] = round($result['latitude'],4);
483
+	}
484
+	if (isset($result['longitude'])) {
485
+		$result['longitude'] = round($result['longitude'],4);
486
+	}
487
+	if ($debug) {
488
+		print_r($result);
489
+	}
429 490
 	return $result;
430 491
     }
431 492
     
@@ -434,12 +495,21 @@  discard block
 block discarded – undo
434 495
 	$aprs_connect = 0;
435 496
 	$aprs_keep = 120;
436 497
 	$aprs_last_tx = time();
437
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
438
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
439
-	if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
440
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
441
-	if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
442
-	else $aprs_pass = '-1';
498
+	if (isset($globalAPRSversion)) {
499
+		$aprs_version = $globalAPRSversion;
500
+	} else {
501
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
502
+	}
503
+	if (isset($globalServerAPRSssid)) {
504
+		$aprs_ssid = $globalServerAPRSssid;
505
+	} else {
506
+		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
507
+	}
508
+	if (isset($globalServerAPRSpass)) {
509
+		$aprs_pass = $globalServerAPRSpass;
510
+	} else {
511
+		$aprs_pass = '-1';
512
+	}
443 513
 	
444 514
 	$aprs_filter  = '';
445 515
 	$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
@@ -466,9 +536,13 @@  discard block
 block discarded – undo
466 536
     }
467 537
     
468 538
     function send($data) {
469
-	if ($this->connected === false) $this->connect();
539
+	if ($this->connected === false) {
540
+		$this->connect();
541
+	}
470 542
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
471
-	if ($send === FALSE) $this->connect();
543
+	if ($send === FALSE) {
544
+		$this->connect();
545
+	}
472 546
     }
473 547
 }
474 548
 
@@ -485,18 +559,26 @@  discard block
 block discarded – undo
485 559
 			//$w = '00';
486 560
 			$custom = '';
487 561
 			if ($ident != '') {
488
-				if ($custom != '') $custom .= '/';
562
+				if ($custom != '') {
563
+					$custom .= '/';
564
+				}
489 565
 				$custom .= 'CS='.$ident;
490 566
 			}
491 567
 			if ($squawk != '') {
492
-				if ($custom != '') $custom .= '/';
568
+				if ($custom != '') {
569
+					$custom .= '/';
570
+				}
493 571
 				$custom .= 'SQ='.$squawk;
494 572
 			}
495 573
 			if ($aircraft_icao != '' && $aircraft_icao != 'NA') {
496
-				if ($custom != '') $custom .= '/';
574
+				if ($custom != '') {
575
+					$custom .= '/';
576
+				}
497 577
 				$custom .= 'AI='.$aircraft_icao;
498 578
 			}
499
-			if ($custom != '') $custom = ' '.$custom;
579
+			if ($custom != '') {
580
+				$custom = ' '.$custom;
581
+			}
500 582
 			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.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_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
501 583
 		}
502 584
 	}
@@ -514,26 +596,38 @@  discard block
 block discarded – undo
514 596
 			//$w = '00';
515 597
 			$custom = '';
516 598
 			if ($ident != '') {
517
-				if ($custom != '') $custom .= '/';
599
+				if ($custom != '') {
600
+					$custom .= '/';
601
+				}
518 602
 				$custom .= 'CS='.$ident;
519 603
 			}
520 604
 			if ($typeid != '') {
521
-				if ($custom != '') $custom .= '/';
605
+				if ($custom != '') {
606
+					$custom .= '/';
607
+				}
522 608
 				$custom .= 'TI='.$typeid;
523 609
 			}
524 610
 			if ($imo != '') {
525
-				if ($custom != '') $custom .= '/';
611
+				if ($custom != '') {
612
+					$custom .= '/';
613
+				}
526 614
 				$custom .= 'IMO='.$imo;
527 615
 			}
528 616
 			if ($arrival_date != '') {
529
-				if ($custom != '') $custom .= '/';
617
+				if ($custom != '') {
618
+					$custom .= '/';
619
+				}
530 620
 				$custom .= 'AD='.strtotime($arrival_date);
531 621
 			}
532 622
 			if ($arrival_code != '') {
533
-				if ($custom != '') $custom .= '/';
623
+				if ($custom != '') {
624
+					$custom .= '/';
625
+				}
534 626
 				$custom .= 'AC='.$arrival_code;
535 627
 			}
536
-			if ($custom != '') $custom = ' '.$custom;
628
+			if ($custom != '') {
629
+				$custom = ' '.$custom;
630
+			}
537 631
 			$altitude = 0;
538 632
 			$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");
539 633
 		}
Please login to merge, or discard this patch.