Inspection of "Add a delete stats function, stats with filter beg..." - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 9321a3...c66f20 )

by Yannick

created 2016-12-20 17:01 UTC

Status

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -12,7 +12,9 @@
 block discarded – undo
 $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
 if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
 	$spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort);
-} else $spotter_array = array();
+} else {
+	$spotter_array = array();
+}
   
 if (!empty($spotter_array))
 {

Please login to merge, or discard this patch.

acars-latest.php 1 patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -36,8 +36,12 @@
 block discarded – undo
 if (!empty($spotter_array)) {
 	include('table-output.php');
 	print '<div class="pagination">';
-	if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'/'.$_GET['sort'].'">&laquo;'._("Previous Page").'</a>';
-	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'/'.$_GET['sort'].'">'._("Next Page").'&raquo;</a>';
+	if ($limit_previous_1 >= 0) {
+		print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'/'.$_GET['sort'].'">&laquo;'._("Previous Page").'</a>';
+	}
+	if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
+		print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'/'.$_GET['sort'].'">'._("Next Page").'&raquo;</a>';
+	}
 	print '</div>';
 }
 print '</div>';

Please login to merge, or discard this patch.

polar-geojson.php 1 patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -35,7 +35,9 @@
 block discarded – undo
 		$first = '';
 		foreach($data as $value => $key) {
 			$final_coord = $Common->getCoordfromDistanceBearing($initial_latitude,$initial_longitude,$value*22.5,$key);
-			if ($first == '') $first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']';
+			if ($first == '') {
+				$first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']';
+			}
 			$output .= '['.$final_coord['longitude'].','.$final_coord['latitude'].'],';
 		}
 		$output .= $first;

Please login to merge, or discard this patch.

require/class.Common.php 1 patch

Braces +43 added lines, -16 removed lines patch added patch discarded remove patch

@@ -27,8 +27,11 @@  discard block
 block discarded – undo
 		} else {
 			curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
 		}
-		if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); 
-		else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); 
+		if ($timeout == '') {
+			curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+		} else {
+			curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+		}
 		curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
 		if ($type == 'post') {
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
@@ -73,8 +76,9 @@  discard block
 block discarded – undo
 	
 	private function curlResponseHeaderCallback($ch, $headerLine) {
 		global $cookies;
-		if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1)
-			$cookies[] = $cookie;
+		if (preg_match('/^Set-Cookie:\s*([^;]*)/mi', $headerLine, $cookie) == 1) {
+					$cookies[] = $cookie;
+		}
 		return strlen($headerLine); // Needed by curl
 	}
 	
@@ -84,10 +88,16 @@  discard block
 block discarded – undo
 	* @return Array array of the tables in HTML page
 	*/
 	public function table2array($data) {
-		if (!is_string($data)) return array();
-		if ($data == '') return array();
+		if (!is_string($data)) {
+			return array();
+		}
+		if ($data == '') {
+			return array();
+		}
 		$html = str_get_html($data);
-		if ($html === false) return array();
+		if ($html === false) {
+			return array();
+		}
 		$tabledata=array();
 		foreach($html->find('tr') as $element)
 		{
@@ -122,7 +132,9 @@  discard block
 block discarded – undo
 	*/
 	public function text2array($data) {
 		$html = str_get_html($data);
-		if ($html === false) return array();
+		if ($html === false) {
+			return array();
+		}
 		$tabledata=array();
 		foreach($html->find('p') as $element)
 		{
@@ -143,7 +155,9 @@  discard block
 block discarded – undo
 	* @return Float Distance in $unit
 	*/
 	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
-		if ($lat == $latc && $lon == $lonc) return 0;
+		if ($lat == $latc && $lon == $lonc) {
+			return 0;
+		}
 		$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515;
 		if ($unit == "km") {
 			return round($dist * 1.609344);
@@ -167,10 +181,16 @@  discard block
 block discarded – undo
 	public function withinThreshold ($timeDifference, $distance) {
 		$x = abs($timeDifference);
 		$d = abs($distance);
-		if ($x == 0 || $d == 0) return true;
+		if ($x == 0 || $d == 0) {
+			return true;
+		}
 		// may be due to Internet jitter; distance is realistic
-		if ($x < 0.7 && $d < 2000) return true;
-		else return $d/$x < 1500*0.27778; // 1500 km/h max
+		if ($x < 0.7 && $d < 2000) {
+			return true;
+		} else {
+			return $d/$x < 1500*0.27778;
+		}
+		// 1500 km/h max
 	}
 
 
@@ -230,7 +250,9 @@  discard block
 block discarded – undo
 	public function hex2str($hex) {
 		$str = '';
 		$hexln = strlen($hex);
-		for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
+		for($i=0;$i<$hexln;$i+=2) {
+			$str .= chr(hexdec(substr($hex,$i,2)));
+		}
 		return $str;
 	}
 	
@@ -258,8 +280,11 @@  discard block
 block discarded – undo
 		$b = $lat2 - $lat1;
 		$c = -($a*$lat1+$b*$lon1);
 		$d = $a*$lat3+$b*$lon3+$c;
-		if ($d > -$approx && $d < $approx) return true;
-		else return false;
+		if ($d > -$approx && $d < $approx) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 	
 	public function array_merge_noappend() {
@@ -285,7 +310,9 @@  discard block
 block discarded – undo
 			return $result;
 		}
 		$handle = @opendir('./locale');
-		if ($handle === false) return $result;
+		if ($handle === false) {
+			return $result;
+		}
 		while (false !== ($file = readdir($handle))) {
 			$path = './locale'.'/'.$file.'/LC_MESSAGES/fam.mo';
 			if ($file != "." && $file != ".." && @file_exists($path)) {

Please login to merge, or discard this patch.

archive-geojson.php 1 patch

Braces +120 added lines, -46 removed lines patch added patch discarded remove patch

@@ -16,21 +16,40 @@  discard block
 block discarded – undo
 }
 header('Content-Type: text/javascript');
 
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
 $from_archive = false;
 $min = false;
 $allhistory = false;
 $filter['source'] = array();
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
-if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
-if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
-if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype'];
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
+}
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('sbs'));
+}
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') {
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
+}
+if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') {
+	$filter['airlines'] = explode(',',$_COOKIE['Airlines']);
+}
+if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') {
+	$filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
+}
+if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') {
+	$filter['airlinestype'] = $_COOKIE['airlinestype'];
+}
 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
 	$min = true;
@@ -60,8 +79,12 @@  discard block
 block discarded – undo
 
 if (!empty($spotter_array)) {
 	$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
-	if ($flightcnt == '') $flightcnt = 0;
-} else $flightcnt = 0;
+	if ($flightcnt == '') {
+		$flightcnt = 0;
+	}
+	} else {
+	$flightcnt = 0;
+}
 
 $sqltime = round(microtime(true)-$begintime,2);
 
@@ -70,8 +93,11 @@  discard block
 block discarded – undo
 
 $output = '{';
 	$output .= '"type": "FeatureCollection",';
-		if ($min) $output .= '"minimal": "true",';
-		else $output .= '"minimal": "false",';
+		if ($min) {
+			$output .= '"minimal": "true",';
+		} else {
+			$output .= '"minimal": "false",';
+		}
 		$output .= '"fc": "'.$flightcnt.'",';
 		$output .= '"sqt": "'.$sqltime.'",';
 
@@ -140,11 +166,16 @@  discard block
 block discarded – undo
 						//$output .= '"fc": "'.$flightcnt.'",';
 						//$output .= '"sqt": "'.$sqltime.'",';
 						$output .= '"properties": {';
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							if ($compress) {
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
+							} else {
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
+							}
 							$output .= '"fc": "'.$flightcnt.'",';
 							$output .= '"sqt": "'.$sqltime.'",';
-							if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+							if (isset($begindate)) {
+								$output .= '"archive_date": "'.$begindate.'",';
+							}
 
 /*
 							if ($min) $output .= '"minimal": "true",';
@@ -152,13 +183,21 @@  discard block
 block discarded – undo
 */
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
-							if ($compress) $output .= '"c": "'.$spotter_item['ident'].'",';
-							else $output .= '"callsign": "'.$spotter_item['ident'].'",';
+							if ($compress) {
+								$output .= '"c": "'.$spotter_item['ident'].'",';
+							} else {
+								$output .= '"callsign": "'.$spotter_item['ident'].'",';
+							}
 						} else {
-							if ($compress) $output .= '"c": "NA",';
-							else $output .= '"callsign": "NA",';
+							if ($compress) {
+								$output .= '"c": "NA",';
+							} else {
+								$output .= '"callsign": "NA",';
+							}
+						}
+						if (isset($spotter_item['registration'])) {
+							$output .= '"registration": "'.$spotter_item['registration'].'",';
 						}
-						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
 							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
@@ -171,19 +210,29 @@  discard block
 block discarded – undo
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
 						}
 						if (!isset($spotter_item['aircraft_shadow'])) {
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
-							else {
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
+								$spotter_item['aircraft_shadow'] = '';
+							} else {
 								$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
-								if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
-								else $spotter_item['aircraft_shadow'] = '';
+								if (count($aircraft_info) > 0) {
+									$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
+								} else {
+									$spotter_item['aircraft_shadow'] = '';
+								}
 							}
 						}
 						if ($spotter_item['aircraft_shadow'] == '') {
-							if ($compress) $output .= '"as": "default.png",';
-							else $output .= '"aircraft_shadow": "default.png",';
+							if ($compress) {
+								$output .= '"as": "default.png",';
+							} else {
+								$output .= '"aircraft_shadow": "default.png",';
+							}
 						} else {
-							if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
-							else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+							if ($compress) {
+								$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
+							} else {
+								$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
+							}
 						}
 						if (isset($spotter_item['airline_name'])) {
 							$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
@@ -191,8 +240,11 @@  discard block
 block discarded – undo
 							$output .= '"airline_name": "NA",';
 						}
 						if (isset($spotter_item['departure_airport'])) {
-							if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
-							else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
+							if ($compress) {
+								$output .= '"dac": "'.$spotter_item['departure_airport'].'",';
+							} else {
+								$output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
+							}
 						}
 						if (isset($spotter_item['departure_airport_city'])) {
 							$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
@@ -204,8 +256,11 @@  discard block
 block discarded – undo
 							$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
 						}
 						if (isset($spotter_item['arrival_airport'])) {
-							if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
-							else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
+							if ($compress) {
+								$output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
+							} else {
+								$output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
+							}
 						}
 						if (isset($spotter_item['arrival_airport_city'])) {
 							$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
@@ -223,18 +278,29 @@  discard block
 block discarded – undo
 							$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
 						}
 						
-						if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
-						else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
-						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
-						else $output .= '"heading": "'.$spotter_item['heading'].'",';
+						if ($compress) {
+							$output .= '"a": "'.$spotter_item['altitude'].'",';
+						} else {
+							$output .= '"altitude": "'.$spotter_item['altitude'].'",';
+						}
+						if ($compress) {
+							$output .= '"h": "'.$spotter_item['heading'].'",';
+						} else {
+							$output .= '"heading": "'.$spotter_item['heading'].'",';
+						}
 						
-						if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
-						else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+						if (isset($archivespeed)) {
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
+						} else {
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
+						}
 						//$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",';
 						//$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",';
 						$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
 
-						if (!$min) $output .= '"image": "'.$image.'",';
+						if (!$min) {
+							$output .= '"image": "'.$image.'",';
+						}
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
 							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
 						}
@@ -242,8 +308,11 @@  discard block
 block discarded – undo
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
 						}
 						if (isset($spotter_item['squawk'])) {
-							if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
-							else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
+							if ($compress) {
+								$output .= '"sq": "'.$spotter_item['squawk'].'",';
+							} else {
+								$output .= '"squawk": "'.$spotter_item['squawk'].'",';
+							}
 						}
 						if (isset($spotter_item['squawk_usage'])) {
 							$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
@@ -277,8 +346,11 @@  discard block
 block discarded – undo
 
 
 							// FIXME : type when not aircraft ?
-						if ($compress) $output .= '"t": "aircraft"';
-						else $output .= '"type": "aircraft"';
+						if ($compress) {
+							$output .= '"t": "aircraft"';
+						} else {
+							$output .= '"type": "aircraft"';
+						}
 						$output .= '},';
 						$output .= '"geometry": {';
 						$output .= '"type": "MultiPoint",';
@@ -298,7 +370,9 @@  discard block
 block discarded – undo
 			$output .= ']';
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
 			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
+			if (isset($begindate)) {
+				$output .= '"archive_date": "'.$begindate.'",';
+			}
 			$output .= '"fc": "'.$flightcnt.'"';
 		} else {
 			$output .= '"features": ';

Please login to merge, or discard this patch.

aircraft-data.php 1 patch

Braces +34 added lines, -12 removed lines patch added patch discarded remove patch

@@ -46,7 +46,9 @@  discard block
 block discarded – undo
 {
 	if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') {
 		$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-	} else $image = $spotter_item['image_thumbnail'];
+	} else {
+		$image = $spotter_item['image_thumbnail'];
+	}
 
 }
 /* else {
@@ -58,7 +60,9 @@  discard block
 block discarded – undo
 	print '<div class="left"><img src="'.$image.'" alt="'.$spotter_item['registration'].' '.$spotter_item['aircraft_name'].'" title="'.$spotter_item['registration'].' '.$spotter_item['aircraft_name'].' Image &copy; '.$spotter_item['image_copyright'].'"/><br />Image &copy; '.$spotter_item['image_copyright'].'</div>';
 }
 print '<div class="right"><div class="callsign-details"><div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
-if (isset($spotter_item['airline_name'])) print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
+if (isset($spotter_item['airline_name'])) {
+	print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
+}
 print '</div>';
 print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
 if (isset($spotter_item['departure_airport_time'])) {
@@ -86,9 +90,14 @@  discard block
 block discarded – undo
 print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country'];
 print '</div></div><div>';
 print '<span>'._("Aircraft").'</span>';
-if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
-if (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
-else print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
+if (isset($spotter_item['aircraft_wiki'])) {
+	print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
+}
+if (isset($spotter_item['aircraft_type'])) {
+	print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
+} else {
+	print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
+}
 print '</div>';
 print '<div><span>'._("Altitude").'</span>';
 if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
@@ -97,7 +106,9 @@  discard block
 block discarded – undo
 	print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
 }
 print '</div>';
-if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
+if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') {
+	print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
+}
 print '<div><span>'._("Speed").'</span>';
 if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
 	print round($spotter_item['ground_speed']*1.15078).' mph';
@@ -111,8 +122,11 @@  discard block
 block discarded – undo
 print '<div><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>';
 if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != '') {
 	print '<div><span>'._("Pilot").'</span>';
-	if (isset($spotter_item['pilot_id'])) print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
-	else print $spotter_item['pilot_name'];
+	if (isset($spotter_item['pilot_id'])) {
+		print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
+	} else {
+		print $spotter_item['pilot_name'];
+	}
 	print '</div>';
 }
 
@@ -133,10 +147,18 @@  discard block
 block discarded – undo
 }
 print '</div>';
 
-if (isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
-if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
-if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
-if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
+if (isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') {
+	print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
+}
+if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') {
+	print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
+}
+if (isset($spotter_item['acars']['message'])) {
+	print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
+}
+if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) {
+	print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
+}
 print '</div>';
 ?>
 </div>

Please login to merge, or discard this patch.

require/class.METAR.php 1 patch

Braces +94 added lines, -36 removed lines patch added patch discarded remove patch

@@ -58,8 +58,11 @@  discard block
 block discarded – undo
                         return "error : ".$e->getMessage();
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
         }
 
         public static function insert_last_update() {
@@ -83,9 +86,14 @@  discard block
 block discarded – undo
     		//$pieces = explode(' ',$data);
     		$pieces = preg_split('/\s/',$data);
     		$pos = 0;
-    		if ($pieces[0] == 'METAR') $pos++;
-    		elseif ($pieces[0] == 'SPECI') $pos++;
-    		if (strlen($pieces[$pos]) != 4) $pos++;
+    		if ($pieces[0] == 'METAR') {
+    			$pos++;
+    		} elseif ($pieces[0] == 'SPECI') {
+    			$pos++;
+    		}
+    		if (strlen($pieces[$pos]) != 4) {
+    			$pos++;
+    		}
     		$result = array();
     		$result['location'] = $pieces[$pos];
     		$pos++;
@@ -94,16 +102,26 @@  discard block
 block discarded – undo
     		$c = count($pieces);
     		for($pos++; $pos < $c; $pos++) {
     			$piece = $pieces[$pos];
-    			if ($piece == 'RMK') break;
-    			if ($piece == 'AUTO') $result['auto'] = true;
-    			if ($piece == 'COR') $result['correction'] = true;
+    			if ($piece == 'RMK') {
+    				break;
+    			}
+    			if ($piece == 'AUTO') {
+    				$result['auto'] = true;
+    			}
+    			if ($piece == 'COR') {
+    				$result['correction'] = true;
+    			}
     			// Wind Speed
     			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
     				$result['wind']['direction'] = (float)$matches[1];
 				$result['wind']['unit'] = $matches[4];
-    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
+    				if ($result['wind']['unit'] == 'KT') {
+    					$result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
+    				} elseif ($result['wind']['unit'] == 'KPH') {
+    					$result['wind']['speed'] = round(((float)$matches[2])*1000,2);
+    				} elseif ($result['wind']['unit'] == 'MPS') {
+    					$result['wind']['speed'] = round(((float)$matches[2]),2);
+    				}
 				$result['wind']['gust'] = (float)$matches[3];
 				$result['wind']['unit'] = $matches[4];
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
@@ -185,14 +203,23 @@  discard block
 block discarded – undo
     				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
     				$type = $matches[1];
     				$cloud = array();
-    				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
-    				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
-    				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
-    				elseif ($type == 'FEW') $cloud['type'] = 'Few';
-    				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
-    				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
-    				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
-    				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
+    				if ($type == 'SKC') {
+    					$cloud['type'] = 'No cloud/Sky clear';
+    				} elseif ($type == 'CLR') {
+    					$cloud['type'] = 'No cloud below 12,000ft (3700m)';
+    				} elseif ($type == 'NSC') {
+    					$cloud['type'] = 'No significant cloud';
+    				} elseif ($type == 'FEW') {
+    					$cloud['type'] = 'Few';
+    				} elseif ($type == 'SCT') {
+    					$cloud['type'] = 'Scattered';
+    				} elseif ($type == 'BKN') {
+    					$cloud['type'] = 'Broken';
+    				} elseif ($type == 'OVC') {
+    					$cloud['type'] = 'Overcast/Full cloud coverage';
+    				} elseif ($type == 'VV') {
+    					$cloud['type'] = 'Vertical visibility';
+    				}
     				$cloud['type_code'] = $type;
     				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
     				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
@@ -222,8 +249,11 @@  discard block
 block discarded – undo
     			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
     				//echo $piece;
     				//print_r($matches);
-    				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-    				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+    				if (isset($matches[5])) {
+    					$range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+    				} else {
+    					$range = array('exact' => (float)$matches[2], 'unit' => 'M');
+    				}
 				if (isset($matches[3])) {
 					$range = Array(
 					    'from' => (float)$matches[2],
@@ -256,8 +286,11 @@  discard block
 block discarded – undo
 				if (isset($matches[3])) {
 					$text[] = $this->texts[$matches[3]];
 				}
-				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
-				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				if (!isset($result['weather'])) {
+					$result['weather'] = implode(' ', $text);
+				} else {
+					$result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				}
     			}
     		}
     		return $result;
@@ -269,8 +302,11 @@  discard block
 block discarded – undo
     		if (isset($globalMETARcycle) && $globalMETARcycle) {
             		$query = "SELECT * FROM metar WHERE metar_location = :icao";
                 } else {
-            		if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
-            		else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+            		if ($globalDBdriver == 'mysql') {
+            			$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
+            		} else {
+            			$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+            		}
                 }
                 $query_values = array(':icao' => $icao);
                  try {
@@ -325,7 +361,9 @@  discard block
 block discarded – undo
         
         public function addMETARCycle() {
     		global $globalDebug, $globalIVAO;
-    		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
+    		if (isset($globalDebug) && $globalDebug) {
+    			echo "Downloading METAR cycle...";
+    		}
     		date_default_timezone_set("UTC");
     		$Common = new Common();
     		if (isset($globalIVAO) && $globalIVAO) {
@@ -333,7 +371,9 @@  discard block
 block discarded – undo
     		} else {
 			$cycle = $Common->getData('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT');
     		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
+    		if (isset($globalDebug) && $globalDebug) {
+    			echo "Done - Updating DB...";
+    		}
     		$date = '';
     		foreach(explode("\n",$cycle) as $line) {
     			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
@@ -342,22 +382,32 @@  discard block
 block discarded – undo
     			} elseif ($line != '') {
     			    //$this->parse($line);
     			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
+    			    if ($date == '') {
+    			    	$date = date('Y/m/d H:m');
+    			    }
     			    $pos = 0;
     			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
+    			    if ($pieces[0] == 'METAR') {
+    			    	$pos++;
+    			    }
+    			    if (strlen($pieces[$pos]) != 4) {
+    			    	$pos++;
+    			    }
 	        	    $location = $pieces[$pos];
 	        	    echo $this->addMETAR($location,$line,$date);
     			}
     			//echo $line."\n";
     		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done\n";
+    		if (isset($globalDebug) && $globalDebug) {
+    			echo "Done\n";
+    		}
         
         }
         public function downloadMETAR($icao) {
     		global $globalMETARurl;
-    		if ($globalMETARurl == '') return array();
+    		if ($globalMETARurl == '') {
+    			return array();
+    		}
     		date_default_timezone_set("UTC");
     		$Common = new Common();
     		$url = str_replace('{icao}',$icao,$globalMETARurl);
@@ -370,16 +420,24 @@  discard block
 block discarded – undo
     			} elseif ($line != '') {
     			    //$this->parse($line);
     			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
+    			    if ($date == '') {
+    			    	$date = date('Y/m/d H:m');
+    			    }
     			    $pos = 0;
     			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
+    			    if ($pieces[0] == 'METAR') {
+    			    	$pos++;
+    			    }
+    			    if (strlen($pieces[$pos]) != 4) {
+    			    	$pos++;
+    			    }
 	        	    $location = $pieces[$pos];
 	        	    if (strlen($location == 4)) {
 	        		$this->addMETAR($location,$line,$date);
 	        		return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
-	        	    } else return array();
+	        	    } else {
+	        	    	return array();
+	        	    }
     			}
     			//echo $line."\n";
     		}

Please login to merge, or discard this patch.

require/class.Image.php 1 patch

Braces +126 added lines, -46 removed lines patch added patch discarded remove patch

@@ -22,7 +22,9 @@  discard block
 block discarded – undo
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
 		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
 		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
+		if ($registration == '' && $aircraft_icao != '') {
+			$registration = $aircraft_icao.$airline_icao;
+		}
 		$registration = trim($registration);
 		$query  = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright
 			FROM spotter_image 
@@ -60,8 +62,11 @@  discard block
 block discarded – undo
 	public function getExifCopyright($url) {
 		$exif = exif_read_data($url);
 		$copyright = '';
-		if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
-		elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
+		if (isset($exif['COMPUTED']['copyright'])) {
+			$copyright = $exif['COMPUTED']['copyright'];
+		} elseif (isset($exif['copyright'])) {
+			$copyright = $exif['copyright'];
+		}
 		if ($copyright != '') {
 			$copyright = str_replace('Copyright ','',$copyright);
 			$copyright = str_replace('© ','',$copyright);
@@ -79,18 +84,29 @@  discard block
 block discarded – undo
 	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
 	{
 		global $globalDebug,$globalAircraftImageFetch;
-		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return '';
+		if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) {
+			return '';
+		}
 		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
 		$registration = trim($registration);
 		//getting the aircraft image
-		if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...';
-		elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
-		elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...';
-		else return "success";
+		if ($globalDebug && $registration != '') {
+			echo 'Try to find an aircraft image for '.$registration.'...';
+		} elseif ($globalDebug && $aircraft_icao != '') {
+			echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
+		} elseif ($globalDebug && $airline_icao != '') {
+			echo 'Try to find an aircraft image for '.$airline_icao.'...';
+		} else {
+			return "success";
+		}
 		$image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao);
-		if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
+		if ($registration == '' && $aircraft_icao != '') {
+			$registration = $aircraft_icao.$airline_icao;
+		}
 		if ($image_url['original'] != '') {
-			if ($globalDebug) echo 'Found !'."\n";
+			if ($globalDebug) {
+				echo 'Found !'."\n";
+			}
 			$query  = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
 			try {
 				$sth = $this->db->prepare($query);
@@ -99,7 +115,9 @@  discard block
 block discarded – undo
 				echo $e->getMessage()."\n";
 				return "error";
 			}
-		} elseif ($globalDebug) echo "Not found :'(\n";
+		} elseif ($globalDebug) {
+			echo "Not found :'(\n";
+		}
 		return "success";
 	}
 
@@ -114,36 +132,75 @@  discard block
 block discarded – undo
 	{
 		global $globalAircraftImageSources, $globalIVAO;
 		$Spotter = new Spotter($this->db);
-		if (!isset($globalIVAO)) $globalIVAO = FALSE;
+		if (!isset($globalIVAO)) {
+			$globalIVAO = FALSE;
+		}
 		$aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING);
 		if ($aircraft_registration != '') {
-			if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			if (strpos($aircraft_registration,'/') !== false) {
+				return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
+			}
 			$aircraft_registration = urlencode(trim($aircraft_registration));
 			$aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
-			if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
-			else $aircraft_name = '';
-			if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao'];
-			else $aircraft_icao = '';
-			if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao'];
-			else $airline_icao = '';
+			if (isset($aircraft_info[0]['aircraft_name'])) {
+				$aircraft_name = $aircraft_info[0]['aircraft_name'];
+			} else {
+				$aircraft_name = '';
+			}
+			if (isset($aircraft_info[0]['aircraft_icao'])) {
+				$aircraft_name = $aircraft_info[0]['aircraft_icao'];
+			} else {
+				$aircraft_icao = '';
+			}
+			if (isset($aircraft_info[0]['airline_icao'])) {
+				$airline_icao = $aircraft_info[0]['airline_icao'];
+			} else {
+				$airline_icao = '';
+			}
 		} elseif ($aircraft_icao != '') {
 			$aircraft_registration = $aircraft_icao;
 			$aircraft_name = '';
-		} else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
-		if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		} else {
+			return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
+		}
+		if (!isset($globalAircraftImageSources)) {
+			$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		}
 		foreach ($globalAircraftImageSources as $source) {
 			$source = strtolower($source);
-			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl($aircraft_icao,$airline_icao);
-			if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters($aircraft_registration,$aircraft_name);
-			if ($source == 'flickr') $images_array = $this->fromFlickr($aircraft_registration,$aircraft_name);
-			if ($source == 'bing') $images_array = $this->fromBing($aircraft_registration,$aircraft_name);
-			if ($source == 'deviantart') $images_array = $this->fromDeviantart($aircraft_registration,$aircraft_name);
-			if ($source == 'wikimedia') $images_array = $this->fromWikimedia($aircraft_registration,$aircraft_name);
-			if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos($aircraft_registration,$aircraft_name);
-			if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures($aircraft_registration,$aircraft_name);
-			if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData($aircraft_registration,$aircraft_name);
-			if ($source == 'customsources') $images_array = $this->fromCustomSource($aircraft_registration,$aircraft_name);
-			if (isset($images_array) && $images_array['original'] != '') return $images_array;
+			if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') {
+				$images_array = $this->fromIvaoMtl($aircraft_icao,$airline_icao);
+			}
+			if ($source == 'planespotters' && !$globalIVAO) {
+				$images_array = $this->fromPlanespotters($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'flickr') {
+				$images_array = $this->fromFlickr($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'bing') {
+				$images_array = $this->fromBing($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'deviantart') {
+				$images_array = $this->fromDeviantart($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'wikimedia') {
+				$images_array = $this->fromWikimedia($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'jetphotos' && !$globalIVAO) {
+				$images_array = $this->fromJetPhotos($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'planepictures' && !$globalIVAO) {
+				$images_array = $this->fromPlanePictures($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'airportdata' && !$globalIVAO) {
+				$images_array = $this->fromAirportData($aircraft_registration,$aircraft_name);
+			}
+			if ($source == 'customsources') {
+				$images_array = $this->fromCustomSource($aircraft_registration,$aircraft_name);
+			}
+			if (isset($images_array) && $images_array['original'] != '') {
+				return $images_array;
+			}
 		}
 		return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
 	}
@@ -301,8 +358,11 @@  discard block
 block discarded – undo
 	*/
 	public function fromFlickr($aircraft_registration,$aircraft_name='') {
 		$Common = new Common();
-		if ($aircraft_name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name);
-		else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.',aircraft';
+		if ($aircraft_name != '') {
+			$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name);
+		} else {
+			$url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.',aircraft';
+		}
 		$data = $Common->getData($url);
 		if ($xml = simplexml_load_string($data)) {
 			if (isset($xml->channel->item)) {
@@ -346,9 +406,14 @@  discard block
 block discarded – undo
 	public function fromBing($aircraft_registration,$aircraft_name='') {
 		global $globalImageBingKey;
 		$Common = new Common();
-		if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false;
-		if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
-		else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
+		if (!isset($globalImageBingKey) || $globalImageBingKey == '') {
+			return false;
+		}
+		if ($aircraft_name != '') {
+			$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
+		} else {
+			$url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
+		}
 		$headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey));
 		$data = $Common->getData($url,'get','',$headers);
 		$result = json_decode($data);
@@ -402,13 +467,18 @@  discard block
 block discarded – undo
 	*/
 	public function fromWikimedia($aircraft_registration,$aircraft_name='') {
 		$Common = new Common();
-		if ($aircraft_name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20'.urlencode($aircraft_name);
-		else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20aircraft';
+		if ($aircraft_name != '') {
+			$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20'.urlencode($aircraft_name);
+		} else {
+			$url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20aircraft';
+		}
 		$data = $Common->getData($url);
 		$result = json_decode($data);
 		if (isset($result->query->search[0]->title)) {
 			$fileo = $result->query->search[0]->title;
-			if (substr($fileo,-3) == 'pdf') return false;
+			if (substr($fileo,-3) == 'pdf') {
+				return false;
+			}
 			$file = urlencode($fileo);
 			$url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file;
 			$data2 = $Common->getData($url2);
@@ -460,7 +530,9 @@  discard block
 block discarded – undo
 		global $globalAircraftCustomSources;
 		//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);
 		if (!empty($globalAircraftImageCustomSources)) {
-			if (!isset($globalAircraftImageCustomSources[0])) $globalAircraftImageCustomSources[] = $globalAircraftImageCustomSources;
+			if (!isset($globalAircraftImageCustomSources[0])) {
+				$globalAircraftImageCustomSources[] = $globalAircraftImageCustomSources;
+			}
 			foreach ($globalAircraftImageCustomSources as $source) {
 				$Common = new Common();
 				$url = str_replace('{registration}',$aircraft_registration,$source['original']);
@@ -469,17 +541,25 @@  discard block
 block discarded – undo
 					$image_url = array();
 					$image_url['thumbnail'] = $url_thumbnail;
 					$image_url['original'] = $url;
-					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
-					else $exifCopyright = '';
-					if ($exifCopyright  != '') $image_url['copyright'] = $exifCopyright;
-					else $image_url['copyright'] = $source['copyright'];
+					if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) {
+						$exifCopyright = $this->getExifCopyright($url);
+					} else {
+						$exifCopyright = '';
+					}
+					if ($exifCopyright  != '') {
+						$image_url['copyright'] = $exifCopyright;
+					} else {
+						$image_url['copyright'] = $source['copyright'];
+					}
 					$image_url['source_website'] = $source['source_website'];
 					$image_url['source'] = $source['source'];
 					return $image_url;
 				}
 			}
 			return false;
-		} else return false;
+		} else {
+			return false;
+		}
 	}
 }
 

Please login to merge, or discard this patch.

require/class.APRS.php 1 patch

Braces +83 added lines, -34 removed lines patch added patch discarded remove patch

@@ -18,7 +18,9 @@  discard block
 block discarded – undo
 	
 	/* Check that end was found and body has at least one byte. */
 	if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
-	    if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
+	    if ($globalDebug) {
+	    	echo '!!! APRS invalid : '.$input."\n";
+	    }
 	    return false;
 	}
 	
@@ -27,23 +29,31 @@  discard block
 block discarded – undo
 	$body_len = strlen($body);
 	$header = substr($input,0,$splitpos);
 	//$header_len = strlen($header);
-	if ($debug) echo 'header : '.$header."\n";
+	if ($debug) {
+		echo 'header : '.$header."\n";
+	}
 	
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
 	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
 	    $ident = $matches[1];
 	    $all_elements = $matches[2];
-	    if ($debug) echo 'ident : '.$ident."\n";
+	    if ($debug) {
+	    	echo 'ident : '.$ident."\n";
+	    }
 	    $result['ident'] = $ident;
-	} else return false;
+	} else {
+		return false;
+	}
 	$elements = explode(',',$all_elements);
 	$source = end($elements);
 	$result['source'] = $source;
 	foreach ($elements as $element) {
 	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
 	        //echo "ok";
-	        if ($element == 'TCPIP*') return false;
+	        if ($element == 'TCPIP*') {
+	        	return false;
+	        }
 	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
 		return false;
 	    }
@@ -89,7 +99,9 @@  discard block
 block discarded – undo
 		//$symbol_table = $matches[4];
 		$lat = intval($lat_deg);
 		$lon = intval($lon_deg);
-		if ($lat > 89 || $lon > 179) return false;
+		if ($lat > 89 || $lon > 179) {
+			return false;
+		}
 	    
 	    /*
 	    $tmp_5b = str_replace('.','',$lat_min);
@@ -99,8 +111,12 @@  discard block
 block discarded – undo
 	    */
 		$latitude = $lat + floatval($lat_min)/60;
 		$longitude = $lon + floatval($lon_min)/60;
-		if ($sind == 'S') $latitude = 0-$latitude;
-		if ($wind == 'W') $longitude = 0-$longitude;
+		if ($sind == 'S') {
+			$latitude = 0-$latitude;
+		}
+		if ($wind == 'W') {
+			$longitude = 0-$longitude;
+		}
 		$result['latitude'] = $latitude;
 		$result['longitude'] = $longitude;
 	    }
@@ -115,7 +131,9 @@  discard block
 block discarded – undo
 		        if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
 		    	    $course = substr($body_parse,0,3);
 		    	    $tmp_s = intval($course);
-		    	    if ($tmp_s >= 1 && $tmp_s <= 360) $result['course'] = intval($course);
+		    	    if ($tmp_s >= 1 && $tmp_s <= 360) {
+		    	    	$result['course'] = intval($course);
+		    	    }
 		    	    $speed = substr($body_parse,4,3);
 		    	    $result['speed'] = round($speed*1.852);
 		    	    $body_parse = substr($body_parse,7);
@@ -149,10 +167,16 @@  discard block
 block discarded – undo
 			        $lat_off = (($dao_split[1])-48.0)*0.001/60.0;
 			        $lon_off = (($dao_split[2])-48.0)*0.001/60.0;
 			    
-				if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
-				else $result['latitude'] += $lat_off;
-				if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
-				else $result['longitude'] += $lon_off;
+				if ($result['latitude'] < 0) {
+					$result['latitude'] -= $lat_off;
+				} else {
+					$result['latitude'] += $lat_off;
+				}
+				if ($result['longitude'] < 0) {
+					$result['longitude'] -= $lon_off;
+				} else {
+					$result['longitude'] += $lon_off;
+				}
 			    }
 		            $body_parse = substr($body_parse,6);
 		    }
@@ -165,27 +189,48 @@  discard block
 block discarded – undo
 			$address = substr($id,2);
 			//print_r($matches);
 			$addressType = (intval(substr($id,0,2),16))&3;
-			if ($addressType == 0) $result['addresstype'] = "RANDOM";
-			elseif ($addressType == 1) $result['addresstype'] = "ICAO";
-			elseif ($addressType == 2) $result['addresstype'] = "FLARM";
-			elseif ($addressType == 3) $result['addresstype'] = "OGN";
+			if ($addressType == 0) {
+				$result['addresstype'] = "RANDOM";
+			} elseif ($addressType == 1) {
+				$result['addresstype'] = "ICAO";
+			} elseif ($addressType == 2) {
+				$result['addresstype'] = "FLARM";
+			} elseif ($addressType == 3) {
+				$result['addresstype'] = "OGN";
+			}
 			$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
 			$result['aircrafttype_code'] = $aircraftType;
-			if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
-			elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
-			elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE";
-			elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
-			elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE";
-			elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE";
-			elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER";
-			elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER";
-			elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT";
-			elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT";
-			elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO";
-			elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON";
-			elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
-			elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
-			elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
+			if ($aircraftType == 0) {
+				$result['aircrafttype'] = "UNKNOWN";
+			} elseif ($aircraftType == 1) {
+				$result['aircrafttype'] = "GLIDER";
+			} elseif ($aircraftType == 2) {
+				$result['aircrafttype'] = "TOW_PLANE";
+			} elseif ($aircraftType == 3) {
+				$result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
+			} elseif ($aircraftType == 4) {
+				$result['aircrafttype'] = "PARACHUTE";
+			} elseif ($aircraftType == 5) {
+				$result['aircrafttype'] = "DROP_PLANE";
+			} elseif ($aircraftType == 6) {
+				$result['aircrafttype'] = "HANG_GLIDER";
+			} elseif ($aircraftType == 7) {
+				$result['aircrafttype'] = "PARA_GLIDER";
+			} elseif ($aircraftType == 8) {
+				$result['aircrafttype'] = "POWERED_AIRCRAFT";
+			} elseif ($aircraftType == 9) {
+				$result['aircrafttype'] = "JET_AIRCRAFT";
+			} elseif ($aircraftType == 10) {
+				$result['aircrafttype'] = "UFO";
+			} elseif ($aircraftType == 11) {
+				$result['aircrafttype'] = "BALLOON";
+			} elseif ($aircraftType == 12) {
+				$result['aircrafttype'] = "AIRSHIP";
+			} elseif ($aircraftType == 13) {
+				$result['aircrafttype'] = "UAV";
+			} elseif ($aircraftType == 15) {
+				$result['aircrafttype'] = "STATIC_OBJECT";
+			}
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
 			$result['stealth'] = $stealth;
 			$result['address'] = $address;
@@ -227,8 +272,12 @@  discard block
 block discarded – undo
 		}
 	    }
 	}
-	if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
-	if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
+	if (isset($result['latitude'])) {
+		$result['latitude'] = round($result['latitude'],4);
+	}
+	if (isset($result['longitude'])) {
+		$result['longitude'] = round($result['longitude'],4);
+	}
 	//print_r($result);
 	return $result;
     }

Please login to merge, or discard this patch.

		@@ -12,7 +12,9 @@
		block discarded – undo
12	12	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
13	13	if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
14	14	$spotter_array = $Spotter->getSpotterDataByRoute($_GET['departure_airport'], $_GET['arrival_airport'], "0,1", $sort);
15		-} else $spotter_array = array();
	15	+} else {
	16	+ $spotter_array = array();
	17	+}
16	18
17	19	if (!empty($spotter_array))
18	20	{

		@@ -36,8 +36,12 @@
		block discarded – undo
36	36	if (!empty($spotter_array)) {
37	37	include('table-output.php');
38	38	print '<div class="pagination">';
39		- if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'/'.$_GET['sort'].'">«'._("Previous Page").'</a>';
40		- if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'/'.$_GET['sort'].'">'._("Next Page").'»</a>';
	39	+ if ($limit_previous_1 >= 0) {
	40	+ print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'/'.$_GET['sort'].'">«'._("Previous Page").'</a>';
	41	+ }
	42	+ if ($spotter_array[0]['query_number_rows'] == $absolute_difference) {
	43	+ print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'/'.$_GET['sort'].'">'._("Next Page").'»</a>';
	44	+ }
41	45	print '</div>';
42	46	}
43	47	print '</div>';

		@@ -35,7 +35,9 @@
		block discarded – undo
35	35	$first = '';
36	36	foreach($data as $value => $key) {
37	37	$final_coord = $Common->getCoordfromDistanceBearing($initial_latitude,$initial_longitude,$value*22.5,$key);
38		- if ($first == '') $first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']';
	38	+ if ($first == '') {
	39	+ $first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']';
	40	+ }
39	41	$output .= '['.$final_coord['longitude'].','.$final_coord['latitude'].'],';
40	42	}
41	43	$output .= $first;

		@@ -27,8 +27,11 @@ discard block
		block discarded – undo
27	27	} else {
28	28	curl_setopt($ch, CURLOPT_USERAGENT, $useragent);
29	29	}
30		- if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10);
31		- else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
	30	+ if ($timeout == '') {
	31	+ curl_setopt($ch, CURLOPT_TIMEOUT, 10);
	32	+ } else {
	33	+ curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
	34	+ }
32	35	curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback"));
33	36	if ($type == 'post') {
34	37	curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
		@@ -73,8 +76,9 @@ discard block
		block discarded – undo
73	76
74	77	private function curlResponseHeaderCallback($ch, $headerLine) {
75	78	global $cookies;
76		- if (preg_match('/^Set-Cookie:\s([^;])/mi', $headerLine, $cookie) == 1)
77		- $cookies[] = $cookie;
	79	+ if (preg_match('/^Set-Cookie:\s([^;])/mi', $headerLine, $cookie) == 1) {
	80	+ $cookies[] = $cookie;
	81	+ }
78	82	return strlen($headerLine); // Needed by curl
79	83	}
80	84
		@@ -84,10 +88,16 @@ discard block
		block discarded – undo
84	88	* @return Array array of the tables in HTML page
85	89	*/
86	90	public function table2array($data) {
87		- if (!is_string($data)) return array();
88		- if ($data == '') return array();
	91	+ if (!is_string($data)) {
	92	+ return array();
	93	+ }
	94	+ if ($data == '') {
	95	+ return array();
	96	+ }
89	97	$html = str_get_html($data);
90		- if ($html === false) return array();
	98	+ if ($html === false) {
	99	+ return array();
	100	+ }
91	101	$tabledata=array();
92	102	foreach($html->find('tr') as $element)
93	103	{
		@@ -122,7 +132,9 @@ discard block
		block discarded – undo
122	132	*/
123	133	public function text2array($data) {
124	134	$html = str_get_html($data);
125		- if ($html === false) return array();
	135	+ if ($html === false) {
	136	+ return array();
	137	+ }
126	138	$tabledata=array();
127	139	foreach($html->find('p') as $element)
128	140	{
		@@ -143,7 +155,9 @@ discard block
		block discarded – undo
143	155	* @return Float Distance in $unit
144	156	*/
145	157	public function distance($lat, $lon, $latc, $lonc, $unit = 'km') {
146		- if ($lat == $latc && $lon == $lonc) return 0;
	158	+ if ($lat == $latc && $lon == $lonc) {
	159	+ return 0;
	160	+ }
147	161	$dist = rad2deg(acos(sin(deg2rad(floatval($lat)))sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))cos(deg2rad(floatval($latc)))cos(deg2rad(floatval($lon)-floatval($lonc)))))60*1.1515;
148	162	if ($unit == "km") {
149	163	return round($dist * 1.609344);
		@@ -167,10 +181,16 @@ discard block
		block discarded – undo
167	181	public function withinThreshold ($timeDifference, $distance) {
168	182	$x = abs($timeDifference);
169	183	$d = abs($distance);
170		- if ($x == 0 \|\| $d == 0) return true;
	184	+ if ($x == 0 \|\| $d == 0) {
	185	+ return true;
	186	+ }
171	187	// may be due to Internet jitter; distance is realistic
172		- if ($x < 0.7 && $d < 2000) return true;
173		- else return $d/$x < 1500*0.27778; // 1500 km/h max
	188	+ if ($x < 0.7 && $d < 2000) {
	189	+ return true;
	190	+ } else {
	191	+ return $d/$x < 1500*0.27778;
	192	+ }
	193	+ // 1500 km/h max
174	194	}
175	195
176	196
		@@ -230,7 +250,9 @@ discard block
		block discarded – undo
230	250	public function hex2str($hex) {
231	251	$str = '';
232	252	$hexln = strlen($hex);
233		- for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2)));
	253	+ for($i=0;$i<$hexln;$i+=2) {
	254	+ $str .= chr(hexdec(substr($hex,$i,2)));
	255	+ }
234	256	return $str;
235	257	}
236	258
		@@ -258,8 +280,11 @@ discard block
		block discarded – undo
258	280	$b = $lat2 - $lat1;
259	281	$c = -($a$lat1+$b$lon1);
260	282	$d = $a$lat3+$b$lon3+$c;
261		- if ($d > -$approx && $d < $approx) return true;
262		- else return false;
	283	+ if ($d > -$approx && $d < $approx) {
	284	+ return true;
	285	+ } else {
	286	+ return false;
	287	+ }
263	288	}
264	289
265	290	public function array_merge_noappend() {
		@@ -285,7 +310,9 @@ discard block
		block discarded – undo
285	310	return $result;
286	311	}
287	312	$handle = @opendir('./locale');
288		- if ($handle === false) return $result;
	313	+ if ($handle === false) {
	314	+ return $result;
	315	+ }
289	316	while (false !== ($file = readdir($handle))) {
290	317	$path = './locale'.'/'.$file.'/LC_MESSAGES/fam.mo';
291	318	if ($file != "." && $file != ".." && @file_exists($path)) {

		@@ -16,21 +16,40 @@ discard block
		block discarded – undo
16	16	}
17	17	header('Content-Type: text/javascript');
18	18
19		-if (!isset($globalJsonCompress)) $compress = true;
20		-else $compress = $globalJsonCompress;
	19	+if (!isset($globalJsonCompress)) {
	20	+ $compress = true;
	21	+} else {
	22	+ $compress = $globalJsonCompress;
	23	+}
21	24
22	25	$from_archive = false;
23	26	$min = false;
24	27	$allhistory = false;
25	28	$filter['source'] = array();
26		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
27		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
28		-if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
29		-if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
30		-if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
31		-if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
32		-if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
33		-if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype'];
	29	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') {
	30	+ $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
	31	+}
	32	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') {
	33	+ $filter['source'] = array_merge($filter['source'],array('whazzup'));
	34	+}
	35	+if ((!isset($globalMapVAchoose) \|\| $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') {
	36	+ $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
	37	+}
	38	+if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') {
	39	+ $filter['source'] = array_merge($filter['source'],array('sbs'));
	40	+}
	41	+if ((!isset($globalMapchoose) \|\| $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') {
	42	+ $filter['source'] = array_merge($filter['source'],array('aprs'));
	43	+}
	44	+if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') {
	45	+ $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
	46	+}
	47	+if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') {
	48	+ $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
	49	+}
	50	+if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') {
	51	+ $filter['airlinestype'] = $_COOKIE['airlinestype'];
	52	+}
34	53
35	54	if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
36	55	$min = true;
		@@ -60,8 +79,12 @@ discard block
		block discarded – undo
60	79
61	80	if (!empty($spotter_array)) {
62	81	$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
63		- if ($flightcnt == '') $flightcnt = 0;
64		-} else $flightcnt = 0;
	82	+ if ($flightcnt == '') {
	83	+ $flightcnt = 0;
	84	+ }
	85	+ } else {
	86	+ $flightcnt = 0;
	87	+}
65	88
66	89	$sqltime = round(microtime(true)-$begintime,2);
67	90
		@@ -70,8 +93,11 @@ discard block
		block discarded – undo
70	93
71	94	$output = '{';
72	95	$output .= '"type": "FeatureCollection",';
73		- if ($min) $output .= '"minimal": "true",';
74		- else $output .= '"minimal": "false",';
	96	+ if ($min) {
	97	+ $output .= '"minimal": "true",';
	98	+ } else {
	99	+ $output .= '"minimal": "false",';
	100	+ }
75	101	$output .= '"fc": "'.$flightcnt.'",';
76	102	$output .= '"sqt": "'.$sqltime.'",';
77	103
		@@ -140,11 +166,16 @@ discard block
		block discarded – undo
140	166	//$output .= '"fc": "'.$flightcnt.'",';
141	167	//$output .= '"sqt": "'.$sqltime.'",';
142	168	$output .= '"properties": {';
143		- if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
144		- else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
	169	+ if ($compress) {
	170	+ $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
	171	+ } else {
	172	+ $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
	173	+ }
145	174	$output .= '"fc": "'.$flightcnt.'",';
146	175	$output .= '"sqt": "'.$sqltime.'",';
147		- if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
	176	+ if (isset($begindate)) {
	177	+ $output .= '"archive_date": "'.$begindate.'",';
	178	+ }
148	179
149	180	/*
150	181	if ($min) $output .= '"minimal": "true",';
		@@ -152,13 +183,21 @@ discard block
		block discarded – undo
152	183	*/
153	184	//$output .= '"fc": "'.$spotter_item['nb'].'",';
154	185	if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
155		- if ($compress) $output .= '"c": "'.$spotter_item['ident'].'",';
156		- else $output .= '"callsign": "'.$spotter_item['ident'].'",';
	186	+ if ($compress) {
	187	+ $output .= '"c": "'.$spotter_item['ident'].'",';
	188	+ } else {
	189	+ $output .= '"callsign": "'.$spotter_item['ident'].'",';
	190	+ }
157	191	} else {
158		- if ($compress) $output .= '"c": "NA",';
159		- else $output .= '"callsign": "NA",';
	192	+ if ($compress) {
	193	+ $output .= '"c": "NA",';
	194	+ } else {
	195	+ $output .= '"callsign": "NA",';
	196	+ }
	197	+ }
	198	+ if (isset($spotter_item['registration'])) {
	199	+ $output .= '"registration": "'.$spotter_item['registration'].'",';
160	200	}
161		- if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
162	201	if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
163	202	$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
164	203	$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
		@@ -171,19 +210,29 @@ discard block
		block discarded – undo
171	210	$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
172	211	}
173	212	if (!isset($spotter_item['aircraft_shadow'])) {
174		- if (!isset($spotter_item['aircraft_icao']) \|\| $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
175		- else {
	213	+ if (!isset($spotter_item['aircraft_icao']) \|\| $spotter_item['aircraft_icao'] == '') {
	214	+ $spotter_item['aircraft_shadow'] = '';
	215	+ } else {
176	216	$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
177		- if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
178		- else $spotter_item['aircraft_shadow'] = '';
	217	+ if (count($aircraft_info) > 0) {
	218	+ $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
	219	+ } else {
	220	+ $spotter_item['aircraft_shadow'] = '';
	221	+ }
179	222	}
180	223	}
181	224	if ($spotter_item['aircraft_shadow'] == '') {
182		- if ($compress) $output .= '"as": "default.png",';
183		- else $output .= '"aircraft_shadow": "default.png",';
	225	+ if ($compress) {
	226	+ $output .= '"as": "default.png",';
	227	+ } else {
	228	+ $output .= '"aircraft_shadow": "default.png",';
	229	+ }
184	230	} else {
185		- if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
186		- else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
	231	+ if ($compress) {
	232	+ $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
	233	+ } else {
	234	+ $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
	235	+ }
187	236	}
188	237	if (isset($spotter_item['airline_name'])) {
189	238	$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
		@@ -191,8 +240,11 @@ discard block
		block discarded – undo
191	240	$output .= '"airline_name": "NA",';
192	241	}
193	242	if (isset($spotter_item['departure_airport'])) {
194		- if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
195		- else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
	243	+ if ($compress) {
	244	+ $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
	245	+ } else {
	246	+ $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
	247	+ }
196	248	}
197	249	if (isset($spotter_item['departure_airport_city'])) {
198	250	$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
		@@ -204,8 +256,11 @@ discard block
		block discarded – undo
204	256	$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
205	257	}
206	258	if (isset($spotter_item['arrival_airport'])) {
207		- if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
208		- else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
	259	+ if ($compress) {
	260	+ $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
	261	+ } else {
	262	+ $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
	263	+ }
209	264	}
210	265	if (isset($spotter_item['arrival_airport_city'])) {
211	266	$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
		@@ -223,18 +278,29 @@ discard block
		block discarded – undo
223	278	$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
224	279	}
225	280
226		- if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
227		- else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
228		- if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
229		- else $output .= '"heading": "'.$spotter_item['heading'].'",';
	281	+ if ($compress) {
	282	+ $output .= '"a": "'.$spotter_item['altitude'].'",';
	283	+ } else {
	284	+ $output .= '"altitude": "'.$spotter_item['altitude'].'",';
	285	+ }
	286	+ if ($compress) {
	287	+ $output .= '"h": "'.$spotter_item['heading'].'",';
	288	+ } else {
	289	+ $output .= '"heading": "'.$spotter_item['heading'].'",';
	290	+ }
230	291
231		- if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
232		- else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
	292	+ if (isset($archivespeed)) {
	293	+ $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
	294	+ } else {
	295	+ $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
	296	+ }
233	297	//$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",';
234	298	//$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",';
235	299	$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
236	300
237		- if (!$min) $output .= '"image": "'.$image.'",';
	301	+ if (!$min) {
	302	+ $output .= '"image": "'.$image.'",';
	303	+ }
238	304	if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
239	305	$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
240	306	}
		@@ -242,8 +308,11 @@ discard block
		block discarded – undo
242	308	$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
243	309	}
244	310	if (isset($spotter_item['squawk'])) {
245		- if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
246		- else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
	311	+ if ($compress) {
	312	+ $output .= '"sq": "'.$spotter_item['squawk'].'",';
	313	+ } else {
	314	+ $output .= '"squawk": "'.$spotter_item['squawk'].'",';
	315	+ }
247	316	}
248	317	if (isset($spotter_item['squawk_usage'])) {
249	318	$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
		@@ -277,8 +346,11 @@ discard block
		block discarded – undo
277	346
278	347
279	348	// FIXME : type when not aircraft ?
280		- if ($compress) $output .= '"t": "aircraft"';
281		- else $output .= '"type": "aircraft"';
	349	+ if ($compress) {
	350	+ $output .= '"t": "aircraft"';
	351	+ } else {
	352	+ $output .= '"type": "aircraft"';
	353	+ }
282	354	$output .= '},';
283	355	$output .= '"geometry": {';
284	356	$output .= '"type": "MultiPoint",';
		@@ -298,7 +370,9 @@ discard block
		block discarded – undo
298	370	$output .= ']';
299	371	$output .= ',"initial_sqltime": "'.$sqltime.'",';
300	372	$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
301		- if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
	373	+ if (isset($begindate)) {
	374	+ $output .= '"archive_date": "'.$begindate.'",';
	375	+ }
302	376	$output .= '"fc": "'.$flightcnt.'"';
303	377	} else {
304	378	$output .= '"features": ';

		@@ -46,7 +46,9 @@ discard block
		block discarded – undo
46	46	{
47	47	if ($spotter_item['image_source'] == 'flickr' \|\| $spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart') {
48	48	$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
49		- } else $image = $spotter_item['image_thumbnail'];
	49	+ } else {
	50	+ $image = $spotter_item['image_thumbnail'];
	51	+ }
50	52
51	53	}
52	54	/* else {
		@@ -58,7 +60,9 @@ discard block
		block discarded – undo
58	60	print '<div class="left"><img src="'.$image.'" alt="'.$spotter_item['registration'].' '.$spotter_item['aircraft_name'].'" title="'.$spotter_item['registration'].' '.$spotter_item['aircraft_name'].' Image © '.$spotter_item['image_copyright'].'"/><br />Image © '.$spotter_item['image_copyright'].'</div>';
59	61	}
60	62	print '<div class="right"><div class="callsign-details"><div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
61		-if (isset($spotter_item['airline_name'])) print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
	63	+if (isset($spotter_item['airline_name'])) {
	64	+ print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
	65	+}
62	66	print '</div>';
63	67	print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country'];
64	68	if (isset($spotter_item['departure_airport_time'])) {
		@@ -86,9 +90,14 @@ discard block
		block discarded – undo
86	90	print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country'];
87	91	print '</div></div><div>';
88	92	print '<span>'._("Aircraft").'</span>';
89		-if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
90		-if (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
91		-else print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
	93	+if (isset($spotter_item['aircraft_wiki'])) {
	94	+ print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
	95	+}
	96	+if (isset($spotter_item['aircraft_type'])) {
	97	+ print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
	98	+} else {
	99	+ print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
	100	+}
92	101	print '</div>';
93	102	print '<div><span>'._("Altitude").'</span>';
94	103	if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') \|\| (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
		@@ -97,7 +106,9 @@ discard block
		block discarded – undo
97	106	print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
98	107	}
99	108	print '</div>';
100		-if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
	109	+if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') {
	110	+ print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
	111	+}
101	112	print '<div><span>'._("Speed").'</span>';
102	113	if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') \|\| (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
103	114	print round($spotter_item['ground_speed']*1.15078).' mph';
		@@ -111,8 +122,11 @@ discard block
		block discarded – undo
111	122	print '<div><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>';
112	123	if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != '') {
113	124	print '<div><span>'._("Pilot").'</span>';
114		- if (isset($spotter_item['pilot_id'])) print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
115		- else print $spotter_item['pilot_name'];
	125	+ if (isset($spotter_item['pilot_id'])) {
	126	+ print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
	127	+ } else {
	128	+ print $spotter_item['pilot_name'];
	129	+ }
116	130	print '</div>';
117	131	}
118	132
		@@ -133,10 +147,18 @@ discard block
		block discarded – undo
133	147	}
134	148	print '</div>';
135	149
136		-if (isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
137		-if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
138		-if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
139		-if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
	150	+if (isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') {
	151	+ print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
	152	+}
	153	+if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') {
	154	+ print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
	155	+}
	156	+if (isset($spotter_item['acars']['message'])) {
	157	+ print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>';
	158	+}
	159	+if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) {
	160	+ print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
	161	+}
140	162	print '</div>';
141	163	?>
142	164	</div>

		@@ -58,8 +58,11 @@ discard block
		block discarded – undo
58	58	return "error : ".$e->getMessage();
59	59	}
60	60	$row = $sth->fetch(PDO::FETCH_ASSOC);
61		- if ($row['nb'] > 0) return false;
62		- else return true;
	61	+ if ($row['nb'] > 0) {
	62	+ return false;
	63	+ } else {
	64	+ return true;
	65	+ }
63	66	}
64	67
65	68	public static function insert_last_update() {
		@@ -83,9 +86,14 @@ discard block
		block discarded – undo
83	86	//$pieces = explode(' ',$data);
84	87	$pieces = preg_split('/\s/',$data);
85	88	$pos = 0;
86		- if ($pieces[0] == 'METAR') $pos++;
87		- elseif ($pieces[0] == 'SPECI') $pos++;
88		- if (strlen($pieces[$pos]) != 4) $pos++;
	89	+ if ($pieces[0] == 'METAR') {
	90	+ $pos++;
	91	+ } elseif ($pieces[0] == 'SPECI') {
	92	+ $pos++;
	93	+ }
	94	+ if (strlen($pieces[$pos]) != 4) {
	95	+ $pos++;
	96	+ }
89	97	$result = array();
90	98	$result['location'] = $pieces[$pos];
91	99	$pos++;
		@@ -94,16 +102,26 @@ discard block
		block discarded – undo
94	102	$c = count($pieces);
95	103	for($pos++; $pos < $c; $pos++) {
96	104	$piece = $pieces[$pos];
97		- if ($piece == 'RMK') break;
98		- if ($piece == 'AUTO') $result['auto'] = true;
99		- if ($piece == 'COR') $result['correction'] = true;
	105	+ if ($piece == 'RMK') {
	106	+ break;
	107	+ }
	108	+ if ($piece == 'AUTO') {
	109	+ $result['auto'] = true;
	110	+ }
	111	+ if ($piece == 'COR') {
	112	+ $result['correction'] = true;
	113	+ }
100	114	// Wind Speed
101	115	if (preg_match('#(VRB\|\d\d\d)(\d\d)(?:G(\d\d))?(KT\|MPS\|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
102	116	$result['wind']['direction'] = (float)$matches[1];
103	117	$result['wind']['unit'] = $matches[4];
104		- if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
105		- elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
106		- elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
	118	+ if ($result['wind']['unit'] == 'KT') {
	119	+ $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
	120	+ } elseif ($result['wind']['unit'] == 'KPH') {
	121	+ $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
	122	+ } elseif ($result['wind']['unit'] == 'MPS') {
	123	+ $result['wind']['speed'] = round(((float)$matches[2]),2);
	124	+ }
107	125	$result['wind']['gust'] = (float)$matches[3];
108	126	$result['wind']['unit'] = $matches[4];
109	127	$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
		@@ -185,14 +203,23 @@ discard block
		block discarded – undo
185	203	//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
186	204	$type = $matches[1];
187	205	$cloud = array();
188		- if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
189		- elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
190		- elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
191		- elseif ($type == 'FEW') $cloud['type'] = 'Few';
192		- elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
193		- elseif ($type == 'BKN') $cloud['type'] = 'Broken';
194		- elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
195		- elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
	206	+ if ($type == 'SKC') {
	207	+ $cloud['type'] = 'No cloud/Sky clear';
	208	+ } elseif ($type == 'CLR') {
	209	+ $cloud['type'] = 'No cloud below 12,000ft (3700m)';
	210	+ } elseif ($type == 'NSC') {
	211	+ $cloud['type'] = 'No significant cloud';
	212	+ } elseif ($type == 'FEW') {
	213	+ $cloud['type'] = 'Few';
	214	+ } elseif ($type == 'SCT') {
	215	+ $cloud['type'] = 'Scattered';
	216	+ } elseif ($type == 'BKN') {
	217	+ $cloud['type'] = 'Broken';
	218	+ } elseif ($type == 'OVC') {
	219	+ $cloud['type'] = 'Overcast/Full cloud coverage';
	220	+ } elseif ($type == 'VV') {
	221	+ $cloud['type'] = 'Vertical visibility';
	222	+ }
196	223	$cloud['type_code'] = $type;
197	224	$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
198	225	$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
		@@ -222,8 +249,11 @@ discard block
		block discarded – undo
222	249	if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
223	250	//echo $piece;
224	251	//print_r($matches);
225		- if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
226		- else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
	252	+ if (isset($matches[5])) {
	253	+ $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
	254	+ } else {
	255	+ $range = array('exact' => (float)$matches[2], 'unit' => 'M');
	256	+ }
227	257	if (isset($matches[3])) {
228	258	$range = Array(
229	259	'from' => (float)$matches[2],
		@@ -256,8 +286,11 @@ discard block
		block discarded – undo
256	286	if (isset($matches[3])) {
257	287	$text[] = $this->texts[$matches[3]];
258	288	}
259		- if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
260		- else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
	289	+ if (!isset($result['weather'])) {
	290	+ $result['weather'] = implode(' ', $text);
	291	+ } else {
	292	+ $result['weather'] = $result['weather'].' / '.implode(' ', $text);
	293	+ }
261	294	}
262	295	}
263	296	return $result;
		@@ -269,8 +302,11 @@ discard block
		block discarded – undo
269	302	if (isset($globalMETARcycle) && $globalMETARcycle) {
270	303	$query = "SELECT * FROM metar WHERE metar_location = :icao";
271	304	} else {
272		- if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
273		- else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
	305	+ if ($globalDBdriver == 'mysql') {
	306	+ $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
	307	+ } else {
	308	+ $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
	309	+ }
274	310	}
275	311	$query_values = array(':icao' => $icao);
276	312	try {
		@@ -325,7 +361,9 @@ discard block
		block discarded – undo
325	361
326	362	public function addMETARCycle() {
327	363	global $globalDebug, $globalIVAO;
328		- if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
	364	+ if (isset($globalDebug) && $globalDebug) {
	365	+ echo "Downloading METAR cycle...";
	366	+ }
329	367	date_default_timezone_set("UTC");
330	368	$Common = new Common();
331	369	if (isset($globalIVAO) && $globalIVAO) {
		@@ -333,7 +371,9 @@ discard block
		block discarded – undo
333	371	} else {
334	372	$cycle = $Common->getData('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT');
335	373	}
336		- if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
	374	+ if (isset($globalDebug) && $globalDebug) {
	375	+ echo "Done - Updating DB...";
	376	+ }
337	377	$date = '';
338	378	foreach(explode("\n",$cycle) as $line) {
339	379	if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
		@@ -342,22 +382,32 @@ discard block
		block discarded – undo
342	382	} elseif ($line != '') {
343	383	//$this->parse($line);
344	384	//echo $line;
345		- if ($date == '') $date = date('Y/m/d H:m');
	385	+ if ($date == '') {
	386	+ $date = date('Y/m/d H:m');
	387	+ }
346	388	$pos = 0;
347	389	$pieces = preg_split('/\s/',$line);
348		- if ($pieces[0] == 'METAR') $pos++;
349		- if (strlen($pieces[$pos]) != 4) $pos++;
	390	+ if ($pieces[0] == 'METAR') {
	391	+ $pos++;
	392	+ }
	393	+ if (strlen($pieces[$pos]) != 4) {
	394	+ $pos++;
	395	+ }
350	396	$location = $pieces[$pos];
351	397	echo $this->addMETAR($location,$line,$date);
352	398	}
353	399	//echo $line."\n";
354	400	}
355		- if (isset($globalDebug) && $globalDebug) echo "Done\n";
	401	+ if (isset($globalDebug) && $globalDebug) {
	402	+ echo "Done\n";
	403	+ }
356	404
357	405	}
358	406	public function downloadMETAR($icao) {
359	407	global $globalMETARurl;
360		- if ($globalMETARurl == '') return array();
	408	+ if ($globalMETARurl == '') {
	409	+ return array();
	410	+ }
361	411	date_default_timezone_set("UTC");
362	412	$Common = new Common();
363	413	$url = str_replace('{icao}',$icao,$globalMETARurl);
		@@ -370,16 +420,24 @@ discard block
		block discarded – undo
370	420	} elseif ($line != '') {
371	421	//$this->parse($line);
372	422	//echo $line;
373		- if ($date == '') $date = date('Y/m/d H:m');
	423	+ if ($date == '') {
	424	+ $date = date('Y/m/d H:m');
	425	+ }
374	426	$pos = 0;
375	427	$pieces = preg_split('/\s/',$line);
376		- if ($pieces[0] == 'METAR') $pos++;
377		- if (strlen($pieces[$pos]) != 4) $pos++;
	428	+ if ($pieces[0] == 'METAR') {
	429	+ $pos++;
	430	+ }
	431	+ if (strlen($pieces[$pos]) != 4) {
	432	+ $pos++;
	433	+ }
378	434	$location = $pieces[$pos];
379	435	if (strlen($location == 4)) {
380	436	$this->addMETAR($location,$line,$date);
381	437	return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
382		- } else return array();
	438	+ } else {
	439	+ return array();
	440	+ }
383	441	}
384	442	//echo $line."\n";
385	443	}

		@@ -22,7 +22,9 @@ discard block
		block discarded – undo
22	22	$registration = filter_var($registration,FILTER_SANITIZE_STRING);
23	23	$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
24	24	$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
25		- if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
	25	+ if ($registration == '' && $aircraft_icao != '') {
	26	+ $registration = $aircraft_icao.$airline_icao;
	27	+ }
26	28	$registration = trim($registration);
27	29	$query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright
28	30	FROM spotter_image
		@@ -60,8 +62,11 @@ discard block
		block discarded – undo
60	62	public function getExifCopyright($url) {
61	63	$exif = exif_read_data($url);
62	64	$copyright = '';
63		- if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright'];
64		- elseif (isset($exif['copyright'])) $copyright = $exif['copyright'];
	65	+ if (isset($exif['COMPUTED']['copyright'])) {
	66	+ $copyright = $exif['COMPUTED']['copyright'];
	67	+ } elseif (isset($exif['copyright'])) {
	68	+ $copyright = $exif['copyright'];
	69	+ }
65	70	if ($copyright != '') {
66	71	$copyright = str_replace('Copyright ','',$copyright);
67	72	$copyright = str_replace('© ','',$copyright);
		@@ -79,18 +84,29 @@ discard block
		block discarded – undo
79	84	public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '')
80	85	{
81	86	global $globalDebug,$globalAircraftImageFetch;
82		- if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return '';
	87	+ if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) {
	88	+ return '';
	89	+ }
83	90	$registration = filter_var($registration,FILTER_SANITIZE_STRING);
84	91	$registration = trim($registration);
85	92	//getting the aircraft image
86		- if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...';
87		- elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
88		- elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...';
89		- else return "success";
	93	+ if ($globalDebug && $registration != '') {
	94	+ echo 'Try to find an aircraft image for '.$registration.'...';
	95	+ } elseif ($globalDebug && $aircraft_icao != '') {
	96	+ echo 'Try to find an aircraft image for '.$aircraft_icao.'...';
	97	+ } elseif ($globalDebug && $airline_icao != '') {
	98	+ echo 'Try to find an aircraft image for '.$airline_icao.'...';
	99	+ } else {
	100	+ return "success";
	101	+ }
90	102	$image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao);
91		- if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao;
	103	+ if ($registration == '' && $aircraft_icao != '') {
	104	+ $registration = $aircraft_icao.$airline_icao;
	105	+ }
92	106	if ($image_url['original'] != '') {
93		- if ($globalDebug) echo 'Found !'."\n";
	107	+ if ($globalDebug) {
	108	+ echo 'Found !'."\n";
	109	+ }
94	110	$query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)";
95	111	try {
96	112	$sth = $this->db->prepare($query);
		@@ -99,7 +115,9 @@ discard block
		block discarded – undo
99	115	echo $e->getMessage()."\n";
100	116	return "error";
101	117	}
102		- } elseif ($globalDebug) echo "Not found :'(\n";
	118	+ } elseif ($globalDebug) {
	119	+ echo "Not found :'(\n";
	120	+ }
103	121	return "success";
104	122	}
105	123
		@@ -114,36 +132,75 @@ discard block
		block discarded – undo
114	132	{
115	133	global $globalAircraftImageSources, $globalIVAO;
116	134	$Spotter = new Spotter($this->db);
117		- if (!isset($globalIVAO)) $globalIVAO = FALSE;
	135	+ if (!isset($globalIVAO)) {
	136	+ $globalIVAO = FALSE;
	137	+ }
118	138	$aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING);
119	139	if ($aircraft_registration != '') {
120		- if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
	140	+ if (strpos($aircraft_registration,'/') !== false) {
	141	+ return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
	142	+ }
121	143	$aircraft_registration = urlencode(trim($aircraft_registration));
122	144	$aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration);
123		- if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name'];
124		- else $aircraft_name = '';
125		- if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao'];
126		- else $aircraft_icao = '';
127		- if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao'];
128		- else $airline_icao = '';
	145	+ if (isset($aircraft_info[0]['aircraft_name'])) {
	146	+ $aircraft_name = $aircraft_info[0]['aircraft_name'];
	147	+ } else {
	148	+ $aircraft_name = '';
	149	+ }
	150	+ if (isset($aircraft_info[0]['aircraft_icao'])) {
	151	+ $aircraft_name = $aircraft_info[0]['aircraft_icao'];
	152	+ } else {
	153	+ $aircraft_icao = '';
	154	+ }
	155	+ if (isset($aircraft_info[0]['airline_icao'])) {
	156	+ $airline_icao = $aircraft_info[0]['airline_icao'];
	157	+ } else {
	158	+ $airline_icao = '';
	159	+ }
129	160	} elseif ($aircraft_icao != '') {
130	161	$aircraft_registration = $aircraft_icao;
131	162	$aircraft_name = '';
132		- } else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
133		- if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
	163	+ } else {
	164	+ return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => '');
	165	+ }
	166	+ if (!isset($globalAircraftImageSources)) {
	167	+ $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
	168	+ }
134	169	foreach ($globalAircraftImageSources as $source) {
135	170	$source = strtolower($source);
136		- if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl($aircraft_icao,$airline_icao);
137		- if ($source == 'planespotters' && !$globalIVAO) $images_array = $this->fromPlanespotters($aircraft_registration,$aircraft_name);
138		- if ($source == 'flickr') $images_array = $this->fromFlickr($aircraft_registration,$aircraft_name);
139		- if ($source == 'bing') $images_array = $this->fromBing($aircraft_registration,$aircraft_name);
140		- if ($source == 'deviantart') $images_array = $this->fromDeviantart($aircraft_registration,$aircraft_name);
141		- if ($source == 'wikimedia') $images_array = $this->fromWikimedia($aircraft_registration,$aircraft_name);
142		- if ($source == 'jetphotos' && !$globalIVAO) $images_array = $this->fromJetPhotos($aircraft_registration,$aircraft_name);
143		- if ($source == 'planepictures' && !$globalIVAO) $images_array = $this->fromPlanePictures($aircraft_registration,$aircraft_name);
144		- if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData($aircraft_registration,$aircraft_name);
145		- if ($source == 'customsources') $images_array = $this->fromCustomSource($aircraft_registration,$aircraft_name);
146		- if (isset($images_array) && $images_array['original'] != '') return $images_array;
	171	+ if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') {
	172	+ $images_array = $this->fromIvaoMtl($aircraft_icao,$airline_icao);
	173	+ }
	174	+ if ($source == 'planespotters' && !$globalIVAO) {
	175	+ $images_array = $this->fromPlanespotters($aircraft_registration,$aircraft_name);
	176	+ }
	177	+ if ($source == 'flickr') {
	178	+ $images_array = $this->fromFlickr($aircraft_registration,$aircraft_name);
	179	+ }
	180	+ if ($source == 'bing') {
	181	+ $images_array = $this->fromBing($aircraft_registration,$aircraft_name);
	182	+ }
	183	+ if ($source == 'deviantart') {
	184	+ $images_array = $this->fromDeviantart($aircraft_registration,$aircraft_name);
	185	+ }
	186	+ if ($source == 'wikimedia') {
	187	+ $images_array = $this->fromWikimedia($aircraft_registration,$aircraft_name);
	188	+ }
	189	+ if ($source == 'jetphotos' && !$globalIVAO) {
	190	+ $images_array = $this->fromJetPhotos($aircraft_registration,$aircraft_name);
	191	+ }
	192	+ if ($source == 'planepictures' && !$globalIVAO) {
	193	+ $images_array = $this->fromPlanePictures($aircraft_registration,$aircraft_name);
	194	+ }
	195	+ if ($source == 'airportdata' && !$globalIVAO) {
	196	+ $images_array = $this->fromAirportData($aircraft_registration,$aircraft_name);
	197	+ }
	198	+ if ($source == 'customsources') {
	199	+ $images_array = $this->fromCustomSource($aircraft_registration,$aircraft_name);
	200	+ }
	201	+ if (isset($images_array) && $images_array['original'] != '') {
	202	+ return $images_array;
	203	+ }
147	204	}
148	205	return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => '');
149	206	}
		@@ -301,8 +358,11 @@ discard block
		block discarded – undo
301	358	*/
302	359	public function fromFlickr($aircraft_registration,$aircraft_name='') {
303	360	$Common = new Common();
304		- if ($aircraft_name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name);
305		- else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.',aircraft';
	361	+ if ($aircraft_name != '') {
	362	+ $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.','.urlencode($aircraft_name);
	363	+ } else {
	364	+ $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$aircraft_registration.',aircraft';
	365	+ }
306	366	$data = $Common->getData($url);
307	367	if ($xml = simplexml_load_string($data)) {
308	368	if (isset($xml->channel->item)) {
		@@ -346,9 +406,14 @@ discard block
		block discarded – undo
346	406	public function fromBing($aircraft_registration,$aircraft_name='') {
347	407	global $globalImageBingKey;
348	408	$Common = new Common();
349		- if (!isset($globalImageBingKey) \|\| $globalImageBingKey == '') return false;
350		- if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
351		- else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
	409	+ if (!isset($globalImageBingKey) \|\| $globalImageBingKey == '') {
	410	+ return false;
	411	+ }
	412	+ if ($aircraft_name != '') {
	413	+ $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27';
	414	+ } else {
	415	+ $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27';
	416	+ }
352	417	$headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey));
353	418	$data = $Common->getData($url,'get','',$headers);
354	419	$result = json_decode($data);
		@@ -402,13 +467,18 @@ discard block
		block discarded – undo
402	467	*/
403	468	public function fromWikimedia($aircraft_registration,$aircraft_name='') {
404	469	$Common = new Common();
405		- if ($aircraft_name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20'.urlencode($aircraft_name);
406		- else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20aircraft';
	470	+ if ($aircraft_name != '') {
	471	+ $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20'.urlencode($aircraft_name);
	472	+ } else {
	473	+ $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$aircraft_registration.'"%20aircraft';
	474	+ }
407	475	$data = $Common->getData($url);
408	476	$result = json_decode($data);
409	477	if (isset($result->query->search[0]->title)) {
410	478	$fileo = $result->query->search[0]->title;
411		- if (substr($fileo,-3) == 'pdf') return false;
	479	+ if (substr($fileo,-3) == 'pdf') {
	480	+ return false;
	481	+ }
412	482	$file = urlencode($fileo);
413	483	$url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user\|url\|size\|mime\|sha1\|timestamp&iiurlwidth=200%27&titles='.$file;
414	484	$data2 = $Common->getData($url2);
		@@ -460,7 +530,9 @@ discard block
		block discarded – undo
460	530	global $globalAircraftCustomSources;
461	531	//$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true);
462	532	if (!empty($globalAircraftImageCustomSources)) {
463		- if (!isset($globalAircraftImageCustomSources[0])) $globalAircraftImageCustomSources[] = $globalAircraftImageCustomSources;
	533	+ if (!isset($globalAircraftImageCustomSources[0])) {
	534	+ $globalAircraftImageCustomSources[] = $globalAircraftImageCustomSources;
	535	+ }
464	536	foreach ($globalAircraftImageCustomSources as $source) {
465	537	$Common = new Common();
466	538	$url = str_replace('{registration}',$aircraft_registration,$source['original']);
		@@ -469,17 +541,25 @@ discard block
		block discarded – undo
469	541	$image_url = array();
470	542	$image_url['thumbnail'] = $url_thumbnail;
471	543	$image_url['original'] = $url;
472		- if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url);
473		- else $exifCopyright = '';
474		- if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright;
475		- else $image_url['copyright'] = $source['copyright'];
	544	+ if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) {
	545	+ $exifCopyright = $this->getExifCopyright($url);
	546	+ } else {
	547	+ $exifCopyright = '';
	548	+ }
	549	+ if ($exifCopyright != '') {
	550	+ $image_url['copyright'] = $exifCopyright;
	551	+ } else {
	552	+ $image_url['copyright'] = $source['copyright'];
	553	+ }
476	554	$image_url['source_website'] = $source['source_website'];
477	555	$image_url['source'] = $source['source'];
478	556	return $image_url;
479	557	}
480	558	}
481	559	return false;
482		- } else return false;
	560	+ } else {
	561	+ return false;
	562	+ }
483	563	}
484	564	}
485	565

		@@ -18,7 +18,9 @@ discard block
		block discarded – undo
18	18
19	19	/* Check that end was found and body has at least one byte. */
20	20	if ($splitpos == 0 \|\| $splitpos + 1 == $input_len \|\| $splitpos === FALSE) {
21		- if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
	21	+ if ($globalDebug) {
	22	+ echo '!!! APRS invalid : '.$input."\n";
	23	+ }
22	24	return false;
23	25	}
24	26
		@@ -27,23 +29,31 @@ discard block
		block discarded – undo
27	29	$body_len = strlen($body);
28	30	$header = substr($input,0,$splitpos);
29	31	//$header_len = strlen($header);
30		- if ($debug) echo 'header : '.$header."\n";
	32	+ if ($debug) {
	33	+ echo 'header : '.$header."\n";
	34	+ }
31	35
32	36	/* Parse source, target and path. */
33	37	//FLRDF0A52>APRS,qAS,LSTB
34	38	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
35	39	$ident = $matches[1];
36	40	$all_elements = $matches[2];
37		- if ($debug) echo 'ident : '.$ident."\n";
	41	+ if ($debug) {
	42	+ echo 'ident : '.$ident."\n";
	43	+ }
38	44	$result['ident'] = $ident;
39		- } else return false;
	45	+ } else {
	46	+ return false;
	47	+ }
40	48	$elements = explode(',',$all_elements);
41	49	$source = end($elements);
42	50	$result['source'] = $source;
43	51	foreach ($elements as $element) {
44	52	if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
45	53	//echo "ok";
46		- if ($element == 'TCPIP*') return false;
	54	+ if ($element == 'TCPIP*') {
	55	+ return false;
	56	+ }
47	57	} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
48	58	return false;
49	59	}
		@@ -89,7 +99,9 @@ discard block
		block discarded – undo
89	99	//$symbol_table = $matches[4];
90	100	$lat = intval($lat_deg);
91	101	$lon = intval($lon_deg);
92		- if ($lat > 89 \|\| $lon > 179) return false;
	102	+ if ($lat > 89 \|\| $lon > 179) {
	103	+ return false;
	104	+ }
93	105
94	106	/*
95	107	$tmp_5b = str_replace('.','',$lat_min);
		@@ -99,8 +111,12 @@ discard block
		block discarded – undo
99	111	*/
100	112	$latitude = $lat + floatval($lat_min)/60;
101	113	$longitude = $lon + floatval($lon_min)/60;
102		- if ($sind == 'S') $latitude = 0-$latitude;
103		- if ($wind == 'W') $longitude = 0-$longitude;
	114	+ if ($sind == 'S') {
	115	+ $latitude = 0-$latitude;
	116	+ }
	117	+ if ($wind == 'W') {
	118	+ $longitude = 0-$longitude;
	119	+ }
104	120	$result['latitude'] = $latitude;
105	121	$result['longitude'] = $longitude;
106	122	}
		@@ -115,7 +131,9 @@ discard block
		block discarded – undo
115	131	if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
116	132	$course = substr($body_parse,0,3);
117	133	$tmp_s = intval($course);
118		- if ($tmp_s >= 1 && $tmp_s <= 360) $result['course'] = intval($course);
	134	+ if ($tmp_s >= 1 && $tmp_s <= 360) {
	135	+ $result['course'] = intval($course);
	136	+ }
119	137	$speed = substr($body_parse,4,3);
120	138	$result['speed'] = round($speed*1.852);
121	139	$body_parse = substr($body_parse,7);
		@@ -149,10 +167,16 @@ discard block
		block discarded – undo
149	167	$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
150	168	$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
151	169
152		- if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
153		- else $result['latitude'] += $lat_off;
154		- if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
155		- else $result['longitude'] += $lon_off;
	170	+ if ($result['latitude'] < 0) {
	171	+ $result['latitude'] -= $lat_off;
	172	+ } else {
	173	+ $result['latitude'] += $lat_off;
	174	+ }
	175	+ if ($result['longitude'] < 0) {
	176	+ $result['longitude'] -= $lon_off;
	177	+ } else {
	178	+ $result['longitude'] += $lon_off;
	179	+ }
156	180	}
157	181	$body_parse = substr($body_parse,6);
158	182	}
		@@ -165,27 +189,48 @@ discard block
		block discarded – undo
165	189	$address = substr($id,2);
166	190	//print_r($matches);
167	191	$addressType = (intval(substr($id,0,2),16))&3;
168		- if ($addressType == 0) $result['addresstype'] = "RANDOM";
169		- elseif ($addressType == 1) $result['addresstype'] = "ICAO";
170		- elseif ($addressType == 2) $result['addresstype'] = "FLARM";
171		- elseif ($addressType == 3) $result['addresstype'] = "OGN";
	192	+ if ($addressType == 0) {
	193	+ $result['addresstype'] = "RANDOM";
	194	+ } elseif ($addressType == 1) {
	195	+ $result['addresstype'] = "ICAO";
	196	+ } elseif ($addressType == 2) {
	197	+ $result['addresstype'] = "FLARM";
	198	+ } elseif ($addressType == 3) {
	199	+ $result['addresstype'] = "OGN";
	200	+ }
172	201	$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
173	202	$result['aircrafttype_code'] = $aircraftType;
174		- if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
175		- elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
176		- elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE";
177		- elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
178		- elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE";
179		- elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE";
180		- elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER";
181		- elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER";
182		- elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT";
183		- elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT";
184		- elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO";
185		- elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON";
186		- elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
187		- elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
188		- elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
	203	+ if ($aircraftType == 0) {
	204	+ $result['aircrafttype'] = "UNKNOWN";
	205	+ } elseif ($aircraftType == 1) {
	206	+ $result['aircrafttype'] = "GLIDER";
	207	+ } elseif ($aircraftType == 2) {
	208	+ $result['aircrafttype'] = "TOW_PLANE";
	209	+ } elseif ($aircraftType == 3) {
	210	+ $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
	211	+ } elseif ($aircraftType == 4) {
	212	+ $result['aircrafttype'] = "PARACHUTE";
	213	+ } elseif ($aircraftType == 5) {
	214	+ $result['aircrafttype'] = "DROP_PLANE";
	215	+ } elseif ($aircraftType == 6) {
	216	+ $result['aircrafttype'] = "HANG_GLIDER";
	217	+ } elseif ($aircraftType == 7) {
	218	+ $result['aircrafttype'] = "PARA_GLIDER";
	219	+ } elseif ($aircraftType == 8) {
	220	+ $result['aircrafttype'] = "POWERED_AIRCRAFT";
	221	+ } elseif ($aircraftType == 9) {
	222	+ $result['aircrafttype'] = "JET_AIRCRAFT";
	223	+ } elseif ($aircraftType == 10) {
	224	+ $result['aircrafttype'] = "UFO";
	225	+ } elseif ($aircraftType == 11) {
	226	+ $result['aircrafttype'] = "BALLOON";
	227	+ } elseif ($aircraftType == 12) {
	228	+ $result['aircrafttype'] = "AIRSHIP";
	229	+ } elseif ($aircraftType == 13) {
	230	+ $result['aircrafttype'] = "UAV";
	231	+ } elseif ($aircraftType == 15) {
	232	+ $result['aircrafttype'] = "STATIC_OBJECT";
	233	+ }
189	234	$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
190	235	$result['stealth'] = $stealth;
191	236	$result['address'] = $address;
		@@ -227,8 +272,12 @@ discard block
		block discarded – undo
227	272	}
228	273	}
229	274	}
230		- if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
231		- if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
	275	+ if (isset($result['latitude'])) {
	276	+ $result['latitude'] = round($result['latitude'],4);
	277	+ }
	278	+ if (isset($result['longitude'])) {
	279	+ $result['longitude'] = round($result['longitude'],4);
	280	+ }
232	281	//print_r($result);
233	282	return $result;
234	283	}

Ysurac / FlightAirMap

Push — master ( 9321a3...c66f20 )

Status

Category

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Braces +43 added lines, -16 removed lines patch added patch discarded remove patch

Braces +120 added lines, -46 removed lines patch added patch discarded remove patch

Braces +34 added lines, -12 removed lines patch added patch discarded remove patch

Braces +94 added lines, -36 removed lines patch added patch discarded remove patch

Braces +126 added lines, -46 removed lines patch added patch discarded remove patch

Braces +83 added lines, -34 removed lines patch added patch discarded remove patch