Inspection of "Display only first aircraft name, on other by high..." - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( e14a40...cfb98e )

by Yannick

created 2017-09-28 20:28 UTC

Status

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -11,14 +11,14 @@  discard block
 block discarded – undo
 
 $from_archive = false;
 if (isset($_GET['ident'])) {
-	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+	$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident,$currenttime);
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident, $currenttime);
 		if (empty($spotter_array)) {
 			$from_archive = true;
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident,$currenttime);
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident, $currenttime);
 		}
 	} else {
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
@@ -29,15 +29,15 @@  discard block
 block discarded – undo
 	}
 }
 if (isset($_GET['flightaware_id'])) {
-	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+	$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
 	if (isset($_GET['currenttime'])) {
-		$currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
+		$currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
 		$currenttime = round($currenttime/1000);
-		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id,$currenttime);
+		$spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id, $currenttime);
 		if (empty($spotter_array)) {
 			$from_archive = true;
 //			$spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
-			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id,$currenttime);
+			$spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id, $currenttime);
 		}
 	} else {
 		$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
 	if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
 	{
 		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']);
+			$image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
 		} else $image = $spotter_item['image_thumbnail'];
 	}
 	/* else {
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
 		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']) && $spotter_item['departure_airport_time'] != 'NULL') {
 			if ($spotter_item['departure_airport_time'] > 2460) {
-				print '<br /><span class="time">'.date('H:m',$spotter_item['departure_airport_time']).'</span>';
+				print '<br /><span class="time">'.date('H:m', $spotter_item['departure_airport_time']).'</span>';
 			} else {
 				print '<br /><span class="time">'.$spotter_item['departure_airport_time'].'</span>';
 			}
@@ -89,7 +89,7 @@  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'];
 		if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
 			if ($spotter_item['arrival_airport_time'] > 2460) {
-				print '<br /><span class="time">'.date('H:m',$spotter_item['arrival_airport_time']).'</span>';
+				print '<br /><span class="time">'.date('H:m', $spotter_item['arrival_airport_time']).'</span>';
 			} else {
 				print '<br /><span class="time">'.$spotter_item['arrival_airport_time'].'</span>';
 			}
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
 	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']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') {
-		$aircraft_names = explode('/',$spotter_item['aircraft_name']);
+		$aircraft_names = explode('/', $spotter_item['aircraft_name']);
 		if (count($aircraft_names) == 1) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
 		else print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
 	} elseif (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
@@ -118,8 +118,8 @@  discard block
 block discarded – undo
 	print '<div id ="altitude"><span>'._("Altitude").'</span>';
 	if (isset($globalGroundAltitude) && $globalGroundAltitude) {
 		try {
-			$groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
-		} catch(Exception $e) {
+			$groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']);
+		} catch (Exception $e) {
 			// If catched not exist
 		}
 	}
@@ -158,9 +158,9 @@  discard block
 block discarded – undo
 	if (isset($globalCam) && $globalCam) {
 		require_once(dirname(__FILE__).'/require/class.Common.php');
 		$Common = new Common();
-		$azimuth = round($Common->azimuth($globalCenterLatitude,$globalCenterLongitude,$spotter_item['latitude'],$spotter_item['longitude']));
-		$distance = $Common->distance($globalCenterLatitude,$globalCenterLongitude,$spotter_item['latitude'],$spotter_item['longitude'],'m');
-		$plunge = round($Common->plunge($globalCenterAltitude,$spotter_item['real_altitude'],$distance));
+		$azimuth = round($Common->azimuth($globalCenterLatitude, $globalCenterLongitude, $spotter_item['latitude'], $spotter_item['longitude']));
+		$distance = $Common->distance($globalCenterLatitude, $globalCenterLongitude, $spotter_item['latitude'], $spotter_item['longitude'], 'm');
+		$plunge = round($Common->plunge($globalCenterAltitude, $spotter_item['real_altitude'], $distance));
 		print '<div id="camcoordinates"><span>'._("Cam Coordinates").'</span>';
 		print 'azimuth: '.$azimuth;
 		print ' / ';
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
 		print '</div>';
 		//echo $Common->getData('http://127.0.0.1/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
 		//echo $Common->getData('file://'.dirname(__FILE__).'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
-		echo $Common->getData('http://'.$_SERVER['SERVER_NAME'].'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
+		echo $Common->getData('http://'.$_SERVER['SERVER_NAME'].'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge, 'get', '', '', '', '', '', '', false, true);
 	}
   
 	print '<div id="heading"><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>';
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
 	print '</div>';
 	if (isset($globalVA) && $globalVA && 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['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>';
 }

Please login to merge, or discard this patch.

Braces +52 added lines, -19 removed lines patch added patch discarded remove patch

@@ -58,7 +58,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 {
 		$image = "images/placeholder_thumb.png";
@@ -73,8 +75,12 @@  discard block
 block discarded – undo
 	}
 	print '<div class="right">';
 	print '<div class="callsign-details">';
-	if ($spotter_item['ident'] != 'Not Available') print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
-	if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
+	if ($spotter_item['ident'] != 'Not Available') {
+		print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
+	}
+	if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') {
+		print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
+	}
 	print '</div>';
 	if ($spotter_item['departure_airport'] != 'NA' && $spotter_item['arrival_airport'] != 'NA') {
 		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'];
@@ -106,13 +112,21 @@  discard block
 block discarded – undo
 	print '</div>';
 	print '<div id="aircraft">';
 	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_wiki'])) {
+		print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
+	}
 	if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') {
 		$aircraft_names = explode('/',$spotter_item['aircraft_name']);
-		if (count($aircraft_names) == 1) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
-		else print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
-	} elseif (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
-	else print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
+		if (count($aircraft_names) == 1) {
+			print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
+		} else {
+			print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
+		}
+	} elseif (isset($spotter_item['aircraft_type'])) {
+		print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
+	} else {
+		print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
+	}
 	
 	print '</div>';
 	print '<div id ="altitude"><span>'._("Altitude").'</span>';
@@ -125,11 +139,17 @@  discard block
 block discarded – undo
 	}
 
 	if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
-		if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
-		else print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
+		if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
+			print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
+		} else {
+			print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
+		}
 	} else {
-		if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
-		else print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
+		if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
+			print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
+		} else {
+			print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
+		}
 	}
 
 	if (isset($groundAltitude) && $groundAltitude < $spotter_item['altitude']*30.48) {
@@ -143,7 +163,9 @@  discard block
 block discarded – undo
 		print '</i>';
 	}
 	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 id="speed"><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';
@@ -176,8 +198,11 @@  discard block
 block discarded – undo
 	print '<div id="heading"><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>';
 	if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != '') {
 		print '<div id="pilot"><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>';
 	}
 	if (isset($spotter_item['aircraft_owner']) && $spotter_item['aircraft_owner'] != '') {
@@ -203,10 +228,18 @@  discard block
 block discarded – undo
 	}
 	print '</div>';
 	print '</div>';
-	if (isset($globalVA) && $globalVA && 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($globalVA) && $globalVA && 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>';
 }
 ?>

Please login to merge, or discard this patch.

		@@ -11,14 +11,14 @@ discard block
		block discarded – undo
11	11
12	12	$from_archive = false;
13	13	if (isset($_GET['ident'])) {
14		- $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
	14	+ $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
15	15	if (isset($_GET['currenttime'])) {
16		- $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
	16	+ $currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
17	17	$currenttime = round($currenttime/1000);
18		- $spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident,$currenttime);
	18	+ $spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident, $currenttime);
19	19	if (empty($spotter_array)) {
20	20	$from_archive = true;
21		- $spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident,$currenttime);
	21	+ $spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident, $currenttime);
22	22	}
23	23	} else {
24	24	$spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident);
		@@ -29,15 +29,15 @@ discard block
		block discarded – undo
29	29	}
30	30	}
31	31	if (isset($_GET['flightaware_id'])) {
32		- $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
	32	+ $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
33	33	if (isset($_GET['currenttime'])) {
34		- $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
	34	+ $currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT);
35	35	$currenttime = round($currenttime/1000);
36		- $spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id,$currenttime);
	36	+ $spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id, $currenttime);
37	37	if (empty($spotter_array)) {
38	38	$from_archive = true;
39	39	// $spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id);
40		- $spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id,$currenttime);
	40	+ $spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id, $currenttime);
41	41	}
42	42	} else {
43	43	$spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id);
		@@ -57,7 +57,7 @@ discard block
		block discarded – undo
57	57	if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "")
58	58	{
59	59	if ($spotter_item['image_source'] == 'flickr' \|\| $spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart') {
60		- $image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
	60	+ $image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']);
61	61	} else $image = $spotter_item['image_thumbnail'];
62	62	}
63	63	/* else {
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	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'];
81	81	if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') {
82	82	if ($spotter_item['departure_airport_time'] > 2460) {
83		- print '<br /><span class="time">'.date('H:m',$spotter_item['departure_airport_time']).'</span>';
	83	+ print '<br /><span class="time">'.date('H:m', $spotter_item['departure_airport_time']).'</span>';
84	84	} else {
85	85	print '<br /><span class="time">'.$spotter_item['departure_airport_time'].'</span>';
86	86	}
		@@ -89,7 +89,7 @@ discard block
		block discarded – undo
89	89	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'];
90	90	if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') {
91	91	if ($spotter_item['arrival_airport_time'] > 2460) {
92		- print '<br /><span class="time">'.date('H:m',$spotter_item['arrival_airport_time']).'</span>';
	92	+ print '<br /><span class="time">'.date('H:m', $spotter_item['arrival_airport_time']).'</span>';
93	93	} else {
94	94	print '<br /><span class="time">'.$spotter_item['arrival_airport_time'].'</span>';
95	95	}
		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108	print '<span>'._("Aircraft").'</span>';
109	109	if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
110	110	if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') {
111		- $aircraft_names = explode('/',$spotter_item['aircraft_name']);
	111	+ $aircraft_names = explode('/', $spotter_item['aircraft_name']);
112	112	if (count($aircraft_names) == 1) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
113	113	else print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
114	114	} elseif (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
		@@ -118,8 +118,8 @@ discard block
		block discarded – undo
118	118	print '<div id ="altitude"><span>'._("Altitude").'</span>';
119	119	if (isset($globalGroundAltitude) && $globalGroundAltitude) {
120	120	try {
121		- $groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']);
122		- } catch(Exception $e) {
	121	+ $groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']);
	122	+ } catch (Exception $e) {
123	123	// If catched not exist
124	124	}
125	125	}
		@@ -158,9 +158,9 @@ discard block
		block discarded – undo
158	158	if (isset($globalCam) && $globalCam) {
159	159	require_once(dirname(__FILE__).'/require/class.Common.php');
160	160	$Common = new Common();
161		- $azimuth = round($Common->azimuth($globalCenterLatitude,$globalCenterLongitude,$spotter_item['latitude'],$spotter_item['longitude']));
162		- $distance = $Common->distance($globalCenterLatitude,$globalCenterLongitude,$spotter_item['latitude'],$spotter_item['longitude'],'m');
163		- $plunge = round($Common->plunge($globalCenterAltitude,$spotter_item['real_altitude'],$distance));
	161	+ $azimuth = round($Common->azimuth($globalCenterLatitude, $globalCenterLongitude, $spotter_item['latitude'], $spotter_item['longitude']));
	162	+ $distance = $Common->distance($globalCenterLatitude, $globalCenterLongitude, $spotter_item['latitude'], $spotter_item['longitude'], 'm');
	163	+ $plunge = round($Common->plunge($globalCenterAltitude, $spotter_item['real_altitude'], $distance));
164	164	print '<div id="camcoordinates"><span>'._("Cam Coordinates").'</span>';
165	165	print 'azimuth: '.$azimuth;
166	166	print ' / ';
		@@ -170,7 +170,7 @@ discard block
		block discarded – undo
170	170	print '</div>';
171	171	//echo $Common->getData('http://127.0.0.1/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
172	172	//echo $Common->getData('file://'.dirname(__FILE__).'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
173		- echo $Common->getData('http://'.$_SERVER['SERVER_NAME'].'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge,'get','','','','','','',false,true);
	173	+ echo $Common->getData('http://'.$_SERVER['SERVER_NAME'].'/camera.php?azimuth='.$azimuth.'&plunge='.$plunge, 'get', '', '', '', '', '', '', false, true);
174	174	}
175	175
176	176	print '<div id="heading"><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>';
		@@ -205,7 +205,7 @@ discard block
		block discarded – undo
205	205	print '</div>';
206	206	if (isset($globalVA) && $globalVA && 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>';
207	207	if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
208		- 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>';
	208	+ 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>';
209	209	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>';
210	210	print '</div>';
211	211	}

		@@ -58,7 +58,9 @@ discard block
		block discarded – undo
58	58	{
59	59	if ($spotter_item['image_source'] == 'flickr' \|\| $spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart') {
60	60	$image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
61		- } else $image = $spotter_item['image_thumbnail'];
	61	+ } else {
	62	+ $image = $spotter_item['image_thumbnail'];
	63	+ }
62	64	}
63	65	/* else {
64	66	$image = "images/placeholder_thumb.png";
		@@ -73,8 +75,12 @@ discard block
		block discarded – undo
73	75	}
74	76	print '<div class="right">';
75	77	print '<div class="callsign-details">';
76		- if ($spotter_item['ident'] != 'Not Available') print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
77		- if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
	78	+ if ($spotter_item['ident'] != 'Not Available') {
	79	+ print '<div class="callsign"><a href="'.$globalURL.'/redirect/'.$spotter_item['flightaware_id'].'" target="_blank">'.$spotter_item['ident'].'</a></div>';
	80	+ }
	81	+ if (isset($spotter_item['airline_name']) && $spotter_item['airline_name'] != 'Not Available') {
	82	+ print '<div class="airline">'.$spotter_item['airline_name'].'</div>';
	83	+ }
78	84	print '</div>';
79	85	if ($spotter_item['departure_airport'] != 'NA' && $spotter_item['arrival_airport'] != 'NA') {
80	86	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'];
		@@ -106,13 +112,21 @@ discard block
		block discarded – undo
106	112	print '</div>';
107	113	print '<div id="aircraft">';
108	114	print '<span>'._("Aircraft").'</span>';
109		- if (isset($spotter_item['aircraft_wiki'])) print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
	115	+ if (isset($spotter_item['aircraft_wiki'])) {
	116	+ print '<a href="'.$spotter_item['aircraft_wiki'].'">'.$spotter_item['aircraft_name'].'</a>';
	117	+ }
110	118	if (isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_manufacturer']) && $spotter_item['aircraft_manufacturer'] != 'N/A' && isset($spotter_item['aircraft_name']) && $spotter_item['aircraft_name'] != 'N/A') {
111	119	$aircraft_names = explode('/',$spotter_item['aircraft_name']);
112		- if (count($aircraft_names) == 1) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
113		- else print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
114		- } elseif (isset($spotter_item['aircraft_type'])) print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
115		- else print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
	120	+ if (count($aircraft_names) == 1) {
	121	+ print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')</a>';
	122	+ } else {
	123	+ print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'" title="'.$spotter_item['aircraft_name'].'">'.$spotter_item['aircraft_manufacturer'].' '.$aircraft_names[0].' ('.$spotter_item['aircraft_type'].')</a>';
	124	+ }
	125	+ } elseif (isset($spotter_item['aircraft_type'])) {
	126	+ print '<a href="'.$globalURL.'/aircraft/'.$spotter_item['aircraft_type'].'">'.$spotter_item['aircraft_type'].'</a>';
	127	+ } else {
	128	+ print $spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'];
	129	+ }
116	130
117	131	print '</div>';
118	132	print '<div id ="altitude"><span>'._("Altitude").'</span>';
		@@ -125,11 +139,17 @@ discard block
		block discarded – undo
125	139	}
126	140
127	141	if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') \|\| (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
128		- if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
129		- else print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
	142	+ if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
	143	+ print $spotter_item['real_altitude'].' feet (FL'.$spotter_item['altitude'].')';
	144	+ } else {
	145	+ print $spotter_item['altitude'].'00 feet (FL'.$spotter_item['altitude'].')';
	146	+ }
130	147	} else {
131		- if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
132		- else print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
	148	+ if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
	149	+ print round($spotter_item['real_altitude']*0.3048).' m (FL'.$spotter_item['altitude'].')';
	150	+ } else {
	151	+ print round($spotter_item['altitude']*30.48).' m (FL'.$spotter_item['altitude'].')';
	152	+ }
133	153	}
134	154
135	155	if (isset($groundAltitude) && $groundAltitude < $spotter_item['altitude']*30.48) {
		@@ -143,7 +163,9 @@ discard block
		block discarded – undo
143	163	print '</i>';
144	164	}
145	165	print '</div>';
146		- 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>';
	166	+ if (isset($spotter_item['registration']) && $spotter_item['registration'] != '') {
	167	+ print '<div><span>'._("Registration").'</span><a href="'.$globalURL.'/registration/'.$spotter_item['registration'].'" target="_blank">'.$spotter_item['registration'].'</a></div>';
	168	+ }
147	169	print '<div id="speed"><span>'._("Speed").'</span>';
148	170	if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') \|\| (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
149	171	print round($spotter_item['ground_speed']*1.15078).' mph';
		@@ -176,8 +198,11 @@ discard block
		block discarded – undo
176	198	print '<div id="heading"><span>'._("Heading").'</span>'.$spotter_item['heading'].'°</div>';
177	199	if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != '') {
178	200	print '<div id="pilot"><span>'._("Pilot").'</span>';
179		- if (isset($spotter_item['pilot_id'])) print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
180		- else print $spotter_item['pilot_name'];
	201	+ if (isset($spotter_item['pilot_id'])) {
	202	+ print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
	203	+ } else {
	204	+ print $spotter_item['pilot_name'];
	205	+ }
181	206	print '</div>';
182	207	}
183	208	if (isset($spotter_item['aircraft_owner']) && $spotter_item['aircraft_owner'] != '') {
		@@ -203,10 +228,18 @@ discard block
		block discarded – undo
203	228	}
204	229	print '</div>';
205	230	print '</div>';
206		- if (isset($globalVA) && $globalVA && 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>';
207		- if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
208		- 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>';
209		- 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>';
	231	+ if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') {
	232	+ print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>';
	233	+ }
	234	+ if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') {
	235	+ print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>';
	236	+ }
	237	+ if (isset($spotter_item['acars']['message'])) {
	238	+ 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>';
	239	+ }
	240	+ if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) {
	241	+ print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>';
	242	+ }
210	243	print '</div>';
211	244	}
212	245	?>

Ysurac / FlightAirMap

Push — master ( e14a40...cfb98e )

Status

Category

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

Braces +52 added lines, -19 removed lines patch added patch discarded remove patch