@@ -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,82 +274,82 @@ discard block |
||
274 | 274 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
275 | 275 | if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
276 | 276 | else $MapType = $_COOKIE['MapType']; |
277 | - ?> |
|
277 | + ?> |
|
278 | 278 | <select class="selectpicker" onchange="mapType(this);"> |
279 | 279 | <?php |
280 | 280 | } else { |
281 | 281 | if (!isset($_COOKIE['MapType3D']) || $_COOKIE['MapType3D'] == '') $MapType = $globalMapProvider; |
282 | 282 | else $MapType = $_COOKIE['MapType3D']; |
283 | - ?> |
|
283 | + ?> |
|
284 | 284 | <select class="selectpicker" onchange="mapType3D(this);"> |
285 | 285 | <?php |
286 | 286 | } |
287 | - ?> |
|
287 | + ?> |
|
288 | 288 | <?php |
289 | 289 | if (isset($globalMapOffline) && $globalMapOffline === TRUE) { |
290 | - ?> |
|
290 | + ?> |
|
291 | 291 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
292 | 292 | <?php |
293 | 293 | } else { |
294 | - if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
|
295 | - ?> |
|
294 | + if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
|
295 | + ?> |
|
296 | 296 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
297 | 297 | <?php |
298 | - } |
|
299 | - ?> |
|
298 | + } |
|
299 | + ?> |
|
300 | 300 | <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') print ' selected'; ?>>ArcGIS Streetmap</option> |
301 | 301 | <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') print ' selected'; ?>>ArcGIS Satellite</option> |
302 | 302 | <?php |
303 | - if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
304 | - ?> |
|
303 | + if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
304 | + ?> |
|
305 | 305 | <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
306 | 306 | <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
307 | 307 | <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
308 | 308 | <?php |
309 | - } |
|
310 | - ?> |
|
309 | + } |
|
310 | + ?> |
|
311 | 311 | <?php |
312 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
313 | - ?> |
|
312 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
313 | + ?> |
|
314 | 314 | <?php |
315 | 315 | if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
316 | - ?> |
|
316 | + ?> |
|
317 | 317 | <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
318 | 318 | <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
319 | 319 | <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
320 | 320 | <?php |
321 | 321 | } |
322 | - ?> |
|
322 | + ?> |
|
323 | 323 | <?php |
324 | 324 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
325 | - ?> |
|
325 | + ?> |
|
326 | 326 | <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
327 | 327 | <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
328 | 328 | <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
329 | 329 | <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
330 | 330 | <?php |
331 | 331 | } |
332 | - ?> |
|
332 | + ?> |
|
333 | 333 | <?php |
334 | 334 | if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
335 | - ?> |
|
335 | + ?> |
|
336 | 336 | <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
337 | 337 | <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
338 | 338 | <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
339 | 339 | <?php |
340 | 340 | } |
341 | - ?> |
|
341 | + ?> |
|
342 | 342 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
343 | 343 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option> |
344 | 344 | <?php |
345 | - } |
|
346 | - ?> |
|
345 | + } |
|
346 | + ?> |
|
347 | 347 | <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option> |
348 | 348 | <?php |
349 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
349 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
350 | 350 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
351 | 351 | else $MapBoxId = $_COOKIE['MapTypeId']; |
352 | - ?> |
|
352 | + ?> |
|
353 | 353 | <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option> |
354 | 354 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
355 | 355 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
@@ -364,16 +364,16 @@ discard block |
||
364 | 364 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
365 | 365 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
366 | 366 | <?php |
367 | - } |
|
368 | - ?> |
|
367 | + } |
|
368 | + ?> |
|
369 | 369 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
370 | 370 | <?php |
371 | 371 | } |
372 | - ?> |
|
372 | + ?> |
|
373 | 373 | </select> |
374 | 374 | </li> |
375 | 375 | <?php |
376 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) { |
|
376 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) { |
|
377 | 377 | ?> |
378 | 378 | <li><?php echo _("Type of Terrain:"); ?> |
379 | 379 | <select class="selectpicker" onchange="terrainType(this);"> |
@@ -384,18 +384,18 @@ discard block |
||
384 | 384 | </select> |
385 | 385 | </li> |
386 | 386 | <?php |
387 | - } |
|
387 | + } |
|
388 | 388 | ?> |
389 | 389 | |
390 | 390 | <?php |
391 | - if (isset($globalMap3D) && $globalMap3D) { |
|
391 | + if (isset($globalMap3D) && $globalMap3D) { |
|
392 | 392 | ?> |
393 | 393 | <li><div class="checkbox"><label><input type="checkbox" name="synchro2d3d" value="1" onclick="clickSyncMap2D3D(this)" <?php if (isset($_COOKIE['Map2D3DSync']) && $_COOKIE['Map2D3DSync'] == 'true') print 'checked'; ?> ><?php echo _("Use same type of map for 2D & 3D"); ?></label></div></li> |
394 | 394 | <?php |
395 | - } |
|
395 | + } |
|
396 | 396 | ?> |
397 | 397 | <?php |
398 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
398 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
399 | 399 | ?> |
400 | 400 | <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> |
401 | 401 | |
@@ -418,17 +418,17 @@ discard block |
||
418 | 418 | <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> |
419 | 419 | <?php |
420 | 420 | } |
421 | - } |
|
421 | + } |
|
422 | 422 | ?> |
423 | 423 | <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> |
424 | 424 | <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> |
425 | 425 | <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li> |
426 | 426 | <?php |
427 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && isset($globalMETAR) && isset($globalMETARcycle) && $globalMETAR && $globalMETARcycle) { |
|
427 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && isset($globalMETAR) && isset($globalMETARcycle) && $globalMETAR && $globalMETARcycle) { |
|
428 | 428 | ?> |
429 | 429 | <li><div class="checkbox"><label><input type="checkbox" name="displayweather" value="1" onclick="clickDisplayWeather(this)" <?php if ((isset($_COOKIE['show_Weather']) && $_COOKIE['show_Weather'] == 'true') || (!isset($_COOKIE['show_Weather']) && (isset($globalMapWeather) && $globalMapWeather === TRUE))) print 'checked'; ?> ><?php echo _("Display weather on 3D map"); ?></label></div></li> |
430 | 430 | <?php |
431 | - } |
|
431 | + } |
|
432 | 432 | ?> |
433 | 433 | <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) print 'checked'; ?> ><?php echo _("Display lightning on map"); ?></label></div></li> |
434 | 434 | <?php |
@@ -444,82 +444,82 @@ discard block |
||
444 | 444 | } |
445 | 445 | ?> |
446 | 446 | <?php |
447 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
447 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
448 | 448 | ?> |
449 | 449 | <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> |
450 | 450 | <li><div class="checkbox"><label><input type="checkbox" name="shadows" value="1" onclick="clickShadows(this)" <?php if ((!isset($_COOKIE['map3dnoshadows']) && (!isset($globalMap3DShadows) || $globalMap3DShadows)) || (isset($_COOKIE['map3dnoshadows']) && $_COOKIE['map3dnoshadows'] == 'false')) print 'checked'; ?> ><?php echo _("Use shadows"); ?></label></div></li> |
451 | 451 | <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> |
452 | 452 | <li><div class="checkbox"><label><input type="checkbox" name="updaterealtime" value="1" onclick="clickUpdateRealtime(this)" <?php if ((isset($_COOKIE['updaterealtime']) && $_COOKIE['updaterealtime'] == 'true') || !isset($_COOKIE['updaterealtime'])) print 'checked'; ?> ><?php echo _("Display realtime data in infobox"); ?></label></div></li> |
453 | 453 | <?php |
454 | - } |
|
455 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
454 | + } |
|
455 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
456 | 456 | ?> |
457 | 457 | <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> |
458 | 458 | <?php |
459 | - } |
|
459 | + } |
|
460 | 460 | ?> |
461 | 461 | <?php |
462 | 462 | if (function_exists('array_column')) { |
463 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
464 | - ?> |
|
463 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
464 | + ?> |
|
465 | 465 | <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> |
466 | 466 | <?php |
467 | - } |
|
467 | + } |
|
468 | 468 | } elseif (isset($globalSources)) { |
469 | - $dispolar = false; |
|
470 | - foreach ($globalSources as $testsource) { |
|
471 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
472 | - } |
|
473 | - if ($dispolar) { |
|
474 | - ?> |
|
469 | + $dispolar = false; |
|
470 | + foreach ($globalSources as $testsource) { |
|
471 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
472 | + } |
|
473 | + if ($dispolar) { |
|
474 | + ?> |
|
475 | 475 | <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> |
476 | 476 | <?php |
477 | - } |
|
478 | - } |
|
479 | - ?> |
|
477 | + } |
|
478 | + } |
|
479 | + ?> |
|
480 | 480 | <?php |
481 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
481 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
482 | 482 | ?> |
483 | 483 | |
484 | 484 | <?php |
485 | 485 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
486 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
487 | - ?> |
|
486 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
487 | + ?> |
|
488 | 488 | <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> |
489 | 489 | <?php |
490 | 490 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
491 | - ?> |
|
491 | + ?> |
|
492 | 492 | <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> |
493 | 493 | <?php |
494 | 494 | } |
495 | - } |
|
496 | - } |
|
497 | - ?> |
|
495 | + } |
|
496 | + } |
|
497 | + ?> |
|
498 | 498 | <?php |
499 | 499 | if (isset($globalMarine) && $globalMarine === TRUE) { |
500 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
501 | - ?> |
|
500 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
501 | + ?> |
|
502 | 502 | <li><?php echo _("Marine icon color:"); ?> |
503 | 503 | <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'; ?>"> |
504 | 504 | </li> |
505 | 505 | <?php |
506 | - } |
|
507 | - } |
|
508 | - ?> |
|
506 | + } |
|
507 | + } |
|
508 | + ?> |
|
509 | 509 | <?php |
510 | 510 | if (isset($globalTracker) && $globalTracker === TRUE) { |
511 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
512 | - ?> |
|
511 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
512 | + ?> |
|
513 | 513 | <li><?php echo _("Tracker icon color:"); ?> |
514 | 514 | <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'; ?>"> |
515 | 515 | </li> |
516 | 516 | <?php |
517 | - } |
|
518 | - } |
|
519 | - ?> |
|
517 | + } |
|
518 | + } |
|
519 | + ?> |
|
520 | 520 | <?php |
521 | 521 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
522 | - ?> |
|
522 | + ?> |
|
523 | 523 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
524 | 524 | <div class="range"> |
525 | 525 | <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'; ?>"> |
@@ -528,9 +528,9 @@ discard block |
||
528 | 528 | </li> |
529 | 529 | <?php |
530 | 530 | } |
531 | - ?> |
|
531 | + ?> |
|
532 | 532 | <?php |
533 | - } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
533 | + } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
534 | 534 | ?> |
535 | 535 | <li><?php echo _("Set scaling factor for rendering resolution:"); ?> |
536 | 536 | <div class="range"> |
@@ -568,7 +568,7 @@ discard block |
||
568 | 568 | </li> |
569 | 569 | <?php |
570 | 570 | } |
571 | - } |
|
571 | + } |
|
572 | 572 | ?> |
573 | 573 | <li><?php echo _("Distance unit:"); ?> |
574 | 574 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -601,19 +601,19 @@ discard block |
||
601 | 601 | <ul> |
602 | 602 | <?php |
603 | 603 | if (!isset($globalAircraft) || $globalAircraft) { |
604 | - ?> |
|
604 | + ?> |
|
605 | 605 | <?php |
606 | 606 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
607 | - ?> |
|
607 | + ?> |
|
608 | 608 | <?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 } ?> |
609 | 609 | <?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 } ?> |
610 | 610 | <?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 } ?> |
611 | 611 | <?php |
612 | 612 | } |
613 | - ?> |
|
613 | + ?> |
|
614 | 614 | <?php |
615 | 615 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
616 | - ?> |
|
616 | + ?> |
|
617 | 617 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
618 | 618 | <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> |
619 | 619 | <?php } ?> |
@@ -622,7 +622,7 @@ discard block |
||
622 | 622 | <?php } ?> |
623 | 623 | <?php |
624 | 624 | } |
625 | - ?> |
|
625 | + ?> |
|
626 | 626 | <li><?php echo _("Display airlines:"); ?> |
627 | 627 | <br/> |
628 | 628 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -642,14 +642,14 @@ discard block |
||
642 | 642 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
643 | 643 | } |
644 | 644 | } |
645 | - ?> |
|
645 | + ?> |
|
646 | 646 | </select> |
647 | 647 | </li> |
648 | 648 | <?php |
649 | 649 | $Spotter = new Spotter(); |
650 | 650 | $allalliancenames = $Spotter->getAllAllianceNames(); |
651 | 651 | if (!empty($allalliancenames)) { |
652 | - ?> |
|
652 | + ?> |
|
653 | 653 | <li><?php echo _("Display alliance:"); ?> |
654 | 654 | <br/> |
655 | 655 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -663,18 +663,18 @@ discard block |
||
663 | 663 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
664 | 664 | } |
665 | 665 | } |
666 | - ?> |
|
666 | + ?> |
|
667 | 667 | </select> |
668 | 668 | </li> |
669 | 669 | <?php |
670 | 670 | } |
671 | - ?> |
|
671 | + ?> |
|
672 | 672 | <?php |
673 | 673 | } |
674 | - ?> |
|
674 | + ?> |
|
675 | 675 | <?php |
676 | 676 | if (isset($globalAPRS) && $globalAPRS) { |
677 | - ?> |
|
677 | + ?> |
|
678 | 678 | <li><?php echo _("Display APRS sources name:"); ?> |
679 | 679 | <select class="selectpicker" multiple onchange="sources(this);"> |
680 | 680 | <?php |
@@ -698,18 +698,18 @@ discard block |
||
698 | 698 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
699 | 699 | } |
700 | 700 | } |
701 | - ?> |
|
701 | + ?> |
|
702 | 702 | </select> |
703 | 703 | </li> |
704 | 704 | <?php |
705 | 705 | } |
706 | - ?> |
|
706 | + ?> |
|
707 | 707 | <?php |
708 | 708 | if (!isset($globalAircraft) || $globalAircraft) { |
709 | - ?> |
|
709 | + ?> |
|
710 | 710 | <?php |
711 | - if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
712 | - ?> |
|
711 | + if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
712 | + ?> |
|
713 | 713 | <li><?php echo _("Display airlines of type:"); ?><br/> |
714 | 714 | <select class="selectpicker" onchange="airlinestype(this);"> |
715 | 715 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -719,21 +719,21 @@ discard block |
||
719 | 719 | </select> |
720 | 720 | </li> |
721 | 721 | <?php |
722 | - } |
|
723 | - ?> |
|
722 | + } |
|
723 | + ?> |
|
724 | 724 | <?php |
725 | 725 | } |
726 | - ?> |
|
726 | + ?> |
|
727 | 727 | <?php |
728 | 728 | if (isset($globalMarine) && $globalMarine) { |
729 | - ?> |
|
729 | + ?> |
|
730 | 730 | <li> |
731 | 731 | <?php echo _("Display vessels with MMSI:"); ?> |
732 | 732 | <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
733 | 733 | </li> |
734 | 734 | <?php |
735 | 735 | } |
736 | - ?> |
|
736 | + ?> |
|
737 | 737 | <li> |
738 | 738 | <?php echo _("Display with ident:"); ?> |
739 | 739 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
@@ -746,7 +746,7 @@ discard block |
||
746 | 746 | </form> |
747 | 747 | </div> |
748 | 748 | <?php |
749 | - if (isset($globalSatellite) && $globalSatellite) { |
|
749 | + if (isset($globalSatellite) && $globalSatellite) { |
|
750 | 750 | ?> |
751 | 751 | <div class="sidebar-pane" id="satellites"> |
752 | 752 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -786,14 +786,14 @@ discard block |
||
786 | 786 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
787 | 787 | } |
788 | 788 | } |
789 | - ?> |
|
789 | + ?> |
|
790 | 790 | </select> |
791 | 791 | </li> |
792 | 792 | </ul> |
793 | 793 | </form> |
794 | 794 | </div> |
795 | 795 | <?php |
796 | - } |
|
796 | + } |
|
797 | 797 | ?> |
798 | 798 | </div> |
799 | 799 | </div> |
@@ -52,7 +52,10 @@ discard block |
||
52 | 52 | <?php |
53 | 53 | if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
54 | 54 | ?> |
55 | -<script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script> |
|
55 | +<script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) { |
|
56 | + print '?tsk='.$tsk; |
|
57 | +} |
|
58 | +?>"></script> |
|
56 | 59 | <?php |
57 | 60 | if (!isset($globalAircraft) || $globalAircraft) { |
58 | 61 | ?> |
@@ -145,8 +148,14 @@ discard block |
||
145 | 148 | ?> |
146 | 149 | <form> |
147 | 150 | <ul> |
148 | - <li><div class="checkbox"><label><input type="checkbox" name="waypoints" value="1" onclick="showWaypoints(this);" <?php if (isset($_COOKIE['waypoints']) && $_COOKIE['waypoints'] == 'true') print 'checked'; ?> /><?php echo _("Display waypoints"); ?></label></div></li> |
|
149 | - <li><div class="checkbox"><label><input type="checkbox" name="airspace" value="1" onclick="showAirspace(this);" <?php if (isset($_COOKIE['airspace']) && $_COOKIE['airspace'] == 'true') print 'checked'; ?> /><?php echo _("Display airspace"); ?></label></div></li> |
|
151 | + <li><div class="checkbox"><label><input type="checkbox" name="waypoints" value="1" onclick="showWaypoints(this);" <?php if (isset($_COOKIE['waypoints']) && $_COOKIE['waypoints'] == 'true') { |
|
152 | + print 'checked'; |
|
153 | +} |
|
154 | +?> /><?php echo _("Display waypoints"); ?></label></div></li> |
|
155 | + <li><div class="checkbox"><label><input type="checkbox" name="airspace" value="1" onclick="showAirspace(this);" <?php if (isset($_COOKIE['airspace']) && $_COOKIE['airspace'] == 'true') { |
|
156 | + print 'checked'; |
|
157 | +} |
|
158 | +?> /><?php echo _("Display airspace"); ?></label></div></li> |
|
150 | 159 | </ul> |
151 | 160 | </form> |
152 | 161 | <?php |
@@ -154,8 +163,14 @@ discard block |
||
154 | 163 | ?> |
155 | 164 | <form> |
156 | 165 | <ul> |
157 | - <li><div class="checkbox"><label><input type="checkbox" name="waypoints" value="1" onclick="showWaypoints(this);" <?php if (isset($_COOKIE['waypoints']) && $_COOKIE['waypoints'] == 'true') print 'checked'; ?> /><?php echo _("Display waypoints"); ?> Beta</label></div></li> |
|
158 | - <li><div class="checkbox"><label><input type="checkbox" name="airspace" value="1" onclick="showAirspace(this);" <?php if (isset($_COOKIE['airspace']) && $_COOKIE['airspace'] == 'true') print 'checked'; ?> /><?php echo _("Display airspace"); ?> Beta</label></div></li> |
|
166 | + <li><div class="checkbox"><label><input type="checkbox" name="waypoints" value="1" onclick="showWaypoints(this);" <?php if (isset($_COOKIE['waypoints']) && $_COOKIE['waypoints'] == 'true') { |
|
167 | + print 'checked'; |
|
168 | +} |
|
169 | +?> /><?php echo _("Display waypoints"); ?> Beta</label></div></li> |
|
170 | + <li><div class="checkbox"><label><input type="checkbox" name="airspace" value="1" onclick="showAirspace(this);" <?php if (isset($_COOKIE['airspace']) && $_COOKIE['airspace'] == 'true') { |
|
171 | + print 'checked'; |
|
172 | +} |
|
173 | +?> /><?php echo _("Display airspace"); ?> Beta</label></div></li> |
|
159 | 174 | </ul> |
160 | 175 | <p>This layers are in Beta, this can and will crash.</p> |
161 | 176 | </form> |
@@ -166,14 +181,32 @@ discard block |
||
166 | 181 | <h1>NOTAM</h1> |
167 | 182 | <form> |
168 | 183 | <ul> |
169 | - <li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam(this);" <?php if (isset($_COOKIE['notam']) && $_COOKIE['notam'] == 'true') print 'checked'; ?> /><?php echo _("Display NOTAM"); ?></label></div></li> |
|
184 | + <li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam(this);" <?php if (isset($_COOKIE['notam']) && $_COOKIE['notam'] == 'true') { |
|
185 | + print 'checked'; |
|
186 | +} |
|
187 | +?> /><?php echo _("Display NOTAM"); ?></label></div></li> |
|
170 | 188 | <li><?php echo _("NOTAM scope:"); ?> |
171 | 189 | <select class="selectpicker" onchange="notamscope(this);"> |
172 | - <option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') print ' selected'; ?>>All</option> |
|
173 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') print ' selected'; ?>>Airport/Enroute warning</option> |
|
174 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') print ' selected'; ?>>Airport warning</option> |
|
175 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') print ' selected'; ?>>Navigation warning</option> |
|
176 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') print ' selected'; ?>>Enroute warning</option> |
|
190 | + <option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') { |
|
191 | + print ' selected'; |
|
192 | +} |
|
193 | +?>>All</option> |
|
194 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') { |
|
195 | + print ' selected'; |
|
196 | +} |
|
197 | +?>>Airport/Enroute warning</option> |
|
198 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') { |
|
199 | + print ' selected'; |
|
200 | +} |
|
201 | +?>>Airport warning</option> |
|
202 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') { |
|
203 | + print ' selected'; |
|
204 | +} |
|
205 | +?>>Navigation warning</option> |
|
206 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') { |
|
207 | + print ' selected'; |
|
208 | +} |
|
209 | +?>>Enroute warning</option> |
|
177 | 210 | </select |
178 | 211 | </li> |
179 | 212 | </ul> |
@@ -201,7 +234,10 @@ discard block |
||
201 | 234 | <div class="form-group"> |
202 | 235 | <label><?php echo _("From:"); ?></label> |
203 | 236 | <div class='input-group date' id='datetimepicker1'> |
204 | - <input type='text' id="start_date" name="start_date" class="form-control" autocomplete="off" value="<?php if (isset($_COOKIE['archive_begin']) && $_COOKIE['archive_begin'] != '') print date("Y-m-d H:i",$_COOKIE['archive_begin']).' UTC'; ?>" required /> |
|
237 | + <input type='text' id="start_date" name="start_date" class="form-control" autocomplete="off" value="<?php if (isset($_COOKIE['archive_begin']) && $_COOKIE['archive_begin'] != '') { |
|
238 | + print date("Y-m-d H:i",$_COOKIE['archive_begin']).' UTC'; |
|
239 | +} |
|
240 | +?>" required /> |
|
205 | 241 | <span class="input-group-addon"> |
206 | 242 | <span class="glyphicon glyphicon-calendar"></span> |
207 | 243 | </span> |
@@ -210,7 +246,10 @@ discard block |
||
210 | 246 | <div class="form-group"> |
211 | 247 | <label><?php echo _("To:"); ?></label> |
212 | 248 | <div class='input-group date' id='datetimepicker2'> |
213 | - <input type='text' id="end_date" name="end_date" class="form-control" autocomplete="off" value="<?php if (isset($_COOKIE['archive_end']) && $_COOKIE['archive_end'] != '') print date("Y-m-d H:i",$_COOKIE['archive_end']).' UTC'; ?>" /> |
|
249 | + <input type='text' id="end_date" name="end_date" class="form-control" autocomplete="off" value="<?php if (isset($_COOKIE['archive_end']) && $_COOKIE['archive_end'] != '') { |
|
250 | + print date("Y-m-d H:i",$_COOKIE['archive_end']).' UTC'; |
|
251 | +} |
|
252 | +?>" /> |
|
214 | 253 | <span class="input-group-addon"> |
215 | 254 | <span class="glyphicon glyphicon-calendar"></span> |
216 | 255 | </span> |
@@ -242,8 +281,20 @@ discard block |
||
242 | 281 | </script> |
243 | 282 | <li><?php echo _("Playback speed:"); ?> |
244 | 283 | <div class="range"> |
245 | - <input type="range" min="0" max="50" step="1" id="archivespeed" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php if (isset($_POST['archivespeed'])) print $_POST['archivespeed']; elseif (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?>"> |
|
246 | - <output id="archivespeedrange"><?php if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output> |
|
284 | + <input type="range" min="0" max="50" step="1" id="archivespeed" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php if (isset($_POST['archivespeed'])) { |
|
285 | + print $_POST['archivespeed']; |
|
286 | +} elseif (isset($_COOKIE['archive_speed'])) { |
|
287 | + print $_COOKIE['archive_speed']; |
|
288 | +} else { |
|
289 | + print '1'; |
|
290 | +} |
|
291 | +?>"> |
|
292 | + <output id="archivespeedrange"><?php if (isset($_COOKIE['archive_speed'])) { |
|
293 | + print $_COOKIE['archive_speed']; |
|
294 | +} else { |
|
295 | + print '1'; |
|
296 | +} |
|
297 | +?></output> |
|
247 | 298 | </div> |
248 | 299 | </li> |
249 | 300 | <?php |
@@ -272,14 +323,20 @@ discard block |
||
272 | 323 | <li><?php echo _("Type of Map:"); ?> |
273 | 324 | <?php |
274 | 325 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
275 | - if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
|
276 | - else $MapType = $_COOKIE['MapType']; |
|
326 | + if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') { |
|
327 | + $MapType = $globalMapProvider; |
|
328 | + } else { |
|
329 | + $MapType = $_COOKIE['MapType']; |
|
330 | + } |
|
277 | 331 | ?> |
278 | 332 | <select class="selectpicker" onchange="mapType(this);"> |
279 | 333 | <?php |
280 | 334 | } else { |
281 | - if (!isset($_COOKIE['MapType3D']) || $_COOKIE['MapType3D'] == '') $MapType = $globalMapProvider; |
|
282 | - else $MapType = $_COOKIE['MapType3D']; |
|
335 | + if (!isset($_COOKIE['MapType3D']) || $_COOKIE['MapType3D'] == '') { |
|
336 | + $MapType = $globalMapProvider; |
|
337 | + } else { |
|
338 | + $MapType = $_COOKIE['MapType3D']; |
|
339 | + } |
|
283 | 340 | ?> |
284 | 341 | <select class="selectpicker" onchange="mapType3D(this);"> |
285 | 342 | <?php |
@@ -288,23 +345,44 @@ discard block |
||
288 | 345 | <?php |
289 | 346 | if (isset($globalMapOffline) && $globalMapOffline === TRUE) { |
290 | 347 | ?> |
291 | - <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
|
348 | + <option value="offline"<?php if ($MapType == 'offline') { |
|
349 | + print ' selected'; |
|
350 | +} |
|
351 | +?>>Natural Earth (local)</option> |
|
292 | 352 | <?php |
293 | 353 | } else { |
294 | 354 | if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
295 | 355 | ?> |
296 | - <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
|
356 | + <option value="offline"<?php if ($MapType == 'offline') { |
|
357 | + print ' selected'; |
|
358 | +} |
|
359 | +?>>Natural Earth (local)</option> |
|
297 | 360 | <?php |
298 | 361 | } |
299 | 362 | ?> |
300 | - <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') print ' selected'; ?>>ArcGIS Streetmap</option> |
|
301 | - <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') print ' selected'; ?>>ArcGIS Satellite</option> |
|
363 | + <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') { |
|
364 | + print ' selected'; |
|
365 | +} |
|
366 | +?>>ArcGIS Streetmap</option> |
|
367 | + <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') { |
|
368 | + print ' selected'; |
|
369 | +} |
|
370 | +?>>ArcGIS Satellite</option> |
|
302 | 371 | <?php |
303 | 372 | if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
304 | 373 | ?> |
305 | - <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
|
306 | - <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
|
307 | - <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
|
374 | + <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') { |
|
375 | + print ' selected'; |
|
376 | +} |
|
377 | +?>>Bing-Aerial</option> |
|
378 | + <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') { |
|
379 | + print ' selected'; |
|
380 | +} |
|
381 | +?>>Bing-Hybrid</option> |
|
382 | + <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') { |
|
383 | + print ' selected'; |
|
384 | +} |
|
385 | +?>>Bing-Road</option> |
|
308 | 386 | <?php |
309 | 387 | } |
310 | 388 | ?> |
@@ -314,59 +392,143 @@ discard block |
||
314 | 392 | <?php |
315 | 393 | if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
316 | 394 | ?> |
317 | - <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
|
318 | - <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
|
319 | - <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
|
395 | + <option value="Here-Aerial"<?php if ($MapType == 'Here') { |
|
396 | + print ' selected'; |
|
397 | +} |
|
398 | +?>>Here-Aerial</option> |
|
399 | + <option value="Here-Hybrid"<?php if ($MapType == 'Here') { |
|
400 | + print ' selected'; |
|
401 | +} |
|
402 | +?>>Here-Hybrid</option> |
|
403 | + <option value="Here-Road"<?php if ($MapType == 'Here') { |
|
404 | + print ' selected'; |
|
405 | +} |
|
406 | +?>>Here-Road</option> |
|
320 | 407 | <?php |
321 | 408 | } |
322 | 409 | ?> |
323 | 410 | <?php |
324 | 411 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
325 | 412 | ?> |
326 | - <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
|
327 | - <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
|
328 | - <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
|
329 | - <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
|
413 | + <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') { |
|
414 | + print ' selected'; |
|
415 | +} |
|
416 | +?>>Google Roadmap</option> |
|
417 | + <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') { |
|
418 | + print ' selected'; |
|
419 | +} |
|
420 | +?>>Google Satellite</option> |
|
421 | + <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') { |
|
422 | + print ' selected'; |
|
423 | +} |
|
424 | +?>>Google Hybrid</option> |
|
425 | + <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') { |
|
426 | + print ' selected'; |
|
427 | +} |
|
428 | +?>>Google Terrain</option> |
|
330 | 429 | <?php |
331 | 430 | } |
332 | 431 | ?> |
333 | 432 | <?php |
334 | 433 | if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
335 | 434 | ?> |
336 | - <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
|
337 | - <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
|
338 | - <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
|
435 | + <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') { |
|
436 | + print ' selected'; |
|
437 | +} |
|
438 | +?>>MapQuest-OSM</option> |
|
439 | + <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') { |
|
440 | + print ' selected'; |
|
441 | +} |
|
442 | +?>>MapQuest-Aerial</option> |
|
443 | + <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') { |
|
444 | + print ' selected'; |
|
445 | +} |
|
446 | +?>>MapQuest-Hybrid</option> |
|
339 | 447 | <?php |
340 | 448 | } |
341 | 449 | ?> |
342 | - <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
|
343 | - <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option> |
|
450 | + <option value="Yandex"<?php if ($MapType == 'Yandex') { |
|
451 | + print ' selected'; |
|
452 | +} |
|
453 | +?>>Yandex</option> |
|
454 | + <option value="offline"<?php if ($MapType == 'offline') { |
|
455 | + print ' selected'; |
|
456 | +} |
|
457 | +?>>Natural Earth</option> |
|
344 | 458 | <?php |
345 | 459 | } |
346 | 460 | ?> |
347 | - <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option> |
|
461 | + <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') { |
|
462 | + print ' selected'; |
|
463 | +} |
|
464 | +?>>National Geographic Street</option> |
|
348 | 465 | <?php |
349 | 466 | if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
350 | - if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
|
351 | - else $MapBoxId = $_COOKIE['MapTypeId']; |
|
467 | + if (!isset($_COOKIE['MapTypeId'])) { |
|
468 | + $MapBoxId = 'default'; |
|
469 | + } else { |
|
470 | + $MapBoxId = $_COOKIE['MapTypeId']; |
|
471 | + } |
|
352 | 472 | ?> |
353 | - <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option> |
|
354 | - <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
|
355 | - <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
|
356 | - <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
|
357 | - <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option> |
|
358 | - <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option> |
|
359 | - <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option> |
|
360 | - <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option> |
|
361 | - <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option> |
|
362 | - <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option> |
|
363 | - <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option> |
|
364 | - <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
|
365 | - <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
|
473 | + <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') { |
|
474 | + print ' selected'; |
|
475 | +} |
|
476 | +?>>Mapbox GL</option> |
|
477 | + <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') { |
|
478 | + print ' selected'; |
|
479 | +} |
|
480 | +?>>Mapbox default</option> |
|
481 | + <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') { |
|
482 | + print ' selected'; |
|
483 | +} |
|
484 | +?>>Mapbox streets</option> |
|
485 | + <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') { |
|
486 | + print ' selected'; |
|
487 | +} |
|
488 | +?>>Mapbox light</option> |
|
489 | + <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') { |
|
490 | + print ' selected'; |
|
491 | +} |
|
492 | +?>>Mapbox dark</option> |
|
493 | + <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') { |
|
494 | + print ' selected'; |
|
495 | +} |
|
496 | +?>>Mapbox satellite</option> |
|
497 | + <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') { |
|
498 | + print ' selected'; |
|
499 | +} |
|
500 | +?>>Mapbox streets-satellite</option> |
|
501 | + <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') { |
|
502 | + print ' selected'; |
|
503 | +} |
|
504 | +?>>Mapbox streets-basic</option> |
|
505 | + <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') { |
|
506 | + print ' selected'; |
|
507 | +} |
|
508 | +?>>Mapbox comic</option> |
|
509 | + <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') { |
|
510 | + print ' selected'; |
|
511 | +} |
|
512 | +?>>Mapbox outdoors</option> |
|
513 | + <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') { |
|
514 | + print ' selected'; |
|
515 | +} |
|
516 | +?>>Mapbox pencil</option> |
|
517 | + <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') { |
|
518 | + print ' selected'; |
|
519 | +} |
|
520 | +?>>Mapbox pirates</option> |
|
521 | + <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') { |
|
522 | + print ' selected'; |
|
523 | +} |
|
524 | +?>>Mapbox emerald</option> |
|
366 | 525 | <?php |
367 | 526 | } |
368 | 527 | ?> |
369 | - <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
|
528 | + <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') { |
|
529 | + print ' selected'; |
|
530 | +} |
|
531 | +?>>OpenStreetMap</option> |
|
370 | 532 | <?php |
371 | 533 | } |
372 | 534 | ?> |
@@ -377,10 +539,22 @@ discard block |
||
377 | 539 | ?> |
378 | 540 | <li><?php echo _("Type of Terrain:"); ?> |
379 | 541 | <select class="selectpicker" onchange="terrainType(this);"> |
380 | - <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option> |
|
381 | - <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option> |
|
382 | - <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option> |
|
383 | - <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option> |
|
542 | + <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') { |
|
543 | + print ' selected'; |
|
544 | +} |
|
545 | +?>>stk terrain</option> |
|
546 | + <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') { |
|
547 | + print ' selected'; |
|
548 | +} |
|
549 | +?>>ellipsoid</option> |
|
550 | + <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') { |
|
551 | + print ' selected'; |
|
552 | +} |
|
553 | +?>>vr terrain</option> |
|
554 | + <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') { |
|
555 | + print ' selected'; |
|
556 | +} |
|
557 | +?>>ArticDEM</option> |
|
384 | 558 | </select> |
385 | 559 | </li> |
386 | 560 | <?php |
@@ -390,66 +564,126 @@ discard block |
||
390 | 564 | <?php |
391 | 565 | if (isset($globalMap3D) && $globalMap3D) { |
392 | 566 | ?> |
393 | - <li><div class="checkbox"><label><input type="checkbox" name="synchro2d3d" value="1" onclick="clickSyncMap2D3D(this)" <?php if (isset($_COOKIE['Map2D3DSync']) && $_COOKIE['Map2D3DSync'] == 'true') print 'checked'; ?> ><?php echo _("Use same type of map for 2D & 3D"); ?></label></div></li> |
|
567 | + <li><div class="checkbox"><label><input type="checkbox" name="synchro2d3d" value="1" onclick="clickSyncMap2D3D(this)" <?php if (isset($_COOKIE['Map2D3DSync']) && $_COOKIE['Map2D3DSync'] == 'true') { |
|
568 | + print 'checked'; |
|
569 | +} |
|
570 | +?> ><?php echo _("Use same type of map for 2D & 3D"); ?></label></div></li> |
|
394 | 571 | <?php |
395 | 572 | } |
396 | 573 | ?> |
397 | 574 | <?php |
398 | 575 | if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
399 | 576 | ?> |
400 | - <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> |
|
577 | + <li><div class="checkbox"><label><input type="checkbox" name="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if (isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') { |
|
578 | + print 'checked'; |
|
579 | +} |
|
580 | +?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li> |
|
401 | 581 | |
402 | 582 | <?php |
403 | 583 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
404 | 584 | ?> |
405 | - <!--<li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>--> |
|
406 | - <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) print 'checked'; ?> ><?php echo _("Display flight path"); ?></label></div></li> |
|
407 | - <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
|
408 | - <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || (!isset($_COOKIE['MapRemainingRoute']) && isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) print 'checked'; ?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li> |
|
409 | - <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
|
585 | + <!--<li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') { |
|
586 | + print 'checked'; |
|
587 | +} |
|
588 | +?> ><?php echo _("Display flight info as popup"); ?></label></div></li>--> |
|
589 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) { |
|
590 | + print 'checked'; |
|
591 | +} |
|
592 | +?> ><?php echo _("Display flight path"); ?></label></div></li> |
|
593 | + <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (!isset($_COOKIE['MapRoute']) && isset($globalMapRoute) && $globalMapRoute)) { |
|
594 | + print 'checked'; |
|
595 | +} |
|
596 | +?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
|
597 | + <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || (!isset($_COOKIE['MapRemainingRoute']) && isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) { |
|
598 | + print 'checked'; |
|
599 | +} |
|
600 | +?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li> |
|
601 | + <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) { |
|
602 | + print 'checked'; |
|
603 | +} |
|
604 | +?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
|
410 | 605 | <?php |
411 | 606 | } elseif (!isset($globalTracker) || $globalTracker === TRUE) { |
412 | 607 | ?> |
413 | - <li><div class="checkbox"><label><input type="checkbox" name="mapmatching" value="1" onclick="clickMapMatching(this)" <?php if ((isset($_COOKIE['mapmatching']) && $_COOKIE['mapmatching'] == 'true') || (!isset($_COOKIE['mapmatching']) && isset($globalMapMatching) && $globalMapMatching)) print 'checked'; ?> ><?php echo _("Enable map matching"); ?></label></div></li> |
|
608 | + <li><div class="checkbox"><label><input type="checkbox" name="mapmatching" value="1" onclick="clickMapMatching(this)" <?php if ((isset($_COOKIE['mapmatching']) && $_COOKIE['mapmatching'] == 'true') || (!isset($_COOKIE['mapmatching']) && isset($globalMapMatching) && $globalMapMatching)) { |
|
609 | + print 'checked'; |
|
610 | +} |
|
611 | +?> ><?php echo _("Enable map matching"); ?></label></div></li> |
|
414 | 612 | <?php |
415 | 613 | } |
416 | 614 | if (isset($globalSatellite) && $globalSatellite === TRUE) { |
417 | 615 | ?> |
418 | - <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> |
|
616 | + <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)) { |
|
617 | + print 'checked'; |
|
618 | +} |
|
619 | +?> ><?php echo _("Satellites animate between updates"); ?></label></div></li> |
|
419 | 620 | <?php |
420 | 621 | } |
421 | 622 | } |
422 | 623 | ?> |
423 | - <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> |
|
424 | - <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> |
|
425 | - <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li> |
|
624 | + <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'])) { |
|
625 | + print 'checked'; |
|
626 | +} |
|
627 | +?> ><?php echo _("Display airports on map"); ?></label></div></li> |
|
628 | + <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))) { |
|
629 | + print 'checked'; |
|
630 | +} |
|
631 | +?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
|
632 | + <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) { |
|
633 | + print 'checked'; |
|
634 | +} |
|
635 | +?> ><?php echo _("Display weather station on map"); ?></label></div></li> |
|
426 | 636 | <?php |
427 | 637 | if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && isset($globalMETAR) && isset($globalMETARcycle) && $globalMETAR && $globalMETARcycle) { |
428 | 638 | ?> |
429 | - <li><div class="checkbox"><label><input type="checkbox" name="displayweather" value="1" onclick="clickDisplayWeather(this)" <?php if ((isset($_COOKIE['show_Weather']) && $_COOKIE['show_Weather'] == 'true') || (!isset($_COOKIE['show_Weather']) && (isset($globalMapWeather) && $globalMapWeather === TRUE))) print 'checked'; ?> ><?php echo _("Display weather on 3D map"); ?></label></div></li> |
|
639 | + <li><div class="checkbox"><label><input type="checkbox" name="displayweather" value="1" onclick="clickDisplayWeather(this)" <?php if ((isset($_COOKIE['show_Weather']) && $_COOKIE['show_Weather'] == 'true') || (!isset($_COOKIE['show_Weather']) && (isset($globalMapWeather) && $globalMapWeather === TRUE))) { |
|
640 | + print 'checked'; |
|
641 | +} |
|
642 | +?> ><?php echo _("Display weather on 3D map"); ?></label></div></li> |
|
430 | 643 | <?php |
431 | 644 | } |
432 | 645 | ?> |
433 | - <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) print 'checked'; ?> ><?php echo _("Display lightning on map"); ?></label></div></li> |
|
646 | + <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) { |
|
647 | + print 'checked'; |
|
648 | +} |
|
649 | +?> ><?php echo _("Display lightning on map"); ?></label></div></li> |
|
434 | 650 | <?php |
435 | 651 | if (isset($globalFires)) { |
436 | 652 | ?> |
437 | - <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> |
|
653 | + <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))) { |
|
654 | + print 'checked'; |
|
655 | +} |
|
656 | +?> ><?php echo _("Display fires on map"); ?></label></div></li> |
|
438 | 657 | <?php |
439 | 658 | } |
440 | 659 | if (isset($globalMap3D) && $globalMap3D) { |
441 | 660 | ?> |
442 | - <li><div class="checkbox"><label><input type="checkbox" name="singlemodel" value="1" onclick="clickSingleModel(this)" <?php if (isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') print 'checked'; ?> ><?php echo _("Only display selected flight on 3D mode"); ?></label></div></li> |
|
661 | + <li><div class="checkbox"><label><input type="checkbox" name="singlemodel" value="1" onclick="clickSingleModel(this)" <?php if (isset($_COOKIE['singlemodel']) && $_COOKIE['singlemodel'] == 'true') { |
|
662 | + print 'checked'; |
|
663 | +} |
|
664 | +?> ><?php echo _("Only display selected flight on 3D mode"); ?></label></div></li> |
|
443 | 665 | <?php |
444 | 666 | } |
445 | 667 | ?> |
446 | 668 | <?php |
447 | 669 | if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
448 | 670 | ?> |
449 | - <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> |
|
450 | - <li><div class="checkbox"><label><input type="checkbox" name="shadows" value="1" onclick="clickShadows(this)" <?php if ((!isset($_COOKIE['map3dnoshadows']) && (!isset($globalMap3DShadows) || $globalMap3DShadows)) || (isset($_COOKIE['map3dnoshadows']) && $_COOKIE['map3dnoshadows'] == 'false')) print 'checked'; ?> ><?php echo _("Use shadows"); ?></label></div></li> |
|
451 | - <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> |
|
452 | - <li><div class="checkbox"><label><input type="checkbox" name="updaterealtime" value="1" onclick="clickUpdateRealtime(this)" <?php if ((isset($_COOKIE['updaterealtime']) && $_COOKIE['updaterealtime'] == 'true') || !isset($_COOKIE['updaterealtime'])) print 'checked'; ?> ><?php echo _("Display realtime data in infobox"); ?></label></div></li> |
|
671 | + <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')) { |
|
672 | + print 'checked'; |
|
673 | +} |
|
674 | +?> ><?php echo _("Show mini-map"); ?></label></div></li> |
|
675 | + <li><div class="checkbox"><label><input type="checkbox" name="shadows" value="1" onclick="clickShadows(this)" <?php if ((!isset($_COOKIE['map3dnoshadows']) && (!isset($globalMap3DShadows) || $globalMap3DShadows)) || (isset($_COOKIE['map3dnoshadows']) && $_COOKIE['map3dnoshadows'] == 'false')) { |
|
676 | + print 'checked'; |
|
677 | +} |
|
678 | +?> ><?php echo _("Use shadows"); ?></label></div></li> |
|
679 | + <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)) { |
|
680 | + print 'checked'; |
|
681 | +} |
|
682 | +?> ><?php echo _("Use same 3D model for all aircraft (use fewer resources)"); ?></label></div></li> |
|
683 | + <li><div class="checkbox"><label><input type="checkbox" name="updaterealtime" value="1" onclick="clickUpdateRealtime(this)" <?php if ((isset($_COOKIE['updaterealtime']) && $_COOKIE['updaterealtime'] == 'true') || !isset($_COOKIE['updaterealtime'])) { |
|
684 | + print 'checked'; |
|
685 | +} |
|
686 | +?> ><?php echo _("Display realtime data in infobox"); ?></label></div></li> |
|
453 | 687 | <?php |
454 | 688 | } |
455 | 689 | if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
@@ -462,17 +696,25 @@ discard block |
||
462 | 696 | if (function_exists('array_column')) { |
463 | 697 | if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
464 | 698 | ?> |
465 | - <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> |
|
699 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
700 | + print 'checked'; |
|
701 | +} |
|
702 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
466 | 703 | <?php |
467 | 704 | } |
468 | 705 | } elseif (isset($globalSources)) { |
469 | 706 | $dispolar = false; |
470 | 707 | foreach ($globalSources as $testsource) { |
471 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
708 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) { |
|
709 | + $dispolar = true; |
|
710 | + } |
|
472 | 711 | } |
473 | 712 | if ($dispolar) { |
474 | 713 | ?> |
475 | - <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> |
|
714 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
715 | + print 'checked'; |
|
716 | +} |
|
717 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
476 | 718 | <?php |
477 | 719 | } |
478 | 720 | } |
@@ -485,11 +727,21 @@ discard block |
||
485 | 727 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
486 | 728 | if (extension_loaded('gd') && function_exists('gd_info')) { |
487 | 729 | ?> |
488 | - <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> |
|
730 | + <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') { |
|
731 | + print 'checked'; |
|
732 | +} |
|
733 | +?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
|
489 | 734 | <?php |
490 | 735 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
491 | 736 | ?> |
492 | - <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> |
|
737 | + <li><?php echo _("Aircraft icon color:"); ?><input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
738 | + print $_COOKIE['IconColor']; |
|
739 | +} elseif (isset($globalAircraftIconColor)) { |
|
740 | + print $globalAircraftIconColor; |
|
741 | +} else { |
|
742 | + print '1a3151'; |
|
743 | +} |
|
744 | +?>"></li> |
|
493 | 745 | <?php |
494 | 746 | } |
495 | 747 | } |
@@ -500,7 +752,14 @@ discard block |
||
500 | 752 | if (extension_loaded('gd') && function_exists('gd_info')) { |
501 | 753 | ?> |
502 | 754 | <li><?php echo _("Marine icon color:"); ?> |
503 | - <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'; ?>"> |
|
755 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
756 | + print $_COOKIE['MarineIconColor']; |
|
757 | +} elseif (isset($globalMarineIconColor)) { |
|
758 | + print $globalMarineIconColor; |
|
759 | +} else { |
|
760 | + print '1a3151'; |
|
761 | +} |
|
762 | +?>"> |
|
504 | 763 | </li> |
505 | 764 | <?php |
506 | 765 | } |
@@ -511,7 +770,14 @@ discard block |
||
511 | 770 | if (extension_loaded('gd') && function_exists('gd_info')) { |
512 | 771 | ?> |
513 | 772 | <li><?php echo _("Tracker icon color:"); ?> |
514 | - <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'; ?>"> |
|
773 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
774 | + print $_COOKIE['TrackerIconColor']; |
|
775 | +} elseif (isset($globalTrackerIconColor)) { |
|
776 | + print $globalTrackerIconColor; |
|
777 | +} else { |
|
778 | + print '1a3151'; |
|
779 | +} |
|
780 | +?>"> |
|
515 | 781 | </li> |
516 | 782 | <?php |
517 | 783 | } |
@@ -522,8 +788,22 @@ discard block |
||
522 | 788 | ?> |
523 | 789 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
524 | 790 | <div class="range"> |
525 | - <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'; ?>"> |
|
526 | - <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output> |
|
791 | + <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) { |
|
792 | + print $_COOKIE['AirportZoom']; |
|
793 | +} elseif (isset($globalAirportZoom)) { |
|
794 | + print $globalAirportZoom; |
|
795 | +} else { |
|
796 | + print '7'; |
|
797 | +} |
|
798 | +?>"> |
|
799 | + <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) { |
|
800 | + print $_COOKIE['AirportZoom']; |
|
801 | +} elseif (isset($globalAirportZoom)) { |
|
802 | + print $globalAirportZoom; |
|
803 | +} else { |
|
804 | + print '7'; |
|
805 | +} |
|
806 | +?></output> |
|
527 | 807 | </div> |
528 | 808 | </li> |
529 | 809 | <?php |
@@ -534,17 +814,40 @@ discard block |
||
534 | 814 | ?> |
535 | 815 | <li><?php echo _("Set scaling factor for rendering resolution:"); ?> |
536 | 816 | <div class="range"> |
537 | - <input type="range" min="0.5" max="2" step="0.5" name="resolutionscale" onchange="scale.value=value;resolutionScale(resolutionscale.value);" value="<?php if (isset($_COOKIE['resolutionScale'])) print $_COOKIE['resolutionScale']; else print '1'; ?>"> |
|
538 | - <output id="scale"><?php if (isset($_COOKIE['resolutionScale'])) print $_COOKIE['resolutionScale']; else print '1'; ?></output> |
|
817 | + <input type="range" min="0.5" max="2" step="0.5" name="resolutionscale" onchange="scale.value=value;resolutionScale(resolutionscale.value);" value="<?php if (isset($_COOKIE['resolutionScale'])) { |
|
818 | + print $_COOKIE['resolutionScale']; |
|
819 | +} else { |
|
820 | + print '1'; |
|
821 | +} |
|
822 | +?>"> |
|
823 | + <output id="scale"><?php if (isset($_COOKIE['resolutionScale'])) { |
|
824 | + print $_COOKIE['resolutionScale']; |
|
825 | +} else { |
|
826 | + print '1'; |
|
827 | +} |
|
828 | +?></output> |
|
539 | 829 | </div> |
540 | 830 | </li> |
541 | 831 | <?php |
542 | 832 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
543 | 833 | ?> |
544 | - <li><input type="checkbox" name="useliveries" value="1" onclick="useLiveries(this)" <?php if (isset($_COOKIE['UseLiveries']) && $_COOKIE['UseLiveries'] == 'true') print 'checked'; ?> > <?php echo _("Use airlines liveries"); ?></li> |
|
545 | - <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') print 'checked'; ?> > <?php echo _("Force Aircraft color"); ?> |
|
834 | + <li><input type="checkbox" name="useliveries" value="1" onclick="useLiveries(this)" <?php if (isset($_COOKIE['UseLiveries']) && $_COOKIE['UseLiveries'] == 'true') { |
|
835 | + print 'checked'; |
|
836 | +} |
|
837 | +?> > <?php echo _("Use airlines liveries"); ?></li> |
|
838 | + <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') { |
|
839 | + print 'checked'; |
|
840 | +} |
|
841 | +?> > <?php echo _("Force Aircraft color"); ?> |
|
546 | 842 | <!--<li><?php echo _("Aircraft icon color:"); ?>--> |
547 | - <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 'ff0000'; ?>"> |
|
843 | + <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
844 | + print $_COOKIE['IconColor']; |
|
845 | +} elseif (isset($globalAircraftIconColor)) { |
|
846 | + print $globalAircraftIconColor; |
|
847 | +} else { |
|
848 | + print 'ff0000'; |
|
849 | +} |
|
850 | +?>"> |
|
548 | 851 | </li> |
549 | 852 | <?php |
550 | 853 | } |
@@ -552,9 +855,19 @@ discard block |
||
552 | 855 | <?php |
553 | 856 | if (isset($globalMarine) && $globalMarine === TRUE) { |
554 | 857 | ?> |
555 | - <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Marine color"); ?> |
|
858 | + <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') { |
|
859 | + print 'checked'; |
|
860 | +} |
|
861 | +?> ><?php echo _("Force Marine color"); ?> |
|
556 | 862 | <!--<li><?php echo _("Marine icon color:"); ?>--> |
557 | - <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 'ff0000'; ?>"> |
|
863 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
864 | + print $_COOKIE['MarineIconColor']; |
|
865 | +} elseif (isset($globalMarineIconColor)) { |
|
866 | + print $globalMarineIconColor; |
|
867 | +} else { |
|
868 | + print 'ff0000'; |
|
869 | +} |
|
870 | +?>"> |
|
558 | 871 | </li> |
559 | 872 | <?php |
560 | 873 | } |
@@ -562,9 +875,19 @@ discard block |
||
562 | 875 | <?php |
563 | 876 | if (isset($globalTracker) && $globalTracker === TRUE) { |
564 | 877 | ?> |
565 | - <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Tracker color"); ?> |
|
878 | + <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') { |
|
879 | + print 'checked'; |
|
880 | +} |
|
881 | +?> ><?php echo _("Force Tracker color"); ?> |
|
566 | 882 | <!--<li><?php echo _("Tracker icon color:"); ?>--> |
567 | - <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 'ff0000'; ?>"> |
|
883 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
884 | + print $_COOKIE['TrackerIconColor']; |
|
885 | +} elseif (isset($globalTrackerIconColor)) { |
|
886 | + print $globalTrackerIconColor; |
|
887 | +} else { |
|
888 | + print 'ff0000'; |
|
889 | +} |
|
890 | +?>"> |
|
568 | 891 | </li> |
569 | 892 | <?php |
570 | 893 | } |
@@ -572,22 +895,46 @@ discard block |
||
572 | 895 | ?> |
573 | 896 | <li><?php echo _("Distance unit:"); ?> |
574 | 897 | <select class="selectpicker" onchange="unitdistance(this);"> |
575 | - <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option> |
|
576 | - <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option> |
|
577 | - <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option> |
|
898 | + <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) { |
|
899 | + echo ' selected'; |
|
900 | +} |
|
901 | +?>>km</option> |
|
902 | + <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
|
903 | + echo ' selected'; |
|
904 | +} |
|
905 | +?>>nm</option> |
|
906 | + <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
|
907 | + echo ' selected'; |
|
908 | +} |
|
909 | +?>>mi</option> |
|
578 | 910 | </select> |
579 | 911 | </li> |
580 | 912 | <li><?php echo _("Altitude unit:"); ?> |
581 | 913 | <select class="selectpicker" onchange="unitaltitude(this);"> |
582 | - <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option> |
|
583 | - <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option> |
|
914 | + <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) { |
|
915 | + echo ' selected'; |
|
916 | +} |
|
917 | +?>>m</option> |
|
918 | + <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) { |
|
919 | + echo ' selected'; |
|
920 | +} |
|
921 | +?>>feet</option> |
|
584 | 922 | </select> |
585 | 923 | </li> |
586 | 924 | <li><?php echo _("Speed unit:"); ?> |
587 | 925 | <select class="selectpicker" onchange="unitspeed(this);"> |
588 | - <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) echo ' selected'; ?>>km/h</option> |
|
589 | - <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option> |
|
590 | - <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option> |
|
926 | + <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) { |
|
927 | + echo ' selected'; |
|
928 | +} |
|
929 | +?>>km/h</option> |
|
930 | + <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) { |
|
931 | + echo ' selected'; |
|
932 | +} |
|
933 | +?>>mph</option> |
|
934 | + <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) { |
|
935 | + echo ' selected'; |
|
936 | +} |
|
937 | +?>>knots</option> |
|
591 | 938 | </select> |
592 | 939 | </li> |
593 | 940 | |
@@ -605,9 +952,18 @@ discard block |
||
605 | 952 | <?php |
606 | 953 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
607 | 954 | ?> |
608 | - <?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 } ?> |
|
609 | - <?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 } ?> |
|
610 | - <?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 } ?> |
|
955 | + <?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'])) { |
|
956 | + print 'checked'; |
|
957 | +} |
|
958 | +?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
|
959 | + <?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'])) { |
|
960 | + print 'checked'; |
|
961 | +} |
|
962 | +?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
|
963 | + <?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'])) { |
|
964 | + print 'checked'; |
|
965 | +} |
|
966 | +?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
|
611 | 967 | <?php |
612 | 968 | } |
613 | 969 | ?> |
@@ -615,10 +971,16 @@ discard block |
||
615 | 971 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
616 | 972 | ?> |
617 | 973 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
618 | - <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> |
|
974 | + <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'])) { |
|
975 | + print 'checked'; |
|
976 | +} |
|
977 | +?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
|
619 | 978 | <?php } ?> |
620 | 979 | <?php if (isset($globalAPRS) && $globalAPRS) { ?> |
621 | - <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) print 'checked'; ?> ><?php echo _("Display APRS data"); ?></label></div></li> |
|
980 | + <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) { |
|
981 | + print 'checked'; |
|
982 | +} |
|
983 | +?> ><?php echo _("Display APRS data"); ?></label></div></li> |
|
622 | 984 | <?php } ?> |
623 | 985 | <?php |
624 | 986 | } |
@@ -635,7 +997,9 @@ discard block |
||
635 | 997 | } |
636 | 998 | foreach($allairlinenames as $airline) { |
637 | 999 | $airline_name = $airline['airline_name']; |
638 | - if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...'; |
|
1000 | + if (strlen($airline_name) > 30) { |
|
1001 | + $airline_name = substr($airline_name,0,30).'...'; |
|
1002 | + } |
|
639 | 1003 | if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) { |
640 | 1004 | echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>'; |
641 | 1005 | } else { |
@@ -653,7 +1017,10 @@ discard block |
||
653 | 1017 | <li><?php echo _("Display alliance:"); ?> |
654 | 1018 | <br/> |
655 | 1019 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
656 | - <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
1020 | + <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') { |
|
1021 | + echo ' selected'; |
|
1022 | +} |
|
1023 | +?>><?php echo _("All"); ?></option> |
|
657 | 1024 | <?php |
658 | 1025 | foreach($allalliancenames as $alliance) { |
659 | 1026 | $alliance_name = $alliance['alliance']; |
@@ -712,10 +1079,22 @@ discard block |
||
712 | 1079 | ?> |
713 | 1080 | <li><?php echo _("Display airlines of type:"); ?><br/> |
714 | 1081 | <select class="selectpicker" onchange="airlinestype(this);"> |
715 | - <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
716 | - <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option> |
|
717 | - <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option> |
|
718 | - <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option> |
|
1082 | + <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') { |
|
1083 | + echo ' selected'; |
|
1084 | +} |
|
1085 | +?>><?php echo _("All"); ?></option> |
|
1086 | + <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') { |
|
1087 | + echo ' selected'; |
|
1088 | +} |
|
1089 | +?>><?php echo _("Passenger"); ?></option> |
|
1090 | + <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') { |
|
1091 | + echo ' selected'; |
|
1092 | +} |
|
1093 | +?>><?php echo _("Cargo"); ?></option> |
|
1094 | + <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') { |
|
1095 | + echo ' selected'; |
|
1096 | +} |
|
1097 | +?>><?php echo _("Military"); ?></option> |
|
719 | 1098 | </select> |
720 | 1099 | </li> |
721 | 1100 | <?php |
@@ -729,14 +1108,20 @@ discard block |
||
729 | 1108 | ?> |
730 | 1109 | <li> |
731 | 1110 | <?php echo _("Display vessels with MMSI:"); ?> |
732 | - <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
|
1111 | + <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) { |
|
1112 | + print $_COOKIE['filter_mmsi']; |
|
1113 | +} |
|
1114 | +?>" /> |
|
733 | 1115 | </li> |
734 | 1116 | <?php |
735 | 1117 | } |
736 | 1118 | ?> |
737 | 1119 | <li> |
738 | 1120 | <?php echo _("Display with ident:"); ?> |
739 | - <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
|
1121 | + <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) { |
|
1122 | + print $_COOKIE['filter_ident']; |
|
1123 | +} |
|
1124 | +?>" /> |
|
740 | 1125 | </li> |
741 | 1126 | </ul> |
742 | 1127 | </form> |
@@ -752,7 +1137,10 @@ discard block |
||
752 | 1137 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
753 | 1138 | <form> |
754 | 1139 | <ul> |
755 | - <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) print 'checked'; ?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li> |
|
1140 | + <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if ((isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') || !isset($_COOKIE['displayiss'])) { |
|
1141 | + print 'checked'; |
|
1142 | +} |
|
1143 | +?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li> |
|
756 | 1144 | <li><?php echo _("Type:"); ?> |
757 | 1145 | <select class="selectpicker" multiple onchange="sattypes(this);"> |
758 | 1146 | <?php |
@@ -760,25 +1148,45 @@ discard block |
||
760 | 1148 | $types = $Satellite->get_tle_types(); |
761 | 1149 | foreach ($types as $type) { |
762 | 1150 | $type_name = $type['tle_type']; |
763 | - if ($type_name == 'musson') $type_name = 'Russian LEO Navigation'; |
|
764 | - else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System'; |
|
765 | - else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System'; |
|
766 | - else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational'; |
|
767 | - else if ($type_name == 'gps-ops') $type_name = 'GPS Operational'; |
|
768 | - else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System'; |
|
769 | - else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System'; |
|
770 | - else if ($type_name == 'sarsat') $type_name = 'Search & Rescue'; |
|
771 | - else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring'; |
|
772 | - else if ($type_name == 'resource') $type_name = 'Earth Resources'; |
|
773 | - else if ($type_name == 'stations') $type_name = 'Space Stations'; |
|
774 | - else if ($type_name == 'geo') $type_name = 'Geostationary'; |
|
775 | - else if ($type_name == 'amateur') $type_name = 'Amateur Radio'; |
|
776 | - else if ($type_name == 'x-comm') $type_name = 'Experimental'; |
|
777 | - else if ($type_name == 'other-comm') $type_name = 'Other Comm'; |
|
778 | - else if ($type_name == 'science') $type_name = 'Space & Earth Science'; |
|
779 | - else if ($type_name == 'military') $type_name = 'Miscellaneous Military'; |
|
780 | - else if ($type_name == 'radar') $type_name = 'Radar Calibration'; |
|
781 | - else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches'; |
|
1151 | + if ($type_name == 'musson') { |
|
1152 | + $type_name = 'Russian LEO Navigation'; |
|
1153 | + } else if ($type_name == 'nnss') { |
|
1154 | + $type_name = 'Navi Navigation Satellite System'; |
|
1155 | + } else if ($type_name == 'sbas') { |
|
1156 | + $type_name = 'Satellite-Based Augmentation System'; |
|
1157 | + } else if ($type_name == 'glo-ops') { |
|
1158 | + $type_name = 'Glonass Operational'; |
|
1159 | + } else if ($type_name == 'gps-ops') { |
|
1160 | + $type_name = 'GPS Operational'; |
|
1161 | + } else if ($type_name == 'argos') { |
|
1162 | + $type_name = 'ARGOS Data Collection System'; |
|
1163 | + } else if ($type_name == 'tdrss') { |
|
1164 | + $type_name = 'Tracking and Data Relay Satellite System'; |
|
1165 | + } else if ($type_name == 'sarsat') { |
|
1166 | + $type_name = 'Search & Rescue'; |
|
1167 | + } else if ($type_name == 'dmc') { |
|
1168 | + $type_name = 'Disaster Monitoring'; |
|
1169 | + } else if ($type_name == 'resource') { |
|
1170 | + $type_name = 'Earth Resources'; |
|
1171 | + } else if ($type_name == 'stations') { |
|
1172 | + $type_name = 'Space Stations'; |
|
1173 | + } else if ($type_name == 'geo') { |
|
1174 | + $type_name = 'Geostationary'; |
|
1175 | + } else if ($type_name == 'amateur') { |
|
1176 | + $type_name = 'Amateur Radio'; |
|
1177 | + } else if ($type_name == 'x-comm') { |
|
1178 | + $type_name = 'Experimental'; |
|
1179 | + } else if ($type_name == 'other-comm') { |
|
1180 | + $type_name = 'Other Comm'; |
|
1181 | + } else if ($type_name == 'science') { |
|
1182 | + $type_name = 'Space & Earth Science'; |
|
1183 | + } else if ($type_name == 'military') { |
|
1184 | + $type_name = 'Miscellaneous Military'; |
|
1185 | + } else if ($type_name == 'radar') { |
|
1186 | + $type_name = 'Radar Calibration'; |
|
1187 | + } else if ($type_name == 'tle-new') { |
|
1188 | + $type_name = 'Last 30 days launches'; |
|
1189 | + } |
|
782 | 1190 | |
783 | 1191 | if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) { |
784 | 1192 | print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>'; |