View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 7b031c...3082e8 )
by Yannick
11:44
created
Status
Category
Toggle Patches
incident-detailed.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -58,8 +58,12 @@
 
 block discarded – undo
58 58 
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
59 59 
 	include('table-output.php');
60 60 
 	print '<div class="pagination">';
61 
-	if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
62 
-	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
61 
+	if ($limit_previous_1 >= 0) {
62 
+		print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
63 
+	}
64 
+	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
65 
+		print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
66 
+	}
63 67 
 	print '</div>';
64 68 
 }
65 69 
 print '</div>';
Please login to merge, or discard this patch.
airport-statistics-registration.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -23,7 +23,9 @@
 
 block discarded – undo
23 23 
 	print '<option></option>';
24 24 
 	$Stats = new Stats();
25 25 
 	$airport_names = $Stats->getAllAirportNames();
26 
-	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
26 
+	if (empty($airport_names)) {
27 
+		$airport_names = $Spotter->getAllAirportNames();
28 
+	}
27 29 
 	ksort($airport_names);
28 30 
 	foreach($airport_names as $airport_name)
29 31 
 	{
Please login to merge, or discard this patch.
airport-statistics-time.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -23,7 +23,9 @@
 
 block discarded – undo
23 23 
 	print '<option></option>';
24 24 
 	$Stats = new Stats();
25 25 
 	$airport_names = $Stats->getAllAirportNames();
26 
-	if (empty($airport_names)) $airport_names = $Spotter->getAllAirportNames();
26 
+	if (empty($airport_names)) {
27 
+		$airport_names = $Spotter->getAllAirportNames();
28 
+	}
27 29 
 	ksort($airport_names);
28 30 
 	foreach($airport_names as $airport_name)
29 31 
 	{
Please login to merge, or discard this patch.
aircraft.php 1 patch
Braces   +15 added lines, -5 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,9 @@  discard block
 
 block discarded – undo
16 16 
 	print '<h1>'._("Aircrafts Types").'</h1>';
17 17
18 18 
 	$aircraft_types = $Stats->getAllAircraftTypes();
19 
-	if (empty($aircraft_types) || $aircraft_types[0]['aircraft_manufacturer'] == '') $aircraft_types = $Spotter->getAllAircraftTypes();
19 
+	if (empty($aircraft_types) || $aircraft_types[0]['aircraft_manufacturer'] == '') {
20 
+		$aircraft_types = $Spotter->getAllAircraftTypes();
21 
+	}
20 22 
 	$previous = null;
21 23 
 	print '<div class="alphabet-legend">';
22 24 
 	foreach($aircraft_types as $value) {
 
@@ -24,10 +26,14 @@  discard block
 
 block discarded – undo
24 26 
 		$firstLetter = substr($value['aircraft_manufacturer'], 0, 1);
25 27 
 		if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
26 28 
 		{
27 
-			if ($previous !== null) print ' | ';
29 
+			if ($previous !== null) {
30 
+				print ' | ';
31 
+			}
28 32 
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
29 33 
 		}
30 
-		if ($firstLetter != '(' && $firstLetter != ')') $previous = $firstLetter;
34 
+		if ($firstLetter != '(' && $firstLetter != ')') {
35 
+			$previous = $firstLetter;
36 
+		}
31 37 
 	}
32 38 
 	print '</div>';
33 39 
 	$previous = null;
 
@@ -38,10 +44,14 @@  discard block
 
 block discarded – undo
38 44 
 		{
39 45 
 			if($previous !== $firstLetter && $firstLetter != '(' && $firstLetter != ')')
40 46 
 			{
41 
-				if ($previous !== null) print '</div>';
47 
+				if ($previous !== null) {
48 
+					print '</div>';
49 
+				}
42 50 
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
43 51 
 			}
44 
-			if ($firstLetter != '(' && $firstLetter != ')') $previous = $firstLetter;
52 
+			if ($firstLetter != '(' && $firstLetter != ')') {
53 
+				$previous = $firstLetter;
54 
+			}
45 55 
 			print '<div class="alphabet-item">';
46 56 
 			print '<a href="'.$globalURL.'/aircraft/'.$value['aircraft_icao'].'">';
47 57 
 			if ($value['aircraft_name'] == '') {
Please login to merge, or discard this patch.
table-output.php 1 patch
Braces   +45 added lines, -17 removed lines patch added patch discarded remove patch 
@@ -367,7 +367,9 @@  discard block
 
 block discarded – undo
367 367 
 	if (isset($globalTimezone))
368 368 
 	{
369 369 
 		date_default_timezone_set($globalTimezone);
370 
-	} else date_default_timezone_set('UTC');
370 
+	} else {
371 
+		date_default_timezone_set('UTC');
372 
+	}
371 373 
 	if ($showSpecial === true)
372 374 
 	{
373 375 
 		print '<tr class="special">'."\n";
 
@@ -386,8 +388,9 @@  discard block
 
 block discarded – undo
386 388 
 			print '<td class="aircraft_thumbnail">'."\n";
387 389
388 390 
 			if ($spotter_item['image_source'] == 'planespotters') {
389 
-				if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
390 
-				else {
391 
+				if ($spotter_item['image_source_website'] != '') {
392 
+					$image_src = $spotter_item['image_source_website'];
393 
+				} else {
391 394 
 					$planespotter_url_array = explode("_", $spotter_item['image']);
392 395 
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
393 396 
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 
@@ -400,7 +403,9 @@  discard block
 
 block discarded – undo
400 403 
                         } else {
401 404 
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
402 405 
                     		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
403 
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
406 
+                    		} else {
407 
+                    			$image_thumbnail = $spotter_item['image_thumbnail'];
408 
+                    		}
404 409 
 				if (isset($spotter_item['airline_name'])) {
405 410 
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
406 411 
 				} else {
 
@@ -422,8 +427,9 @@  discard block
 
 block discarded – undo
422 427 
 			print '<td class="aircraft_thumbnail">'."\n";
423 428 
 			//print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
424 429 
 			if ($spotter_item['image_source'] == 'planespotters') {
425 
-				if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
426 
-				else {
430 
+				if ($spotter_item['image_source_website'] != '') {
431 
+					$image_src = $spotter_item['image_source_website'];
432 
+				} else {
427 433 
 					$planespotter_url_array = explode("_", $spotter_array[0]['image']);
428 434 
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
429 435 
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
 
@@ -440,7 +446,9 @@  discard block
 
 block discarded – undo
440 446 
 			} else {
441 447 
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
442 448 
                     		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
443 
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
449 
+                    		} else {
450 
+                    			$image_thumbnail = $spotter_item['image_thumbnail'];
451 
+                    		}
444 452 
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
445 453 
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
446 454 
 				} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
 
@@ -527,15 +535,21 @@  discard block
 
 block discarded – undo
527 535 
 		if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
528 536 
 			if ($spotter_item['departure_airport_time'] > 2460) {
529 537 
 				$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
530 
-			} else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
538 
+			} else {
539 
+				$departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
540 
+			}
531 541 
 			if ($spotter_item['real_departure_airport_time'] > 2460) {
532 542 
 				$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
533 
-			} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
543 
+			} else {
544 
+				$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
545 
+			}
534 546 
 			print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
535 547 
 		} elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') {
536 548 
 			if ($spotter_item['real_departure_airport_time'] > 2460) {
537 549 
 				$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
538 
-			} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
550 
+			} else {
551 
+				$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
552 
+			}
539 553 
 			print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
540 554 
 		} elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
541 555 
 			if ($spotter_item['departure_airport_time'] > 2460) {
 
@@ -557,7 +571,9 @@  discard block
 
 block discarded – undo
557 571 
 					$longitude = $spotter_item['longitude'];
558 572 
 				}
559 573 
 				$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
560 
-			} else $distance = '';
574 
+			} else {
575 
+				$distance = '';
576 
+			}
561 577 
 			if ($distance != '') {
562 578 
 			    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
563 579 
 				    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
 
@@ -582,7 +598,9 @@  discard block
 
 block discarded – undo
582 598 
 		} else {
583 599 
 			if (isset($spotter_item['real_arrival_airport']) && $spotter_item['real_arrival_airport'] != $spotter_item['arrival_airport']) {
584 600 
 				print '<span class="nomobile">Scheduled : <a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a></span>'."\n";
585 
-				if (!isset($Spotter)) $Spotter = new Spotter();
601 
+				if (!isset($Spotter)) {
602 
+					$Spotter = new Spotter();
603 
+				}
586 604 
 				$arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['real_arrival_airport']);
587 605 
 				print '<br /><span class="nomobile">'._("Real:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$arrival_airport_info[0]['city'].','.$arrival_airport_info[0]['country'].' ('.$spotter_item['real_arrival_airport'].')</a></span>'."\n";
588 606 
 				print '<span class="mobile">'._("Scheduled:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$spotter_item['real_arrival_airport'].'</a></span>'."\n";
 
@@ -598,20 +616,28 @@  discard block
 
 block discarded – undo
598 616 
 		if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
599 617 
 			if ($spotter_item['arrival_airport_time'] > 2460) {
600 618 
 				$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
601 
-			} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
619 
+			} else {
620 
+				$arrival_airport_time = $spotter_item['arrival_airport_time'];
621 
+			}
602 622 
 			if ($spotter_item['real_arrival_airport_time'] > 2460) {
603 623 
 				$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
604 
-			} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
624 
+			} else {
625 
+				$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
626 
+			}
605 627 
 			print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
606 628 
 		} elseif (isset($spotter_item['real_arrival_airport_time'])) {
607 629 
 			if ($spotter_item['real_arrival_airport_time'] > 2460) {
608 630 
 				$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
609 
-			} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
631 
+			} else {
632 
+				$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
633 
+			}
610 634 
 			print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
611 635 
 		} elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
612 636 
 			if ($spotter_item['arrival_airport_time'] > 2460) {
613 637 
 				$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
614 
-			} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
638 
+			} else {
639 
+				$arrival_airport_time = $spotter_item['arrival_airport_time'];
640 
+			}
615 641 
 			print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
616 642 
 		}
617 643 
 		if (!isset($spotter_item['real_arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
 
@@ -624,7 +650,9 @@  discard block
 
 block discarded – undo
624 650 
 					$longitude = $spotter_item['longitude'];
625 651 
 				}
626 652 
 				$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
627 
-			} else $distance = '';
653 
+			} else {
654 
+				$distance = '';
655 
+			}
628 656 
 			if ($distance != '') {
629 657 
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
630 658 
 					echo '<br/><i>'.round($distance*0.539957).' nm</i>';
Please login to merge, or discard this patch.
require/class.Accident.php 1 patch
Braces   +75 added lines, -27 removed lines patch added patch discarded remove patch 
@@ -96,8 +96,11 @@  discard block
 
 block discarded – undo
96 96 
 			$data = array();
97 97 
 			if ($row['registration'] != '') {
98 98 
 				$image_array = $Image->getSpotterImage($row['registration']);
99 
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
100 
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
99 
+				if (count($image_array) > 0) {
100 
+					$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
101 
+				} else {
102 
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
103 
+				}
101 104 
 				$aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']);
102 105 
 				$aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type);
103 106 
 				if (!empty($aircraft_info)) {
 
@@ -113,17 +116,30 @@  discard block
 
 block discarded – undo
113 116 
 					$data['aircraft_base'] = $owner_data['base'];
114 117 
 					$data['aircraft_date_first_reg'] = $owner_data['date_first_reg'];
115 118 
 				}
116 
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
117 
-			if ($row['registration'] == '') $row['registration'] = 'NA';
118 
-			if ($row['ident'] == '') $row['ident'] = 'NA';
119 
+			} else {
120 
+				$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
121 
+			}
122 
+			if ($row['registration'] == '') {
123 
+				$row['registration'] = 'NA';
124 
+			}
125 
+			if ($row['ident'] == '') {
126 
+				$row['ident'] = 'NA';
127 
+			}
119 128 
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3));
120 129 
 			if (isset($identicao[0])) {
121 130 
 				if (substr($row['ident'],0,2) == 'AF') {
122 
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
123 
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
124 
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
131 
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
132 
+						$icao = $row['ident'];
133 
+					} else {
134 
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
135 
+					}
136 
+				} else {
137 
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
138 
+				}
125 139 
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
126 
-			} else $icao = $row['ident'];
140 
+			} else {
141 
+				$icao = $row['ident'];
142 
+			}
127 143 
 			$icao = $Translation->checkTranslation($icao,false);
128 144 
 			//$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url']));
129 145 
 			if ($row['airline_name'] != '' && !isset($data['airline_name'])) {
 
@@ -138,10 +154,14 @@  discard block
 
 block discarded – undo
138 154 
 				//else echo 'No data...'."\n";
139 155 
 			}
140 156 
 			$data = array_merge($row,$data);
141 
-			if ($data['ident'] == null) $data['ident'] = $icao;
157 
+			if ($data['ident'] == null) {
158 
+				$data['ident'] = $icao;
159 
+			}
142 160 
 			if ($data['title'] == null) {
143 161 
 				$data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country'];
144 
-			} else $data['message'] = strtolower($data['title']);
162 
+			} else {
163 
+				$data['message'] = strtolower($data['title']);
164 
+			}
145 165 
 			$ids = $Spotter->getAllIDByRegistration($data['registration']);
146 166 
 			$date = $data['date'];
147 167 
 			if (isset($ids[$date])) {
 
@@ -158,8 +178,9 @@  discard block
 
 block discarded – undo
158 178 
 		if (isset($result)) {
159 179 
 			$result[0]['query_number_rows'] = $i;
160 180 
 			return $result;
181 
+		} else {
182 
+			return array();
161 183 
 		}
162 
-		else return array();
163 184 
 	}
164 185
165 186 
 	/*
 
@@ -198,7 +219,9 @@  discard block
 
 block discarded – undo
198 219 
 	*/
199 220 
 	public function import($file) {
200 221 
 		global $globalTransaction, $globalDebug;
201 
-		if ($globalDebug) echo 'Import '.$file."\n";
222 
+		if ($globalDebug) {
223 
+			echo 'Import '.$file."\n";
224 
+		}
202 225 
 		$result = array();
203 226 
 		if (file_exists($file)) {
204 227 
 			if (($handle = fopen($file,'r')) !== FALSE) {
 
@@ -209,8 +232,11 @@  discard block
 
 block discarded – undo
209 232 
 				}
210 233 
 				fclose($handle);
211 234 
 			}
212 
-			if (!empty($result)) $this->add($result,true);
213 
-			elseif ($globalDebug) echo 'Nothing to import';
235 
+			if (!empty($result)) {
236 
+				$this->add($result,true);
237 
+			} elseif ($globalDebug) {
238 
+				echo 'Nothing to import';
239 
+			}
214 240 
 		}
215 241 
 	}
216 242 
 
@@ -246,14 +272,23 @@  discard block
 
 block discarded – undo
246 272 
 					}
247 273 
 				}
248 274 
 				fclose($handle);
249 
-			} elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
250 
-		} elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
275 
+			} elseif ($globalDebug) {
276 
+				echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5';
277 
+			}
278 
+		} elseif ($globalDebug) {
279 
+			echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.';
280 
+		}
251 281 
 		$result = $Common->arr_diff($all_md5_new,$all_md5);
252 
-		if (empty($result) && $globalDebug) echo 'Nothing to update';
282 
+		if (empty($result) && $globalDebug) {
283 
+			echo 'Nothing to update';
284 
+		}
253 285 
 		foreach ($result as $file => $md5) {
254 286 
 			$Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file);
255 
-			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file);
256 
-			elseif ($globalDebug) echo 'Download '.$file.' failed';
287 
+			if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) {
288 
+				$this->import(dirname(__FILE__).'/../install/tmp/'.$file);
289 
+			} elseif ($globalDebug) {
290 
+				echo 'Download '.$file.' failed';
291 
+			}
257 292 
 		}
258 293 
 	}
259 294 
 
@@ -270,13 +305,17 @@  discard block
 
 block discarded – undo
270 305 
 		$Image = new Image();
271 306 
 		$Spotter = new Spotter();
272 307
273 
-		if (empty($crash)) return false;
308 
+		if (empty($crash)) {
309 
+			return false;
310 
+		}
274 311 
 		if (!$new) {
275 312 
 			$query_delete = 'DELETE FROM accidents WHERE source = :source';
276 313 
 			$sthd = $Connection->db->prepare($query_delete);
277 314 
 			$sthd->execute(array(':source' => $crash[0]['source']));
278 315 
 		}
279 
-		if ($globalTransaction) $Connection->db->beginTransaction();
316 
+		if ($globalTransaction) {
317 
+			$Connection->db->beginTransaction();
318 
+		}
280 319 
 		$initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null);
281 320 
 		$query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source';
282 321 
 		$sth_check = $Connection->db->prepare($query_check);
 
@@ -291,7 +330,9 @@  discard block
 
 block discarded – undo
291 330 
 					return $value === "" ? NULL : $value;
292 331 
 				}, $cr);
293 332 
 				if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) {
294 
-					if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
333 
+					if (strpos($cr['registration'],'-') === FALSE) {
334 
+						$cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']);
335 
+					}
295 336 
 					$query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']);
296 337 
 					$sth_check->execute($query_check_values);
297 338 
 					$result_check = $sth_check->fetch(PDO::FETCH_ASSOC);
 
@@ -313,9 +354,13 @@  discard block
 
 block discarded – undo
313 354 
 					$Connection->db->beginTransaction();
314 355 
 				}
315 356 
 			}
316 
-			if ($globalTransaction) $Connection->db->commit();
357 
+			if ($globalTransaction) {
358 
+				$Connection->db->commit();
359 
+			}
317 360 
 		} catch(PDOException $e) {
318 
-			if ($globalTransaction) $Connection->db->rollBack();
361 
+			if ($globalTransaction) {
362 
+				$Connection->db->rollBack();
363 
+			}
319 364 
 			echo $e->getMessage();
320 365 
 		}
321 366 
 		$sth_check->closeCursor();
 
@@ -354,8 +399,11 @@  discard block
 
 block discarded – undo
354 399 
 			return "error : ".$e->getMessage();
355 400 
 		}
356 401 
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
357 
-		if ($row['nb'] > 0) return false;
358 
-		else return true;
402 
+		if ($row['nb'] > 0) {
403 
+			return false;
404 
+		} else {
405 
+			return true;
406 
+		}
359 407 
 	}
360 408
361 409 
 	public static function insert_last_accidents_update() {
Please login to merge, or discard this patch.
accident-latest.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -58,8 +58,12 @@
 
 block discarded – undo
58 58 
 if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) {
59 59 
 	include('table-output.php');
60 60 
 	print '<div class="pagination">';
61 
-	if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
62 
-	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
61 
+	if ($limit_previous_1 >= 0) {
62 
+		print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">&laquo;'._("Previous Page").'</a>';
63 
+	}
64 
+	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
65 
+		print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'&raquo;</a>';
66 
+	}
63 67 
 	print '</div>';
64 68 
 }
65 69 
 print '</div>';
Please login to merge, or discard this patch.
install/class.update_db.php 1 patch
Braces   +888 added lines, -307 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,9 @@  discard block
 
 block discarded – undo
16 16 
 		curl_setopt($ch, CURLOPT_URL, $url);
17 17 
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
18 18 
 		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
19 
-		if ($referer != '') curl_setopt($ch, CURLOPT_REFERER, $referer);
19 
+		if ($referer != '') {
20 
+			curl_setopt($ch, CURLOPT_REFERER, $referer);
21 
+		}
20 22 
 		curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5');
21 23 
 		curl_setopt($ch, CURLOPT_FILE, $fp);
22 24 
 		curl_exec($ch);
 
@@ -27,12 +29,16 @@  discard block
 
 block discarded – undo
27 29 
 	public static function gunzip($in_file,$out_file_name = '') {
28 30 
 		//echo $in_file.' -> '.$out_file_name."\n";
29 31 
 		$buffer_size = 4096; // read 4kb at a time
30 
-		if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file);
32 
+		if ($out_file_name == '') {
33 
+			$out_file_name = str_replace('.gz', '', $in_file);
34 
+		}
31 35 
 		if ($in_file != '' && file_exists($in_file)) {
32 36 
 			// PHP version of Ubuntu use gzopen64 instead of gzopen
33 
-			if (function_exists('gzopen')) $file = gzopen($in_file,'rb');
34 
-			elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb');
35 
-			else {
37 
+			if (function_exists('gzopen')) {
38 
+				$file = gzopen($in_file,'rb');
39 
+			} elseif (function_exists('gzopen64')) {
40 
+				$file = gzopen64($in_file,'rb');
41 
+			} else {
36 42 
 				echo 'gzopen not available';
37 43 
 				die;
38 44 
 			}
 
@@ -53,8 +59,12 @@  discard block
 
 block discarded – undo
53 59 
 			if ($res === TRUE) {
54 60 
 				$zip->extractTo($path);
55 61 
 				$zip->close();
56 
-			} else return false;
57 
-		} else return false;
62 
+			} else {
63 
+				return false;
64 
+			}
65 
+		} else {
66 
+			return false;
67 
+		}
58 68 
 	}
59 69
60 70 
 	public static function connect_sqlite($database) {
 
@@ -69,7 +79,9 @@  discard block
 
 block discarded – undo
69 79 
 	public static function retrieve_route_sqlite_to_dest($database_file) {
70 80 
 		global $globalDebug, $globalTransaction;
71 81 
 		//$query = 'TRUNCATE TABLE routes';
72 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
82 
+		if ($globalDebug) {
83 
+			echo " - Delete previous routes from DB -";
84 
+		}
73 85 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
74 86 
 		$Connection = new Connection();
75 87 
 		try {
 
@@ -80,7 +92,9 @@  discard block
 
 block discarded – undo
80 92 
                         return "error : ".$e->getMessage();
81 93 
                 }
82 94
83 
-    		if ($globalDebug) echo " - Add routes to DB -";
95 
+    		if ($globalDebug) {
96 
+    			echo " - Add routes to DB -";
97 
+    		}
84 98 
     		update_db::connect_sqlite($database_file);
85 99 
 		//$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID';
86 100 
 		$query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID";
 
@@ -95,15 +109,21 @@  discard block
 
 block discarded – undo
95 109 
 		$Connection = new Connection();
96 110 
 		$sth_dest = $Connection->db->prepare($query_dest);
97 111 
 		try {
98 
-			if ($globalTransaction) $Connection->db->beginTransaction();
112 
+			if ($globalTransaction) {
113 
+				$Connection->db->beginTransaction();
114 
+			}
99 115 
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
100 116 
 				//$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
101 117 
 				$query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file);
102 118 
 				$sth_dest->execute($query_dest_values);
103 119 
             		}
104 
-			if ($globalTransaction) $Connection->db->commit();
120 
+			if ($globalTransaction) {
121 
+				$Connection->db->commit();
122 
+			}
105 123 
 		} catch(PDOException $e) {
106 
-			if ($globalTransaction) $Connection->db->rollBack();
124 
+			if ($globalTransaction) {
125 
+				$Connection->db->rollBack();
126 
+			}
107 127 
 			return "error : ".$e->getMessage();
108 128 
 		}
109 129 
                 return '';
 
@@ -111,7 +131,9 @@  discard block
 
 block discarded – undo
111 131 
 	public static function retrieve_route_oneworld($database_file) {
112 132 
 		global $globalDebug, $globalTransaction;
113 133 
 		//$query = 'TRUNCATE TABLE routes';
114 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
134 
+		if ($globalDebug) {
135 
+			echo " - Delete previous routes from DB -";
136 
+		}
115 137 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
116 138 
 		$Connection = new Connection();
117 139 
 		try {
 
@@ -122,14 +144,18 @@  discard block
 
 block discarded – undo
122 144 
                         return "error : ".$e->getMessage();
123 145 
                 }
124 146
125 
-    		if ($globalDebug) echo " - Add routes to DB -";
147 
+    		if ($globalDebug) {
148 
+    			echo " - Add routes to DB -";
149 
+    		}
126 150 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
127 151 
 		$Spotter = new Spotter();
128 152 
 		if ($fh = fopen($database_file,"r")) {
129 153 
 			$query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)';
130 154 
 			$Connection = new Connection();
131 155 
 			$sth_dest = $Connection->db->prepare($query_dest);
132 
-			if ($globalTransaction) $Connection->db->beginTransaction();
156 
+			if ($globalTransaction) {
157 
+				$Connection->db->beginTransaction();
158 
+			}
133 159 
 			while (!feof($fh)) {
134 160 
 				$line = fgetcsv($fh,9999,',');
135 161 
 				if ($line[0] != '') {
 
@@ -138,13 +164,17 @@  discard block
 
 block discarded – undo
138 164 
 							$query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld');
139 165 
 							$sth_dest->execute($query_dest_values);
140 166 
 						} catch(PDOException $e) {
141 
-							if ($globalTransaction) $Connection->db->rollBack();
167 
+							if ($globalTransaction) {
168 
+								$Connection->db->rollBack();
169 
+							}
142 170 
 							return "error : ".$e->getMessage();
143 171 
 						}
144 172 
 					}
145 173 
 				}
146 174 
 			}
147 
-			if ($globalTransaction) $Connection->db->commit();
175 
+			if ($globalTransaction) {
176 
+				$Connection->db->commit();
177 
+			}
148 178 
 		}
149 179 
                 return '';
150 180 
 	}
 
@@ -152,7 +182,9 @@  discard block
 
 block discarded – undo
152 182 
 	public static function retrieve_route_skyteam($database_file) {
153 183 
 		global $globalDebug, $globalTransaction;
154 184 
 		//$query = 'TRUNCATE TABLE routes';
155 
-		if ($globalDebug) echo " - Delete previous routes from DB -";
185 
+		if ($globalDebug) {
186 
+			echo " - Delete previous routes from DB -";
187 
+		}
156 188 
 		$query = "DELETE FROM routes WHERE Source = '' OR Source = :source";
157 189 
 		$Connection = new Connection();
158 190 
 		try {
 
@@ -163,7 +195,9 @@  discard block
 
 block discarded – undo
163 195 
                         return "error : ".$e->getMessage();
164 196 
                 }
165 197
166 
-    		if ($globalDebug) echo " - Add routes to DB -";
198 
+    		if ($globalDebug) {
199 
+    			echo " - Add routes to DB -";
200 
+    		}
167 201
168 202 
 		require_once(dirname(__FILE__).'/../require/class.Spotter.php');
169 203 
 		$Spotter = new Spotter();
 
@@ -172,7 +206,9 @@  discard block
 
 block discarded – undo
172 206 
 			$Connection = new Connection();
173 207 
 			$sth_dest = $Connection->db->prepare($query_dest);
174 208 
 			try {
175 
-				if ($globalTransaction) $Connection->db->beginTransaction();
209 
+				if ($globalTransaction) {
210 
+					$Connection->db->beginTransaction();
211 
+				}
176 212 
 				while (!feof($fh)) {
177 213 
 					$line = fgetcsv($fh,9999,',');
178 214 
 					if ($line[0] != '') {
 
@@ -183,9 +219,13 @@  discard block
 
 block discarded – undo
183 219 
 						}
184 220 
 					}
185 221 
 				}
186 
-				if ($globalTransaction) $Connection->db->commit();
222 
+				if ($globalTransaction) {
223 
+					$Connection->db->commit();
224 
+				}
187 225 
 			} catch(PDOException $e) {
188 
-				if ($globalTransaction) $Connection->db->rollBack();
226 
+				if ($globalTransaction) {
227 
+					$Connection->db->rollBack();
228 
+				}
189 229 
 				return "error : ".$e->getMessage();
190 230 
 			}
191 231 
 		}
 
@@ -228,11 +268,16 @@  discard block
 
 block discarded – undo
228 268 
 		$sth_dest = $Connection->db->prepare($query_dest);
229 269 
 		$sth_dest_owner = $Connection->db->prepare($query_dest_owner);
230 270 
 		try {
231 
-			if ($globalTransaction) $Connection->db->beginTransaction();
271 
+			if ($globalTransaction) {
272 
+				$Connection->db->beginTransaction();
273 
+			}
232 274 
             		while ($values = $sth->fetch(PDO::FETCH_ASSOC)) {
233 275 
 			//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
234 
-				if ($values['UserString4'] == 'M') $type = 'military';
235 
-				else $type = null;
276 
+				if ($values['UserString4'] == 'M') {
277 
+					$type = 'military';
278 
+				} else {
279 
+					$type = null;
280 
+				}
236 281 
 				$query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type);
237 282 
 				$sth_dest->execute($query_dest_values);
238 283 
 				if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') {
 
@@ -240,7 +285,9 @@  discard block
 
 block discarded – undo
240 285 
 				    $sth_dest_owner->execute($query_dest_owner_values);
241 286 
 				}
242 287 
             		}
243 
-			if ($globalTransaction) $Connection->db->commit();
288 
+			if ($globalTransaction) {
289 
+				$Connection->db->commit();
290 
+			}
244 291 
 		} catch(PDOException $e) {
245 292 
 			return "error : ".$e->getMessage();
246 293 
 		}
 
@@ -277,7 +324,9 @@  discard block
 
 block discarded – undo
277 324 
 			$Connection = new Connection();
278 325 
 			$sth_dest = $Connection->db->prepare($query_dest);
279 326 
 			try {
280 
-				if ($globalTransaction) $Connection->db->beginTransaction();
327 
+				if ($globalTransaction) {
328 
+					$Connection->db->beginTransaction();
329 
+				}
281 330 
             			while (!feof($fh)) {
282 331 
             				$values = array();
283 332 
             				$line = $Common->hex2str(fgets($fh,9999));
 
@@ -288,7 +337,9 @@  discard block
 
 block discarded – undo
288 337 
             				// Check if we can find ICAO, else set it to GLID
289 338 
             				$aircraft_name_split = explode(' ',$aircraft_name);
290 339 
             				$search_more = '';
291 
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
340 
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
341 
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
342 
+            				}
292 343 
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
293 344 
             				$sth_search = $Connection->db->prepare($query_search);
294 345 
 					try {
 
@@ -301,7 +352,9 @@  discard block
 
 block discarded – undo
301 352 
 					} catch(PDOException $e) {
302 353 
 						return "error : ".$e->getMessage();
303 354 
 					}
304 
-					if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID';
355 
+					if (!isset($values['ICAOTypeCode'])) {
356 
+						$values['ICAOTypeCode'] = 'GLID';
357 
+					}
305 358 
 					// Add data to db
306 359 
 					if ($values['Registration'] != '' && $values['Registration'] != '0000') {
307 360 
 						//$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']);
 
@@ -310,7 +363,9 @@  discard block
 
 block discarded – undo
310 363 
 						$sth_dest->execute($query_dest_values);
311 364 
 					}
312 365 
 				}
313 
-				if ($globalTransaction) $Connection->db->commit();
366 
+				if ($globalTransaction) {
367 
+					$Connection->db->commit();
368 
+				}
314 369 
 			} catch(PDOException $e) {
315 370 
 				return "error : ".$e->getMessage();
316 371 
 			}
 
@@ -346,7 +401,9 @@  discard block
 
 block discarded – undo
346 401 
 			$Connection = new Connection();
347 402 
 			$sth_dest = $Connection->db->prepare($query_dest);
348 403 
 			try {
349 
-				if ($globalTransaction) $Connection->db->beginTransaction();
404 
+				if ($globalTransaction) {
405 
+					$Connection->db->beginTransaction();
406 
+				}
350 407 
 				$tmp = fgetcsv($fh,9999,',',"'");
351 408 
             			while (!feof($fh)) {
352 409 
             				$line = fgetcsv($fh,9999,',',"'");
 
@@ -359,13 +416,17 @@  discard block
 
 block discarded – undo
359 416 
             				// Check if we can find ICAO, else set it to GLID
360 417 
             				$aircraft_name_split = explode(' ',$aircraft_name);
361 418 
             				$search_more = '';
362 
-            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
419 
+            				if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) {
420 
+            					$search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'";
421 
+            				}
363 422 
             				$query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more;
364 423 
             				$sth_search = $Connection->db->prepare($query_search);
365 424 
 					try {
366 425 
                                     		$sth_search->execute();
367 426 
 	            				$result = $sth_search->fetch(PDO::FETCH_ASSOC);
368 
-	            				if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao'];
427 
+	            				if (isset($result['icao']) && $result['icao'] != '') {
428 
+	            					$values['ICAOTypeCode'] = $result['icao'];
429 
+	            				}
369 430 
 					} catch(PDOException $e) {
370 431 
 						return "error : ".$e->getMessage();
371 432 
 					}
 
@@ -378,7 +439,9 @@  discard block
 
 block discarded – undo
378 439 
 						$sth_dest->execute($query_dest_values);
379 440 
 					}
380 441 
 				}
381 
-				if ($globalTransaction) $Connection->db->commit();
442 
+				if ($globalTransaction) {
443 
+					$Connection->db->commit();
444 
+				}
382 445 
 			} catch(PDOException $e) {
383 446 
 				return "error : ".$e->getMessage();
384 447 
 			}
 
@@ -417,7 +480,9 @@  discard block
 
 block discarded – undo
417 480 
 			$sth_dest = $Connection->db->prepare($query_dest);
418 481 
 			$sth_modes = $Connection->db->prepare($query_modes);
419 482 
 			try {
420 
-				if ($globalTransaction) $Connection->db->beginTransaction();
483 
+				if ($globalTransaction) {
484 
+					$Connection->db->beginTransaction();
485 
+				}
421 486 
 				$tmp = fgetcsv($fh,9999,',','"');
422 487 
             			while (!feof($fh)) {
423 488 
             				$line = fgetcsv($fh,9999,',','"');
 
@@ -427,16 +492,22 @@  discard block
 
 block discarded – undo
427 492 
             				    $values['registration'] = $line[0];
428 493 
             				    $values['base'] = $line[4];
429 494 
             				    $values['owner'] = $line[5];
430 
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
431 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
495 
+            				    if ($line[6] == '') {
496 
+            				    	$values['date_first_reg'] = null;
497 
+            				    } else {
498 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
499 
+					    }
432 500 
 					    $values['cancel'] = $line[7];
433 501 
 					} elseif ($country == 'EI') {
434 502 
 					    // TODO : add modeS & reg to aircraft_modes
435 503 
             				    $values['registration'] = $line[0];
436 504 
             				    $values['base'] = $line[3];
437 505 
             				    $values['owner'] = $line[2];
438 
-            				    if ($line[1] == '') $values['date_first_reg'] = null;
439 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
506 
+            				    if ($line[1] == '') {
507 
+            				    	$values['date_first_reg'] = null;
508 
+            				    } else {
509 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[1]));
510 
+					    }
440 511 
 					    $values['cancel'] = '';
441 512 
 					    $values['modes'] = $line[7];
442 513 
 					    $values['icao'] = $line[8];
 
@@ -455,16 +526,22 @@  discard block
 
 block discarded – undo
455 526 
             				    $values['registration'] = $line[3];
456 527 
             				    $values['base'] = null;
457 528 
             				    $values['owner'] = $line[5];
458 
-            				    if ($line[18] == '') $values['date_first_reg'] = null;
459 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
529 
+            				    if ($line[18] == '') {
530 
+            				    	$values['date_first_reg'] = null;
531 
+            				    } else {
532 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[18]));
533 
+					    }
460 534 
 					    $values['cancel'] = '';
461 535 
 					} elseif ($country == 'VH') {
462 536 
 					    // TODO : add modeS & reg to aircraft_modes
463 537 
             				    $values['registration'] = $line[0];
464 538 
             				    $values['base'] = null;
465 539 
             				    $values['owner'] = $line[12];
466 
-            				    if ($line[28] == '') $values['date_first_reg'] = null;
467 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
540 
+            				    if ($line[28] == '') {
541 
+            				    	$values['date_first_reg'] = null;
542 
+            				    } else {
543 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[28]));
544 
+					    }
468 545
469 546 
 					    $values['cancel'] = $line[39];
470 547 
 					} elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') {
 
@@ -483,29 +560,41 @@  discard block
 
 block discarded – undo
483 560 
             				    $values['registration'] = $line[0];
484 561 
             				    $values['base'] = null;
485 562 
             				    $values['owner'] = $line[8];
486 
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
487 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
563 
+            				    if ($line[7] == '') {
564 
+            				    	$values['date_first_reg'] = null;
565 
+            				    } else {
566 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
567 
+					    }
488 568 
 					    $values['cancel'] = '';
489 569 
 					} elseif ($country == 'PP') {
490 570 
             				    $values['registration'] = $line[0];
491 571 
             				    $values['base'] = null;
492 572 
             				    $values['owner'] = $line[4];
493 
-            				    if ($line[6] == '') $values['date_first_reg'] = null;
494 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
573 
+            				    if ($line[6] == '') {
574 
+            				    	$values['date_first_reg'] = null;
575 
+            				    } else {
576 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[6]));
577 
+					    }
495 578 
 					    $values['cancel'] = $line[7];
496 579 
 					} elseif ($country == 'E7') {
497 580 
             				    $values['registration'] = $line[0];
498 581 
             				    $values['base'] = null;
499 582 
             				    $values['owner'] = $line[4];
500 
-            				    if ($line[5] == '') $values['date_first_reg'] = null;
501 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
583 
+            				    if ($line[5] == '') {
584 
+            				    	$values['date_first_reg'] = null;
585 
+            				    } else {
586 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[5]));
587 
+					    }
502 588 
 					    $values['cancel'] = '';
503 589 
 					} elseif ($country == '8Q') {
504 590 
             				    $values['registration'] = $line[0];
505 591 
             				    $values['base'] = null;
506 592 
             				    $values['owner'] = $line[3];
507 
-            				    if ($line[7] == '') $values['date_first_reg'] = null;
508 
-					    else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
593 
+            				    if ($line[7] == '') {
594 
+            				    	$values['date_first_reg'] = null;
595 
+            				    } else {
596 
+					    	$values['date_first_reg'] = date("Y-m-d",strtotime($line[7]));
597 
+					    }
509 598 
 					    $values['cancel'] = '';
510 599 
 					} elseif ($country == 'ZK') {
511 600 
             				    $values['registration'] = $line[0];
 
@@ -550,7 +639,9 @@  discard block
 
 block discarded – undo
550 639 
 						$sth_modes->execute($query_modes_values);
551 640 
 					}
552 641 
 				}
553 
-				if ($globalTransaction) $Connection->db->commit();
642 
+				if ($globalTransaction) {
643 
+					$Connection->db->commit();
644 
+				}
554 645 
 			} catch(PDOException $e) {
555 646 
 				return "error : ".$e->getMessage();
556 647 
 			}
 
@@ -684,25 +775,45 @@  discard block
 
 block discarded – undo
684 775 
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image_thumb, :image)";
685 776 
 		$Connection = new Connection();
686 777 
 		$sth_dest = $Connection->db->prepare($query_dest);
687 
-		if ($globalTransaction) $Connection->db->beginTransaction();
778 
+		if ($globalTransaction) {
779 
+			$Connection->db->beginTransaction();
780 
+		}
688 781
689 782 
 		$i = 0;
690 783 
 		while($row = sparql_fetch_array($result))
691 784 
 		{
692 785 
 			if ($i >= 1) {
693 786 
 			//print_r($row);
694 
-			if (!isset($row['iata'])) $row['iata'] = '';
695 
-			if (!isset($row['icao'])) $row['icao'] = '';
696 
-			if (!isset($row['type'])) $row['type'] = '';
697 
-			if (!isset($row['altitude'])) $row['altitude'] = '';
787 
+			if (!isset($row['iata'])) {
788 
+				$row['iata'] = '';
789 
+			}
790 
+			if (!isset($row['icao'])) {
791 
+				$row['icao'] = '';
792 
+			}
793 
+			if (!isset($row['type'])) {
794 
+				$row['type'] = '';
795 
+			}
796 
+			if (!isset($row['altitude'])) {
797 
+				$row['altitude'] = '';
798 
+			}
698 799 
 			if (isset($row['city_bis'])) {
699 800 
 				$row['city'] = $row['city_bis'];
700 801 
 			}
701 
-			if (!isset($row['city'])) $row['city'] = '';
702 
-			if (!isset($row['country'])) $row['country'] = '';
703 
-			if (!isset($row['homepage'])) $row['homepage'] = '';
704 
-			if (!isset($row['wikipedia_page'])) $row['wikipedia_page'] = '';
705 
-			if (!isset($row['name'])) continue;
802 
+			if (!isset($row['city'])) {
803 
+				$row['city'] = '';
804 
+			}
805 
+			if (!isset($row['country'])) {
806 
+				$row['country'] = '';
807 
+			}
808 
+			if (!isset($row['homepage'])) {
809 
+				$row['homepage'] = '';
810 
+			}
811 
+			if (!isset($row['wikipedia_page'])) {
812 
+				$row['wikipedia_page'] = '';
813 
+			}
814 
+			if (!isset($row['name'])) {
815 
+				continue;
816 
+			}
706 817 
 			if (!isset($row['image'])) {
707 818 
 				$row['image'] = '';
708 819 
 				$row['image_thumb'] = '';
 
@@ -738,7 +849,9 @@  discard block
 
 block discarded – undo
738 849
739 850 
 			$i++;
740 851 
 		}
741 
-		if ($globalTransaction) $Connection->db->commit();
852 
+		if ($globalTransaction) {
853 
+			$Connection->db->commit();
854 
+		}
742 855 
 		echo "Delete duplicate rows...\n";
743 856 
 		$query = 'ALTER IGNORE TABLE airport ADD UNIQUE INDEX icaoidx (icao)';
744 857 
 		try {
 
@@ -750,7 +863,9 @@  discard block
 
 block discarded – undo
750 863 
                 }
751 864
752 865
753 
-		if ($globalDebug) echo "Insert Not available Airport...\n";
866 
+		if ($globalDebug) {
867 
+			echo "Insert Not available Airport...\n";
868 
+		}
754 869 
 		$query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image`,`image_thumb`)
755 870 
 		    VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image, :image_thumb)";
756 871 
 		$query_values = array(':airport_id' => $i, ':name' => 'Not available',':iata' => 'NA',':icao' => 'NA',':latitude' => '0',':longitude' => '0',':altitude' => '0',':type' => 'NA',':city' => 'N/A',':country' => 'N/A',':home_link' => '',':wikipedia_link' => '',':image' => '',':image_thumb' => '');
 
@@ -777,7 +892,9 @@  discard block
 
 block discarded – undo
777 892 
 		$delimiter = ',';
778 893 
 		$out_file = $tmp_dir.'airports.csv';
779 894 
 		update_db::download('http://ourairports.com/data/airports.csv',$out_file);
780 
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
895 
+		if (!file_exists($out_file) || !is_readable($out_file)) {
896 
+			return FALSE;
897 
+		}
781 898 
 		echo "Add data from ourairports.com...\n";
782 899
783 900 
 		$header = NULL;
 
@@ -787,8 +904,9 @@  discard block
 
 block discarded – undo
787 904 
 			//$Connection->db->beginTransaction();
788 905 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
789 906 
 			{
790 
-				if(!$header) $header = $row;
791 
-				else {
907 
+				if(!$header) {
908 
+					$header = $row;
909 
+				} else {
792 910 
 					$data = array();
793 911 
 					$data = array_combine($header, $row);
794 912 
 					try {
 
@@ -826,7 +944,9 @@  discard block
 
 block discarded – undo
826 944 
 		echo "Download data from another free database...\n";
827 945 
 		$out_file = $tmp_dir.'GlobalAirportDatabase.zip';
828 946 
 		update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file);
829 
-		if (!file_exists($out_file) || !is_readable($out_file)) return FALSE;
947 
+		if (!file_exists($out_file) || !is_readable($out_file)) {
948 
+			return FALSE;
949 
+		}
830 950 
 		update_db::unzip($out_file);
831 951 
 		$header = NULL;
832 952 
 		echo "Add data from another free database...\n";
 
@@ -837,8 +957,9 @@  discard block
 
 block discarded – undo
837 957 
 			//$Connection->db->beginTransaction();
838 958 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
839 959 
 			{
840 
-				if(!$header) $header = $row;
841 
-				else {
960 
+				if(!$header) {
961 
+					$header = $row;
962 
+				} else {
842 963 
 					$data = $row;
843 964
844 965 
 					$query = 'UPDATE airport SET `city` = :city, `country` = :country WHERE icao = :icao';
 
@@ -1014,7 +1135,9 @@  discard block
 
 block discarded – undo
1014 1135 
 		if (($handle = fopen($tmp_dir.'MASTER.txt', 'r')) !== FALSE)
1015 1136 
 		{
1016 1137 
 			$i = 0;
1017 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1138 
+			if ($globalTransaction) {
1139 
+				$Connection->db->beginTransaction();
1140 
+			}
1018 1141 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1019 1142 
 			{
1020 1143 
 				if ($i > 0) {
 
@@ -1027,7 +1150,9 @@  discard block
 
 block discarded – undo
1027 1150 
 					}
1028 1151 
 					$result_search = $sths->fetchAll(PDO::FETCH_ASSOC);
1029 1152 
 					if (!empty($result_search)) {
1030 
-						if ($globalDebug) echo '.';
1153 
+						if ($globalDebug) {
1154 
+							echo '.';
1155 
+						}
1031 1156 
 							//if ($globalDBdriver == 'mysql') {
1032 1157 
 							//	$queryi = 'INSERT INTO faamfr (mfr,icao) VALUES (:mfr,:icao) ON DUPLICATE KEY UPDATE icao = :icao';
1033 1158 
 							//} else {
 
@@ -1049,8 +1174,12 @@  discard block
 
 block discarded – undo
1049 1174 
 						}
1050 1175 
 						$result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC);
1051 1176 
 						if (!empty($result_search_mfr)) {
1052 
-							if (trim($data[16]) == '' && trim($data[23]) != '') $data[16] = $data[23];
1053 
-							if (trim($data[16]) == '' && trim($data[15]) != '') $data[16] = $data[15];
1177 
+							if (trim($data[16]) == '' && trim($data[23]) != '') {
1178 
+								$data[16] = $data[23];
1179 
+							}
1180 
+							if (trim($data[16]) == '' && trim($data[15]) != '') {
1181 
+								$data[16] = $data[15];
1182 
+							}
1054 1183 
 							$queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)';
1055 1184 
 							try {
1056 1185 
 								$sthf = $Connection->db->prepare($queryf);
 
@@ -1061,7 +1190,9 @@  discard block
 
 block discarded – undo
1061 1190 
 						}
1062 1191 
 					}
1063 1192 
 					if (strtotime($data[29]) > time()) {
1064 
-						if ($globalDebug) echo 'i';
1193 
+						if ($globalDebug) {
1194 
+							echo 'i';
1195 
+						}
1065 1196 
 						$query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)';
1066 1197 
 						try {
1067 1198 
 							$sth = $Connection->db->prepare($query);
 
@@ -1072,13 +1203,19 @@  discard block
 
 block discarded – undo
1072 1203 
 					}
1073 1204 
 				}
1074 1205 
 				if ($i % 90 == 0) {
1075 
-					if ($globalTransaction) $Connection->db->commit();
1076 
-					if ($globalTransaction) $Connection->db->beginTransaction();
1206 
+					if ($globalTransaction) {
1207 
+						$Connection->db->commit();
1208 
+					}
1209 
+					if ($globalTransaction) {
1210 
+						$Connection->db->beginTransaction();
1211 
+					}
1077 1212 
 				}
1078 1213 
 				$i++;
1079 1214 
 			}
1080 1215 
 			fclose($handle);
1081 
-			if ($globalTransaction) $Connection->db->commit();
1216 
+			if ($globalTransaction) {
1217 
+				$Connection->db->commit();
1218 
+			}
1082 1219 
 		}
1083 1220 
 		print_r($mfr);
1084 1221 
 		return '';
 
@@ -1103,11 +1240,15 @@  discard block
 
 block discarded – undo
1103 1240 
 			$i = 0;
1104 1241 
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
1105 1242 
 			//$Connection->db->beginTransaction();
1106 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1243 
+			if ($globalTransaction) {
1244 
+				$Connection->db->beginTransaction();
1245 
+			}
1107 1246 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1108 1247 
 			{
1109 1248 
 				if ($i > 0) {
1110 
-					if ($data[1] == 'NULL') $data[1] = $data[0];
1249 
+					if ($data[1] == 'NULL') {
1250 
+						$data[1] = $data[0];
1251 
+					}
1111 1252 
 					$query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)';
1112 1253 
 					try {
1113 1254 
 						$sth = $Connection->db->prepare($query);
 
@@ -1119,7 +1260,9 @@  discard block
 
 block discarded – undo
1119 1260 
 				$i++;
1120 1261 
 			}
1121 1262 
 			fclose($handle);
1122 
-			if ($globalTransaction) $Connection->db->commit();
1263 
+			if ($globalTransaction) {
1264 
+				$Connection->db->commit();
1265 
+			}
1123 1266 
 		}
1124 1267 
 		return '';
1125 1268 
         }
 
@@ -1140,7 +1283,9 @@  discard block
 
 block discarded – undo
1140 1283 
 		if (($handle = fopen($tmp_dir.'owners.tsv', 'r')) !== FALSE)
1141 1284 
 		{
1142 1285 
 			$i = 0;
1143 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1286 
+			if ($globalTransaction) {
1287 
+				$Connection->db->beginTransaction();
1288 
+			}
1144 1289 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1145 1290 
 			{
1146 1291 
 				if ($i > 0) {
 
@@ -1156,7 +1301,9 @@  discard block
 
 block discarded – undo
1156 1301 
 				$i++;
1157 1302 
 			}
1158 1303 
 			fclose($handle);
1159 
-			if ($globalTransaction) $Connection->db->commit();
1304 
+			if ($globalTransaction) {
1305 
+				$Connection->db->commit();
1306 
+			}
1160 1307 
 		}
1161 1308 
 		return '';
1162 1309 
         }
 
@@ -1181,7 +1328,9 @@  discard block
 
 block discarded – undo
1181 1328 
 			$i = 0;
1182 1329 
 			//$Connection->db->setAttribute(PDO::ATTR_AUTOCOMMIT, FALSE);
1183 1330 
 			//$Connection->db->beginTransaction();
1184 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1331 
+			if ($globalTransaction) {
1332 
+				$Connection->db->beginTransaction();
1333 
+			}
1185 1334 
 			while (($data = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1186 1335 
 			{
1187 1336 
 				if ($i > 0) {
 
@@ -1196,7 +1345,9 @@  discard block
 
 block discarded – undo
1196 1345 
 				$i++;
1197 1346 
 			}
1198 1347 
 			fclose($handle);
1199 
-			if ($globalTransaction) $Connection->db->commit();
1348 
+			if ($globalTransaction) {
1349 
+				$Connection->db->commit();
1350 
+			}
1200 1351 
 		}
1201 1352 
 		return '';
1202 1353 
         }
 
@@ -1215,7 +1366,9 @@  discard block
 
 block discarded – undo
1215 1366 
 		$Connection = new Connection();
1216 1367 
 		if (($handle = fopen($tmp_dir.'ban_eu.csv', 'r')) !== FALSE)
1217 1368 
 		{
1218 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1369 
+			if ($globalTransaction) {
1370 
+				$Connection->db->beginTransaction();
1371 
+			}
1219 1372 
 			while (($data = fgetcsv($handle, 1000)) !== FALSE)
1220 1373 
 			{
1221 1374 
 				$query = 'UPDATE airlines SET ban_eu = 1 WHERE icao = :icao AND forsource IS NULL';
 
@@ -1230,7 +1383,9 @@  discard block
 
 block discarded – undo
1230 1383 
 				}
1231 1384 
 			}
1232 1385 
 			fclose($handle);
1233 
-			if ($globalTransaction) $Connection->db->commit();
1386 
+			if ($globalTransaction) {
1387 
+				$Connection->db->commit();
1388 
+			}
1234 1389 
 		}
1235 1390 
 		return '';
1236 1391 
         }
 
@@ -1381,7 +1536,9 @@  discard block
 
 block discarded – undo
1381 1536 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1382 1537 
 		{
1383 1538 
 			$i = 0;
1384 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1539 
+			if ($globalTransaction) {
1540 
+				$Connection->db->beginTransaction();
1541 
+			}
1385 1542 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1386 1543 
 			{
1387 1544 
 				$i++;
 
@@ -1409,7 +1566,9 @@  discard block
 
 block discarded – undo
1409 1566 
 				}
1410 1567 
 			}
1411 1568 
 			fclose($handle);
1412 
-			if ($globalTransaction) $Connection->db->commit();
1569 
+			if ($globalTransaction) {
1570 
+				$Connection->db->commit();
1571 
+			}
1413 1572 
 		}
1414 1573 
 		return '';
1415 1574 
         }
 
@@ -1432,7 +1591,9 @@  discard block
 
 block discarded – undo
1432 1591 
 		$Connection = new Connection();
1433 1592 
 		if (($handle = fopen($filename, 'r')) !== FALSE)
1434 1593 
 		{
1435 
-			if ($globalTransaction) $Connection->db->beginTransaction();
1594 
+			if ($globalTransaction) {
1595 
+				$Connection->db->beginTransaction();
1596 
+			}
1436 1597 
 			while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE)
1437 1598 
 			{
1438 1599 
 				if(count($row) > 1) {
 
@@ -1446,7 +1607,9 @@  discard block
 
 block discarded – undo
1446 1607 
 				}
1447 1608 
 			}
1448 1609 
 			fclose($handle);
1449 
-			if ($globalTransaction) $Connection->db->commit();
1610 
+			if ($globalTransaction) {
1611 
+				$Connection->db->commit();
1612 
+			}
1450 1613 
 		}
1451 1614 
 		return '';
1452 1615 
         }
 
@@ -1466,8 +1629,9 @@  discard block
 
 block discarded – undo
1466 1629 
 	        }
1467 1630
1468 1631
1469 
-		if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
1470 
-		else {
1632 
+		if ($globalDBdriver == 'mysql') {
1633 
+			update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql');
1634 
+		} else {
1471 1635 
 			update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql');
1472 1636 
 			$query = "CREATE EXTENSION postgis";
1473 1637 
 			$Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']);
 
@@ -1486,20 +1650,30 @@  discard block
 
 block discarded – undo
1486 1650 
 		global $tmp_dir, $globalDebug;
1487 1651 
 		include_once('class.create_db.php');
1488 1652 
 		require_once(dirname(__FILE__).'/../require/class.NOTAM.php');
1489 
-		if ($globalDebug) echo "NOTAM from FlightAirMap website : Download...";
1653 
+		if ($globalDebug) {
1654 
+			echo "NOTAM from FlightAirMap website : Download...";
1655 
+		}
1490 1656 
 		update_db::download('http://data.flightairmap.fr/data/notam.txt.gz',$tmp_dir.'notam.txt.gz');
1491 1657 
 		$error = '';
1492 1658 
 		if (file_exists($tmp_dir.'notam.txt.gz')) {
1493 
-			if ($globalDebug) echo "Gunzip...";
1659 
+			if ($globalDebug) {
1660 
+				echo "Gunzip...";
1661 
+			}
1494 1662 
 			update_db::gunzip($tmp_dir.'notam.txt.gz');
1495 
-			if ($globalDebug) echo "Add to DB...";
1663 
+			if ($globalDebug) {
1664 
+				echo "Add to DB...";
1665 
+			}
1496 1666 
 			//$error = create_db::import_file($tmp_dir.'notam.sql');
1497 1667 
 			$NOTAM = new NOTAM();
1498 1668 
 			$NOTAM->updateNOTAMfromTextFile($tmp_dir.'notam.txt');
1499 
-		} else $error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
1669 
+		} else {
1670 
+			$error = "File ".$tmp_dir.'notam.txt.gz'." doesn't exist. Download failed.";
1671 
+		}
1500 1672 
 		if ($error != '') {
1501 1673 
 			return $error;
1502 
-		} elseif ($globalDebug) echo "Done\n";
1674 
+		} elseif ($globalDebug) {
1675 
+			echo "Done\n";
1676 
+		}
1503 1677 
 		return '';
1504 1678 
 	}
1505 1679 
 
@@ -1553,67 +1727,111 @@  discard block
 
 block discarded – undo
1553 1727 
 		//if ($globalDebug) echo "IVAO : Download...";
1554 1728 
 		//update_db::download('http://fr.mirror.ivao.aero/software/ivae_feb2013.zip',$tmp_dir.'ivae_feb2013.zip');
1555 1729 
 		if (file_exists($tmp_dir.'ivae_feb2013.zip')) {
1556 
-			if ($globalDebug) echo "Unzip...";
1730 
+			if ($globalDebug) {
1731 
+				echo "Unzip...";
1732 
+			}
1557 1733 
 			update_db::unzip($tmp_dir.'ivae_feb2013.zip');
1558 
-			if ($globalDebug) echo "Add to DB...";
1734 
+			if ($globalDebug) {
1735 
+				echo "Add to DB...";
1736 
+			}
1559 1737 
 			update_db::ivao_airlines($tmp_dir.'data/airlines.dat');
1560 
-			if ($globalDebug) echo "Copy airlines logos to airlines images directory...";
1738 
+			if ($globalDebug) {
1739 
+				echo "Copy airlines logos to airlines images directory...";
1740 
+			}
1561 1741 
 			if (is_writable(dirname(__FILE__).'/../images/airlines')) {
1562 
-				if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo.";
1563 
-			} else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
1564 
-		} else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
1742 
+				if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) {
1743 
+					$error = "Failed to copy airlines logo.";
1744 
+				}
1745 
+			} else {
1746 
+				$error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable";
1747 
+			}
1748 
+		} else {
1749 
+			$error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed.";
1750 
+		}
1565 1751 
 		if ($error != '') {
1566 1752 
 			return $error;
1567 
-		} elseif ($globalDebug) echo "Done\n";
1753 
+		} elseif ($globalDebug) {
1754 
+			echo "Done\n";
1755 
+		}
1568 1756 
 		return '';
1569 1757 
 	}
1570 1758
1571 1759 
 	public static function update_routes() {
1572 1760 
 		global $tmp_dir, $globalDebug;
1573 1761 
 		$error = '';
1574 
-		if ($globalDebug) echo "Routes : Download...";
1762 
+		if ($globalDebug) {
1763 
+			echo "Routes : Download...";
1764 
+		}
1575 1765 
 		update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz');
1576 1766 
 		if (file_exists($tmp_dir.'StandingData.sqb.gz')) {
1577 
-			if ($globalDebug) echo "Gunzip...";
1767 
+			if ($globalDebug) {
1768 
+				echo "Gunzip...";
1769 
+			}
1578 1770 
 			update_db::gunzip($tmp_dir.'StandingData.sqb.gz');
1579 
-			if ($globalDebug) echo "Add to DB...";
1771 
+			if ($globalDebug) {
1772 
+				echo "Add to DB...";
1773 
+			}
1580 1774 
 			$error = update_db::retrieve_route_sqlite_to_dest($tmp_dir.'StandingData.sqb');
1581 
-		} else $error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
1775 
+		} else {
1776 
+			$error = "File ".$tmp_dir.'StandingData.sqb.gz'." doesn't exist. Download failed.";
1777 
+		}
1582 1778 
 		if ($error != '') {
1583 1779 
 			return $error;
1584 
-		} elseif ($globalDebug) echo "Done\n";
1780 
+		} elseif ($globalDebug) {
1781 
+			echo "Done\n";
1782 
+		}
1585 1783 
 		return '';
1586 1784 
 	}
1587 1785 
 	public static function update_oneworld() {
1588 1786 
 		global $tmp_dir, $globalDebug;
1589 1787 
 		$error = '';
1590 
-		if ($globalDebug) echo "Schedules Oneworld : Download...";
1788 
+		if ($globalDebug) {
1789 
+			echo "Schedules Oneworld : Download...";
1790 
+		}
1591 1791 
 		update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz');
1592 1792 
 		if (file_exists($tmp_dir.'oneworld.csv.gz')) {
1593 
-			if ($globalDebug) echo "Gunzip...";
1793 
+			if ($globalDebug) {
1794 
+				echo "Gunzip...";
1795 
+			}
1594 1796 
 			update_db::gunzip($tmp_dir.'oneworld.csv.gz');
1595 
-			if ($globalDebug) echo "Add to DB...";
1797 
+			if ($globalDebug) {
1798 
+				echo "Add to DB...";
1799 
+			}
1596 1800 
 			$error = update_db::retrieve_route_oneworld($tmp_dir.'oneworld.csv');
1597 
-		} else $error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
1801 
+		} else {
1802 
+			$error = "File ".$tmp_dir.'oneworld.csv.gz'." doesn't exist. Download failed.";
1803 
+		}
1598 1804 
 		if ($error != '') {
1599 1805 
 			return $error;
1600 
-		} elseif ($globalDebug) echo "Done\n";
1806 
+		} elseif ($globalDebug) {
1807 
+			echo "Done\n";
1808 
+		}
1601 1809 
 		return '';
1602 1810 
 	}
1603 1811 
 	public static function update_skyteam() {
1604 1812 
 		global $tmp_dir, $globalDebug;
1605 1813 
 		$error = '';
1606 
-		if ($globalDebug) echo "Schedules Skyteam : Download...";
1814 
+		if ($globalDebug) {
1815 
+			echo "Schedules Skyteam : Download...";
1816 
+		}
1607 1817 
 		update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz');
1608 1818 
 		if (file_exists($tmp_dir.'skyteam.csv.gz')) {
1609 
-			if ($globalDebug) echo "Gunzip...";
1819 
+			if ($globalDebug) {
1820 
+				echo "Gunzip...";
1821 
+			}
1610 1822 
 			update_db::gunzip($tmp_dir.'skyteam.csv.gz');
1611 
-			if ($globalDebug) echo "Add to DB...";
1823 
+			if ($globalDebug) {
1824 
+				echo "Add to DB...";
1825 
+			}
1612 1826 
 			$error = update_db::retrieve_route_skyteam($tmp_dir.'skyteam.csv');
1613 
-		} else $error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
1827 
+		} else {
1828 
+			$error = "File ".$tmp_dir.'skyteam.csv.gz'." doesn't exist. Download failed.";
1829 
+		}
1614 1830 
 		if ($error != '') {
1615 1831 
 			return $error;
1616 
-		} elseif ($globalDebug) echo "Done\n";
1832 
+		} elseif ($globalDebug) {
1833 
+			echo "Done\n";
1834 
+		}
1617 1835 
 		return '';
1618 1836 
 	}
1619 1837 
 	public static function update_ModeS() {
 
@@ -1630,370 +1848,642 @@  discard block
 
 block discarded – undo
1630 1848 
 			exit;
1631 1849 
 		} elseif ($globalDebug) echo "Done\n";
1632 1850 
 */
1633 
-		if ($globalDebug) echo "Modes : Download...";
1634 
-//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
1851 
+		if ($globalDebug) {
1852 
+			echo "Modes : Download...";
1853 
+		}
1854 
+		//		update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb');
1635 1855 
 		update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz');
1636 1856
1637 1857 
 //		if (file_exists($tmp_dir.'basestation_latest.zip')) {
1638 1858 
 		if (file_exists($tmp_dir.'BaseStation.sqb.gz')) {
1639 
-			if ($globalDebug) echo "Unzip...";
1640 
-//			update_db::unzip($tmp_dir.'basestation_latest.zip');
1859 
+			if ($globalDebug) {
1860 
+				echo "Unzip...";
1861 
+			}
1862 
+			//			update_db::unzip($tmp_dir.'basestation_latest.zip');
1641 1863 
 			update_db::gunzip($tmp_dir.'BaseStation.sqb.gz');
1642 
-			if ($globalDebug) echo "Add to DB...";
1864 
+			if ($globalDebug) {
1865 
+				echo "Add to DB...";
1866 
+			}
1643 1867 
 			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'BaseStation.sqb');
1644 1868 
 //			$error = update_db::retrieve_modes_sqlite_to_dest($tmp_dir.'basestation.sqb');
1645 
-		} else $error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
1869 
+		} else {
1870 
+			$error = "File ".$tmp_dir.'basestation_latest.zip'." doesn't exist. Download failed.";
1871 
+		}
1646 1872 
 		if ($error != '') {
1647 1873 
 			return $error;
1648 
-		} elseif ($globalDebug) echo "Done\n";
1874 
+		} elseif ($globalDebug) {
1875 
+			echo "Done\n";
1876 
+		}
1649 1877 
 		return '';
1650 1878 
 	}
1651 1879
1652 1880 
 	public static function update_ModeS_faa() {
1653 1881 
 		global $tmp_dir, $globalDebug;
1654 
-		if ($globalDebug) echo "Modes FAA: Download...";
1882 
+		if ($globalDebug) {
1883 
+			echo "Modes FAA: Download...";
1884 
+		}
1655 1885 
 		update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip');
1656 1886 
 		if (file_exists($tmp_dir.'ReleasableAircraft.zip')) {
1657 
-			if ($globalDebug) echo "Unzip...";
1887 
+			if ($globalDebug) {
1888 
+				echo "Unzip...";
1889 
+			}
1658 1890 
 			update_db::unzip($tmp_dir.'ReleasableAircraft.zip');
1659 
-			if ($globalDebug) echo "Add to DB...";
1891 
+			if ($globalDebug) {
1892 
+				echo "Add to DB...";
1893 
+			}
1660 1894 
 			$error = update_db::modes_faa();
1661 
-		} else $error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
1895 
+		} else {
1896 
+			$error = "File ".$tmp_dir.'ReleasableAircraft.zip'." doesn't exist. Download failed.";
1897 
+		}
1662 1898 
 		if ($error != '') {
1663 1899 
 			return $error;
1664 
-		} elseif ($globalDebug) echo "Done\n";
1900 
+		} elseif ($globalDebug) {
1901 
+			echo "Done\n";
1902 
+		}
1665 1903 
 		return '';
1666 1904 
 	}
1667 1905
1668 1906 
 	public static function update_ModeS_flarm() {
1669 1907 
 		global $tmp_dir, $globalDebug;
1670 
-		if ($globalDebug) echo "Modes Flarmnet: Download...";
1908 
+		if ($globalDebug) {
1909 
+			echo "Modes Flarmnet: Download...";
1910 
+		}
1671 1911 
 		update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln');
1672 1912 
 		if (file_exists($tmp_dir.'data.fln')) {
1673 
-			if ($globalDebug) echo "Add to DB...";
1913 
+			if ($globalDebug) {
1914 
+				echo "Add to DB...";
1915 
+			}
1674 1916 
 			$error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln');
1675 
-		} else $error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
1917 
+		} else {
1918 
+			$error = "File ".$tmp_dir.'data.fln'." doesn't exist. Download failed.";
1919 
+		}
1676 1920 
 		if ($error != '') {
1677 1921 
 			return $error;
1678 
-		} elseif ($globalDebug) echo "Done\n";
1922 
+		} elseif ($globalDebug) {
1923 
+			echo "Done\n";
1924 
+		}
1679 1925 
 		return '';
1680 1926 
 	}
1681 1927
1682 1928 
 	public static function update_ModeS_ogn() {
1683 1929 
 		global $tmp_dir, $globalDebug;
1684 
-		if ($globalDebug) echo "Modes OGN: Download...";
1930 
+		if ($globalDebug) {
1931 
+			echo "Modes OGN: Download...";
1932 
+		}
1685 1933 
 		update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv');
1686 1934 
 		if (file_exists($tmp_dir.'ogn.csv')) {
1687 
-			if ($globalDebug) echo "Add to DB...";
1935 
+			if ($globalDebug) {
1936 
+				echo "Add to DB...";
1937 
+			}
1688 1938 
 			$error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv');
1689 
-		} else $error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
1939 
+		} else {
1940 
+			$error = "File ".$tmp_dir.'ogn.csv'." doesn't exist. Download failed.";
1941 
+		}
1690 1942 
 		if ($error != '') {
1691 1943 
 			return $error;
1692 
-		} elseif ($globalDebug) echo "Done\n";
1944 
+		} elseif ($globalDebug) {
1945 
+			echo "Done\n";
1946 
+		}
1693 1947 
 		return '';
1694 1948 
 	}
1695 1949
1696 1950 
 	public static function update_owner() {
1697 1951 
 		global $tmp_dir, $globalDebug, $globalMasterSource;
1698 1952
1699 
-		if ($globalDebug) echo "Owner France: Download...";
1953 
+		if ($globalDebug) {
1954 
+			echo "Owner France: Download...";
1955 
+		}
1700 1956 
 		update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv');
1701 1957 
 		if (file_exists($tmp_dir.'owner_f.csv')) {
1702 
-			if ($globalDebug) echo "Add to DB...";
1958 
+			if ($globalDebug) {
1959 
+				echo "Add to DB...";
1960 
+			}
1703 1961 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F');
1704 
-		} else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
1962 
+		} else {
1963 
+			$error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed.";
1964 
+		}
1705 1965 
 		if ($error != '') {
1706 1966 
 			return $error;
1707 
-		} elseif ($globalDebug) echo "Done\n";
1967 
+		} elseif ($globalDebug) {
1968 
+			echo "Done\n";
1969 
+		}
1708 1970
1709 
-		if ($globalDebug) echo "Owner Ireland: Download...";
1971 
+		if ($globalDebug) {
1972 
+			echo "Owner Ireland: Download...";
1973 
+		}
1710 1974 
 		update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv');
1711 1975 
 		if (file_exists($tmp_dir.'owner_ei.csv')) {
1712 
-			if ($globalDebug) echo "Add to DB...";
1976 
+			if ($globalDebug) {
1977 
+				echo "Add to DB...";
1978 
+			}
1713 1979 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI');
1714 
-		} else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
1980 
+		} else {
1981 
+			$error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed.";
1982 
+		}
1715 1983 
 		if ($error != '') {
1716 1984 
 			return $error;
1717 
-		} elseif ($globalDebug) echo "Done\n";
1718 
-		if ($globalDebug) echo "Owner Switzerland: Download...";
1985 
+		} elseif ($globalDebug) {
1986 
+			echo "Done\n";
1987 
+		}
1988 
+		if ($globalDebug) {
1989 
+			echo "Owner Switzerland: Download...";
1990 
+		}
1719 1991 
 		update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv');
1720 1992 
 		if (file_exists($tmp_dir.'owner_hb.csv')) {
1721 
-			if ($globalDebug) echo "Add to DB...";
1993 
+			if ($globalDebug) {
1994 
+				echo "Add to DB...";
1995 
+			}
1722 1996 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB');
1723 
-		} else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
1997 
+		} else {
1998 
+			$error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed.";
1999 
+		}
1724 2000 
 		if ($error != '') {
1725 2001 
 			return $error;
1726 
-		} elseif ($globalDebug) echo "Done\n";
1727 
-		if ($globalDebug) echo "Owner Czech Republic: Download...";
2002 
+		} elseif ($globalDebug) {
2003 
+			echo "Done\n";
2004 
+		}
2005 
+		if ($globalDebug) {
2006 
+			echo "Owner Czech Republic: Download...";
2007 
+		}
1728 2008 
 		update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv');
1729 2009 
 		if (file_exists($tmp_dir.'owner_ok.csv')) {
1730 
-			if ($globalDebug) echo "Add to DB...";
2010 
+			if ($globalDebug) {
2011 
+				echo "Add to DB...";
2012 
+			}
1731 2013 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK');
1732 
-		} else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2014 
+		} else {
2015 
+			$error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed.";
2016 
+		}
1733 2017 
 		if ($error != '') {
1734 2018 
 			return $error;
1735 
-		} elseif ($globalDebug) echo "Done\n";
1736 
-		if ($globalDebug) echo "Owner Australia: Download...";
2019 
+		} elseif ($globalDebug) {
2020 
+			echo "Done\n";
2021 
+		}
2022 
+		if ($globalDebug) {
2023 
+			echo "Owner Australia: Download...";
2024 
+		}
1737 2025 
 		update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv');
1738 2026 
 		if (file_exists($tmp_dir.'owner_vh.csv')) {
1739 
-			if ($globalDebug) echo "Add to DB...";
2027 
+			if ($globalDebug) {
2028 
+				echo "Add to DB...";
2029 
+			}
1740 2030 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH');
1741 
-		} else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2031 
+		} else {
2032 
+			$error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed.";
2033 
+		}
1742 2034 
 		if ($error != '') {
1743 2035 
 			return $error;
1744 
-		} elseif ($globalDebug) echo "Done\n";
1745 
-		if ($globalDebug) echo "Owner Austria: Download...";
2036 
+		} elseif ($globalDebug) {
2037 
+			echo "Done\n";
2038 
+		}
2039 
+		if ($globalDebug) {
2040 
+			echo "Owner Austria: Download...";
2041 
+		}
1746 2042 
 		update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv');
1747 2043 
 		if (file_exists($tmp_dir.'owner_oe.csv')) {
1748 
-			if ($globalDebug) echo "Add to DB...";
2044 
+			if ($globalDebug) {
2045 
+				echo "Add to DB...";
2046 
+			}
1749 2047 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE');
1750 
-		} else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2048 
+		} else {
2049 
+			$error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed.";
2050 
+		}
1751 2051 
 		if ($error != '') {
1752 2052 
 			return $error;
1753 
-		} elseif ($globalDebug) echo "Done\n";
1754 
-		if ($globalDebug) echo "Owner Chile: Download...";
2053 
+		} elseif ($globalDebug) {
2054 
+			echo "Done\n";
2055 
+		}
2056 
+		if ($globalDebug) {
2057 
+			echo "Owner Chile: Download...";
2058 
+		}
1755 2059 
 		update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv');
1756 2060 
 		if (file_exists($tmp_dir.'owner_cc.csv')) {
1757 
-			if ($globalDebug) echo "Add to DB...";
2061 
+			if ($globalDebug) {
2062 
+				echo "Add to DB...";
2063 
+			}
1758 2064 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC');
1759 
-		} else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2065 
+		} else {
2066 
+			$error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed.";
2067 
+		}
1760 2068 
 		if ($error != '') {
1761 2069 
 			return $error;
1762 
-		} elseif ($globalDebug) echo "Done\n";
1763 
-		if ($globalDebug) echo "Owner Colombia: Download...";
2070 
+		} elseif ($globalDebug) {
2071 
+			echo "Done\n";
2072 
+		}
2073 
+		if ($globalDebug) {
2074 
+			echo "Owner Colombia: Download...";
2075 
+		}
1764 2076 
 		update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv');
1765 2077 
 		if (file_exists($tmp_dir.'owner_hj.csv')) {
1766 
-			if ($globalDebug) echo "Add to DB...";
2078 
+			if ($globalDebug) {
2079 
+				echo "Add to DB...";
2080 
+			}
1767 2081 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ');
1768 
-		} else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2082 
+		} else {
2083 
+			$error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed.";
2084 
+		}
1769 2085 
 		if ($error != '') {
1770 2086 
 			return $error;
1771 
-		} elseif ($globalDebug) echo "Done\n";
1772 
-		if ($globalDebug) echo "Owner Bosnia Herzegobina: Download...";
2087 
+		} elseif ($globalDebug) {
2088 
+			echo "Done\n";
2089 
+		}
2090 
+		if ($globalDebug) {
2091 
+			echo "Owner Bosnia Herzegobina: Download...";
2092 
+		}
1773 2093 
 		update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv');
1774 2094 
 		if (file_exists($tmp_dir.'owner_e7.csv')) {
1775 
-			if ($globalDebug) echo "Add to DB...";
2095 
+			if ($globalDebug) {
2096 
+				echo "Add to DB...";
2097 
+			}
1776 2098 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7');
1777 
-		} else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2099 
+		} else {
2100 
+			$error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed.";
2101 
+		}
1778 2102 
 		if ($error != '') {
1779 2103 
 			return $error;
1780 
-		} elseif ($globalDebug) echo "Done\n";
1781 
-		if ($globalDebug) echo "Owner Brazil: Download...";
2104 
+		} elseif ($globalDebug) {
2105 
+			echo "Done\n";
2106 
+		}
2107 
+		if ($globalDebug) {
2108 
+			echo "Owner Brazil: Download...";
2109 
+		}
1782 2110 
 		update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv');
1783 2111 
 		if (file_exists($tmp_dir.'owner_pp.csv')) {
1784 
-			if ($globalDebug) echo "Add to DB...";
2112 
+			if ($globalDebug) {
2113 
+				echo "Add to DB...";
2114 
+			}
1785 2115 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP');
1786 
-		} else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2116 
+		} else {
2117 
+			$error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed.";
2118 
+		}
1787 2119 
 		if ($error != '') {
1788 2120 
 			return $error;
1789 
-		} elseif ($globalDebug) echo "Done\n";
1790 
-		if ($globalDebug) echo "Owner Cayman Islands: Download...";
2121 
+		} elseif ($globalDebug) {
2122 
+			echo "Done\n";
2123 
+		}
2124 
+		if ($globalDebug) {
2125 
+			echo "Owner Cayman Islands: Download...";
2126 
+		}
1791 2127 
 		update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv');
1792 2128 
 		if (file_exists($tmp_dir.'owner_vp.csv')) {
1793 
-			if ($globalDebug) echo "Add to DB...";
2129 
+			if ($globalDebug) {
2130 
+				echo "Add to DB...";
2131 
+			}
1794 2132 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP');
1795 
-		} else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2133 
+		} else {
2134 
+			$error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed.";
2135 
+		}
1796 2136 
 		if ($error != '') {
1797 2137 
 			return $error;
1798 
-		} elseif ($globalDebug) echo "Done\n";
1799 
-		if ($globalDebug) echo "Owner Croatia: Download...";
2138 
+		} elseif ($globalDebug) {
2139 
+			echo "Done\n";
2140 
+		}
2141 
+		if ($globalDebug) {
2142 
+			echo "Owner Croatia: Download...";
2143 
+		}
1800 2144 
 		update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv');
1801 2145 
 		if (file_exists($tmp_dir.'owner_9a.csv')) {
1802 
-			if ($globalDebug) echo "Add to DB...";
2146 
+			if ($globalDebug) {
2147 
+				echo "Add to DB...";
2148 
+			}
1803 2149 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A');
1804 
-		} else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2150 
+		} else {
2151 
+			$error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed.";
2152 
+		}
1805 2153 
 		if ($error != '') {
1806 2154 
 			return $error;
1807 
-		} elseif ($globalDebug) echo "Done\n";
1808 
-		if ($globalDebug) echo "Owner Luxembourg: Download...";
2155 
+		} elseif ($globalDebug) {
2156 
+			echo "Done\n";
2157 
+		}
2158 
+		if ($globalDebug) {
2159 
+			echo "Owner Luxembourg: Download...";
2160 
+		}
1809 2161 
 		update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv');
1810 2162 
 		if (file_exists($tmp_dir.'owner_lx.csv')) {
1811 
-			if ($globalDebug) echo "Add to DB...";
2163 
+			if ($globalDebug) {
2164 
+				echo "Add to DB...";
2165 
+			}
1812 2166 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX');
1813 
-		} else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2167 
+		} else {
2168 
+			$error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed.";
2169 
+		}
1814 2170 
 		if ($error != '') {
1815 2171 
 			return $error;
1816 
-		} elseif ($globalDebug) echo "Done\n";
1817 
-		if ($globalDebug) echo "Owner Maldives: Download...";
2172 
+		} elseif ($globalDebug) {
2173 
+			echo "Done\n";
2174 
+		}
2175 
+		if ($globalDebug) {
2176 
+			echo "Owner Maldives: Download...";
2177 
+		}
1818 2178 
 		update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv');
1819 2179 
 		if (file_exists($tmp_dir.'owner_8q.csv')) {
1820 
-			if ($globalDebug) echo "Add to DB...";
2180 
+			if ($globalDebug) {
2181 
+				echo "Add to DB...";
2182 
+			}
1821 2183 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q');
1822 
-		} else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2184 
+		} else {
2185 
+			$error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed.";
2186 
+		}
1823 2187 
 		if ($error != '') {
1824 2188 
 			return $error;
1825 
-		} elseif ($globalDebug) echo "Done\n";
1826 
-		if ($globalDebug) echo "Owner New Zealand: Download...";
2189 
+		} elseif ($globalDebug) {
2190 
+			echo "Done\n";
2191 
+		}
2192 
+		if ($globalDebug) {
2193 
+			echo "Owner New Zealand: Download...";
2194 
+		}
1827 2195 
 		update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv');
1828 2196 
 		if (file_exists($tmp_dir.'owner_zk.csv')) {
1829 
-			if ($globalDebug) echo "Add to DB...";
2197 
+			if ($globalDebug) {
2198 
+				echo "Add to DB...";
2199 
+			}
1830 2200 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK');
1831 
-		} else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2201 
+		} else {
2202 
+			$error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed.";
2203 
+		}
1832 2204 
 		if ($error != '') {
1833 2205 
 			return $error;
1834 
-		} elseif ($globalDebug) echo "Done\n";
1835 
-		if ($globalDebug) echo "Owner Papua New Guinea: Download...";
2206 
+		} elseif ($globalDebug) {
2207 
+			echo "Done\n";
2208 
+		}
2209 
+		if ($globalDebug) {
2210 
+			echo "Owner Papua New Guinea: Download...";
2211 
+		}
1836 2212 
 		update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv');
1837 2213 
 		if (file_exists($tmp_dir.'owner_p2.csv')) {
1838 
-			if ($globalDebug) echo "Add to DB...";
2214 
+			if ($globalDebug) {
2215 
+				echo "Add to DB...";
2216 
+			}
1839 2217 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2');
1840 
-		} else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2218 
+		} else {
2219 
+			$error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed.";
2220 
+		}
1841 2221 
 		if ($error != '') {
1842 2222 
 			return $error;
1843 
-		} elseif ($globalDebug) echo "Done\n";
1844 
-		if ($globalDebug) echo "Owner Slovakia: Download...";
2223 
+		} elseif ($globalDebug) {
2224 
+			echo "Done\n";
2225 
+		}
2226 
+		if ($globalDebug) {
2227 
+			echo "Owner Slovakia: Download...";
2228 
+		}
1845 2229 
 		update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv');
1846 2230 
 		if (file_exists($tmp_dir.'owner_om.csv')) {
1847 
-			if ($globalDebug) echo "Add to DB...";
2231 
+			if ($globalDebug) {
2232 
+				echo "Add to DB...";
2233 
+			}
1848 2234 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM');
1849 
-		} else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2235 
+		} else {
2236 
+			$error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed.";
2237 
+		}
1850 2238 
 		if ($error != '') {
1851 2239 
 			return $error;
1852 
-		} elseif ($globalDebug) echo "Done\n";
1853 
-		if ($globalDebug) echo "Owner Ecuador: Download...";
2240 
+		} elseif ($globalDebug) {
2241 
+			echo "Done\n";
2242 
+		}
2243 
+		if ($globalDebug) {
2244 
+			echo "Owner Ecuador: Download...";
2245 
+		}
1854 2246 
 		update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv');
1855 2247 
 		if (file_exists($tmp_dir.'owner_hc.csv')) {
1856 
-			if ($globalDebug) echo "Add to DB...";
2248 
+			if ($globalDebug) {
2249 
+				echo "Add to DB...";
2250 
+			}
1857 2251 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC');
1858 
-		} else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2252 
+		} else {
2253 
+			$error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed.";
2254 
+		}
1859 2255 
 		if ($error != '') {
1860 2256 
 			return $error;
1861 
-		} elseif ($globalDebug) echo "Done\n";
1862 
-		if ($globalDebug) echo "Owner Iceland: Download...";
2257 
+		} elseif ($globalDebug) {
2258 
+			echo "Done\n";
2259 
+		}
2260 
+		if ($globalDebug) {
2261 
+			echo "Owner Iceland: Download...";
2262 
+		}
1863 2263 
 		update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv');
1864 2264 
 		if (file_exists($tmp_dir.'owner_tf.csv')) {
1865 
-			if ($globalDebug) echo "Add to DB...";
2265 
+			if ($globalDebug) {
2266 
+				echo "Add to DB...";
2267 
+			}
1866 2268 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF');
1867 
-		} else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2269 
+		} else {
2270 
+			$error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed.";
2271 
+		}
1868 2272 
 		if ($error != '') {
1869 2273 
 			return $error;
1870 
-		} elseif ($globalDebug) echo "Done\n";
1871 
-		if ($globalDebug) echo "Owner Isle of Man: Download...";
2274 
+		} elseif ($globalDebug) {
2275 
+			echo "Done\n";
2276 
+		}
2277 
+		if ($globalDebug) {
2278 
+			echo "Owner Isle of Man: Download...";
2279 
+		}
1872 2280 
 		update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv');
1873 2281 
 		if (file_exists($tmp_dir.'owner_m.csv')) {
1874 
-			if ($globalDebug) echo "Add to DB...";
2282 
+			if ($globalDebug) {
2283 
+				echo "Add to DB...";
2284 
+			}
1875 2285 
 			$error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M');
1876 
-		} else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2286 
+		} else {
2287 
+			$error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed.";
2288 
+		}
1877 2289 
 		if ($error != '') {
1878 2290 
 			return $error;
1879 
-		} elseif ($globalDebug) echo "Done\n";
2291 
+		} elseif ($globalDebug) {
2292 
+			echo "Done\n";
2293 
+		}
1880 2294 
 		if ($globalMasterSource) {
1881 
-			if ($globalDebug) echo "ModeS Netherlands: Download...";
2295 
+			if ($globalDebug) {
2296 
+				echo "ModeS Netherlands: Download...";
2297 
+			}
1882 2298 
 			update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv');
1883 2299 
 			if (file_exists($tmp_dir.'owner_ph.csv')) {
1884 
-				if ($globalDebug) echo "Add to DB...";
2300 
+				if ($globalDebug) {
2301 
+					echo "Add to DB...";
2302 
+				}
1885 2303 
 				$error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH');
1886 
-			} else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2304 
+			} else {
2305 
+				$error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed.";
2306 
+			}
1887 2307 
 			if ($error != '') {
1888 2308 
 				return $error;
1889 
-			} elseif ($globalDebug) echo "Done\n";
1890 
-			if ($globalDebug) echo "ModeS Denmark: Download...";
2309 
+			} elseif ($globalDebug) {
2310 
+				echo "Done\n";
2311 
+			}
2312 
+			if ($globalDebug) {
2313 
+				echo "ModeS Denmark: Download...";
2314 
+			}
1891 2315 
 			update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv');
1892 2316 
 			if (file_exists($tmp_dir.'owner_oy.csv')) {
1893 
-				if ($globalDebug) echo "Add to DB...";
2317 
+				if ($globalDebug) {
2318 
+					echo "Add to DB...";
2319 
+				}
1894 2320 
 				$error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY');
1895 
-			} else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2321 
+			} else {
2322 
+				$error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed.";
2323 
+			}
1896 2324 
 			if ($error != '') {
1897 2325 
 				return $error;
1898 
-			} elseif ($globalDebug) echo "Done\n";
1899 
-		} elseif ($globalDebug) echo "Done\n";
2326 
+			} elseif ($globalDebug) {
2327 
+				echo "Done\n";
2328 
+			}
2329 
+		} elseif ($globalDebug) {
2330 
+			echo "Done\n";
2331 
+		}
1900 2332 
 		return '';
1901 2333 
 	}
1902 2334
1903 2335 
 	public static function update_translation() {
1904 2336 
 		global $tmp_dir, $globalDebug;
1905 2337 
 		$error = '';
1906 
-		if ($globalDebug) echo "Translation : Download...";
2338 
+		if ($globalDebug) {
2339 
+			echo "Translation : Download...";
2340 
+		}
1907 2341 
 		update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip');
1908 2342 
 		if (file_exists($tmp_dir.'translation.zip')) {
1909 
-			if ($globalDebug) echo "Unzip...";
2343 
+			if ($globalDebug) {
2344 
+				echo "Unzip...";
2345 
+			}
1910 2346 
 			update_db::unzip($tmp_dir.'translation.zip');
1911 
-			if ($globalDebug) echo "Add to DB...";
2347 
+			if ($globalDebug) {
2348 
+				echo "Add to DB...";
2349 
+			}
1912 2350 
 			$error = update_db::translation();
1913 
-		} else $error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2351 
+		} else {
2352 
+			$error = "File ".$tmp_dir.'translation.zip'." doesn't exist. Download failed.";
2353 
+		}
1914 2354 
 		if ($error != '') {
1915 2355 
 			return $error;
1916 
-		} elseif ($globalDebug) echo "Done\n";
2356 
+		} elseif ($globalDebug) {
2357 
+			echo "Done\n";
2358 
+		}
1917 2359 
 		return '';
1918 2360 
 	}
1919 2361
1920 2362 
 	public static function update_translation_fam() {
1921 2363 
 		global $tmp_dir, $globalDebug;
1922 
-		if ($globalDebug) echo "Translation from FlightAirMap website : Download...";
2364 
+		if ($globalDebug) {
2365 
+			echo "Translation from FlightAirMap website : Download...";
2366 
+		}
1923 2367 
 		update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz');
1924 2368 
 		if (file_exists($tmp_dir.'translation.tsv.gz')) {
1925 
-			if ($globalDebug) echo "Gunzip...";
2369 
+			if ($globalDebug) {
2370 
+				echo "Gunzip...";
2371 
+			}
1926 2372 
 			update_db::gunzip($tmp_dir.'translation.tsv.gz');
1927 
-			if ($globalDebug) echo "Add to DB...";
2373 
+			if ($globalDebug) {
2374 
+				echo "Add to DB...";
2375 
+			}
1928 2376 
 			$error = update_db::translation_fam();
1929 
-		} else $error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2377 
+		} else {
2378 
+			$error = "File ".$tmp_dir.'translation.tsv.gz'." doesn't exist. Download failed.";
2379 
+		}
1930 2380 
 		if ($error != '') {
1931 2381 
 			return $error;
1932 
-		} elseif ($globalDebug) echo "Done\n";
2382 
+		} elseif ($globalDebug) {
2383 
+			echo "Done\n";
2384 
+		}
1933 2385 
 		return '';
1934 2386 
 	}
1935 2387 
 	public static function update_ModeS_fam() {
1936 2388 
 		global $tmp_dir, $globalDebug;
1937 
-		if ($globalDebug) echo "ModeS from FlightAirMap website : Download...";
2389 
+		if ($globalDebug) {
2390 
+			echo "ModeS from FlightAirMap website : Download...";
2391 
+		}
1938 2392 
 		update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz');
1939 2393 
 		if (file_exists($tmp_dir.'modes.tsv.gz')) {
1940 
-			if ($globalDebug) echo "Gunzip...";
2394 
+			if ($globalDebug) {
2395 
+				echo "Gunzip...";
2396 
+			}
1941 2397 
 			update_db::gunzip($tmp_dir.'modes.tsv.gz');
1942 
-			if ($globalDebug) echo "Add to DB...";
2398 
+			if ($globalDebug) {
2399 
+				echo "Add to DB...";
2400 
+			}
1943 2401 
 			$error = update_db::modes_fam();
1944 
-		} else $error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2402 
+		} else {
2403 
+			$error = "File ".$tmp_dir.'modes.tsv.gz'." doesn't exist. Download failed.";
2404 
+		}
1945 2405 
 		if ($error != '') {
1946 2406 
 			return $error;
1947 
-		} elseif ($globalDebug) echo "Done\n";
2407 
+		} elseif ($globalDebug) {
2408 
+			echo "Done\n";
2409 
+		}
1948 2410 
 		return '';
1949 2411 
 	}
1950 2412 
 	public static function update_owner_fam() {
1951 2413 
 		global $tmp_dir, $globalDebug, $globalOwner;
1952 
-		if ($globalDebug) echo "owner from FlightAirMap website : Download...";
2414 
+		if ($globalDebug) {
2415 
+			echo "owner from FlightAirMap website : Download...";
2416 
+		}
1953 2417 
 		if ($globalOwner === TRUE) {
1954 2418 
 			update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz');
1955 2419 
 		} else {
1956 2420 
 			update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz');
1957 2421 
 		}
1958 2422 
 		if (file_exists($tmp_dir.'owners.tsv.gz')) {
1959 
-			if ($globalDebug) echo "Gunzip...";
2423 
+			if ($globalDebug) {
2424 
+				echo "Gunzip...";
2425 
+			}
1960 2426 
 			update_db::gunzip($tmp_dir.'owners.tsv.gz');
1961 
-			if ($globalDebug) echo "Add to DB...";
2427 
+			if ($globalDebug) {
2428 
+				echo "Add to DB...";
2429 
+			}
1962 2430 
 			$error = update_db::owner_fam();
1963 
-		} else $error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
2431 
+		} else {
2432 
+			$error = "File ".$tmp_dir.'owners.tsv.gz'." doesn't exist. Download failed.";
2433 
+		}
1964 2434 
 		if ($error != '') {
1965 2435 
 			return $error;
1966 
-		} elseif ($globalDebug) echo "Done\n";
2436 
+		} elseif ($globalDebug) {
2437 
+			echo "Done\n";
2438 
+		}
1967 2439 
 		return '';
1968 2440 
 	}
1969 2441 
 	public static function update_routes_fam() {
1970 2442 
 		global $tmp_dir, $globalDebug;
1971 
-		if ($globalDebug) echo "Routes from FlightAirMap website : Download...";
2443 
+		if ($globalDebug) {
2444 
+			echo "Routes from FlightAirMap website : Download...";
2445 
+		}
1972 2446 
 		update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz');
1973 2447 
 		if (file_exists($tmp_dir.'routes.tsv.gz')) {
1974 
-			if ($globalDebug) echo "Gunzip...";
2448 
+			if ($globalDebug) {
2449 
+				echo "Gunzip...";
2450 
+			}
1975 2451 
 			update_db::gunzip($tmp_dir.'routes.tsv.gz');
1976 
-			if ($globalDebug) echo "Add to DB...";
2452 
+			if ($globalDebug) {
2453 
+				echo "Add to DB...";
2454 
+			}
1977 2455 
 			$error = update_db::routes_fam();
1978 
-		} else $error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
2456 
+		} else {
2457 
+			$error = "File ".$tmp_dir.'routes.tsv.gz'." doesn't exist. Download failed.";
2458 
+		}
1979 2459 
 		if ($error != '') {
1980 2460 
 			return $error;
1981 
-		} elseif ($globalDebug) echo "Done\n";
2461 
+		} elseif ($globalDebug) {
2462 
+			echo "Done\n";
2463 
+		}
1982 2464 
 		return '';
1983 2465 
 	}
1984 2466 
 	public static function update_banned_fam() {
1985 2467 
 		global $tmp_dir, $globalDebug;
1986 
-		if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download...";
2468 
+		if ($globalDebug) {
2469 
+			echo "Banned airlines in Europe from FlightAirMap website : Download...";
2470 
+		}
1987 2471 
 		update_db::download('http://data.flightairmap.fr/data/ban_eu.csv',$tmp_dir.'ban_eu.csv');
1988 2472 
 		if (file_exists($tmp_dir.'ban_eu.csv')) {
1989 2473 
 			//if ($globalDebug) echo "Gunzip...";
1990 2474 
 			//update_db::gunzip($tmp_dir.'ban_ue.csv');
1991 
-			if ($globalDebug) echo "Add to DB...";
2475 
+			if ($globalDebug) {
2476 
+				echo "Add to DB...";
2477 
+			}
1992 2478 
 			$error = update_db::banned_fam();
1993 
-		} else $error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
2479 
+		} else {
2480 
+			$error = "File ".$tmp_dir.'ban_eu.csv'." doesn't exist. Download failed.";
2481 
+		}
1994 2482 
 		if ($error != '') {
1995 2483 
 			return $error;
1996 
-		} elseif ($globalDebug) echo "Done\n";
2484 
+		} elseif ($globalDebug) {
2485 
+			echo "Done\n";
2486 
+		}
1997 2487 
 		return '';
1998 2488 
 	}
1999 2489 
 
@@ -2001,7 +2491,9 @@  discard block
 
 block discarded – undo
2001 2491 
 		global $tmp_dir, $globalDebug, $globalDBdriver;
2002 2492 
 		include_once('class.create_db.php');
2003 2493 
 		$error = '';
2004 
-		if ($globalDebug) echo "Airspace from FlightAirMap website : Download...";
2494 
+		if ($globalDebug) {
2495 
+			echo "Airspace from FlightAirMap website : Download...";
2496 
+		}
2005 2497 
 		if ($globalDBdriver == 'mysql') {
2006 2498 
 			update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5');
2007 2499 
 		} else {
 
@@ -2017,9 +2509,13 @@  discard block
 
 block discarded – undo
2017 2509 
 					update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz');
2018 2510 
 				}
2019 2511 
 				if (file_exists($tmp_dir.'airspace.sql.gz')) {
2020 
-					if ($globalDebug) echo "Gunzip...";
2512 
+					if ($globalDebug) {
2513 
+						echo "Gunzip...";
2514 
+					}
2021 2515 
 					update_db::gunzip($tmp_dir.'airspace.sql.gz');
2022 
-					if ($globalDebug) echo "Add to DB...";
2516 
+					if ($globalDebug) {
2517 
+						echo "Add to DB...";
2518 
+					}
2023 2519 
 					$Connection = new Connection();
2024 2520 
 					if ($Connection->tableExists('airspace')) {
2025 2521 
 						$query = 'DROP TABLE airspace';
 
@@ -2032,31 +2528,47 @@  discard block
 
 block discarded – undo
2032 2528 
 		    			}
2033 2529 
 					$error = create_db::import_file($tmp_dir.'airspace.sql');
2034 2530 
 					update_db::insert_airspace_version($airspace_md5);
2035 
-				} else $error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed.";
2531 
+				} else {
2532 
+					$error = "File ".$tmp_dir.'airpsace.sql.gz'." doesn't exist. Download failed.";
2533 
+				}
2036 2534 
 			}
2037 
-		} else $error = "File ".$tmp_dir.'airpsace.sql.gz.md5'." doesn't exist. Download failed.";
2535 
+		} else {
2536 
+			$error = "File ".$tmp_dir.'airpsace.sql.gz.md5'." doesn't exist. Download failed.";
2537 
+		}
2038 2538 
 		if ($error != '') {
2039 2539 
 			return $error;
2040 
-		} elseif ($globalDebug) echo "Done\n";
2540 
+		} elseif ($globalDebug) {
2541 
+			echo "Done\n";
2542 
+		}
2041 2543 
 		return '';
2042 2544 
 	}
2043 2545
2044 2546 
 	public static function update_tle() {
2045 2547 
 		global $tmp_dir, $globalDebug;
2046 
-		if ($globalDebug) echo "Download TLE : Download...";
2548 
+		if ($globalDebug) {
2549 
+			echo "Download TLE : Download...";
2550 
+		}
2047 2551 
 		$alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt',
2048 2552 
 		'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt',
2049 2553 
 		'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt');
2050 2554 
 		foreach ($alltle as $filename) {
2051 
-			if ($globalDebug) echo "downloading ".$filename.'...';
2555 
+			if ($globalDebug) {
2556 
+				echo "downloading ".$filename.'...';
2557 
+			}
2052 2558 
 			update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename);
2053 2559 
 			if (file_exists($tmp_dir.$filename)) {
2054 
-				if ($globalDebug) echo "Add to DB ".$filename."...";
2560 
+				if ($globalDebug) {
2561 
+					echo "Add to DB ".$filename."...";
2562 
+				}
2055 2563 
 				$error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename));
2056 
-			} else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
2564 
+			} else {
2565 
+				$error = "File ".$tmp_dir.$filename." doesn't exist. Download failed.";
2566 
+			}
2057 2567 
 			if ($error != '') {
2058 2568 
 				echo $error."\n";
2059 
-			} elseif ($globalDebug) echo "Done\n";
2569 
+			} elseif ($globalDebug) {
2570 
+				echo "Done\n";
2571 
+			}
2060 2572 
 		}
2061 2573 
 		return '';
2062 2574 
 	}
 
@@ -2064,10 +2576,14 @@  discard block
 
 block discarded – undo
2064 2576 
 	public static function update_models() {
2065 2577 
 		global $tmp_dir, $globalDebug;
2066 2578 
 		$error = '';
2067 
-		if ($globalDebug) echo "Models from FlightAirMap website : Download...";
2579 
+		if ($globalDebug) {
2580 
+			echo "Models from FlightAirMap website : Download...";
2581 
+		}
2068 2582 
 		update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',$tmp_dir.'models.md5sum');
2069 2583 
 		if (file_exists($tmp_dir.'models.md5sum')) {
2070 
-			if ($globalDebug) echo "Check files...\n";
2584 
+			if ($globalDebug) {
2585 
+				echo "Check files...\n";
2586 
+			}
2071 2587 
 			$newmodelsdb = array();
2072 2588 
 			if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) {
2073 2589 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2086,25 +2602,35 @@  discard block
 
 block discarded – undo
2086 2602 
 			}
2087 2603 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2088 2604 
 			foreach ($diff as $key => $value) {
2089 
-				if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n";
2605 
+				if ($globalDebug) {
2606 
+					echo 'Downloading model '.$key.' ...'."\n";
2607 
+				}
2090 2608 
 				update_db::download('http://data.flightairmap.fr/data/models/'.$key,dirname(__FILE__).'/../models/'.$key);
2091 2609
2092 2610 
 			}
2093 2611 
 			update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum');
2094 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2612 
+		} else {
2613 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2614 
+		}
2095 2615 
 		if ($error != '') {
2096 2616 
 			return $error;
2097 
-		} elseif ($globalDebug) echo "Done\n";
2617 
+		} elseif ($globalDebug) {
2618 
+			echo "Done\n";
2619 
+		}
2098 2620 
 		return '';
2099 2621 
 	}
2100 2622
2101 2623 
 	public static function update_space_models() {
2102 2624 
 		global $tmp_dir, $globalDebug;
2103 2625 
 		$error = '';
2104 
-		if ($globalDebug) echo "Space models from FlightAirMap website : Download...";
2626 
+		if ($globalDebug) {
2627 
+			echo "Space models from FlightAirMap website : Download...";
2628 
+		}
2105 2629 
 		update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum');
2106 2630 
 		if (file_exists($tmp_dir.'space_models.md5sum')) {
2107 
-			if ($globalDebug) echo "Check files...\n";
2631 
+			if ($globalDebug) {
2632 
+				echo "Check files...\n";
2633 
+			}
2108 2634 
 			$newmodelsdb = array();
2109 2635 
 			if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) {
2110 2636 
 				while (($row = fgetcsv($handle,1000," ")) !== FALSE) {
 
@@ -2123,15 +2649,21 @@  discard block
 
 block discarded – undo
2123 2649 
 			}
2124 2650 
 			$diff = array_diff($newmodelsdb,$modelsdb);
2125 2651 
 			foreach ($diff as $key => $value) {
2126 
-				if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n";
2652 
+				if ($globalDebug) {
2653 
+					echo 'Downloading space model '.$key.' ...'."\n";
2654 
+				}
2127 2655 
 				update_db::download('http://data.flightairmap.fr/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key);
2128 2656
2129 2657 
 			}
2130 2658 
 			update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum');
2131 
-		} else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2659 
+		} else {
2660 
+			$error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed.";
2661 
+		}
2132 2662 
 		if ($error != '') {
2133 2663 
 			return $error;
2134 
-		} elseif ($globalDebug) echo "Done\n";
2664 
+		} elseif ($globalDebug) {
2665 
+			echo "Done\n";
2666 
+		}
2135 2667 
 		return '';
2136 2668 
 	}
2137 2669 
 
@@ -2174,7 +2706,9 @@  discard block
 
 block discarded – undo
2174 2706 
                 }
2175 2707
2176 2708 
 		$error = '';
2177 
-		if ($globalDebug) echo "Notam : Download...";
2709 
+		if ($globalDebug) {
2710 
+			echo "Notam : Download...";
2711 
+		}
2178 2712 
 		update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss');
2179 2713 
 		if (file_exists($tmp_dir.'notam.rss')) {
2180 2714 
 			$notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true);
 
@@ -2189,14 +2723,30 @@  discard block
 
 block discarded – undo
2189 2723 
 				$data['fir'] = $q[0];
2190 2724 
 				$data['code'] = $q[1];
2191 2725 
 				$ifrvfr = $q[2];
2192 
-				if ($ifrvfr == 'IV') $data['rules'] = 'IFR/VFR';
2193 
-				if ($ifrvfr == 'I') $data['rules'] = 'IFR';
2194 
-				if ($ifrvfr == 'V') $data['rules'] = 'VFR';
2195 
-				if ($q[4] == 'A') $data['scope'] = 'Airport warning';
2196 
-				if ($q[4] == 'E') $data['scope'] = 'Enroute warning';
2197 
-				if ($q[4] == 'W') $data['scope'] = 'Navigation warning';
2198 
-				if ($q[4] == 'AE') $data['scope'] = 'Airport/Enroute warning';
2199 
-				if ($q[4] == 'AW') $data['scope'] = 'Airport/Navigation warning';
2726 
+				if ($ifrvfr == 'IV') {
2727 
+					$data['rules'] = 'IFR/VFR';
2728 
+				}
2729 
+				if ($ifrvfr == 'I') {
2730 
+					$data['rules'] = 'IFR';
2731 
+				}
2732 
+				if ($ifrvfr == 'V') {
2733 
+					$data['rules'] = 'VFR';
2734 
+				}
2735 
+				if ($q[4] == 'A') {
2736 
+					$data['scope'] = 'Airport warning';
2737 
+				}
2738 
+				if ($q[4] == 'E') {
2739 
+					$data['scope'] = 'Enroute warning';
2740 
+				}
2741 
+				if ($q[4] == 'W') {
2742 
+					$data['scope'] = 'Navigation warning';
2743 
+				}
2744 
+				if ($q[4] == 'AE') {
2745 
+					$data['scope'] = 'Airport/Enroute warning';
2746 
+				}
2747 
+				if ($q[4] == 'AW') {
2748 
+					$data['scope'] = 'Airport/Navigation warning';
2749 
+				}
2200 2750 
 				//$data['scope'] = $q[4];
2201 2751 
 				$data['lower_limit'] = $q[5];
2202 2752 
 				$data['upper_limit'] = $q[6];
 
@@ -2204,8 +2754,12 @@  discard block
 
 block discarded – undo
2204 2754 
 				sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius);
2205 2755 
 				$latitude = $Common->convertDec($las,'latitude');
2206 2756 
 				$longitude = $Common->convertDec($lns,'longitude');
2207 
-				if ($lac == 'S') $latitude = '-'.$latitude;
2208 
-				if ($lnc == 'W') $longitude = '-'.$longitude;
2757 
+				if ($lac == 'S') {
2758 
+					$latitude = '-'.$latitude;
2759 
+				}
2760 
+				if ($lnc == 'W') {
2761 
+					$longitude = '-'.$longitude;
2762 
+				}
2209 2763 
 				$data['center_latitude'] = $latitude;
2210 2764 
 				$data['center_longitude'] = $longitude;
2211 2765 
 				$data['radius'] = intval($radius);
 
@@ -2235,10 +2789,14 @@  discard block
 
 block discarded – undo
2235 2789 
 				$NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']);
2236 2790 
 				unset($data);
2237 2791 
 			}
2238 
-		} else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
2792 
+		} else {
2793 
+			$error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed.";
2794 
+		}
2239 2795 
 		if ($error != '') {
2240 2796 
 			return $error;
2241 
-		} elseif ($globalDebug) echo "Done\n";
2797 
+		} elseif ($globalDebug) {
2798 
+			echo "Done\n";
2799 
+		}
2242 2800 
 		return '';
2243 2801 
 	}
2244 2802 
 	
@@ -2263,7 +2821,9 @@  discard block
 
 block discarded – undo
2263 2821 
 		$airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json');
2264 2822 
 		$airspace_json = json_decode($airspace_lst,true);
2265 2823 
 		foreach ($airspace_json['records'] as $airspace) {
2266 
-			if ($globalDebug) echo $airspace['name']."...\n";
2824 
+			if ($globalDebug) {
2825 
+				echo $airspace['name']."...\n";
2826 
+			}
2267 2827 
 			update_db::download($airspace['uri'],$tmp_dir.$airspace['name']);
2268 2828 
 			if (file_exists($tmp_dir.$airspace['name'])) {
2269 2829 
 				file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name'])));
 
@@ -2307,8 +2867,11 @@  discard block
 
 block discarded – undo
2307 2867 
                         return "error : ".$e->getMessage();
2308 2868 
                 }
2309 2869 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2310 
-                if ($row['nb'] > 0) return false;
2311 
-                else return true;
2870 
+                if ($row['nb'] > 0) {
2871 
+                	return false;
2872 
+                } else {
2873 
+                	return true;
2874 
+                }
2312 2875 
 	}
2313 2876
2314 2877 
 	public static function insert_last_update() {
 
@@ -2333,8 +2896,11 @@  discard block
 
 block discarded – undo
2333 2896 
                         return "error : ".$e->getMessage();
2334 2897 
                 }
2335 2898 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2336 
-                if ($row['nb'] > 0) return true;
2337 
-                else return false;
2899 
+                if ($row['nb'] > 0) {
2900 
+                	return true;
2901 
+                } else {
2902 
+                	return false;
2903 
+                }
2338 2904 
 	}
2339 2905
2340 2906 
 
@@ -2365,8 +2931,11 @@  discard block
 
 block discarded – undo
2365 2931 
                         return "error : ".$e->getMessage();
2366 2932 
                 }
2367 2933 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2368 
-                if ($row['nb'] > 0) return false;
2369 
-                else return true;
2934 
+                if ($row['nb'] > 0) {
2935 
+                	return false;
2936 
+                } else {
2937 
+                	return true;
2938 
+                }
2370 2939 
 	}
2371 2940
2372 2941 
 	public static function insert_last_notam_update() {
 
@@ -2395,8 +2964,11 @@  discard block
 
 block discarded – undo
2395 2964 
                         return "error : ".$e->getMessage();
2396 2965 
                 }
2397 2966 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2398 
-                if ($row['nb'] > 0) return false;
2399 
-                else return true;
2967 
+                if ($row['nb'] > 0) {
2968 
+                	return false;
2969 
+                } else {
2970 
+                	return true;
2971 
+                }
2400 2972 
 	}
2401 2973
2402 2974 
 	public static function insert_last_airspace_update() {
 
@@ -2426,8 +2998,11 @@  discard block
 
 block discarded – undo
2426 2998 
                         return "error : ".$e->getMessage();
2427 2999 
                 }
2428 3000 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2429 
-                if ($row['nb'] > 0) return false;
2430 
-                else return true;
3001 
+                if ($row['nb'] > 0) {
3002 
+                	return false;
3003 
+                } else {
3004 
+                	return true;
3005 
+                }
2431 3006 
 	}
2432 3007
2433 3008 
 	public static function insert_last_owner_update() {
 
@@ -2456,8 +3031,11 @@  discard block
 
 block discarded – undo
2456 3031 
                         return "error : ".$e->getMessage();
2457 3032 
                 }
2458 3033 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2459 
-                if ($row['nb'] > 0) return false;
2460 
-                else return true;
3034 
+                if ($row['nb'] > 0) {
3035 
+                	return false;
3036 
+                } else {
3037 
+                	return true;
3038 
+                }
2461 3039 
 	}
2462 3040
2463 3041 
 	public static function insert_last_schedules_update() {
 
@@ -2486,8 +3064,11 @@  discard block
 
 block discarded – undo
2486 3064 
                         return "error : ".$e->getMessage();
2487 3065 
                 }
2488 3066 
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
2489 
-                if ($row['nb'] > 0) return false;
2490 
-                else return true;
3067 
+                if ($row['nb'] > 0) {
3068 
+                	return false;
3069 
+                } else {
3070 
+                	return true;
3071 
+                }
2491 3072 
 	}
2492 3073
2493 3074 
 	public static function insert_last_tle_update() {
Please login to merge, or discard this patch.
scripts/daemon-spotter.php 1 patch
Braces   +544 added lines, -186 removed lines patch added patch discarded remove patch 
@@ -14,7 +14,9 @@  discard block
 
 block discarded – undo
14 14 
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
15 15 
 require_once(dirname(__FILE__).'/../require/class.Common.php');
16 16
17 
-if (!isset($globalDebug)) $globalDebug = FALSE;
17 
+if (!isset($globalDebug)) {
18 
+	$globalDebug = FALSE;
19 
+}
18 20
19 21 
 // Check if schema is at latest version
20 22 
 $Connection = new Connection();
 
@@ -54,13 +56,22 @@  discard block
 
 block discarded – undo
54 56 
     $globalSources = array();
55 57 
     $globalSources[] = array('host' => $options['source']);
56 58 
 }
57 
-if (isset($options['server'])) $globalServer = TRUE;
58 
-if (isset($options['idsource'])) $id_source = $options['idsource'];
59 
-else $id_source = 1;
59 
+if (isset($options['server'])) {
60 
+	$globalServer = TRUE;
61 
+}
62 
+if (isset($options['idsource'])) {
63 
+	$id_source = $options['idsource'];
64 
+} else {
65 
+	$id_source = 1;
66 
+}
60 67 
 if (isset($globalServer) && $globalServer) {
61 
-    if ($globalDebug) echo "Using Server Mode\n";
68 
+    if ($globalDebug) {
69 
+    	echo "Using Server Mode\n";
70 
+    }
62 71 
     $SI=new SpotterServer();
63 
-} else $SI=new SpotterImport($Connection->db);
72 
+} else {
73 
+	$SI=new SpotterImport($Connection->db);
74 
+}
64 75 
 //$APRS=new APRS($Connection->db);
65 76 
 $SBS=new SBS();
66 77 
 $ACARS=new ACARS($Connection->db);
 
@@ -78,7 +89,9 @@  discard block
 
 block discarded – undo
78 89 
 }
79 90
80 91 
 // let's try and connect
81 
-if ($globalDebug) echo "Connecting...\n";
92 
+if ($globalDebug) {
93 
+	echo "Connecting...\n";
94 
+}
82 95 
 $use_aprs = false;
83 96 
 $aprs_full = false;
84 97 
 $reset = 0;
 
@@ -87,7 +100,9 @@  discard block
 
 block discarded – undo
87 100 
     $ip = gethostbyname($host);
88 101 
     $s = socket_create(AF_INET, SOCK_STREAM, 0);
89 102 
     $r = @socket_connect($s, $ip, $port);
90 
-    if (!socket_set_nonblock($s)) echo "Unable to set nonblock on socket\n";
103 
+    if (!socket_set_nonblock($s)) {
104 
+    	echo "Unable to set nonblock on socket\n";
105 
+    }
91 106 
     if ($r || socket_last_error() == 114 || socket_last_error() == 115) {
92 107 
         return $s;
93 108 
     }
 
@@ -115,7 +130,9 @@  discard block
 
 block discarded – undo
115 130 
     //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs;
116 131 
     global $sockets, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset;
117 132 
     $reset++;
118 
-    if ($globalDebug) echo 'Connect to all...'."\n";
133 
+    if ($globalDebug) {
134 
+    	echo 'Connect to all...'."\n";
135 
+    }
119 136 
     foreach ($hosts as $id => $value) {
120 137 
 	$host = $value['host'];
121 138 
 	$globalSources[$id]['last_exec'] = 0;
 
@@ -125,27 +142,37 @@  discard block
 
 block discarded – undo
125 142 
         	//$formats[$id] = 'deltadbtxt';
126 143 
         	$globalSources[$id]['format'] = 'deltadbtxt';
127 144 
         	//$last_exec['deltadbtxt'] = 0;
128 
-        	if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n";
145 
+        	if ($globalDebug) {
146 
+        		echo "Connect to deltadb source (".$host.")...\n";
147 
+        	}
129 148 
             } else if (preg_match('/vatsim-data.txt$/i',$host)) {
130 149 
         	//$formats[$id] = 'vatsimtxt';
131 150 
         	$globalSources[$id]['format'] = 'vatsimtxt';
132 151 
         	//$last_exec['vatsimtxt'] = 0;
133 
-        	if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n";
152 
+        	if ($globalDebug) {
153 
+        		echo "Connect to vatsim source (".$host.")...\n";
154 
+        	}
134 155 
     	    } else if (preg_match('/aircraftlist.json$/i',$host)) {
135 156 
         	//$formats[$id] = 'aircraftlistjson';
136 157 
         	$globalSources[$id]['format'] = 'aircraftlistjson';
137 158 
         	//$last_exec['aircraftlistjson'] = 0;
138 
-        	if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n";
159 
+        	if ($globalDebug) {
160 
+        		echo "Connect to aircraftlist.json source (".$host.")...\n";
161 
+        	}
139 162 
     	    } else if (preg_match('/opensky/i',$host)) {
140 163 
         	//$formats[$id] = 'aircraftlistjson';
141 164 
         	$globalSources[$id]['format'] = 'opensky';
142 165 
         	//$last_exec['aircraftlistjson'] = 0;
143 
-        	if ($globalDebug) echo "Connect to opensky source (".$host.")...\n";
166 
+        	if ($globalDebug) {
167 
+        		echo "Connect to opensky source (".$host.")...\n";
168 
+        	}
144 169 
     	    } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) {
145 170 
         	//$formats[$id] = 'radarvirtueljson';
146 171 
         	$globalSources[$id]['format'] = 'radarvirtueljson';
147 172 
         	//$last_exec['radarvirtueljson'] = 0;
148 
-        	if ($globalDebug) echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
173 
+        	if ($globalDebug) {
174 
+        		echo "Connect to radarvirtuel.com/file.json source (".$host.")...\n";
175 
+        	}
149 176 
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
150 177 
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
151 178 
         	    exit(0);
 
@@ -154,7 +181,9 @@  discard block
 
 block discarded – undo
154 181 
         	//$formats[$id] = 'planeupdatefaa';
155 182 
         	$globalSources[$id]['format'] = 'planeupdatefaa';
156 183 
         	//$last_exec['planeupdatefaa'] = 0;
157 
-        	if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
184 
+        	if ($globalDebug) {
185 
+        		echo "Connect to planeUpdateFAA.php source (".$host.")...\n";
186 
+        	}
158 187 
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
159 188 
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
160 189 
         	    exit(0);
 
@@ -163,26 +192,36 @@  discard block
 
 block discarded – undo
163 192 
         	//$formats[$id] = 'phpvmacars';
164 193 
         	$globalSources[$id]['format'] = 'phpvmacars';
165 194 
         	//$last_exec['phpvmacars'] = 0;
166 
-        	if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n";
195 
+        	if ($globalDebug) {
196 
+        		echo "Connect to phpvmacars source (".$host.")...\n";
197 
+        	}
167 198 
             } else if (preg_match('/VAM-json.php$/i',$host)) {
168 199 
         	//$formats[$id] = 'phpvmacars';
169 200 
         	$globalSources[$id]['format'] = 'vam';
170 
-        	if ($globalDebug) echo "Connect to Vam source (".$host.")...\n";
201 
+        	if ($globalDebug) {
202 
+        		echo "Connect to Vam source (".$host.")...\n";
203 
+        	}
171 204 
             } else if (preg_match('/whazzup/i',$host)) {
172 205 
         	//$formats[$id] = 'whazzup';
173 206 
         	$globalSources[$id]['format'] = 'whazzup';
174 207 
         	//$last_exec['whazzup'] = 0;
175 
-        	if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n";
208 
+        	if ($globalDebug) {
209 
+        		echo "Connect to whazzup source (".$host.")...\n";
210 
+        	}
176 211 
             } else if (preg_match('/recentpireps/i',$host)) {
177 212 
         	//$formats[$id] = 'pirepsjson';
178 213 
         	$globalSources[$id]['format'] = 'pirepsjson';
179 214 
         	//$last_exec['pirepsjson'] = 0;
180 
-        	if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n";
215 
+        	if ($globalDebug) {
216 
+        		echo "Connect to pirepsjson source (".$host.")...\n";
217 
+        	}
181 218 
             } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) {
182 219 
         	//$formats[$id] = 'fr24json';
183 220 
         	$globalSources[$id]['format'] = 'fr24json';
184 221 
         	//$last_exec['fr24json'] = 0;
185 
-        	if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n";
222 
+        	if ($globalDebug) {
223 
+        		echo "Connect to fr24 source (".$host.")...\n";
224 
+        	}
186 225 
         	if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) {
187 226 
         	    echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n";
188 227 
         	    exit(0);
 
@@ -191,10 +230,14 @@  discard block
 
 block discarded – undo
191 230 
             } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) {
192 231 
         	//$formats[$id] = 'tsv';
193 232 
         	$globalSources[$id]['format'] = 'tsv';
194 
-        	if ($globalDebug) echo "Connect to tsv source (".$host.")...\n";
233 
+        	if ($globalDebug) {
234 
+        		echo "Connect to tsv source (".$host.")...\n";
235 
+        	}
195 236 
             }
196 237 
         } elseif (filter_var($host,FILTER_VALIDATE_URL)) {
197 
-        	if ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
238 
+        	if ($globalDebug) {
239 
+        		echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n";
240 
+        	}
198 241 
         } elseif (!filter_var($host,FILTER_VALIDATE_URL)) {
199 242 
 	    $hostport = explode(':',$host);
200 243 
 	    if (isset($hostport[1])) {
 
@@ -231,17 +274,25 @@  discard block
 
 block discarded – undo
231 274 
         		//$formats[$id] = 'beast';
232 275 
         		$globalSources[$id]['format'] = 'beast';
233 276 
 		    //} else $formats[$id] = 'sbs';
234 
-		    } else $globalSources[$id]['format'] = 'sbs';
277 
+		    } else {
278 
+		    	$globalSources[$id]['format'] = 'sbs';
279 
+		    }
235 280 
 		    //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n";
236 281 
 		}
237 
-		if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
282 
+		if ($globalDebug) {
283 
+			echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n";
284 
+		}
238 285 
             } else {
239 
-		if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
286 
+		if ($globalDebug) {
287 
+			echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n";
288 
+		}
240 289 
     	    }
241 290 
         }
242 291 
     }
243 292 
 }
244 
-if (!isset($globalMinFetch)) $globalMinFetch = 15;
293 
+if (!isset($globalMinFetch)) {
294 
+	$globalMinFetch = 15;
295 
+}
245 296
246 297 
 // Initialize all
247 298 
 $status = array();
 
@@ -249,13 +300,19 @@  discard block
 
 block discarded – undo
249 300 
 $formats = array();
250 301 
 $last_exec = array();
251 302 
 $time = time();
252 
-if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut;
253 
-else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut;
254 
-else $timeout = 20;
303 
+if (isset($globalSourcesTimeout)) {
304 
+	$timeout = $globalSourcesTimeOut;
305 
+} else if (isset($globalSBS1TimeOut)) {
306 
+	$timeout = $globalSBS1TimeOut;
307 
+} else {
308 
+	$timeout = 20;
309 
+}
255 310 
 $errno = '';
256 311 
 $errstr='';
257 312
258 
-if (!isset($globalDaemon)) $globalDaemon = TRUE;
313 
+if (!isset($globalDaemon)) {
314 
+	$globalDaemon = TRUE;
315 
+}
259 316 
 /* Initiate connections to all the hosts simultaneously */
260 317 
 //connect_all($hosts);
261 318 
 //connect_all($globalSources);
 
@@ -275,7 +332,9 @@  discard block
 
 block discarded – undo
275 332 
     if (isset($source['format']) && $source['format'] == 'aprs') {
276 333 
 	$aprs_connect = 0;
277 334 
 	$use_aprs = true;
278 
-	if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true;
335 
+	if (isset($source['port']) && $source['port'] == '10152') {
336 
+		$aprs_full = true;
337 
+	}
279 338 
 	break;
280 339 
     }
281 340 
 }
 
@@ -286,24 +345,44 @@  discard block
 
 block discarded – undo
286 345 
 	$aprs_connect = 0;
287 346 
 	$aprs_keep = 120;
288 347 
 	$aprs_last_tx = time();
289 
-	if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
290 
-	else $aprs_version = $globalName.' using FlightAirMap';
348 
+	if (isset($globalAPRSversion)) {
349 
+		$aprs_version = $globalAPRSversion;
350 
+	} else {
351 
+		$aprs_version = $globalName.' using FlightAirMap';
352 
+	}
291 353 
 	//else $aprs_version = 'Perl Example App';
292 
-	if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid;
293 
-	else $aprs_ssid = 'FAM';
354 
+	if (isset($globalAPRSssid)) {
355 
+		$aprs_ssid = $globalAPRSssid;
356 
+	} else {
357 
+		$aprs_ssid = 'FAM';
358 
+	}
294 359 
 	//else $aprs_ssid = 'PerlEx';
295 
-	if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter;
296 
-	else $aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
297 
-	if ($aprs_full) $aprs_filter = '';
298 
-	if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} appid {$aprs_version} filter {$aprs_filter}\n";
299 
-	else $aprs_login = "user {$aprs_ssid} appid {$aprs_version}\n";
300 
-}
360 
+	if (isset($globalAPRSfilter)) {
361 
+		$aprs_filter = $globalAPRSfilter;
362 
+	} else {
363 
+		$aprs_filter =  'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0';
364 
+	}
365 
+	if ($aprs_full) {
366 
+		$aprs_filter = '';
367 
+	}
368 
+	if ($aprs_filter != '') {
369 
+		$aprs_login = "user {$aprs_ssid} appid {$aprs_version} filter {$aprs_filter}\n";
370 
+	} else {
371 
+		$aprs_login = "user {$aprs_ssid} appid {$aprs_version}\n";
372 
+	}
373 
+	}
301 374
302 375 
 // connected - lets do some work
303 
-if ($globalDebug) echo "Connected!\n";
376 
+if ($globalDebug) {
377 
+	echo "Connected!\n";
378 
+}
304 379 
 sleep(1);
305 
-if ($globalDebug) echo "SCAN MODE \n\n";
306 
-if (!isset($globalCronEnd)) $globalCronEnd = 60;
380 
+if ($globalDebug) {
381 
+	echo "SCAN MODE \n\n";
382 
+}
383 
+if (!isset($globalCronEnd)) {
384 
+	$globalCronEnd = 60;
385 
+}
307 386 
 $endtime = time()+$globalCronEnd;
308 387 
 $i = 1;
309 388 
 $tt = array();
 
@@ -317,20 +396,28 @@  discard block
 
 block discarded – undo
317 396
318 397 
 // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time.
319 398 
 while ($i > 0) {
320 
-    if (!$globalDaemon) $i = $endtime-time();
399 
+    if (!$globalDaemon) {
400 
+    	$i = $endtime-time();
401 
+    }
321 402 
     // Delete old ATC
322 403 
     if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) {
323 
-	if ($globalDebug) echo 'Delete old ATC...'."\n";
404 
+	if ($globalDebug) {
405 
+		echo 'Delete old ATC...'."\n";
406 
+	}
324 407 
         $ATC->deleteOldATC();
325 408 
     }
326 409
327 410 
     if (count($last_exec) > 0) {
328 411 
 	$max = $globalMinFetch;
329 412 
 	foreach ($last_exec as $last) {
330 
-	    if ((time() - $last['last']) < $max) $max = time() - $last['last'];
413 
+	    if ((time() - $last['last']) < $max) {
414 
+	    	$max = time() - $last['last'];
415 
+	    }
331 416 
 	}
332 417 
 	if ($max != $globalMinFetch) {
333 
-	    if ($globalDebug) echo 'Sleeping...'."\n";
418 
+	    if ($globalDebug) {
419 
+	    	echo 'Sleeping...'."\n";
420 
+	    }
334 421 
 	    sleep($globalMinFetch-$max+2);
335 422 
 	}
336 423 
     }
 
@@ -338,11 +425,15 @@  discard block
 
 block discarded – undo
338 425
339 426 
     //foreach ($formats as $id => $value) {
340 427 
     foreach ($globalSources as $id => $value) {
341 
-	if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0;
428 
+	if (!isset($last_exec[$id]['last'])) {
429 
+		$last_exec[$id]['last'] = 0;
430 
+	}
342 431 
 	if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
343 432 
 	    //$buffer = $Common->getData($hosts[$id]);
344 433 
 	    $buffer = $Common->getData($value['host']);
345 
-	    if ($buffer != '') $reset = 0;
434 
+	    if ($buffer != '') {
435 
+	    	$reset = 0;
436 
+	    }
346 437 
     	    $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer));
347 438 
 	    $buffer = explode('\n',$buffer);
348 439 
 	    foreach ($buffer as $line) {
 
@@ -351,19 +442,38 @@  discard block
 
 block discarded – undo
351 442 
 	            $data = array();
352 443 
 	            $data['hex'] = $line[1]; // hex
353 444 
 	            $data['ident'] = $line[2]; // ident
354 
-	            if (isset($line[3])) $data['altitude'] = $line[3]; // altitude
355 
-	            if (isset($line[4])) $data['speed'] = $line[4]; // speed
356 
-	            if (isset($line[5])) $data['heading'] = $line[5]; // heading
357 
-	            if (isset($line[6])) $data['latitude'] = $line[6]; // lat
358 
-	            if (isset($line[7])) $data['longitude'] = $line[7]; // long
445 
+	            if (isset($line[3])) {
446 
+	            	$data['altitude'] = $line[3];
447 
+	            }
448 
+	            // altitude
449 
+	            if (isset($line[4])) {
450 
+	            	$data['speed'] = $line[4];
451 
+	            }
452 
+	            // speed
453 
+	            if (isset($line[5])) {
454 
+	            	$data['heading'] = $line[5];
455 
+	            }
456 
+	            // heading
457 
+	            if (isset($line[6])) {
458 
+	            	$data['latitude'] = $line[6];
459 
+	            }
460 
+	            // lat
461 
+	            if (isset($line[7])) {
462 
+	            	$data['longitude'] = $line[7];
463 
+	            }
464 
+	            // long
359 465 
 	            $data['verticalrate'] = ''; // vertical rate
360 466 
 	            //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk
361 467 
 	            $data['emergency'] = ''; // emergency
362 468 
 		    $data['datetime'] = date('Y-m-d H:i:s');
363 469 
 		    $data['format_source'] = 'deltadbtxt';
364 470 
     		    $data['id_source'] = $id_source;
365 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
366 
-		    if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats'];
471 
+		    if (isset($value['name']) && $value['name'] != '') {
472 
+		    	$data['source_name'] = $value['name'];
473 
+		    }
474 
+		    if (isset($value['sourcestats'])) {
475 
+		    	$data['sourcestats'] = $value['sourcestats'];
476 
+		    }
367 477 
     		    $SI->add($data);
368 478 
 		    unset($data);
369 479 
     		}
 
@@ -386,10 +496,19 @@  discard block
 
 block discarded – undo
386 496 
 			$data['pilot_name'] = $line[2];
387 497 
 			$data['hex'] = str_pad(dechex($line[1]),6,'000000',STR_PAD_LEFT);
388 498 
 			$data['ident'] = $line[0]; // ident
389 
-			if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude
499 
+			if ($line[7] != '' && $line[7] != 0) {
500 
+				$data['altitude'] = $line[7];
501 
+			}
502 
+			// altitude
390 503 
 			$data['speed'] = $line[8]; // speed
391 
-			if (isset($line[45])) $data['heading'] = $line[45]; // heading
392 
-			elseif (isset($line[38])) $data['heading'] = $line[38]; // heading
504 
+			if (isset($line[45])) {
505 
+				$data['heading'] = $line[45];
506 
+			}
507 
+			// heading
508 
+			elseif (isset($line[38])) {
509 
+				$data['heading'] = $line[38];
510 
+			}
511 
+			// heading
393 512 
 			$data['latitude'] = $line[5]; // lat
394 513 
 	        	$data['longitude'] = $line[6]; // long
395 514 
 	        	$data['verticalrate'] = ''; // vertical rate
 
@@ -398,14 +517,18 @@  discard block
 
 block discarded – undo
398 517 
 	        	$data['waypoints'] = $line[30];
399 518 
 			$data['datetime'] = date('Y-m-d H:i:s');
400 519 
 			//$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37]));
401 
-			if (isset($line[37])) $data['last_update'] = $line[37];
520 
+			if (isset($line[37])) {
521 
+				$data['last_update'] = $line[37];
522 
+			}
402 523 
 		        $data['departure_airport_icao'] = $line[11];
403 524 
 		        $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':');
404 525 
 		        $data['arrival_airport_icao'] = $line[13];
405 526 
 			$data['frequency'] = $line[4];
406 527 
 			$data['type'] = $line[18];
407 528 
 			$data['range'] = $line[19];
408 
-			if (isset($line[35])) $data['info'] = $line[35];
529 
+			if (isset($line[35])) {
530 
+				$data['info'] = $line[35];
531 
+			}
409 532 
     			$data['id_source'] = $id_source;
410 533 
 	    		//$data['arrival_airport_time'] = ;
411 534 
 	    		if ($line[9] != '') {
 
@@ -419,23 +542,38 @@  discard block
 
 block discarded – undo
419 542 
 	    		elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt';
420 543 
 	    		*/
421 544 
 	    		$data['format_source'] = $value['format'];
422 
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
423 
-    			if ($line[3] == 'PILOT') $SI->add($data);
424 
-			elseif ($line[3] == 'ATC') {
545 
+			if (isset($value['name']) && $value['name'] != '') {
546 
+				$data['source_name'] = $value['name'];
547 
+			}
548 
+    			if ($line[3] == 'PILOT') {
549 
+    				$SI->add($data);
550 
+    			} elseif ($line[3] == 'ATC') {
425 551 
 				//print_r($data);
426 552 
 				$data['info'] = str_replace('^&sect;','<br />',$data['info']);
427 553 
 				$data['info'] = str_replace('&amp;sect;','',$data['info']);
428 554 
 				$typec = substr($data['ident'],-3);
429 
-				if ($typec == 'APP') $data['type'] = 'Approach';
430 
-				elseif ($typec == 'TWR') $data['type'] = 'Tower';
431 
-				elseif ($typec == 'OBS') $data['type'] = 'Observer';
432 
-				elseif ($typec == 'GND') $data['type'] = 'Ground';
433 
-				elseif ($typec == 'DEL') $data['type'] = 'Delivery';
434 
-				elseif ($typec == 'DEP') $data['type'] = 'Departure';
435 
-				elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
436 
-				elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
437 
-				elseif ($data['type'] == '') $data['type'] = 'Observer';
438 
-				if (!isset($data['source_name'])) $data['source_name'] = '';
555 
+				if ($typec == 'APP') {
556 
+					$data['type'] = 'Approach';
557 
+				} elseif ($typec == 'TWR') {
558 
+					$data['type'] = 'Tower';
559 
+				} elseif ($typec == 'OBS') {
560 
+					$data['type'] = 'Observer';
561 
+				} elseif ($typec == 'GND') {
562 
+					$data['type'] = 'Ground';
563 
+				} elseif ($typec == 'DEL') {
564 
+					$data['type'] = 'Delivery';
565 
+				} elseif ($typec == 'DEP') {
566 
+					$data['type'] = 'Departure';
567 
+				} elseif ($typec == 'FSS') {
568 
+					$data['type'] = 'Flight Service Station';
569 
+				} elseif ($typec == 'CTR') {
570 
+					$data['type'] = 'Control Radar or Centre';
571 
+				} elseif ($data['type'] == '') {
572 
+					$data['type'] = 'Observer';
573 
+				}
574 
+				if (!isset($data['source_name'])) {
575 
+					$data['source_name'] = '';
576 
+				}
439 577 
 				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']);
440 578 
 			}
441 579 
     			unset($data);
 
@@ -455,26 +593,55 @@  discard block
 
 block discarded – undo
455 593 
 		foreach ($all_data['acList'] as $line) {
456 594 
 		    $data = array();
457 595 
 		    $data['hex'] = $line['Icao']; // hex
458 
-		    if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident
459 
-		    if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude
460 
-		    if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed
461 
-		    if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading
462 
-		    if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat
463 
-		    if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long
596 
+		    if (isset($line['Call'])) {
597 
+		    	$data['ident'] = $line['Call'];
598 
+		    }
599 
+		    // ident
600 
+		    if (isset($line['Alt'])) {
601 
+		    	$data['altitude'] = $line['Alt'];
602 
+		    }
603 
+		    // altitude
604 
+		    if (isset($line['Spd'])) {
605 
+		    	$data['speed'] = $line['Spd'];
606 
+		    }
607 
+		    // speed
608 
+		    if (isset($line['Trak'])) {
609 
+		    	$data['heading'] = $line['Trak'];
610 
+		    }
611 
+		    // heading
612 
+		    if (isset($line['Lat'])) {
613 
+		    	$data['latitude'] = $line['Lat'];
614 
+		    }
615 
+		    // lat
616 
+		    if (isset($line['Long'])) {
617 
+		    	$data['longitude'] = $line['Long'];
618 
+		    }
619 
+		    // long
464 620 
 		    //$data['verticalrate'] = $line['']; // verticale rate
465 
-		    if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk
621 
+		    if (isset($line['Sqk'])) {
622 
+		    	$data['squawk'] = $line['Sqk'];
623 
+		    }
624 
+		    // squawk
466 625 
 		    $data['emergency'] = ''; // emergency
467 
-		    if (isset($line['Reg'])) $data['registration'] = $line['Reg'];
626 
+		    if (isset($line['Reg'])) {
627 
+		    	$data['registration'] = $line['Reg'];
628 
+		    }
468 629 
 		    /*
469 630 
 		    if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000);
470 631 
 		    else $data['datetime'] = date('Y-m-d H:i:s');
471 632 
 		    */
472 633 
 		    $data['datetime'] = date('Y-m-d H:i:s');
473 
-		    if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type'];
634 
+		    if (isset($line['Type'])) {
635 
+		    	$data['aircraft_icao'] = $line['Type'];
636 
+		    }
474 637 
 	    	    $data['format_source'] = 'aircraftlistjson';
475 638 
 		    $data['id_source'] = $id_source;
476 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
477 
-		    if (isset($data['datetime'])) $SI->add($data);
639 
+		    if (isset($value['name']) && $value['name'] != '') {
640 
+		    	$data['source_name'] = $value['name'];
641 
+		    }
642 
+		    if (isset($data['datetime'])) {
643 
+		    	$SI->add($data);
644 
+		    }
478 645 
 		    unset($data);
479 646 
 		}
480 647 
 	    } else {
 
@@ -494,7 +661,9 @@  discard block
 
 block discarded – undo
494 661 
 		    $data['datetime'] = date('Y-m-d H:i:s');
495 662 
 	    	    $data['format_source'] = 'aircraftlistjson';
496 663 
     		    $data['id_source'] = $id_source;
497 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
664 
+		    if (isset($value['name']) && $value['name'] != '') {
665 
+		    	$data['source_name'] = $value['name'];
666 
+		    }
498 667 
 		    $SI->add($data);
499 668 
 		    unset($data);
500 669 
 		}
 
@@ -530,7 +699,9 @@  discard block
 
 block discarded – undo
530 699 
 		    $data['datetime'] = date('Y-m-d H:i:s',$line[9]);
531 700 
 	    	    $data['format_source'] = 'planeupdatefaa';
532 701 
     		    $data['id_source'] = $id_source;
533 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
702 
+		    if (isset($value['name']) && $value['name'] != '') {
703 
+		    	$data['source_name'] = $value['name'];
704 
+		    }
534 705 
 		    $SI->add($data);
535 706 
 		    unset($data);
536 707 
 		}
 
@@ -570,7 +741,9 @@  discard block
 
 block discarded – undo
570 741 
 	    //$buffer = $Common->getData($hosts[$id]);
571 742 
 	    $buffer = $Common->getData($value['host']);
572 743 
 	    $all_data = json_decode($buffer,true);
573 
-	    if (!empty($all_data)) $reset = 0;
744 
+	    if (!empty($all_data)) {
745 
+	    	$reset = 0;
746 
+	    }
574 747 
 	    foreach ($all_data as $key => $line) {
575 748 
 		if ($key != 'full_count' && $key != 'version' && $key != 'stats') {
576 749 
 		    $data = array();
 
@@ -591,7 +764,9 @@  discard block
 
 block discarded – undo
591 764 
 		    $data['datetime'] = date('Y-m-d H:i:s'); //$line[10]
592 765 
 	    	    $data['format_source'] = 'fr24json';
593 766 
     		    $data['id_source'] = $id_source;
594 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
767 
+		    if (isset($value['name']) && $value['name'] != '') {
768 
+		    	$data['source_name'] = $value['name'];
769 
+		    }
595 770 
 		    $SI->add($data);
596 771 
 		    unset($data);
597 772 
 		}
 
@@ -615,23 +790,39 @@  discard block
 
 block discarded – undo
615 790 
 		    if (isset($line['inf'])) {
616 791 
 			$data = array();
617 792 
 			$data['hex'] = $line['inf']['ia'];
618 
-			if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13]
793 
+			if (isset($line['inf']['cs'])) {
794 
+				$data['ident'] = $line['inf']['cs'];
795 
+			}
796 
+			//$line[13]
619 797 
 	    		$data['altitude'] = round($line['inf']['al']*3.28084); // altitude
620 
-	    		if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed
621 
-	    		if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading
798 
+	    		if (isset($line['inf']['gs'])) {
799 
+	    			$data['speed'] = round($line['inf']['gs']*0.539957);
800 
+	    		}
801 
+	    		// speed
802 
+	    		if (isset($line['inf']['tr'])) {
803 
+	    			$data['heading'] = $line['inf']['tr'];
804 
+	    		}
805 
+	    		// heading
622 806 
 	    		$data['latitude'] = $line['pt'][0]; // lat
623 807 
 	    		$data['longitude'] = $line['pt'][1]; // long
624 808 
 	    		//if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate
625 
-	    		if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk
809 
+	    		if (isset($line['inf']['sq'])) {
810 
+	    			$data['squawk'] = $line['inf']['sq'];
811 
+	    		}
812 
+	    		// squawk
626 813 
 	    		//$data['aircraft_icao'] = $line[8];
627 
-	    		if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc'];
814 
+	    		if (isset($line['inf']['rc'])) {
815 
+	    			$data['registration'] = $line['inf']['rc'];
816 
+	    		}
628 817 
 			//$data['departure_airport_iata'] = $line[11];
629 818 
 			//$data['arrival_airport_iata'] = $line[12];
630 819 
 	    		//$data['emergency'] = ''; // emergency
631 820 
 			$data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10]
632 821 
 	    		$data['format_source'] = 'radarvirtueljson';
633 822 
     			$data['id_source'] = $id_source;
634 
-			if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
823 
+			if (isset($value['name']) && $value['name'] != '') {
824 
+				$data['source_name'] = $value['name'];
825 
+			}
635 826 
 			$SI->add($data);
636 827 
 			unset($data);
637 828 
 		    }
 
@@ -652,29 +843,62 @@  discard block
 
 block discarded – undo
652 843 
 		    $data['id'] = $line['id'];
653 844 
 		    $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6);
654 845 
 		    $data['ident'] = $line['callsign']; // ident
655 
-		    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id
656 
-		    if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name
657 
-		    if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude
658 
-		    if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed
659 
-		    if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading
660 
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
846 
+		    if (isset($line['pilotid'])) {
847 
+		    	$data['pilot_id'] = $line['pilotid'];
848 
+		    }
849 
+		    // pilot id
850 
+		    if (isset($line['name'])) {
851 
+		    	$data['pilot_name'] = $line['name'];
852 
+		    }
853 
+		    // pilot name
854 
+		    if (isset($line['alt'])) {
855 
+		    	$data['altitude'] = $line['alt'];
856 
+		    }
857 
+		    // altitude
858 
+		    if (isset($line['gs'])) {
859 
+		    	$data['speed'] = $line['gs'];
860 
+		    }
861 
+		    // speed
862 
+		    if (isset($line['heading'])) {
863 
+		    	$data['heading'] = $line['heading'];
864 
+		    }
865 
+		    // heading
866 
+		    if (isset($line['route'])) {
867 
+		    	$data['waypoints'] = $line['route'];
868 
+		    }
869 
+		    // route
661 870 
 		    $data['latitude'] = $line['lat']; // lat
662 871 
 		    $data['longitude'] = $line['lon']; // long
663 872 
 		    //$data['verticalrate'] = $line['vrt']; // verticale rate
664 873 
 		    //$data['squawk'] = $line['squawk']; // squawk
665 874 
 		    //$data['emergency'] = ''; // emergency
666 
-		    if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao'];
667 
-		    if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime'];
668 
-		    if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao'];
875 
+		    if (isset($line['depicao'])) {
876 
+		    	$data['departure_airport_icao'] = $line['depicao'];
877 
+		    }
878 
+		    if (isset($line['deptime'])) {
879 
+		    	$data['departure_airport_time'] = $line['deptime'];
880 
+		    }
881 
+		    if (isset($line['arricao'])) {
882 
+		    	$data['arrival_airport_icao'] = $line['arricao'];
883 
+		    }
669 884 
 		    //$data['arrival_airport_time'] = $line['arrtime'];
670 
-		    if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft'];
671 
-		    if (isset($line['transponder'])) $data['squawk'] = $line['transponder'];
672 
-		    if (isset($line['atis'])) $data['info'] = $line['atis'];
673 
-		    else $data['info'] = '';
885 
+		    if (isset($line['aircraft'])) {
886 
+		    	$data['aircraft_icao'] = $line['aircraft'];
887 
+		    }
888 
+		    if (isset($line['transponder'])) {
889 
+		    	$data['squawk'] = $line['transponder'];
890 
+		    }
891 
+		    if (isset($line['atis'])) {
892 
+		    	$data['info'] = $line['atis'];
893 
+		    } else {
894 
+		    	$data['info'] = '';
895 
+		    }
674 896 
 		    $data['format_source'] = 'pireps';
675 897 
     		    $data['id_source'] = $id_source;
676 898 
 		    $data['datetime'] = date('Y-m-d H:i:s');
677 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
899 
+		    if (isset($value['name']) && $value['name'] != '') {
900 
+		    	$data['source_name'] = $value['name'];
901 
+		    }
678 902 
 		    if ($line['icon'] == 'plane') {
679 903 
 			$SI->add($data);
680 904 
 		    //    print_r($data);
 
@@ -683,15 +907,25 @@  discard block
 
 block discarded – undo
683 907 
 			$data['info'] = str_replace('&amp;sect;','',$data['info']);
684 908 
 			$typec = substr($data['ident'],-3);
685 909 
 			$data['type'] = '';
686 
-			if ($typec == 'APP') $data['type'] = 'Approach';
687 
-			elseif ($typec == 'TWR') $data['type'] = 'Tower';
688 
-			elseif ($typec == 'OBS') $data['type'] = 'Observer';
689 
-			elseif ($typec == 'GND') $data['type'] = 'Ground';
690 
-			elseif ($typec == 'DEL') $data['type'] = 'Delivery';
691 
-			elseif ($typec == 'DEP') $data['type'] = 'Departure';
692 
-			elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station';
693 
-			elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre';
694 
-			else $data['type'] = 'Observer';
910 
+			if ($typec == 'APP') {
911 
+				$data['type'] = 'Approach';
912 
+			} elseif ($typec == 'TWR') {
913 
+				$data['type'] = 'Tower';
914 
+			} elseif ($typec == 'OBS') {
915 
+				$data['type'] = 'Observer';
916 
+			} elseif ($typec == 'GND') {
917 
+				$data['type'] = 'Ground';
918 
+			} elseif ($typec == 'DEL') {
919 
+				$data['type'] = 'Delivery';
920 
+			} elseif ($typec == 'DEP') {
921 
+				$data['type'] = 'Departure';
922 
+			} elseif ($typec == 'FSS') {
923 
+				$data['type'] = 'Flight Service Station';
924 
+			} elseif ($typec == 'CTR') {
925 
+				$data['type'] = 'Control Radar or Centre';
926 
+			} else {
927 
+				$data['type'] = 'Observer';
928 
+			}
695 929 
 			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']);
696 930 
 		    }
697 931 
 		    unset($data);
 
@@ -702,7 +936,9 @@  discard block
 
 block discarded – undo
702 936 
     	//} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) {
703 937 
     	} elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
704 938 
 	    //$buffer = $Common->getData($hosts[$id]);
705 
-	    if ($globalDebug) echo 'Get Data...'."\n";
939 
+	    if ($globalDebug) {
940 
+	    	echo 'Get Data...'."\n";
941 
+	    }
706 942 
 	    $buffer = $Common->getData($value['host']);
707 943 
 	    $all_data = json_decode($buffer,true);
708 944 
 	    if ($buffer != '' && is_array($all_data)) {
 
@@ -710,10 +946,16 @@  discard block
 
 block discarded – undo
710 946 
 		foreach ($all_data as $line) {
711 947 
 	    	    $data = array();
712 948 
 	    	    //$data['id'] = $line['id']; // id not usable
713 
-	    	    if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum'];
949 
+	    	    if (isset($line['pilotid'])) {
950 
+	    	    	$data['id'] = $line['pilotid'].$line['flightnum'];
951 
+	    	    }
714 952 
 	    	    $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex
715 
-	    	    if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname'];
716 
-	    	    if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid'];
953 
+	    	    if (isset($line['pilotname'])) {
954 
+	    	    	$data['pilot_name'] = $line['pilotname'];
955 
+	    	    }
956 
+	    	    if (isset($line['pilotid'])) {
957 
+	    	    	$data['pilot_id'] = $line['pilotid'];
958 
+	    	    }
717 959 
 	    	    $data['ident'] = $line['flightnum']; // ident
718 960 
 	    	    $data['altitude'] = $line['alt']; // altitude
719 961 
 	    	    $data['speed'] = $line['gs']; // speed
 
@@ -731,27 +973,41 @@  discard block
 
 block discarded – undo
731 973 
 	    	    $data['arrival_airport_icao'] = $line['arricao'];
732 974 
     		    $data['arrival_airport_time'] = $line['arrtime'];
733 975 
     		    $data['registration'] = $line['aircraft'];
734 
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
976 
+		    if (isset($line['route'])) {
977 
+		    	$data['waypoints'] = $line['route'];
978 
+		    }
979 
+		    // route
735 980 
 		    if (isset($line['aircraftname'])) {
736 981 
 			$line['aircraftname'] = strtoupper($line['aircraftname']);
737 982 
 			$line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']);
738 983 
 	    		$aircraft_data = explode('-',$line['aircraftname']);
739 
-	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0];
740 
-	    		elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1];
741 
-	    		else {
984 
+	    		if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) {
985 
+	    			$data['aircraft_icao'] = $aircraft_data[0];
986 
+	    		} elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) {
987 
+	    			$data['aircraft_icao'] = $aircraft_data[1];
988 
+	    		} else {
742 989 
 	    		    $aircraft_data = explode(' ',$line['aircraftname']);
743 
-	    		    if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1];
744 
-	    		    else $data['aircraft_icao'] = $line['aircraftname'];
990 
+	    		    if (isset($aircraft_data[1])) {
991 
+	    		    	$data['aircraft_icao'] = $aircraft_data[1];
992 
+	    		    } else {
993 
+	    		    	$data['aircraft_icao'] = $line['aircraftname'];
994 
+	    		    }
745 995 
 	    		}
746 996 
 	    	    }
747 
-    		    if (isset($line['route'])) $data['waypoints'] = $line['route'];
997 
+    		    if (isset($line['route'])) {
998 
+    		    	$data['waypoints'] = $line['route'];
999 
+    		    }
748 1000 
     		    $data['id_source'] = $id_source;
749 1001 
 	    	    $data['format_source'] = 'phpvmacars';
750 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1002 
+		    if (isset($value['name']) && $value['name'] != '') {
1003 
+		    	$data['source_name'] = $value['name'];
1004 
+		    }
751 1005 
 		    $SI->add($data);
752 1006 
 		    unset($data);
753 1007 
 		}
754 
-		if ($globalDebug) echo 'No more data...'."\n";
1008 
+		if ($globalDebug) {
1009 
+			echo 'No more data...'."\n";
1010 
+		}
755 1011 
 		unset($buffer);
756 1012 
 		unset($all_data);
757 1013 
 	    }
 
@@ -759,7 +1015,9 @@  discard block
 
 block discarded – undo
759 1015 
     	    $last_exec[$id]['last'] = time();
760 1016 
     	} elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) {
761 1017 
 	    //$buffer = $Common->getData($hosts[$id]);
762 
-	    if ($globalDebug) echo 'Get Data...'."\n";
1018 
+	    if ($globalDebug) {
1019 
+	    	echo 'Get Data...'."\n";
1020 
+	    }
763 1021 
 	    $buffer = $Common->getData($value['host']);
764 1022 
 	    $all_data = json_decode($buffer,true);
765 1023 
 	    if ($buffer != '' && is_array($all_data)) {
 
@@ -788,15 +1046,22 @@  discard block
 
 block discarded – undo
788 1046 
 	    	    $data['arrival_airport_icao'] = $line['arrival'];
789 1047 
     		    //$data['arrival_airport_time'] = $line['arrival_time'];
790 1048 
     		    //$data['registration'] = $line['aircraft'];
791 
-		    if (isset($line['route'])) $data['waypoints'] = $line['route']; // route
1049 
+		    if (isset($line['route'])) {
1050 
+		    	$data['waypoints'] = $line['route'];
1051 
+		    }
1052 
+		    // route
792 1053 
 	    	    $data['aircraft_icao'] = $line['plane_type'];
793 1054 
     		    $data['id_source'] = $id_source;
794 1055 
 	    	    $data['format_source'] = 'vam';
795 
-		    if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name'];
1056 
+		    if (isset($value['name']) && $value['name'] != '') {
1057 
+		    	$data['source_name'] = $value['name'];
1058 
+		    }
796 1059 
 		    $SI->add($data);
797 1060 
 		    unset($data);
798 1061 
 		}
799 
-		if ($globalDebug) echo 'No more data...'."\n";
1062 
+		if ($globalDebug) {
1063 
+			echo 'No more data...'."\n";
1064 
+		}
800 1065 
 		unset($buffer);
801 1066 
 		unset($all_data);
802 1067 
 	    }
 
@@ -804,7 +1069,9 @@  discard block
 
 block discarded – undo
804 1069 
     	    $last_exec[$id]['last'] = time();
805 1070 
 	//} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') {
806 1071 
 	} elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3') {
807 
-	    if (function_exists('pcntl_fork')) pcntl_signal_dispatch();
1072 
+	    if (function_exists('pcntl_fork')) {
1073 
+	    	pcntl_signal_dispatch();
1074 
+	    }
808 1075 
     	    //$last_exec[$id]['last'] = time();
809 1076
810 1077 
 	    //$read = array( $sockets[$id] );
 
@@ -812,7 +1079,9 @@  discard block
 
 block discarded – undo
812 1079 
 	    $write = NULL;
813 1080 
 	    $e = NULL;
814 1081 
 	    $n = socket_select($read, $write, $e, $timeout);
815 
-	    if ($e != NULL) var_dump($e);
1082 
+	    if ($e != NULL) {
1083 
+	    	var_dump($e);
1084 
+	    }
816 1085 
 	    if ($n > 0) {
817 1086 
 		$reset = 0;
818 1087 
 		foreach ($read as $nb => $r) {
 
@@ -834,7 +1103,9 @@  discard block
 
 block discarded – undo
834 1103 
 		    if ($buffer != '') {
835 1104 
 			$tt[$format] = 0;
836 1105 
 			if ($format == 'acarssbs3') {
837 
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1106 
+                    	    if ($globalDebug) {
1107 
+                    	    	echo 'ACARS : '.$buffer."\n";
1108 
+                    	    }
838 1109 
 			    $ACARS->add(trim($buffer));
839 1110 
 			    $ACARS->deleteLiveAcarsData();
840 1111 
 			} elseif ($format == 'raw') {
 
@@ -843,9 +1114,15 @@  discard block
 
 block discarded – undo
843 1114 
 			    if (is_array($data)) {
844 1115 
 				$data['datetime'] = date('Y-m-d H:i:s');
845 1116 
 				$data['format_source'] = 'raw';
846 
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
847 
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
848 
-                                if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1117 
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
1118 
+					$data['source_name'] = $globalSources[$nb]['name'];
1119 
+				}
1120 
+    				if (isset($globalSources[$nb]['sourcestats'])) {
1121 
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1122 
+    				}
1123 
+                                if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1124 
+                                	$SI->add($data);
1125 
+                                }
849 1126 
                             }
850 1127 
                         } elseif ($format == 'flightgearsp') {
851 1128 
                     	    //echo $buffer."\n";
 
@@ -863,11 +1140,15 @@  discard block
 
 block discarded – undo
863 1140 
 				$data['speed'] = round($line[5]*1.94384);
864 1141 
 				$data['datetime'] = date('Y-m-d H:i:s');
865 1142 
 				$data['format_source'] = 'flightgearsp';
866 
-				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1143 
+				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1144 
+					$SI->add($data);
1145 
+				}
867 1146 
 				$send = @ socket_send( $r  , $data_aprs , strlen($data_aprs) , 0 );
868 1147 
 			    }
869 1148 
                         } elseif ($format == 'acars') {
870 
-                    	    if ($globalDebug) echo 'ACARS : '.$buffer."\n";
1149 
+                    	    if ($globalDebug) {
1150 
+                    	    	echo 'ACARS : '.$buffer."\n";
1151 
+                    	    }
871 1152 
 			    $ACARS->add(trim($buffer));
872 1153 
 			    socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port);
873 1154 
 			    $ACARS->deleteLiveAcarsData();
 
@@ -888,7 +1169,9 @@  discard block
 
 block discarded – undo
888 1169 
 				    $aircraft_type = $line[10];
889 1170 
 				    $aircraft_type = preg_split(':/:',$aircraft_type);
890 1171 
 				    $data['aircraft_name'] = substr(end($aircraft_type),0,-4);
891 
-				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1172 
+				    if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1173 
+				    	$SI->add($data);
1174 
+				    }
892 1175 
 				}
893 1176 
 			    }
894 1177 
 			} elseif ($format == 'beast') {
 
@@ -904,21 +1187,43 @@  discard block
 
 block discarded – undo
904 1187 
     				$data['hex'] = $lined['hexid'];
905 1188 
     				//$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));;
906 1189 
     				$data['datetime'] = date('Y-m-d H:i:s');;
907 
-    				if (isset($lined['ident'])) $data['ident'] = $lined['ident'];
908 
-    				if (isset($lined['lat'])) $data['latitude'] = $lined['lat'];
909 
-    				if (isset($lined['lon'])) $data['longitude'] = $lined['lon'];
910 
-    				if (isset($lined['speed'])) $data['speed'] = $lined['speed'];
911 
-    				if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk'];
912 
-    				if (isset($lined['alt'])) $data['altitude'] = $lined['alt'];
913 
-    				if (isset($lined['heading'])) $data['heading'] = $lined['heading'];
1190 
+    				if (isset($lined['ident'])) {
1191 
+    					$data['ident'] = $lined['ident'];
1192 
+    				}
1193 
+    				if (isset($lined['lat'])) {
1194 
+    					$data['latitude'] = $lined['lat'];
1195 
+    				}
1196 
+    				if (isset($lined['lon'])) {
1197 
+    					$data['longitude'] = $lined['lon'];
1198 
+    				}
1199 
+    				if (isset($lined['speed'])) {
1200 
+    					$data['speed'] = $lined['speed'];
1201 
+    				}
1202 
+    				if (isset($lined['squawk'])) {
1203 
+    					$data['squawk'] = $lined['squawk'];
1204 
+    				}
1205 
+    				if (isset($lined['alt'])) {
1206 
+    					$data['altitude'] = $lined['alt'];
1207 
+    				}
1208 
+    				if (isset($lined['heading'])) {
1209 
+    					$data['heading'] = $lined['heading'];
1210 
+    				}
914 1211 
     				$data['id_source'] = $id_source;
915 1212 
     				$data['format_source'] = 'tsv';
916 
-    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
917 
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
918 
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data);
1213 
+    				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
1214 
+    					$data['source_name'] = $globalSources[$nb]['name'];
1215 
+    				}
1216 
+    				if (isset($globalSources[$nb]['sourcestats'])) {
1217 
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1218 
+    				}
1219 
+    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1220 
+    					$SI->add($data);
1221 
+    				}
919 1222 
     				unset($lined);
920 1223 
     				unset($data);
921 
-    			    } else $error = true;
1224 
+    			    } else {
1225 
+    			    	$error = true;
1226 
+    			    }
922 1227 
 			} elseif ($format == 'aprs' && $use_aprs) {
923 1228 
 			    if ($aprs_connect == 0) {
924 1229 
 				$send = @ socket_send( $r  , $aprs_login , strlen($aprs_login) , 0 );
 
@@ -944,29 +1249,44 @@  discard block
 
 block discarded – undo
944 1249 
 				    $data['latitude'] = $line['latitude'];
945 1250 
 				    $data['longitude'] = $line['longitude'];
946 1251 
 				    //$data['verticalrate'] = $line[16];
947 
-				    if (isset($line['speed'])) $data['speed'] = $line['speed'];
948 
-				    else $data['speed'] = 0;
1252 
+				    if (isset($line['speed'])) {
1253 
+				    	$data['speed'] = $line['speed'];
1254 
+				    } else {
1255 
+				    	$data['speed'] = 0;
1256 
+				    }
949 1257 
 				    $data['altitude'] = $line['altitude'];
950 
-				    if (isset($line['course'])) $data['heading'] = $line['course'];
1258 
+				    if (isset($line['course'])) {
1259 
+				    	$data['heading'] = $line['course'];
1260 
+				    }
951 1261 
 				    //else $data['heading'] = 0;
952 1262 
 				    $data['aircraft_type'] = $line['stealth'];
953 
-				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) $data['noarchive'] = true;
1263 
+				    if (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive == FALSE)) {
1264 
+				    	$data['noarchive'] = true;
1265 
+				    }
954 1266 
     				    $data['id_source'] = $id_source;
955 1267 
 				    $data['format_source'] = 'aprs';
956 1268 
 				    $data['source_name'] = $line['source'];
957 
-    				    if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1269 
+    				    if (isset($globalSources[$nb]['sourcestats'])) {
1270 
+    				    	$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1271 
+    				    }
958 1272 
 				    $currentdate = date('Y-m-d H:i:s');
959 1273 
 				    $aprsdate = strtotime($data['datetime']);
960 1274 
 				    // Accept data if time <= system time + 20s
961 
-				    if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) $send = $SI->add($data);
962 
-				    else {
963 
-					if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
964 
-					else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
1275 
+				    if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) {
1276 
+				    	$send = $SI->add($data);
1277 
+				    } else {
1278 
+					if ($line['stealth'] != 0) {
1279 
+						echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n";
1280 
+					} else {
1281 
+						echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n";
1282 
+					}
965 1283 
 				    }
966 1284 
 				    unset($data);
967 1285 
 				}
968 1286 
 				//elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n";
969 
-				elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n";
1287 
+				elseif ($line == true && $globalDebug) {
1288 
+					echo '!! Failed : '.$buffer."!!\n";
1289 
+				}
970 1290 
 			    }
971 1291 
 			} else {
972 1292 
 			    $line = explode(',', $buffer);
 
@@ -995,25 +1315,42 @@  discard block
 
 block discarded – undo
995 1315 
     				$data['ground'] = $line[21];
996 1316 
     				$data['emergency'] = $line[19];
997 1317 
     				$data['format_source'] = 'sbs';
998 
-				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name'];
999 
-    				if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1318 
+				if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') {
1319 
+					$data['source_name'] = $globalSources[$nb]['name'];
1320 
+				}
1321 
+    				if (isset($globalSources[$nb]['sourcestats'])) {
1322 
+    					$data['sourcestats'] = $globalSources[$nb]['sourcestats'];
1323 
+    				}
1000 1324 
     				$data['id_source'] = $id_source;
1001 
-    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data);
1002 
-    				else $error = true;
1325 
+    				if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) {
1326 
+    					$send = $SI->add($data);
1327 
+    				} else {
1328 
+    					$error = true;
1329 
+    				}
1003 1330 
     				unset($data);
1004 
-    			    } else $error = true;
1331 
+    			    } else {
1332 
+    			    	$error = true;
1333 
+    			    }
1005 1334 
 			    if ($error) {
1006 1335 
 				if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) {
1007 
-					if ($globalDebug) echo "Not a message. Ignoring... \n";
1336 
+					if ($globalDebug) {
1337 
+						echo "Not a message. Ignoring... \n";
1338 
+					}
1008 1339 
 				} else {
1009 
-					if ($globalDebug) echo "Wrong line format. Ignoring... \n";
1340 
+					if ($globalDebug) {
1341 
+						echo "Wrong line format. Ignoring... \n";
1342 
+					}
1010 1343 
 					if ($globalDebug) {
1011 1344 
 						echo $buffer;
1012 1345 
 						print_r($line);
1013 1346 
 					}
1014 1347 
 					//socket_close($r);
1015 
-					if ($globalDebug) echo "Reconnect after an error...\n";
1016 
-					if ($format == 'aprs') $aprs_connect = 0;
1348 
+					if ($globalDebug) {
1349 
+						echo "Reconnect after an error...\n";
1350 
+					}
1351 
+					if ($format == 'aprs') {
1352 
+						$aprs_connect = 0;
1353 
+					}
1017 1354 
 					$sourceer[$nb] = $globalSources[$nb];
1018 1355 
 					connect_all($sourceer);
1019 1356 
 					$sourceer = array();
 
@@ -1021,10 +1358,14 @@  discard block
 
 block discarded – undo
1021 1358 
 			    }
1022 1359 
 			}
1023 1360 
 			// Sleep for xxx microseconds
1024 
-			if (isset($globalSBSSleep)) usleep($globalSBSSleep);
1361 
+			if (isset($globalSBSSleep)) {
1362 
+				usleep($globalSBSSleep);
1363 
+			}
1025 1364 
 		    } else {
1026 1365 
 			if ($format == 'flightgearmp') {
1027 
-			    	if ($globalDebug) echo "Reconnect FlightGear MP...";
1366 
+			    	if ($globalDebug) {
1367 
+			    		echo "Reconnect FlightGear MP...";
1368 
+			    	}
1028 1369 
 				//@socket_close($r);
1029 1370 
 				sleep($globalMinFetch);
1030 1371 
 				$sourcefg[$nb] = $globalSources[$nb];
 
@@ -1033,10 +1374,15 @@  discard block
 
 block discarded – undo
1033 1374 
 				break;
1034 1375
1035 1376 
 			} elseif ($format != 'acars' && $format != 'flightgearsp') {
1036 
-			    if (isset($tt[$format])) $tt[$format]++;
1037 
-			    else $tt[$format] = 0;
1377 
+			    if (isset($tt[$format])) {
1378 
+			    	$tt[$format]++;
1379 
+			    } else {
1380 
+			    	$tt[$format] = 0;
1381 
+			    }
1038 1382 
 			    if ($tt[$format] > 30) {
1039 
-				if ($globalDebug) echo "ERROR : Reconnect ".$format."...";
1383 
+				if ($globalDebug) {
1384 
+					echo "ERROR : Reconnect ".$format."...";
1385 
+				}
1040 1386 
 				//@socket_close($r);
1041 1387 
 				sleep(2);
1042 1388 
 				$aprs_connect = 0;
 
@@ -1052,12 +1398,18 @@  discard block
 
 block discarded – undo
1052 1398 
 		}
1053 1399 
 	    } else {
1054 1400 
 		$error = socket_strerror(socket_last_error());
1055 
-		if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n";
1401 
+		if ($globalDebug) {
1402 
+			echo "ERROR : socket_select give this error ".$error . "\n";
1403 
+		}
1056 1404 
 		if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || time() - $time >= $timeout) {
1057 
-			if (isset($globalDebug)) echo "Restarting...\n";
1405 
+			if (isset($globalDebug)) {
1406 
+				echo "Restarting...\n";
1407 
+			}
1058 1408 
 			// Restart the script if possible
1059 1409 
 			if (is_array($sockets)) {
1060 
-			    if ($globalDebug) echo "Shutdown all sockets...";
1410 
+			    if ($globalDebug) {
1411 
+			    	echo "Shutdown all sockets...";
1412 
+			    }
1061 1413
1062 1414 
 			    foreach ($sockets as $sock) {
1063 1415 
 				@socket_shutdown($sock,2);
 
@@ -1065,18 +1417,24 @@  discard block
 
 block discarded – undo
1065 1417 
 			    }
1066 1418
1067 1419 
 			}
1068 
-			if ($globalDebug) echo "Restart all connections...";
1420 
+			if ($globalDebug) {
1421 
+				echo "Restart all connections...";
1422 
+			}
1069 1423 
 			sleep(2);
1070 1424 
 			$time = time();
1071 1425 
 			//connect_all($hosts);
1072 1426 
 			$aprs_connect = 0;
1073 
-			if ($reset > 40) exit('Too many attempts...');
1427 
+			if ($reset > 40) {
1428 
+				exit('Too many attempts...');
1429 
+			}
1074 1430 
 			connect_all($globalSources);
1075 1431 
 		}
1076 1432 
 	    }
1077 1433 
 	}
1078 1434 
 	if ($globalDaemon === false) {
1079 
-	    if ($globalDebug) echo 'Check all...'."\n";
1435 
+	    if ($globalDebug) {
1436 
+	    	echo 'Check all...'."\n";
1437 
+	    }
1080 1438 
 	    $SI->checkAll();
1081 1439 
 	}
1082 1440 
     }
Please login to merge, or discard this patch.