Completed
Push — master ( 460c94...2c5525 )
by Yannick
33:06
created
captain-detailed.php 2 patches
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -5,14 +5,14 @@  discard block
 block discarded – undo
5 5
 require_once('require/class.Language.php');
6 6
 require_once('require/class.MarineArchive.php');
7 7
 
8
-if (!isset($_GET['captain'])){
8
+if (!isset($_GET['captain'])) {
9 9
 	header('Location: '.$globalURL.'/');
10 10
 } else {
11 11
 	$type = 'marine';
12 12
 	$Marine = new Marine();
13 13
 	$MarineArchive = new MarineArchive();
14 14
 	//calculuation for the pagination
15
-	if(!isset($_GET['limit']))
15
+	if (!isset($_GET['limit']))
16 16
 	{
17 17
 		$limit_start = 0;
18 18
 		$limit_end = 25;
@@ -33,29 +33,29 @@  discard block
 block discarded – undo
33 33
 	
34 34
 	$page_url = $globalURL.'/captain/'.$_GET['captain'];
35 35
 	
36
-	$captain = filter_input(INPUT_GET,'captain',FILTER_SANITIZE_STRING);
37
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
38
-	$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
39
-	$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
36
+	$captain = filter_input(INPUT_GET, 'captain', FILTER_SANITIZE_STRING);
37
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
38
+	$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT);
39
+	$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT);
40 40
 	$filter = array();
41
-	if ($year != '') $filter = array_merge($filter,array('year' => $year));
42
-	if ($month != '') $filter = array_merge($filter,array('month' => $month));
41
+	if ($year != '') $filter = array_merge($filter, array('year' => $year));
42
+	if ($month != '') $filter = array_merge($filter, array('month' => $month));
43 43
 	if ($sort != '') 
44 44
 	{
45
-		$spotter_array = $Marine->getMarineDataByCaptain($captain,$limit_start.",".$absolute_difference, $sort,$filter);
45
+		$spotter_array = $Marine->getMarineDataByCaptain($captain, $limit_start.",".$absolute_difference, $sort, $filter);
46 46
 		if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
47
-			$spotter_array = $MarineArchive->getMarineDataByCaptain($captain,$limit_start.",".$absolute_difference, $sort,$filter);
47
+			$spotter_array = $MarineArchive->getMarineDataByCaptain($captain, $limit_start.",".$absolute_difference, $sort, $filter);
48 48
 		}
49 49
 	} else {
50
-		$spotter_array = $Marine->getMarineDataByCaptain($captain,$limit_start.",".$absolute_difference,'',$filter);
50
+		$spotter_array = $Marine->getMarineDataByCaptain($captain, $limit_start.",".$absolute_difference, '', $filter);
51 51
 		if (empty($spotter_array) && isset($globalArchiveResults) && $globalArchiveResults) {
52
-			$spotter_array = $MarineArchive->getMarineDataByCaptain($captain,$limit_start.",".$absolute_difference,'',$filter);
52
+			$spotter_array = $MarineArchive->getMarineDataByCaptain($captain, $limit_start.",".$absolute_difference, '', $filter);
53 53
 		}
54 54
 	}
55 55
 
56 56
 	if (!empty($spotter_array))
57 57
 	{
58
-		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['captain_name']);
58
+		$title = sprintf(_("Detailed View for %s"), $spotter_array[0]['captain_name']);
59 59
 		$ident = $spotter_array[0]['ident'];
60 60
 		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
61 61
 		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
@@ -119,9 +119,9 @@  discard block
 block discarded – undo
119 119
 		} else $flights = 0;
120 120
 		if ($flights == 0)
121 121
 		*/
122
-		$flights = $Marine->countRacesByCaptain($captain,$filter);
122
+		$flights = $Marine->countRacesByCaptain($captain, $filter);
123 123
 		print '<div><span class="label">'._("Races").'</span>'.$flights.'</div>';
124
-		$aircraft_type = count($Marine->countAllBoatTypesByCaptain($captain,$filter));
124
+		$aircraft_type = count($Marine->countAllBoatTypesByCaptain($captain, $filter));
125 125
 		print '<div><span class="label">'._("Boat type").'</span>'.$aircraft_type.'</div>';
126 126
 		//$aircraft_registration = count($Marine->countAllAircraftRegistrationByCaptain($captain,$filter));
127 127
 		//print '<div><span class="label">'._("Aircraft").'</span>'.$aircraft_registration.'</div>';
@@ -129,13 +129,13 @@  discard block
 block discarded – undo
129 129
 		//print '<div><span class="label">'._("Manufacturers").'</span>'.$aircraft_manufacturer.'</div>';
130 130
 		//$airlines = count($Marine->countAllAirlinesByCaptain($captain,$filter));
131 131
 		//print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>';
132
-		$duration = $Marine->getRaceDurationByCaptain($captain,$filter);
132
+		$duration = $Marine->getRaceDurationByCaptain($captain, $filter);
133 133
 		if ($duration != '0') print '<div><span class="label">'._("Total races spotted duration").'</span>'.$duration.'</div>';
134 134
 		print '</div>';
135 135
 	
136 136
 		//include('captain-sub-menu.php');
137 137
 		print '<div class="table column">';
138
-		print '<p>'.sprintf(_("The table below shows the detailed information of all races with the captain <strong>%s</strong>."),$spotter_array[0]['captain_name']).'</p>';
138
+		print '<p>'.sprintf(_("The table below shows the detailed information of all races with the captain <strong>%s</strong>."), $spotter_array[0]['captain_name']).'</p>';
139 139
 
140 140
 		include('table-output.php'); 
141 141
 		print '<div class="pagination">';
Please login to merge, or discard this patch.
Braces   +18 added lines, -6 removed lines patch added patch discarded remove patch
@@ -38,8 +38,12 @@  discard block
 block discarded – undo
38 38
 	$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
39 39
 	$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
40 40
 	$filter = array();
41
-	if ($year != '') $filter = array_merge($filter,array('year' => $year));
42
-	if ($month != '') $filter = array_merge($filter,array('month' => $month));
41
+	if ($year != '') {
42
+		$filter = array_merge($filter,array('year' => $year));
43
+	}
44
+	if ($month != '') {
45
+		$filter = array_merge($filter,array('month' => $month));
46
+	}
43 47
 	if ($sort != '') 
44 48
 	{
45 49
 		$spotter_array = $Marine->getMarineDataByCaptain($captain,$limit_start.",".$absolute_difference, $sort,$filter);
@@ -57,8 +61,12 @@  discard block
 block discarded – undo
57 61
 	{
58 62
 		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['captain_name']);
59 63
 		$ident = $spotter_array[0]['ident'];
60
-		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
61
-		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
64
+		if (isset($spotter_array[0]['latitude'])) {
65
+			$latitude = $spotter_array[0]['latitude'];
66
+		}
67
+		if (isset($spotter_array[0]['longitude'])) {
68
+			$longitude = $spotter_array[0]['longitude'];
69
+		}
62 70
 		require_once('header.php');
63 71
 		/*
64 72
 		if (isset($globalArchive) && $globalArchive) {
@@ -111,7 +119,9 @@  discard block
 block discarded – undo
111 119
 		*/
112 120
 		print '<div class="info column">';
113 121
 		print '<h1>'.$spotter_array[0]['captain_name'].'</h1>';
114
-		if (isset($spotter_array[0]['captain_id']) && $spotter_array[0]['captain_id'] != '') print '<div><span class="label">'._("Captain ID").'</span>'.$spotter_array[0]['captain_id'].'</div>';
122
+		if (isset($spotter_array[0]['captain_id']) && $spotter_array[0]['captain_id'] != '') {
123
+			print '<div><span class="label">'._("Captain ID").'</span>'.$spotter_array[0]['captain_id'].'</div>';
124
+		}
115 125
 		/*
116 126
 		if ($year == '' && $month == '') {
117 127
 			$Stats = new Stats();
@@ -130,7 +140,9 @@  discard block
 block discarded – undo
130 140
 		//$airlines = count($Marine->countAllAirlinesByCaptain($captain,$filter));
131 141
 		//print '<div><span class="label">'._("Airlines").'</span>'.$airlines.'</div>';
132 142
 		$duration = $Marine->getRaceDurationByCaptain($captain,$filter);
133
-		if ($duration != '0') print '<div><span class="label">'._("Total races spotted duration").'</span>'.$duration.'</div>';
143
+		if ($duration != '0') {
144
+			print '<div><span class="label">'._("Total races spotted duration").'</span>'.$duration.'</div>';
145
+		}
134 146
 		print '</div>';
135 147
 	
136 148
 		//include('captain-sub-menu.php');
Please login to merge, or discard this patch.
header.php 1 patch
Braces   +95 added lines, -22 removed lines patch added patch discarded remove patch
@@ -6,12 +6,19 @@  discard block
 block discarded – undo
6 6
 //gets the page file and stores it in a variable
7 7
 $file_path = pathinfo($_SERVER['SCRIPT_NAME']);
8 8
 $current_page = $file_path['filename'];
9
-if ($globalTimezone == '') $globalTimezone = 'UTC';
9
+if ($globalTimezone == '') {
10
+	$globalTimezone = 'UTC';
11
+}
10 12
 date_default_timezone_set($globalTimezone);
11
-if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType'];
12
-else $MapType = $globalMapProvider;
13
+if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') {
14
+	$MapType = $_COOKIE['MapType'];
15
+} else {
16
+	$MapType = $globalMapProvider;
17
+}
13 18
 
14
-if (isset($globalMapOffline) && $globalMapOffline) $MapType = 'offline';
19
+if (isset($globalMapOffline) && $globalMapOffline) {
20
+	$MapType = 'offline';
21
+}
15 22
 
16 23
 if (isset($_GET['3d'])) {
17 24
 	setcookie('MapFormat','3d');
@@ -209,7 +216,10 @@  discard block
 block discarded – undo
209 216
 <?php
210 217
 		} else {
211 218
 ?>
212
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?<?php print time(); ?><?php if (isset($tsk)) print '&tsk='.$tsk; ?>"></script>
219
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?<?php print time(); ?><?php if (isset($tsk)) {
220
+	print '&tsk='.$tsk;
221
+}
222
+?>"></script>
213 223
 <?php
214 224
 		}
215 225
 		if (!isset($globalAircraft) || $globalAircraft) {
@@ -249,7 +259,13 @@  discard block
 block discarded – undo
249 259
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
250 260
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
251 261
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
252
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
262
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) {
263
+	print '&latitude='.$latitude;
264
+}
265
+?><?php if(isset($longitude)) {
266
+	print '&longitude='.$longitude;
267
+}
268
+?>&<?php print time(); ?>"></script>
253 269
 <?php
254 270
 		if (!isset($type) || $type == 'aircraft') {
255 271
 ?>
@@ -322,7 +338,13 @@  discard block
 block discarded – undo
322 338
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
323 339
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
324 340
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
325
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
341
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) {
342
+	print '&latitude='.$latitude;
343
+}
344
+?><?php if(isset($longitude)) {
345
+	print '&longitude='.$longitude;
346
+}
347
+?>&<?php print time(); ?>"></script>
326 348
 <script src="<?php print $globalURL; ?>/js/map-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script>
327 349
 <?php
328 350
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
@@ -403,7 +425,12 @@  discard block
 block discarded – undo
403 425
         <span class="icon-bar"></span>
404 426
       </button>
405 427
       <a href="<?php print $globalURL; ?>/search" class="navbar-toggle search"><i class="fa fa-search"></i></a>
406
-      <a class="navbar-brand" href="<?php if ($globalURL == '') print '/'; else print $globalURL; ?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
428
+      <a class="navbar-brand" href="<?php if ($globalURL == '') {
429
+	print '/';
430
+} else {
431
+	print $globalURL;
432
+}
433
+?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
407 434
     </div>
408 435
     <div class="collapse navbar-collapse">
409 436
 
@@ -458,7 +485,10 @@  discard block
 block discarded – undo
458 485
 	}
459 486
 ?>
460 487
 
461
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
488
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
489
+	echo 'right-';
490
+}
491
+?>caret"></b></a>
462 492
           <ul class="dropdown-menu">
463 493
           	<li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircraft Types"); ?></a></li>
464 494
 <?php
@@ -529,8 +559,14 @@  discard block
 block discarded – undo
529 559
         </li>
530 560
       	<li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li>
531 561
       	<li><a href="<?php print $globalURL; ?>/statistics"><?php echo _("Statistics"); ?></a></li>
532
-        <li class="dropdown<?php if ($sub) echo '-submenu'; ?>">
533
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
562
+        <li class="dropdown<?php if ($sub) {
563
+	echo '-submenu';
564
+}
565
+?>">
566
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) {
567
+	echo 'right-';
568
+}
569
+?>caret"></b></a>
534 570
           <ul class="dropdown-menu">
535 571
           	<li><a href="<?php print $globalURL; ?>/tools/acars"><?php echo _("ACARS translator"); ?></a></li>
536 572
           	<li><a href="<?php print $globalURL; ?>/tools/metar"><?php echo _("METAR translator"); ?></a></li>
@@ -574,7 +610,10 @@  discard block
 block discarded – undo
574 610
 <?php
575 611
 	}
576 612
 ?>
577
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
613
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
614
+	echo 'right-';
615
+}
616
+?>caret"></b></a>
578 617
 		<ul class="dropdown-menu">
579 618
 <?php
580 619
 	if (isset($globalVM) && $globalVM) {
@@ -624,7 +663,10 @@  discard block
 block discarded – undo
624 663
 <?php
625 664
 	}
626 665
 ?>
627
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
666
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
667
+	echo 'right-';
668
+}
669
+?>caret"></b></a>
628 670
 		<ul class="dropdown-menu">
629 671
 		    <li><a href="<?php print $globalURL; ?>/tracker/currently"><?php echo _("Current Activity"); ?></a></li>
630 672
 		    <li><a href="<?php print $globalURL; ?>/tracker/latest"><?php echo _("Latest Activity"); ?></a></li>
@@ -667,7 +709,10 @@  discard block
 block discarded – undo
667 709
 ?>
668 710
 
669 711
 <!--
670
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
712
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
713
+	echo 'right-';
714
+}
715
+?>caret"></b></a>
671 716
 		<ul class="dropdown-menu">
672 717
 		    <li><a href="<?php print $globalURL; ?>/satellite/currently"><?php echo _("Current Activity"); ?></a></li>
673 718
 		    <li><a href="<?php print $globalURL; ?>/satellite/latest"><?php echo _("Latest Activity"); ?></a></li>
@@ -725,9 +770,14 @@  discard block
 block discarded – undo
725 770
   		    <?php
726 771
   		        foreach ($alllang as $key => $lang) {
727 772
   		            print '<option value="'.$key.'"';
728
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
729
-  		            if ($lang[0] == 'Deutsch') print '>'.$lang[0].' (&beta;eta)</option>';
730
-  		            else print '>'.$lang[0].'</option>';
773
+  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) {
774
+  		            	print ' selected ';
775
+  		            }
776
+  		            if ($lang[0] == 'Deutsch') {
777
+  		            	print '>'.$lang[0].' (&beta;eta)</option>';
778
+  		            } else {
779
+  		            	print '>'.$lang[0].'</option>';
780
+  		            }
731 781
   		        }
732 782
   		    ?>
733 783
   		</select>
@@ -875,9 +925,24 @@  discard block
 block discarded – undo
875 925
 	$customid = $globalMapProvider;
876 926
 ?>
877 927
     L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
878
-        maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>,
879
-        minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
880
-        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
928
+        maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
929
+	print $globalMapCustomLayer[$customid]['maxZoom'];
930
+} else {
931
+	print '18';
932
+}
933
+?>,
934
+        minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
935
+	print $globalMapCustomLayer[$customid]['minZoom'];
936
+} else {
937
+	print '0';
938
+}
939
+?>,
940
+        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
941
+	print 'false';
942
+} else {
943
+	print 'true';
944
+}
945
+?>,
881 946
         attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
882 947
     }).addTo(map);
883 948
 <?php
@@ -892,7 +957,12 @@  discard block
 block discarded – undo
892 957
         maxZoom: 5,
893 958
         tms : true,
894 959
         zindex : 3,
895
-        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
960
+        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
961
+	print 'false';
962
+} else {
963
+	print 'true';
964
+}
965
+?>,
896 966
         attribution: 'Natural Earth'
897 967
     }).addTo(map);
898 968
 <?php
@@ -915,4 +985,7 @@  discard block
 block discarded – undo
915 985
 
916 986
 ?>
917 987
 
918
-<section class="container main-content <?php if (strtolower($current_page) == 'index') print 'index '; ?>clear">
988
+<section class="container main-content <?php if (strtolower($current_page) == 'index') {
989
+	print 'index ';
990
+}
991
+?>clear">
Please login to merge, or discard this patch.
captain.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 
8 8
 if (isset($_POST['captain']))
9 9
 {
10
-	header('Location: '.$globalURL.'/captain/'.filter_input(INPUT_POST,'captain',FILTER_SANITIZE_STRING));
10
+	header('Location: '.$globalURL.'/captain/'.filter_input(INPUT_POST, 'captain', FILTER_SANITIZE_STRING));
11 11
 //} else if (isset($_GET['airport'])){
12 12
 } else {
13 13
 	$Marine = new Marine();
@@ -24,11 +24,11 @@  discard block
 block discarded – undo
24 24
 	//ksort($captain_names);
25 25
 	$previous = null;
26 26
 	print '<div class="alphabet-legend">';
27
-	foreach($captain_names as $value) {
27
+	foreach ($captain_names as $value) {
28 28
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['captain_name'], 0, 1));
29
-		if($previous !== $firstLetter && $firstLetter != "'")
29
+		if ($previous !== $firstLetter && $firstLetter != "'")
30 30
 		{
31
-			if ($previous !== null){
31
+			if ($previous !== null) {
32 32
 				print ' | ';
33 33
 			}
34 34
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
@@ -37,13 +37,13 @@  discard block
 block discarded – undo
37 37
 	}
38 38
 	print '</div>';
39 39
 	$previous = null;
40
-	foreach($captain_names as $value) {
40
+	foreach ($captain_names as $value) {
41 41
 		$firstLetter = strtoupper($Common->replace_mb_substr($value['captain_name'], 0, 1));
42 42
 		if ($firstLetter != "")
43 43
 		{
44
-			if($previous !== $firstLetter && $firstLetter != "'")
44
+			if ($previous !== $firstLetter && $firstLetter != "'")
45 45
 			{
46
-				if ($previous !== null){
46
+				if ($previous !== null) {
47 47
 					print '</div>';
48 48
 				}
49 49
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
Please login to merge, or discard this patch.
Braces   +11 added lines, -4 removed lines patch added patch discarded remove patch
@@ -33,7 +33,9 @@  discard block
 block discarded – undo
33 33
 			}
34 34
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
35 35
 		}
36
-		if ($firstLetter != "'") $previous = $firstLetter;
36
+		if ($firstLetter != "'") {
37
+			$previous = $firstLetter;
38
+		}
37 39
 	}
38 40
 	print '</div>';
39 41
 	$previous = null;
@@ -48,10 +50,15 @@  discard block
 block discarded – undo
48 50
 				}
49 51
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
50 52
 			}
51
-			if ($firstLetter != "'") $previous = $firstLetter;
53
+			if ($firstLetter != "'") {
54
+				$previous = $firstLetter;
55
+			}
52 56
 			print '<div class="alphabet-item">';
53
-			if (isset($value['captain_id']) && $value['captain_id'] != '') print '<a href="'.$globalURL.'/marine/captain/'.$value['captain_id'].'">'.$value['captain_name'].' ('.$value['captain_id'].')';
54
-			else print '<a href="'.$globalURL.'/captain/'.$value['captain_name'].'">'.$value['captain_name'];
57
+			if (isset($value['captain_id']) && $value['captain_id'] != '') {
58
+				print '<a href="'.$globalURL.'/marine/captain/'.$value['captain_id'].'">'.$value['captain_name'].' ('.$value['captain_id'].')';
59
+			} else {
60
+				print '<a href="'.$globalURL.'/captain/'.$value['captain_name'].'">'.$value['captain_name'];
61
+			}
55 62
 			print '</a>';
56 63
 			print '</div>';
57 64
 		}
Please login to merge, or discard this patch.
scripts/daemon-spotter.php 3 patches
Indentation   +1104 added lines, -1104 removed lines patch added patch discarded remove patch
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
 require_once(dirname(__FILE__).'/../require/class.Common.php');
17 17
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
18 18
 if (isset($globalMarine) && $globalMarine) {
19
-    require_once(dirname(__FILE__).'/../require/class.AIS.php');
20
-    require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
19
+	require_once(dirname(__FILE__).'/../require/class.AIS.php');
20
+	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
21 21
 }
22 22
 
23 23
 if (!isset($globalDebug)) $globalDebug = FALSE;
@@ -25,46 +25,46 @@  discard block
 block discarded – undo
25 25
 // Check if schema is at latest version
26 26
 $Connection = new Connection();
27 27
 if ($Connection->connectionExists() === false) {
28
-    echo "Can't connect to your database. Check DB is running, user/password and database logs.";
29
-    exit();
28
+	echo "Can't connect to your database. Check DB is running, user/password and database logs.";
29
+	exit();
30 30
 }
31 31
 if ($Connection->latest() === false) {
32
-    echo "You MUST update to latest schema. Run install/index.php";
33
-    exit();
32
+	echo "You MUST update to latest schema. Run install/index.php";
33
+	exit();
34 34
 }
35 35
 if (PHP_SAPI != 'cli') {
36
-    echo "This script MUST be called from console, not a web browser.";
36
+	echo "This script MUST be called from console, not a web browser.";
37 37
 //    exit();
38 38
 }
39 39
 
40 40
 // This is to be compatible with old version of settings.php
41 41
 if (!isset($globalSources)) {
42
-    if (isset($globalSBS1Hosts)) {
43
-        //$hosts = $globalSBS1Hosts;
44
-        foreach ($globalSBS1Hosts as $host) {
45
-	    $globalSources[] = array('host' => $host);
46
-    	}
47
-    } else {
48
-        if (!isset($globalSBS1Host)) {
49
-	    echo '$globalSources MUST be defined !';
50
-	    die;
42
+	if (isset($globalSBS1Hosts)) {
43
+		//$hosts = $globalSBS1Hosts;
44
+		foreach ($globalSBS1Hosts as $host) {
45
+		$globalSources[] = array('host' => $host);
46
+		}
47
+	} else {
48
+		if (!isset($globalSBS1Host)) {
49
+		echo '$globalSources MUST be defined !';
50
+		die;
51 51
 	}
52 52
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
53 53
 	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
54
-    }
54
+	}
55 55
 }
56 56
 
57 57
 $options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver','enable-aircraft','disable-aircraft','enable-tracker','disable-tracker','enable-marine','disable-marine'));
58 58
 //if (isset($options['s'])) $hosts = array($options['s']);
59 59
 //elseif (isset($options['source'])) $hosts = array($options['source']);
60 60
 if (isset($options['s'])) {
61
-    $globalSources = array();
62
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
63
-    else $globalSources[] = array('host' => $options['s']);
61
+	$globalSources = array();
62
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
63
+	else $globalSources[] = array('host' => $options['s']);
64 64
 } elseif (isset($options['source'])) {
65
-    $globalSources = array();
66
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
67
-    else $globalSources[] = array('host' => $options['source']);
65
+	$globalSources = array();
66
+	if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
67
+	else $globalSources[] = array('host' => $options['source']);
68 68
 }
69 69
 if (isset($options['aprsserverhost'])) {
70 70
 	$globalServerAPRS = TRUE;
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
 if (isset($options['idsource'])) $id_source = $options['idsource'];
104 104
 else $id_source = 1;
105 105
 if (isset($globalServer) && $globalServer) {
106
-    if ($globalDebug) echo "Using Server Mode\n";
107
-    $SI=new SpotterServer();
106
+	if ($globalDebug) echo "Using Server Mode\n";
107
+	$SI=new SpotterServer();
108 108
 /*
109 109
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
110 110
     $SI = new adsb2aprs();
@@ -114,14 +114,14 @@  discard block
 block discarded – undo
114 114
 
115 115
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
116 116
 if (isset($globalMarine) && $globalMarine) {
117
-    require_once(dirname(__FILE__).'/../require/class.AIS.php');
118
-    require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
117
+	require_once(dirname(__FILE__).'/../require/class.AIS.php');
118
+	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
119 119
 }
120 120
 
121 121
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
122 122
 if (isset($globalMarine) && $globalMarine) {
123
-    $AIS = new AIS();
124
-    $MI = new MarineImport($Connection->db);
123
+	$AIS = new AIS();
124
+	$MI = new MarineImport($Connection->db);
125 125
 }
126 126
 //$APRS=new APRS($Connection->db);
127 127
 $SBS=new SBS();
@@ -134,12 +134,12 @@  discard block
 block discarded – undo
134 134
 //$servertz = system('date +%Z');
135 135
 // signal handler - playing nice with sockets and dump1090
136 136
 if (function_exists('pcntl_fork')) {
137
-    pcntl_signal(SIGINT,  function() {
138
-        global $sockets;
139
-        echo "\n\nctrl-c or kill signal received. Tidying up ... ";
140
-        die("Bye!\n");
141
-    });
142
-    pcntl_signal_dispatch();
137
+	pcntl_signal(SIGINT,  function() {
138
+		global $sockets;
139
+		echo "\n\nctrl-c or kill signal received. Tidying up ... ";
140
+		die("Bye!\n");
141
+	});
142
+	pcntl_signal_dispatch();
143 143
 }
144 144
 
145 145
 // let's try and connect
@@ -149,46 +149,46 @@  discard block
 block discarded – undo
149 149
 $reset = 0;
150 150
 
151 151
 function connect_all($hosts) {
152
-    //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
153
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
154
-    $reset++;
155
-    if ($globalDebug) echo 'Connect to all...'."\n";
156
-    foreach ($hosts as $id => $value) {
152
+	//global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
153
+	global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
154
+	$reset++;
155
+	if ($globalDebug) echo 'Connect to all...'."\n";
156
+	foreach ($hosts as $id => $value) {
157 157
 	$host = $value['host'];
158 158
 	$globalSources[$id]['last_exec'] = 0;
159 159
 	// Here we check type of source(s)
160 160
 	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
161
-            if (preg_match('/deltadb.txt$/i',$host)) {
162
-        	//$formats[$id] = 'deltadbtxt';
163
-        	$globalSources[$id]['format'] = 'deltadbtxt';
164
-        	//$last_exec['deltadbtxt'] = 0;
165
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
166
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
167
-        	//$formats[$id] = 'vatsimtxt';
168
-        	$globalSources[$id]['format'] = 'vatsimtxt';
169
-        	//$last_exec['vatsimtxt'] = 0;
170
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
171
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
172
-        	//$formats[$id] = 'aircraftlistjson';
173
-        	$globalSources[$id]['format'] = 'aircraftlistjson';
174
-        	//$last_exec['aircraftlistjson'] = 0;
175
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
176
-    	    } else if (preg_match('/aircraft.json$/i',$host)) {
177
-        	//$formats[$id] = 'aircraftjson';
178
-        	$globalSources[$id]['format'] = 'aircraftjson';
179
-        	//$last_exec['aircraftlistjson'] = 0;
180
-        	if ($globalDebug) echo "Connect to aircraft.json source (".$host.")...\n";
181
-    	    } else if (preg_match('/aircraft$/i',$host)) {
182
-        	//$formats[$id] = 'planefinderclient';
183
-        	$globalSources[$id]['format'] = 'planefinderclient';
184
-        	//$last_exec['aircraftlistjson'] = 0;
185
-        	if ($globalDebug) echo "Connect to planefinderclient source (".$host.")...\n";
186
-    	    } else if (preg_match('/opensky/i',$host)) {
187
-        	//$formats[$id] = 'aircraftlistjson';
188
-        	$globalSources[$id]['format'] = 'opensky';
189
-        	//$last_exec['aircraftlistjson'] = 0;
190
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
191
-    	    /*
161
+			if (preg_match('/deltadb.txt$/i',$host)) {
162
+			//$formats[$id] = 'deltadbtxt';
163
+			$globalSources[$id]['format'] = 'deltadbtxt';
164
+			//$last_exec['deltadbtxt'] = 0;
165
+			if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
166
+			} else if (preg_match('/vatsim-data.txt$/i',$host)) {
167
+			//$formats[$id] = 'vatsimtxt';
168
+			$globalSources[$id]['format'] = 'vatsimtxt';
169
+			//$last_exec['vatsimtxt'] = 0;
170
+			if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
171
+			} else if (preg_match('/aircraftlist.json$/i',$host)) {
172
+			//$formats[$id] = 'aircraftlistjson';
173
+			$globalSources[$id]['format'] = 'aircraftlistjson';
174
+			//$last_exec['aircraftlistjson'] = 0;
175
+			if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
176
+			} else if (preg_match('/aircraft.json$/i',$host)) {
177
+			//$formats[$id] = 'aircraftjson';
178
+			$globalSources[$id]['format'] = 'aircraftjson';
179
+			//$last_exec['aircraftlistjson'] = 0;
180
+			if ($globalDebug) echo "Connect to aircraft.json source (".$host.")...\n";
181
+			} else if (preg_match('/aircraft$/i',$host)) {
182
+			//$formats[$id] = 'planefinderclient';
183
+			$globalSources[$id]['format'] = 'planefinderclient';
184
+			//$last_exec['aircraftlistjson'] = 0;
185
+			if ($globalDebug) echo "Connect to planefinderclient source (".$host.")...\n";
186
+			} else if (preg_match('/opensky/i',$host)) {
187
+			//$formats[$id] = 'aircraftlistjson';
188
+			$globalSources[$id]['format'] = 'opensky';
189
+			//$last_exec['aircraftlistjson'] = 0;
190
+			if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
191
+			/*
192 192
     	    // Disabled for now, site change source format
193 193
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
194 194
         	//$formats[$id] = 'radarvirtueljson';
@@ -200,128 +200,128 @@  discard block
 block discarded – undo
200 200
         	    exit(0);
201 201
         	}
202 202
     	    */
203
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
204
-        	//$formats[$id] = 'planeupdatefaa';
205
-        	$globalSources[$id]['format'] = 'planeupdatefaa';
206
-        	//$last_exec['planeupdatefaa'] = 0;
207
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
208
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
209
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
210
-        	    exit(0);
211
-        	}
212
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
213
-        	//$formats[$id] = 'phpvmacars';
214
-        	$globalSources[$id]['format'] = 'phpvmacars';
215
-        	//$last_exec['phpvmacars'] = 0;
216
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
217
-            } else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
218
-        	//$formats[$id] = 'phpvmacars';
219
-        	$globalSources[$id]['format'] = 'vaos';
220
-        	//$last_exec['phpvmacars'] = 0;
221
-        	if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
222
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
223
-        	//$formats[$id] = 'phpvmacars';
224
-        	$globalSources[$id]['format'] = 'vam';
225
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
226
-            } else if (preg_match('/whazzup/i',$host)) {
227
-        	//$formats[$id] = 'whazzup';
228
-        	$globalSources[$id]['format'] = 'whazzup';
229
-        	//$last_exec['whazzup'] = 0;
230
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
231
-            } else if (preg_match('/blitzortung/i',$host)) {
232
-        	$globalSources[$id]['format'] = 'blitzortung';
233
-        	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
234
-            } else if (preg_match('/airwhere/i',$host)) {
235
-        	$globalSources[$id]['format'] = 'airwhere';
236
-        	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
237
-            } else if (preg_match('/recentpireps/i',$host)) {
238
-        	//$formats[$id] = 'pirepsjson';
239
-        	$globalSources[$id]['format'] = 'pirepsjson';
240
-        	//$last_exec['pirepsjson'] = 0;
241
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
242
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
243
-        	//$formats[$id] = 'fr24json';
244
-        	$globalSources[$id]['format'] = 'fr24json';
245
-        	//$last_exec['fr24json'] = 0;
246
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
247
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
248
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
249
-        	    exit(0);
250
-        	}
251
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
252
-        	//$formats[$id] = 'fr24json';
253
-        	$globalSources[$id]['format'] = 'myshiptracking';
254
-        	//$last_exec['fr24json'] = 0;
255
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
256
-        	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
257
-        	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
258
-        	    exit(0);
259
-        	}
260
-            //} else if (preg_match('/10001/',$host)) {
261
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
262
-        	//$formats[$id] = 'tsv';
263
-        	$globalSources[$id]['format'] = 'tsv';
264
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
265
-            }
266
-        } elseif (filter_var($host,FILTER_VALIDATE_URL) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway')) {
267
-    		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
268
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
269
-    		    if ($idf !== false) {
270
-    			$httpfeeds[$id] = $idf;
271
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
272
-    		    } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
273
-    		} elseif ($globalDebug && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\n";
274
-    		elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
275
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
276
-	    $hostport = explode(':',$host);
277
-	    if (isset($hostport[1])) {
203
+			} else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
204
+			//$formats[$id] = 'planeupdatefaa';
205
+			$globalSources[$id]['format'] = 'planeupdatefaa';
206
+			//$last_exec['planeupdatefaa'] = 0;
207
+			if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
208
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
209
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
210
+				exit(0);
211
+			}
212
+			} else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
213
+			//$formats[$id] = 'phpvmacars';
214
+			$globalSources[$id]['format'] = 'phpvmacars';
215
+			//$last_exec['phpvmacars'] = 0;
216
+			if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
217
+			} else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
218
+			//$formats[$id] = 'phpvmacars';
219
+			$globalSources[$id]['format'] = 'vaos';
220
+			//$last_exec['phpvmacars'] = 0;
221
+			if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
222
+			} else if (preg_match('/VAM-json.php$/i',$host)) {
223
+			//$formats[$id] = 'phpvmacars';
224
+			$globalSources[$id]['format'] = 'vam';
225
+			if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
226
+			} else if (preg_match('/whazzup/i',$host)) {
227
+			//$formats[$id] = 'whazzup';
228
+			$globalSources[$id]['format'] = 'whazzup';
229
+			//$last_exec['whazzup'] = 0;
230
+			if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
231
+			} else if (preg_match('/blitzortung/i',$host)) {
232
+			$globalSources[$id]['format'] = 'blitzortung';
233
+			if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
234
+			} else if (preg_match('/airwhere/i',$host)) {
235
+			$globalSources[$id]['format'] = 'airwhere';
236
+			if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
237
+			} else if (preg_match('/recentpireps/i',$host)) {
238
+			//$formats[$id] = 'pirepsjson';
239
+			$globalSources[$id]['format'] = 'pirepsjson';
240
+			//$last_exec['pirepsjson'] = 0;
241
+			if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
242
+			} else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
243
+			//$formats[$id] = 'fr24json';
244
+			$globalSources[$id]['format'] = 'fr24json';
245
+			//$last_exec['fr24json'] = 0;
246
+			if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
247
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
248
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
249
+				exit(0);
250
+			}
251
+			} else if (preg_match(':myshiptracking.com/:i',$host)) {
252
+			//$formats[$id] = 'fr24json';
253
+			$globalSources[$id]['format'] = 'myshiptracking';
254
+			//$last_exec['fr24json'] = 0;
255
+			if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
256
+			if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
257
+				echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
258
+				exit(0);
259
+			}
260
+			//} else if (preg_match('/10001/',$host)) {
261
+			} else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
262
+			//$formats[$id] = 'tsv';
263
+			$globalSources[$id]['format'] = 'tsv';
264
+			if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
265
+			}
266
+		} elseif (filter_var($host,FILTER_VALIDATE_URL) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway')) {
267
+			if ($globalSources[$id]['format'] == 'aisnmeahttp') {
268
+				$idf = fopen($globalSources[$id]['host'],'r',false,$context);
269
+				if ($idf !== false) {
270
+				$httpfeeds[$id] = $idf;
271
+				if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
272
+				} elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
273
+			} elseif ($globalDebug && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\n";
274
+			elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
275
+		} elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
276
+		$hostport = explode(':',$host);
277
+		if (isset($hostport[1])) {
278 278
 		$port = $hostport[1];
279 279
 		$hostn = $hostport[0];
280
-	    } else {
280
+		} else {
281 281
 		$port = $globalSources[$id]['port'];
282 282
 		$hostn = $globalSources[$id]['host'];
283
-	    }
284
-	    $Common = new Common();
285
-	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
286
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
287
-    	    } else {
288
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
289
-	    }
290
-	    if ($s) {
291
-    	        $sockets[$id] = $s;
292
-    	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
293
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
283
+		}
284
+		$Common = new Common();
285
+		if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
286
+			$s = $Common->create_socket($hostn,$port, $errno, $errstr);
287
+			} else {
288
+			$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
289
+		}
290
+		if ($s) {
291
+				$sockets[$id] = $s;
292
+				if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
293
+			if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
294 294
 			//$formats[$id] = 'aprs';
295 295
 			$globalSources[$id]['format'] = 'aprs';
296 296
 			//$aprs_connect = 0;
297 297
 			//$use_aprs = true;
298
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
298
+			} elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
299 299
 			$globalSources[$id]['format'] = 'vrstcp';
300
-    		    } elseif ($port == '10001') {
301
-        		//$formats[$id] = 'tsv';
302
-        		$globalSources[$id]['format'] = 'tsv';
303
-		    } elseif ($port == '30002') {
304
-        		//$formats[$id] = 'raw';
305
-        		$globalSources[$id]['format'] = 'raw';
306
-		    } elseif ($port == '5001') {
307
-        		//$formats[$id] = 'raw';
308
-        		$globalSources[$id]['format'] = 'flightgearmp';
309
-		    } elseif ($port == '30005') {
300
+				} elseif ($port == '10001') {
301
+				//$formats[$id] = 'tsv';
302
+				$globalSources[$id]['format'] = 'tsv';
303
+			} elseif ($port == '30002') {
304
+				//$formats[$id] = 'raw';
305
+				$globalSources[$id]['format'] = 'raw';
306
+			} elseif ($port == '5001') {
307
+				//$formats[$id] = 'raw';
308
+				$globalSources[$id]['format'] = 'flightgearmp';
309
+			} elseif ($port == '30005') {
310 310
 			// Not yet supported
311
-        		//$formats[$id] = 'beast';
312
-        		$globalSources[$id]['format'] = 'beast';
313
-		    //} else $formats[$id] = 'sbs';
314
-		    } else $globalSources[$id]['format'] = 'sbs';
315
-		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
311
+				//$formats[$id] = 'beast';
312
+				$globalSources[$id]['format'] = 'beast';
313
+			//} else $formats[$id] = 'sbs';
314
+			} else $globalSources[$id]['format'] = 'sbs';
315
+			//if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
316 316
 		}
317 317
 		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
318
-            } else {
318
+			} else {
319 319
 		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
320 320
 		sleep(10);
321 321
 		connect_all($hosts);
322
-    	    }
323
-        }
324
-    }
322
+			}
323
+		}
324
+	}
325 325
 }
326 326
 if (!isset($globalMinFetch)) $globalMinFetch = 15;
327 327
 
@@ -344,9 +344,9 @@  discard block
 block discarded – undo
344 344
 //connect_all($globalSources);
345 345
 
346 346
 if (isset($globalProxy) && $globalProxy) {
347
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
347
+	$context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
348 348
 } else {
349
-    $context = stream_context_create(array('http' => array('timeout' => $timeout)));
349
+	$context = stream_context_create(array('http' => array('timeout' => $timeout)));
350 350
 }
351 351
 
352 352
 // APRS Configuration
@@ -355,21 +355,21 @@  discard block
 block discarded – undo
355 355
 	die;
356 356
 }
357 357
 foreach ($globalSources as $key => $source) {
358
-    if (!isset($source['format'])) {
359
-        $globalSources[$key]['format'] = 'auto';
360
-    }
361
-    if (isset($source['callback']) && $source['callback'] === TRUE) {
362
-        unset($globalSources[$key]);
363
-    }
358
+	if (!isset($source['format'])) {
359
+		$globalSources[$key]['format'] = 'auto';
360
+	}
361
+	if (isset($source['callback']) && $source['callback'] === TRUE) {
362
+		unset($globalSources[$key]);
363
+	}
364 364
 }
365 365
 connect_all($globalSources);
366 366
 foreach ($globalSources as $key => $source) {
367
-    if (isset($source['format']) && $source['format'] == 'aprs') {
367
+	if (isset($source['format']) && $source['format'] == 'aprs') {
368 368
 	$aprs_connect = 0;
369 369
 	$use_aprs = true;
370 370
 	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
371 371
 	break;
372
-    }
372
+	}
373 373
 }
374 374
 
375 375
 if ($use_aprs) {
@@ -410,133 +410,133 @@  discard block
 block discarded – undo
410 410
 
411 411
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
412 412
 while ($i > 0) {
413
-    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
413
+	if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
414 414
 
415
-    if (!$globalDaemon) $i = $endtime-time();
416
-    // Delete old ATC
417
-    if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
415
+	if (!$globalDaemon) $i = $endtime-time();
416
+	// Delete old ATC
417
+	if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
418 418
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
419
-        $ATC->deleteOldATC();
420
-    }
419
+		$ATC->deleteOldATC();
420
+	}
421 421
     
422
-    if (count($last_exec) == count($globalSources)) {
422
+	if (count($last_exec) == count($globalSources)) {
423 423
 	$max = $globalMinFetch;
424 424
 	foreach ($last_exec as $last) {
425
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
425
+		if ((time() - $last['last']) < $max) $max = time() - $last['last'];
426 426
 	}
427 427
 	if ($max < $globalMinFetch) {
428
-	    if ($globalDebug) echo 'Sleeping...'."\n";
429
-	    sleep($globalMinFetch-$max+2);
428
+		if ($globalDebug) echo 'Sleeping...'."\n";
429
+		sleep($globalMinFetch-$max+2);
430
+	}
430 431
 	}
431
-    }
432 432
 
433 433
     
434
-    //foreach ($formats as $id => $value) {
435
-    foreach ($globalSources as $id => $value) {
434
+	//foreach ($formats as $id => $value) {
435
+	foreach ($globalSources as $id => $value) {
436 436
 	date_default_timezone_set('UTC');
437 437
 	//if ($globalDebug) echo 'Source host : '.$value['host'].' - Source format: '.$value['format']."\n";
438 438
 	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
439 439
 	if ($value['format'] === 'deltadbtxt' && 
440
-	    (
440
+		(
441 441
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
442 442
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
443
-	    )
443
+		)
444 444
 	) {
445
-	    //$buffer = $Common->getData($hosts[$id]);
446
-	    $buffer = $Common->getData($value['host']);
447
-	    if ($buffer != '') $reset = 0;
448
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
449
-	    $buffer = explode('\n',$buffer);
450
-	    foreach ($buffer as $line) {
451
-    		if ($line != '' && count($line) > 7) {
452
-    		    $line = explode(',', $line);
453
-	            $data = array();
454
-	            $data['hex'] = $line[1]; // hex
455
-	            $data['ident'] = $line[2]; // ident
456
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
457
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
458
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
459
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
460
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
461
-	            $data['verticalrate'] = ''; // vertical rate
462
-	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
463
-	            $data['emergency'] = ''; // emergency
464
-		    $data['datetime'] = date('Y-m-d H:i:s');
465
-		    $data['format_source'] = 'deltadbtxt';
466
-    		    $data['id_source'] = $id_source;
467
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
468
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
469
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
470
-    		    $SI->add($data);
471
-		    unset($data);
472
-    		}
473
-    	    }
474
-    	    $last_exec[$id]['last'] = time();
445
+		//$buffer = $Common->getData($hosts[$id]);
446
+		$buffer = $Common->getData($value['host']);
447
+		if ($buffer != '') $reset = 0;
448
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
449
+		$buffer = explode('\n',$buffer);
450
+		foreach ($buffer as $line) {
451
+			if ($line != '' && count($line) > 7) {
452
+				$line = explode(',', $line);
453
+				$data = array();
454
+				$data['hex'] = $line[1]; // hex
455
+				$data['ident'] = $line[2]; // ident
456
+				if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
457
+				if (isset($line[4])) $data['speed'] = $line[4]; // speed
458
+				if (isset($line[5])) $data['heading'] = $line[5]; // heading
459
+				if (isset($line[6])) $data['latitude'] = $line[6]; // lat
460
+				if (isset($line[7])) $data['longitude'] = $line[7]; // long
461
+				$data['verticalrate'] = ''; // vertical rate
462
+				//if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
463
+				$data['emergency'] = ''; // emergency
464
+			$data['datetime'] = date('Y-m-d H:i:s');
465
+			$data['format_source'] = 'deltadbtxt';
466
+				$data['id_source'] = $id_source;
467
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
468
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
469
+			if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
470
+				$SI->add($data);
471
+			unset($data);
472
+			}
473
+			}
474
+			$last_exec[$id]['last'] = time();
475 475
 	} elseif ($value['format'] === 'aisnmeatxt' && 
476
-	    (
476
+		(
477 477
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
478 478
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
479
-	    )
479
+		)
480 480
 	) {
481
-	    date_default_timezone_set('CET');
482
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
483
-	    date_default_timezone_set('UTC');
484
-	    if ($buffer != '') $reset = 0;
485
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
486
-	    $buffer = explode('\n',$buffer);
487
-	    foreach ($buffer as $line) {
481
+		date_default_timezone_set('CET');
482
+		$buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
483
+		date_default_timezone_set('UTC');
484
+		if ($buffer != '') $reset = 0;
485
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
486
+		$buffer = explode('\n',$buffer);
487
+		foreach ($buffer as $line) {
488 488
 		if ($line != '') {
489
-		    //echo "'".$line."'\n";
490
-		    $add = false;
491
-		    $ais_data = $AIS->parse_line(trim($line));
492
-		    $data = array();
493
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
494
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
495
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
496
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
497
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
498
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
499
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
500
-		    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
501
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
502
-		    if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
503
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
504
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
505
-		    if (isset($ais_data['timestamp'])) {
489
+			//echo "'".$line."'\n";
490
+			$add = false;
491
+			$ais_data = $AIS->parse_line(trim($line));
492
+			$data = array();
493
+			if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
494
+			if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
495
+			if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
496
+			if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
497
+			if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
498
+			if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
499
+			if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
500
+			if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
501
+			if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
502
+			if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
503
+			if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
504
+			if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
505
+			if (isset($ais_data['timestamp'])) {
506 506
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
507 507
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
508
-			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
509
-			    $add = true;
508
+				$last_exec[$id]['timestamp'] = $ais_data['timestamp'];
509
+				$add = true;
510 510
 			}
511
-		    } else {
511
+			} else {
512 512
 			$data['datetime'] = date('Y-m-d H:i:s');
513 513
 			$add = true;
514
-		    }
515
-		    $data['format_source'] = 'aisnmeatxt';
516
-    		    $data['id_source'] = $id_source;
517
-		    //print_r($data);
518
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
519
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
520
-		    unset($data);
514
+			}
515
+			$data['format_source'] = 'aisnmeatxt';
516
+				$data['id_source'] = $id_source;
517
+			//print_r($data);
518
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
519
+			if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
520
+			unset($data);
521 521
 		}
522
-    	    }
523
-    	    $last_exec[$id]['last'] = time();
522
+			}
523
+			$last_exec[$id]['last'] = time();
524 524
 	} elseif ($value['format'] === 'aisnmeahttp') {
525
-	    $arr = $httpfeeds;
526
-	    $w = $e = null;
525
+		$arr = $httpfeeds;
526
+		$w = $e = null;
527 527
 	    
528
-	    if (isset($arr[$id])) {
528
+		if (isset($arr[$id])) {
529 529
 		$nn = stream_select($arr,$w,$e,$timeout);
530 530
 		if ($nn > 0) {
531
-		    foreach ($httpfeeds as $feed) {
531
+			foreach ($httpfeeds as $feed) {
532 532
 			$buffer = stream_get_line($feed,2000,"\n");
533 533
 			if ($buffer === FALSE) {
534
-			    connect_all($globalSources);
534
+				connect_all($globalSources);
535 535
 			}
536 536
 			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
537 537
 			$buffer = explode('\n',$buffer);
538 538
 			foreach ($buffer as $line) {
539
-			    if ($line != '') {
539
+				if ($line != '') {
540 540
 				$ais_data = $AIS->parse_line(trim($line));
541 541
 				$data = array();
542 542
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
@@ -554,117 +554,117 @@  discard block
 block discarded – undo
554 554
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
555 555
 				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
556 556
 				if (isset($ais_data['timestamp'])) {
557
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
557
+					$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
558 558
 				} else {
559
-				    $data['datetime'] = date('Y-m-d H:i:s');
559
+					$data['datetime'] = date('Y-m-d H:i:s');
560 560
 				}
561 561
 				$data['format_source'] = 'aisnmeahttp';
562 562
 				$data['id_source'] = $id_source;
563 563
 				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
564 564
 				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
565 565
 				unset($data);
566
-			    }
566
+				}
567
+			}
567 568
 			}
568
-		    }
569 569
 		} else {
570
-		    $format = $value['format'];
571
-		    if (isset($tt[$format])) $tt[$format]++;
572
-		    else $tt[$format] = 0;
573
-		    if ($tt[$format] > 30) {
570
+			$format = $value['format'];
571
+			if (isset($tt[$format])) $tt[$format]++;
572
+			else $tt[$format] = 0;
573
+			if ($tt[$format] > 30) {
574 574
 			if ($globalDebug) echo 'Reconnect...'."\n";
575 575
 			sleep(2);
576 576
 			//$sourceeen[] = $value;
577 577
 			//connect_all($sourceeen);
578 578
 			//$sourceeen = array();
579 579
 			connect_all($globalSources);
580
-		    }
580
+			}
581
+		}
581 582
 		}
582
-	    }
583 583
 	} elseif ($value['format'] === 'myshiptracking' && 
584
-	    (
584
+		(
585 585
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
586 586
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
587
-	    )
587
+		)
588 588
 	) {
589
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
590
-	    if ($buffer != '') {
589
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
590
+		if ($buffer != '') {
591 591
 		//echo $buffer;
592 592
 		$all_data = json_decode($buffer,true);
593 593
 		//print_r($all_data);
594 594
 		if (isset($all_data[0]['DATA'])) {
595
-		    foreach ($all_data[0]['DATA'] as $line) {
595
+			foreach ($all_data[0]['DATA'] as $line) {
596 596
 			if ($line != '') {
597
-			    $data = array();
598
-			    $data['ident'] = $line['NAME'];
599
-			    $data['mmsi'] = $line['MMSI'];
600
-			    if (strlen($data['mmsi']) > 9) {
597
+				$data = array();
598
+				$data['ident'] = $line['NAME'];
599
+				$data['mmsi'] = $line['MMSI'];
600
+				if (strlen($data['mmsi']) > 9) {
601 601
 				$data['mmsi'] = substr($data['mmsi'],-9);
602
-			    }
603
-			    $data['speed'] = $line['SOG'];
604
-			    $data['heading'] = $line['COG'];
605
-			    $data['latitude'] = $line['LAT'];
606
-			    $data['longitude'] = $line['LNG'];
607
-			    //    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
608
-			    //$data['type_id'] = $line['TYPE'];
609
-			    $data['imo'] = $line['IMO'];
610
-			    if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
611
-			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
612
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
613
-			    $data['format_source'] = 'myshiptracking';
614
-			    $data['id_source'] = $id_source;
615
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
616
-			    $MI->add($data);
617
-			    unset($data);
602
+				}
603
+				$data['speed'] = $line['SOG'];
604
+				$data['heading'] = $line['COG'];
605
+				$data['latitude'] = $line['LAT'];
606
+				$data['longitude'] = $line['LNG'];
607
+				//    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
608
+				//$data['type_id'] = $line['TYPE'];
609
+				$data['imo'] = $line['IMO'];
610
+				if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
611
+				if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
612
+				$data['datetime'] = date('Y-m-d H:i:s',$line['T']);
613
+				$data['format_source'] = 'myshiptracking';
614
+				$data['id_source'] = $id_source;
615
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
616
+				$MI->add($data);
617
+				unset($data);
618
+			}
618 619
 			}
619
-		    }
620 620
 		}
621
-	    }
622
-	    $last_exec[$id]['last'] = time();
621
+		}
622
+		$last_exec[$id]['last'] = time();
623 623
 	} elseif ($value['format'] === 'boatbeaconapp' && 
624
-	    (
624
+		(
625 625
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
626 626
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
627
-	    )
627
+		)
628 628
 	) {
629
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
630
-	    if ($buffer != '') {
629
+		$buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
630
+		if ($buffer != '') {
631 631
 		$all_data = json_decode($buffer,true);
632 632
 		if (isset($all_data[0]['mmsi'])) {
633
-		    foreach ($all_data as $line) {
633
+			foreach ($all_data as $line) {
634 634
 			if ($line != '') {
635
-			    $data = array();
636
-			    $data['ident'] = $line['shipname'];
637
-			    $data['callsign'] = $line['callsign'];
638
-			    $data['mmsi'] = substr($line['mmsi'],-9);
639
-			    $data['speed'] = $line['sog'];
640
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
641
-			    $data['latitude'] = $line['latitude'];
642
-			    $data['longitude'] = $line['longitude'];
643
-			    $data['type_id'] = $line['shiptype'];
644
-			    $data['arrival_code'] = $line['destination'];
645
-			    $data['datetime'] = $line['time'];
646
-			    $data['format_source'] = 'boatbeaconapp';
647
-			    $data['id_source'] = $id_source;
648
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
649
-			    $MI->add($data);
650
-			    unset($data);
635
+				$data = array();
636
+				$data['ident'] = $line['shipname'];
637
+				$data['callsign'] = $line['callsign'];
638
+				$data['mmsi'] = substr($line['mmsi'],-9);
639
+				$data['speed'] = $line['sog'];
640
+				if ($line['heading'] != '511') $data['heading'] = $line['heading'];
641
+				$data['latitude'] = $line['latitude'];
642
+				$data['longitude'] = $line['longitude'];
643
+				$data['type_id'] = $line['shiptype'];
644
+				$data['arrival_code'] = $line['destination'];
645
+				$data['datetime'] = $line['time'];
646
+				$data['format_source'] = 'boatbeaconapp';
647
+				$data['id_source'] = $id_source;
648
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
649
+				$MI->add($data);
650
+				unset($data);
651
+			}
651 652
 			}
652
-		    }
653 653
 		}
654 654
 		
655
-	    }
656
-    	    $last_exec[$id]['last'] = time();
655
+		}
656
+			$last_exec[$id]['last'] = time();
657 657
 	} elseif ($value['format'] === 'boatnerd' && 
658
-	    (
658
+		(
659 659
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
660 660
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
661
-	    )
661
+		)
662 662
 	) {
663
-	    $buffer = $Common->getData($value['host']);
664
-	    if ($buffer != '') {
663
+		$buffer = $Common->getData($value['host']);
664
+		if ($buffer != '') {
665 665
 		$all_data = json_decode($buffer,true);
666 666
 		if (isset($all_data['features'][0]['id'])) {
667
-		    foreach ($all_data['features'] as $line) {
667
+			foreach ($all_data['features'] as $line) {
668 668
 			print_r($line);
669 669
 			$data = array();
670 670
 			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
@@ -684,67 +684,67 @@  discard block
 block discarded – undo
684 684
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
685 685
 			if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);
686 686
 			unset($data);
687
-		    }
687
+			}
688 688
 		}
689 689
 		
690
-	    }
691
-    	    $last_exec[$id]['last'] = time();
690
+		}
691
+			$last_exec[$id]['last'] = time();
692 692
 	} elseif ($value['format'] === 'shipplotter' && 
693
-	    (
693
+		(
694 694
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
695 695
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
696
-	    )
696
+		)
697 697
 	) {
698
-	    if ($globalDebug) echo 'download...';
699
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
700
-	    if ($globalDebug) echo 'done !'."\n";
701
-	    // FIXME: Need more work
702
-	    if ($buffer != '') $reset = 0;
703
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
704
-	    $buffer = explode('\n',$buffer);
705
-	    foreach ($buffer as $line) {
698
+		if ($globalDebug) echo 'download...';
699
+		$buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
700
+		if ($globalDebug) echo 'done !'."\n";
701
+		// FIXME: Need more work
702
+		if ($buffer != '') $reset = 0;
703
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
704
+		$buffer = explode('\n',$buffer);
705
+		foreach ($buffer as $line) {
706 706
 		if ($line != '') {
707
-		    $data = array();
708
-		    //echo $line."\n";
709
-		    $data['mmsi'] = (int)substr($line,0,9);
710
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
711
-		    $data['status_id'] = substr($line,21,2);
712
-		    $data['type_id'] = substr($line,24,3);
713
-		    $data['latitude'] = substr($line,29,9);
714
-		    $data['longitude'] = substr($line,41,9);
715
-		    $data['speed'] = round(substr($line,51,5));
716
-		    //$data['course'] = substr($line,57,5);
717
-		    $data['heading'] = round(substr($line,63,3));
718
-		    //$data['draft'] = substr($line,67,4);
719
-		    //$data['length'] = substr($line,72,3);
720
-		    //$data['beam'] = substr($line,76,2);
721
-		    $data['ident'] = trim(utf8_encode(substr($line,78,20)));
722
-		    //$data['callsign'] = trim(substr($line,100,7);
723
-		    $data['arrival_code'] = substr($line,108,20);
724
-		    //$data['etaDate'] = substr($line,129,5);
725
-		    //$data['etaTime'] = substr($line,135,5);
726
-		    $data['format_source'] = 'shipplotter';
727
-    		    $data['id_source'] = $id_source;
728
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
729
-		    //print_r($data);
730
-		    //echo 'Add...'."\n";
731
-		    $MI->add($data);
732
-		    unset($data);
707
+			$data = array();
708
+			//echo $line."\n";
709
+			$data['mmsi'] = (int)substr($line,0,9);
710
+			$data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
711
+			$data['status_id'] = substr($line,21,2);
712
+			$data['type_id'] = substr($line,24,3);
713
+			$data['latitude'] = substr($line,29,9);
714
+			$data['longitude'] = substr($line,41,9);
715
+			$data['speed'] = round(substr($line,51,5));
716
+			//$data['course'] = substr($line,57,5);
717
+			$data['heading'] = round(substr($line,63,3));
718
+			//$data['draft'] = substr($line,67,4);
719
+			//$data['length'] = substr($line,72,3);
720
+			//$data['beam'] = substr($line,76,2);
721
+			$data['ident'] = trim(utf8_encode(substr($line,78,20)));
722
+			//$data['callsign'] = trim(substr($line,100,7);
723
+			$data['arrival_code'] = substr($line,108,20);
724
+			//$data['etaDate'] = substr($line,129,5);
725
+			//$data['etaTime'] = substr($line,135,5);
726
+			$data['format_source'] = 'shipplotter';
727
+				$data['id_source'] = $id_source;
728
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
729
+			//print_r($data);
730
+			//echo 'Add...'."\n";
731
+			$MI->add($data);
732
+			unset($data);
733 733
 		}
734
-    	    }
735
-    	    $last_exec[$id]['last'] = time();
734
+			}
735
+			$last_exec[$id]['last'] = time();
736 736
 	} elseif ($value['format'] === 'sailaway' && 
737
-	    (
737
+		(
738 738
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
739 739
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
740
-	    )
740
+		)
741 741
 	) {
742
-	    if ($globalDebug) echo '! Download... ';
743
-	    for ($i =0; $i <= 1; $i++) {
744
-		    if ($globalDebug) echo 'Racetype: '.$i.' ';
745
-	    $buffer = $Common->getData('https://sailaway.world/cgi-bin/sailaway/GetMissions.pl?race=1&tutorial=0&hist=1&racetype='.$i);
746
-	    if ($globalDebug) echo 'done'."\n";
747
-	    if ($buffer != '') {
742
+		if ($globalDebug) echo '! Download... ';
743
+		for ($i =0; $i <= 1; $i++) {
744
+			if ($globalDebug) echo 'Racetype: '.$i.' ';
745
+		$buffer = $Common->getData('https://sailaway.world/cgi-bin/sailaway/GetMissions.pl?race=1&tutorial=0&hist=1&racetype='.$i);
746
+		if ($globalDebug) echo 'done'."\n";
747
+		if ($buffer != '') {
748 748
 		$all_data = json_decode($buffer,true);
749 749
 		if (isset($all_data['missions'])) {
750 750
 			foreach ($all_data['missions'] as $mission) {
@@ -803,34 +803,34 @@  discard block
 block discarded – undo
803 803
 				}
804 804
 			}
805 805
 		}
806
-	    }
807
-	    }
808
-    	    $last_exec[$id]['last'] = time();
806
+		}
807
+		}
808
+			$last_exec[$id]['last'] = time();
809 809
 	//} elseif (($value === 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value === 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) {
810 810
 	} elseif (
811
-	    (
811
+		(
812 812
 		$value['format'] === 'whazzup' && 
813 813
 		(
814
-		    (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
815
-		    (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
814
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
815
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
816 816
 		)
817
-	    ) || (
817
+		) || (
818 818
 		$value['format'] === 'vatsimtxt' && 
819 819
 		(
820
-		    (isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
821
-		    (!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
820
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
821
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
822
+		)
822 823
 		)
823
-	    )
824 824
 	) {
825
-	    //$buffer = $Common->getData($hosts[$id]);
826
-	    $buffer = $Common->getData($value['host']);
827
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
828
-	    $buffer = explode('\n',$buffer);
829
-	    $reset = 0;
830
-	    foreach ($buffer as $line) {
831
-    		if ($line != '') {
832
-    		    $line = explode(':', $line);
833
-    		    if (count($line) > 30 && $line[0] != 'callsign') {
825
+		//$buffer = $Common->getData($hosts[$id]);
826
+		$buffer = $Common->getData($value['host']);
827
+			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
828
+		$buffer = explode('\n',$buffer);
829
+		$reset = 0;
830
+		foreach ($buffer as $line) {
831
+			if ($line != '') {
832
+				$line = explode(':', $line);
833
+				if (count($line) > 30 && $line[0] != 'callsign') {
834 834
 			$data = array();
835 835
 			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
836 836
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
@@ -843,37 +843,37 @@  discard block
 block discarded – undo
843 843
 			if (isset($line[45])) $data['heading'] = $line[45]; // heading
844 844
 			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
845 845
 			$data['latitude'] = $line[5]; // lat
846
-	        	$data['longitude'] = $line[6]; // long
847
-	        	$data['verticalrate'] = ''; // vertical rate
848
-	        	$data['squawk'] = ''; // squawk
849
-	        	$data['emergency'] = ''; // emergency
850
-	        	$data['waypoints'] = $line[30];
846
+				$data['longitude'] = $line[6]; // long
847
+				$data['verticalrate'] = ''; // vertical rate
848
+				$data['squawk'] = ''; // squawk
849
+				$data['emergency'] = ''; // emergency
850
+				$data['waypoints'] = $line[30];
851 851
 			$data['datetime'] = date('Y-m-d H:i:s');
852 852
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
853 853
 			//if (isset($line[37])) $data['last_update'] = $line[37];
854
-		        $data['departure_airport_icao'] = $line[11];
855
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
856
-		        $data['arrival_airport_icao'] = $line[13];
854
+				$data['departure_airport_icao'] = $line[11];
855
+				$data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
856
+				$data['arrival_airport_icao'] = $line[13];
857 857
 			$data['frequency'] = $line[4];
858 858
 			$data['type'] = $line[18];
859 859
 			$data['range'] = $line[19];
860 860
 			if (isset($line[35])) $data['info'] = $line[35];
861
-    			$data['id_source'] = $id_source;
862
-	    		//$data['arrival_airport_time'] = ;
863
-	    		if ($line[9] != '') {
864
-	    		    $aircraft_data = explode('/',$line[9]);
865
-	    		    if (isset($aircraft_data[1])) {
866
-	    			$data['aircraft_icao'] = $aircraft_data[1];
867
-	    		    }
868
-        		}
869
-	    		/*
861
+				$data['id_source'] = $id_source;
862
+				//$data['arrival_airport_time'] = ;
863
+				if ($line[9] != '') {
864
+					$aircraft_data = explode('/',$line[9]);
865
+					if (isset($aircraft_data[1])) {
866
+					$data['aircraft_icao'] = $aircraft_data[1];
867
+					}
868
+				}
869
+				/*
870 870
 	    		if ($value === 'whazzup') $data['format_source'] = 'whazzup';
871 871
 	    		elseif ($value === 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
872 872
 	    		*/
873
-	    		$data['format_source'] = $value['format'];
873
+				$data['format_source'] = $value['format'];
874 874
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
875 875
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
876
-    			if ($line[3] === 'PILOT') $SI->add($data);
876
+				if ($line[3] === 'PILOT') $SI->add($data);
877 877
 			elseif ($line[3] === 'ATC') {
878 878
 				//print_r($data);
879 879
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
@@ -894,21 +894,21 @@  discard block
 block discarded – undo
894 894
 					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
895 895
 				}
896 896
 			}
897
-    			unset($data);
898
-    		    }
899
-    		}
900
-    	    }
901
-    	    //if ($value === 'whazzup') $last_exec['whazzup'] = time();
902
-    	    //elseif ($value === 'vatsimtxt') $last_exec['vatsimtxt'] = time();
903
-    	    $last_exec[$id]['last'] = time();
904
-    	} elseif ($value['format'] === 'airwhere' && 
905
-    	    (
906
-    		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
907
-    		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
908
-    	    )
909
-    	) {
910
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
911
-	    if ($buffer != '') {
897
+				unset($data);
898
+				}
899
+			}
900
+			}
901
+			//if ($value === 'whazzup') $last_exec['whazzup'] = time();
902
+			//elseif ($value === 'vatsimtxt') $last_exec['vatsimtxt'] = time();
903
+			$last_exec[$id]['last'] = time();
904
+		} elseif ($value['format'] === 'airwhere' && 
905
+			(
906
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
907
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
908
+			)
909
+		) {
910
+		$buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
911
+		if ($buffer != '') {
912 912
 		$all_data = simplexml_load_string($buffer);
913 913
 		foreach($all_data->children() as $childdata) {
914 914
 			$data = array();
@@ -930,10 +930,10 @@  discard block
 block discarded – undo
930 930
 			$SI->add($data);
931 931
 			unset($data);
932 932
 		}
933
-	    }
934
-	    $Source->deleteOldLocationByType('gs');
935
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
936
-	    if ($buffer != '') {
933
+		}
934
+		$Source->deleteOldLocationByType('gs');
935
+		$buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
936
+		if ($buffer != '') {
937 937
 		$all_data = simplexml_load_string($buffer);
938 938
 		foreach($all_data->children() as $childdata) {
939 939
 			$data = array();
@@ -951,8 +951,8 @@  discard block
 block discarded – undo
951 951
 			}
952 952
 			unset($data);
953 953
 		}
954
-	    }
955
-	    $last_exec[$id]['last'] = time();
954
+		}
955
+		$last_exec[$id]['last'] = time();
956 956
 	/*
957 957
 	} if ($value['format'] === 'aircraftlistjson') {
958 958
 	    print_r($globalSources);
@@ -960,17 +960,17 @@  discard block
 block discarded – undo
960 960
 	    echo $globalMinFetch;
961 961
 	*/
962 962
 	} elseif ($value['format'] === 'aircraftlistjson' && 
963
-	    (
963
+		(
964 964
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
965 965
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
966
-	    )
966
+		)
967 967
 	) {
968
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
969
-	    if ($buffer != '') {
970
-	        $all_data = json_decode($buffer,true);
968
+		$buffer = $Common->getData($value['host'],'get','','','','','20');
969
+		if ($buffer != '') {
970
+			$all_data = json_decode($buffer,true);
971 971
 		if (isset($all_data['acList'])) {
972
-		    $reset = 0;
973
-		    foreach ($all_data['acList'] as $line) {
972
+			$reset = 0;
973
+			foreach ($all_data['acList'] as $line) {
974 974
 			$data = array();
975 975
 			$data['hex'] = $line['Icao']; // hex
976 976
 			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -993,10 +993,10 @@  discard block
 block discarded – undo
993 993
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
994 994
 			if (isset($data['latitude'])) $SI->add($data);
995 995
 			unset($data);
996
-		    }
996
+			}
997 997
 		} elseif (is_array($all_data)) {
998
-		    $reset = 0;
999
-		    foreach ($all_data as $line) {
998
+			$reset = 0;
999
+			foreach ($all_data as $line) {
1000 1000
 			$data = array();
1001 1001
 			$data['hex'] = $line['hex']; // hex
1002 1002
 			$data['ident'] = $line['flight']; // ident
@@ -1016,291 +1016,291 @@  discard block
 block discarded – undo
1016 1016
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1017 1017
 			$SI->add($data);
1018 1018
 			unset($data);
1019
-		    }
1019
+			}
1020 1020
 		}
1021
-	    } elseif ($globalDebug) echo 'No data'."\n";
1022
-    	    //$last_exec['aircraftlistjson'] = time();
1023
-    	    $last_exec[$id]['last'] = time();
1024
-    	//} elseif ($value === 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
1025
-    	} elseif ($value['format'] === 'planeupdatefaa' && 
1026
-    	    (
1027
-    		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1028
-    		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1029
-    	    )
1030
-    	) {
1031
-	    $buffer = $Common->getData($value['host']);
1032
-	    $all_data = json_decode($buffer,true);
1033
-	    if (isset($all_data['planes'])) {
1021
+		} elseif ($globalDebug) echo 'No data'."\n";
1022
+			//$last_exec['aircraftlistjson'] = time();
1023
+			$last_exec[$id]['last'] = time();
1024
+		//} elseif ($value === 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
1025
+		} elseif ($value['format'] === 'planeupdatefaa' && 
1026
+			(
1027
+			(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1028
+			(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1029
+			)
1030
+		) {
1031
+		$buffer = $Common->getData($value['host']);
1032
+		$all_data = json_decode($buffer,true);
1033
+		if (isset($all_data['planes'])) {
1034 1034
 		$reset = 0;
1035 1035
 		foreach ($all_data['planes'] as $key => $line) {
1036
-		    $data = array();
1037
-		    $data['hex'] = $key; // hex
1038
-		    $data['ident'] = $line[3]; // ident
1039
-		    $data['altitude'] = $line[6]; // altitude
1040
-		    $data['speed'] = $line[8]; // speed
1041
-		    $data['heading'] = $line[7]; // heading
1042
-		    $data['latitude'] = $line[4]; // lat
1043
-		    $data['longitude'] = $line[5]; // long
1044
-		    //$data['verticalrate'] = $line[]; // verticale rate
1045
-		    $data['squawk'] = $line[10]; // squawk
1046
-		    $data['emergency'] = ''; // emergency
1047
-		    $data['registration'] = $line[2];
1048
-		    $data['aircraft_icao'] = $line[0];
1049
-		    $deparr = explode('-',$line[1]);
1050
-		    if (count($deparr) === 2) {
1036
+			$data = array();
1037
+			$data['hex'] = $key; // hex
1038
+			$data['ident'] = $line[3]; // ident
1039
+			$data['altitude'] = $line[6]; // altitude
1040
+			$data['speed'] = $line[8]; // speed
1041
+			$data['heading'] = $line[7]; // heading
1042
+			$data['latitude'] = $line[4]; // lat
1043
+			$data['longitude'] = $line[5]; // long
1044
+			//$data['verticalrate'] = $line[]; // verticale rate
1045
+			$data['squawk'] = $line[10]; // squawk
1046
+			$data['emergency'] = ''; // emergency
1047
+			$data['registration'] = $line[2];
1048
+			$data['aircraft_icao'] = $line[0];
1049
+			$deparr = explode('-',$line[1]);
1050
+			if (count($deparr) === 2) {
1051 1051
 			$data['departure_airport_icao'] = $deparr[0];
1052 1052
 			$data['arrival_airport_icao'] = $deparr[1];
1053
-		    }
1054
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
1055
-	    	    $data['format_source'] = 'planeupdatefaa';
1056
-    		    $data['id_source'] = $id_source;
1057
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1058
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1059
-		    $SI->add($data);
1060
-		    unset($data);
1053
+			}
1054
+			$data['datetime'] = date('Y-m-d H:i:s',$line[9]);
1055
+				$data['format_source'] = 'planeupdatefaa';
1056
+				$data['id_source'] = $id_source;
1057
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1058
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1059
+			$SI->add($data);
1060
+			unset($data);
1061 1061
 		}
1062
-	    }
1063
-	    //$last_exec['planeupdatefaa'] = time();
1064
-	    $last_exec[$id]['last'] = time();
1062
+		}
1063
+		//$last_exec['planeupdatefaa'] = time();
1064
+		$last_exec[$id]['last'] = time();
1065 1065
 	} elseif ($value['format'] === 'opensky' && 
1066
-	    (
1066
+		(
1067 1067
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1068 1068
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1069
-	    )
1069
+		)
1070 1070
 	) {
1071
-	    $buffer = $Common->getData($value['host']);
1072
-	    $all_data = json_decode($buffer,true);
1073
-	    if (isset($all_data['states'])) {
1071
+		$buffer = $Common->getData($value['host']);
1072
+		$all_data = json_decode($buffer,true);
1073
+		if (isset($all_data['states'])) {
1074 1074
 		$reset = 0;
1075 1075
 		foreach ($all_data['states'] as $key => $line) {
1076
-		    $data = array();
1077
-		    $data['hex'] = $line[0]; // hex
1078
-		    $data['ident'] = trim($line[1]); // ident
1079
-		    $data['altitude'] = round($line[7]*3.28084); // altitude
1080
-		    $data['speed'] = round($line[9]*1.94384); // speed
1081
-		    $data['heading'] = round($line[10]); // heading
1082
-		    $data['latitude'] = $line[6]; // lat
1083
-		    $data['longitude'] = $line[5]; // long
1084
-		    $data['verticalrate'] = $line[11]; // verticale rate
1085
-		    //$data['squawk'] = $line[10]; // squawk
1086
-		    //$data['emergency'] = ''; // emergency
1087
-		    //$data['registration'] = $line[2];
1088
-		    //$data['aircraft_icao'] = $line[0];
1089
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
1090
-		    $data['format_source'] = 'opensky';
1091
-		    $data['id_source'] = $id_source;
1092
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1093
-		    $SI->add($data);
1094
-		    unset($data);
1076
+			$data = array();
1077
+			$data['hex'] = $line[0]; // hex
1078
+			$data['ident'] = trim($line[1]); // ident
1079
+			$data['altitude'] = round($line[7]*3.28084); // altitude
1080
+			$data['speed'] = round($line[9]*1.94384); // speed
1081
+			$data['heading'] = round($line[10]); // heading
1082
+			$data['latitude'] = $line[6]; // lat
1083
+			$data['longitude'] = $line[5]; // long
1084
+			$data['verticalrate'] = $line[11]; // verticale rate
1085
+			//$data['squawk'] = $line[10]; // squawk
1086
+			//$data['emergency'] = ''; // emergency
1087
+			//$data['registration'] = $line[2];
1088
+			//$data['aircraft_icao'] = $line[0];
1089
+			$data['datetime'] = date('Y-m-d H:i:s',$line[3]);
1090
+			$data['format_source'] = 'opensky';
1091
+			$data['id_source'] = $id_source;
1092
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1093
+			$SI->add($data);
1094
+			unset($data);
1095
+		}
1095 1096
 		}
1096
-	    }
1097
-	    //$last_exec['planeupdatefaa'] = time();
1098
-	    $last_exec[$id]['last'] = time();
1097
+		//$last_exec['planeupdatefaa'] = time();
1098
+		$last_exec[$id]['last'] = time();
1099 1099
 	} elseif ($value['format'] === 'aircraftjson' && 
1100
-	    (
1100
+		(
1101 1101
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1102 1102
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1103
-	    )
1103
+		)
1104 1104
 	) {
1105
-	    $buffer = $Common->getData($value['host']);
1106
-	    $all_data = json_decode($buffer,true);
1107
-	    if (isset($all_data['aircraft']) && isset($all_data['now']) && $all_data['now'] > time()-1800) {
1105
+		$buffer = $Common->getData($value['host']);
1106
+		$all_data = json_decode($buffer,true);
1107
+		if (isset($all_data['aircraft']) && isset($all_data['now']) && $all_data['now'] > time()-1800) {
1108 1108
 		$reset = 0;
1109 1109
 		foreach ($all_data['aircraft'] as $key => $line) {
1110
-		    $data = array();
1111
-		    // add support for ground vehicule with ~ in front of hex
1112
-		    if (isset($line['hex'])) $data['hex'] = $line['hex']; // hex
1113
-		    if (isset($line['flight'])) $data['ident'] = trim($line['flight']); // ident
1114
-		    if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
1115
-		    if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
1116
-		    if (isset($line['track'])) $data['heading'] = $line['track']; // heading
1117
-		    if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
1118
-		    if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
1119
-		    if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
1120
-		    if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
1121
-		    //$data['emergency'] = ''; // emergency
1122
-		    //$data['registration'] = $line[2];
1123
-		    //$data['aircraft_icao'] = $line[0];
1124
-		    $data['datetime'] = date('Y-m-d H:i:s');
1125
-		    $data['format_source'] = 'aircraftjson';
1126
-		    $data['id_source'] = $id_source;
1127
-		    if (isset($value['name']) && $value['name'] != '') {
1128
-			    if (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = $value['name'].'_MLAT';
1129
-			    else $data['source_name'] = $value['name'];
1130
-		    } elseif (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = 'MLAT';
1131
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1132
-		    $SI->add($data);
1133
-		    unset($data);
1110
+			$data = array();
1111
+			// add support for ground vehicule with ~ in front of hex
1112
+			if (isset($line['hex'])) $data['hex'] = $line['hex']; // hex
1113
+			if (isset($line['flight'])) $data['ident'] = trim($line['flight']); // ident
1114
+			if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
1115
+			if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
1116
+			if (isset($line['track'])) $data['heading'] = $line['track']; // heading
1117
+			if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
1118
+			if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
1119
+			if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
1120
+			if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
1121
+			//$data['emergency'] = ''; // emergency
1122
+			//$data['registration'] = $line[2];
1123
+			//$data['aircraft_icao'] = $line[0];
1124
+			$data['datetime'] = date('Y-m-d H:i:s');
1125
+			$data['format_source'] = 'aircraftjson';
1126
+			$data['id_source'] = $id_source;
1127
+			if (isset($value['name']) && $value['name'] != '') {
1128
+				if (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = $value['name'].'_MLAT';
1129
+				else $data['source_name'] = $value['name'];
1130
+			} elseif (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = 'MLAT';
1131
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1132
+			$SI->add($data);
1133
+			unset($data);
1134 1134
 		}
1135
-	    }
1136
-	    //$last_exec['planeupdatefaa'] = time();
1137
-	    $last_exec[$id]['last'] = time();
1135
+		}
1136
+		//$last_exec['planeupdatefaa'] = time();
1137
+		$last_exec[$id]['last'] = time();
1138 1138
 	} elseif ($value['format'] === 'planefinderclient' && 
1139
-	    (
1139
+		(
1140 1140
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1141 1141
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1142
-	    )
1142
+		)
1143 1143
 	) {
1144
-	    $buffer = $Common->getData($value['host']);
1145
-	    $all_data = json_decode($buffer,true);
1146
-	    if (isset($all_data['aircraft'])) {
1144
+		$buffer = $Common->getData($value['host']);
1145
+		$all_data = json_decode($buffer,true);
1146
+		if (isset($all_data['aircraft'])) {
1147 1147
 		$reset = 0;
1148 1148
 		foreach ($all_data['aircraft'] as $key => $line) {
1149
-		    $data = array();
1150
-		    $data['hex'] = $key; // hex
1151
-		    if (isset($line['callsign'])) $data['ident'] = trim($line['callsign']); // ident
1152
-		    if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
1153
-		    if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
1154
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1155
-		    if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
1156
-		    if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
1157
-		    if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
1158
-		    if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
1159
-		    //$data['emergency'] = ''; // emergency
1160
-		    if (isset($line['reg'])) $data['registration'] = $line['reg'];
1161
-		    if (isset($line['type'])) $data['aircraft_icao'] = $line['type'];
1162
-		    $data['datetime'] = date('Y-m-d H:i:s',$line['pos_update_time']);
1163
-		    $data['format_source'] = 'planefinderclient';
1164
-		    $data['id_source'] = $id_source;
1165
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1166
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1167
-		    $SI->add($data);
1168
-		    unset($data);
1149
+			$data = array();
1150
+			$data['hex'] = $key; // hex
1151
+			if (isset($line['callsign'])) $data['ident'] = trim($line['callsign']); // ident
1152
+			if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
1153
+			if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
1154
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1155
+			if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
1156
+			if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
1157
+			if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
1158
+			if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
1159
+			//$data['emergency'] = ''; // emergency
1160
+			if (isset($line['reg'])) $data['registration'] = $line['reg'];
1161
+			if (isset($line['type'])) $data['aircraft_icao'] = $line['type'];
1162
+			$data['datetime'] = date('Y-m-d H:i:s',$line['pos_update_time']);
1163
+			$data['format_source'] = 'planefinderclient';
1164
+			$data['id_source'] = $id_source;
1165
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1166
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1167
+			$SI->add($data);
1168
+			unset($data);
1169
+		}
1169 1170
 		}
1170
-	    }
1171
-	    $last_exec[$id]['last'] = time();
1171
+		$last_exec[$id]['last'] = time();
1172 1172
 	//} elseif ($value === 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) {
1173 1173
 	} elseif ($value['format'] === 'fr24json' && 
1174
-	    (
1174
+		(
1175 1175
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1176 1176
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1177
-	    )
1177
+		)
1178 1178
 	) {
1179
-	    //$buffer = $Common->getData($hosts[$id]);
1180
-	    $buffer = $Common->getData($value['host']);
1181
-	    $all_data = json_decode($buffer,true);
1182
-	    if (!empty($all_data)) $reset = 0;
1183
-	    foreach ($all_data as $key => $line) {
1179
+		//$buffer = $Common->getData($hosts[$id]);
1180
+		$buffer = $Common->getData($value['host']);
1181
+		$all_data = json_decode($buffer,true);
1182
+		if (!empty($all_data)) $reset = 0;
1183
+		foreach ($all_data as $key => $line) {
1184 1184
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
1185
-		    $data = array();
1186
-		    $data['hex'] = $line[0];
1187
-		    $data['ident'] = $line[16]; //$line[13]
1188
-	    	    $data['altitude'] = $line[4]; // altitude
1189
-	    	    $data['speed'] = $line[5]; // speed
1190
-	    	    $data['heading'] = $line[3]; // heading
1191
-	    	    $data['latitude'] = $line[1]; // lat
1192
-	    	    $data['longitude'] = $line[2]; // long
1193
-	    	    $data['verticalrate'] = $line[15]; // verticale rate
1194
-	    	    $data['squawk'] = $line[6]; // squawk
1195
-	    	    $data['aircraft_icao'] = $line[8];
1196
-	    	    $data['registration'] = $line[9];
1197
-		    $data['departure_airport_iata'] = $line[11];
1198
-		    $data['arrival_airport_iata'] = $line[12];
1199
-	    	    $data['emergency'] = ''; // emergency
1200
-		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
1201
-	    	    $data['format_source'] = 'fr24json';
1202
-    		    $data['id_source'] = $id_source;
1203
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1204
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1205
-		    $SI->add($data);
1206
-		    unset($data);
1185
+			$data = array();
1186
+			$data['hex'] = $line[0];
1187
+			$data['ident'] = $line[16]; //$line[13]
1188
+				$data['altitude'] = $line[4]; // altitude
1189
+				$data['speed'] = $line[5]; // speed
1190
+				$data['heading'] = $line[3]; // heading
1191
+				$data['latitude'] = $line[1]; // lat
1192
+				$data['longitude'] = $line[2]; // long
1193
+				$data['verticalrate'] = $line[15]; // verticale rate
1194
+				$data['squawk'] = $line[6]; // squawk
1195
+				$data['aircraft_icao'] = $line[8];
1196
+				$data['registration'] = $line[9];
1197
+			$data['departure_airport_iata'] = $line[11];
1198
+			$data['arrival_airport_iata'] = $line[12];
1199
+				$data['emergency'] = ''; // emergency
1200
+			$data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
1201
+				$data['format_source'] = 'fr24json';
1202
+				$data['id_source'] = $id_source;
1203
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1204
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1205
+			$SI->add($data);
1206
+			unset($data);
1207 1207
 		}
1208
-	    }
1209
-	    //$last_exec['fr24json'] = time();
1210
-	    $last_exec[$id]['last'] = time();
1208
+		}
1209
+		//$last_exec['fr24json'] = time();
1210
+		$last_exec[$id]['last'] = time();
1211 1211
 	//} elseif ($value === 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) {
1212 1212
 	} elseif ($value['format'] === 'radarvirtueljson' && 
1213
-	    (
1213
+		(
1214 1214
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1215 1215
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1216
-	    )
1216
+		)
1217 1217
 	) {
1218
-	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
1219
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
1220
-	    //echo $buffer;
1221
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
1222
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
1223
-	    $all_data = json_decode($buffer,true);
1224
-	    if (json_last_error() != JSON_ERROR_NONE) {
1218
+		//$buffer = $Common->getData($hosts[$id],'get','','','','','150');
1219
+		$buffer = $Common->getData($value['host'],'get','','','','','150');
1220
+		//echo $buffer;
1221
+		$buffer = str_replace(array("\n","\r"),"",$buffer);
1222
+		$buffer = preg_replace('/,"num":(.+)/','}',$buffer);
1223
+		$all_data = json_decode($buffer,true);
1224
+		if (json_last_error() != JSON_ERROR_NONE) {
1225 1225
 		die(json_last_error_msg());
1226
-	    }
1227
-	    if (isset($all_data['mrkrs'])) {
1226
+		}
1227
+		if (isset($all_data['mrkrs'])) {
1228 1228
 		$reset = 0;
1229 1229
 		foreach ($all_data['mrkrs'] as $key => $line) {
1230
-		    if (isset($line['inf'])) {
1230
+			if (isset($line['inf'])) {
1231 1231
 			$data = array();
1232 1232
 			$data['hex'] = $line['inf']['ia'];
1233 1233
 			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
1234
-	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
1235
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
1236
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
1237
-	    		$data['latitude'] = $line['pt'][0]; // lat
1238
-	    		$data['longitude'] = $line['pt'][1]; // long
1239
-	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
1240
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
1241
-	    		//$data['aircraft_icao'] = $line[8];
1242
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
1234
+				$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
1235
+				if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
1236
+				if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
1237
+				$data['latitude'] = $line['pt'][0]; // lat
1238
+				$data['longitude'] = $line['pt'][1]; // long
1239
+				//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
1240
+				if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
1241
+				//$data['aircraft_icao'] = $line[8];
1242
+				if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
1243 1243
 			//$data['departure_airport_iata'] = $line[11];
1244 1244
 			//$data['arrival_airport_iata'] = $line[12];
1245
-	    		//$data['emergency'] = ''; // emergency
1245
+				//$data['emergency'] = ''; // emergency
1246 1246
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
1247
-	    		$data['format_source'] = 'radarvirtueljson';
1248
-    			$data['id_source'] = $id_source;
1247
+				$data['format_source'] = 'radarvirtueljson';
1248
+				$data['id_source'] = $id_source;
1249 1249
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1250 1250
 			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1251 1251
 			$SI->add($data);
1252 1252
 			unset($data);
1253
-		    }
1253
+			}
1254
+		}
1254 1255
 		}
1255
-	    }
1256
-	    //$last_exec['radarvirtueljson'] = time();
1257
-	    $last_exec[$id]['last'] = time();
1256
+		//$last_exec['radarvirtueljson'] = time();
1257
+		$last_exec[$id]['last'] = time();
1258 1258
 	//} elseif ($value === 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) {
1259 1259
 	} elseif ($value['format'] === 'pirepsjson' && 
1260
-	    (
1260
+		(
1261 1261
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1262 1262
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1263
-	    )
1263
+		)
1264 1264
 	) {
1265
-	    //$buffer = $Common->getData($hosts[$id]);
1266
-	    $buffer = $Common->getData($value['host'].'?'.time());
1267
-	    $all_data = json_decode(utf8_encode($buffer),true);
1265
+		//$buffer = $Common->getData($hosts[$id]);
1266
+		$buffer = $Common->getData($value['host'].'?'.time());
1267
+		$all_data = json_decode(utf8_encode($buffer),true);
1268 1268
 	    
1269
-	    if (isset($all_data['pireps'])) {
1269
+		if (isset($all_data['pireps'])) {
1270 1270
 		$reset = 0;
1271
-	        foreach ($all_data['pireps'] as $line) {
1272
-		    $data = array();
1273
-		    $data['id'] = $line['id'];
1274
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
1275
-		    $data['ident'] = $line['callsign']; // ident
1276
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
1277
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
1278
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
1279
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
1280
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1281
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1282
-		    $data['latitude'] = $line['lat']; // lat
1283
-		    $data['longitude'] = $line['lon']; // long
1284
-		    //$data['verticalrate'] = $line['vrt']; // verticale rate
1285
-		    //$data['squawk'] = $line['squawk']; // squawk
1286
-		    //$data['emergency'] = ''; // emergency
1287
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
1288
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
1289
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
1290
-		    //$data['arrival_airport_time'] = $line['arrtime'];
1291
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
1292
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
1293
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
1294
-		    else $data['info'] = '';
1295
-		    $data['format_source'] = 'pireps';
1296
-    		    $data['id_source'] = $id_source;
1297
-		    $data['datetime'] = date('Y-m-d H:i:s');
1298
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1299
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1300
-		    if ($line['icon'] === 'plane') {
1271
+			foreach ($all_data['pireps'] as $line) {
1272
+			$data = array();
1273
+			$data['id'] = $line['id'];
1274
+			$data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
1275
+			$data['ident'] = $line['callsign']; // ident
1276
+			if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
1277
+			if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
1278
+			if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
1279
+			if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
1280
+			if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1281
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1282
+			$data['latitude'] = $line['lat']; // lat
1283
+			$data['longitude'] = $line['lon']; // long
1284
+			//$data['verticalrate'] = $line['vrt']; // verticale rate
1285
+			//$data['squawk'] = $line['squawk']; // squawk
1286
+			//$data['emergency'] = ''; // emergency
1287
+			if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
1288
+			if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
1289
+			if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
1290
+			//$data['arrival_airport_time'] = $line['arrtime'];
1291
+			if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
1292
+			if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
1293
+			if (isset($line['atis'])) $data['info'] = $line['atis'];
1294
+			else $data['info'] = '';
1295
+			$data['format_source'] = 'pireps';
1296
+				$data['id_source'] = $id_source;
1297
+			$data['datetime'] = date('Y-m-d H:i:s');
1298
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1299
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1300
+			if ($line['icon'] === 'plane') {
1301 1301
 			$SI->add($data);
1302
-		    //    print_r($data);
1303
-    		    } elseif ($line['icon'] === 'ct') {
1302
+			//    print_r($data);
1303
+				} elseif ($line['icon'] === 'ct') {
1304 1304
 			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
1305 1305
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
1306 1306
 			$typec = substr($data['ident'],-3);
@@ -1315,209 +1315,209 @@  discard block
 block discarded – undo
1315 1315
 			elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
1316 1316
 			else $data['type'] = 'Observer';
1317 1317
 			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
1318
-		    }
1319
-		    unset($data);
1318
+			}
1319
+			unset($data);
1320
+		}
1320 1321
 		}
1321
-	    }
1322
-	    //$last_exec['pirepsjson'] = time();
1323
-	    $last_exec[$id]['last'] = time();
1322
+		//$last_exec['pirepsjson'] = time();
1323
+		$last_exec[$id]['last'] = time();
1324 1324
 	//} elseif ($value === 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
1325 1325
 	} elseif ($value['format'] === 'phpvmacars' && 
1326
-	    (
1326
+		(
1327 1327
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1328 1328
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1329
-	    )
1329
+		)
1330 1330
 	) {
1331
-	    //$buffer = $Common->getData($hosts[$id]);
1332
-	    if ($globalDebug) echo 'Get Data...'."\n";
1333
-	    $buffer = $Common->getData($value['host']);
1334
-	    $all_data = json_decode($buffer,true);
1335
-	    if ($buffer != '' && is_array($all_data)) {
1331
+		//$buffer = $Common->getData($hosts[$id]);
1332
+		if ($globalDebug) echo 'Get Data...'."\n";
1333
+		$buffer = $Common->getData($value['host']);
1334
+		$all_data = json_decode($buffer,true);
1335
+		if ($buffer != '' && is_array($all_data)) {
1336 1336
 		$reset = 0;
1337 1337
 		foreach ($all_data as $line) {
1338
-	    	    $data = array();
1339
-	    	    //$data['id'] = $line['id']; // id not usable
1340
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1341
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1342
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1343
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1344
-	    	    $data['ident'] = $line['flightnum']; // ident
1345
-	    	    $data['altitude'] = $line['alt']; // altitude
1346
-	    	    $data['speed'] = $line['gs']; // speed
1347
-	    	    $data['heading'] = $line['heading']; // heading
1348
-	    	    $data['latitude'] = $line['lat']; // lat
1349
-	    	    $data['longitude'] = $line['lng']; // long
1350
-	    	    $data['verticalrate'] = ''; // verticale rate
1351
-	    	    $data['squawk'] = ''; // squawk
1352
-	    	    $data['emergency'] = ''; // emergency
1353
-	    	    //$data['datetime'] = $line['lastupdate'];
1354
-	    	    //$data['last_update'] = $line['lastupdate'];
1355
-	    	    if (isset($value['timezone'])) {
1356
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1357
-	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1358
-	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1359
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
1360
-	    	    $data['departure_airport_icao'] = $line['depicao'];
1361
-	    	    $data['departure_airport_time'] = $line['deptime'];
1362
-	    	    $data['arrival_airport_icao'] = $line['arricao'];
1363
-    		    $data['arrival_airport_time'] = $line['arrtime'];
1364
-    		    if (isset($line['registration'])) {
1365
-    			$data['registration'] = $line['registration'];
1366
-    			//if (isset($line['aircraft'])) $data['id'] = $line['aircraft'];
1367
-    		    } else $data['registration'] = $line['aircraft'];
1368
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1369
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1370
-		    if (isset($line['aircraftname'])) {
1338
+				$data = array();
1339
+				//$data['id'] = $line['id']; // id not usable
1340
+				if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1341
+				$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1342
+				if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1343
+				if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1344
+				$data['ident'] = $line['flightnum']; // ident
1345
+				$data['altitude'] = $line['alt']; // altitude
1346
+				$data['speed'] = $line['gs']; // speed
1347
+				$data['heading'] = $line['heading']; // heading
1348
+				$data['latitude'] = $line['lat']; // lat
1349
+				$data['longitude'] = $line['lng']; // long
1350
+				$data['verticalrate'] = ''; // verticale rate
1351
+				$data['squawk'] = ''; // squawk
1352
+				$data['emergency'] = ''; // emergency
1353
+				//$data['datetime'] = $line['lastupdate'];
1354
+				//$data['last_update'] = $line['lastupdate'];
1355
+				if (isset($value['timezone'])) {
1356
+				$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1357
+				$datetime->setTimeZone(new DateTimeZone('UTC'));
1358
+				$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1359
+				} else $data['datetime'] = date('Y-m-d H:i:s');
1360
+				$data['departure_airport_icao'] = $line['depicao'];
1361
+				$data['departure_airport_time'] = $line['deptime'];
1362
+				$data['arrival_airport_icao'] = $line['arricao'];
1363
+				$data['arrival_airport_time'] = $line['arrtime'];
1364
+				if (isset($line['registration'])) {
1365
+				$data['registration'] = $line['registration'];
1366
+				//if (isset($line['aircraft'])) $data['id'] = $line['aircraft'];
1367
+				} else $data['registration'] = $line['aircraft'];
1368
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1369
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1370
+			if (isset($line['aircraftname'])) {
1371 1371
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
1372 1372
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
1373
-	    		$aircraft_data = explode('-',$line['aircraftname']);
1374
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1375
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1376
-	    		else {
1377
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
1378
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1379
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1380
-	    		}
1381
-	    	    }
1382
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
1383
-    		    $data['id_source'] = $id_source;
1384
-	    	    $data['format_source'] = 'phpvmacars';
1385
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1386
-		    $SI->add($data);
1387
-		    unset($data);
1373
+				$aircraft_data = explode('-',$line['aircraftname']);
1374
+				if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1375
+				elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1376
+				else {
1377
+					$aircraft_data = explode(' ',$line['aircraftname']);
1378
+					if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1379
+					else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1380
+				}
1381
+				}
1382
+				if (isset($line['route'])) $data['waypoints'] = $line['route'];
1383
+				$data['id_source'] = $id_source;
1384
+				$data['format_source'] = 'phpvmacars';
1385
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1386
+			$SI->add($data);
1387
+			unset($data);
1388 1388
 		}
1389 1389
 		if ($globalDebug) echo 'No more data...'."\n";
1390 1390
 		unset($buffer);
1391 1391
 		unset($all_data);
1392
-	    }
1393
-	    //$last_exec['phpvmacars'] = time();
1394
-	    $last_exec[$id]['last'] = time();
1392
+		}
1393
+		//$last_exec['phpvmacars'] = time();
1394
+		$last_exec[$id]['last'] = time();
1395 1395
 	} elseif ($value['format'] === 'vaos' && 
1396
-	    (
1396
+		(
1397 1397
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1398 1398
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1399
-	    )
1399
+		)
1400 1400
 	) {
1401
-	    //$buffer = $Common->getData($hosts[$id]);
1402
-	    if ($globalDebug) echo 'Get Data...'."\n";
1403
-	    $buffer = $Common->getData($value['host']);
1404
-	    $all_data = json_decode($buffer,true);
1405
-	    if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
1401
+		//$buffer = $Common->getData($hosts[$id]);
1402
+		if ($globalDebug) echo 'Get Data...'."\n";
1403
+		$buffer = $Common->getData($value['host']);
1404
+		$all_data = json_decode($buffer,true);
1405
+		if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
1406 1406
 		$reset = 0;
1407 1407
 		foreach ($all_data['ACARSData'] as $line) {
1408
-		    //print_r($line);
1409
-	    	    $data = array();
1410
-	    	    //$data['id'] = $line['id']; // id not usable
1411
-	    	    $data['id'] = $line['id'];
1412
-	    	    //$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1413
-	    	    if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
1414
-	    	    if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
1415
-	    	    $data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
1416
-	    	    if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
1417
-	    	    $data['altitude'] = $line['altitude']; // altitude
1418
-	    	    $data['speed'] = $line['groundspeed']; // speed
1419
-	    	    $data['heading'] = $line['heading']; // heading
1420
-	    	    $data['latitude'] = $line['lat']; // lat
1421
-	    	    $data['longitude'] = $line['lon']; // long
1422
-	    	    //$data['verticalrate'] = ''; // verticale rate
1423
-	    	    //$data['squawk'] = ''; // squawk
1424
-	    	    //$data['emergency'] = ''; // emergency
1425
-	    	    if (isset($value['timezone'])) {
1426
-	    		$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
1427
-	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1428
-	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1429
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
1408
+			//print_r($line);
1409
+				$data = array();
1410
+				//$data['id'] = $line['id']; // id not usable
1411
+				$data['id'] = $line['id'];
1412
+				//$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1413
+				if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
1414
+				if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
1415
+				$data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
1416
+				if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
1417
+				$data['altitude'] = $line['altitude']; // altitude
1418
+				$data['speed'] = $line['groundspeed']; // speed
1419
+				$data['heading'] = $line['heading']; // heading
1420
+				$data['latitude'] = $line['lat']; // lat
1421
+				$data['longitude'] = $line['lon']; // long
1422
+				//$data['verticalrate'] = ''; // verticale rate
1423
+				//$data['squawk'] = ''; // squawk
1424
+				//$data['emergency'] = ''; // emergency
1425
+				if (isset($value['timezone'])) {
1426
+				$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
1427
+				$datetime->setTimeZone(new DateTimeZone('UTC'));
1428
+				$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1429
+				} else $data['datetime'] = date('Y-m-d H:i:s');
1430 1430
 	    	    
1431
-	    	    $data['departure_airport_icao'] = $line['bid']['depapt']['icao'];
1432
-	    	    $data['departure_airport_time'] = $line['bid']['deptime'];
1433
-	    	    $data['arrival_airport_icao'] = $line['bid']['arrapt']['icao'];
1434
-		    $data['arrival_airport_time'] = $line['bid']['arrtime'];
1435
-		    $data['registration'] = $line['bid']['aircraft']['registration'];
1431
+				$data['departure_airport_icao'] = $line['bid']['depapt']['icao'];
1432
+				$data['departure_airport_time'] = $line['bid']['deptime'];
1433
+				$data['arrival_airport_icao'] = $line['bid']['arrapt']['icao'];
1434
+			$data['arrival_airport_time'] = $line['bid']['arrtime'];
1435
+			$data['registration'] = $line['bid']['aircraft']['registration'];
1436 1436
 
1437
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1438
-		    if (isset($line['bid']['route']) && $line['bid']['route'] != '') $data['waypoints'] = $line['bid']['route']; // route
1439
-	    	    $data['aircraft_icao'] = $line['bid']['aircraft']['icao'];
1437
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1438
+			if (isset($line['bid']['route']) && $line['bid']['route'] != '') $data['waypoints'] = $line['bid']['route']; // route
1439
+				$data['aircraft_icao'] = $line['bid']['aircraft']['icao'];
1440 1440
 
1441
-    		    $data['id_source'] = $id_source;
1442
-	    	    $data['format_source'] = 'vaos';
1443
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1444
-		    $SI->add($data);
1445
-		    unset($data);
1441
+				$data['id_source'] = $id_source;
1442
+				$data['format_source'] = 'vaos';
1443
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1444
+			$SI->add($data);
1445
+			unset($data);
1446 1446
 		}
1447 1447
 		if ($globalDebug) echo 'No more data...'."\n";
1448 1448
 		unset($buffer);
1449 1449
 		unset($all_data);
1450
-	    }
1451
-	    //$last_exec['phpvmacars'] = time();
1452
-	    $last_exec[$id]['last'] = time();
1450
+		}
1451
+		//$last_exec['phpvmacars'] = time();
1452
+		$last_exec[$id]['last'] = time();
1453 1453
 	} elseif ($value['format'] === 'vam' && 
1454
-	    (
1454
+		(
1455 1455
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) ||
1456 1456
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1457
-	    )
1457
+		)
1458 1458
 	) {
1459
-	    //$buffer = $Common->getData($hosts[$id]);
1460
-	    if ($globalDebug) echo 'Get Data...'."\n";
1461
-	    $buffer = $Common->getData($value['host']);
1462
-	    $all_data = json_decode($buffer,true);
1463
-	    if ($buffer != '' && is_array($all_data)) {
1459
+		//$buffer = $Common->getData($hosts[$id]);
1460
+		if ($globalDebug) echo 'Get Data...'."\n";
1461
+		$buffer = $Common->getData($value['host']);
1462
+		$all_data = json_decode($buffer,true);
1463
+		if ($buffer != '' && is_array($all_data)) {
1464 1464
 		$reset = 0;
1465 1465
 		foreach ($all_data as $line) {
1466
-	    	    $data = array();
1467
-	    	    //$data['id'] = $line['id']; // id not usable
1468
-	    	    $data['id'] = trim($line['flight_id']);
1469
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1470
-	    	    $data['pilot_name'] = $line['pilot_name'];
1471
-	    	    $data['pilot_id'] = $line['pilot_id'];
1472
-	    	    $data['ident'] = trim($line['callsign']); // ident
1473
-	    	    $data['altitude'] = $line['altitude']; // altitude
1474
-	    	    $data['speed'] = $line['gs']; // speed
1475
-	    	    $data['heading'] = $line['heading']; // heading
1476
-	    	    $data['latitude'] = $line['latitude']; // lat
1477
-	    	    $data['longitude'] = $line['longitude']; // long
1478
-	    	    $data['verticalrate'] = ''; // verticale rate
1479
-	    	    $data['squawk'] = ''; // squawk
1480
-	    	    $data['emergency'] = ''; // emergency
1481
-	    	    //$data['datetime'] = $line['lastupdate'];
1482
-	    	    $data['last_update'] = $line['last_update'];
1483
-		    $data['datetime'] = date('Y-m-d H:i:s');
1484
-	    	    $data['departure_airport_icao'] = $line['departure'];
1485
-	    	    //$data['departure_airport_time'] = $line['departure_time'];
1486
-	    	    $data['arrival_airport_icao'] = $line['arrival'];
1487
-    		    //$data['arrival_airport_time'] = $line['arrival_time'];
1488
-    		    //$data['registration'] = $line['aircraft'];
1489
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1490
-	    	    $data['aircraft_icao'] = $line['plane_type'];
1491
-    		    $data['id_source'] = $id_source;
1492
-	    	    $data['format_source'] = 'vam';
1493
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1494
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1495
-		    $SI->add($data);
1496
-		    unset($data);
1466
+				$data = array();
1467
+				//$data['id'] = $line['id']; // id not usable
1468
+				$data['id'] = trim($line['flight_id']);
1469
+				$data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1470
+				$data['pilot_name'] = $line['pilot_name'];
1471
+				$data['pilot_id'] = $line['pilot_id'];
1472
+				$data['ident'] = trim($line['callsign']); // ident
1473
+				$data['altitude'] = $line['altitude']; // altitude
1474
+				$data['speed'] = $line['gs']; // speed
1475
+				$data['heading'] = $line['heading']; // heading
1476
+				$data['latitude'] = $line['latitude']; // lat
1477
+				$data['longitude'] = $line['longitude']; // long
1478
+				$data['verticalrate'] = ''; // verticale rate
1479
+				$data['squawk'] = ''; // squawk
1480
+				$data['emergency'] = ''; // emergency
1481
+				//$data['datetime'] = $line['lastupdate'];
1482
+				$data['last_update'] = $line['last_update'];
1483
+			$data['datetime'] = date('Y-m-d H:i:s');
1484
+				$data['departure_airport_icao'] = $line['departure'];
1485
+				//$data['departure_airport_time'] = $line['departure_time'];
1486
+				$data['arrival_airport_icao'] = $line['arrival'];
1487
+				//$data['arrival_airport_time'] = $line['arrival_time'];
1488
+				//$data['registration'] = $line['aircraft'];
1489
+			if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1490
+				$data['aircraft_icao'] = $line['plane_type'];
1491
+				$data['id_source'] = $id_source;
1492
+				$data['format_source'] = 'vam';
1493
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1494
+			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1495
+			$SI->add($data);
1496
+			unset($data);
1497 1497
 		}
1498 1498
 		if ($globalDebug) echo 'No more data...'."\n";
1499 1499
 		unset($buffer);
1500 1500
 		unset($all_data);
1501
-	    }
1502
-	    //$last_exec['phpvmacars'] = time();
1503
-	    $last_exec[$id]['last'] = time();
1501
+		}
1502
+		//$last_exec['phpvmacars'] = time();
1503
+		$last_exec[$id]['last'] = time();
1504 1504
 	} elseif ($value['format'] === 'blitzortung' && 
1505
-	    (
1505
+		(
1506 1506
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
1507 1507
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
1508
-	    )
1508
+		)
1509 1509
 	) {
1510
-	    //$buffer = $Common->getData($hosts[$id]);
1511
-	    if ($globalDebug) echo 'Get Data...'."\n";
1512
-	    $buffer = $Common->getData($value['host']);
1513
-	    $all_data = json_decode($buffer,true);
1514
-	    if ($buffer != '') {
1510
+		//$buffer = $Common->getData($hosts[$id]);
1511
+		if ($globalDebug) echo 'Get Data...'."\n";
1512
+		$buffer = $Common->getData($value['host']);
1513
+		$all_data = json_decode($buffer,true);
1514
+		if ($buffer != '') {
1515 1515
 		$Source->deleteLocationBySource('blitzortung');
1516 1516
 		$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
1517 1517
 		$buffer = explode('\n',$buffer);
1518 1518
 		foreach ($buffer as $buffer_line) {
1519
-		    $line = json_decode($buffer_line,true);
1520
-		    if (isset($line['time'])) {
1519
+			$line = json_decode($buffer_line,true);
1520
+			if (isset($line['time'])) {
1521 1521
 			$data = array();
1522 1522
 			$data['altitude'] = $line['alt']; // altitude
1523 1523
 			$data['latitude'] = $line['lat']; // lat
@@ -1529,94 +1529,94 @@  discard block
 block discarded – undo
1529 1529
 			if ($globalDebug) echo '☈ Lightning added'."\n";
1530 1530
 			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
1531 1531
 			unset($data);
1532
-		    }
1532
+			}
1533 1533
 		}
1534 1534
 		if ($globalDebug) echo 'No more data...'."\n";
1535 1535
 		unset($buffer);
1536
-	    }
1537
-	    $last_exec[$id]['last'] = time();
1536
+		}
1537
+		$last_exec[$id]['last'] = time();
1538 1538
 	//} elseif ($value === 'sbs' || $value === 'tsv' || $value === 'raw' || $value === 'aprs' || $value === 'beast') {
1539 1539
 	} elseif ($value['format'] === 'sbs' || $value['format'] === 'tsv' || $value['format'] === 'raw' || $value['format'] === 'aprs' || $value['format'] === 'famaprs' || $value['format'] === 'beast' || $value['format'] === 'flightgearmp' || $value['format'] === 'flightgearsp' || $value['format'] === 'acars' || $value['format'] === 'acarssbs3' || $value['format'] === 'ais' || $value['format'] === 'vrstcp') {
1540
-	    //$last_exec[$id]['last'] = time();
1541
-	    //$read = array( $sockets[$id] );
1542
-	    $read = $sockets;
1543
-	    $write = NULL;
1544
-	    $e = NULL;
1545
-	    $n = socket_select($read, $write, $e, $timeout);
1546
-	    if ($e != NULL) var_dump($e);
1547
-	    if ($n > 0) {
1540
+		//$last_exec[$id]['last'] = time();
1541
+		//$read = array( $sockets[$id] );
1542
+		$read = $sockets;
1543
+		$write = NULL;
1544
+		$e = NULL;
1545
+		$n = socket_select($read, $write, $e, $timeout);
1546
+		if ($e != NULL) var_dump($e);
1547
+		if ($n > 0) {
1548 1548
 		$reset = 0;
1549 1549
 		foreach ($read as $nb => $r) {
1550
-		    //$value = $formats[$nb];
1551
-		    $format = $globalSources[$nb]['format'];
1552
-		    if ($format === 'sbs' || $format === 'aprs' || $format === 'famaprs' || $format === 'raw' || $format === 'tsv' || $format === 'acarssbs3') {
1550
+			//$value = $formats[$nb];
1551
+			$format = $globalSources[$nb]['format'];
1552
+			if ($format === 'sbs' || $format === 'aprs' || $format === 'famaprs' || $format === 'raw' || $format === 'tsv' || $format === 'acarssbs3') {
1553 1553
 			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1554
-		    } elseif ($format === 'vrstcp') {
1554
+			} elseif ($format === 'vrstcp') {
1555 1555
 			$buffer = @socket_read($r, 6000);
1556
-		    } else {
1556
+			} else {
1557 1557
 			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1558
-		    }
1559
-		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1560
-		    //echo $buffer."\n";
1561
-		    // lets play nice and handle signals such as ctrl-c/kill properly
1562
-		    //if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1563
-		    $error = false;
1564
-		    //$SI::del();
1565
-		    if ($buffer !== FALSE) {
1558
+			}
1559
+			//$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1560
+			//echo $buffer."\n";
1561
+			// lets play nice and handle signals such as ctrl-c/kill properly
1562
+			//if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1563
+			$error = false;
1564
+			//$SI::del();
1565
+			if ($buffer !== FALSE) {
1566 1566
 			if ($format === 'vrstcp') {
1567
-			    $buffer = explode('},{',$buffer);
1567
+				$buffer = explode('},{',$buffer);
1568 1568
 			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1569
-		    }
1570
-		    // SBS format is CSV format
1571
-		    if ($buffer !== FALSE && $buffer !== '') {
1569
+			}
1570
+			// SBS format is CSV format
1571
+			if ($buffer !== FALSE && $buffer !== '') {
1572 1572
 			$tt[$format] = 0;
1573 1573
 			if ($format === 'acarssbs3') {
1574
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1575
-			    $ACARS->add(trim($buffer));
1576
-			    $ACARS->deleteLiveAcarsData();
1574
+				if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1575
+				$ACARS->add(trim($buffer));
1576
+				$ACARS->deleteLiveAcarsData();
1577 1577
 			} elseif ($format === 'raw') {
1578
-			    // AVR format
1579
-			    $data = $SBS->parse($buffer);
1580
-			    if (is_array($data)) {
1578
+				// AVR format
1579
+				$data = $SBS->parse($buffer);
1580
+				if (is_array($data)) {
1581 1581
 				$data['datetime'] = date('Y-m-d H:i:s');
1582 1582
 				$data['format_source'] = 'raw';
1583 1583
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1584 1584
 				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1585 1585
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1586 1586
 				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1587
-			    }
1587
+				}
1588 1588
 			} elseif ($format === 'ais') {
1589
-			    $ais_data = $AIS->parse_line(trim($buffer));
1590
-			    $data = array();
1591
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1592
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
1593
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1594
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1595
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1596
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1597
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1598
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1599
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1600
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1601
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1602
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1603
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1604
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1605
-			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1606
-			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1589
+				$ais_data = $AIS->parse_line(trim($buffer));
1590
+				$data = array();
1591
+				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1592
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
1593
+				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1594
+				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1595
+				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1596
+				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1597
+				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1598
+				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1599
+				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1600
+				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1601
+				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1602
+				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1603
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1604
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1605
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1606
+				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1607 1607
 
1608
-			    if (isset($ais_data['timestamp'])) {
1608
+				if (isset($ais_data['timestamp'])) {
1609 1609
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1610
-			    } else {
1610
+				} else {
1611 1611
 				$data['datetime'] = date('Y-m-d H:i:s');
1612
-			    }
1613
-			    $data['format_source'] = 'aisnmea';
1614
-    			    $data['id_source'] = $id_source;
1615
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
1616
-			    unset($data);
1617
-                        } elseif ($format === 'flightgearsp') {
1618
-                    	    //echo $buffer."\n";
1619
-                    	    if (strlen($buffer) > 5) {
1612
+				}
1613
+				$data['format_source'] = 'aisnmea';
1614
+					$data['id_source'] = $id_source;
1615
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
1616
+				unset($data);
1617
+						} elseif ($format === 'flightgearsp') {
1618
+							//echo $buffer."\n";
1619
+							if (strlen($buffer) > 5) {
1620 1620
 				$line = explode(',',$buffer);
1621 1621
 				$data = array();
1622 1622
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
@@ -1633,38 +1633,38 @@  discard block
 block discarded – undo
1633 1633
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1634 1634
 				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1635 1635
 				//$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1636
-			    }
1637
-                        } elseif ($format === 'acars') {
1638
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1639
-			    $ACARS->add(trim($buffer));
1640
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1641
-			    $ACARS->deleteLiveAcarsData();
1636
+				}
1637
+						} elseif ($format === 'acars') {
1638
+							if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1639
+				$ACARS->add(trim($buffer));
1640
+				socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1641
+				$ACARS->deleteLiveAcarsData();
1642 1642
 			} elseif ($format === 'flightgearmp') {
1643
-			    if (substr($buffer,0,1) != '#') {
1643
+				if (substr($buffer,0,1) != '#') {
1644 1644
 				$data = array();
1645 1645
 				//echo $buffer."\n";
1646 1646
 				$line = explode(' ',$buffer);
1647 1647
 				if (count($line) === 11) {
1648
-				    $userserver = explode('@',$line[0]);
1649
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1650
-				    $data['ident'] = $userserver[0];
1651
-				    $data['registration'] = $userserver[0];
1652
-				    $data['latitude'] = $line[4];
1653
-				    $data['longitude'] = $line[5];
1654
-				    $data['altitude'] = $line[6];
1655
-				    $data['datetime'] = date('Y-m-d H:i:s');
1656
-				    $aircraft_type = $line[10];
1657
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1658
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1659
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1660
-				    if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1648
+					$userserver = explode('@',$line[0]);
1649
+					$data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1650
+					$data['ident'] = $userserver[0];
1651
+					$data['registration'] = $userserver[0];
1652
+					$data['latitude'] = $line[4];
1653
+					$data['longitude'] = $line[5];
1654
+					$data['altitude'] = $line[6];
1655
+					$data['datetime'] = date('Y-m-d H:i:s');
1656
+					$aircraft_type = $line[10];
1657
+					$aircraft_type = preg_split(':/:',$aircraft_type);
1658
+					$data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1659
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1660
+					if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1661
+				}
1661 1662
 				}
1662
-			    }
1663 1663
 			} elseif ($format === 'beast') {
1664
-			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1665
-			    die;
1664
+				echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1665
+				die;
1666 1666
 			} elseif ($format === 'vrstcp') {
1667
-			    foreach($buffer as $all_data) {
1667
+				foreach($buffer as $all_data) {
1668 1668
 				$line = json_decode('{'.$all_data.'}',true);
1669 1669
 				$data = array();
1670 1670
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
@@ -1684,158 +1684,158 @@  discard block
 block discarded – undo
1684 1684
 				*/
1685 1685
 				$data['datetime'] = date('Y-m-d H:i:s');
1686 1686
 				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1687
-		    		$data['format_source'] = 'vrstcp';
1687
+					$data['format_source'] = 'vrstcp';
1688 1688
 				$data['id_source'] = $id_source;
1689 1689
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1690 1690
 				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1691 1691
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1692 1692
 				unset($data);
1693
-			    }
1693
+				}
1694 1694
 			} elseif ($format === 'tsv' || substr($buffer,0,4) === 'clock') {
1695
-			    $line = explode("\t", $buffer);
1696
-			    for($k = 0; $k < count($line); $k=$k+2) {
1695
+				$line = explode("\t", $buffer);
1696
+				for($k = 0; $k < count($line); $k=$k+2) {
1697 1697
 				$key = $line[$k];
1698
-			        $lined[$key] = $line[$k+1];
1699
-			    }
1700
-    			    if (count($lined) > 3) {
1701
-    				$data['hex'] = $lined['hexid'];
1702
-    				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1703
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1704
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1705
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1706
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1707
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1708
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1709
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1710
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1711
-    				$data['id_source'] = $id_source;
1712
-    				$data['format_source'] = 'tsv';
1713
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1714
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1698
+					$lined[$key] = $line[$k+1];
1699
+				}
1700
+					if (count($lined) > 3) {
1701
+					$data['hex'] = $lined['hexid'];
1702
+					//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1703
+					$data['datetime'] = date('Y-m-d H:i:s');;
1704
+					if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1705
+					if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1706
+					if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1707
+					if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1708
+					if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1709
+					if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1710
+					if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1711
+					$data['id_source'] = $id_source;
1712
+					$data['format_source'] = 'tsv';
1713
+					if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1714
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1715 1715
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1716
-    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1717
-    				unset($lined);
1718
-    				unset($data);
1719
-    			    } else $error = true;
1716
+					if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1717
+					unset($lined);
1718
+					unset($data);
1719
+					} else $error = true;
1720 1720
 			} elseif ($format === 'aprs' && $use_aprs) {
1721
-			    if ($aprs_connect === 0) {
1721
+				if ($aprs_connect === 0) {
1722 1722
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1723 1723
 				$aprs_connect = 1;
1724
-			    }
1724
+				}
1725 1725
 			    
1726
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1726
+				if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1727 1727
 				$aprs_last_tx = time();
1728 1728
 				$data_aprs = "# Keep alive";
1729 1729
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1730
-			    }
1730
+				}
1731 1731
 			    
1732
-			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1733
-			    //echo 'APRS data : '.$buffer."\n";
1734
-			    $buffer = str_replace('APRS <- ','',$buffer);
1735
-			    $buffer = str_replace('APRS -> ','',$buffer);
1736
-			    //echo $buffer."\n";
1737
-			    date_default_timezone_set('UTC');
1738
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1732
+				//echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1733
+				//echo 'APRS data : '.$buffer."\n";
1734
+				$buffer = str_replace('APRS <- ','',$buffer);
1735
+				$buffer = str_replace('APRS -> ','',$buffer);
1736
+				//echo $buffer."\n";
1737
+				date_default_timezone_set('UTC');
1738
+				if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1739 1739
 				$line = $APRS->parse($buffer);
1740 1740
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1741 1741
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
1742
-				    $aprs_last_tx = time();
1743
-				    $data = array();
1744
-				    //print_r($line);
1745
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1746
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1747
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
1748
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1749
-				    if (isset($line['arrival_code'])) $data['arrival_code'] = $line['arrival_code'];
1750
-				    if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
1751
-				    if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
1752
-				    if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
1753
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1754
-				    else $data['datetime'] = date('Y-m-d H:i:s');
1755
-				    //$data['datetime'] = date('Y-m-d H:i:s');
1756
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
1757
-				    $data['latitude'] = $line['latitude'];
1758
-				    $data['longitude'] = $line['longitude'];
1759
-				    //$data['verticalrate'] = $line[16];
1760
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
1761
-				    //else $data['speed'] = 0;
1762
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1763
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1764
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1765
-				    //if (isset($line['heading'])) $data['heading'] = $line['heading'];
1742
+					$aprs_last_tx = time();
1743
+					$data = array();
1744
+					//print_r($line);
1745
+					if (isset($line['address'])) $data['hex'] = $line['address'];
1746
+					if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1747
+					if (isset($line['imo'])) $data['imo'] = $line['imo'];
1748
+					if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1749
+					if (isset($line['arrival_code'])) $data['arrival_code'] = $line['arrival_code'];
1750
+					if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
1751
+					if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
1752
+					if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
1753
+					if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1754
+					else $data['datetime'] = date('Y-m-d H:i:s');
1755
+					//$data['datetime'] = date('Y-m-d H:i:s');
1756
+					if (isset($line['ident'])) $data['ident'] = $line['ident'];
1757
+					$data['latitude'] = $line['latitude'];
1758
+					$data['longitude'] = $line['longitude'];
1759
+					//$data['verticalrate'] = $line[16];
1760
+					if (isset($line['speed'])) $data['speed'] = $line['speed'];
1761
+					//else $data['speed'] = 0;
1762
+					if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1763
+					if (isset($line['comment'])) $data['comment'] = $line['comment'];
1764
+					if (isset($line['symbol'])) $data['type'] = $line['symbol'];
1765
+					//if (isset($line['heading'])) $data['heading'] = $line['heading'];
1766 1766
 				    
1767
-				    if (isset($line['heading']) && isset($line['format_source'])) $data['heading'] = $line['heading'];
1768
-				    //else echo 'No heading...'."\n";
1769
-				    //else $data['heading'] = 0;
1770
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1771
-				    //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1772
-				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
1773
-				    elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
1774
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1775
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1776
-    				    $data['id_source'] = $id_source;
1777
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1778
-				    else $data['format_source'] = 'aprs';
1779
-				    $data['source_name'] = $line['source'];
1780
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1781
-				    else $data['source_type'] = 'flarm';
1782
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1783
-				    $currentdate = date('Y-m-d H:i:s');
1784
-				    $aprsdate = strtotime($data['datetime']);
1785
-				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
1786
-				    // Accept data if time <= system time + 20s
1787
-				    //if (($data['source_type'] === 'modes') || isset($line['stealth']) && ($line['stealth'] === 0 || $line['stealth'] === '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1788
-				    if (
1767
+					if (isset($line['heading']) && isset($line['format_source'])) $data['heading'] = $line['heading'];
1768
+					//else echo 'No heading...'."\n";
1769
+					//else $data['heading'] = 0;
1770
+					if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
1771
+					//if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1772
+					if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
1773
+					elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
1774
+					if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1775
+					elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
1776
+						$data['id_source'] = $id_source;
1777
+						if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1778
+					else $data['format_source'] = 'aprs';
1779
+					$data['source_name'] = $line['source'];
1780
+					if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1781
+					else $data['source_type'] = 'flarm';
1782
+						if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1783
+					$currentdate = date('Y-m-d H:i:s');
1784
+					$aprsdate = strtotime($data['datetime']);
1785
+					if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
1786
+					// Accept data if time <= system time + 20s
1787
+					//if (($data['source_type'] === 'modes') || isset($line['stealth']) && ($line['stealth'] === 0 || $line['stealth'] === '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1788
+					if (
1789 1789
 					($data['source_type'] === 'modes') || 
1790 1790
 					isset($line['stealth']) && 
1791 1791
 					(!isset($data['hex']) || $data['hex'] != 'FFFFFF') && 
1792 1792
 					 ($line['stealth'] === 0 || $line['stealth'] == '') && 
1793 1793
 					 (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1794 1794
 					$send = $SI->add($data);
1795
-				    } elseif ($data['source_type'] === 'ais') {
1795
+					} elseif ($data['source_type'] === 'ais') {
1796 1796
 					$data['type'] = '';
1797 1797
 					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
1798
-				    } elseif (isset($line['stealth']) && $line['stealth'] != 0) {
1798
+					} elseif (isset($line['stealth']) && $line['stealth'] != 0) {
1799 1799
 					 echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1800
-				    } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1801
-					    //$line['symbol'] === 'Balloon' ||
1802
-					    $line['symbol'] === 'Glider' || 
1803
-					    $line['symbol'] === 'No. Plane' || 
1804
-					    $line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter')) {
1805
-					    if ($line['symbol'] === 'Ballon') $data['aircraft_icao'] = 'BALL';
1806
-					    if ($line['symbol'] === 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
1807
-					    $send = $SI->add($data);
1808
-				    } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1809
-					    $line['symbol'] === 'Yacht (Sail)' || 
1810
-					    $line['symbol'] === 'Ship (Power Boat)')) {
1811
-					    $send = $MI->add($data);
1812
-				    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1813
-					    $line['symbol'] === 'Car' || 
1814
-					    $line['symbol'] === 'Ambulance' || 
1815
-					    $line['symbol'] === 'Van' || 
1816
-					    $line['symbol'] === 'Truck' || $line['symbol'] === 'Truck (18 Wheeler)' || 
1817
-					    $line['symbol'] === 'Motorcycle' || 
1818
-					    $line['symbol'] === 'Tractor' || 
1819
-					    $line['symbol'] === 'Police' || 
1820
-					    $line['symbol'] === 'Bike' || 
1821
-					    $line['symbol'] === 'Jogger' || 
1822
-					    $line['symbol'] === 'Horse' || 
1823
-					    $line['symbol'] === 'Bus' || 
1824
-					    $line['symbol'] === 'Jeep' || 
1825
-					    $line['symbol'] === 'Recreational Vehicle' || 
1826
-					    $line['symbol'] === 'Yacht (Sail)' || 
1827
-					    $line['symbol'] === 'Ship (Power Boat)' || 
1828
-					    $line['symbol'] === 'Firetruck' || 
1829
-					    $line['symbol'] === 'Balloon' || $line['symbol'] === 'Glider' || 
1830
-					    $line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter' || 
1831
-					    $line['symbol'] === 'SUV' ||
1832
-					    $line['symbol'] === 'Snowmobile' ||
1833
-					    $line['symbol'] === 'Mobile Satellite Station')) {
1834
-				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1800
+					} elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1801
+						//$line['symbol'] === 'Balloon' ||
1802
+						$line['symbol'] === 'Glider' || 
1803
+						$line['symbol'] === 'No. Plane' || 
1804
+						$line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter')) {
1805
+						if ($line['symbol'] === 'Ballon') $data['aircraft_icao'] = 'BALL';
1806
+						if ($line['symbol'] === 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
1807
+						$send = $SI->add($data);
1808
+					} elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1809
+						$line['symbol'] === 'Yacht (Sail)' || 
1810
+						$line['symbol'] === 'Ship (Power Boat)')) {
1811
+						$send = $MI->add($data);
1812
+					} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1813
+						$line['symbol'] === 'Car' || 
1814
+						$line['symbol'] === 'Ambulance' || 
1815
+						$line['symbol'] === 'Van' || 
1816
+						$line['symbol'] === 'Truck' || $line['symbol'] === 'Truck (18 Wheeler)' || 
1817
+						$line['symbol'] === 'Motorcycle' || 
1818
+						$line['symbol'] === 'Tractor' || 
1819
+						$line['symbol'] === 'Police' || 
1820
+						$line['symbol'] === 'Bike' || 
1821
+						$line['symbol'] === 'Jogger' || 
1822
+						$line['symbol'] === 'Horse' || 
1823
+						$line['symbol'] === 'Bus' || 
1824
+						$line['symbol'] === 'Jeep' || 
1825
+						$line['symbol'] === 'Recreational Vehicle' || 
1826
+						$line['symbol'] === 'Yacht (Sail)' || 
1827
+						$line['symbol'] === 'Ship (Power Boat)' || 
1828
+						$line['symbol'] === 'Firetruck' || 
1829
+						$line['symbol'] === 'Balloon' || $line['symbol'] === 'Glider' || 
1830
+						$line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter' || 
1831
+						$line['symbol'] === 'SUV' ||
1832
+						$line['symbol'] === 'Snowmobile' ||
1833
+						$line['symbol'] === 'Mobile Satellite Station')) {
1834
+					//} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1835 1835
 				//    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1836 1836
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1837 1837
 					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
1838
-				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1838
+					} elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1839 1839
 					if (!isset($data['altitude'])) $data['altitude'] = 0;
1840 1840
 					$Source->deleteOldLocationByType('gs');
1841 1841
 					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
@@ -1843,7 +1843,7 @@  discard block
 block discarded – undo
1843 1843
 					} else {
1844 1844
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1845 1845
 					}
1846
-				    } elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
1846
+					} elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
1847 1847
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1848 1848
 					if ($globalDebug) echo '# Weather Station added'."\n";
1849 1849
 					$Source->deleteOldLocationByType('wx');
@@ -1853,7 +1853,7 @@  discard block
 block discarded – undo
1853 1853
 					} else {
1854 1854
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
1855 1855
 					}
1856
-				    } elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
1856
+					} elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
1857 1857
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1858 1858
 					if ($globalDebug) echo '☈ Lightning added'."\n";
1859 1859
 					$Source->deleteOldLocationByType('lightning');
@@ -1862,11 +1862,11 @@  discard block
 block discarded – undo
1862 1862
 					} else {
1863 1863
 						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
1864 1864
 					}
1865
-				    } elseif ($globalDebug) {
1866
-				    	echo '/!\ Not added: '.$buffer."\n";
1867
-				    	print_r($line);
1868
-				    }
1869
-				    unset($data);
1865
+					} elseif ($globalDebug) {
1866
+						echo '/!\ Not added: '.$buffer."\n";
1867
+						print_r($line);
1868
+					}
1869
+					unset($data);
1870 1870
 				}
1871 1871
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
1872 1872
 					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
@@ -1885,12 +1885,12 @@  discard block
 block discarded – undo
1885 1885
 				} elseif (!isset($globalSources[$nb]['last_weather_clean'])) {
1886 1886
 					$globalSources[$nb]['last_weather_clean'] = time();
1887 1887
 				}
1888
-			    }
1888
+				}
1889 1889
 			} else {
1890
-			    $line = explode(',', $buffer);
1891
-    			    if (count($line) > 20) {
1892
-    			    	$data['hex'] = $line[4];
1893
-    				/*
1890
+				$line = explode(',', $buffer);
1891
+					if (count($line) > 20) {
1892
+						$data['hex'] = $line[4];
1893
+					/*
1894 1894
     				$data['datetime'] = $line[6].' '.$line[7];
1895 1895
     					date_default_timezone_set($globalTimezone);
1896 1896
     					$datetime = new DateTime($data['datetime']);
@@ -1898,31 +1898,31 @@  discard block
 block discarded – undo
1898 1898
     					$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1899 1899
     					date_default_timezone_set('UTC');
1900 1900
     				*/
1901
-    				// Force datetime to current UTC datetime
1902
-    				date_default_timezone_set('UTC');
1903
-    				$data['datetime'] = date('Y-m-d H:i:s');
1904
-    				$data['ident'] = trim($line[10]);
1905
-    				$data['latitude'] = $line[14];
1906
-    				$data['longitude'] = $line[15];
1907
-    				$data['verticalrate'] = $line[16];
1908
-    				$data['emergency'] = $line[20];
1909
-    				$data['speed'] = $line[12];
1910
-    				$data['squawk'] = $line[17];
1911
-    				$data['altitude'] = $line[11];
1912
-    				$data['heading'] = $line[13];
1913
-    				$data['ground'] = $line[21];
1914
-    				$data['emergency'] = $line[19];
1915
-    				$data['format_source'] = 'sbs';
1901
+					// Force datetime to current UTC datetime
1902
+					date_default_timezone_set('UTC');
1903
+					$data['datetime'] = date('Y-m-d H:i:s');
1904
+					$data['ident'] = trim($line[10]);
1905
+					$data['latitude'] = $line[14];
1906
+					$data['longitude'] = $line[15];
1907
+					$data['verticalrate'] = $line[16];
1908
+					$data['emergency'] = $line[20];
1909
+					$data['speed'] = $line[12];
1910
+					$data['squawk'] = $line[17];
1911
+					$data['altitude'] = $line[11];
1912
+					$data['heading'] = $line[13];
1913
+					$data['ground'] = $line[21];
1914
+					$data['emergency'] = $line[19];
1915
+					$data['format_source'] = 'sbs';
1916 1916
 				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1917 1917
 				elseif ($line[0] == 'MLAT') $data['source_name'] = 'MLAT';
1918
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1918
+					if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1919 1919
 				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1920
-    				$data['id_source'] = $id_source;
1921
-    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1922
-    				else $error = true;
1923
-    				unset($data);
1924
-    			    } else $error = true;
1925
-			    if ($error) {
1920
+					$data['id_source'] = $id_source;
1921
+					if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1922
+					else $error = true;
1923
+					unset($data);
1924
+					} else $error = true;
1925
+				if ($error) {
1926 1926
 				if (count($line) > 1 && ($line[0] === 'STA' || $line[0] === 'AIR' || $line[0] === 'SEL' || $line[0] === 'ID' || $line[0] === 'CLK')) { 
1927 1927
 					if ($globalDebug) echo "Not a message. Ignoring... \n";
1928 1928
 				} else {
@@ -1938,13 +1938,13 @@  discard block
 block discarded – undo
1938 1938
 					connect_all($sourceer);
1939 1939
 					$sourceer = array();
1940 1940
 				}
1941
-			    }
1941
+				}
1942 1942
 			}
1943 1943
 			// Sleep for xxx microseconds
1944 1944
 			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
1945
-		    } else {
1945
+			} else {
1946 1946
 			if ($format === 'flightgearmp') {
1947
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
1947
+					if ($globalDebug) echo "Reconnect FlightGear MP...";
1948 1948
 				//@socket_close($r);
1949 1949
 				sleep($globalMinFetch);
1950 1950
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1953,9 +1953,9 @@  discard block
 block discarded – undo
1953 1953
 				break;
1954 1954
 				
1955 1955
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
1956
-			    if (isset($tt[$format])) $tt[$format]++;
1957
-			    else $tt[$format] = 0;
1958
-			    if ($tt[$format] > 30 || $buffer === FALSE) {
1956
+				if (isset($tt[$format])) $tt[$format]++;
1957
+				else $tt[$format] = 0;
1958
+				if ($tt[$format] > 30 || $buffer === FALSE) {
1959 1959
 				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
1960 1960
 				//@socket_close($r);
1961 1961
 				sleep(2);
@@ -1966,24 +1966,24 @@  discard block
 block discarded – undo
1966 1966
 				//connect_all($globalSources);
1967 1967
 				$tt[$format]=0;
1968 1968
 				break;
1969
-			    } 
1970
-			    //else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
1969
+				} 
1970
+				//else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
1971
+			}
1971 1972
 			}
1972
-		    }
1973 1973
 		}
1974
-	    } else {
1974
+		} else {
1975 1975
 		$error = socket_strerror(socket_last_error());
1976 1976
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1977 1977
 			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1978 1978
 			if (isset($globalDebug)) echo "Restarting...\n";
1979 1979
 			// Restart the script if possible
1980 1980
 			if (is_array($sockets)) {
1981
-			    if ($globalDebug) echo "Shutdown all sockets...";
1981
+				if ($globalDebug) echo "Shutdown all sockets...";
1982 1982
 			    
1983
-			    foreach ($sockets as $sock) {
1983
+				foreach ($sockets as $sock) {
1984 1984
 				@socket_shutdown($sock,2);
1985 1985
 				@socket_close($sock);
1986
-			    }
1986
+				}
1987 1987
 			    
1988 1988
 			}
1989 1989
 			if ($globalDebug) echo "Waiting...";
@@ -1998,15 +1998,15 @@  discard block
 block discarded – undo
1998 1998
 			if ($globalDebug) echo "Restart all connections...";
1999 1999
 			connect_all($globalSources);
2000 2000
 		}
2001
-	    }
2001
+		}
2002 2002
 	}
2003 2003
 	if ($globalDaemon === false) {
2004
-	    if ($globalDebug) echo 'Check all...'."\n";
2005
-	    if (isset($SI)) $SI->checkAll();
2006
-	    if (isset($TI)) $TI->checkAll();
2007
-	    if (isset($MI)) $MI->checkAll();
2004
+		if ($globalDebug) echo 'Check all...'."\n";
2005
+		if (isset($SI)) $SI->checkAll();
2006
+		if (isset($TI)) $TI->checkAll();
2007
+		if (isset($MI)) $MI->checkAll();
2008
+	}
2008 2009
 	}
2009
-    }
2010 2010
 }
2011 2011
 
2012 2012
 ?>
Please login to merge, or discard this patch.
Spacing   +212 added lines, -212 removed lines patch added patch discarded remove patch
@@ -50,20 +50,20 @@  discard block
 block discarded – undo
50 50
 	    die;
51 51
 	}
52 52
 	//$hosts = array($globalSBS1Host.':'.$globalSBS1Port);
53
-	$globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port);
53
+	$globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port);
54 54
     }
55 55
 }
56 56
 
57
-$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver','enable-aircraft','disable-aircraft','enable-tracker','disable-tracker','enable-marine','disable-marine'));
57
+$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver', 'enable-aircraft', 'disable-aircraft', 'enable-tracker', 'disable-tracker', 'enable-marine', 'disable-marine'));
58 58
 //if (isset($options['s'])) $hosts = array($options['s']);
59 59
 //elseif (isset($options['source'])) $hosts = array($options['source']);
60 60
 if (isset($options['s'])) {
61 61
     $globalSources = array();
62
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
62
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']);
63 63
     else $globalSources[] = array('host' => $options['s']);
64 64
 } elseif (isset($options['source'])) {
65 65
     $globalSources = array();
66
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
66
+    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']);
67 67
     else $globalSources[] = array('host' => $options['source']);
68 68
 }
69 69
 if (isset($options['aprsserverhost'])) {
@@ -104,13 +104,13 @@  discard block
 block discarded – undo
104 104
 else $id_source = 1;
105 105
 if (isset($globalServer) && $globalServer) {
106 106
     if ($globalDebug) echo "Using Server Mode\n";
107
-    $SI=new SpotterServer();
107
+    $SI = new SpotterServer();
108 108
 /*
109 109
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
110 110
     $SI = new adsb2aprs();
111 111
     $SI->connect();
112 112
 */
113
-} else $SI=new SpotterImport($Connection->db);
113
+} else $SI = new SpotterImport($Connection->db);
114 114
 
115 115
 if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
116 116
 if (isset($globalMarine) && $globalMarine) {
@@ -124,17 +124,17 @@  discard block
 block discarded – undo
124 124
     $MI = new MarineImport($Connection->db);
125 125
 }
126 126
 //$APRS=new APRS($Connection->db);
127
-$SBS=new SBS();
127
+$SBS = new SBS();
128 128
 if (!isset($globalNoDB) || $globalNoDB !== TRUE) {
129
-	$ACARS=new ACARS($Connection->db,true);
130
-	$Source=new Source($Connection->db);
129
+	$ACARS = new ACARS($Connection->db, true);
130
+	$Source = new Source($Connection->db);
131 131
 }
132
-$Common=new Common();
132
+$Common = new Common();
133 133
 date_default_timezone_set('UTC');
134 134
 //$servertz = system('date +%Z');
135 135
 // signal handler - playing nice with sockets and dump1090
136 136
 if (function_exists('pcntl_fork')) {
137
-    pcntl_signal(SIGINT,  function() {
137
+    pcntl_signal(SIGINT, function() {
138 138
         global $sockets;
139 139
         echo "\n\nctrl-c or kill signal received. Tidying up ... ";
140 140
         die("Bye!\n");
@@ -150,40 +150,40 @@  discard block
 block discarded – undo
150 150
 
151 151
 function connect_all($hosts) {
152 152
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
153
-    global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
153
+    global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context;
154 154
     $reset++;
155 155
     if ($globalDebug) echo 'Connect to all...'."\n";
156 156
     foreach ($hosts as $id => $value) {
157 157
 	$host = $value['host'];
158 158
 	$globalSources[$id]['last_exec'] = 0;
159 159
 	// Here we check type of source(s)
160
-	if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
161
-            if (preg_match('/deltadb.txt$/i',$host)) {
160
+	if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) {
161
+            if (preg_match('/deltadb.txt$/i', $host)) {
162 162
         	//$formats[$id] = 'deltadbtxt';
163 163
         	$globalSources[$id]['format'] = 'deltadbtxt';
164 164
         	//$last_exec['deltadbtxt'] = 0;
165 165
         	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
166
-            } else if (preg_match('/vatsim-data.txt$/i',$host)) {
166
+            } else if (preg_match('/vatsim-data.txt$/i', $host)) {
167 167
         	//$formats[$id] = 'vatsimtxt';
168 168
         	$globalSources[$id]['format'] = 'vatsimtxt';
169 169
         	//$last_exec['vatsimtxt'] = 0;
170 170
         	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
171
-    	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
171
+    	    } else if (preg_match('/aircraftlist.json$/i', $host)) {
172 172
         	//$formats[$id] = 'aircraftlistjson';
173 173
         	$globalSources[$id]['format'] = 'aircraftlistjson';
174 174
         	//$last_exec['aircraftlistjson'] = 0;
175 175
         	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
176
-    	    } else if (preg_match('/aircraft.json$/i',$host)) {
176
+    	    } else if (preg_match('/aircraft.json$/i', $host)) {
177 177
         	//$formats[$id] = 'aircraftjson';
178 178
         	$globalSources[$id]['format'] = 'aircraftjson';
179 179
         	//$last_exec['aircraftlistjson'] = 0;
180 180
         	if ($globalDebug) echo "Connect to aircraft.json source (".$host.")...\n";
181
-    	    } else if (preg_match('/aircraft$/i',$host)) {
181
+    	    } else if (preg_match('/aircraft$/i', $host)) {
182 182
         	//$formats[$id] = 'planefinderclient';
183 183
         	$globalSources[$id]['format'] = 'planefinderclient';
184 184
         	//$last_exec['aircraftlistjson'] = 0;
185 185
         	if ($globalDebug) echo "Connect to planefinderclient source (".$host.")...\n";
186
-    	    } else if (preg_match('/opensky/i',$host)) {
186
+    	    } else if (preg_match('/opensky/i', $host)) {
187 187
         	//$formats[$id] = 'aircraftlistjson';
188 188
         	$globalSources[$id]['format'] = 'opensky';
189 189
         	//$last_exec['aircraftlistjson'] = 0;
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
         	    exit(0);
201 201
         	}
202 202
     	    */
203
-    	    } else if (preg_match('/planeUpdateFAA.php$/i',$host)) {
203
+    	    } else if (preg_match('/planeUpdateFAA.php$/i', $host)) {
204 204
         	//$formats[$id] = 'planeupdatefaa';
205 205
         	$globalSources[$id]['format'] = 'planeupdatefaa';
206 206
         	//$last_exec['planeupdatefaa'] = 0;
@@ -209,37 +209,37 @@  discard block
 block discarded – undo
209 209
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
210 210
         	    exit(0);
211 211
         	}
212
-            } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) {
212
+            } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) {
213 213
         	//$formats[$id] = 'phpvmacars';
214 214
         	$globalSources[$id]['format'] = 'phpvmacars';
215 215
         	//$last_exec['phpvmacars'] = 0;
216 216
         	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
217
-            } else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
217
+            } else if (preg_match('/\/api\/v1\/acars\/data$/i', $host)) {
218 218
         	//$formats[$id] = 'phpvmacars';
219 219
         	$globalSources[$id]['format'] = 'vaos';
220 220
         	//$last_exec['phpvmacars'] = 0;
221 221
         	if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
222
-            } else if (preg_match('/VAM-json.php$/i',$host)) {
222
+            } else if (preg_match('/VAM-json.php$/i', $host)) {
223 223
         	//$formats[$id] = 'phpvmacars';
224 224
         	$globalSources[$id]['format'] = 'vam';
225 225
         	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
226
-            } else if (preg_match('/whazzup/i',$host)) {
226
+            } else if (preg_match('/whazzup/i', $host)) {
227 227
         	//$formats[$id] = 'whazzup';
228 228
         	$globalSources[$id]['format'] = 'whazzup';
229 229
         	//$last_exec['whazzup'] = 0;
230 230
         	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
231
-            } else if (preg_match('/blitzortung/i',$host)) {
231
+            } else if (preg_match('/blitzortung/i', $host)) {
232 232
         	$globalSources[$id]['format'] = 'blitzortung';
233 233
         	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
234
-            } else if (preg_match('/airwhere/i',$host)) {
234
+            } else if (preg_match('/airwhere/i', $host)) {
235 235
         	$globalSources[$id]['format'] = 'airwhere';
236 236
         	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
237
-            } else if (preg_match('/recentpireps/i',$host)) {
237
+            } else if (preg_match('/recentpireps/i', $host)) {
238 238
         	//$formats[$id] = 'pirepsjson';
239 239
         	$globalSources[$id]['format'] = 'pirepsjson';
240 240
         	//$last_exec['pirepsjson'] = 0;
241 241
         	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
242
-            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
242
+            } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) {
243 243
         	//$formats[$id] = 'fr24json';
244 244
         	$globalSources[$id]['format'] = 'fr24json';
245 245
         	//$last_exec['fr24json'] = 0;
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
249 249
         	    exit(0);
250 250
         	}
251
-            } else if (preg_match(':myshiptracking.com/:i',$host)) {
251
+            } else if (preg_match(':myshiptracking.com/:i', $host)) {
252 252
         	//$formats[$id] = 'fr24json';
253 253
         	$globalSources[$id]['format'] = 'myshiptracking';
254 254
         	//$last_exec['fr24json'] = 0;
@@ -258,22 +258,22 @@  discard block
 block discarded – undo
258 258
         	    exit(0);
259 259
         	}
260 260
             //} else if (preg_match('/10001/',$host)) {
261
-            } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
261
+            } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
262 262
         	//$formats[$id] = 'tsv';
263 263
         	$globalSources[$id]['format'] = 'tsv';
264 264
         	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
265 265
             }
266
-        } elseif (filter_var($host,FILTER_VALIDATE_URL) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway')) {
266
+        } elseif (filter_var($host, FILTER_VALIDATE_URL) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway')) {
267 267
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
268
-    		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
268
+    		    $idf = fopen($globalSources[$id]['host'], 'r', false, $context);
269 269
     		    if ($idf !== false) {
270 270
     			$httpfeeds[$id] = $idf;
271 271
         		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
272 272
     		    } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
273 273
     		} elseif ($globalDebug && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\n";
274 274
     		elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
275
-        } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
276
-	    $hostport = explode(':',$host);
275
+        } elseif (!filter_var($host, FILTER_VALIDATE_URL)) {
276
+	    $hostport = explode(':', $host);
277 277
 	    if (isset($hostport[1])) {
278 278
 		$port = $hostport[1];
279 279
 		$hostn = $hostport[0];
@@ -283,19 +283,19 @@  discard block
 block discarded – undo
283 283
 	    }
284 284
 	    $Common = new Common();
285 285
 	    if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) {
286
-        	$s = $Common->create_socket($hostn,$port, $errno, $errstr);
286
+        	$s = $Common->create_socket($hostn, $port, $errno, $errstr);
287 287
     	    } else {
288
-        	$s = $Common->create_socket_udp($hostn,$port, $errno, $errstr);
288
+        	$s = $Common->create_socket_udp($hostn, $port, $errno, $errstr);
289 289
 	    }
290 290
 	    if ($s) {
291 291
     	        $sockets[$id] = $s;
292 292
     	        if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') {
293
-		    if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') {
293
+		    if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') {
294 294
 			//$formats[$id] = 'aprs';
295 295
 			$globalSources[$id]['format'] = 'aprs';
296 296
 			//$aprs_connect = 0;
297 297
 			//$use_aprs = true;
298
-		    } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
298
+		    } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') {
299 299
 			$globalSources[$id]['format'] = 'vrstcp';
300 300
     		    } elseif ($port == '10001') {
301 301
         		//$formats[$id] = 'tsv';
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
337 337
 else $timeout = 20;
338 338
 $errno = '';
339
-$errstr='';
339
+$errstr = '';
340 340
 
341 341
 if (!isset($globalDaemon)) $globalDaemon = TRUE;
342 342
 /* Initiate connections to all the hosts simultaneously */
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
344 344
 //connect_all($globalSources);
345 345
 
346 346
 if (isset($globalProxy) && $globalProxy) {
347
-    $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true)));
347
+    $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true)));
348 348
 } else {
349 349
     $context = stream_context_create(array('http' => array('timeout' => $timeout)));
350 350
 }
@@ -374,16 +374,16 @@  discard block
 block discarded – undo
374 374
 
375 375
 if ($use_aprs) {
376 376
 	require_once(dirname(__FILE__).'/../require/class.APRS.php');
377
-	$APRS=new APRS();
377
+	$APRS = new APRS();
378 378
 	$aprs_connect = 0;
379 379
 	$aprs_keep = 120;
380 380
 	$aprs_last_tx = time();
381 381
 	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
382
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
382
+	else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
383 383
 	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
384
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
384
+	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
385 385
 	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
386
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
386
+	else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
387 387
 	if ($aprs_full) $aprs_filter = '';
388 388
 	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
389 389
 	else $aprs_pass = '-1';
@@ -397,12 +397,12 @@  discard block
 block discarded – undo
397 397
 sleep(1);
398 398
 if ($globalDebug) echo "SCAN MODE \n\n";
399 399
 if (!isset($globalCronEnd)) $globalCronEnd = 60;
400
-$endtime = time()+$globalCronEnd;
400
+$endtime = time() + $globalCronEnd;
401 401
 $i = 1;
402 402
 $tt = array();
403 403
 // Delete all ATC
404 404
 if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
405
-	$ATC=new ATC($Connection->db);
405
+	$ATC = new ATC($Connection->db);
406 406
 }
407 407
 if (!$globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
408 408
 	$ATC->deleteAll();
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
412 412
 while ($i > 0) {
413 413
     if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
414 414
 
415
-    if (!$globalDaemon) $i = $endtime-time();
415
+    if (!$globalDaemon) $i = $endtime - time();
416 416
     // Delete old ATC
417 417
     if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
418 418
 	if ($globalDebug) echo 'Delete old ATC...'."\n";
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
 	}
427 427
 	if ($max < $globalMinFetch) {
428 428
 	    if ($globalDebug) echo 'Sleeping...'."\n";
429
-	    sleep($globalMinFetch-$max+2);
429
+	    sleep($globalMinFetch - $max + 2);
430 430
 	}
431 431
     }
432 432
 
@@ -445,8 +445,8 @@  discard block
 block discarded – undo
445 445
 	    //$buffer = $Common->getData($hosts[$id]);
446 446
 	    $buffer = $Common->getData($value['host']);
447 447
 	    if ($buffer != '') $reset = 0;
448
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
449
-	    $buffer = explode('\n',$buffer);
448
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
449
+	    $buffer = explode('\n', $buffer);
450 450
 	    foreach ($buffer as $line) {
451 451
     		if ($line != '' && count($line) > 7) {
452 452
     		    $line = explode(',', $line);
@@ -479,11 +479,11 @@  discard block
 block discarded – undo
479 479
 	    )
480 480
 	) {
481 481
 	    date_default_timezone_set('CET');
482
-	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
482
+	    $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host']));
483 483
 	    date_default_timezone_set('UTC');
484 484
 	    if ($buffer != '') $reset = 0;
485
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
486
-	    $buffer = explode('\n',$buffer);
485
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
486
+	    $buffer = explode('\n', $buffer);
487 487
 	    foreach ($buffer as $line) {
488 488
 		if ($line != '') {
489 489
 		    //echo "'".$line."'\n";
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
 		    $ais_data = $AIS->parse_line(trim($line));
492 492
 		    $data = array();
493 493
 		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
494
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
494
+		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9);
495 495
 		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
496 496
 		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
497 497
 		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
 		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
504 504
 		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
505 505
 		    if (isset($ais_data['timestamp'])) {
506
-			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
506
+			$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
507 507
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
508 508
 			    $last_exec[$id]['timestamp'] = $ais_data['timestamp'];
509 509
 			    $add = true;
@@ -526,21 +526,21 @@  discard block
 block discarded – undo
526 526
 	    $w = $e = null;
527 527
 	    
528 528
 	    if (isset($arr[$id])) {
529
-		$nn = stream_select($arr,$w,$e,$timeout);
529
+		$nn = stream_select($arr, $w, $e, $timeout);
530 530
 		if ($nn > 0) {
531 531
 		    foreach ($httpfeeds as $feed) {
532
-			$buffer = stream_get_line($feed,2000,"\n");
532
+			$buffer = stream_get_line($feed, 2000, "\n");
533 533
 			if ($buffer === FALSE) {
534 534
 			    connect_all($globalSources);
535 535
 			}
536
-			$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
537
-			$buffer = explode('\n',$buffer);
536
+			$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
537
+			$buffer = explode('\n', $buffer);
538 538
 			foreach ($buffer as $line) {
539 539
 			    if ($line != '') {
540 540
 				$ais_data = $AIS->parse_line(trim($line));
541 541
 				$data = array();
542 542
 				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
543
-				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
543
+				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9);
544 544
 				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
545 545
 				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
546 546
 				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
@@ -552,9 +552,9 @@  discard block
 block discarded – undo
552 552
 				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
553 553
 				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
554 554
 				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
555
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
555
+				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
556 556
 				if (isset($ais_data['timestamp'])) {
557
-				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
557
+				    $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
558 558
 				} else {
559 559
 				    $data['datetime'] = date('Y-m-d H:i:s');
560 560
 				}
@@ -586,10 +586,10 @@  discard block
 block discarded – undo
586 586
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
587 587
 	    )
588 588
 	) {
589
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
589
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
590 590
 	    if ($buffer != '') {
591 591
 		//echo $buffer;
592
-		$all_data = json_decode($buffer,true);
592
+		$all_data = json_decode($buffer, true);
593 593
 		//print_r($all_data);
594 594
 		if (isset($all_data[0]['DATA'])) {
595 595
 		    foreach ($all_data[0]['DATA'] as $line) {
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
 			    $data['ident'] = $line['NAME'];
599 599
 			    $data['mmsi'] = $line['MMSI'];
600 600
 			    if (strlen($data['mmsi']) > 9) {
601
-				$data['mmsi'] = substr($data['mmsi'],-9);
601
+				$data['mmsi'] = substr($data['mmsi'], -9);
602 602
 			    }
603 603
 			    $data['speed'] = $line['SOG'];
604 604
 			    $data['heading'] = $line['COG'];
@@ -608,8 +608,8 @@  discard block
 block discarded – undo
608 608
 			    //$data['type_id'] = $line['TYPE'];
609 609
 			    $data['imo'] = $line['IMO'];
610 610
 			    if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
611
-			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
612
-			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
611
+			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s', strtotime($line['ARV']));
612
+			    $data['datetime'] = date('Y-m-d H:i:s', $line['T']);
613 613
 			    $data['format_source'] = 'myshiptracking';
614 614
 			    $data['id_source'] = $id_source;
615 615
 			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -626,16 +626,16 @@  discard block
 block discarded – undo
626 626
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
627 627
 	    )
628 628
 	) {
629
-	    $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host']));
629
+	    $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host']));
630 630
 	    if ($buffer != '') {
631
-		$all_data = json_decode($buffer,true);
631
+		$all_data = json_decode($buffer, true);
632 632
 		if (isset($all_data[0]['mmsi'])) {
633 633
 		    foreach ($all_data as $line) {
634 634
 			if ($line != '') {
635 635
 			    $data = array();
636 636
 			    $data['ident'] = $line['shipname'];
637 637
 			    $data['callsign'] = $line['callsign'];
638
-			    $data['mmsi'] = substr($line['mmsi'],-9);
638
+			    $data['mmsi'] = substr($line['mmsi'], -9);
639 639
 			    $data['speed'] = $line['sog'];
640 640
 			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
641 641
 			    $data['latitude'] = $line['latitude'];
@@ -662,14 +662,14 @@  discard block
 block discarded – undo
662 662
 	) {
663 663
 	    $buffer = $Common->getData($value['host']);
664 664
 	    if ($buffer != '') {
665
-		$all_data = json_decode($buffer,true);
665
+		$all_data = json_decode($buffer, true);
666 666
 		if (isset($all_data['features'][0]['id'])) {
667 667
 		    foreach ($all_data['features'] as $line) {
668 668
 			print_r($line);
669 669
 			$data = array();
670 670
 			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
671 671
 			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
672
-			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'],-9);
672
+			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'], -9);
673 673
 			if (isset($line['properties']['imo'])) $data['imo'] = $line['properties']['imo'];
674 674
 			if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed'];
675 675
 			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) $data['heading'] = $line['properties']['heading'];
@@ -696,31 +696,31 @@  discard block
 block discarded – undo
696 696
 	    )
697 697
 	) {
698 698
 	    if ($globalDebug) echo 'download...';
699
-	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
699
+	    $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter');
700 700
 	    if ($globalDebug) echo 'done !'."\n";
701 701
 	    // FIXME: Need more work
702 702
 	    if ($buffer != '') $reset = 0;
703
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
704
-	    $buffer = explode('\n',$buffer);
703
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
704
+	    $buffer = explode('\n', $buffer);
705 705
 	    foreach ($buffer as $line) {
706 706
 		if ($line != '') {
707 707
 		    $data = array();
708 708
 		    //echo $line."\n";
709
-		    $data['mmsi'] = (int)substr($line,0,9);
710
-		    $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10));
711
-		    $data['status_id'] = substr($line,21,2);
712
-		    $data['type_id'] = substr($line,24,3);
713
-		    $data['latitude'] = substr($line,29,9);
714
-		    $data['longitude'] = substr($line,41,9);
715
-		    $data['speed'] = round(substr($line,51,5));
709
+		    $data['mmsi'] = (int) substr($line, 0, 9);
710
+		    $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10));
711
+		    $data['status_id'] = substr($line, 21, 2);
712
+		    $data['type_id'] = substr($line, 24, 3);
713
+		    $data['latitude'] = substr($line, 29, 9);
714
+		    $data['longitude'] = substr($line, 41, 9);
715
+		    $data['speed'] = round(substr($line, 51, 5));
716 716
 		    //$data['course'] = substr($line,57,5);
717
-		    $data['heading'] = round(substr($line,63,3));
717
+		    $data['heading'] = round(substr($line, 63, 3));
718 718
 		    //$data['draft'] = substr($line,67,4);
719 719
 		    //$data['length'] = substr($line,72,3);
720 720
 		    //$data['beam'] = substr($line,76,2);
721
-		    $data['ident'] = trim(utf8_encode(substr($line,78,20)));
721
+		    $data['ident'] = trim(utf8_encode(substr($line, 78, 20)));
722 722
 		    //$data['callsign'] = trim(substr($line,100,7);
723
-		    $data['arrival_code'] = substr($line,108,20);
723
+		    $data['arrival_code'] = substr($line, 108, 20);
724 724
 		    //$data['etaDate'] = substr($line,129,5);
725 725
 		    //$data['etaTime'] = substr($line,135,5);
726 726
 		    $data['format_source'] = 'shipplotter';
@@ -740,21 +740,21 @@  discard block
 block discarded – undo
740 740
 	    )
741 741
 	) {
742 742
 	    if ($globalDebug) echo '! Download... ';
743
-	    for ($i =0; $i <= 1; $i++) {
743
+	    for ($i = 0; $i <= 1; $i++) {
744 744
 		    if ($globalDebug) echo 'Racetype: '.$i.' ';
745 745
 	    $buffer = $Common->getData('https://sailaway.world/cgi-bin/sailaway/GetMissions.pl?race=1&tutorial=0&hist=1&racetype='.$i);
746 746
 	    if ($globalDebug) echo 'done'."\n";
747 747
 	    if ($buffer != '') {
748
-		$all_data = json_decode($buffer,true);
748
+		$all_data = json_decode($buffer, true);
749 749
 		if (isset($all_data['missions'])) {
750 750
 			foreach ($all_data['missions'] as $mission) {
751 751
 				$mission_user = $mission['usrname'];
752
-				$mission_name = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$mission['mistitle']);
753
-				if (!isset($globalFilter['sailway']['race']) || (isset($globalFilter['sailway']['race']) && in_array($mission['misnr'],$globalFilter['sailway']['race']))) {
752
+				$mission_name = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $mission['mistitle']);
753
+				if (!isset($globalFilter['sailway']['race']) || (isset($globalFilter['sailway']['race']) && in_array($mission['misnr'], $globalFilter['sailway']['race']))) {
754 754
 					$bufferm = $Common->getData('https://sailaway.world/cgi-bin/sailaway/GetLeaderboard.pl?misnr='.$mission['misnr']);
755 755
 				} else $bufferm = '';
756 756
 				if ($bufferm != '') {
757
-					$mission_data = json_decode($bufferm,true);
757
+					$mission_data = json_decode($bufferm, true);
758 758
 					if (isset($mission_data['leaderboard'][0]['results'])) {
759 759
 						foreach ($mission_data['leaderboard'][0]['results'] as $sail) {
760 760
 							//print_r($bufferm);
@@ -771,13 +771,13 @@  discard block
 block discarded – undo
771 771
 								$pos = $Common->convertDecLatLong($sail['pos']);
772 772
 								$data['latitude'] = $pos['latitude'];
773 773
 								$data['longitude'] = $pos['longitude'];
774
-								$resultdescr = explode(',',$sail['resultdescr']);
775
-								$data['speed'] = round(str_replace(array('Spd: ','kn.'),'',trim($resultdescr[2]))*1.852,2);
776
-								$data['heading'] = str_replace(array('Hdg: ','°'),'',trim($resultdescr[1]));
774
+								$resultdescr = explode(',', $sail['resultdescr']);
775
+								$data['speed'] = round(str_replace(array('Spd: ', 'kn.'), '', trim($resultdescr[2]))*1.852, 2);
776
+								$data['heading'] = str_replace(array('Hdg: ', '°'), '', trim($resultdescr[1]));
777 777
 								if (isset($resultdescr[3])) {
778
-									$data['distance'] = round(str_replace('nm.','',trim(explode(' ',$resultdescr[3])[1]))*1.852,3);
778
+									$data['distance'] = round(str_replace('nm.', '', trim(explode(' ', $resultdescr[3])[1]))*1.852, 3);
779 779
 								}
780
-								$data['ident'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$sail['ubtname']));
780
+								$data['ident'] = trim(preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $sail['ubtname']));
781 781
 								$data['captain_id'] = $sail['usrnr'];
782 782
 								$data['captain_name'] = $sail['usrname'];
783 783
 								$data['race_id'] = $sail['misnr'];
@@ -824,8 +824,8 @@  discard block
 block discarded – undo
824 824
 	) {
825 825
 	    //$buffer = $Common->getData($hosts[$id]);
826 826
 	    $buffer = $Common->getData($value['host']);
827
-    	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
828
-	    $buffer = explode('\n',$buffer);
827
+    	    $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
828
+	    $buffer = explode('\n', $buffer);
829 829
 	    $reset = 0;
830 830
 	    foreach ($buffer as $line) {
831 831
     		if ($line != '') {
@@ -836,7 +836,7 @@  discard block
 block discarded – undo
836 836
 			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
837 837
 			$data['pilot_id'] = $line[1];
838 838
 			$data['pilot_name'] = $line[2];
839
-			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
839
+			$data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT);
840 840
 			$data['ident'] = $line[0]; // ident
841 841
 			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
842 842
 			$data['speed'] = $line[8]; // speed
@@ -852,7 +852,7 @@  discard block
 block discarded – undo
852 852
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
853 853
 			//if (isset($line[37])) $data['last_update'] = $line[37];
854 854
 		        $data['departure_airport_icao'] = $line[11];
855
-		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
855
+		        $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':');
856 856
 		        $data['arrival_airport_icao'] = $line[13];
857 857
 			$data['frequency'] = $line[4];
858 858
 			$data['type'] = $line[18];
@@ -861,7 +861,7 @@  discard block
 block discarded – undo
861 861
     			$data['id_source'] = $id_source;
862 862
 	    		//$data['arrival_airport_time'] = ;
863 863
 	    		if ($line[9] != '') {
864
-	    		    $aircraft_data = explode('/',$line[9]);
864
+	    		    $aircraft_data = explode('/', $line[9]);
865 865
 	    		    if (isset($aircraft_data[1])) {
866 866
 	    			$data['aircraft_icao'] = $aircraft_data[1];
867 867
 	    		    }
@@ -876,9 +876,9 @@  discard block
 block discarded – undo
876 876
     			if ($line[3] === 'PILOT') $SI->add($data);
877 877
 			elseif ($line[3] === 'ATC') {
878 878
 				//print_r($data);
879
-				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
880
-				$data['info'] = str_replace('&amp;sect;','',$data['info']);
881
-				$typec = substr($data['ident'],-3);
879
+				$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
880
+				$data['info'] = str_replace('&amp;sect;', '', $data['info']);
881
+				$typec = substr($data['ident'], -3);
882 882
 				if ($typec === 'APP') $data['type'] = 'Approach';
883 883
 				elseif ($typec === 'TWR') $data['type'] = 'Tower';
884 884
 				elseif ($typec === 'OBS') $data['type'] = 'Observer';
@@ -890,8 +890,8 @@  discard block
 block discarded – undo
890 890
 				elseif ($data['type'] === '') $data['type'] = 'Observer';
891 891
 				if (!isset($data['source_name'])) $data['source_name'] = '';
892 892
 				if (isset($ATC)) {
893
-					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
894
-					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
893
+					if (count($ATC->getByIdent($data['ident'], $data['format_source'])) > 0) echo $ATC->update($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']);
894
+					else echo $ATC->add($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']);
895 895
 				}
896 896
 			}
897 897
     			unset($data);
@@ -907,24 +907,24 @@  discard block
 block discarded – undo
907 907
     		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
908 908
     	    )
909 909
     	) {
910
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20');
910
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php', 'get', '', '', '', '', '20');
911 911
 	    if ($buffer != '') {
912 912
 		$all_data = simplexml_load_string($buffer);
913
-		foreach($all_data->children() as $childdata) {
913
+		foreach ($all_data->children() as $childdata) {
914 914
 			$data = array();
915 915
 			$line = $childdata;
916 916
 			//$data['hex'] = str_pad(dechex((int)$line['pktPilotID']),6,'000000',STR_PAD_LEFT);
917
-			$data['id'] = date('Ymd').(int)$line['pktPilotID'];
918
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
919
-			$data['latitude'] = (float)$line['pktLatitude'];
920
-			$data['longitude'] = (float)$line['pktLongitude'];
921
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
922
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
923
-			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
917
+			$data['id'] = date('Ymd').(int) $line['pktPilotID'];
918
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['entryTime'].' BST'));
919
+			$data['latitude'] = (float) $line['pktLatitude'];
920
+			$data['longitude'] = (float) $line['pktLongitude'];
921
+			if ((float) $line['pktTrack'] != 0) $data['heading'] = (float) $line['pktTrack'];
922
+			if ((int) $line['pktSpeed'] != 0) $data['speed'] = (int) $line['pktSpeed'];
923
+			$data['altitude'] = round((int) $line['pktAltitude']*3.28084);
924 924
 			$data['altitude_relative'] = 'AMSL';
925
-			$data['pilot_id'] = (int)$line['pktPilotID'];
925
+			$data['pilot_id'] = (int) $line['pktPilotID'];
926 926
 			$data['aircraft_icao'] = 'PARAGLIDER';
927
-			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
927
+			$pilot_data = explode(',', $Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
928 928
 			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
929 929
 			$data['format_source'] = $value['format'];
930 930
 			$SI->add($data);
@@ -932,22 +932,22 @@  discard block
 block discarded – undo
932 932
 		}
933 933
 	    }
934 934
 	    $Source->deleteOldLocationByType('gs');
935
-	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20');
935
+	    $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php', 'get', '', '', '', '', '20');
936 936
 	    if ($buffer != '') {
937 937
 		$all_data = simplexml_load_string($buffer);
938
-		foreach($all_data->children() as $childdata) {
938
+		foreach ($all_data->children() as $childdata) {
939 939
 			$data = array();
940 940
 			$line = $childdata;
941
-			$data['id'] = (int)$line['gsID'];
942
-			$data['latitude'] = (float)$line['gsLatitude'];
943
-			$data['longitude'] = (float)$line['gsLongitude'];
944
-			$data['altitude'] = round((int)$line['gsHeight']*3.28084);
941
+			$data['id'] = (int) $line['gsID'];
942
+			$data['latitude'] = (float) $line['gsLatitude'];
943
+			$data['longitude'] = (float) $line['gsLongitude'];
944
+			$data['altitude'] = round((int) $line['gsHeight']*3.28084);
945 945
 			$data['altitude_relative'] = 'AMSL';
946
-			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['gsLastUpdate'].' BST'));
946
+			$data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['gsLastUpdate'].' BST'));
947 947
 			if (count($Source->getLocationInfoByLocationID($data['id'])) > 0) {
948
-				$Source->updateLocationByLocationID('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
948
+				$Source->updateLocationByLocationID('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
949 949
 			} else {
950
-				$Source->addLocation('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']);
950
+				$Source->addLocation('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']);
951 951
 			}
952 952
 			unset($data);
953 953
 		}
@@ -965,9 +965,9 @@  discard block
 block discarded – undo
965 965
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch))
966 966
 	    )
967 967
 	) {
968
-	    $buffer = $Common->getData($value['host'],'get','','','','','20');
968
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20');
969 969
 	    if ($buffer != '') {
970
-	        $all_data = json_decode($buffer,true);
970
+	        $all_data = json_decode($buffer, true);
971 971
 		if (isset($all_data['acList'])) {
972 972
 		    $reset = 0;
973 973
 		    foreach ($all_data['acList'] as $line) {
@@ -983,7 +983,7 @@  discard block
 block discarded – undo
983 983
 			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
984 984
 			$data['emergency'] = ''; // emergency
985 985
 			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
986
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
986
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
987 987
 			else $data['datetime'] = date('Y-m-d H:i:s');
988 988
 			//$data['datetime'] = date('Y-m-d H:i:s');
989 989
 			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
@@ -1008,7 +1008,7 @@  discard block
 block discarded – undo
1008 1008
 			$data['verticalrate'] = $line['vrt']; // verticale rate
1009 1009
 			$data['squawk'] = $line['squawk']; // squawk
1010 1010
 			$data['emergency'] = ''; // emergency
1011
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1011
+			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000));
1012 1012
 			else $data['datetime'] = date('Y-m-d H:i:s');
1013 1013
 			$data['format_source'] = 'aircraftlistjson';
1014 1014
 			$data['id_source'] = $id_source;
@@ -1029,7 +1029,7 @@  discard block
 block discarded – undo
1029 1029
     	    )
1030 1030
     	) {
1031 1031
 	    $buffer = $Common->getData($value['host']);
1032
-	    $all_data = json_decode($buffer,true);
1032
+	    $all_data = json_decode($buffer, true);
1033 1033
 	    if (isset($all_data['planes'])) {
1034 1034
 		$reset = 0;
1035 1035
 		foreach ($all_data['planes'] as $key => $line) {
@@ -1046,12 +1046,12 @@  discard block
 block discarded – undo
1046 1046
 		    $data['emergency'] = ''; // emergency
1047 1047
 		    $data['registration'] = $line[2];
1048 1048
 		    $data['aircraft_icao'] = $line[0];
1049
-		    $deparr = explode('-',$line[1]);
1049
+		    $deparr = explode('-', $line[1]);
1050 1050
 		    if (count($deparr) === 2) {
1051 1051
 			$data['departure_airport_icao'] = $deparr[0];
1052 1052
 			$data['arrival_airport_icao'] = $deparr[1];
1053 1053
 		    }
1054
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
1054
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[9]);
1055 1055
 	    	    $data['format_source'] = 'planeupdatefaa';
1056 1056
     		    $data['id_source'] = $id_source;
1057 1057
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1069,7 +1069,7 @@  discard block
 block discarded – undo
1069 1069
 	    )
1070 1070
 	) {
1071 1071
 	    $buffer = $Common->getData($value['host']);
1072
-	    $all_data = json_decode($buffer,true);
1072
+	    $all_data = json_decode($buffer, true);
1073 1073
 	    if (isset($all_data['states'])) {
1074 1074
 		$reset = 0;
1075 1075
 		foreach ($all_data['states'] as $key => $line) {
@@ -1086,7 +1086,7 @@  discard block
 block discarded – undo
1086 1086
 		    //$data['emergency'] = ''; // emergency
1087 1087
 		    //$data['registration'] = $line[2];
1088 1088
 		    //$data['aircraft_icao'] = $line[0];
1089
-		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
1089
+		    $data['datetime'] = date('Y-m-d H:i:s', $line[3]);
1090 1090
 		    $data['format_source'] = 'opensky';
1091 1091
 		    $data['id_source'] = $id_source;
1092 1092
 		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1103,8 +1103,8 @@  discard block
 block discarded – undo
1103 1103
 	    )
1104 1104
 	) {
1105 1105
 	    $buffer = $Common->getData($value['host']);
1106
-	    $all_data = json_decode($buffer,true);
1107
-	    if (isset($all_data['aircraft']) && isset($all_data['now']) && $all_data['now'] > time()-1800) {
1106
+	    $all_data = json_decode($buffer, true);
1107
+	    if (isset($all_data['aircraft']) && isset($all_data['now']) && $all_data['now'] > time() - 1800) {
1108 1108
 		$reset = 0;
1109 1109
 		foreach ($all_data['aircraft'] as $key => $line) {
1110 1110
 		    $data = array();
@@ -1142,7 +1142,7 @@  discard block
 block discarded – undo
1142 1142
 	    )
1143 1143
 	) {
1144 1144
 	    $buffer = $Common->getData($value['host']);
1145
-	    $all_data = json_decode($buffer,true);
1145
+	    $all_data = json_decode($buffer, true);
1146 1146
 	    if (isset($all_data['aircraft'])) {
1147 1147
 		$reset = 0;
1148 1148
 		foreach ($all_data['aircraft'] as $key => $line) {
@@ -1159,7 +1159,7 @@  discard block
 block discarded – undo
1159 1159
 		    //$data['emergency'] = ''; // emergency
1160 1160
 		    if (isset($line['reg'])) $data['registration'] = $line['reg'];
1161 1161
 		    if (isset($line['type'])) $data['aircraft_icao'] = $line['type'];
1162
-		    $data['datetime'] = date('Y-m-d H:i:s',$line['pos_update_time']);
1162
+		    $data['datetime'] = date('Y-m-d H:i:s', $line['pos_update_time']);
1163 1163
 		    $data['format_source'] = 'planefinderclient';
1164 1164
 		    $data['id_source'] = $id_source;
1165 1165
 		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
@@ -1178,7 +1178,7 @@  discard block
 block discarded – undo
1178 1178
 	) {
1179 1179
 	    //$buffer = $Common->getData($hosts[$id]);
1180 1180
 	    $buffer = $Common->getData($value['host']);
1181
-	    $all_data = json_decode($buffer,true);
1181
+	    $all_data = json_decode($buffer, true);
1182 1182
 	    if (!empty($all_data)) $reset = 0;
1183 1183
 	    foreach ($all_data as $key => $line) {
1184 1184
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
@@ -1216,11 +1216,11 @@  discard block
 block discarded – undo
1216 1216
 	    )
1217 1217
 	) {
1218 1218
 	    //$buffer = $Common->getData($hosts[$id],'get','','','','','150');
1219
-	    $buffer = $Common->getData($value['host'],'get','','','','','150');
1219
+	    $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150');
1220 1220
 	    //echo $buffer;
1221
-	    $buffer = str_replace(array("\n","\r"),"",$buffer);
1222
-	    $buffer = preg_replace('/,"num":(.+)/','}',$buffer);
1223
-	    $all_data = json_decode($buffer,true);
1221
+	    $buffer = str_replace(array("\n", "\r"), "", $buffer);
1222
+	    $buffer = preg_replace('/,"num":(.+)/', '}', $buffer);
1223
+	    $all_data = json_decode($buffer, true);
1224 1224
 	    if (json_last_error() != JSON_ERROR_NONE) {
1225 1225
 		die(json_last_error_msg());
1226 1226
 	    }
@@ -1243,7 +1243,7 @@  discard block
 block discarded – undo
1243 1243
 			//$data['departure_airport_iata'] = $line[11];
1244 1244
 			//$data['arrival_airport_iata'] = $line[12];
1245 1245
 	    		//$data['emergency'] = ''; // emergency
1246
-			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
1246
+			$data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10]
1247 1247
 	    		$data['format_source'] = 'radarvirtueljson';
1248 1248
     			$data['id_source'] = $id_source;
1249 1249
 			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
@@ -1264,14 +1264,14 @@  discard block
 block discarded – undo
1264 1264
 	) {
1265 1265
 	    //$buffer = $Common->getData($hosts[$id]);
1266 1266
 	    $buffer = $Common->getData($value['host'].'?'.time());
1267
-	    $all_data = json_decode(utf8_encode($buffer),true);
1267
+	    $all_data = json_decode(utf8_encode($buffer), true);
1268 1268
 	    
1269 1269
 	    if (isset($all_data['pireps'])) {
1270 1270
 		$reset = 0;
1271 1271
 	        foreach ($all_data['pireps'] as $line) {
1272 1272
 		    $data = array();
1273 1273
 		    $data['id'] = $line['id'];
1274
-		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
1274
+		    $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6);
1275 1275
 		    $data['ident'] = $line['callsign']; // ident
1276 1276
 		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
1277 1277
 		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
@@ -1301,9 +1301,9 @@  discard block
 block discarded – undo
1301 1301
 			$SI->add($data);
1302 1302
 		    //    print_r($data);
1303 1303
     		    } elseif ($line['icon'] === 'ct') {
1304
-			$data['info'] = str_replace('^&sect;','<br />',$data['info']);
1305
-			$data['info'] = str_replace('&amp;sect;','',$data['info']);
1306
-			$typec = substr($data['ident'],-3);
1304
+			$data['info'] = str_replace('^&sect;', '<br />', $data['info']);
1305
+			$data['info'] = str_replace('&amp;sect;', '', $data['info']);
1306
+			$typec = substr($data['ident'], -3);
1307 1307
 			$data['type'] = '';
1308 1308
 			if ($typec === 'APP') $data['type'] = 'Approach';
1309 1309
 			elseif ($typec === 'TWR') $data['type'] = 'Tower';
@@ -1314,7 +1314,7 @@  discard block
 block discarded – undo
1314 1314
 			elseif ($typec === 'FSS') $data['type'] = 'Flight Service Station';
1315 1315
 			elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
1316 1316
 			else $data['type'] = 'Observer';
1317
-			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
1317
+			if (isset($ATC)) echo $ATC->add($data['ident'], '', $data['latitude'], $data['longitude'], '0', $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source']);
1318 1318
 		    }
1319 1319
 		    unset($data);
1320 1320
 		}
@@ -1331,14 +1331,14 @@  discard block
 block discarded – undo
1331 1331
 	    //$buffer = $Common->getData($hosts[$id]);
1332 1332
 	    if ($globalDebug) echo 'Get Data...'."\n";
1333 1333
 	    $buffer = $Common->getData($value['host']);
1334
-	    $all_data = json_decode($buffer,true);
1334
+	    $all_data = json_decode($buffer, true);
1335 1335
 	    if ($buffer != '' && is_array($all_data)) {
1336 1336
 		$reset = 0;
1337 1337
 		foreach ($all_data as $line) {
1338 1338
 	    	    $data = array();
1339 1339
 	    	    //$data['id'] = $line['id']; // id not usable
1340 1340
 	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1341
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1341
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex
1342 1342
 	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1343 1343
 	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1344 1344
 	    	    $data['ident'] = $line['flightnum']; // ident
@@ -1353,7 +1353,7 @@  discard block
 block discarded – undo
1353 1353
 	    	    //$data['datetime'] = $line['lastupdate'];
1354 1354
 	    	    //$data['last_update'] = $line['lastupdate'];
1355 1355
 	    	    if (isset($value['timezone'])) {
1356
-	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1356
+	    		$datetime = new DateTime($line['lastupdate'], new DateTimeZone($value['timezone']));
1357 1357
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1358 1358
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1359 1359
 	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
@@ -1369,14 +1369,14 @@  discard block
 block discarded – undo
1369 1369
 		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1370 1370
 		    if (isset($line['aircraftname'])) {
1371 1371
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
1372
-			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
1373
-	    		$aircraft_data = explode('-',$line['aircraftname']);
1372
+			$line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']);
1373
+	    		$aircraft_data = explode('-', $line['aircraftname']);
1374 1374
 	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1375 1375
 	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1376 1376
 	    		else {
1377
-	    		    $aircraft_data = explode(' ',$line['aircraftname']);
1378
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1379
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1377
+	    		    $aircraft_data = explode(' ', $line['aircraftname']);
1378
+	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]);
1379
+	    		    else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']);
1380 1380
 	    		}
1381 1381
 	    	    }
1382 1382
     		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
@@ -1401,7 +1401,7 @@  discard block
 block discarded – undo
1401 1401
 	    //$buffer = $Common->getData($hosts[$id]);
1402 1402
 	    if ($globalDebug) echo 'Get Data...'."\n";
1403 1403
 	    $buffer = $Common->getData($value['host']);
1404
-	    $all_data = json_decode($buffer,true);
1404
+	    $all_data = json_decode($buffer, true);
1405 1405
 	    if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
1406 1406
 		$reset = 0;
1407 1407
 		foreach ($all_data['ACARSData'] as $line) {
@@ -1412,7 +1412,7 @@  discard block
 block discarded – undo
1412 1412
 	    	    //$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1413 1413
 	    	    if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
1414 1414
 	    	    if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
1415
-	    	    $data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
1415
+	    	    $data['ident'] = str_replace(' ', '', $line['bid']['flightnum']); // ident
1416 1416
 	    	    if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
1417 1417
 	    	    $data['altitude'] = $line['altitude']; // altitude
1418 1418
 	    	    $data['speed'] = $line['groundspeed']; // speed
@@ -1423,7 +1423,7 @@  discard block
 block discarded – undo
1423 1423
 	    	    //$data['squawk'] = ''; // squawk
1424 1424
 	    	    //$data['emergency'] = ''; // emergency
1425 1425
 	    	    if (isset($value['timezone'])) {
1426
-	    		$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
1426
+	    		$datetime = new DateTime($line['updated_at'], new DateTimeZone($value['timezone']));
1427 1427
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1428 1428
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1429 1429
 	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
@@ -1459,14 +1459,14 @@  discard block
 block discarded – undo
1459 1459
 	    //$buffer = $Common->getData($hosts[$id]);
1460 1460
 	    if ($globalDebug) echo 'Get Data...'."\n";
1461 1461
 	    $buffer = $Common->getData($value['host']);
1462
-	    $all_data = json_decode($buffer,true);
1462
+	    $all_data = json_decode($buffer, true);
1463 1463
 	    if ($buffer != '' && is_array($all_data)) {
1464 1464
 		$reset = 0;
1465 1465
 		foreach ($all_data as $line) {
1466 1466
 	    	    $data = array();
1467 1467
 	    	    //$data['id'] = $line['id']; // id not usable
1468 1468
 	    	    $data['id'] = trim($line['flight_id']);
1469
-	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex
1469
+	    	    $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex
1470 1470
 	    	    $data['pilot_name'] = $line['pilot_name'];
1471 1471
 	    	    $data['pilot_id'] = $line['pilot_id'];
1472 1472
 	    	    $data['ident'] = trim($line['callsign']); // ident
@@ -1510,24 +1510,24 @@  discard block
 block discarded – undo
1510 1510
 	    //$buffer = $Common->getData($hosts[$id]);
1511 1511
 	    if ($globalDebug) echo 'Get Data...'."\n";
1512 1512
 	    $buffer = $Common->getData($value['host']);
1513
-	    $all_data = json_decode($buffer,true);
1513
+	    $all_data = json_decode($buffer, true);
1514 1514
 	    if ($buffer != '') {
1515 1515
 		$Source->deleteLocationBySource('blitzortung');
1516
-		$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
1517
-		$buffer = explode('\n',$buffer);
1516
+		$buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer));
1517
+		$buffer = explode('\n', $buffer);
1518 1518
 		foreach ($buffer as $buffer_line) {
1519
-		    $line = json_decode($buffer_line,true);
1519
+		    $line = json_decode($buffer_line, true);
1520 1520
 		    if (isset($line['time'])) {
1521 1521
 			$data = array();
1522 1522
 			$data['altitude'] = $line['alt']; // altitude
1523 1523
 			$data['latitude'] = $line['lat']; // lat
1524 1524
 			$data['longitude'] = $line['lon']; // long
1525
-			$data['datetime'] = date('Y-m-d H:i:s',substr($line['time'],0,10));
1525
+			$data['datetime'] = date('Y-m-d H:i:s', substr($line['time'], 0, 10));
1526 1526
 			$data['id_source'] = $id_source;
1527 1527
 			$data['format_source'] = 'blitzortung';
1528 1528
 			$SI->add($data);
1529 1529
 			if ($globalDebug) echo '☈ Lightning added'."\n";
1530
-			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
1530
+			$Source->addLocation('', $data['latitude'], $data['longitude'], 0, '', '', 'blitzortung', 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime']);
1531 1531
 			unset($data);
1532 1532
 		    }
1533 1533
 		}
@@ -1550,11 +1550,11 @@  discard block
 block discarded – undo
1550 1550
 		    //$value = $formats[$nb];
1551 1551
 		    $format = $globalSources[$nb]['format'];
1552 1552
 		    if ($format === 'sbs' || $format === 'aprs' || $format === 'famaprs' || $format === 'raw' || $format === 'tsv' || $format === 'acarssbs3') {
1553
-			$buffer = @socket_read($r, 6000,PHP_NORMAL_READ);
1553
+			$buffer = @socket_read($r, 6000, PHP_NORMAL_READ);
1554 1554
 		    } elseif ($format === 'vrstcp') {
1555 1555
 			$buffer = @socket_read($r, 6000);
1556 1556
 		    } else {
1557
-			$az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port);
1557
+			$az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port);
1558 1558
 		    }
1559 1559
 		    //$buffer = socket_read($r, 60000,PHP_NORMAL_READ);
1560 1560
 		    //echo $buffer."\n";
@@ -1564,8 +1564,8 @@  discard block
 block discarded – undo
1564 1564
 		    //$SI::del();
1565 1565
 		    if ($buffer !== FALSE) {
1566 1566
 			if ($format === 'vrstcp') {
1567
-			    $buffer = explode('},{',$buffer);
1568
-			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
1567
+			    $buffer = explode('},{', $buffer);
1568
+			} else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer));
1569 1569
 		    }
1570 1570
 		    // SBS format is CSV format
1571 1571
 		    if ($buffer !== FALSE && $buffer !== '') {
@@ -1589,7 +1589,7 @@  discard block
 block discarded – undo
1589 1589
 			    $ais_data = $AIS->parse_line(trim($buffer));
1590 1590
 			    $data = array();
1591 1591
 			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1592
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
1592
+			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'], -9);
1593 1593
 			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1594 1594
 			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1595 1595
 			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
@@ -1600,13 +1600,13 @@  discard block
 block discarded – undo
1600 1600
 			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1601 1601
 			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1602 1602
 			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1603
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1603
+			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']);
1604 1604
 			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1605 1605
 			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1606 1606
 			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1607 1607
 
1608 1608
 			    if (isset($ais_data['timestamp'])) {
1609
-				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
1609
+				$data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']);
1610 1610
 			    } else {
1611 1611
 				$data['datetime'] = date('Y-m-d H:i:s');
1612 1612
 			    }
@@ -1617,10 +1617,10 @@  discard block
 block discarded – undo
1617 1617
                         } elseif ($format === 'flightgearsp') {
1618 1618
                     	    //echo $buffer."\n";
1619 1619
                     	    if (strlen($buffer) > 5) {
1620
-				$line = explode(',',$buffer);
1620
+				$line = explode(',', $buffer);
1621 1621
 				$data = array();
1622 1622
 				//XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p
1623
-				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6);
1623
+				$data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6);
1624 1624
 				$data['ident'] = $line[6];
1625 1625
 				$data['aircraft_name'] = $line[7];
1626 1626
 				$data['longitude'] = $line[1];
@@ -1637,16 +1637,16 @@  discard block
 block discarded – undo
1637 1637
                         } elseif ($format === 'acars') {
1638 1638
                     	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1639 1639
 			    $ACARS->add(trim($buffer));
1640
-			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1640
+			    socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port);
1641 1641
 			    $ACARS->deleteLiveAcarsData();
1642 1642
 			} elseif ($format === 'flightgearmp') {
1643
-			    if (substr($buffer,0,1) != '#') {
1643
+			    if (substr($buffer, 0, 1) != '#') {
1644 1644
 				$data = array();
1645 1645
 				//echo $buffer."\n";
1646
-				$line = explode(' ',$buffer);
1646
+				$line = explode(' ', $buffer);
1647 1647
 				if (count($line) === 11) {
1648
-				    $userserver = explode('@',$line[0]);
1649
-				    $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex
1648
+				    $userserver = explode('@', $line[0]);
1649
+				    $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex
1650 1650
 				    $data['ident'] = $userserver[0];
1651 1651
 				    $data['registration'] = $userserver[0];
1652 1652
 				    $data['latitude'] = $line[4];
@@ -1654,8 +1654,8 @@  discard block
 block discarded – undo
1654 1654
 				    $data['altitude'] = $line[6];
1655 1655
 				    $data['datetime'] = date('Y-m-d H:i:s');
1656 1656
 				    $aircraft_type = $line[10];
1657
-				    $aircraft_type = preg_split(':/:',$aircraft_type);
1658
-				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1657
+				    $aircraft_type = preg_split(':/:', $aircraft_type);
1658
+				    $data['aircraft_name'] = substr(end($aircraft_type), 0, -4);
1659 1659
 				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1660 1660
 				    if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1661 1661
 				}
@@ -1664,8 +1664,8 @@  discard block
 block discarded – undo
1664 1664
 			    echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n";
1665 1665
 			    die;
1666 1666
 			} elseif ($format === 'vrstcp') {
1667
-			    foreach($buffer as $all_data) {
1668
-				$line = json_decode('{'.$all_data.'}',true);
1667
+			    foreach ($buffer as $all_data) {
1668
+				$line = json_decode('{'.$all_data.'}', true);
1669 1669
 				$data = array();
1670 1670
 				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
1671 1671
 				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
@@ -1691,16 +1691,16 @@  discard block
 block discarded – undo
1691 1691
 				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
1692 1692
 				unset($data);
1693 1693
 			    }
1694
-			} elseif ($format === 'tsv' || substr($buffer,0,4) === 'clock') {
1694
+			} elseif ($format === 'tsv' || substr($buffer, 0, 4) === 'clock') {
1695 1695
 			    $line = explode("\t", $buffer);
1696
-			    for($k = 0; $k < count($line); $k=$k+2) {
1696
+			    for ($k = 0; $k < count($line); $k = $k + 2) {
1697 1697
 				$key = $line[$k];
1698
-			        $lined[$key] = $line[$k+1];
1698
+			        $lined[$key] = $line[$k + 1];
1699 1699
 			    }
1700 1700
     			    if (count($lined) > 3) {
1701 1701
     				$data['hex'] = $lined['hexid'];
1702 1702
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1703
-    				$data['datetime'] = date('Y-m-d H:i:s');;
1703
+    				$data['datetime'] = date('Y-m-d H:i:s'); ;
1704 1704
     				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1705 1705
     				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1706 1706
     				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
@@ -1719,23 +1719,23 @@  discard block
 block discarded – undo
1719 1719
     			    } else $error = true;
1720 1720
 			} elseif ($format === 'aprs' && $use_aprs) {
1721 1721
 			    if ($aprs_connect === 0) {
1722
-				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
1722
+				$send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0);
1723 1723
 				$aprs_connect = 1;
1724 1724
 			    }
1725 1725
 			    
1726
-			    if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) {
1726
+			    if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) {
1727 1727
 				$aprs_last_tx = time();
1728 1728
 				$data_aprs = "# Keep alive";
1729
-				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1729
+				$send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0);
1730 1730
 			    }
1731 1731
 			    
1732 1732
 			    //echo 'Connect : '.$aprs_connect.' '.$buffer."\n";
1733 1733
 			    //echo 'APRS data : '.$buffer."\n";
1734
-			    $buffer = str_replace('APRS <- ','',$buffer);
1735
-			    $buffer = str_replace('APRS -> ','',$buffer);
1734
+			    $buffer = str_replace('APRS <- ', '', $buffer);
1735
+			    $buffer = str_replace('APRS -> ', '', $buffer);
1736 1736
 			    //echo $buffer."\n";
1737 1737
 			    date_default_timezone_set('UTC');
1738
-			    if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') {
1738
+			    if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') {
1739 1739
 				$line = $APRS->parse($buffer);
1740 1740
 				//if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) {
1741 1741
 				if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) {
@@ -1750,7 +1750,7 @@  discard block
 block discarded – undo
1750 1750
 				    if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
1751 1751
 				    if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
1752 1752
 				    if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
1753
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1753
+				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']);
1754 1754
 				    else $data['datetime'] = date('Y-m-d H:i:s');
1755 1755
 				    //$data['datetime'] = date('Y-m-d H:i:s');
1756 1756
 				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
@@ -1838,29 +1838,29 @@  discard block
 block discarded – undo
1838 1838
 				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1839 1839
 					if (!isset($data['altitude'])) $data['altitude'] = 0;
1840 1840
 					$Source->deleteOldLocationByType('gs');
1841
-					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
1842
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1841
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'gs')) > 0) {
1842
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
1843 1843
 					} else {
1844
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
1844
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']);
1845 1845
 					}
1846 1846
 				    } elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
1847 1847
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1848 1848
 					if ($globalDebug) echo '# Weather Station added'."\n";
1849 1849
 					$Source->deleteOldLocationByType('wx');
1850 1850
 					$weather_data = json_encode($line);
1851
-					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
1852
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
1851
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'wx')) > 0) {
1852
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
1853 1853
 					} else {
1854
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'wx.png','wx',$id,0,$data['datetime'],$weather_data);
1854
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'wx.png', 'wx', $id, 0, $data['datetime'], $weather_data);
1855 1855
 					}
1856 1856
 				    } elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
1857 1857
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1858 1858
 					if ($globalDebug) echo '☈ Lightning added'."\n";
1859 1859
 					$Source->deleteOldLocationByType('lightning');
1860
-					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
1861
-						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
1860
+					if (count($Source->getLocationInfoByNameType($data['ident'], 'lightning')) > 0) {
1861
+						$Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
1862 1862
 					} else {
1863
-						$Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
1863
+						$Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], 0, '', '', $data['source_name'], 'weather/thunderstorm.png', 'lightning', $id, 0, $data['datetime'], $data['comment']);
1864 1864
 					}
1865 1865
 				    } elseif ($globalDebug) {
1866 1866
 				    	echo '/!\ Not added: '.$buffer."\n";
@@ -1869,7 +1869,7 @@  discard block
 block discarded – undo
1869 1869
 				    unset($data);
1870 1870
 				}
1871 1871
 				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
1872
-					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
1872
+					$Source->updateLocationDescByName($line['ident'], $line['source'], $id, $line['comment']);
1873 1873
 				}
1874 1874
 				/*
1875 1875
 				elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] === 'Car' || $line['symbol'] === 'Ambulance' || $line['symbol'] === 'Van' || $line['symbol'] === 'Truck' || $line['symbol'] === 'Truck (18 Wheeler)' || $line['symbol'] === 'Motorcycle')) {
@@ -1878,7 +1878,7 @@  discard block
 block discarded – undo
1878 1878
 				*/
1879 1879
 				//elseif ($line === false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
1880 1880
 				elseif ($line === true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
1881
-				if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
1881
+				if (isset($globalSources[$nb]['last_weather_clean']) && time() - $globalSources[$nb]['last_weather_clean'] > 60*5) {
1882 1882
 					$Source->deleteOldLocationByType('lightning');
1883 1883
 					$Source->deleteOldLocationByType('wx');
1884 1884
 					$globalSources[$nb]['last_weather_clean'] = time();
@@ -1964,7 +1964,7 @@  discard block
 block discarded – undo
1964 1964
 				connect_all($sourceee);
1965 1965
 				$sourceee = array();
1966 1966
 				//connect_all($globalSources);
1967
-				$tt[$format]=0;
1967
+				$tt[$format] = 0;
1968 1968
 				break;
1969 1969
 			    } 
1970 1970
 			    //else if ($globalDebug) echo "Trying again (".$tt[$format]."x) ".$format."...";
@@ -1974,14 +1974,14 @@  discard block
 block discarded – undo
1974 1974
 	    } else {
1975 1975
 		$error = socket_strerror(socket_last_error());
1976 1976
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1977
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1977
+			if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n";
1978 1978
 			if (isset($globalDebug)) echo "Restarting...\n";
1979 1979
 			// Restart the script if possible
1980 1980
 			if (is_array($sockets)) {
1981 1981
 			    if ($globalDebug) echo "Shutdown all sockets...";
1982 1982
 			    
1983 1983
 			    foreach ($sockets as $sock) {
1984
-				@socket_shutdown($sock,2);
1984
+				@socket_shutdown($sock, 2);
1985 1985
 				@socket_close($sock);
1986 1986
 			    }
1987 1987
 			    
Please login to merge, or discard this patch.
Braces   +1210 added lines, -406 removed lines patch added patch discarded remove patch
@@ -14,13 +14,17 @@  discard block
 block discarded – undo
14 14
 require_once(dirname(__FILE__).'/../require/class.Source.php');
15 15
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
16 16
 require_once(dirname(__FILE__).'/../require/class.Common.php');
17
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
17
+if (isset($globalTracker) && $globalTracker) {
18
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
19
+}
18 20
 if (isset($globalMarine) && $globalMarine) {
19 21
     require_once(dirname(__FILE__).'/../require/class.AIS.php');
20 22
     require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
21 23
 }
22 24
 
23
-if (!isset($globalDebug)) $globalDebug = FALSE;
25
+if (!isset($globalDebug)) {
26
+	$globalDebug = FALSE;
27
+}
24 28
 
25 29
 // Check if schema is at latest version
26 30
 $Connection = new Connection();
@@ -59,66 +63,107 @@  discard block
 block discarded – undo
59 63
 //elseif (isset($options['source'])) $hosts = array($options['source']);
60 64
 if (isset($options['s'])) {
61 65
     $globalSources = array();
62
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']);
63
-    else $globalSources[] = array('host' => $options['s']);
64
-} elseif (isset($options['source'])) {
66
+    if (isset($options['format'])) {
67
+    	$globalSources[] = array('host' => $options['s'],'format' => $options['format']);
68
+    } else {
69
+    	$globalSources[] = array('host' => $options['s']);
70
+    }
71
+    } elseif (isset($options['source'])) {
65 72
     $globalSources = array();
66
-    if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']);
67
-    else $globalSources[] = array('host' => $options['source']);
68
-}
73
+    if (isset($options['format'])) {
74
+    	$globalSources[] = array('host' => $options['source'],'format' => $options['format']);
75
+    } else {
76
+    	$globalSources[] = array('host' => $options['source']);
77
+    }
78
+    }
69 79
 if (isset($options['aprsserverhost'])) {
70 80
 	$globalServerAPRS = TRUE;
71 81
 	$globalServerAPRShost = $options['aprsserverhost'];
72 82
 }
73
-if (isset($options['aprsserverport'])) $globalServerAPRSport = $options['aprsserverport'];
74
-if (isset($options['aprsserverssid'])) $globalServerAPRSssid = $options['aprsserverssid'];
75
-if (isset($options['aprsserverpass'])) $globalServerAPRSpass = $options['aprsserverpass'];
76
-if (isset($options['noaprsserver'])) $globalServerAPRS = FALSE; 
83
+if (isset($options['aprsserverport'])) {
84
+	$globalServerAPRSport = $options['aprsserverport'];
85
+}
86
+if (isset($options['aprsserverssid'])) {
87
+	$globalServerAPRSssid = $options['aprsserverssid'];
88
+}
89
+if (isset($options['aprsserverpass'])) {
90
+	$globalServerAPRSpass = $options['aprsserverpass'];
91
+}
92
+if (isset($options['noaprsserver'])) {
93
+	$globalServerAPRS = FALSE;
94
+}
77 95
 if (isset($options['enable-aircraft'])) {
78
-	if ($globalDebug) echo 'Enable Aircraft mode'."\n";
96
+	if ($globalDebug) {
97
+		echo 'Enable Aircraft mode'."\n";
98
+	}
79 99
 	$globalAircraft = TRUE; 
80 100
 }
81 101
 if (isset($options['disable-aircraft'])) {
82
-	if ($globalDebug) echo 'Disable Aircraft mode'."\n";
102
+	if ($globalDebug) {
103
+		echo 'Disable Aircraft mode'."\n";
104
+	}
83 105
 	$globalAircraft = FALSE;
84 106
 }
85 107
 if (isset($options['enable-tracker'])) {
86
-	if ($globalDebug) echo 'Enable Tracker mode'."\n";
108
+	if ($globalDebug) {
109
+		echo 'Enable Tracker mode'."\n";
110
+	}
87 111
 	$globalTracker = TRUE; 
88 112
 }
89 113
 if (isset($options['disable-tracker'])) {
90
-	if ($globalDebug) echo 'Disable Tracker mode'."\n";
114
+	if ($globalDebug) {
115
+		echo 'Disable Tracker mode'."\n";
116
+	}
91 117
 	$globalTracker = FALSE;
92 118
 }
93 119
 if (isset($options['enable-marine'])) {
94
-	if ($globalDebug) echo 'Enable Marine mode'."\n";
120
+	if ($globalDebug) {
121
+		echo 'Enable Marine mode'."\n";
122
+	}
95 123
 	$globalMarine = TRUE;
96 124
 }
97 125
 if (isset($options['disable-marine'])) {
98
-	if ($globalDebug) echo 'Disable Marine mode'."\n";
126
+	if ($globalDebug) {
127
+		echo 'Disable Marine mode'."\n";
128
+	}
99 129
 	$globalMarine = FALSE;
100 130
 }
101
-if (isset($options['nodaemon'])) $globalDaemon = FALSE;
102
-if (isset($options['server'])) $globalServer = TRUE;
103
-if (isset($options['idsource'])) $id_source = $options['idsource'];
104
-else $id_source = 1;
131
+if (isset($options['nodaemon'])) {
132
+	$globalDaemon = FALSE;
133
+}
134
+if (isset($options['server'])) {
135
+	$globalServer = TRUE;
136
+}
137
+if (isset($options['idsource'])) {
138
+	$id_source = $options['idsource'];
139
+} else {
140
+	$id_source = 1;
141
+}
105 142
 if (isset($globalServer) && $globalServer) {
106
-    if ($globalDebug) echo "Using Server Mode\n";
143
+    if ($globalDebug) {
144
+    	echo "Using Server Mode\n";
145
+    }
107 146
     $SI=new SpotterServer();
108 147
 /*
109 148
     require_once(dirname(__FILE__).'/../require/class.APRS.php');
110 149
     $SI = new adsb2aprs();
111 150
     $SI->connect();
112 151
 */
113
-} else $SI=new SpotterImport($Connection->db);
152
+} else {
153
+	$SI=new SpotterImport($Connection->db);
154
+}
114 155
 
115
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
156
+if (isset($globalTracker) && $globalTracker) {
157
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
158
+}
116 159
 if (isset($globalMarine) && $globalMarine) {
117 160
     require_once(dirname(__FILE__).'/../require/class.AIS.php');
118 161
     require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
119 162
 }
120 163
 
121
-if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
164
+if (isset($globalTracker) && $globalTracker) {
165
+	$TI = new TrackerImport($Connection->db);
166
+}
122 167
 if (isset($globalMarine) && $globalMarine) {
123 168
     $AIS = new AIS();
124 169
     $MI = new MarineImport($Connection->db);
@@ -143,7 +188,9 @@  discard block
 block discarded – undo
143 188
 }
144 189
 
145 190
 // let's try and connect
146
-if ($globalDebug) echo "Connecting...\n";
191
+if ($globalDebug) {
192
+	echo "Connecting...\n";
193
+}
147 194
 $use_aprs = false;
148 195
 $aprs_full = false;
149 196
 $reset = 0;
@@ -152,7 +199,9 @@  discard block
 block discarded – undo
152 199
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
153 200
     global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context;
154 201
     $reset++;
155
-    if ($globalDebug) echo 'Connect to all...'."\n";
202
+    if ($globalDebug) {
203
+    	echo 'Connect to all...'."\n";
204
+    }
156 205
     foreach ($hosts as $id => $value) {
157 206
 	$host = $value['host'];
158 207
 	$globalSources[$id]['last_exec'] = 0;
@@ -162,32 +211,44 @@  discard block
 block discarded – undo
162 211
         	//$formats[$id] = 'deltadbtxt';
163 212
         	$globalSources[$id]['format'] = 'deltadbtxt';
164 213
         	//$last_exec['deltadbtxt'] = 0;
165
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
214
+        	if ($globalDebug) {
215
+        		echo "Connect to deltadb source (".$host.")...\n";
216
+        	}
166 217
             } else if (preg_match('/vatsim-data.txt$/i',$host)) {
167 218
         	//$formats[$id] = 'vatsimtxt';
168 219
         	$globalSources[$id]['format'] = 'vatsimtxt';
169 220
         	//$last_exec['vatsimtxt'] = 0;
170
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
221
+        	if ($globalDebug) {
222
+        		echo "Connect to vatsim source (".$host.")...\n";
223
+        	}
171 224
     	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
172 225
         	//$formats[$id] = 'aircraftlistjson';
173 226
         	$globalSources[$id]['format'] = 'aircraftlistjson';
174 227
         	//$last_exec['aircraftlistjson'] = 0;
175
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
228
+        	if ($globalDebug) {
229
+        		echo "Connect to aircraftlist.json source (".$host.")...\n";
230
+        	}
176 231
     	    } else if (preg_match('/aircraft.json$/i',$host)) {
177 232
         	//$formats[$id] = 'aircraftjson';
178 233
         	$globalSources[$id]['format'] = 'aircraftjson';
179 234
         	//$last_exec['aircraftlistjson'] = 0;
180
-        	if ($globalDebug) echo "Connect to aircraft.json source (".$host.")...\n";
235
+        	if ($globalDebug) {
236
+        		echo "Connect to aircraft.json source (".$host.")...\n";
237
+        	}
181 238
     	    } else if (preg_match('/aircraft$/i',$host)) {
182 239
         	//$formats[$id] = 'planefinderclient';
183 240
         	$globalSources[$id]['format'] = 'planefinderclient';
184 241
         	//$last_exec['aircraftlistjson'] = 0;
185
-        	if ($globalDebug) echo "Connect to planefinderclient source (".$host.")...\n";
242
+        	if ($globalDebug) {
243
+        		echo "Connect to planefinderclient source (".$host.")...\n";
244
+        	}
186 245
     	    } else if (preg_match('/opensky/i',$host)) {
187 246
         	//$formats[$id] = 'aircraftlistjson';
188 247
         	$globalSources[$id]['format'] = 'opensky';
189 248
         	//$last_exec['aircraftlistjson'] = 0;
190
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
249
+        	if ($globalDebug) {
250
+        		echo "Connect to opensky source (".$host.")...\n";
251
+        	}
191 252
     	    /*
192 253
     	    // Disabled for now, site change source format
193 254
     	    } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) {
@@ -204,7 +265,9 @@  discard block
 block discarded – undo
204 265
         	//$formats[$id] = 'planeupdatefaa';
205 266
         	$globalSources[$id]['format'] = 'planeupdatefaa';
206 267
         	//$last_exec['planeupdatefaa'] = 0;
207
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
268
+        	if ($globalDebug) {
269
+        		echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
270
+        	}
208 271
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
209 272
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
210 273
         	    exit(0);
@@ -213,37 +276,53 @@  discard block
 block discarded – undo
213 276
         	//$formats[$id] = 'phpvmacars';
214 277
         	$globalSources[$id]['format'] = 'phpvmacars';
215 278
         	//$last_exec['phpvmacars'] = 0;
216
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
279
+        	if ($globalDebug) {
280
+        		echo "Connect to phpvmacars source (".$host.")...\n";
281
+        	}
217 282
             } else if (preg_match('/\/api\/v1\/acars\/data$/i',$host)) {
218 283
         	//$formats[$id] = 'phpvmacars';
219 284
         	$globalSources[$id]['format'] = 'vaos';
220 285
         	//$last_exec['phpvmacars'] = 0;
221
-        	if ($globalDebug) echo "Connect to vaos source (".$host.")...\n";
286
+        	if ($globalDebug) {
287
+        		echo "Connect to vaos source (".$host.")...\n";
288
+        	}
222 289
             } else if (preg_match('/VAM-json.php$/i',$host)) {
223 290
         	//$formats[$id] = 'phpvmacars';
224 291
         	$globalSources[$id]['format'] = 'vam';
225
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
292
+        	if ($globalDebug) {
293
+        		echo "Connect to Vam source (".$host.")...\n";
294
+        	}
226 295
             } else if (preg_match('/whazzup/i',$host)) {
227 296
         	//$formats[$id] = 'whazzup';
228 297
         	$globalSources[$id]['format'] = 'whazzup';
229 298
         	//$last_exec['whazzup'] = 0;
230
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
299
+        	if ($globalDebug) {
300
+        		echo "Connect to whazzup source (".$host.")...\n";
301
+        	}
231 302
             } else if (preg_match('/blitzortung/i',$host)) {
232 303
         	$globalSources[$id]['format'] = 'blitzortung';
233
-        	if ($globalDebug) echo "Connect to blitzortung source (".$host.")...\n";
304
+        	if ($globalDebug) {
305
+        		echo "Connect to blitzortung source (".$host.")...\n";
306
+        	}
234 307
             } else if (preg_match('/airwhere/i',$host)) {
235 308
         	$globalSources[$id]['format'] = 'airwhere';
236
-        	if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n";
309
+        	if ($globalDebug) {
310
+        		echo "Connect to airwhere source (".$host.")...\n";
311
+        	}
237 312
             } else if (preg_match('/recentpireps/i',$host)) {
238 313
         	//$formats[$id] = 'pirepsjson';
239 314
         	$globalSources[$id]['format'] = 'pirepsjson';
240 315
         	//$last_exec['pirepsjson'] = 0;
241
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
316
+        	if ($globalDebug) {
317
+        		echo "Connect to pirepsjson source (".$host.")...\n";
318
+        	}
242 319
             } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
243 320
         	//$formats[$id] = 'fr24json';
244 321
         	$globalSources[$id]['format'] = 'fr24json';
245 322
         	//$last_exec['fr24json'] = 0;
246
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
323
+        	if ($globalDebug) {
324
+        		echo "Connect to fr24 source (".$host.")...\n";
325
+        	}
247 326
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
248 327
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
249 328
         	    exit(0);
@@ -252,7 +331,9 @@  discard block
 block discarded – undo
252 331
         	//$formats[$id] = 'fr24json';
253 332
         	$globalSources[$id]['format'] = 'myshiptracking';
254 333
         	//$last_exec['fr24json'] = 0;
255
-        	if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n";
334
+        	if ($globalDebug) {
335
+        		echo "Connect to myshiptracking source (".$host.")...\n";
336
+        	}
256 337
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
257 338
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
258 339
         	    exit(0);
@@ -261,17 +342,26 @@  discard block
 block discarded – undo
261 342
             } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
262 343
         	//$formats[$id] = 'tsv';
263 344
         	$globalSources[$id]['format'] = 'tsv';
264
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
345
+        	if ($globalDebug) {
346
+        		echo "Connect to tsv source (".$host.")...\n";
347
+        	}
265 348
             }
266 349
         } elseif (filter_var($host,FILTER_VALIDATE_URL) || (isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway')) {
267 350
     		if ($globalSources[$id]['format'] == 'aisnmeahttp') {
268 351
     		    $idf = fopen($globalSources[$id]['host'],'r',false,$context);
269 352
     		    if ($idf !== false) {
270 353
     			$httpfeeds[$id] = $idf;
271
-        		if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
272
-    		    } elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n";
273
-    		} elseif ($globalDebug && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\n";
274
-    		elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
354
+        		if ($globalDebug) {
355
+        			echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n";
356
+        		}
357
+    		    } elseif ($globalDebug) {
358
+    		    	echo "Can't connect to ".$globalSources[$id]['host']."\n";
359
+    		    }
360
+    		} elseif ($globalDebug && isset($globalSources[$id]['format']) && $globalSources[$id]['format'] == 'sailaway') {
361
+    			echo "Connect to ".$globalSources[$id]['format']." source (sailaway)...\n";
362
+    		} elseif ($globalDebug) {
363
+    			echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
364
+    		}
275 365
         } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
276 366
 	    $hostport = explode(':',$host);
277 367
 	    if (isset($hostport[1])) {
@@ -311,19 +401,27 @@  discard block
 block discarded – undo
311 401
         		//$formats[$id] = 'beast';
312 402
         		$globalSources[$id]['format'] = 'beast';
313 403
 		    //} else $formats[$id] = 'sbs';
314
-		    } else $globalSources[$id]['format'] = 'sbs';
404
+		    } else {
405
+		    	$globalSources[$id]['format'] = 'sbs';
406
+		    }
315 407
 		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
316 408
 		}
317
-		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
409
+		if ($globalDebug) {
410
+			echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
411
+		}
318 412
             } else {
319
-		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
413
+		if ($globalDebug) {
414
+			echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
415
+		}
320 416
 		sleep(10);
321 417
 		connect_all($hosts);
322 418
     	    }
323 419
         }
324 420
     }
325 421
 }
326
-if (!isset($globalMinFetch)) $globalMinFetch = 15;
422
+if (!isset($globalMinFetch)) {
423
+	$globalMinFetch = 15;
424
+}
327 425
 
328 426
 // Initialize all
329 427
 $status = array();
@@ -332,13 +430,19 @@  discard block
 block discarded – undo
332 430
 $formats = array();
333 431
 $last_exec = array();
334 432
 $time = time();
335
-if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut;
336
-else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
337
-else $timeout = 20;
433
+if (isset($globalSourcesTimeout)) {
434
+	$timeout = $globalSourcesTimeOut;
435
+} else if (isset($globalSBS1TimeOut)) {
436
+	$timeout = $globalSBS1TimeOut;
437
+} else {
438
+	$timeout = 20;
439
+}
338 440
 $errno = '';
339 441
 $errstr='';
340 442
 
341
-if (!isset($globalDaemon)) $globalDaemon = TRUE;
443
+if (!isset($globalDaemon)) {
444
+	$globalDaemon = TRUE;
445
+}
342 446
 /* Initiate connections to all the hosts simultaneously */
343 447
 //connect_all($hosts);
344 448
 //connect_all($globalSources);
@@ -367,7 +471,9 @@  discard block
 block discarded – undo
367 471
     if (isset($source['format']) && $source['format'] == 'aprs') {
368 472
 	$aprs_connect = 0;
369 473
 	$use_aprs = true;
370
-	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
474
+	if (isset($source['port']) && $source['port'] == '10152') {
475
+		$aprs_full = true;
476
+	}
371 477
 	break;
372 478
     }
373 479
 }
@@ -378,25 +484,46 @@  discard block
 block discarded – undo
378 484
 	$aprs_connect = 0;
379 485
 	$aprs_keep = 120;
380 486
 	$aprs_last_tx = time();
381
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
382
-	else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
383
-	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
384
-	else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
385
-	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
386
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
387
-	if ($aprs_full) $aprs_filter = '';
388
-	if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass;
389
-	else $aprs_pass = '-1';
487
+	if (isset($globalAPRSversion)) {
488
+		$aprs_version = $globalAPRSversion;
489
+	} else {
490
+		$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
491
+	}
492
+	if (isset($globalAPRSssid)) {
493
+		$aprs_ssid = $globalAPRSssid;
494
+	} else {
495
+		$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
496
+	}
497
+	if (isset($globalAPRSfilter)) {
498
+		$aprs_filter = $globalAPRSfilter;
499
+	} else {
500
+		$aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
501
+	}
502
+	if ($aprs_full) {
503
+		$aprs_filter = '';
504
+	}
505
+	if (isset($globalAPRSpass)) {
506
+		$aprs_pass = $globalAPRSpass;
507
+	} else {
508
+		$aprs_pass = '-1';
509
+	}
390 510
 
391
-	if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
392
-	else $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
393
-}
511
+	if ($aprs_filter != '') {
512
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n";
513
+	} else {
514
+		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
515
+	}
516
+	}
394 517
 
395 518
 // connected - lets do some work
396 519
 //if ($globalDebug) echo "Connected!\n";
397 520
 sleep(1);
398
-if ($globalDebug) echo "SCAN MODE \n\n";
399
-if (!isset($globalCronEnd)) $globalCronEnd = 60;
521
+if ($globalDebug) {
522
+	echo "SCAN MODE \n\n";
523
+}
524
+if (!isset($globalCronEnd)) {
525
+	$globalCronEnd = 60;
526
+}
400 527
 $endtime = time()+$globalCronEnd;
401 528
 $i = 1;
402 529
 $tt = array();
@@ -410,22 +537,32 @@  discard block
 block discarded – undo
410 537
 
411 538
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
412 539
 while ($i > 0) {
413
-    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
540
+    if (function_exists('pcntl_fork')) {
541
+    	pcntl_signal_dispatch();
542
+    }
414 543
 
415
-    if (!$globalDaemon) $i = $endtime-time();
544
+    if (!$globalDaemon) {
545
+    	$i = $endtime-time();
546
+    }
416 547
     // Delete old ATC
417 548
     if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
418
-	if ($globalDebug) echo 'Delete old ATC...'."\n";
549
+	if ($globalDebug) {
550
+		echo 'Delete old ATC...'."\n";
551
+	}
419 552
         $ATC->deleteOldATC();
420 553
     }
421 554
     
422 555
     if (count($last_exec) == count($globalSources)) {
423 556
 	$max = $globalMinFetch;
424 557
 	foreach ($last_exec as $last) {
425
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
558
+	    if ((time() - $last['last']) < $max) {
559
+	    	$max = time() - $last['last'];
560
+	    }
426 561
 	}
427 562
 	if ($max < $globalMinFetch) {
428
-	    if ($globalDebug) echo 'Sleeping...'."\n";
563
+	    if ($globalDebug) {
564
+	    	echo 'Sleeping...'."\n";
565
+	    }
429 566
 	    sleep($globalMinFetch-$max+2);
430 567
 	}
431 568
     }
@@ -435,7 +572,9 @@  discard block
 block discarded – undo
435 572
     foreach ($globalSources as $id => $value) {
436 573
 	date_default_timezone_set('UTC');
437 574
 	//if ($globalDebug) echo 'Source host : '.$value['host'].' - Source format: '.$value['format']."\n";
438
-	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
575
+	if (!isset($last_exec[$id]['last'])) {
576
+		$last_exec[$id]['last'] = 0;
577
+	}
439 578
 	if ($value['format'] === 'deltadbtxt' && 
440 579
 	    (
441 580
 		(isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalSources[$id]['minfetch'])) || 
@@ -444,7 +583,9 @@  discard block
 block discarded – undo
444 583
 	) {
445 584
 	    //$buffer = $Common->getData($hosts[$id]);
446 585
 	    $buffer = $Common->getData($value['host']);
447
-	    if ($buffer != '') $reset = 0;
586
+	    if ($buffer != '') {
587
+	    	$reset = 0;
588
+	    }
448 589
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
449 590
 	    $buffer = explode('\n',$buffer);
450 591
 	    foreach ($buffer as $line) {
@@ -453,20 +594,41 @@  discard block
 block discarded – undo
453 594
 	            $data = array();
454 595
 	            $data['hex'] = $line[1]; // hex
455 596
 	            $data['ident'] = $line[2]; // ident
456
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
457
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
458
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
459
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
460
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
597
+	            if (isset($line[3])) {
598
+	            	$data['altitude'] = $line[3];
599
+	            }
600
+	            // altitude
601
+	            if (isset($line[4])) {
602
+	            	$data['speed'] = $line[4];
603
+	            }
604
+	            // speed
605
+	            if (isset($line[5])) {
606
+	            	$data['heading'] = $line[5];
607
+	            }
608
+	            // heading
609
+	            if (isset($line[6])) {
610
+	            	$data['latitude'] = $line[6];
611
+	            }
612
+	            // lat
613
+	            if (isset($line[7])) {
614
+	            	$data['longitude'] = $line[7];
615
+	            }
616
+	            // long
461 617
 	            $data['verticalrate'] = ''; // vertical rate
462 618
 	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
463 619
 	            $data['emergency'] = ''; // emergency
464 620
 		    $data['datetime'] = date('Y-m-d H:i:s');
465 621
 		    $data['format_source'] = 'deltadbtxt';
466 622
     		    $data['id_source'] = $id_source;
467
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
468
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
469
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
623
+		    if (isset($value['name']) && $value['name'] != '') {
624
+		    	$data['source_name'] = $value['name'];
625
+		    }
626
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
627
+		    	$data['noarchive'] = true;
628
+		    }
629
+		    if (isset($value['sourcestats'])) {
630
+		    	$data['sourcestats'] = $value['sourcestats'];
631
+		    }
470 632
     		    $SI->add($data);
471 633
 		    unset($data);
472 634
     		}
@@ -481,7 +643,9 @@  discard block
 block discarded – undo
481 643
 	    date_default_timezone_set('CET');
482 644
 	    $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host']));
483 645
 	    date_default_timezone_set('UTC');
484
-	    if ($buffer != '') $reset = 0;
646
+	    if ($buffer != '') {
647
+	    	$reset = 0;
648
+	    }
485 649
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
486 650
 	    $buffer = explode('\n',$buffer);
487 651
 	    foreach ($buffer as $line) {
@@ -490,18 +654,42 @@  discard block
 block discarded – undo
490 654
 		    $add = false;
491 655
 		    $ais_data = $AIS->parse_line(trim($line));
492 656
 		    $data = array();
493
-		    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
494
-		    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
495
-		    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
496
-		    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
497
-		    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
498
-		    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
499
-		    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
500
-		    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
501
-		    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
502
-		    if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
503
-		    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
504
-		    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
657
+		    if (isset($ais_data['ident'])) {
658
+		    	$data['ident'] = $ais_data['ident'];
659
+		    }
660
+		    if (isset($ais_data['mmsi'])) {
661
+		    	$data['mmsi'] = substr($ais_data['mmsi'],-9);
662
+		    }
663
+		    if (isset($ais_data['speed'])) {
664
+		    	$data['speed'] = $ais_data['speed'];
665
+		    }
666
+		    if (isset($ais_data['heading'])) {
667
+		    	$data['heading'] = $ais_data['heading'];
668
+		    }
669
+		    if (isset($ais_data['latitude'])) {
670
+		    	$data['latitude'] = $ais_data['latitude'];
671
+		    }
672
+		    if (isset($ais_data['longitude'])) {
673
+		    	$data['longitude'] = $ais_data['longitude'];
674
+		    }
675
+		    if (isset($ais_data['status'])) {
676
+		    	$data['status'] = $ais_data['status'];
677
+		    }
678
+		    if (isset($ais_data['statusid'])) {
679
+		    	$data['status_id'] = $ais_data['statusid'];
680
+		    }
681
+		    if (isset($ais_data['type'])) {
682
+		    	$data['type'] = $ais_data['type'];
683
+		    }
684
+		    if (isset($ais_data['typeid'])) {
685
+		    	$data['type_id'] = $ais_data['typeid'];
686
+		    }
687
+		    if (isset($ais_data['imo'])) {
688
+		    	$data['imo'] = $ais_data['imo'];
689
+		    }
690
+		    if (isset($ais_data['callsign'])) {
691
+		    	$data['callsign'] = $ais_data['callsign'];
692
+		    }
505 693
 		    if (isset($ais_data['timestamp'])) {
506 694
 			$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
507 695
 			if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) {
@@ -515,8 +703,12 @@  discard block
 block discarded – undo
515 703
 		    $data['format_source'] = 'aisnmeatxt';
516 704
     		    $data['id_source'] = $id_source;
517 705
 		    //print_r($data);
518
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
519
-		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
706
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
707
+		    	$data['noarchive'] = true;
708
+		    }
709
+		    if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') {
710
+		    	$MI->add($data);
711
+		    }
520 712
 		    unset($data);
521 713
 		}
522 714
     	    }
@@ -539,20 +731,48 @@  discard block
 block discarded – undo
539 731
 			    if ($line != '') {
540 732
 				$ais_data = $AIS->parse_line(trim($line));
541 733
 				$data = array();
542
-				if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
543
-				if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
544
-				if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
545
-				if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
546
-				if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
547
-				if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
548
-				if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
549
-				if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
550
-				if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
551
-				if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid'];
552
-				if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
553
-				if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
554
-				if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
555
-				if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
734
+				if (isset($ais_data['ident'])) {
735
+					$data['ident'] = $ais_data['ident'];
736
+				}
737
+				if (isset($ais_data['mmsi'])) {
738
+					$data['mmsi'] = substr($ais_data['mmsi'],-9);
739
+				}
740
+				if (isset($ais_data['speed'])) {
741
+					$data['speed'] = $ais_data['speed'];
742
+				}
743
+				if (isset($ais_data['heading'])) {
744
+					$data['heading'] = $ais_data['heading'];
745
+				}
746
+				if (isset($ais_data['latitude'])) {
747
+					$data['latitude'] = $ais_data['latitude'];
748
+				}
749
+				if (isset($ais_data['longitude'])) {
750
+					$data['longitude'] = $ais_data['longitude'];
751
+				}
752
+				if (isset($ais_data['status'])) {
753
+					$data['status'] = $ais_data['status'];
754
+				}
755
+				if (isset($ais_data['statusid'])) {
756
+					$data['status_id'] = $ais_data['statusid'];
757
+				}
758
+				if (isset($ais_data['type'])) {
759
+					$data['type'] = $ais_data['type'];
760
+				}
761
+				if (isset($ais_data['typeid'])) {
762
+					$data['type_id'] = $ais_data['typeid'];
763
+				}
764
+				if (isset($ais_data['imo'])) {
765
+					$data['imo'] = $ais_data['imo'];
766
+				}
767
+				if (isset($ais_data['callsign'])) {
768
+					$data['callsign'] = $ais_data['callsign'];
769
+				}
770
+				if (isset($ais_data['destination'])) {
771
+					$data['arrival_code'] = $ais_data['destination'];
772
+				}
773
+				if (isset($ais_data['eta_ts'])) {
774
+					$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
775
+				}
556 776
 				if (isset($ais_data['timestamp'])) {
557 777
 				    $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
558 778
 				} else {
@@ -560,18 +780,27 @@  discard block
 block discarded – undo
560 780
 				}
561 781
 				$data['format_source'] = 'aisnmeahttp';
562 782
 				$data['id_source'] = $id_source;
563
-				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
564
-				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
783
+				if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
784
+					$data['noarchive'] = true;
785
+				}
786
+				if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') {
787
+					$MI->add($data);
788
+				}
565 789
 				unset($data);
566 790
 			    }
567 791
 			}
568 792
 		    }
569 793
 		} else {
570 794
 		    $format = $value['format'];
571
-		    if (isset($tt[$format])) $tt[$format]++;
572
-		    else $tt[$format] = 0;
795
+		    if (isset($tt[$format])) {
796
+		    	$tt[$format]++;
797
+		    } else {
798
+		    	$tt[$format] = 0;
799
+		    }
573 800
 		    if ($tt[$format] > 30) {
574
-			if ($globalDebug) echo 'Reconnect...'."\n";
801
+			if ($globalDebug) {
802
+				echo 'Reconnect...'."\n";
803
+			}
575 804
 			sleep(2);
576 805
 			//$sourceeen[] = $value;
577 806
 			//connect_all($sourceeen);
@@ -607,12 +836,18 @@  discard block
 block discarded – undo
607 836
 			    //    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
608 837
 			    //$data['type_id'] = $line['TYPE'];
609 838
 			    $data['imo'] = $line['IMO'];
610
-			    if ($line['DEST'] != '') $data['arrival_code'] = $line['DEST'];
611
-			    if ($line['ARV'] != '') $data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
839
+			    if ($line['DEST'] != '') {
840
+			    	$data['arrival_code'] = $line['DEST'];
841
+			    }
842
+			    if ($line['ARV'] != '') {
843
+			    	$data['arrival_time'] = date('Y-m-d H:i:s',strtotime($line['ARV']));
844
+			    }
612 845
 			    $data['datetime'] = date('Y-m-d H:i:s',$line['T']);
613 846
 			    $data['format_source'] = 'myshiptracking';
614 847
 			    $data['id_source'] = $id_source;
615
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
848
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
849
+			    	$data['noarchive'] = true;
850
+			    }
616 851
 			    $MI->add($data);
617 852
 			    unset($data);
618 853
 			}
@@ -637,7 +872,9 @@  discard block
 block discarded – undo
637 872
 			    $data['callsign'] = $line['callsign'];
638 873
 			    $data['mmsi'] = substr($line['mmsi'],-9);
639 874
 			    $data['speed'] = $line['sog'];
640
-			    if ($line['heading'] != '511') $data['heading'] = $line['heading'];
875
+			    if ($line['heading'] != '511') {
876
+			    	$data['heading'] = $line['heading'];
877
+			    }
641 878
 			    $data['latitude'] = $line['latitude'];
642 879
 			    $data['longitude'] = $line['longitude'];
643 880
 			    $data['type_id'] = $line['shiptype'];
@@ -645,7 +882,9 @@  discard block
 block discarded – undo
645 882
 			    $data['datetime'] = $line['time'];
646 883
 			    $data['format_source'] = 'boatbeaconapp';
647 884
 			    $data['id_source'] = $id_source;
648
-			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
885
+			    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
886
+			    	$data['noarchive'] = true;
887
+			    }
649 888
 			    $MI->add($data);
650 889
 			    unset($data);
651 890
 			}
@@ -667,22 +906,44 @@  discard block
 block discarded – undo
667 906
 		    foreach ($all_data['features'] as $line) {
668 907
 			print_r($line);
669 908
 			$data = array();
670
-			if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name'];
671
-			if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign'];
672
-			if (isset($line['properties']['mmsi'])) $data['mmsi'] = substr($line['properties']['mmsi'],-9);
673
-			if (isset($line['properties']['imo'])) $data['imo'] = $line['properties']['imo'];
674
-			if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed'];
675
-			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) $data['heading'] = $line['properties']['heading'];
909
+			if (isset($line['properties']['name'])) {
910
+				$data['ident'] = $line['properties']['name'];
911
+			}
912
+			if (isset($line['properties']['callsign'])) {
913
+				$data['callsign'] = $line['properties']['callsign'];
914
+			}
915
+			if (isset($line['properties']['mmsi'])) {
916
+				$data['mmsi'] = substr($line['properties']['mmsi'],-9);
917
+			}
918
+			if (isset($line['properties']['imo'])) {
919
+				$data['imo'] = $line['properties']['imo'];
920
+			}
921
+			if (isset($line['properties']['speed'])) {
922
+				$data['speed'] = $line['properties']['speed'];
923
+			}
924
+			if (isset($line['properties']['heading']) && $line['properties']['heading'] != 0) {
925
+				$data['heading'] = $line['properties']['heading'];
926
+			}
676 927
 			$data['latitude'] = $line['geometry']['coordinates'][1];
677 928
 			$data['longitude'] = $line['geometry']['coordinates'][0];
678
-			if (isset($line['properties']['vesselType'])) $data['type'] = $line['properties']['vesselType'];
679
-			if (isset($line['properties']['destination'])) $data['arrival_code'] = $line['properties']['destination'];
680
-			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') $data['arrival_date'] = $line['properties']['eta'];
929
+			if (isset($line['properties']['vesselType'])) {
930
+				$data['type'] = $line['properties']['vesselType'];
931
+			}
932
+			if (isset($line['properties']['destination'])) {
933
+				$data['arrival_code'] = $line['properties']['destination'];
934
+			}
935
+			if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') {
936
+				$data['arrival_date'] = $line['properties']['eta'];
937
+			}
681 938
 			$data['format_source'] = 'boatnerd';
682 939
 			$data['id_source'] = $id_source;
683 940
 			$data['datetime'] = date('Y-m-d H:i:s');
684
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
685
-			if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data);
941
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
942
+				$data['noarchive'] = true;
943
+			}
944
+			if ($line['properties']['vesselType'] != 'Navigation Aid') {
945
+				$MI->add($data);
946
+			}
686 947
 			unset($data);
687 948
 		    }
688 949
 		}
@@ -695,11 +956,17 @@  discard block
 block discarded – undo
695 956
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
696 957
 	    )
697 958
 	) {
698
-	    if ($globalDebug) echo 'download...';
959
+	    if ($globalDebug) {
960
+	    	echo 'download...';
961
+	    }
699 962
 	    $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter');
700
-	    if ($globalDebug) echo 'done !'."\n";
963
+	    if ($globalDebug) {
964
+	    	echo 'done !'."\n";
965
+	    }
701 966
 	    // FIXME: Need more work
702
-	    if ($buffer != '') $reset = 0;
967
+	    if ($buffer != '') {
968
+	    	$reset = 0;
969
+	    }
703 970
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
704 971
 	    $buffer = explode('\n',$buffer);
705 972
 	    foreach ($buffer as $line) {
@@ -725,7 +992,9 @@  discard block
 block discarded – undo
725 992
 		    //$data['etaTime'] = substr($line,135,5);
726 993
 		    $data['format_source'] = 'shipplotter';
727 994
     		    $data['id_source'] = $id_source;
728
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
995
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
996
+		    	$data['noarchive'] = true;
997
+		    }
729 998
 		    //print_r($data);
730 999
 		    //echo 'Add...'."\n";
731 1000
 		    $MI->add($data);
@@ -739,11 +1008,17 @@  discard block
 block discarded – undo
739 1008
 		(!isset($globalSources[$id]['minfetch']) && (time() - $last_exec[$id]['last'] > $globalMinFetch*3))
740 1009
 	    )
741 1010
 	) {
742
-	    if ($globalDebug) echo '! Download... ';
1011
+	    if ($globalDebug) {
1012
+	    	echo '! Download... ';
1013
+	    }
743 1014
 	    for ($i =0; $i <= 1; $i++) {
744
-		    if ($globalDebug) echo 'Racetype: '.$i.' ';
1015
+		    if ($globalDebug) {
1016
+		    	echo 'Racetype: '.$i.' ';
1017
+		    }
745 1018
 	    $buffer = $Common->getData('https://sailaway.world/cgi-bin/sailaway/GetMissions.pl?race=1&tutorial=0&hist=1&racetype='.$i);
746
-	    if ($globalDebug) echo 'done'."\n";
1019
+	    if ($globalDebug) {
1020
+	    	echo 'done'."\n";
1021
+	    }
747 1022
 	    if ($buffer != '') {
748 1023
 		$all_data = json_decode($buffer,true);
749 1024
 		if (isset($all_data['missions'])) {
@@ -752,7 +1027,9 @@  discard block
 block discarded – undo
752 1027
 				$mission_name = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '',$mission['mistitle']);
753 1028
 				if (!isset($globalFilter['sailway']['race']) || (isset($globalFilter['sailway']['race']) && in_array($mission['misnr'],$globalFilter['sailway']['race']))) {
754 1029
 					$bufferm = $Common->getData('https://sailaway.world/cgi-bin/sailaway/GetLeaderboard.pl?misnr='.$mission['misnr']);
755
-				} else $bufferm = '';
1030
+				} else {
1031
+					$bufferm = '';
1032
+				}
756 1033
 				if ($bufferm != '') {
757 1034
 					$mission_data = json_decode($bufferm,true);
758 1035
 					if (isset($mission_data['leaderboard'][0]['results'])) {
@@ -791,7 +1068,9 @@  discard block
 block discarded – undo
791 1068
 								//$data['callsign'] = trim(substr($line,100,7);
792 1069
 								$data['format_source'] = 'sailaway';
793 1070
 								$data['id_source'] = $id_source;
794
-								if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1071
+								if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1072
+									$data['noarchive'] = true;
1073
+								}
795 1074
 								//print_r($data);
796 1075
 								//echo 'Add...'."\n";
797 1076
 								$MI->add($data);
@@ -832,16 +1111,28 @@  discard block
 block discarded – undo
832 1111
     		    $line = explode(':', $line);
833 1112
     		    if (count($line) > 30 && $line[0] != 'callsign') {
834 1113
 			$data = array();
835
-			if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
836
-			else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
1114
+			if (isset($line[37]) && $line[37] != '') {
1115
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37];
1116
+			} else {
1117
+				$data['id'] = $value['format'].'-'.$line[1].'-'.$line[0];
1118
+			}
837 1119
 			$data['pilot_id'] = $line[1];
838 1120
 			$data['pilot_name'] = $line[2];
839 1121
 			$data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT);
840 1122
 			$data['ident'] = $line[0]; // ident
841
-			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
1123
+			if ($line[7] != '' && $line[7] != 0) {
1124
+				$data['altitude'] = $line[7];
1125
+			}
1126
+			// altitude
842 1127
 			$data['speed'] = $line[8]; // speed
843
-			if (isset($line[45])) $data['heading'] = $line[45]; // heading
844
-			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
1128
+			if (isset($line[45])) {
1129
+				$data['heading'] = $line[45];
1130
+			}
1131
+			// heading
1132
+			elseif (isset($line[38])) {
1133
+				$data['heading'] = $line[38];
1134
+			}
1135
+			// heading
845 1136
 			$data['latitude'] = $line[5]; // lat
846 1137
 	        	$data['longitude'] = $line[6]; // long
847 1138
 	        	$data['verticalrate'] = ''; // vertical rate
@@ -857,7 +1148,9 @@  discard block
 block discarded – undo
857 1148
 			$data['frequency'] = $line[4];
858 1149
 			$data['type'] = $line[18];
859 1150
 			$data['range'] = $line[19];
860
-			if (isset($line[35])) $data['info'] = $line[35];
1151
+			if (isset($line[35])) {
1152
+				$data['info'] = $line[35];
1153
+			}
861 1154
     			$data['id_source'] = $id_source;
862 1155
 	    		//$data['arrival_airport_time'] = ;
863 1156
 	    		if ($line[9] != '') {
@@ -871,27 +1164,47 @@  discard block
 block discarded – undo
871 1164
 	    		elseif ($value === 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
872 1165
 	    		*/
873 1166
 	    		$data['format_source'] = $value['format'];
874
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
875
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
876
-    			if ($line[3] === 'PILOT') $SI->add($data);
877
-			elseif ($line[3] === 'ATC') {
1167
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1168
+				$data['noarchive'] = true;
1169
+			}
1170
+			if (isset($value['name']) && $value['name'] != '') {
1171
+				$data['source_name'] = $value['name'];
1172
+			}
1173
+    			if ($line[3] === 'PILOT') {
1174
+    				$SI->add($data);
1175
+    			} elseif ($line[3] === 'ATC') {
878 1176
 				//print_r($data);
879 1177
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
880 1178
 				$data['info'] = str_replace('&amp;sect;','',$data['info']);
881 1179
 				$typec = substr($data['ident'],-3);
882
-				if ($typec === 'APP') $data['type'] = 'Approach';
883
-				elseif ($typec === 'TWR') $data['type'] = 'Tower';
884
-				elseif ($typec === 'OBS') $data['type'] = 'Observer';
885
-				elseif ($typec === 'GND') $data['type'] = 'Ground';
886
-				elseif ($typec === 'DEL') $data['type'] = 'Delivery';
887
-				elseif ($typec === 'DEP') $data['type'] = 'Departure';
888
-				elseif ($typec === 'FSS') $data['type'] = 'Flight Service Station';
889
-				elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
890
-				elseif ($data['type'] === '') $data['type'] = 'Observer';
891
-				if (!isset($data['source_name'])) $data['source_name'] = '';
1180
+				if ($typec === 'APP') {
1181
+					$data['type'] = 'Approach';
1182
+				} elseif ($typec === 'TWR') {
1183
+					$data['type'] = 'Tower';
1184
+				} elseif ($typec === 'OBS') {
1185
+					$data['type'] = 'Observer';
1186
+				} elseif ($typec === 'GND') {
1187
+					$data['type'] = 'Ground';
1188
+				} elseif ($typec === 'DEL') {
1189
+					$data['type'] = 'Delivery';
1190
+				} elseif ($typec === 'DEP') {
1191
+					$data['type'] = 'Departure';
1192
+				} elseif ($typec === 'FSS') {
1193
+					$data['type'] = 'Flight Service Station';
1194
+				} elseif ($typec === 'CTR') {
1195
+					$data['type'] = 'Control Radar or Centre';
1196
+				} elseif ($data['type'] === '') {
1197
+					$data['type'] = 'Observer';
1198
+				}
1199
+				if (!isset($data['source_name'])) {
1200
+					$data['source_name'] = '';
1201
+				}
892 1202
 				if (isset($ATC)) {
893
-					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
894
-					else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
1203
+					if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) {
1204
+						echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
1205
+					} else {
1206
+						echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']);
1207
+					}
895 1208
 				}
896 1209
 			}
897 1210
     			unset($data);
@@ -918,14 +1231,20 @@  discard block
 block discarded – undo
918 1231
 			$data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST'));
919 1232
 			$data['latitude'] = (float)$line['pktLatitude'];
920 1233
 			$data['longitude'] = (float)$line['pktLongitude'];
921
-			if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack'];
922
-			if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed'];
1234
+			if ((float)$line['pktTrack'] != 0) {
1235
+				$data['heading'] = (float)$line['pktTrack'];
1236
+			}
1237
+			if ((int)$line['pktSpeed'] != 0) {
1238
+				$data['speed'] = (int)$line['pktSpeed'];
1239
+			}
923 1240
 			$data['altitude'] = round((int)$line['pktAltitude']*3.28084);
924 1241
 			$data['altitude_relative'] = 'AMSL';
925 1242
 			$data['pilot_id'] = (int)$line['pktPilotID'];
926 1243
 			$data['aircraft_icao'] = 'PARAGLIDER';
927 1244
 			$pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id']));
928
-			if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4];
1245
+			if (isset($pilot_data[4])) {
1246
+				$data['pilot_name'] = $pilot_data[4];
1247
+			}
929 1248
 			$data['format_source'] = $value['format'];
930 1249
 			$SI->add($data);
931 1250
 			unset($data);
@@ -973,25 +1292,59 @@  discard block
 block discarded – undo
973 1292
 		    foreach ($all_data['acList'] as $line) {
974 1293
 			$data = array();
975 1294
 			$data['hex'] = $line['Icao']; // hex
976
-			if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
977
-			if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
978
-			if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
979
-			if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
980
-			if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
981
-			if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
1295
+			if (isset($line['Call'])) {
1296
+				$data['ident'] = $line['Call'];
1297
+			}
1298
+			// ident
1299
+			if (isset($line['Alt'])) {
1300
+				$data['altitude'] = $line['Alt'];
1301
+			}
1302
+			// altitude
1303
+			if (isset($line['Spd'])) {
1304
+				$data['speed'] = $line['Spd'];
1305
+			}
1306
+			// speed
1307
+			if (isset($line['Trak'])) {
1308
+				$data['heading'] = $line['Trak'];
1309
+			}
1310
+			// heading
1311
+			if (isset($line['Lat'])) {
1312
+				$data['latitude'] = $line['Lat'];
1313
+			}
1314
+			// lat
1315
+			if (isset($line['Long'])) {
1316
+				$data['longitude'] = $line['Long'];
1317
+			}
1318
+			// long
982 1319
 			//$data['verticalrate'] = $line['']; // verticale rate
983
-			if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
1320
+			if (isset($line['Sqk'])) {
1321
+				$data['squawk'] = $line['Sqk'];
1322
+			}
1323
+			// squawk
984 1324
 			$data['emergency'] = ''; // emergency
985
-			if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
986
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
987
-			else $data['datetime'] = date('Y-m-d H:i:s');
1325
+			if (isset($line['Reg'])) {
1326
+				$data['registration'] = $line['Reg'];
1327
+			}
1328
+			if (isset($line['PosTime'])) {
1329
+				$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1330
+			} else {
1331
+				$data['datetime'] = date('Y-m-d H:i:s');
1332
+			}
988 1333
 			//$data['datetime'] = date('Y-m-d H:i:s');
989
-			if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
1334
+			if (isset($line['Type'])) {
1335
+				$data['aircraft_icao'] = $line['Type'];
1336
+			}
990 1337
 			$data['format_source'] = 'aircraftlistjson';
991 1338
 			$data['id_source'] = $id_source;
992
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
993
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
994
-			if (isset($data['latitude'])) $SI->add($data);
1339
+			if (isset($value['name']) && $value['name'] != '') {
1340
+				$data['source_name'] = $value['name'];
1341
+			}
1342
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1343
+				$data['noarchive'] = true;
1344
+			}
1345
+			if (isset($data['latitude'])) {
1346
+				$SI->add($data);
1347
+			}
995 1348
 			unset($data);
996 1349
 		    }
997 1350
 		} elseif (is_array($all_data)) {
@@ -1008,17 +1361,26 @@  discard block
 block discarded – undo
1008 1361
 			$data['verticalrate'] = $line['vrt']; // verticale rate
1009 1362
 			$data['squawk'] = $line['squawk']; // squawk
1010 1363
 			$data['emergency'] = ''; // emergency
1011
-			if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1012
-			else $data['datetime'] = date('Y-m-d H:i:s');
1364
+			if (isset($line['PosTime'])) {
1365
+				$data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000));
1366
+			} else {
1367
+				$data['datetime'] = date('Y-m-d H:i:s');
1368
+			}
1013 1369
 			$data['format_source'] = 'aircraftlistjson';
1014 1370
 			$data['id_source'] = $id_source;
1015
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1016
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1371
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1372
+				$data['noarchive'] = true;
1373
+			}
1374
+			if (isset($value['name']) && $value['name'] != '') {
1375
+				$data['source_name'] = $value['name'];
1376
+			}
1017 1377
 			$SI->add($data);
1018 1378
 			unset($data);
1019 1379
 		    }
1020 1380
 		}
1021
-	    } elseif ($globalDebug) echo 'No data'."\n";
1381
+	    } elseif ($globalDebug) {
1382
+	    	echo 'No data'."\n";
1383
+	    }
1022 1384
     	    //$last_exec['aircraftlistjson'] = time();
1023 1385
     	    $last_exec[$id]['last'] = time();
1024 1386
     	//} elseif ($value === 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) {
@@ -1054,8 +1416,12 @@  discard block
 block discarded – undo
1054 1416
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
1055 1417
 	    	    $data['format_source'] = 'planeupdatefaa';
1056 1418
     		    $data['id_source'] = $id_source;
1057
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1058
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1419
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1420
+		    	$data['noarchive'] = true;
1421
+		    }
1422
+		    if (isset($value['name']) && $value['name'] != '') {
1423
+		    	$data['source_name'] = $value['name'];
1424
+		    }
1059 1425
 		    $SI->add($data);
1060 1426
 		    unset($data);
1061 1427
 		}
@@ -1089,7 +1455,9 @@  discard block
 block discarded – undo
1089 1455
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[3]);
1090 1456
 		    $data['format_source'] = 'opensky';
1091 1457
 		    $data['id_source'] = $id_source;
1092
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1458
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1459
+		    	$data['noarchive'] = true;
1460
+		    }
1093 1461
 		    $SI->add($data);
1094 1462
 		    unset($data);
1095 1463
 		}
@@ -1109,15 +1477,42 @@  discard block
 block discarded – undo
1109 1477
 		foreach ($all_data['aircraft'] as $key => $line) {
1110 1478
 		    $data = array();
1111 1479
 		    // add support for ground vehicule with ~ in front of hex
1112
-		    if (isset($line['hex'])) $data['hex'] = $line['hex']; // hex
1113
-		    if (isset($line['flight'])) $data['ident'] = trim($line['flight']); // ident
1114
-		    if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
1115
-		    if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
1116
-		    if (isset($line['track'])) $data['heading'] = $line['track']; // heading
1117
-		    if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
1118
-		    if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
1119
-		    if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
1120
-		    if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
1480
+		    if (isset($line['hex'])) {
1481
+		    	$data['hex'] = $line['hex'];
1482
+		    }
1483
+		    // hex
1484
+		    if (isset($line['flight'])) {
1485
+		    	$data['ident'] = trim($line['flight']);
1486
+		    }
1487
+		    // ident
1488
+		    if (isset($line['altitude'])) {
1489
+		    	$data['altitude'] = $line['altitude'];
1490
+		    }
1491
+		    // altitude
1492
+		    if (isset($line['speed'])) {
1493
+		    	$data['speed'] = $line['speed'];
1494
+		    }
1495
+		    // speed
1496
+		    if (isset($line['track'])) {
1497
+		    	$data['heading'] = $line['track'];
1498
+		    }
1499
+		    // heading
1500
+		    if (isset($line['lat'])) {
1501
+		    	$data['latitude'] = $line['lat'];
1502
+		    }
1503
+		    // lat
1504
+		    if (isset($line['lon'])) {
1505
+		    	$data['longitude'] = $line['lon'];
1506
+		    }
1507
+		    // long
1508
+		    if (isset($line['vert_rate'])) {
1509
+		    	$data['verticalrate'] = $line['vert_rate'];
1510
+		    }
1511
+		    // verticale rate
1512
+		    if (isset($line['squawk'])) {
1513
+		    	$data['squawk'] = $line['squawk'];
1514
+		    }
1515
+		    // squawk
1121 1516
 		    //$data['emergency'] = ''; // emergency
1122 1517
 		    //$data['registration'] = $line[2];
1123 1518
 		    //$data['aircraft_icao'] = $line[0];
@@ -1125,10 +1520,17 @@  discard block
 block discarded – undo
1125 1520
 		    $data['format_source'] = 'aircraftjson';
1126 1521
 		    $data['id_source'] = $id_source;
1127 1522
 		    if (isset($value['name']) && $value['name'] != '') {
1128
-			    if (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = $value['name'].'_MLAT';
1129
-			    else $data['source_name'] = $value['name'];
1130
-		    } elseif (isset($line['mlat']) && !empty($line['mlat'])) $data['source_name'] = 'MLAT';
1131
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1523
+			    if (isset($line['mlat']) && !empty($line['mlat'])) {
1524
+			    	$data['source_name'] = $value['name'].'_MLAT';
1525
+			    } else {
1526
+			    	$data['source_name'] = $value['name'];
1527
+			    }
1528
+		    } elseif (isset($line['mlat']) && !empty($line['mlat'])) {
1529
+		    	$data['source_name'] = 'MLAT';
1530
+		    }
1531
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1532
+		    	$data['noarchive'] = true;
1533
+		    }
1132 1534
 		    $SI->add($data);
1133 1535
 		    unset($data);
1134 1536
 		}
@@ -1148,22 +1550,54 @@  discard block
 block discarded – undo
1148 1550
 		foreach ($all_data['aircraft'] as $key => $line) {
1149 1551
 		    $data = array();
1150 1552
 		    $data['hex'] = $key; // hex
1151
-		    if (isset($line['callsign'])) $data['ident'] = trim($line['callsign']); // ident
1152
-		    if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; // altitude
1153
-		    if (isset($line['speed'])) $data['speed'] = $line['speed']; // speed
1154
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1155
-		    if (isset($line['lat'])) $data['latitude'] = $line['lat']; // lat
1156
-		    if (isset($line['lon'])) $data['longitude'] = $line['lon']; // long
1157
-		    if (isset($line['vert_rate'])) $data['verticalrate'] = $line['vert_rate']; // verticale rate
1158
-		    if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; // squawk
1553
+		    if (isset($line['callsign'])) {
1554
+		    	$data['ident'] = trim($line['callsign']);
1555
+		    }
1556
+		    // ident
1557
+		    if (isset($line['altitude'])) {
1558
+		    	$data['altitude'] = $line['altitude'];
1559
+		    }
1560
+		    // altitude
1561
+		    if (isset($line['speed'])) {
1562
+		    	$data['speed'] = $line['speed'];
1563
+		    }
1564
+		    // speed
1565
+		    if (isset($line['heading'])) {
1566
+		    	$data['heading'] = $line['heading'];
1567
+		    }
1568
+		    // heading
1569
+		    if (isset($line['lat'])) {
1570
+		    	$data['latitude'] = $line['lat'];
1571
+		    }
1572
+		    // lat
1573
+		    if (isset($line['lon'])) {
1574
+		    	$data['longitude'] = $line['lon'];
1575
+		    }
1576
+		    // long
1577
+		    if (isset($line['vert_rate'])) {
1578
+		    	$data['verticalrate'] = $line['vert_rate'];
1579
+		    }
1580
+		    // verticale rate
1581
+		    if (isset($line['squawk'])) {
1582
+		    	$data['squawk'] = $line['squawk'];
1583
+		    }
1584
+		    // squawk
1159 1585
 		    //$data['emergency'] = ''; // emergency
1160
-		    if (isset($line['reg'])) $data['registration'] = $line['reg'];
1161
-		    if (isset($line['type'])) $data['aircraft_icao'] = $line['type'];
1586
+		    if (isset($line['reg'])) {
1587
+		    	$data['registration'] = $line['reg'];
1588
+		    }
1589
+		    if (isset($line['type'])) {
1590
+		    	$data['aircraft_icao'] = $line['type'];
1591
+		    }
1162 1592
 		    $data['datetime'] = date('Y-m-d H:i:s',$line['pos_update_time']);
1163 1593
 		    $data['format_source'] = 'planefinderclient';
1164 1594
 		    $data['id_source'] = $id_source;
1165
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1166
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1595
+		    if (isset($value['name']) && $value['name'] != '') {
1596
+		    	$data['source_name'] = $value['name'];
1597
+		    }
1598
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1599
+		    	$data['noarchive'] = true;
1600
+		    }
1167 1601
 		    $SI->add($data);
1168 1602
 		    unset($data);
1169 1603
 		}
@@ -1179,7 +1613,9 @@  discard block
 block discarded – undo
1179 1613
 	    //$buffer = $Common->getData($hosts[$id]);
1180 1614
 	    $buffer = $Common->getData($value['host']);
1181 1615
 	    $all_data = json_decode($buffer,true);
1182
-	    if (!empty($all_data)) $reset = 0;
1616
+	    if (!empty($all_data)) {
1617
+	    	$reset = 0;
1618
+	    }
1183 1619
 	    foreach ($all_data as $key => $line) {
1184 1620
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
1185 1621
 		    $data = array();
@@ -1200,8 +1636,12 @@  discard block
 block discarded – undo
1200 1636
 		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
1201 1637
 	    	    $data['format_source'] = 'fr24json';
1202 1638
     		    $data['id_source'] = $id_source;
1203
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1204
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1639
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1640
+		    	$data['noarchive'] = true;
1641
+		    }
1642
+		    if (isset($value['name']) && $value['name'] != '') {
1643
+		    	$data['source_name'] = $value['name'];
1644
+		    }
1205 1645
 		    $SI->add($data);
1206 1646
 		    unset($data);
1207 1647
 		}
@@ -1230,24 +1670,42 @@  discard block
 block discarded – undo
1230 1670
 		    if (isset($line['inf'])) {
1231 1671
 			$data = array();
1232 1672
 			$data['hex'] = $line['inf']['ia'];
1233
-			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
1673
+			if (isset($line['inf']['cs'])) {
1674
+				$data['ident'] = $line['inf']['cs'];
1675
+			}
1676
+			//$line[13]
1234 1677
 	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
1235
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
1236
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
1678
+	    		if (isset($line['inf']['gs'])) {
1679
+	    			$data['speed'] = round($line['inf']['gs']*0.539957);
1680
+	    		}
1681
+	    		// speed
1682
+	    		if (isset($line['inf']['tr'])) {
1683
+	    			$data['heading'] = $line['inf']['tr'];
1684
+	    		}
1685
+	    		// heading
1237 1686
 	    		$data['latitude'] = $line['pt'][0]; // lat
1238 1687
 	    		$data['longitude'] = $line['pt'][1]; // long
1239 1688
 	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
1240
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
1689
+	    		if (isset($line['inf']['sq'])) {
1690
+	    			$data['squawk'] = $line['inf']['sq'];
1691
+	    		}
1692
+	    		// squawk
1241 1693
 	    		//$data['aircraft_icao'] = $line[8];
1242
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
1694
+	    		if (isset($line['inf']['rc'])) {
1695
+	    			$data['registration'] = $line['inf']['rc'];
1696
+	    		}
1243 1697
 			//$data['departure_airport_iata'] = $line[11];
1244 1698
 			//$data['arrival_airport_iata'] = $line[12];
1245 1699
 	    		//$data['emergency'] = ''; // emergency
1246 1700
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
1247 1701
 	    		$data['format_source'] = 'radarvirtueljson';
1248 1702
     			$data['id_source'] = $id_source;
1249
-			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1250
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1703
+			if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1704
+				$data['noarchive'] = true;
1705
+			}
1706
+			if (isset($value['name']) && $value['name'] != '') {
1707
+				$data['source_name'] = $value['name'];
1708
+			}
1251 1709
 			$SI->add($data);
1252 1710
 			unset($data);
1253 1711
 		    }
@@ -1273,30 +1731,65 @@  discard block
 block discarded – undo
1273 1731
 		    $data['id'] = $line['id'];
1274 1732
 		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
1275 1733
 		    $data['ident'] = $line['callsign']; // ident
1276
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
1277
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
1278
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
1279
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
1280
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
1281
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1734
+		    if (isset($line['pilotid'])) {
1735
+		    	$data['pilot_id'] = $line['pilotid'];
1736
+		    }
1737
+		    // pilot id
1738
+		    if (isset($line['name'])) {
1739
+		    	$data['pilot_name'] = $line['name'];
1740
+		    }
1741
+		    // pilot name
1742
+		    if (isset($line['alt'])) {
1743
+		    	$data['altitude'] = $line['alt'];
1744
+		    }
1745
+		    // altitude
1746
+		    if (isset($line['gs'])) {
1747
+		    	$data['speed'] = $line['gs'];
1748
+		    }
1749
+		    // speed
1750
+		    if (isset($line['heading'])) {
1751
+		    	$data['heading'] = $line['heading'];
1752
+		    }
1753
+		    // heading
1754
+		    if (isset($line['route'])) {
1755
+		    	$data['waypoints'] = $line['route'];
1756
+		    }
1757
+		    // route
1282 1758
 		    $data['latitude'] = $line['lat']; // lat
1283 1759
 		    $data['longitude'] = $line['lon']; // long
1284 1760
 		    //$data['verticalrate'] = $line['vrt']; // verticale rate
1285 1761
 		    //$data['squawk'] = $line['squawk']; // squawk
1286 1762
 		    //$data['emergency'] = ''; // emergency
1287
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
1288
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
1289
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
1763
+		    if (isset($line['depicao'])) {
1764
+		    	$data['departure_airport_icao'] = $line['depicao'];
1765
+		    }
1766
+		    if (isset($line['deptime'])) {
1767
+		    	$data['departure_airport_time'] = $line['deptime'];
1768
+		    }
1769
+		    if (isset($line['arricao'])) {
1770
+		    	$data['arrival_airport_icao'] = $line['arricao'];
1771
+		    }
1290 1772
 		    //$data['arrival_airport_time'] = $line['arrtime'];
1291
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
1292
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
1293
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
1294
-		    else $data['info'] = '';
1773
+		    if (isset($line['aircraft'])) {
1774
+		    	$data['aircraft_icao'] = $line['aircraft'];
1775
+		    }
1776
+		    if (isset($line['transponder'])) {
1777
+		    	$data['squawk'] = $line['transponder'];
1778
+		    }
1779
+		    if (isset($line['atis'])) {
1780
+		    	$data['info'] = $line['atis'];
1781
+		    } else {
1782
+		    	$data['info'] = '';
1783
+		    }
1295 1784
 		    $data['format_source'] = 'pireps';
1296 1785
     		    $data['id_source'] = $id_source;
1297 1786
 		    $data['datetime'] = date('Y-m-d H:i:s');
1298
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1299
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1787
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1788
+		    	$data['noarchive'] = true;
1789
+		    }
1790
+		    if (isset($value['name']) && $value['name'] != '') {
1791
+		    	$data['source_name'] = $value['name'];
1792
+		    }
1300 1793
 		    if ($line['icon'] === 'plane') {
1301 1794
 			$SI->add($data);
1302 1795
 		    //    print_r($data);
@@ -1305,16 +1798,28 @@  discard block
 block discarded – undo
1305 1798
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
1306 1799
 			$typec = substr($data['ident'],-3);
1307 1800
 			$data['type'] = '';
1308
-			if ($typec === 'APP') $data['type'] = 'Approach';
1309
-			elseif ($typec === 'TWR') $data['type'] = 'Tower';
1310
-			elseif ($typec === 'OBS') $data['type'] = 'Observer';
1311
-			elseif ($typec === 'GND') $data['type'] = 'Ground';
1312
-			elseif ($typec === 'DEL') $data['type'] = 'Delivery';
1313
-			elseif ($typec === 'DEP') $data['type'] = 'Departure';
1314
-			elseif ($typec === 'FSS') $data['type'] = 'Flight Service Station';
1315
-			elseif ($typec === 'CTR') $data['type'] = 'Control Radar or Centre';
1316
-			else $data['type'] = 'Observer';
1317
-			if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
1801
+			if ($typec === 'APP') {
1802
+				$data['type'] = 'Approach';
1803
+			} elseif ($typec === 'TWR') {
1804
+				$data['type'] = 'Tower';
1805
+			} elseif ($typec === 'OBS') {
1806
+				$data['type'] = 'Observer';
1807
+			} elseif ($typec === 'GND') {
1808
+				$data['type'] = 'Ground';
1809
+			} elseif ($typec === 'DEL') {
1810
+				$data['type'] = 'Delivery';
1811
+			} elseif ($typec === 'DEP') {
1812
+				$data['type'] = 'Departure';
1813
+			} elseif ($typec === 'FSS') {
1814
+				$data['type'] = 'Flight Service Station';
1815
+			} elseif ($typec === 'CTR') {
1816
+				$data['type'] = 'Control Radar or Centre';
1817
+			} else {
1818
+				$data['type'] = 'Observer';
1819
+			}
1820
+			if (isset($ATC)) {
1821
+				echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']);
1822
+			}
1318 1823
 		    }
1319 1824
 		    unset($data);
1320 1825
 		}
@@ -1329,7 +1834,9 @@  discard block
 block discarded – undo
1329 1834
 	    )
1330 1835
 	) {
1331 1836
 	    //$buffer = $Common->getData($hosts[$id]);
1332
-	    if ($globalDebug) echo 'Get Data...'."\n";
1837
+	    if ($globalDebug) {
1838
+	    	echo 'Get Data...'."\n";
1839
+	    }
1333 1840
 	    $buffer = $Common->getData($value['host']);
1334 1841
 	    $all_data = json_decode($buffer,true);
1335 1842
 	    if ($buffer != '' && is_array($all_data)) {
@@ -1337,10 +1844,16 @@  discard block
 block discarded – undo
1337 1844
 		foreach ($all_data as $line) {
1338 1845
 	    	    $data = array();
1339 1846
 	    	    //$data['id'] = $line['id']; // id not usable
1340
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
1847
+	    	    if (isset($line['pilotid'])) {
1848
+	    	    	$data['id'] = $line['pilotid'].$line['flightnum'];
1849
+	    	    }
1341 1850
 	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1342
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
1343
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
1851
+	    	    if (isset($line['pilotname'])) {
1852
+	    	    	$data['pilot_name'] = $line['pilotname'];
1853
+	    	    }
1854
+	    	    if (isset($line['pilotid'])) {
1855
+	    	    	$data['pilot_id'] = $line['pilotid'];
1856
+	    	    }
1344 1857
 	    	    $data['ident'] = $line['flightnum']; // ident
1345 1858
 	    	    $data['altitude'] = $line['alt']; // altitude
1346 1859
 	    	    $data['speed'] = $line['gs']; // speed
@@ -1356,7 +1869,9 @@  discard block
 block discarded – undo
1356 1869
 	    		$datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone']));
1357 1870
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1358 1871
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1359
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
1872
+	    	    } else {
1873
+	    	    	$data['datetime'] = date('Y-m-d H:i:s');
1874
+	    	    }
1360 1875
 	    	    $data['departure_airport_icao'] = $line['depicao'];
1361 1876
 	    	    $data['departure_airport_time'] = $line['deptime'];
1362 1877
 	    	    $data['arrival_airport_icao'] = $line['arricao'];
@@ -1364,29 +1879,47 @@  discard block
 block discarded – undo
1364 1879
     		    if (isset($line['registration'])) {
1365 1880
     			$data['registration'] = $line['registration'];
1366 1881
     			//if (isset($line['aircraft'])) $data['id'] = $line['aircraft'];
1367
-    		    } else $data['registration'] = $line['aircraft'];
1368
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1369
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1882
+    		    } else {
1883
+    		    	$data['registration'] = $line['aircraft'];
1884
+    		    }
1885
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1886
+		    	$data['noarchive'] = true;
1887
+		    }
1888
+		    if (isset($line['route'])) {
1889
+		    	$data['waypoints'] = $line['route'];
1890
+		    }
1891
+		    // route
1370 1892
 		    if (isset($line['aircraftname'])) {
1371 1893
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
1372 1894
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
1373 1895
 	    		$aircraft_data = explode('-',$line['aircraftname']);
1374
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0];
1375
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1];
1376
-	    		else {
1896
+	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) {
1897
+	    			$data['aircraft_icao'] = $aircraft_data[0];
1898
+	    		} elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) {
1899
+	    			$data['aircraft_icao'] = $aircraft_data[1];
1900
+	    		} else {
1377 1901
 	    		    $aircraft_data = explode(' ',$line['aircraftname']);
1378
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1379
-	    		    else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1902
+	    		    if (isset($aircraft_data[1])) {
1903
+	    		    	$data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]);
1904
+	    		    } else {
1905
+	    		    	$data['aircraft_icao'] = str_replace('-','',$line['aircraftname']);
1906
+	    		    }
1380 1907
 	    		}
1381 1908
 	    	    }
1382
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
1909
+    		    if (isset($line['route'])) {
1910
+    		    	$data['waypoints'] = $line['route'];
1911
+    		    }
1383 1912
     		    $data['id_source'] = $id_source;
1384 1913
 	    	    $data['format_source'] = 'phpvmacars';
1385
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1914
+		    if (isset($value['name']) && $value['name'] != '') {
1915
+		    	$data['source_name'] = $value['name'];
1916
+		    }
1386 1917
 		    $SI->add($data);
1387 1918
 		    unset($data);
1388 1919
 		}
1389
-		if ($globalDebug) echo 'No more data...'."\n";
1920
+		if ($globalDebug) {
1921
+			echo 'No more data...'."\n";
1922
+		}
1390 1923
 		unset($buffer);
1391 1924
 		unset($all_data);
1392 1925
 	    }
@@ -1399,7 +1932,9 @@  discard block
 block discarded – undo
1399 1932
 	    )
1400 1933
 	) {
1401 1934
 	    //$buffer = $Common->getData($hosts[$id]);
1402
-	    if ($globalDebug) echo 'Get Data...'."\n";
1935
+	    if ($globalDebug) {
1936
+	    	echo 'Get Data...'."\n";
1937
+	    }
1403 1938
 	    $buffer = $Common->getData($value['host']);
1404 1939
 	    $all_data = json_decode($buffer,true);
1405 1940
 	    if ($buffer != '' && is_array($all_data) && isset($all_data['ACARSData'])) {
@@ -1410,10 +1945,16 @@  discard block
 block discarded – undo
1410 1945
 	    	    //$data['id'] = $line['id']; // id not usable
1411 1946
 	    	    $data['id'] = $line['id'];
1412 1947
 	    	    //$data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
1413
-	    	    if (isset($line['user']['username'])) $data['pilot_name'] = $line['user']['username'];
1414
-	    	    if (isset($line['user_id'])) $data['pilot_id'] = $line['user_id'];
1948
+	    	    if (isset($line['user']['username'])) {
1949
+	    	    	$data['pilot_name'] = $line['user']['username'];
1950
+	    	    }
1951
+	    	    if (isset($line['user_id'])) {
1952
+	    	    	$data['pilot_id'] = $line['user_id'];
1953
+	    	    }
1415 1954
 	    	    $data['ident'] = str_replace(' ','',$line['bid']['flightnum']); // ident
1416
-	    	    if (is_numeric($data['ident'])) $data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
1955
+	    	    if (is_numeric($data['ident'])) {
1956
+	    	    	$data['ident'] = $line['bid']['airline']['icao'].$data['ident'];
1957
+	    	    }
1417 1958
 	    	    $data['altitude'] = $line['altitude']; // altitude
1418 1959
 	    	    $data['speed'] = $line['groundspeed']; // speed
1419 1960
 	    	    $data['heading'] = $line['heading']; // heading
@@ -1426,7 +1967,9 @@  discard block
 block discarded – undo
1426 1967
 	    		$datetime = new DateTime($line['updated_at'],new DateTimeZone($value['timezone']));
1427 1968
 	    		$datetime->setTimeZone(new DateTimeZone('UTC'));
1428 1969
 	    		$data['datetime'] = $datetime->format('Y-m-d H:i:s');
1429
-	    	    } else $data['datetime'] = date('Y-m-d H:i:s');
1970
+	    	    } else {
1971
+	    	    	$data['datetime'] = date('Y-m-d H:i:s');
1972
+	    	    }
1430 1973
 	    	    
1431 1974
 	    	    $data['departure_airport_icao'] = $line['bid']['depapt']['icao'];
1432 1975
 	    	    $data['departure_airport_time'] = $line['bid']['deptime'];
@@ -1434,17 +1977,26 @@  discard block
 block discarded – undo
1434 1977
 		    $data['arrival_airport_time'] = $line['bid']['arrtime'];
1435 1978
 		    $data['registration'] = $line['bid']['aircraft']['registration'];
1436 1979
 
1437
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1438
-		    if (isset($line['bid']['route']) && $line['bid']['route'] != '') $data['waypoints'] = $line['bid']['route']; // route
1980
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
1981
+		    	$data['noarchive'] = true;
1982
+		    }
1983
+		    if (isset($line['bid']['route']) && $line['bid']['route'] != '') {
1984
+		    	$data['waypoints'] = $line['bid']['route'];
1985
+		    }
1986
+		    // route
1439 1987
 	    	    $data['aircraft_icao'] = $line['bid']['aircraft']['icao'];
1440 1988
 
1441 1989
     		    $data['id_source'] = $id_source;
1442 1990
 	    	    $data['format_source'] = 'vaos';
1443
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1991
+		    if (isset($value['name']) && $value['name'] != '') {
1992
+		    	$data['source_name'] = $value['name'];
1993
+		    }
1444 1994
 		    $SI->add($data);
1445 1995
 		    unset($data);
1446 1996
 		}
1447
-		if ($globalDebug) echo 'No more data...'."\n";
1997
+		if ($globalDebug) {
1998
+			echo 'No more data...'."\n";
1999
+		}
1448 2000
 		unset($buffer);
1449 2001
 		unset($all_data);
1450 2002
 	    }
@@ -1457,7 +2009,9 @@  discard block
 block discarded – undo
1457 2009
 	    )
1458 2010
 	) {
1459 2011
 	    //$buffer = $Common->getData($hosts[$id]);
1460
-	    if ($globalDebug) echo 'Get Data...'."\n";
2012
+	    if ($globalDebug) {
2013
+	    	echo 'Get Data...'."\n";
2014
+	    }
1461 2015
 	    $buffer = $Common->getData($value['host']);
1462 2016
 	    $all_data = json_decode($buffer,true);
1463 2017
 	    if ($buffer != '' && is_array($all_data)) {
@@ -1486,16 +2040,25 @@  discard block
 block discarded – undo
1486 2040
 	    	    $data['arrival_airport_icao'] = $line['arrival'];
1487 2041
     		    //$data['arrival_airport_time'] = $line['arrival_time'];
1488 2042
     		    //$data['registration'] = $line['aircraft'];
1489
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
2043
+		    if (isset($line['route'])) {
2044
+		    	$data['waypoints'] = $line['route'];
2045
+		    }
2046
+		    // route
1490 2047
 	    	    $data['aircraft_icao'] = $line['plane_type'];
1491 2048
     		    $data['id_source'] = $id_source;
1492 2049
 	    	    $data['format_source'] = 'vam';
1493
-		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true;
1494
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
2050
+		    if (isset($value['noarchive']) && $value['noarchive'] === TRUE) {
2051
+		    	$data['noarchive'] = true;
2052
+		    }
2053
+		    if (isset($value['name']) && $value['name'] != '') {
2054
+		    	$data['source_name'] = $value['name'];
2055
+		    }
1495 2056
 		    $SI->add($data);
1496 2057
 		    unset($data);
1497 2058
 		}
1498
-		if ($globalDebug) echo 'No more data...'."\n";
2059
+		if ($globalDebug) {
2060
+			echo 'No more data...'."\n";
2061
+		}
1499 2062
 		unset($buffer);
1500 2063
 		unset($all_data);
1501 2064
 	    }
@@ -1508,7 +2071,9 @@  discard block
 block discarded – undo
1508 2071
 	    )
1509 2072
 	) {
1510 2073
 	    //$buffer = $Common->getData($hosts[$id]);
1511
-	    if ($globalDebug) echo 'Get Data...'."\n";
2074
+	    if ($globalDebug) {
2075
+	    	echo 'Get Data...'."\n";
2076
+	    }
1512 2077
 	    $buffer = $Common->getData($value['host']);
1513 2078
 	    $all_data = json_decode($buffer,true);
1514 2079
 	    if ($buffer != '') {
@@ -1526,12 +2091,16 @@  discard block
 block discarded – undo
1526 2091
 			$data['id_source'] = $id_source;
1527 2092
 			$data['format_source'] = 'blitzortung';
1528 2093
 			$SI->add($data);
1529
-			if ($globalDebug) echo '☈ Lightning added'."\n";
2094
+			if ($globalDebug) {
2095
+				echo '☈ Lightning added'."\n";
2096
+			}
1530 2097
 			$Source->addLocation('',$data['latitude'],$data['longitude'],0,'','','blitzortung','weather/thunderstorm.png','lightning',$id,0,$data['datetime']);
1531 2098
 			unset($data);
1532 2099
 		    }
1533 2100
 		}
1534
-		if ($globalDebug) echo 'No more data...'."\n";
2101
+		if ($globalDebug) {
2102
+			echo 'No more data...'."\n";
2103
+		}
1535 2104
 		unset($buffer);
1536 2105
 	    }
1537 2106
 	    $last_exec[$id]['last'] = time();
@@ -1543,7 +2112,9 @@  discard block
 block discarded – undo
1543 2112
 	    $write = NULL;
1544 2113
 	    $e = NULL;
1545 2114
 	    $n = socket_select($read, $write, $e, $timeout);
1546
-	    if ($e != NULL) var_dump($e);
2115
+	    if ($e != NULL) {
2116
+	    	var_dump($e);
2117
+	    }
1547 2118
 	    if ($n > 0) {
1548 2119
 		$reset = 0;
1549 2120
 		foreach ($read as $nb => $r) {
@@ -1565,13 +2136,17 @@  discard block
 block discarded – undo
1565 2136
 		    if ($buffer !== FALSE) {
1566 2137
 			if ($format === 'vrstcp') {
1567 2138
 			    $buffer = explode('},{',$buffer);
1568
-			} else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
2139
+			} else {
2140
+				$buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer));
2141
+			}
1569 2142
 		    }
1570 2143
 		    // SBS format is CSV format
1571 2144
 		    if ($buffer !== FALSE && $buffer !== '') {
1572 2145
 			$tt[$format] = 0;
1573 2146
 			if ($format === 'acarssbs3') {
1574
-			    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
2147
+			    if ($globalDebug) {
2148
+			    	echo 'ACARS : '.$buffer."\n";
2149
+			    }
1575 2150
 			    $ACARS->add(trim($buffer));
1576 2151
 			    $ACARS->deleteLiveAcarsData();
1577 2152
 			} elseif ($format === 'raw') {
@@ -1580,30 +2155,70 @@  discard block
 block discarded – undo
1580 2155
 			    if (is_array($data)) {
1581 2156
 				$data['datetime'] = date('Y-m-d H:i:s');
1582 2157
 				$data['format_source'] = 'raw';
1583
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1584
-				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1585
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1586
-				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
2158
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
2159
+					$data['source_name'] = $globalSources[$nb]['name'];
2160
+				}
2161
+				if (isset($globalSources[$nb]['sourcestats'])) {
2162
+					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2163
+				}
2164
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2165
+					$data['noarchive'] = true;
2166
+				}
2167
+				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
2168
+					$SI->add($data);
2169
+				}
1587 2170
 			    }
1588 2171
 			} elseif ($format === 'ais') {
1589 2172
 			    $ais_data = $AIS->parse_line(trim($buffer));
1590 2173
 			    $data = array();
1591
-			    if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident'];
1592
-			    if (isset($ais_data['mmsi'])) $data['mmsi'] = substr($ais_data['mmsi'],-9);
1593
-			    if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed'];
1594
-			    if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading'];
1595
-			    if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude'];
1596
-			    if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude'];
1597
-			    if (isset($ais_data['status'])) $data['status'] = $ais_data['status'];
1598
-			    if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid'];
1599
-			    if (isset($ais_data['type'])) $data['type'] = $ais_data['type'];
1600
-			    if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo'];
1601
-			    if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign'];
1602
-			    if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination'];
1603
-			    if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
1604
-			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1605
-			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1606
-			    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2174
+			    if (isset($ais_data['ident'])) {
2175
+			    	$data['ident'] = $ais_data['ident'];
2176
+			    }
2177
+			    if (isset($ais_data['mmsi'])) {
2178
+			    	$data['mmsi'] = substr($ais_data['mmsi'],-9);
2179
+			    }
2180
+			    if (isset($ais_data['speed'])) {
2181
+			    	$data['speed'] = $ais_data['speed'];
2182
+			    }
2183
+			    if (isset($ais_data['heading'])) {
2184
+			    	$data['heading'] = $ais_data['heading'];
2185
+			    }
2186
+			    if (isset($ais_data['latitude'])) {
2187
+			    	$data['latitude'] = $ais_data['latitude'];
2188
+			    }
2189
+			    if (isset($ais_data['longitude'])) {
2190
+			    	$data['longitude'] = $ais_data['longitude'];
2191
+			    }
2192
+			    if (isset($ais_data['status'])) {
2193
+			    	$data['status'] = $ais_data['status'];
2194
+			    }
2195
+			    if (isset($ais_data['statusid'])) {
2196
+			    	$data['status_id'] = $ais_data['statusid'];
2197
+			    }
2198
+			    if (isset($ais_data['type'])) {
2199
+			    	$data['type'] = $ais_data['type'];
2200
+			    }
2201
+			    if (isset($ais_data['imo'])) {
2202
+			    	$data['imo'] = $ais_data['imo'];
2203
+			    }
2204
+			    if (isset($ais_data['callsign'])) {
2205
+			    	$data['callsign'] = $ais_data['callsign'];
2206
+			    }
2207
+			    if (isset($ais_data['destination'])) {
2208
+			    	$data['arrival_code'] = $ais_data['destination'];
2209
+			    }
2210
+			    if (isset($ais_data['eta_ts'])) {
2211
+			    	$data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']);
2212
+			    }
2213
+			    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2214
+			    	$data['noarchive'] = true;
2215
+			    }
2216
+			    if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
2217
+			    	$data['source_name'] = $globalSources[$nb]['name'];
2218
+			    }
2219
+			    if (isset($globalSources[$nb]['sourcestats'])) {
2220
+			    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2221
+			    }
1607 2222
 
1608 2223
 			    if (isset($ais_data['timestamp'])) {
1609 2224
 				$data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']);
@@ -1612,7 +2227,9 @@  discard block
 block discarded – undo
1612 2227
 			    }
1613 2228
 			    $data['format_source'] = 'aisnmea';
1614 2229
     			    $data['id_source'] = $id_source;
1615
-			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') $MI->add($data);
2230
+			    if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] === 'Ship') {
2231
+			    	$MI->add($data);
2232
+			    }
1616 2233
 			    unset($data);
1617 2234
                         } elseif ($format === 'flightgearsp') {
1618 2235
                     	    //echo $buffer."\n";
@@ -1630,12 +2247,18 @@  discard block
 block discarded – undo
1630 2247
 				$data['speed'] = round($line[5]*1.94384);
1631 2248
 				$data['datetime'] = date('Y-m-d H:i:s');
1632 2249
 				$data['format_source'] = 'flightgearsp';
1633
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1634
-				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
2250
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2251
+					$data['noarchive'] = true;
2252
+				}
2253
+				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
2254
+					$SI->add($data);
2255
+				}
1635 2256
 				//$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
1636 2257
 			    }
1637 2258
                         } elseif ($format === 'acars') {
1638
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
2259
+                    	    if ($globalDebug) {
2260
+                    	    	echo 'ACARS : '.$buffer."\n";
2261
+                    	    }
1639 2262
 			    $ACARS->add(trim($buffer));
1640 2263
 			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
1641 2264
 			    $ACARS->deleteLiveAcarsData();
@@ -1656,8 +2279,12 @@  discard block
 block discarded – undo
1656 2279
 				    $aircraft_type = $line[10];
1657 2280
 				    $aircraft_type = preg_split(':/:',$aircraft_type);
1658 2281
 				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
1659
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1660
-				    if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
2282
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2283
+				    	$data['noarchive'] = true;
2284
+				    }
2285
+				    if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
2286
+				    	$SI->add($data);
2287
+				    }
1661 2288
 				}
1662 2289
 			    }
1663 2290
 			} elseif ($format === 'beast') {
@@ -1667,28 +2294,62 @@  discard block
 block discarded – undo
1667 2294
 			    foreach($buffer as $all_data) {
1668 2295
 				$line = json_decode('{'.$all_data.'}',true);
1669 2296
 				$data = array();
1670
-				if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex
1671
-				if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
1672
-				if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
1673
-				if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
1674
-				if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
1675
-				if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
1676
-				if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
2297
+				if (isset($line['Icao'])) {
2298
+					$data['hex'] = $line['Icao'];
2299
+				}
2300
+				// hex
2301
+				if (isset($line['Call'])) {
2302
+					$data['ident'] = $line['Call'];
2303
+				}
2304
+				// ident
2305
+				if (isset($line['Alt'])) {
2306
+					$data['altitude'] = $line['Alt'];
2307
+				}
2308
+				// altitude
2309
+				if (isset($line['Spd'])) {
2310
+					$data['speed'] = $line['Spd'];
2311
+				}
2312
+				// speed
2313
+				if (isset($line['Trak'])) {
2314
+					$data['heading'] = $line['Trak'];
2315
+				}
2316
+				// heading
2317
+				if (isset($line['Lat'])) {
2318
+					$data['latitude'] = $line['Lat'];
2319
+				}
2320
+				// lat
2321
+				if (isset($line['Long'])) {
2322
+					$data['longitude'] = $line['Long'];
2323
+				}
2324
+				// long
1677 2325
 				//$data['verticalrate'] = $line['']; // verticale rate
1678
-				if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
2326
+				if (isset($line['Sqk'])) {
2327
+					$data['squawk'] = $line['Sqk'];
2328
+				}
2329
+				// squawk
1679 2330
 				$data['emergency'] = ''; // emergency
1680
-				if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
2331
+				if (isset($line['Reg'])) {
2332
+					$data['registration'] = $line['Reg'];
2333
+				}
1681 2334
 				/*
1682 2335
 				if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
1683 2336
 				else $data['datetime'] = date('Y-m-d H:i:s');
1684 2337
 				*/
1685 2338
 				$data['datetime'] = date('Y-m-d H:i:s');
1686
-				if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
2339
+				if (isset($line['Type'])) {
2340
+					$data['aircraft_icao'] = $line['Type'];
2341
+				}
1687 2342
 		    		$data['format_source'] = 'vrstcp';
1688 2343
 				$data['id_source'] = $id_source;
1689
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1690
-				if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1691
-				if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data);
2344
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2345
+					$data['noarchive'] = true;
2346
+				}
2347
+				if (isset($value['name']) && $value['name'] != '') {
2348
+					$data['source_name'] = $value['name'];
2349
+				}
2350
+				if (isset($data['latitude']) && isset($data['hex'])) {
2351
+					$SI->add($data);
2352
+				}
1692 2353
 				unset($data);
1693 2354
 			    }
1694 2355
 			} elseif ($format === 'tsv' || substr($buffer,0,4) === 'clock') {
@@ -1701,22 +2362,46 @@  discard block
 block discarded – undo
1701 2362
     				$data['hex'] = $lined['hexid'];
1702 2363
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
1703 2364
     				$data['datetime'] = date('Y-m-d H:i:s');;
1704
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
1705
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
1706
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
1707
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
1708
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
1709
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
1710
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
2365
+    				if (isset($lined['ident'])) {
2366
+    					$data['ident'] = $lined['ident'];
2367
+    				}
2368
+    				if (isset($lined['lat'])) {
2369
+    					$data['latitude'] = $lined['lat'];
2370
+    				}
2371
+    				if (isset($lined['lon'])) {
2372
+    					$data['longitude'] = $lined['lon'];
2373
+    				}
2374
+    				if (isset($lined['speed'])) {
2375
+    					$data['speed'] = $lined['speed'];
2376
+    				}
2377
+    				if (isset($lined['squawk'])) {
2378
+    					$data['squawk'] = $lined['squawk'];
2379
+    				}
2380
+    				if (isset($lined['alt'])) {
2381
+    					$data['altitude'] = $lined['alt'];
2382
+    				}
2383
+    				if (isset($lined['heading'])) {
2384
+    					$data['heading'] = $lined['heading'];
2385
+    				}
1711 2386
     				$data['id_source'] = $id_source;
1712 2387
     				$data['format_source'] = 'tsv';
1713
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1714
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1715
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1716
-    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
2388
+    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
2389
+    					$data['source_name'] = $globalSources[$nb]['name'];
2390
+    				}
2391
+    				if (isset($globalSources[$nb]['sourcestats'])) {
2392
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2393
+    				}
2394
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2395
+					$data['noarchive'] = true;
2396
+				}
2397
+    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
2398
+    					$SI->add($data);
2399
+    				}
1717 2400
     				unset($lined);
1718 2401
     				unset($data);
1719
-    			    } else $error = true;
2402
+    			    } else {
2403
+    			    	$error = true;
2404
+    			    }
1720 2405
 			} elseif ($format === 'aprs' && $use_aprs) {
1721 2406
 			    if ($aprs_connect === 0) {
1722 2407
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
@@ -1742,47 +2427,96 @@  discard block
 block discarded – undo
1742 2427
 				    $aprs_last_tx = time();
1743 2428
 				    $data = array();
1744 2429
 				    //print_r($line);
1745
-				    if (isset($line['address'])) $data['hex'] = $line['address'];
1746
-				    if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi'];
1747
-				    if (isset($line['imo'])) $data['imo'] = $line['imo'];
1748
-				    if (isset($line['squawk'])) $data['squawk'] = $line['squawk'];
1749
-				    if (isset($line['arrival_code'])) $data['arrival_code'] = $line['arrival_code'];
1750
-				    if (isset($line['arrival_date'])) $data['arrival_date'] = $line['arrival_date'];
1751
-				    if (isset($line['typeid'])) $data['type_id'] = $line['typeid'];
1752
-				    if (isset($line['statusid'])) $data['status_id'] = $line['statusid'];
1753
-				    if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
1754
-				    else $data['datetime'] = date('Y-m-d H:i:s');
2430
+				    if (isset($line['address'])) {
2431
+				    	$data['hex'] = $line['address'];
2432
+				    }
2433
+				    if (isset($line['mmsi'])) {
2434
+				    	$data['mmsi'] = $line['mmsi'];
2435
+				    }
2436
+				    if (isset($line['imo'])) {
2437
+				    	$data['imo'] = $line['imo'];
2438
+				    }
2439
+				    if (isset($line['squawk'])) {
2440
+				    	$data['squawk'] = $line['squawk'];
2441
+				    }
2442
+				    if (isset($line['arrival_code'])) {
2443
+				    	$data['arrival_code'] = $line['arrival_code'];
2444
+				    }
2445
+				    if (isset($line['arrival_date'])) {
2446
+				    	$data['arrival_date'] = $line['arrival_date'];
2447
+				    }
2448
+				    if (isset($line['typeid'])) {
2449
+				    	$data['type_id'] = $line['typeid'];
2450
+				    }
2451
+				    if (isset($line['statusid'])) {
2452
+				    	$data['status_id'] = $line['statusid'];
2453
+				    }
2454
+				    if (isset($line['timestamp'])) {
2455
+				    	$data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']);
2456
+				    } else {
2457
+				    	$data['datetime'] = date('Y-m-d H:i:s');
2458
+				    }
1755 2459
 				    //$data['datetime'] = date('Y-m-d H:i:s');
1756
-				    if (isset($line['ident'])) $data['ident'] = $line['ident'];
2460
+				    if (isset($line['ident'])) {
2461
+				    	$data['ident'] = $line['ident'];
2462
+				    }
1757 2463
 				    $data['latitude'] = $line['latitude'];
1758 2464
 				    $data['longitude'] = $line['longitude'];
1759 2465
 				    //$data['verticalrate'] = $line[16];
1760
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
2466
+				    if (isset($line['speed'])) {
2467
+				    	$data['speed'] = $line['speed'];
2468
+				    }
1761 2469
 				    //else $data['speed'] = 0;
1762
-				    if (isset($line['altitude'])) $data['altitude'] = $line['altitude'];
1763
-				    if (isset($line['comment'])) $data['comment'] = $line['comment'];
1764
-				    if (isset($line['symbol'])) $data['type'] = $line['symbol'];
2470
+				    if (isset($line['altitude'])) {
2471
+				    	$data['altitude'] = $line['altitude'];
2472
+				    }
2473
+				    if (isset($line['comment'])) {
2474
+				    	$data['comment'] = $line['comment'];
2475
+				    }
2476
+				    if (isset($line['symbol'])) {
2477
+				    	$data['type'] = $line['symbol'];
2478
+				    }
1765 2479
 				    //if (isset($line['heading'])) $data['heading'] = $line['heading'];
1766 2480
 				    
1767
-				    if (isset($line['heading']) && isset($line['format_source'])) $data['heading'] = $line['heading'];
2481
+				    if (isset($line['heading']) && isset($line['format_source'])) {
2482
+				    	$data['heading'] = $line['heading'];
2483
+				    }
1768 2484
 				    //else echo 'No heading...'."\n";
1769 2485
 				    //else $data['heading'] = 0;
1770
-				    if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth'];
2486
+				    if (isset($line['stealth'])) {
2487
+				    	$data['aircraft_type'] = $line['stealth'];
2488
+				    }
1771 2489
 				    //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true;
1772
-				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true;
1773
-				    elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false;
1774
-				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
1775
-				    elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false;
2490
+				    if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) {
2491
+				    	$data['noarchive'] = true;
2492
+				    } elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) {
2493
+				    	$data['noarchive'] = false;
2494
+				    }
2495
+				    if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2496
+				    	$data['noarchive'] = true;
2497
+				    } elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) {
2498
+				    	$data['noarchive'] = false;
2499
+				    }
1776 2500
     				    $data['id_source'] = $id_source;
1777
-    				    if (isset($line['format_source'])) $data['format_source'] = $line['format_source'];
1778
-				    else $data['format_source'] = 'aprs';
2501
+    				    if (isset($line['format_source'])) {
2502
+    				    	$data['format_source'] = $line['format_source'];
2503
+    				    } else {
2504
+				    	$data['format_source'] = 'aprs';
2505
+				    }
1779 2506
 				    $data['source_name'] = $line['source'];
1780
-				    if (isset($line['source_type'])) $data['source_type'] = $line['source_type'];
1781
-				    else $data['source_type'] = 'flarm';
1782
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2507
+				    if (isset($line['source_type'])) {
2508
+				    	$data['source_type'] = $line['source_type'];
2509
+				    } else {
2510
+				    	$data['source_type'] = 'flarm';
2511
+				    }
2512
+    				    if (isset($globalSources[$nb]['sourcestats'])) {
2513
+    				    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2514
+    				    }
1783 2515
 				    $currentdate = date('Y-m-d H:i:s');
1784 2516
 				    $aprsdate = strtotime($data['datetime']);
1785
-				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') $data['altitude_relative'] = 'AMSL';
2517
+				    if ($data['source_type'] != 'modes' && $data['source_type'] != 'ais') {
2518
+				    	$data['altitude_relative'] = 'AMSL';
2519
+				    }
1786 2520
 				    // Accept data if time <= system time + 20s
1787 2521
 				    //if (($data['source_type'] === 'modes') || isset($line['stealth']) && ($line['stealth'] === 0 || $line['stealth'] === '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1788 2522
 				    if (
@@ -1794,7 +2528,9 @@  discard block
 block discarded – undo
1794 2528
 					$send = $SI->add($data);
1795 2529
 				    } elseif ($data['source_type'] === 'ais') {
1796 2530
 					$data['type'] = '';
1797
-					if (isset($globalMarine) && $globalMarine) $send = $MI->add($data);
2531
+					if (isset($globalMarine) && $globalMarine) {
2532
+						$send = $MI->add($data);
2533
+					}
1798 2534
 				    } elseif (isset($line['stealth']) && $line['stealth'] != 0) {
1799 2535
 					 echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1800 2536
 				    } elseif (isset($globalAircraft) && $globalAircraft && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
@@ -1802,8 +2538,12 @@  discard block
 block discarded – undo
1802 2538
 					    $line['symbol'] === 'Glider' || 
1803 2539
 					    $line['symbol'] === 'No. Plane' || 
1804 2540
 					    $line['symbol'] === 'Aircraft (small)' || $line['symbol'] === 'Helicopter')) {
1805
-					    if ($line['symbol'] === 'Ballon') $data['aircraft_icao'] = 'BALL';
1806
-					    if ($line['symbol'] === 'Glider') $data['aircraft_icao'] = 'PARAGLIDER';
2541
+					    if ($line['symbol'] === 'Ballon') {
2542
+					    	$data['aircraft_icao'] = 'BALL';
2543
+					    }
2544
+					    if ($line['symbol'] === 'Glider') {
2545
+					    	$data['aircraft_icao'] = 'PARAGLIDER';
2546
+					    }
1807 2547
 					    $send = $SI->add($data);
1808 2548
 				    } elseif (isset($globalMarine) && $globalMarine && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && (
1809 2549
 					    $line['symbol'] === 'Yacht (Sail)' || 
@@ -1834,9 +2574,13 @@  discard block
 block discarded – undo
1834 2574
 				    //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1835 2575
 				//    } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') {
1836 2576
 					//echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n";
1837
-					if (isset($globalTracker) && $globalTracker) $send = $TI->add($data);
2577
+					if (isset($globalTracker) && $globalTracker) {
2578
+						$send = $TI->add($data);
2579
+					}
1838 2580
 				    } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident']) && isset($data['altitude'])) {
1839
-					if (!isset($data['altitude'])) $data['altitude'] = 0;
2581
+					if (!isset($data['altitude'])) {
2582
+						$data['altitude'] = 0;
2583
+					}
1840 2584
 					$Source->deleteOldLocationByType('gs');
1841 2585
 					if (count($Source->getLocationInfoByNameType($data['ident'],'gs')) > 0) {
1842 2586
 						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']);
@@ -1845,7 +2589,9 @@  discard block
 block discarded – undo
1845 2589
 					}
1846 2590
 				    } elseif (isset($line['symbol']) && $line['symbol'] === 'Weather Station') {
1847 2591
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1848
-					if ($globalDebug) echo '# Weather Station added'."\n";
2592
+					if ($globalDebug) {
2593
+						echo '# Weather Station added'."\n";
2594
+					}
1849 2595
 					$Source->deleteOldLocationByType('wx');
1850 2596
 					$weather_data = json_encode($line);
1851 2597
 					if (count($Source->getLocationInfoByNameType($data['ident'],'wx')) > 0) {
@@ -1855,7 +2601,9 @@  discard block
 block discarded – undo
1855 2601
 					}
1856 2602
 				    } elseif (isset($line['symbol']) && ($line['symbol'] === 'Lightning' || $line['symbol'] === 'Thunderstorm')) {
1857 2603
 					//if ($globalDebug) echo '!! Weather Station not yet supported'."\n";
1858
-					if ($globalDebug) echo '☈ Lightning added'."\n";
2604
+					if ($globalDebug) {
2605
+						echo '☈ Lightning added'."\n";
2606
+					}
1859 2607
 					$Source->deleteOldLocationByType('lightning');
1860 2608
 					if (count($Source->getLocationInfoByNameType($data['ident'],'lightning')) > 0) {
1861 2609
 						$Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],0,'','',$data['source_name'],'weather/thunderstorm.png','lightning',$id,0,$data['datetime'],$data['comment']);
@@ -1867,8 +2615,7 @@  discard block
 block discarded – undo
1867 2615
 				    	print_r($line);
1868 2616
 				    }
1869 2617
 				    unset($data);
1870
-				}
1871
-				elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
2618
+				} elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') {
1872 2619
 					$Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']);
1873 2620
 				}
1874 2621
 				/*
@@ -1877,7 +2624,9 @@  discard block
 block discarded – undo
1877 2624
 				}
1878 2625
 				*/
1879 2626
 				//elseif ($line === false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
1880
-				elseif ($line === true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
2627
+				elseif ($line === true && $globalDebug) {
2628
+					echo '!! Failed : '.$buffer."!!\n";
2629
+				}
1881 2630
 				if (isset($globalSources[$nb]['last_weather_clean']) && time()-$globalSources[$nb]['last_weather_clean'] > 60*5) {
1882 2631
 					$Source->deleteOldLocationByType('lightning');
1883 2632
 					$Source->deleteOldLocationByType('wx');
@@ -1913,27 +2662,47 @@  discard block
 block discarded – undo
1913 2662
     				$data['ground'] = $line[21];
1914 2663
     				$data['emergency'] = $line[19];
1915 2664
     				$data['format_source'] = 'sbs';
1916
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
1917
-				elseif ($line[0] == 'MLAT') $data['source_name'] = 'MLAT';
1918
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1919
-				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true;
2665
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
2666
+					$data['source_name'] = $globalSources[$nb]['name'];
2667
+				} elseif ($line[0] == 'MLAT') {
2668
+					$data['source_name'] = 'MLAT';
2669
+				}
2670
+    				if (isset($globalSources[$nb]['sourcestats'])) {
2671
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
2672
+    				}
2673
+				if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) {
2674
+					$data['noarchive'] = true;
2675
+				}
1920 2676
     				$data['id_source'] = $id_source;
1921
-    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1922
-    				else $error = true;
2677
+    				if (($data['latitude'] === '' && $data['longitude'] === '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
2678
+    					$send = $SI->add($data);
2679
+    				} else {
2680
+    					$error = true;
2681
+    				}
1923 2682
     				unset($data);
1924
-    			    } else $error = true;
2683
+    			    } else {
2684
+    			    	$error = true;
2685
+    			    }
1925 2686
 			    if ($error) {
1926 2687
 				if (count($line) > 1 && ($line[0] === 'STA' || $line[0] === 'AIR' || $line[0] === 'SEL' || $line[0] === 'ID' || $line[0] === 'CLK')) { 
1927
-					if ($globalDebug) echo "Not a message. Ignoring... \n";
2688
+					if ($globalDebug) {
2689
+						echo "Not a message. Ignoring... \n";
2690
+					}
1928 2691
 				} else {
1929
-					if ($globalDebug) echo "Wrong line format. Ignoring... \n";
2692
+					if ($globalDebug) {
2693
+						echo "Wrong line format. Ignoring... \n";
2694
+					}
1930 2695
 					if ($globalDebug) {
1931 2696
 						echo $buffer;
1932 2697
 						//print_r($line);
1933 2698
 					}
1934 2699
 					//socket_close($r);
1935
-					if ($globalDebug) echo "Reconnect after an error...\n";
1936
-					if ($format === 'aprs') $aprs_connect = 0;
2700
+					if ($globalDebug) {
2701
+						echo "Reconnect after an error...\n";
2702
+					}
2703
+					if ($format === 'aprs') {
2704
+						$aprs_connect = 0;
2705
+					}
1937 2706
 					$sourceer[$nb] = $globalSources[$nb];
1938 2707
 					connect_all($sourceer);
1939 2708
 					$sourceer = array();
@@ -1941,10 +2710,14 @@  discard block
 block discarded – undo
1941 2710
 			    }
1942 2711
 			}
1943 2712
 			// Sleep for xxx microseconds
1944
-			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
2713
+			if (isset($globalSBSSleep)) {
2714
+				usleep($globalSBSSleep);
2715
+			}
1945 2716
 		    } else {
1946 2717
 			if ($format === 'flightgearmp') {
1947
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
2718
+			    	if ($globalDebug) {
2719
+			    		echo "Reconnect FlightGear MP...";
2720
+			    	}
1948 2721
 				//@socket_close($r);
1949 2722
 				sleep($globalMinFetch);
1950 2723
 				$sourcefg[$nb] = $globalSources[$nb];
@@ -1953,10 +2726,15 @@  discard block
 block discarded – undo
1953 2726
 				break;
1954 2727
 				
1955 2728
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
1956
-			    if (isset($tt[$format])) $tt[$format]++;
1957
-			    else $tt[$format] = 0;
2729
+			    if (isset($tt[$format])) {
2730
+			    	$tt[$format]++;
2731
+			    } else {
2732
+			    	$tt[$format] = 0;
2733
+			    }
1958 2734
 			    if ($tt[$format] > 30 || $buffer === FALSE) {
1959
-				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
2735
+				if ($globalDebug) {
2736
+					echo "ERROR : Reconnect ".$format."...";
2737
+				}
1960 2738
 				//@socket_close($r);
1961 2739
 				sleep(2);
1962 2740
 				$aprs_connect = 0;
@@ -1974,11 +2752,17 @@  discard block
 block discarded – undo
1974 2752
 	    } else {
1975 2753
 		$error = socket_strerror(socket_last_error());
1976 2754
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) {
1977
-			if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1978
-			if (isset($globalDebug)) echo "Restarting...\n";
2755
+			if ($globalDebug) {
2756
+				echo "ERROR : socket_select give this error ".$error . "\n";
2757
+			}
2758
+			if (isset($globalDebug)) {
2759
+				echo "Restarting...\n";
2760
+			}
1979 2761
 			// Restart the script if possible
1980 2762
 			if (is_array($sockets)) {
1981
-			    if ($globalDebug) echo "Shutdown all sockets...";
2763
+			    if ($globalDebug) {
2764
+			    	echo "Shutdown all sockets...";
2765
+			    }
1982 2766
 			    
1983 2767
 			    foreach ($sockets as $sock) {
1984 2768
 				@socket_shutdown($sock,2);
@@ -1986,25 +2770,45 @@  discard block
 block discarded – undo
1986 2770
 			    }
1987 2771
 			    
1988 2772
 			}
1989
-			if ($globalDebug) echo "Waiting...";
2773
+			if ($globalDebug) {
2774
+				echo "Waiting...";
2775
+			}
1990 2776
 			sleep(2);
1991 2777
 			$time = time();
1992 2778
 			//connect_all($hosts);
1993 2779
 			$aprs_connect = 0;
1994
-			if ($reset%5 === 0) sleep(20);
1995
-			if ($reset%10 === 0) sleep(100);
1996
-			if ($reset%20 === 0) sleep(200);
1997
-			if ($reset > 100) exit('Too many attempts...');
1998
-			if ($globalDebug) echo "Restart all connections...";
2780
+			if ($reset%5 === 0) {
2781
+				sleep(20);
2782
+			}
2783
+			if ($reset%10 === 0) {
2784
+				sleep(100);
2785
+			}
2786
+			if ($reset%20 === 0) {
2787
+				sleep(200);
2788
+			}
2789
+			if ($reset > 100) {
2790
+				exit('Too many attempts...');
2791
+			}
2792
+			if ($globalDebug) {
2793
+				echo "Restart all connections...";
2794
+			}
1999 2795
 			connect_all($globalSources);
2000 2796
 		}
2001 2797
 	    }
2002 2798
 	}
2003 2799
 	if ($globalDaemon === false) {
2004
-	    if ($globalDebug) echo 'Check all...'."\n";
2005
-	    if (isset($SI)) $SI->checkAll();
2006
-	    if (isset($TI)) $TI->checkAll();
2007
-	    if (isset($MI)) $MI->checkAll();
2800
+	    if ($globalDebug) {
2801
+	    	echo 'Check all...'."\n";
2802
+	    }
2803
+	    if (isset($SI)) {
2804
+	    	$SI->checkAll();
2805
+	    }
2806
+	    if (isset($TI)) {
2807
+	    	$TI->checkAll();
2808
+	    }
2809
+	    if (isset($MI)) {
2810
+	    	$MI->checkAll();
2811
+	    }
2008 2812
 	}
2009 2813
     }
2010 2814
 }
Please login to merge, or discard this patch.