Completed
Push — master ( e14a40...cfb98e )
by Yannick
54:46 queued 27:34
created
aircraft-data.php 1 patch
Braces   +52 added lines, -19 removed lines patch added patch discarded remove patch
@@ -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
 ?>
Please login to merge, or discard this patch.