@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | <?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 } ?> |
51 | 51 | </tr></table></div> |
52 | 52 | <?php |
53 | - if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
53 | + if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
54 | 54 | ?> |
55 | 55 | <script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script> |
56 | 56 | <?php |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script> |
75 | 75 | <?php |
76 | 76 | } |
77 | - } |
|
77 | + } |
|
78 | 78 | ?> |
79 | 79 | |
80 | 80 | <div id="sidebar" class="sidebar collapsed"> |
@@ -85,13 +85,13 @@ discard block |
||
85 | 85 | <li><a href="" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li> |
86 | 86 | <li><a href="" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li> |
87 | 87 | <?php |
88 | - //if ((isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') || (isset($globalBeta) && $globalBeta === TRUE)) { |
|
88 | + //if ((isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') || (isset($globalBeta) && $globalBeta === TRUE)) { |
|
89 | 89 | if (isset($globalArchive) && $globalArchive == TRUE && (!isset($globalAircraft) || $globalAircraft === TRUE)) { |
90 | 90 | ?> |
91 | 91 | <li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li> |
92 | 92 | <?php |
93 | 93 | } |
94 | - //} |
|
94 | + //} |
|
95 | 95 | ?> |
96 | 96 | <li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li> |
97 | 97 | <li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li> |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | ?> |
106 | 106 | |
107 | 107 | <?php |
108 | - if (isset($globalMap3D) && $globalMap3D) { |
|
108 | + if (isset($globalMap3D) && $globalMap3D) { |
|
109 | 109 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
110 | 110 | ?> |
111 | 111 | <li><a href="" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li> |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | <li><a href="" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li> |
116 | 116 | <?php |
117 | 117 | } |
118 | - } |
|
118 | + } |
|
119 | 119 | ?> |
120 | 120 | </ul> |
121 | 121 | |
@@ -247,15 +247,15 @@ discard block |
||
247 | 247 | </div> |
248 | 248 | </li> |
249 | 249 | <?php |
250 | - if (isset($globalDemo) && $globalDemo) { |
|
250 | + if (isset($globalDemo) && $globalDemo) { |
|
251 | 251 | ?> |
252 | 252 | <li><button type="button" class="btn btn-primary disabled"><?php echo _("Show archive"); ?></button> Disabled in Demo mode</li> |
253 | 253 | <?php |
254 | - } else { |
|
254 | + } else { |
|
255 | 255 | ?> |
256 | 256 | <li><button type="button" onclick="addarchive(begindate,enddate);" class="btn btn-primary"><?php echo _("Show archive"); ?></button></li> |
257 | 257 | <?php |
258 | - } |
|
258 | + } |
|
259 | 259 | ?> |
260 | 260 | </ul> |
261 | 261 | <ul> |
@@ -274,72 +274,72 @@ discard block |
||
274 | 274 | <?php |
275 | 275 | if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
276 | 276 | else $MapType = $_COOKIE['MapType']; |
277 | - ?> |
|
277 | + ?> |
|
278 | 278 | <?php |
279 | 279 | if (isset($globalMapOffline) && $globalMapOffline === TRUE) { |
280 | - ?> |
|
280 | + ?> |
|
281 | 281 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
282 | 282 | <?php |
283 | 283 | } else { |
284 | - if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
|
285 | - ?> |
|
284 | + if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
|
285 | + ?> |
|
286 | 286 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
287 | 287 | <?php |
288 | - } |
|
289 | - ?> |
|
288 | + } |
|
289 | + ?> |
|
290 | 290 | <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') print ' selected'; ?>>ArcGIS Streetmap</option> |
291 | 291 | <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') print ' selected'; ?>>ArcGIS Satellite</option> |
292 | 292 | <?php |
293 | - if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
294 | - ?> |
|
293 | + if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
294 | + ?> |
|
295 | 295 | <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
296 | 296 | <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
297 | 297 | <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
298 | 298 | <?php |
299 | - } |
|
300 | - ?> |
|
299 | + } |
|
300 | + ?> |
|
301 | 301 | <?php |
302 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
303 | - ?> |
|
302 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
303 | + ?> |
|
304 | 304 | <?php |
305 | 305 | if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
306 | - ?> |
|
306 | + ?> |
|
307 | 307 | <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
308 | 308 | <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
309 | 309 | <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
310 | 310 | <?php |
311 | 311 | } |
312 | - ?> |
|
312 | + ?> |
|
313 | 313 | <?php |
314 | 314 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
315 | - ?> |
|
315 | + ?> |
|
316 | 316 | <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
317 | 317 | <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
318 | 318 | <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
319 | 319 | <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
320 | 320 | <?php |
321 | 321 | } |
322 | - ?> |
|
322 | + ?> |
|
323 | 323 | <?php |
324 | 324 | if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
325 | - ?> |
|
325 | + ?> |
|
326 | 326 | <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
327 | 327 | <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
328 | 328 | <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
329 | 329 | <?php |
330 | 330 | } |
331 | - ?> |
|
331 | + ?> |
|
332 | 332 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
333 | 333 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option> |
334 | 334 | <?php |
335 | - } |
|
336 | - ?> |
|
335 | + } |
|
336 | + ?> |
|
337 | 337 | <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option> |
338 | 338 | <?php |
339 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
339 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
340 | 340 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
341 | 341 | else $MapBoxId = $_COOKIE['MapTypeId']; |
342 | - ?> |
|
342 | + ?> |
|
343 | 343 | <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option> |
344 | 344 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
345 | 345 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
@@ -354,16 +354,16 @@ discard block |
||
354 | 354 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
355 | 355 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
356 | 356 | <?php |
357 | - } |
|
358 | - ?> |
|
357 | + } |
|
358 | + ?> |
|
359 | 359 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
360 | 360 | <?php |
361 | 361 | } |
362 | - ?> |
|
362 | + ?> |
|
363 | 363 | </select> |
364 | 364 | </li> |
365 | 365 | <?php |
366 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) { |
|
366 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) { |
|
367 | 367 | ?> |
368 | 368 | <li><?php echo _("Type of Terrain:"); ?> |
369 | 369 | <select class="selectpicker" onchange="terrainType(this);"> |
@@ -374,10 +374,10 @@ discard block |
||
374 | 374 | </select> |
375 | 375 | </li> |
376 | 376 | <?php |
377 | - } |
|
377 | + } |
|
378 | 378 | ?> |
379 | 379 | <?php |
380 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
380 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
381 | 381 | ?> |
382 | 382 | <li><div class="checkbox"><label><input type="checkbox" name="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if (isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') print 'checked'; ?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li> |
383 | 383 | |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | <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> |
401 | 401 | <?php |
402 | 402 | } |
403 | - } |
|
403 | + } |
|
404 | 404 | ?> |
405 | 405 | <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> |
406 | 406 | <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> |
@@ -419,80 +419,80 @@ discard block |
||
419 | 419 | } |
420 | 420 | ?> |
421 | 421 | <?php |
422 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
422 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
423 | 423 | ?> |
424 | 424 | <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> |
425 | 425 | <li><div class="checkbox"><label><input type="checkbox" name="one3dmodel" value="1" onclick="useOne3Dmodel(this)" <?php if ((isset($_COOKIE['one3dmodel']) && $_COOKIE['one3dmodel'] == 'true') || (!isset($_COOKIE['one3dmodel']) && isset($globalMap3DOneModel) && $globalMap3DOneModel)) print 'checked'; ?> ><?php echo _("Use same 3D model for all aircraft (use fewer resources)"); ?></label></div></li> |
426 | 426 | <?php |
427 | - } |
|
428 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
427 | + } |
|
428 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
429 | 429 | ?> |
430 | 430 | <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> |
431 | 431 | <?php |
432 | - } |
|
432 | + } |
|
433 | 433 | ?> |
434 | 434 | <?php |
435 | 435 | if (function_exists('array_column')) { |
436 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
437 | - ?> |
|
436 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
437 | + ?> |
|
438 | 438 | <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> |
439 | 439 | <?php |
440 | - } |
|
440 | + } |
|
441 | 441 | } elseif (isset($globalSources)) { |
442 | - $dispolar = false; |
|
443 | - foreach ($globalSources as $testsource) { |
|
444 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
445 | - } |
|
446 | - if ($dispolar) { |
|
447 | - ?> |
|
442 | + $dispolar = false; |
|
443 | + foreach ($globalSources as $testsource) { |
|
444 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
445 | + } |
|
446 | + if ($dispolar) { |
|
447 | + ?> |
|
448 | 448 | <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> |
449 | 449 | <?php |
450 | - } |
|
451 | - } |
|
452 | - ?> |
|
450 | + } |
|
451 | + } |
|
452 | + ?> |
|
453 | 453 | <?php |
454 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
454 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
455 | 455 | ?> |
456 | 456 | |
457 | 457 | <?php |
458 | 458 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
459 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
460 | - ?> |
|
459 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
460 | + ?> |
|
461 | 461 | <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> |
462 | 462 | <?php |
463 | 463 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
464 | - ?> |
|
464 | + ?> |
|
465 | 465 | <li><?php echo _("Aircraft icon color:"); ?><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'; ?>"></li> |
466 | 466 | <?php |
467 | 467 | } |
468 | - } |
|
469 | - } |
|
470 | - ?> |
|
468 | + } |
|
469 | + } |
|
470 | + ?> |
|
471 | 471 | <?php |
472 | 472 | if (isset($globalMarine) && $globalMarine === TRUE) { |
473 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
474 | - ?> |
|
473 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
474 | + ?> |
|
475 | 475 | <li><?php echo _("Marine icon color:"); ?> |
476 | 476 | <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'; ?>"> |
477 | 477 | </li> |
478 | 478 | <?php |
479 | - } |
|
480 | - } |
|
481 | - ?> |
|
479 | + } |
|
480 | + } |
|
481 | + ?> |
|
482 | 482 | <?php |
483 | 483 | if (isset($globalTracker) && $globalTracker === TRUE) { |
484 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
485 | - ?> |
|
484 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
485 | + ?> |
|
486 | 486 | <li><?php echo _("Tracker icon color:"); ?> |
487 | 487 | <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'; ?>"> |
488 | 488 | </li> |
489 | 489 | <?php |
490 | - } |
|
491 | - } |
|
492 | - ?> |
|
490 | + } |
|
491 | + } |
|
492 | + ?> |
|
493 | 493 | <?php |
494 | 494 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
495 | - ?> |
|
495 | + ?> |
|
496 | 496 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
497 | 497 | <div class="range"> |
498 | 498 | <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'; ?>"> |
@@ -501,9 +501,9 @@ discard block |
||
501 | 501 | </li> |
502 | 502 | <?php |
503 | 503 | } |
504 | - ?> |
|
504 | + ?> |
|
505 | 505 | <?php |
506 | - } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
506 | + } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
507 | 507 | ?> |
508 | 508 | <li><?php echo _("Set scaling factor for rendering resolution:"); ?> |
509 | 509 | <div class="range"> |
@@ -541,7 +541,7 @@ discard block |
||
541 | 541 | </li> |
542 | 542 | <?php |
543 | 543 | } |
544 | - } |
|
544 | + } |
|
545 | 545 | ?> |
546 | 546 | <li><?php echo _("Distance unit:"); ?> |
547 | 547 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -574,19 +574,19 @@ discard block |
||
574 | 574 | <ul> |
575 | 575 | <?php |
576 | 576 | if (!isset($globalAircraft) || $globalAircraft) { |
577 | - ?> |
|
577 | + ?> |
|
578 | 578 | <?php |
579 | 579 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
580 | - ?> |
|
580 | + ?> |
|
581 | 581 | <?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 } ?> |
582 | 582 | <?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 } ?> |
583 | 583 | <?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 } ?> |
584 | 584 | <?php |
585 | 585 | } |
586 | - ?> |
|
586 | + ?> |
|
587 | 587 | <?php |
588 | 588 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
589 | - ?> |
|
589 | + ?> |
|
590 | 590 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
591 | 591 | <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> |
592 | 592 | <?php } ?> |
@@ -595,7 +595,7 @@ discard block |
||
595 | 595 | <?php } ?> |
596 | 596 | <?php |
597 | 597 | } |
598 | - ?> |
|
598 | + ?> |
|
599 | 599 | <li><?php echo _("Display airlines:"); ?> |
600 | 600 | <br/> |
601 | 601 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -615,14 +615,14 @@ discard block |
||
615 | 615 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
616 | 616 | } |
617 | 617 | } |
618 | - ?> |
|
618 | + ?> |
|
619 | 619 | </select> |
620 | 620 | </li> |
621 | 621 | <?php |
622 | 622 | $Spotter = new Spotter(); |
623 | 623 | $allalliancenames = $Spotter->getAllAllianceNames(); |
624 | 624 | if (!empty($allalliancenames)) { |
625 | - ?> |
|
625 | + ?> |
|
626 | 626 | <li><?php echo _("Display alliance:"); ?> |
627 | 627 | <br/> |
628 | 628 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -636,18 +636,18 @@ discard block |
||
636 | 636 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
637 | 637 | } |
638 | 638 | } |
639 | - ?> |
|
639 | + ?> |
|
640 | 640 | </select> |
641 | 641 | </li> |
642 | 642 | <?php |
643 | 643 | } |
644 | - ?> |
|
644 | + ?> |
|
645 | 645 | <?php |
646 | 646 | } |
647 | - ?> |
|
647 | + ?> |
|
648 | 648 | <?php |
649 | 649 | if (isset($globalAPRS) && $globalAPRS) { |
650 | - ?> |
|
650 | + ?> |
|
651 | 651 | <li><?php echo _("Display APRS sources name:"); ?> |
652 | 652 | <select class="selectpicker" multiple onchange="sources(this);"> |
653 | 653 | <?php |
@@ -671,18 +671,18 @@ discard block |
||
671 | 671 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
672 | 672 | } |
673 | 673 | } |
674 | - ?> |
|
674 | + ?> |
|
675 | 675 | </select> |
676 | 676 | </li> |
677 | 677 | <?php |
678 | 678 | } |
679 | - ?> |
|
679 | + ?> |
|
680 | 680 | <?php |
681 | 681 | if (!isset($globalAircraft) || $globalAircraft) { |
682 | - ?> |
|
682 | + ?> |
|
683 | 683 | <?php |
684 | - if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
685 | - ?> |
|
684 | + if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
685 | + ?> |
|
686 | 686 | <li><?php echo _("Display airlines of type:"); ?><br/> |
687 | 687 | <select class="selectpicker" onchange="airlinestype(this);"> |
688 | 688 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -692,21 +692,21 @@ discard block |
||
692 | 692 | </select> |
693 | 693 | </li> |
694 | 694 | <?php |
695 | - } |
|
696 | - ?> |
|
695 | + } |
|
696 | + ?> |
|
697 | 697 | <?php |
698 | 698 | } |
699 | - ?> |
|
699 | + ?> |
|
700 | 700 | <?php |
701 | 701 | if (isset($globalMarine) && $globalMarine) { |
702 | - ?> |
|
702 | + ?> |
|
703 | 703 | <li> |
704 | 704 | <?php echo _("Display vessels with MMSI:"); ?> |
705 | 705 | <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
706 | 706 | </li> |
707 | 707 | <?php |
708 | 708 | } |
709 | - ?> |
|
709 | + ?> |
|
710 | 710 | <li> |
711 | 711 | <?php echo _("Display with ident:"); ?> |
712 | 712 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
@@ -719,7 +719,7 @@ discard block |
||
719 | 719 | </form> |
720 | 720 | </div> |
721 | 721 | <?php |
722 | - if (isset($globalSatellite) && $globalSatellite) { |
|
722 | + if (isset($globalSatellite) && $globalSatellite) { |
|
723 | 723 | ?> |
724 | 724 | <div class="sidebar-pane" id="satellites"> |
725 | 725 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -759,14 +759,14 @@ discard block |
||
759 | 759 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
760 | 760 | } |
761 | 761 | } |
762 | - ?> |
|
762 | + ?> |
|
763 | 763 | </select> |
764 | 764 | </li> |
765 | 765 | </ul> |
766 | 766 | </form> |
767 | 767 | </div> |
768 | 768 | <?php |
769 | - } |
|
769 | + } |
|
770 | 770 | ?> |
771 | 771 | </div> |
772 | 772 | </div> |