View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 75e641...0485dc )
by Yannick
33:10
created
Status
Category
Toggle Patches
live-geojson.php 1 patch
Braces   +321 added lines, -130 removed lines patch added patch discarded remove patch 
@@ -12,7 +12,9 @@  discard block
 
 block discarded – undo
12 12 
 $tracker = false;
13 13 
 $marine = false;
14 14 
 $usecoord = false;
15 
-if (isset($_GET['test'])) exit();
15 
+if (isset($_GET['test'])) {
16 
+	exit();
17 
+}
16 18 
 if (isset($_GET['tracker'])) {
17 19 
     $tracker = true;
18 20 
 }
 
@@ -57,28 +59,55 @@  discard block
 
 block discarded – undo
57 59 
 }
58 60 
 header('Content-Type: text/javascript');
59 61
60 
-if (!isset($globalJsonCompress)) $compress = true;
61 
-else $compress = $globalJsonCompress;
62 
+if (!isset($globalJsonCompress)) {
63 
+	$compress = true;
64 
+} else {
65 
+	$compress = $globalJsonCompress;
66 
+}
62 67
63 68 
 $from_archive = false;
64 69 
 $min = true;
65 70 
 $allhistory = false;
66 71 
 $filter['source'] = array();
67 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
68 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
69 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
70 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
71 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
72 
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
73 
-if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
74 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
75 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
76 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
77 
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
72 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
73 
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
74 
+}
75 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
76 
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
77 
+}
78 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
79 
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
80 
+}
81 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
82 
+	$filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
83 
+}
84 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
85 
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
86 
+}
87 
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
88 
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
89 
+}
90 
+if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') {
91 
+	$filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
92 
+}
93 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
94 
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
95 
+}
96 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
97 
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
98 
+}
99 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
100 
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
101 
+}
102 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
103 
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
104 
+}
78 105
79 106 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
80 107 
 	$min = true;
81 
-} else $min = false;
108 
+} else {
109 
+	$min = false;
110 
+}
82 111
83 112 
 $spotter_array = array();
84 113 
 
@@ -189,24 +218,38 @@  discard block
 
 block discarded – undo
189 218 
 			$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
190 219 
 		}
191 220 
 	}
192 
-	if ($flightcnt == '') $flightcnt = 0;
193 
-} else $flightcnt = 0;
221 
+	if ($flightcnt == '') {
222 
+		$flightcnt = 0;
223 
+	}
224 
+	} else {
225 
+	$flightcnt = 0;
226 
+}
194 227
195 228 
 $sqltime = round(microtime(true)-$begintime,2);
196 229
197 230 
 $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT);
198 
-if ($currenttime != '') $currenttime = round($currenttime/1000);
231 
+if ($currenttime != '') {
232 
+	$currenttime = round($currenttime/1000);
233 
+}
199 234
200 
-if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) $usenextlatlon = false;
201 
-else $usenextlatlon = true;
202 
-if ($usenextlatlon === false) $currenttime = '';
235 
+if ((!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation == FALSE) || (isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'false')) {
236 
+	$usenextlatlon = false;
237 
+} else {
238 
+	$usenextlatlon = true;
239 
+}
240 
+if ($usenextlatlon === false) {
241 
+	$currenttime = '';
242 
+}
203 243 
 $j = 0;
204 244 
 $prev_flightaware_id = '';
205 245 
 $aircrafts_shadow = array();
206 246 
 $output = '{';
207 247 
 	$output .= '"type": "FeatureCollection",';
208 
-		if ($min) $output .= '"minimal": "true",';
209 
-		else $output .= '"minimal": "false",';
248 
+		if ($min) {
249 
+			$output .= '"minimal": "true",';
250 
+		} else {
251 
+			$output .= '"minimal": "false",';
252 
+		}
210 253 
 		//$output .= '"fc": "'.$flightcnt.'",';
211 254 
 		$output .= '"sqt": "'.$sqltime.'",';
212 255 
 
@@ -251,18 +294,29 @@  discard block
 
 block discarded – undo
251 294 
 						}
252 295 
 						$output .= '"properties": {';
253 296 
 						if (isset($spotter_item['flightaware_id'])) {
254 
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
255 
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
297 
+							if ($compress) {
298 
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
299 
+							} else {
300 
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
301 
+							}
256 302 
 						} elseif (isset($spotter_item['famtrackid'])) {
257 
-							if ($compress) $output .= '"fti": "'.$spotter_item['famtrackid'].'",';
258 
-							else $output .= '"famtrackid": "'.$spotter_item['famtrackid'].'",';
303 
+							if ($compress) {
304 
+								$output .= '"fti": "'.$spotter_item['famtrackid'].'",';
305 
+							} else {
306 
+								$output .= '"famtrackid": "'.$spotter_item['famtrackid'].'",';
307 
+							}
259 308 
 						} elseif (isset($spotter_item['fammarine_id'])) {
260 
-							if ($compress) $output .= '"fmi": "'.$spotter_item['fammarine_id'].'",';
261 
-							else $output .= '"fammarineid": "'.$spotter_item['fammarine_id'].'",';
309 
+							if ($compress) {
310 
+								$output .= '"fmi": "'.$spotter_item['fammarine_id'].'",';
311 
+							} else {
312 
+								$output .= '"fammarineid": "'.$spotter_item['fammarine_id'].'",';
313 
+							}
262 314 
 						}
263 315 
 						$output .= '"fc": "'.$flightcnt.'",';
264 316 
 						$output .= '"sqt": "'.$sqltime.'",';
265 
-						if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
317 
+						if (isset($begindate)) {
318 
+							$output .= '"archive_date": "'.$begindate.'",';
319 
+						}
266 320
267 321 
 /*
268 322 
 							if ($min) $output .= '"minimal": "true",';
 
@@ -270,14 +324,22 @@  discard block
 
 block discarded – undo
270 324 
 */
271 325 
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
272 326 
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
273 
-							if ($compress) $output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
274 
-							else $output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
327 
+							if ($compress) {
328 
+								$output .= '"c": "'.str_replace('\\','',$spotter_item['ident']).'",';
329 
+							} else {
330 
+								$output .= '"callsign": "'.str_replace('\\','',$spotter_item['ident']).'",';
331 
+							}
275 332 
 							//"
276 333 
 						} else {
277 
-							if ($compress) $output .= '"c": "NA",';
278 
-							else $output .= '"callsign": "NA",';
334 
+							if ($compress) {
335 
+								$output .= '"c": "NA",';
336 
+							} else {
337 
+								$output .= '"callsign": "NA",';
338 
+							}
339 
+						}
340 
+						if (isset($spotter_item['registration'])) {
341 
+							$output .= '"registration": "'.$spotter_item['registration'].'",';
279 342 
 						}
280 
-						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
281 343 
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
282 344 
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
283 345 
 							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
 
@@ -290,16 +352,23 @@  discard block
 
 block discarded – undo
290 352 
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
291 353 
 						}
292 354 
 						if (!isset($spotter_item['aircraft_shadow']) && !$tracker) {
293 
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
294 
-							else {
355 
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
356 
+								$spotter_item['aircraft_shadow'] = '';
357 
+							} else {
295 358 
 								$aircraft_icao = $spotter_item['aircraft_icao'];
296 
-								if (isset($aircrafts_shadow[$aircraft_icao])) $spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
297 
-								else {
359 
+								if (isset($aircrafts_shadow[$aircraft_icao])) {
360 
+									$spotter_item['aircraft_shadow'] = $aircrafts_shadow[$aircraft_icao];
361 
+								} else {
298 362 
 									$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
299 
-									if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
300 
-									elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') $spotter_item['aircraft_shadow'] = 'PA18.png';
301 
-									elseif ($aircraft_icao == 'PARAGLIDER') $spotter_item['aircraft_shadow'] = 'PARAGLIDER.png';
302 
-									else $spotter_item['aircraft_shadow'] = '';
363 
+									if (count($aircraft_info) > 0) {
364 
+										$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
365 
+									} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
366 
+										$spotter_item['aircraft_shadow'] = 'PA18.png';
367 
+									} elseif ($aircraft_icao == 'PARAGLIDER') {
368 
+										$spotter_item['aircraft_shadow'] = 'PARAGLIDER.png';
369 
+									} else {
370 
+										$spotter_item['aircraft_shadow'] = '';
371 
+									}
303 372 
 									$aircrafts_shadow[$aircraft_icao] = $spotter_item['aircraft_shadow'];
304 373 
 								}
305 374 
 							}
 
@@ -307,73 +376,139 @@  discard block
 
 block discarded – undo
307 376 
 						if (!isset($spotter_item['aircraft_shadow']) || $spotter_item['aircraft_shadow'] == '') {
308 377 
 							if ($tracker) {
309 378 
 								if (isset($spotter_item['type']) && $spotter_item['type'] == 'Ambulance') {
310 
-									if ($compress) $output .= '"as": "ambulance.png",';
311 
-									else $output .= '"aircraft_shadow": "ambulance.png",';
379 
+									if ($compress) {
380 
+										$output .= '"as": "ambulance.png",';
381 
+									} else {
382 
+										$output .= '"aircraft_shadow": "ambulance.png",';
383 
+									}
312 384 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Police') {
313 
-									if ($compress) $output .= '"as": "police.png",';
314 
-									else $output .= '"aircraft_shadow": "police.png",';
385 
+									if ($compress) {
386 
+										$output .= '"as": "police.png",';
387 
+									} else {
388 
+										$output .= '"aircraft_shadow": "police.png",';
389 
+									}
315 390 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Yacht (Sail)') {
316 
-									if ($compress) $output .= '"as": "ship.png",';
317 
-									else $output .= '"aircraft_shadow": "ship.png",';
391 
+									if ($compress) {
392 
+										$output .= '"as": "ship.png",';
393 
+									} else {
394 
+										$output .= '"aircraft_shadow": "ship.png",';
395 
+									}
318 396 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Ship (Power Boat)') {
319 
-									if ($compress) $output .= '"as": "ship.png",';
320 
-									else $output .= '"aircraft_shadow": "ship.png",';
397 
+									if ($compress) {
398 
+										$output .= '"as": "ship.png",';
399 
+									} else {
400 
+										$output .= '"aircraft_shadow": "ship.png",';
401 
+									}
321 402 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Shuttle') {
322 
-									if ($compress) $output .= '"as": "ship.png",';
323 
-									else $output .= '"aircraft_shadow": "ship.png",';
403 
+									if ($compress) {
404 
+										$output .= '"as": "ship.png",';
405 
+									} else {
406 
+										$output .= '"aircraft_shadow": "ship.png",';
407 
+									}
324 408 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck') {
325 
-									if ($compress) $output .= '"as": "truck.png",';
326 
-									else $output .= '"aircraft_shadow": "truck.png",';
409 
+									if ($compress) {
410 
+										$output .= '"as": "truck.png",';
411 
+									} else {
412 
+										$output .= '"aircraft_shadow": "truck.png",';
413 
+									}
327 414 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Truck (18 Wheeler)') {
328 
-									if ($compress) $output .= '"as": "truck.png",';
329 
-									else $output .= '"aircraft_shadow": "truck.png",';
415 
+									if ($compress) {
416 
+										$output .= '"as": "truck.png",';
417 
+									} else {
418 
+										$output .= '"aircraft_shadow": "truck.png",';
419 
+									}
330 420 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Aircraft (small)') {
331 
-									if ($compress) $output .= '"as": "aircraft.png",';
332 
-									else $output .= '"aircraft_shadow": "aircraft.png",';
421 
+									if ($compress) {
422 
+										$output .= '"as": "aircraft.png",';
423 
+									} else {
424 
+										$output .= '"aircraft_shadow": "aircraft.png",';
425 
+									}
333 426 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Large Aircraft') {
334 
-									if ($compress) $output .= '"as": "aircraft.png",';
335 
-									else $output .= '"aircraft_shadow": "aircraft.png",';
427 
+									if ($compress) {
428 
+										$output .= '"as": "aircraft.png",';
429 
+									} else {
430 
+										$output .= '"aircraft_shadow": "aircraft.png",';
431 
+									}
336 432 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Helicopter') {
337 
-									if ($compress) $output .= '"as": "helico.png",';
338 
-									else $output .= '"aircraft_shadow": "helico.png",';
433 
+									if ($compress) {
434 
+										$output .= '"as": "helico.png",';
435 
+									} else {
436 
+										$output .= '"aircraft_shadow": "helico.png",';
437 
+									}
339 438 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Railroad Engine') {
340 
-									if ($compress) $output .= '"as": "rail.png",';
341 
-									else $output .= '"aircraft_shadow": "rail.png",';
439 
+									if ($compress) {
440 
+										$output .= '"as": "rail.png",';
441 
+									} else {
442 
+										$output .= '"aircraft_shadow": "rail.png",';
443 
+									}
342 444 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Firetruck') {
343 
-									if ($compress) $output .= '"as": "firetruck.png",';
344 
-									else $output .= '"aircraft_shadow": "firetruck.png",';
445 
+									if ($compress) {
446 
+										$output .= '"as": "firetruck.png",';
447 
+									} else {
448 
+										$output .= '"aircraft_shadow": "firetruck.png",';
449 
+									}
345 450 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bus') {
346 
-									if ($compress) $output .= '"as": "bus.png",';
347 
-									else $output .= '"aircraft_shadow": "bus.png",';
451 
+									if ($compress) {
452 
+										$output .= '"as": "bus.png",';
453 
+									} else {
454 
+										$output .= '"aircraft_shadow": "bus.png",';
455 
+									}
348 456 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Phone') {
349 
-									if ($compress) $output .= '"as": "phone.png",';
350 
-									else $output .= '"aircraft_shadow": "phone.png",';
457 
+									if ($compress) {
458 
+										$output .= '"as": "phone.png",';
459 
+									} else {
460 
+										$output .= '"aircraft_shadow": "phone.png",';
461 
+									}
351 462 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Jogger') {
352 
-									if ($compress) $output .= '"as": "jogger.png",';
353 
-									else $output .= '"aircraft_shadow": "jogger.png",';
463 
+									if ($compress) {
464 
+										$output .= '"as": "jogger.png",';
465 
+									} else {
466 
+										$output .= '"aircraft_shadow": "jogger.png",';
467 
+									}
354 468 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Bike') {
355 
-									if ($compress) $output .= '"as": "bike.png",';
356 
-									else $output .= '"aircraft_shadow": "bike.png",';
469 
+									if ($compress) {
470 
+										$output .= '"as": "bike.png",';
471 
+									} else {
472 
+										$output .= '"aircraft_shadow": "bike.png",';
473 
+									}
357 474 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Motorcycle') {
358 
-									if ($compress) $output .= '"as": "motorcycle.png",';
359 
-									else $output .= '"aircraft_shadow": "motorcycle.png",';
475 
+									if ($compress) {
476 
+										$output .= '"as": "motorcycle.png",';
477 
+									} else {
478 
+										$output .= '"aircraft_shadow": "motorcycle.png",';
479 
+									}
360 480 
 								} elseif (isset($spotter_item['type']) && $spotter_item['type'] == 'Balloon') {
361 
-									if ($compress) $output .= '"as": "balloon.png",';
362 
-									else $output .= '"aircraft_shadow": "balloon.png",';
481 
+									if ($compress) {
482 
+										$output .= '"as": "balloon.png",';
483 
+									} else {
484 
+										$output .= '"aircraft_shadow": "balloon.png",';
485 
+									}
363 486 
 								} else {
364 
-									if ($compress) $output .= '"as": "car.png",';
365 
-									else $output .= '"aircraft_shadow": "car.png",';
487 
+									if ($compress) {
488 
+										$output .= '"as": "car.png",';
489 
+									} else {
490 
+										$output .= '"aircraft_shadow": "car.png",';
491 
+									}
366 492 
 								}
367 493 
 							} elseif ($marine) {
368 
-								if ($compress) $output .= '"as": "ship.png",';
369 
-								else $output .= '"aircraft_shadow": "ship.png",';
494 
+								if ($compress) {
495 
+									$output .= '"as": "ship.png",';
496 
+								} else {
497 
+									$output .= '"aircraft_shadow": "ship.png",';
498 
+								}
370 499 
 							} else {
371 
-								if ($compress) $output .= '"as": "default.png",';
372 
-								else $output .= '"aircraft_shadow": "default.png",';
500 
+								if ($compress) {
501 
+									$output .= '"as": "default.png",';
502 
+								} else {
503 
+									$output .= '"aircraft_shadow": "default.png",';
504 
+								}
373 505 
 							}
374 506 
 						} else {
375 
-							if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
376 
-							else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
507 
+							if ($compress) {
508 
+								$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
509 
+							} else {
510 
+								$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
511 
+							}
377 512 
 						}
378 513 
 						if (isset($spotter_item['airline_name'])) {
379 514 
 							$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
 
@@ -381,8 +516,11 @@  discard block
 
 block discarded – undo
381 516 
 							$output .= '"airline_name": "NA",';
382 517 
 						}
383 518 
 						if (isset($spotter_item['departure_airport'])) {
384 
-							if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
385 
-							else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
519 
+							if ($compress) {
520 
+								$output .= '"dac": "'.$spotter_item['departure_airport'].'",';
521 
+							} else {
522 
+								$output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
523 
+							}
386 524 
 						}
387 525 
 						if (isset($spotter_item['departure_airport_city'])) {
388 526 
 							$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
 
@@ -394,8 +532,11 @@  discard block
 
 block discarded – undo
394 532 
 							$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
395 533 
 						}
396 534 
 						if (isset($spotter_item['arrival_airport'])) {
397 
-							if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
398 
-							else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
535 
+							if ($compress) {
536 
+								$output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
537 
+							} else {
538 
+								$output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
539 
+							}
399 540 
 						}
400 541 
 						if (isset($spotter_item['arrival_airport_city'])) {
401 542 
 							$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
 
@@ -414,8 +555,11 @@  discard block
 
 block discarded – undo
414 555 
 						}
415 556
416 557 
 						if (isset($spotter_item['altitude'])) {
417 
-							if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
418 
-							else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
558 
+							if ($compress) {
559 
+								$output .= '"a": "'.$spotter_item['altitude'].'",';
560 
+							} else {
561 
+								$output .= '"altitude": "'.$spotter_item['altitude'].'",';
562 
+							}
419 563 
 						}
420 564
421 565 
 						$heading = $spotter_item['heading'];
 
@@ -439,19 +583,24 @@  discard block
 
 block discarded – undo
439 583 
 							}
440 584 
 						}
441 585
442 
-						if ($compress)$output .= '"h": "'.$heading.'",';
443 
-						else $output .= '"heading": "'.$heading.'",';
586 
+						if ($compress) {
587 
+							$output .= '"h": "'.$heading.'",';
588 
+						} else {
589 
+							$output .= '"heading": "'.$heading.'",';
590 
+						}
444 591 
 						if ($currenttime != '') {
445 592 
 							if (strtotime($spotter_item['date']) < $currenttime) {
446 593 
 								if (isset($archivespeed)) {
447 594 
 									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
448 595 
 									$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
449 
-									if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
450 
-									else {
596 
+									if (!isset($idistance) || $fdistance < $idistance) {
597 
+										$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
598 
+									} else {
451 599 
 										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,$archivespeed,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
452 600 
 										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
453 
-										if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
454 
-										else {
601 
+										if (!isset($idistance) || $fdistance < $idistance) {
602 
+											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
603 
+										} else {
455 604 
 											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed);
456 605 
 											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
457 606 
 										}
 
@@ -459,12 +608,14 @@  discard block
 
 block discarded – undo
459 608 
 								} elseif ($usenextlatlon) {
460 609 
 									$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,1,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
461 610 
 									$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
462 
-									if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
463 
-									else {
611 
+									if (!isset($idistance) || $fdistance < $idistance) {
612 
+										$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
613 
+									} else {
464 614 
 										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,1,($currenttime-strtotime($spotter_item['date'])+$globalMapRefresh));
465 615 
 										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
466 
-										if (!isset($idistance) || $fdistance < $idistance) $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
467 
-										else {
616 
+										if (!isset($idistance) || $fdistance < $idistance) {
617 
+											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
618 
+										} else {
468 619 
 											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading);
469 620 
 											$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
470 621 
 										}
 
@@ -503,7 +654,9 @@  discard block
 
 block discarded – undo
503 654 
 							}
504 655 
 						}
505 656
506 
-						if (!$min) $output .= '"image": "'.$image.'",';
657 
+						if (!$min) {
658 
+							$output .= '"image": "'.$image.'",';
659 
+						}
507 660 
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
508 661 
 							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
509 662 
 						}
 
@@ -511,8 +664,11 @@  discard block
 
 block discarded – undo
511 664 
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
512 665 
 						}
513 666 
 						if (isset($spotter_item['squawk'])) {
514 
-							if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
515 
-							else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
667 
+							if ($compress) {
668 
+								$output .= '"sq": "'.$spotter_item['squawk'].'",';
669 
+							} else {
670 
+								$output .= '"squawk": "'.$spotter_item['squawk'].'",';
671 
+							}
516 672 
 						}
517 673 
 						if (isset($spotter_item['squawk_usage'])) {
518 674 
 							$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
 
@@ -531,14 +687,23 @@  discard block
 
 block discarded – undo
531 687 
 						}
532 688 
 						// type when not aircraft ?
533 689 
 						if (isset($spotter_item['type'])) {
534 
-							if ($compress) $output .= '"t": "'.$spotter_item['type'].'"';
535 
-							else $output .= '"type": "'.$spotter_item['type'].'"';
690 
+							if ($compress) {
691 
+								$output .= '"t": "'.$spotter_item['type'].'"';
692 
+							} else {
693 
+								$output .= '"type": "'.$spotter_item['type'].'"';
694 
+							}
536 695 
 						} elseif ($marine) {
537 
-							if ($compress) $output .= '"t": "ship"';
538 
-							else $output .= '"type": "ship"';
696 
+							if ($compress) {
697 
+								$output .= '"t": "ship"';
698 
+							} else {
699 
+								$output .= '"type": "ship"';
700 
+							}
539 701 
 						} else {
540 
-							if ($compress) $output .= '"t": "aircraft"';
541 
-							else $output .= '"type": "aircraft"';
702 
+							if ($compress) {
703 
+								$output .= '"t": "aircraft"';
704 
+							} else {
705 
+								$output .= '"type": "aircraft"';
706 
+							}
542 707 
 						}
543 708 
 						$output .= '},';
544 709 
 						$output .= '"geometry": {';
 
@@ -546,15 +711,19 @@  discard block
 
 block discarded – undo
546 711 
 								$output .= '"coordinates": [';
547 712 
 								if ($currenttime != '') {
548 713 
 									if (strtotime($spotter_item['date']) < $currenttime) {
549 
-										if (!isset($archivespeed)) $archivespeed = 1;
714 
+										if (!isset($archivespeed)) {
715 
+											$archivespeed = 1;
716 
+										}
550 717 
 										$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$heading,$archivespeed,($currenttime-strtotime($spotter_item['date'])));
551 718 
 										$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
552 
-										if (!isset($idistance) || $fdistance < $idistance) $output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
553 
-										else {
719 
+										if (!isset($idistance) || $fdistance < $idistance) {
720 
+											$output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
721 
+										} else {
554 722 
 											$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$cheading,$archivespeed,($currenttime-strtotime($spotter_item['date'])));
555 723 
 											$fdistance = $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$nextcoord['latitude'],$nextcoord['longitude']);
556 
-											if (!isset($idistance) || $fdistance < $idistance) $output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
557 
-											else {
724 
+											if (!isset($idistance) || $fdistance < $idistance) {
725 
+												$output .= $nextcoord['longitude'].','.$nextcoord['latitude'];
726 
+											} else {
558 727 
 												$output .= $spotter_item['longitude'].', ';
559 728 
 												$output .= $spotter_item['latitude'];
560 729 
 											}
 
@@ -632,7 +801,9 @@  discard block
 
 block discarded – undo
632 801 
 			}
633 802 
 */
634 803 
 				$history = filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING);
635 
-				if ($history == '' && isset($_COOKIE['history'])) $history = $_COOKIE['history'];
804 
+				if ($history == '' && isset($_COOKIE['history'])) {
805 
+					$history = $_COOKIE['history'];
806 
+				}
636 807
637 808 
 				if (
638 809 
 				    (isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') 
@@ -702,8 +873,11 @@  discard block
 
 block discarded – undo
702 873 
 									$output_history .= ']}},';
703 874 
 									$output .= $output_history;
704 875 
 								}
705 
-								if ($compress) $output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
706 
-								else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
876 
+								if ($compress) {
877 
+									$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "history","a": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
878 
+								} else {
879 
+									$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history","altitude": "'.$alt.'"},"geometry": {"type": "LineString","coordinates": [';
880 
+								}
707 881 
 							}
708 882 
 							$output_history .= '[';
709 883 
 							$output_history .=  $spotter_history['longitude'].', ';
 
@@ -724,10 +898,15 @@  discard block
 
 block discarded – undo
724 898 
 							if ($d == false) {
725 899 
 								if ($compress) {
726 900 
 									$output_history = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'",';
727 
-									if (isset($spotter_history_array[0]['mapmatching_engine']) && $spotter_history_array[0]['mapmatching_engine'] == 'graphhopper') $output_history .= '"atr": "Powered by <a href=\"https://www.graphhopper.com/\">GraphHopper API</a>", Map matching engine use data from © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",';
728 
-									elseif (isset($spotter_history_array[0]['mapmatching_engine'])) $output_history .= '"atr": "Map matching engine use data from © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",';
901 
+									if (isset($spotter_history_array[0]['mapmatching_engine']) && $spotter_history_array[0]['mapmatching_engine'] == 'graphhopper') {
902 
+										$output_history .= '"atr": "Powered by <a href=\"https://www.graphhopper.com/\">GraphHopper API</a>", Map matching engine use data from © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",';
903 
+									} elseif (isset($spotter_history_array[0]['mapmatching_engine'])) {
904 
+										$output_history .= '"atr": "Map matching engine use data from © <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a>",';
905 
+									}
729 906 
 									$output_history .= '"t": "history"},"geometry": {"type": "LineString","coordinates": [';
730 
-								} else $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
907 
+								} else {
908 
+									$output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "history"},"geometry": {"type": "LineString","coordinates": [';
909 
+								}
731 910 
 								$d = true;
732 911 
 							}
733 912 
 							$output_history .= '[';
 
@@ -750,7 +929,9 @@  discard block
 
 block discarded – undo
750 929 
 							$output_historyd = '[';
751 930 
 							$output_historyd .=  $spotter_item['longitude'].', ';
752 931 
 							$output_historyd .=  $spotter_item['latitude'];
753 
-							if (isset($spotter_history['altitude'])) $output_historyd .=  ','.$spotter_item['altitude']*30.48;
932 
+							if (isset($spotter_history['altitude'])) {
933 
+								$output_historyd .=  ','.$spotter_item['altitude']*30.48;
934 
+							}
754 935 
 							$output_historyd .= '],';
755 936 
 							//$output_history = $output_historyd.$output_history;
756 937 
 							$output_history = $output_history.$output_historyd;
 
@@ -777,8 +958,11 @@  discard block
 
 block discarded – undo
777 958 
 				        && $spotter_item['arrival_airport'] != 'NA'
778 959 
 				        && ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == "true")
779 960 
 				    	    || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)))) {
780 
-				    if ($compress) $output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
781 
-				    else $output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
961 
+				    if ($compress) {
962 
+				    	$output_air = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "route"},"geometry": {"type": "LineString","coordinates": [';
963 
+				    } else {
964 
+				    	$output_air = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "route"},"geometry": {"type": "LineString","coordinates": [';
965 
+				    }
782 966 
 				    if (isset($spotter_item['departure_airport_latitude'])) {
783 967 
 					$output_air .= '['.$spotter_item['departure_airport_longitude'].','.$spotter_item['departure_airport_latitude'].'],';
784 968 
 				    } elseif (isset($spotter_item['departure_airport']) && $spotter_item['departure_airport'] != 'NA') {
 
@@ -811,8 +995,11 @@  discard block
 
 block discarded – undo
811 995 
 				    	    || (!isset($_COOKIE['MapRemainingRoute']) && (!isset($globalMapRemainingRoute)
812 996 
 				    	    || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)))))) {
813 997 
 				    $havedata = false;
814 
-				    if ($compress) $output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
815 
-				    else $output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
998 
+				    if ($compress) {
999 
+				    	$output_dest = '{"type": "Feature","properties": {"c": "'.$spotter_item['ident'].'","t": "routedest"},"geometry": {"type": "LineString","coordinates": [';
1000 
+				    } else {
1001 
+				    	$output_dest = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['ident'].'","type": "routedest"},"geometry": {"type": "LineString","coordinates": [';
1002 
+				    }
816 1003
817 1004 
 				    //$output_dest .= '['.$spotter_item['longitude'].','.$spotter_item['latitude'].'],';
818 1005 
 				    if (isset($spotter_item['arrival_airport_latitude'])) {
 
@@ -837,7 +1024,9 @@  discard block
 
 block discarded – undo
837 1024 
 					$output_dest  = substr($output_dest, 0, -1);
838 1025 
 				    }
839 1026 
 				    $output_dest .= ']}},';
840 
-				    if ($havedata) $output .= $output_dest;
1027 
+				    if ($havedata) {
1028 
+				    	$output .= $output_dest;
1029 
+				    }
841 1030 
 				    unset($output_dest);
842 1031 
 				}
843 1032 
 			}
 
@@ -845,7 +1034,9 @@  discard block
 
 block discarded – undo
845 1034 
 			$output .= ']';
846 1035 
 			$output .= ',"initial_sqltime": "'.$sqltime.'",';
847 1036 
 			$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
848 
-			if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
1037 
+			if (isset($begindate)) {
1038 
+				$output .= '"archive_date": "'.$begindate.'",';
1039 
+			}
849 1040 
 			$output .= '"fc": "'.$j.'"';
850 1041 
 		} else {
851 1042 
 			$output .= '"features": ';
Please login to merge, or discard this patch.
archive-geojson.php 1 patch
Braces   +123 added lines, -47 removed lines patch added patch discarded remove patch 
@@ -15,21 +15,40 @@  discard block
 
 block discarded – undo
15 15 
 }
16 16 
 header('Content-Type: text/javascript');
17 17
18 
-if (!isset($globalJsonCompress)) $compress = true;
19 
-else $compress = $globalJsonCompress;
18 
+if (!isset($globalJsonCompress)) {
19 
+	$compress = true;
20 
+} else {
21 
+	$compress = $globalJsonCompress;
22 
+}
20 23
21 24 
 $from_archive = false;
22 25 
 $min = false;
23 26 
 $allhistory = false;
24 27 
 $filter['source'] = array();
25 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
26 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
27 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
28 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs'));
29 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
30 
-if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']);
31 
-if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
32 
-if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype'];
28 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') {
29 
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
30 
+}
31 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') {
32 
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
33 
+}
34 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') {
35 
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
36 
+}
37 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') {
38 
+	$filter['source'] = array_merge($filter['source'],array('sbs'));
39 
+}
40 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') {
41 
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
42 
+}
43 
+if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') {
44 
+	$filter['airlines'] = explode(',',$_COOKIE['Airlines']);
45 
+}
46 
+if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') {
47 
+	$filter['source_aprs'] = explode(',',$_COOKIE['Sources']);
48 
+}
49 
+if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') {
50 
+	$filter['airlinestype'] = $_COOKIE['airlinestype'];
51 
+}
33 52
34 53 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
35 54 
 	$min = true;
 
@@ -61,8 +80,12 @@  discard block
 
 block discarded – undo
61 80 
 if (!empty($spotter_array)) {
62 81 
 	//$flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter);
63 82 
 	$flightcnt = 0;
64 
-	if ($flightcnt == '') $flightcnt = 0;
65 
-} else $flightcnt = 0;
83 
+	if ($flightcnt == '') {
84 
+		$flightcnt = 0;
85 
+	}
86 
+	} else {
87 
+	$flightcnt = 0;
88 
+}
66 89
67 90 
 $sqltime = round(microtime(true)-$begintime,2);
68 91 
 
@@ -71,8 +94,11 @@  discard block
 
 block discarded – undo
71 94
72 95 
 $output = '{';
73 96 
 	$output .= '"type": "FeatureCollection",';
74 
-		if ($min) $output .= '"minimal": "true",';
75 
-		else $output .= '"minimal": "false",';
97 
+		if ($min) {
98 
+			$output .= '"minimal": "true",';
99 
+		} else {
100 
+			$output .= '"minimal": "false",';
101 
+		}
76 102 
 		$output .= '"fc": "'.$flightcnt.'",';
77 103 
 		$output .= '"sqt": "'.$sqltime.'",';
78 104 
 
@@ -98,11 +124,16 @@  discard block
 
 block discarded – undo
98 124 
 						//$output .= '"fc": "'.$flightcnt.'",';
99 125 
 						//$output .= '"sqt": "'.$sqltime.'",';
100 126 
 						$output .= '"properties": {';
101 
-							if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
102 
-							else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
127 
+							if ($compress) {
128 
+								$output .= '"fi": "'.$spotter_item['flightaware_id'].'",';
129 
+							} else {
130 
+								$output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",';
131 
+							}
103 132 
 							$output .= '"fc": "'.$flightcnt.'",';
104 133 
 							$output .= '"sqt": "'.$sqltime.'",';
105 
-							if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
134 
+							if (isset($begindate)) {
135 
+								$output .= '"archive_date": "'.$begindate.'",';
136 
+							}
106 137
107 138 
 /*
108 139 
 							if ($min) $output .= '"minimal": "true",';
 
@@ -110,13 +141,21 @@  discard block
 
 block discarded – undo
110 141 
 */
111 142 
 							//$output .= '"fc": "'.$spotter_item['nb'].'",';
112 143 
 						if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') {
113 
-							if ($compress) $output .= '"c": "'.$spotter_item['ident'].'",';
114 
-							else $output .= '"callsign": "'.$spotter_item['ident'].'",';
144 
+							if ($compress) {
145 
+								$output .= '"c": "'.$spotter_item['ident'].'",';
146 
+							} else {
147 
+								$output .= '"callsign": "'.$spotter_item['ident'].'",';
148 
+							}
115 149 
 						} else {
116 
-							if ($compress) $output .= '"c": "NA",';
117 
-							else $output .= '"callsign": "NA",';
150 
+							if ($compress) {
151 
+								$output .= '"c": "NA",';
152 
+							} else {
153 
+								$output .= '"callsign": "NA",';
154 
+							}
155 
+						}
156 
+						if (isset($spotter_item['registration'])) {
157 
+							$output .= '"registration": "'.$spotter_item['registration'].'",';
118 158 
 						}
119 
-						if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",';
120 159 
 						if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) {
121 160 
 							$output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",';
122 161 
 							$output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",';
 
@@ -129,19 +168,29 @@  discard block
 
 block discarded – undo
129 168 
 							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
130 169 
 						}
131 170 
 						if (!isset($spotter_item['aircraft_shadow'])) {
132 
-							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = '';
133 
-							else {
171 
+							if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') {
172 
+								$spotter_item['aircraft_shadow'] = '';
173 
+							} else {
134 174 
 								$aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']);
135 
-								if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
136 
-								else $spotter_item['aircraft_shadow'] = '';
175 
+								if (count($aircraft_info) > 0) {
176 
+									$spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow'];
177 
+								} else {
178 
+									$spotter_item['aircraft_shadow'] = '';
179 
+								}
137 180 
 							}
138 181 
 						}
139 182 
 						if ($spotter_item['aircraft_shadow'] == '') {
140 
-							if ($compress) $output .= '"as": "default.png",';
141 
-							else $output .= '"aircraft_shadow": "default.png",';
183 
+							if ($compress) {
184 
+								$output .= '"as": "default.png",';
185 
+							} else {
186 
+								$output .= '"aircraft_shadow": "default.png",';
187 
+							}
142 188 
 						} else {
143 
-							if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
144 
-							else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
189 
+							if ($compress) {
190 
+								$output .= '"as": "'.$spotter_item['aircraft_shadow'].'",';
191 
+							} else {
192 
+								$output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
193 
+							}
145 194 
 						}
146 195 
 						if (isset($spotter_item['airline_name'])) {
147 196 
 							$output .= '"airline_name": "'.$spotter_item['airline_name'].'",';
 
@@ -149,8 +198,11 @@  discard block
 
 block discarded – undo
149 198 
 							$output .= '"airline_name": "NA",';
150 199 
 						}
151 200 
 						if (isset($spotter_item['departure_airport'])) {
152 
-							if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",';
153 
-							else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
201 
+							if ($compress) {
202 
+								$output .= '"dac": "'.$spotter_item['departure_airport'].'",';
203 
+							} else {
204 
+								$output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",';
205 
+							}
154 206 
 						}
155 207 
 						if (isset($spotter_item['departure_airport_city'])) {
156 208 
 							$output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",';
 
@@ -162,8 +214,11 @@  discard block
 
 block discarded – undo
162 214 
 							$output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",';
163 215 
 						}
164 216 
 						if (isset($spotter_item['arrival_airport'])) {
165 
-							if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
166 
-							else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
217 
+							if ($compress) {
218 
+								$output .= '"aac": "'.$spotter_item['arrival_airport'].'",';
219 
+							} else {
220 
+								$output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",';
221 
+							}
167 222 
 						}
168 223 
 						if (isset($spotter_item['arrival_airport_city'])) {
169 224 
 							$output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",';
 
@@ -181,18 +236,29 @@  discard block
 
 block discarded – undo
181 236 
 							$output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",';
182 237 
 						}
183 238
184 
-						if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",';
185 
-						else $output .= '"altitude": "'.$spotter_item['altitude'].'",';
186 
-						if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",';
187 
-						else $output .= '"heading": "'.$spotter_item['heading'].'",';
239 
+						if ($compress) {
240 
+							$output .= '"a": "'.$spotter_item['altitude'].'",';
241 
+						} else {
242 
+							$output .= '"altitude": "'.$spotter_item['altitude'].'",';
243 
+						}
244 
+						if ($compress) {
245 
+							$output .= '"h": "'.$spotter_item['heading'].'",';
246 
+						} else {
247 
+							$output .= '"heading": "'.$spotter_item['heading'].'",';
248 
+						}
188 249
189 
-						if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
190 
-						else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
250 
+						if (isset($archivespeed)) {
251 
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed);
252 
+						} else {
253 
+							$nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']);
254 
+						}
191 255 
 						//$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",';
192 256 
 						//$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",';
193 257 
 						$output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],';
194 258
195 
-						if (!$min) $output .= '"image": "'.$image.'",';
259 
+						if (!$min) {
260 
+							$output .= '"image": "'.$image.'",';
261 
+						}
196 262 
 						if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') {
197 263 
 							$output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",';
198 264 
 						}
 
@@ -200,8 +266,11 @@  discard block
 
 block discarded – undo
200 266 
 							$output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",';
201 267 
 						}
202 268 
 						if (isset($spotter_item['squawk'])) {
203 
-							if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",';
204 
-							else $output .= '"squawk": "'.$spotter_item['squawk'].'",';
269 
+							if ($compress) {
270 
+								$output .= '"sq": "'.$spotter_item['squawk'].'",';
271 
+							} else {
272 
+								$output .= '"squawk": "'.$spotter_item['squawk'].'",';
273 
+							}
205 274 
 						}
206 275 
 						if (isset($spotter_item['squawk_usage'])) {
207 276 
 							$output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",';
 
@@ -228,7 +297,9 @@  discard block
 
 block discarded – undo
228 297 
 				{
229 298 
 					$output_history .= '['.$spotter_history['longitude'].', '.$spotter_history['latitude'].'],';
230 299 
 					$output_time .= (strtotime($spotter_history['date'])*1000).',';
231 
-					if ($previousts != 0) $output_timediff .= (strtotime($spotter_history['date'])-$previousts).',';
300 
+					if ($previousts != 0) {
301 
+						$output_timediff .= (strtotime($spotter_history['date'])-$previousts).',';
302 
+					}
232 303 
 					$previousts = strtotime($spotter_history['date']);
233 304 
 				}
234 305 
 				if (isset($output_time)) {
 
@@ -240,8 +311,11 @@  discard block
 
 block discarded – undo
240 311 
 				    $output .= '"timediff": ['.$output_timediff.'],';
241 312 
 				}
242 313 
 							// FIXME : type when not aircraft ?
243 
-						if ($compress) $output .= '"t": "aircraft"';
244 
-						else $output .= '"type": "aircraft"';
314 
+						if ($compress) {
315 
+							$output .= '"t": "aircraft"';
316 
+						} else {
317 
+							$output .= '"type": "aircraft"';
318 
+						}
245 319 
 						$output .= '},';
246 320 
 						$output .= '"geometry": {';
247 321 
 						$output .= '"type": "MultiPoint",';
 
@@ -260,7 +334,9 @@  discard block
 
 block discarded – undo
260 334 
 		$output .= ']';
261 335 
 		$output .= ',"initial_sqltime": "'.$sqltime.'",';
262 336 
 		$output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",';
263 
-		if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",';
337 
+		if (isset($begindate)) {
338 
+			$output .= '"archive_date": "'.$begindate.'",';
339 
+		}
264 340 
 		$output .= '"fc": "'.$flightcnt.'"';
265 341 
 	} else {
266 342 
 		$output .= '"features": ';
Please login to merge, or discard this patch.