@@ -329,15 +329,15 @@ discard block |
||
329 | 329 | } |
330 | 330 | |
331 | 331 | <?php |
332 | - if (isset($globalMapUseBbox) && $globalMapUseBbox) { |
|
332 | + if (isset($globalMapUseBbox) && $globalMapUseBbox) { |
|
333 | 333 | ?> |
334 | 334 | var loc_geojson = Cesium.loadJson("<?php print $globalURL; ?>/location-geojson.php?coord="+bbox()); |
335 | 335 | <?php |
336 | - } else { |
|
336 | + } else { |
|
337 | 337 | ?> |
338 | 338 | var loc_geojson = Cesium.loadJson("<?php print $globalURL; ?>/location-geojson.php"); |
339 | 339 | <?php |
340 | - } |
|
340 | + } |
|
341 | 341 | ?> |
342 | 342 | loc_geojson.then(function(geojsondata) { |
343 | 343 | loc = new Cesium.CustomDataSource('location'); |
@@ -560,11 +560,11 @@ discard block |
||
560 | 560 | } |
561 | 561 | |
562 | 562 | <?php |
563 | - if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) { |
|
563 | + if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) { |
|
564 | 564 | ?> |
565 | 565 | update_tsk(); |
566 | 566 | <?php |
567 | - } |
|
567 | + } |
|
568 | 568 | ?> |
569 | 569 | |
570 | 570 | update_locationsLayer(); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | <?php }; if (isset($globalSatellite) && $globalSatellite) { ?><td><div id="ibxsatellite"><h4><?php echo _("Satellites Displayed"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?> |
48 | 48 | </tr></table></div> |
49 | 49 | <?php |
50 | - if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
50 | + if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
51 | 51 | ?> |
52 | 52 | <script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script> |
53 | 53 | <?php |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script> |
72 | 72 | <?php |
73 | 73 | } |
74 | - } |
|
74 | + } |
|
75 | 75 | ?> |
76 | 76 | |
77 | 77 | <div id="sidebar" class="sidebar collapsed"> |
@@ -82,34 +82,34 @@ discard block |
||
82 | 82 | <li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li> |
83 | 83 | <li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li> |
84 | 84 | <?php |
85 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
85 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
86 | 86 | if (isset($globalArchive) && $globalArchive == TRUE) { |
87 | 87 | ?> |
88 | 88 | <li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li> |
89 | 89 | <?php |
90 | 90 | } |
91 | - } |
|
91 | + } |
|
92 | 92 | ?> |
93 | 93 | <li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li> |
94 | 94 | <li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li> |
95 | 95 | <li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li> |
96 | 96 | <?php |
97 | - if (isset($globalMap3D) && $globalMap3D) { |
|
97 | + if (isset($globalMap3D) && $globalMap3D) { |
|
98 | 98 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
99 | 99 | ?> |
100 | 100 | <li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li> |
101 | 101 | <?php |
102 | - if (isset($globalSatellite) && $globalSatellite) { |
|
102 | + if (isset($globalSatellite) && $globalSatellite) { |
|
103 | 103 | ?> |
104 | 104 | <li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li> |
105 | 105 | <?php |
106 | - } |
|
106 | + } |
|
107 | 107 | } else { |
108 | 108 | ?> |
109 | 109 | <li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li> |
110 | 110 | <?php |
111 | 111 | } |
112 | - } |
|
112 | + } |
|
113 | 113 | ?> |
114 | 114 | </ul> |
115 | 115 | |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | ?> |
185 | 185 | </div> |
186 | 186 | <?php |
187 | - if (isset($globalArchive) && $globalArchive == TRUE) { |
|
187 | + if (isset($globalArchive) && $globalArchive == TRUE) { |
|
188 | 188 | ?> |
189 | 189 | <div class="sidebar-pane" id="archive"> |
190 | 190 | <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | </form> |
244 | 244 | </div> |
245 | 245 | <?php |
246 | - } |
|
246 | + } |
|
247 | 247 | ?> |
248 | 248 | <div class="sidebar-pane" id="settings"> |
249 | 249 | <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -254,56 +254,56 @@ discard block |
||
254 | 254 | <?php |
255 | 255 | if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
256 | 256 | else $MapType = $_COOKIE['MapType']; |
257 | - ?> |
|
257 | + ?> |
|
258 | 258 | <?php |
259 | 259 | if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
260 | - ?> |
|
260 | + ?> |
|
261 | 261 | <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
262 | 262 | <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
263 | 263 | <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
264 | 264 | <?php |
265 | 265 | } |
266 | - ?> |
|
266 | + ?> |
|
267 | 267 | <?php |
268 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
269 | - ?> |
|
268 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
269 | + ?> |
|
270 | 270 | <?php |
271 | - if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
272 | - ?> |
|
271 | + if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
272 | + ?> |
|
273 | 273 | <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
274 | 274 | <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
275 | 275 | <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
276 | 276 | <?php |
277 | - } |
|
278 | - ?> |
|
277 | + } |
|
278 | + ?> |
|
279 | 279 | <?php |
280 | - if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
281 | - ?> |
|
280 | + if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
281 | + ?> |
|
282 | 282 | <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
283 | 283 | <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
284 | 284 | <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
285 | 285 | <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
286 | 286 | <?php |
287 | - } |
|
288 | - ?> |
|
287 | + } |
|
288 | + ?> |
|
289 | 289 | <?php |
290 | - if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
291 | - ?> |
|
290 | + if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
291 | + ?> |
|
292 | 292 | <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
293 | 293 | <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
294 | 294 | <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
295 | 295 | <?php |
296 | - } |
|
297 | - ?> |
|
296 | + } |
|
297 | + ?> |
|
298 | 298 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
299 | 299 | <?php |
300 | 300 | } |
301 | - ?> |
|
301 | + ?> |
|
302 | 302 | <?php |
303 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
303 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
304 | 304 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
305 | 305 | else $MapBoxId = $_COOKIE['MapTypeId']; |
306 | - ?> |
|
306 | + ?> |
|
307 | 307 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
308 | 308 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
309 | 309 | <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
@@ -317,13 +317,13 @@ discard block |
||
317 | 317 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
318 | 318 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
319 | 319 | <?php |
320 | - } |
|
321 | - ?> |
|
320 | + } |
|
321 | + ?> |
|
322 | 322 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
323 | 323 | </select> |
324 | 324 | </li> |
325 | 325 | <?php |
326 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
326 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
327 | 327 | ?> |
328 | 328 | <li><?php echo _("Type of Terrain:"); ?> |
329 | 329 | <select class="selectpicker" onchange="terrainType(this);"> |
@@ -334,10 +334,10 @@ discard block |
||
334 | 334 | </select> |
335 | 335 | </li> |
336 | 336 | <?php |
337 | - } |
|
337 | + } |
|
338 | 338 | ?> |
339 | 339 | <?php |
340 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
340 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
341 | 341 | ?> |
342 | 342 | <?php |
343 | 343 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Satellites animate between updates"); ?></label></div></li> |
355 | 355 | <?php |
356 | 356 | } |
357 | - } |
|
357 | + } |
|
358 | 358 | ?> |
359 | 359 | <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li> |
360 | 360 | <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
@@ -366,81 +366,81 @@ discard block |
||
366 | 366 | <li><div class="checkbox"><label><input type="checkbox" name="displayfires" value="1" onclick="clickDisplayFires(this)" <?php if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) print 'checked'; ?> ><?php echo _("Display fires on map"); ?></label></div></li> |
367 | 367 | <?php |
368 | 368 | } |
369 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
369 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
370 | 370 | ?> |
371 | 371 | <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li> |
372 | 372 | <?php |
373 | - } |
|
374 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
373 | + } |
|
374 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
375 | 375 | ?> |
376 | 376 | <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li> |
377 | 377 | <?php |
378 | - } |
|
378 | + } |
|
379 | 379 | ?> |
380 | 380 | <?php |
381 | 381 | if (function_exists('array_column')) { |
382 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
383 | - ?> |
|
382 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
383 | + ?> |
|
384 | 384 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
385 | 385 | <?php |
386 | - } |
|
386 | + } |
|
387 | 387 | } elseif (isset($globalSources)) { |
388 | - $dispolar = false; |
|
389 | - foreach ($globalSources as $testsource) { |
|
390 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
391 | - } |
|
392 | - if ($dispolar) { |
|
393 | - ?> |
|
388 | + $dispolar = false; |
|
389 | + foreach ($globalSources as $testsource) { |
|
390 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
391 | + } |
|
392 | + if ($dispolar) { |
|
393 | + ?> |
|
394 | 394 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
395 | 395 | <?php |
396 | - } |
|
397 | - } |
|
398 | - ?> |
|
396 | + } |
|
397 | + } |
|
398 | + ?> |
|
399 | 399 | <?php |
400 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
400 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
401 | 401 | ?> |
402 | 402 | |
403 | 403 | <?php |
404 | 404 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
405 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
406 | - ?> |
|
405 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
406 | + ?> |
|
407 | 407 | <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
408 | 408 | <?php |
409 | 409 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
410 | - ?> |
|
410 | + ?> |
|
411 | 411 | <li><?php echo _("Aircraft icon color:"); ?> |
412 | 412 | <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"> |
413 | 413 | </li> |
414 | 414 | <?php |
415 | 415 | } |
416 | - } |
|
417 | - } |
|
418 | - ?> |
|
416 | + } |
|
417 | + } |
|
418 | + ?> |
|
419 | 419 | <?php |
420 | 420 | if (isset($globalMarine) && $globalMarine === TRUE) { |
421 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
422 | - ?> |
|
421 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
422 | + ?> |
|
423 | 423 | <li><?php echo _("Marine icon color:"); ?> |
424 | 424 | <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>"> |
425 | 425 | </li> |
426 | 426 | <?php |
427 | - } |
|
428 | - } |
|
429 | - ?> |
|
427 | + } |
|
428 | + } |
|
429 | + ?> |
|
430 | 430 | <?php |
431 | 431 | if (isset($globalTracker) && $globalTracker === TRUE) { |
432 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
433 | - ?> |
|
432 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
433 | + ?> |
|
434 | 434 | <li><?php echo _("Tracker icon color:"); ?> |
435 | 435 | <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>"> |
436 | 436 | </li> |
437 | 437 | <?php |
438 | - } |
|
439 | - } |
|
440 | - ?> |
|
438 | + } |
|
439 | + } |
|
440 | + ?> |
|
441 | 441 | <?php |
442 | 442 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
443 | - ?> |
|
443 | + ?> |
|
444 | 444 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
445 | 445 | <div class="range"> |
446 | 446 | <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>"> |
@@ -449,9 +449,9 @@ discard block |
||
449 | 449 | </li> |
450 | 450 | <?php |
451 | 451 | } |
452 | - ?> |
|
452 | + ?> |
|
453 | 453 | <?php |
454 | - } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
454 | + } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
455 | 455 | ?> |
456 | 456 | <?php |
457 | 457 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
@@ -483,7 +483,7 @@ discard block |
||
483 | 483 | </li> |
484 | 484 | <?php |
485 | 485 | } |
486 | - } |
|
486 | + } |
|
487 | 487 | ?> |
488 | 488 | <li><?php echo _("Distance unit:"); ?> |
489 | 489 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -516,19 +516,19 @@ discard block |
||
516 | 516 | <ul> |
517 | 517 | <?php |
518 | 518 | if (!isset($globalAircraft) || $globalAircraft) { |
519 | - ?> |
|
519 | + ?> |
|
520 | 520 | <?php |
521 | 521 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
522 | - ?> |
|
522 | + ?> |
|
523 | 523 | <?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
524 | 524 | <?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
525 | 525 | <?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
526 | 526 | <?php |
527 | 527 | } |
528 | - ?> |
|
528 | + ?> |
|
529 | 529 | <?php |
530 | 530 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
531 | - ?> |
|
531 | + ?> |
|
532 | 532 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
533 | 533 | <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
534 | 534 | <?php } ?> |
@@ -537,7 +537,7 @@ discard block |
||
537 | 537 | <?php } ?> |
538 | 538 | <?php |
539 | 539 | } |
540 | - ?> |
|
540 | + ?> |
|
541 | 541 | <li><?php echo _("Display airlines:"); ?> |
542 | 542 | <br/> |
543 | 543 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -557,14 +557,14 @@ discard block |
||
557 | 557 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
558 | 558 | } |
559 | 559 | } |
560 | - ?> |
|
560 | + ?> |
|
561 | 561 | </select> |
562 | 562 | </li> |
563 | 563 | <?php |
564 | 564 | $Spotter = new Spotter(); |
565 | 565 | $allalliancenames = $Spotter->getAllAllianceNames(); |
566 | 566 | if (!empty($allalliancenames)) { |
567 | - ?> |
|
567 | + ?> |
|
568 | 568 | <li><?php echo _("Display alliance:"); ?> |
569 | 569 | <br/> |
570 | 570 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -578,18 +578,18 @@ discard block |
||
578 | 578 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
579 | 579 | } |
580 | 580 | } |
581 | - ?> |
|
581 | + ?> |
|
582 | 582 | </select> |
583 | 583 | </li> |
584 | 584 | <?php |
585 | 585 | } |
586 | - ?> |
|
586 | + ?> |
|
587 | 587 | <?php |
588 | 588 | } |
589 | - ?> |
|
589 | + ?> |
|
590 | 590 | <?php |
591 | 591 | if (isset($globalAPRS) && $globalAPRS) { |
592 | - ?> |
|
592 | + ?> |
|
593 | 593 | <li><?php echo _("Display APRS sources name:"); ?> |
594 | 594 | <select class="selectpicker" multiple onchange="sources(this);"> |
595 | 595 | <?php |
@@ -613,18 +613,18 @@ discard block |
||
613 | 613 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
614 | 614 | } |
615 | 615 | } |
616 | - ?> |
|
616 | + ?> |
|
617 | 617 | </select> |
618 | 618 | </li> |
619 | 619 | <?php |
620 | 620 | } |
621 | - ?> |
|
621 | + ?> |
|
622 | 622 | <?php |
623 | 623 | if (!isset($globalAircraft) || $globalAircraft) { |
624 | - ?> |
|
624 | + ?> |
|
625 | 625 | <?php |
626 | - if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
627 | - ?> |
|
626 | + if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
627 | + ?> |
|
628 | 628 | <li><?php echo _("Display airlines of type:"); ?><br/> |
629 | 629 | <select class="selectpicker" onchange="airlinestype(this);"> |
630 | 630 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -634,21 +634,21 @@ discard block |
||
634 | 634 | </select> |
635 | 635 | </li> |
636 | 636 | <?php |
637 | - } |
|
638 | - ?> |
|
637 | + } |
|
638 | + ?> |
|
639 | 639 | <?php |
640 | 640 | } |
641 | - ?> |
|
641 | + ?> |
|
642 | 642 | <?php |
643 | 643 | if (isset($globalMarine) && $globalMarine) { |
644 | - ?> |
|
644 | + ?> |
|
645 | 645 | <li> |
646 | 646 | <?php echo _("Display vessels with MMSI:"); ?> |
647 | 647 | <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
648 | 648 | </li> |
649 | 649 | <?php |
650 | 650 | } |
651 | - ?> |
|
651 | + ?> |
|
652 | 652 | <li> |
653 | 653 | <?php echo _("Display with ident:"); ?> |
654 | 654 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
@@ -661,7 +661,7 @@ discard block |
||
661 | 661 | </form> |
662 | 662 | </div> |
663 | 663 | <?php |
664 | - if (isset($globalSatellite) && $globalSatellite) { |
|
664 | + if (isset($globalSatellite) && $globalSatellite) { |
|
665 | 665 | ?> |
666 | 666 | <div class="sidebar-pane" id="satellites"> |
667 | 667 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -701,14 +701,14 @@ discard block |
||
701 | 701 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
702 | 702 | } |
703 | 703 | } |
704 | - ?> |
|
704 | + ?> |
|
705 | 705 | </select> |
706 | 706 | </li> |
707 | 707 | </ul> |
708 | 708 | </form> |
709 | 709 | </div> |
710 | 710 | <?php |
711 | - } |
|
711 | + } |
|
712 | 712 | ?> |
713 | 713 | </div> |
714 | 714 | </div> |