@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | <?php }; if (isset($globalSatellite) && $globalSatellite) { ?><td><div id="ibxsatellite"><h4><?php echo _("Satellites Displayed"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?> |
48 | 48 | </tr></table></div> |
49 | 49 | <?php |
50 | - if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
50 | + if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
51 | 51 | ?> |
52 | 52 | <script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script> |
53 | 53 | <?php |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script> |
72 | 72 | <?php |
73 | 73 | } |
74 | - } |
|
74 | + } |
|
75 | 75 | ?> |
76 | 76 | |
77 | 77 | <div id="sidebar" class="sidebar collapsed"> |
@@ -82,34 +82,34 @@ discard block |
||
82 | 82 | <li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li> |
83 | 83 | <li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li> |
84 | 84 | <?php |
85 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
85 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
86 | 86 | if (isset($globalArchive) && $globalArchive == TRUE) { |
87 | 87 | ?> |
88 | 88 | <li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li> |
89 | 89 | <?php |
90 | 90 | } |
91 | - } |
|
91 | + } |
|
92 | 92 | ?> |
93 | 93 | <li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li> |
94 | 94 | <li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li> |
95 | 95 | <li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li> |
96 | 96 | <?php |
97 | - if (isset($globalMap3D) && $globalMap3D) { |
|
97 | + if (isset($globalMap3D) && $globalMap3D) { |
|
98 | 98 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
99 | 99 | ?> |
100 | 100 | <li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li> |
101 | 101 | <?php |
102 | 102 | } else { |
103 | - if (isset($globalSatellite) && $globalSatellite) { |
|
103 | + if (isset($globalSatellite) && $globalSatellite) { |
|
104 | 104 | ?> |
105 | 105 | <li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li> |
106 | 106 | <?php |
107 | - } |
|
107 | + } |
|
108 | 108 | ?> |
109 | 109 | <li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li> |
110 | 110 | <?php |
111 | 111 | } |
112 | - } |
|
112 | + } |
|
113 | 113 | ?> |
114 | 114 | </ul> |
115 | 115 | |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | ?> |
185 | 185 | </div> |
186 | 186 | <?php |
187 | - if (isset($globalArchive) && $globalArchive == TRUE) { |
|
187 | + if (isset($globalArchive) && $globalArchive == TRUE) { |
|
188 | 188 | ?> |
189 | 189 | <div class="sidebar-pane" id="archive"> |
190 | 190 | <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | </form> |
244 | 244 | </div> |
245 | 245 | <?php |
246 | - } |
|
246 | + } |
|
247 | 247 | ?> |
248 | 248 | <div class="sidebar-pane" id="settings"> |
249 | 249 | <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -254,67 +254,67 @@ discard block |
||
254 | 254 | <?php |
255 | 255 | if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
256 | 256 | else $MapType = $_COOKIE['MapType']; |
257 | - ?> |
|
257 | + ?> |
|
258 | 258 | <?php |
259 | 259 | if (isset($globalMapOffline) && $globalMapOffline === TRUE) { |
260 | - ?> |
|
260 | + ?> |
|
261 | 261 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
262 | 262 | <?php |
263 | 263 | } else { |
264 | - if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
|
265 | - ?> |
|
264 | + if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
|
265 | + ?> |
|
266 | 266 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
267 | 267 | <?php |
268 | - } |
|
269 | - if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
270 | - ?> |
|
268 | + } |
|
269 | + if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
270 | + ?> |
|
271 | 271 | <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
272 | 272 | <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
273 | 273 | <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
274 | 274 | <?php |
275 | - } |
|
276 | - ?> |
|
275 | + } |
|
276 | + ?> |
|
277 | 277 | <?php |
278 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
279 | - ?> |
|
278 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
279 | + ?> |
|
280 | 280 | <?php |
281 | 281 | if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
282 | - ?> |
|
282 | + ?> |
|
283 | 283 | <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
284 | 284 | <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
285 | 285 | <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
286 | 286 | <?php |
287 | 287 | } |
288 | - ?> |
|
288 | + ?> |
|
289 | 289 | <?php |
290 | 290 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
291 | - ?> |
|
291 | + ?> |
|
292 | 292 | <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
293 | 293 | <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
294 | 294 | <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
295 | 295 | <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
296 | 296 | <?php |
297 | 297 | } |
298 | - ?> |
|
298 | + ?> |
|
299 | 299 | <?php |
300 | 300 | if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
301 | - ?> |
|
301 | + ?> |
|
302 | 302 | <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
303 | 303 | <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
304 | 304 | <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
305 | 305 | <?php |
306 | 306 | } |
307 | - ?> |
|
307 | + ?> |
|
308 | 308 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
309 | 309 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option> |
310 | 310 | <?php |
311 | - } |
|
312 | - ?> |
|
311 | + } |
|
312 | + ?> |
|
313 | 313 | <?php |
314 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
314 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
315 | 315 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
316 | 316 | else $MapBoxId = $_COOKIE['MapTypeId']; |
317 | - ?> |
|
317 | + ?> |
|
318 | 318 | <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option> |
319 | 319 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
320 | 320 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
@@ -329,16 +329,16 @@ discard block |
||
329 | 329 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
330 | 330 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
331 | 331 | <?php |
332 | - } |
|
333 | - ?> |
|
332 | + } |
|
333 | + ?> |
|
334 | 334 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
335 | 335 | <?php |
336 | 336 | } |
337 | - ?> |
|
337 | + ?> |
|
338 | 338 | </select> |
339 | 339 | </li> |
340 | 340 | <?php |
341 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) { |
|
341 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) { |
|
342 | 342 | ?> |
343 | 343 | <li><?php echo _("Type of Terrain:"); ?> |
344 | 344 | <select class="selectpicker" onchange="terrainType(this);"> |
@@ -349,10 +349,10 @@ discard block |
||
349 | 349 | </select> |
350 | 350 | </li> |
351 | 351 | <?php |
352 | - } |
|
352 | + } |
|
353 | 353 | ?> |
354 | 354 | <?php |
355 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
355 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
356 | 356 | ?> |
357 | 357 | <li><div class="checkbox"><label><input type="checkbox" name="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if ((isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') || (!isset($_COOKIE['Map2DBuildings']))) print 'checked'; ?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li> |
358 | 358 | |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | <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> |
372 | 372 | <?php |
373 | 373 | } |
374 | - } |
|
374 | + } |
|
375 | 375 | ?> |
376 | 376 | <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> |
377 | 377 | <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> |
@@ -383,81 +383,81 @@ discard block |
||
383 | 383 | <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> |
384 | 384 | <?php |
385 | 385 | } |
386 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
386 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
387 | 387 | ?> |
388 | 388 | <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> |
389 | 389 | <?php |
390 | - } |
|
391 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
390 | + } |
|
391 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
392 | 392 | ?> |
393 | 393 | <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> |
394 | 394 | <?php |
395 | - } |
|
395 | + } |
|
396 | 396 | ?> |
397 | 397 | <?php |
398 | 398 | if (function_exists('array_column')) { |
399 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
400 | - ?> |
|
399 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
400 | + ?> |
|
401 | 401 | <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> |
402 | 402 | <?php |
403 | - } |
|
403 | + } |
|
404 | 404 | } elseif (isset($globalSources)) { |
405 | - $dispolar = false; |
|
406 | - foreach ($globalSources as $testsource) { |
|
407 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
408 | - } |
|
409 | - if ($dispolar) { |
|
410 | - ?> |
|
405 | + $dispolar = false; |
|
406 | + foreach ($globalSources as $testsource) { |
|
407 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
408 | + } |
|
409 | + if ($dispolar) { |
|
410 | + ?> |
|
411 | 411 | <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> |
412 | 412 | <?php |
413 | - } |
|
414 | - } |
|
415 | - ?> |
|
413 | + } |
|
414 | + } |
|
415 | + ?> |
|
416 | 416 | <?php |
417 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
417 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
418 | 418 | ?> |
419 | 419 | |
420 | 420 | <?php |
421 | 421 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
422 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
423 | - ?> |
|
422 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
423 | + ?> |
|
424 | 424 | <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> |
425 | 425 | <?php |
426 | 426 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
427 | - ?> |
|
427 | + ?> |
|
428 | 428 | <li><?php echo _("Aircraft icon color:"); ?> |
429 | 429 | <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'; ?>"> |
430 | 430 | </li> |
431 | 431 | <?php |
432 | 432 | } |
433 | - } |
|
434 | - } |
|
435 | - ?> |
|
433 | + } |
|
434 | + } |
|
435 | + ?> |
|
436 | 436 | <?php |
437 | 437 | if (isset($globalMarine) && $globalMarine === TRUE) { |
438 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
439 | - ?> |
|
438 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
439 | + ?> |
|
440 | 440 | <li><?php echo _("Marine icon color:"); ?> |
441 | 441 | <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'; ?>"> |
442 | 442 | </li> |
443 | 443 | <?php |
444 | - } |
|
445 | - } |
|
446 | - ?> |
|
444 | + } |
|
445 | + } |
|
446 | + ?> |
|
447 | 447 | <?php |
448 | 448 | if (isset($globalTracker) && $globalTracker === TRUE) { |
449 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
450 | - ?> |
|
449 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
450 | + ?> |
|
451 | 451 | <li><?php echo _("Tracker icon color:"); ?> |
452 | 452 | <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'; ?>"> |
453 | 453 | </li> |
454 | 454 | <?php |
455 | - } |
|
456 | - } |
|
457 | - ?> |
|
455 | + } |
|
456 | + } |
|
457 | + ?> |
|
458 | 458 | <?php |
459 | 459 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
460 | - ?> |
|
460 | + ?> |
|
461 | 461 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
462 | 462 | <div class="range"> |
463 | 463 | <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'; ?>"> |
@@ -466,9 +466,9 @@ discard block |
||
466 | 466 | </li> |
467 | 467 | <?php |
468 | 468 | } |
469 | - ?> |
|
469 | + ?> |
|
470 | 470 | <?php |
471 | - } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
471 | + } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
472 | 472 | ?> |
473 | 473 | <?php |
474 | 474 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
@@ -500,7 +500,7 @@ discard block |
||
500 | 500 | </li> |
501 | 501 | <?php |
502 | 502 | } |
503 | - } |
|
503 | + } |
|
504 | 504 | ?> |
505 | 505 | <li><?php echo _("Distance unit:"); ?> |
506 | 506 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -533,19 +533,19 @@ discard block |
||
533 | 533 | <ul> |
534 | 534 | <?php |
535 | 535 | if (!isset($globalAircraft) || $globalAircraft) { |
536 | - ?> |
|
536 | + ?> |
|
537 | 537 | <?php |
538 | 538 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
539 | - ?> |
|
539 | + ?> |
|
540 | 540 | <?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 } ?> |
541 | 541 | <?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 } ?> |
542 | 542 | <?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 } ?> |
543 | 543 | <?php |
544 | 544 | } |
545 | - ?> |
|
545 | + ?> |
|
546 | 546 | <?php |
547 | 547 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
548 | - ?> |
|
548 | + ?> |
|
549 | 549 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
550 | 550 | <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> |
551 | 551 | <?php } ?> |
@@ -554,7 +554,7 @@ discard block |
||
554 | 554 | <?php } ?> |
555 | 555 | <?php |
556 | 556 | } |
557 | - ?> |
|
557 | + ?> |
|
558 | 558 | <li><?php echo _("Display airlines:"); ?> |
559 | 559 | <br/> |
560 | 560 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -574,14 +574,14 @@ discard block |
||
574 | 574 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
575 | 575 | } |
576 | 576 | } |
577 | - ?> |
|
577 | + ?> |
|
578 | 578 | </select> |
579 | 579 | </li> |
580 | 580 | <?php |
581 | 581 | $Spotter = new Spotter(); |
582 | 582 | $allalliancenames = $Spotter->getAllAllianceNames(); |
583 | 583 | if (!empty($allalliancenames)) { |
584 | - ?> |
|
584 | + ?> |
|
585 | 585 | <li><?php echo _("Display alliance:"); ?> |
586 | 586 | <br/> |
587 | 587 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -595,18 +595,18 @@ discard block |
||
595 | 595 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
596 | 596 | } |
597 | 597 | } |
598 | - ?> |
|
598 | + ?> |
|
599 | 599 | </select> |
600 | 600 | </li> |
601 | 601 | <?php |
602 | 602 | } |
603 | - ?> |
|
603 | + ?> |
|
604 | 604 | <?php |
605 | 605 | } |
606 | - ?> |
|
606 | + ?> |
|
607 | 607 | <?php |
608 | 608 | if (isset($globalAPRS) && $globalAPRS) { |
609 | - ?> |
|
609 | + ?> |
|
610 | 610 | <li><?php echo _("Display APRS sources name:"); ?> |
611 | 611 | <select class="selectpicker" multiple onchange="sources(this);"> |
612 | 612 | <?php |
@@ -630,18 +630,18 @@ discard block |
||
630 | 630 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
631 | 631 | } |
632 | 632 | } |
633 | - ?> |
|
633 | + ?> |
|
634 | 634 | </select> |
635 | 635 | </li> |
636 | 636 | <?php |
637 | 637 | } |
638 | - ?> |
|
638 | + ?> |
|
639 | 639 | <?php |
640 | 640 | if (!isset($globalAircraft) || $globalAircraft) { |
641 | - ?> |
|
641 | + ?> |
|
642 | 642 | <?php |
643 | - if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
644 | - ?> |
|
643 | + if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
644 | + ?> |
|
645 | 645 | <li><?php echo _("Display airlines of type:"); ?><br/> |
646 | 646 | <select class="selectpicker" onchange="airlinestype(this);"> |
647 | 647 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -651,21 +651,21 @@ discard block |
||
651 | 651 | </select> |
652 | 652 | </li> |
653 | 653 | <?php |
654 | - } |
|
655 | - ?> |
|
654 | + } |
|
655 | + ?> |
|
656 | 656 | <?php |
657 | 657 | } |
658 | - ?> |
|
658 | + ?> |
|
659 | 659 | <?php |
660 | 660 | if (isset($globalMarine) && $globalMarine) { |
661 | - ?> |
|
661 | + ?> |
|
662 | 662 | <li> |
663 | 663 | <?php echo _("Display vessels with MMSI:"); ?> |
664 | 664 | <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
665 | 665 | </li> |
666 | 666 | <?php |
667 | 667 | } |
668 | - ?> |
|
668 | + ?> |
|
669 | 669 | <li> |
670 | 670 | <?php echo _("Display with ident:"); ?> |
671 | 671 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
@@ -678,7 +678,7 @@ discard block |
||
678 | 678 | </form> |
679 | 679 | </div> |
680 | 680 | <?php |
681 | - if (isset($globalSatellite) && $globalSatellite) { |
|
681 | + if (isset($globalSatellite) && $globalSatellite) { |
|
682 | 682 | ?> |
683 | 683 | <div class="sidebar-pane" id="satellites"> |
684 | 684 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -718,14 +718,14 @@ discard block |
||
718 | 718 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
719 | 719 | } |
720 | 720 | } |
721 | - ?> |
|
721 | + ?> |
|
722 | 722 | </select> |
723 | 723 | </li> |
724 | 724 | </ul> |
725 | 725 | </form> |
726 | 726 | </div> |
727 | 727 | <?php |
728 | - } |
|
728 | + } |
|
729 | 729 | ?> |
730 | 730 | </div> |
731 | 731 | </div> |
@@ -49,7 +49,10 @@ discard block |
||
49 | 49 | <?php |
50 | 50 | if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
51 | 51 | ?> |
52 | -<script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script> |
|
52 | +<script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) { |
|
53 | + print '?tsk='.$tsk; |
|
54 | +} |
|
55 | +?>"></script> |
|
53 | 56 | <?php |
54 | 57 | if (!isset($globalAircraft) || $globalAircraft) { |
55 | 58 | ?> |
@@ -163,11 +166,26 @@ discard block |
||
163 | 166 | <li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam();" /><?php echo _("Display NOTAM"); ?></label></div></li> |
164 | 167 | <li><?php echo _("NOTAM scope:"); ?> |
165 | 168 | <select class="selectpicker" onchange="notamscope(this);"> |
166 | - <option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') print ' selected'; ?>>All</option> |
|
167 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') print ' selected'; ?>>Airport/Enroute warning</option> |
|
168 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') print ' selected'; ?>>Airport warning</option> |
|
169 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') print ' selected'; ?>>Navigation warning</option> |
|
170 | - <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') print ' selected'; ?>>Enroute warning</option> |
|
169 | + <option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') { |
|
170 | + print ' selected'; |
|
171 | +} |
|
172 | +?>>All</option> |
|
173 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') { |
|
174 | + print ' selected'; |
|
175 | +} |
|
176 | +?>>Airport/Enroute warning</option> |
|
177 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') { |
|
178 | + print ' selected'; |
|
179 | +} |
|
180 | +?>>Airport warning</option> |
|
181 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') { |
|
182 | + print ' selected'; |
|
183 | +} |
|
184 | +?>>Navigation warning</option> |
|
185 | + <option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') { |
|
186 | + print ' selected'; |
|
187 | +} |
|
188 | +?>>Enroute warning</option> |
|
171 | 189 | </select |
172 | 190 | </li> |
173 | 191 | </ul> |
@@ -195,7 +213,12 @@ discard block |
||
195 | 213 | <div class="form-group"> |
196 | 214 | <label>From (UTC):</label> |
197 | 215 | <div class='input-group date' id='datetimepicker1'> |
198 | - <input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required /> |
|
216 | + <input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) { |
|
217 | + print $_POST['start_date']; |
|
218 | +} elseif (isset($_COOKIE['archive_begin'])) { |
|
219 | + print date("m/d/Y h:i a",$_COOKIE['archive_begin']); |
|
220 | +} |
|
221 | +?>" required /> |
|
199 | 222 | <span class="input-group-addon"> |
200 | 223 | <span class="glyphicon glyphicon-calendar"></span> |
201 | 224 | </span> |
@@ -204,7 +227,12 @@ discard block |
||
204 | 227 | <div class="form-group"> |
205 | 228 | <label>To (UTC):</label> |
206 | 229 | <div class='input-group date' id='datetimepicker2'> |
207 | - <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" /> |
|
230 | + <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) { |
|
231 | + print $_POST['end_date']; |
|
232 | +} elseif (isset($_COOKIE['archive_end'])) { |
|
233 | + print date("m/d/Y h:i a",$_COOKIE['archive_end']); |
|
234 | +} |
|
235 | +?>" /> |
|
208 | 236 | <span class="input-group-addon"> |
209 | 237 | <span class="glyphicon glyphicon-calendar"></span> |
210 | 238 | </span> |
@@ -229,8 +257,20 @@ discard block |
||
229 | 257 | </script> |
230 | 258 | <li><?php echo _("Playback speed:"); ?> |
231 | 259 | <div class="range"> |
232 | - <input type="range" min="0" max="50" step="1" 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'; ?>"> |
|
233 | - <output id="archivespeedrange"><?php if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output> |
|
260 | + <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php if (isset($_POST['archivespeed'])) { |
|
261 | + print $_POST['archivespeed']; |
|
262 | +} elseif (isset($_COOKIE['archive_speed'])) { |
|
263 | + print $_COOKIE['archive_speed']; |
|
264 | +} else { |
|
265 | + print '1'; |
|
266 | +} |
|
267 | +?>"> |
|
268 | + <output id="archivespeedrange"><?php if (isset($_COOKIE['archive_speed'])) { |
|
269 | + print $_COOKIE['archive_speed']; |
|
270 | +} else { |
|
271 | + print '1'; |
|
272 | +} |
|
273 | +?></output> |
|
234 | 274 | </div> |
235 | 275 | </li> |
236 | 276 | <li><input type="submit" name="archive" value="Show archive" class="btn btn-primary" /></li> |
@@ -252,25 +292,43 @@ discard block |
||
252 | 292 | <li><?php echo _("Type of Map:"); ?> |
253 | 293 | <select class="selectpicker" onchange="mapType(this);"> |
254 | 294 | <?php |
255 | - if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
|
256 | - else $MapType = $_COOKIE['MapType']; |
|
295 | + if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') { |
|
296 | + $MapType = $globalMapProvider; |
|
297 | + } else { |
|
298 | + $MapType = $_COOKIE['MapType']; |
|
299 | + } |
|
257 | 300 | ?> |
258 | 301 | <?php |
259 | 302 | if (isset($globalMapOffline) && $globalMapOffline === TRUE) { |
260 | 303 | ?> |
261 | - <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
|
304 | + <option value="offline"<?php if ($MapType == 'offline') { |
|
305 | + print ' selected'; |
|
306 | +} |
|
307 | +?>>Natural Earth (local)</option> |
|
262 | 308 | <?php |
263 | 309 | } else { |
264 | 310 | if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
265 | 311 | ?> |
266 | - <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
|
312 | + <option value="offline"<?php if ($MapType == 'offline') { |
|
313 | + print ' selected'; |
|
314 | +} |
|
315 | +?>>Natural Earth (local)</option> |
|
267 | 316 | <?php |
268 | 317 | } |
269 | 318 | if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
270 | 319 | ?> |
271 | - <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
|
272 | - <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
|
273 | - <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
|
320 | + <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') { |
|
321 | + print ' selected'; |
|
322 | +} |
|
323 | +?>>Bing-Aerial</option> |
|
324 | + <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') { |
|
325 | + print ' selected'; |
|
326 | +} |
|
327 | +?>>Bing-Hybrid</option> |
|
328 | + <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') { |
|
329 | + print ' selected'; |
|
330 | +} |
|
331 | +?>>Bing-Road</option> |
|
274 | 332 | <?php |
275 | 333 | } |
276 | 334 | ?> |
@@ -280,58 +338,139 @@ discard block |
||
280 | 338 | <?php |
281 | 339 | if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
282 | 340 | ?> |
283 | - <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
|
284 | - <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
|
285 | - <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
|
341 | + <option value="Here-Aerial"<?php if ($MapType == 'Here') { |
|
342 | + print ' selected'; |
|
343 | +} |
|
344 | +?>>Here-Aerial</option> |
|
345 | + <option value="Here-Hybrid"<?php if ($MapType == 'Here') { |
|
346 | + print ' selected'; |
|
347 | +} |
|
348 | +?>>Here-Hybrid</option> |
|
349 | + <option value="Here-Road"<?php if ($MapType == 'Here') { |
|
350 | + print ' selected'; |
|
351 | +} |
|
352 | +?>>Here-Road</option> |
|
286 | 353 | <?php |
287 | 354 | } |
288 | 355 | ?> |
289 | 356 | <?php |
290 | 357 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
291 | 358 | ?> |
292 | - <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
|
293 | - <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
|
294 | - <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
|
295 | - <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
|
359 | + <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') { |
|
360 | + print ' selected'; |
|
361 | +} |
|
362 | +?>>Google Roadmap</option> |
|
363 | + <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') { |
|
364 | + print ' selected'; |
|
365 | +} |
|
366 | +?>>Google Satellite</option> |
|
367 | + <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') { |
|
368 | + print ' selected'; |
|
369 | +} |
|
370 | +?>>Google Hybrid</option> |
|
371 | + <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') { |
|
372 | + print ' selected'; |
|
373 | +} |
|
374 | +?>>Google Terrain</option> |
|
296 | 375 | <?php |
297 | 376 | } |
298 | 377 | ?> |
299 | 378 | <?php |
300 | 379 | if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
301 | 380 | ?> |
302 | - <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
|
303 | - <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
|
304 | - <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
|
381 | + <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') { |
|
382 | + print ' selected'; |
|
383 | +} |
|
384 | +?>>MapQuest-OSM</option> |
|
385 | + <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') { |
|
386 | + print ' selected'; |
|
387 | +} |
|
388 | +?>>MapQuest-Aerial</option> |
|
389 | + <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') { |
|
390 | + print ' selected'; |
|
391 | +} |
|
392 | +?>>MapQuest-Hybrid</option> |
|
305 | 393 | <?php |
306 | 394 | } |
307 | 395 | ?> |
308 | - <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
|
309 | - <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option> |
|
396 | + <option value="Yandex"<?php if ($MapType == 'Yandex') { |
|
397 | + print ' selected'; |
|
398 | +} |
|
399 | +?>>Yandex</option> |
|
400 | + <option value="offline"<?php if ($MapType == 'offline') { |
|
401 | + print ' selected'; |
|
402 | +} |
|
403 | +?>>Natural Earth</option> |
|
310 | 404 | <?php |
311 | 405 | } |
312 | 406 | ?> |
313 | 407 | <?php |
314 | 408 | if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
315 | - if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
|
316 | - else $MapBoxId = $_COOKIE['MapTypeId']; |
|
409 | + if (!isset($_COOKIE['MapTypeId'])) { |
|
410 | + $MapBoxId = 'default'; |
|
411 | + } else { |
|
412 | + $MapBoxId = $_COOKIE['MapTypeId']; |
|
413 | + } |
|
317 | 414 | ?> |
318 | - <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option> |
|
319 | - <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
|
320 | - <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
|
321 | - <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
|
322 | - <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option> |
|
323 | - <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option> |
|
324 | - <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option> |
|
325 | - <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option> |
|
326 | - <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option> |
|
327 | - <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option> |
|
328 | - <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option> |
|
329 | - <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
|
330 | - <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
|
415 | + <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') { |
|
416 | + print ' selected'; |
|
417 | +} |
|
418 | +?>>Mapbox GL</option> |
|
419 | + <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') { |
|
420 | + print ' selected'; |
|
421 | +} |
|
422 | +?>>Mapbox default</option> |
|
423 | + <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') { |
|
424 | + print ' selected'; |
|
425 | +} |
|
426 | +?>>Mapbox streets</option> |
|
427 | + <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') { |
|
428 | + print ' selected'; |
|
429 | +} |
|
430 | +?>>Mapbox light</option> |
|
431 | + <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') { |
|
432 | + print ' selected'; |
|
433 | +} |
|
434 | +?>>Mapbox dark</option> |
|
435 | + <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') { |
|
436 | + print ' selected'; |
|
437 | +} |
|
438 | +?>>Mapbox satellite</option> |
|
439 | + <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') { |
|
440 | + print ' selected'; |
|
441 | +} |
|
442 | +?>>Mapbox streets-satellite</option> |
|
443 | + <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') { |
|
444 | + print ' selected'; |
|
445 | +} |
|
446 | +?>>Mapbox streets-basic</option> |
|
447 | + <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') { |
|
448 | + print ' selected'; |
|
449 | +} |
|
450 | +?>>Mapbox comic</option> |
|
451 | + <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') { |
|
452 | + print ' selected'; |
|
453 | +} |
|
454 | +?>>Mapbox outdoors</option> |
|
455 | + <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') { |
|
456 | + print ' selected'; |
|
457 | +} |
|
458 | +?>>Mapbox pencil</option> |
|
459 | + <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') { |
|
460 | + print ' selected'; |
|
461 | +} |
|
462 | +?>>Mapbox pirates</option> |
|
463 | + <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') { |
|
464 | + print ' selected'; |
|
465 | +} |
|
466 | +?>>Mapbox emerald</option> |
|
331 | 467 | <?php |
332 | 468 | } |
333 | 469 | ?> |
334 | - <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
|
470 | + <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') { |
|
471 | + print ' selected'; |
|
472 | +} |
|
473 | +?>>OpenStreetMap</option> |
|
335 | 474 | <?php |
336 | 475 | } |
337 | 476 | ?> |
@@ -342,10 +481,22 @@ discard block |
||
342 | 481 | ?> |
343 | 482 | <li><?php echo _("Type of Terrain:"); ?> |
344 | 483 | <select class="selectpicker" onchange="terrainType(this);"> |
345 | - <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option> |
|
346 | - <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option> |
|
347 | - <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option> |
|
348 | - <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option> |
|
484 | + <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') { |
|
485 | + print ' selected'; |
|
486 | +} |
|
487 | +?>>stk terrain</option> |
|
488 | + <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') { |
|
489 | + print ' selected'; |
|
490 | +} |
|
491 | +?>>ellipsoid</option> |
|
492 | + <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') { |
|
493 | + print ' selected'; |
|
494 | +} |
|
495 | +?>>vr terrain</option> |
|
496 | + <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') { |
|
497 | + print ' selected'; |
|
498 | +} |
|
499 | +?>>ArticDEM</option> |
|
349 | 500 | </select> |
350 | 501 | </li> |
351 | 502 | <?php |
@@ -354,38 +505,77 @@ discard block |
||
354 | 505 | <?php |
355 | 506 | if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
356 | 507 | ?> |
357 | - <li><div class="checkbox"><label><input type="checkbox" name="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if ((isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') || (!isset($_COOKIE['Map2DBuildings']))) print 'checked'; ?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li> |
|
508 | + <li><div class="checkbox"><label><input type="checkbox" name="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if ((isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') || (!isset($_COOKIE['Map2DBuildings']))) { |
|
509 | + print 'checked'; |
|
510 | +} |
|
511 | +?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li> |
|
358 | 512 | |
359 | 513 | <?php |
360 | 514 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
361 | 515 | ?> |
362 | - <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> |
|
363 | - <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> |
|
364 | - <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
|
365 | - <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> |
|
366 | - <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> |
|
516 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') { |
|
517 | + print 'checked'; |
|
518 | +} |
|
519 | +?> ><?php echo _("Display flight info as popup"); ?></label></div></li> |
|
520 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) { |
|
521 | + print 'checked'; |
|
522 | +} |
|
523 | +?> ><?php echo _("Display flight path"); ?></label></div></li> |
|
524 | + <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) { |
|
525 | + print 'checked'; |
|
526 | +} |
|
527 | +?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
|
528 | + <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)) { |
|
529 | + print 'checked'; |
|
530 | +} |
|
531 | +?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li> |
|
532 | + <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)) { |
|
533 | + print 'checked'; |
|
534 | +} |
|
535 | +?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
|
367 | 536 | <?php |
368 | 537 | } |
369 | 538 | if (isset($globalSatellite) && $globalSatellite === TRUE) { |
370 | 539 | ?> |
371 | - <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> |
|
540 | + <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)) { |
|
541 | + print 'checked'; |
|
542 | +} |
|
543 | +?> ><?php echo _("Satellites animate between updates"); ?></label></div></li> |
|
372 | 544 | <?php |
373 | 545 | } |
374 | 546 | } |
375 | 547 | ?> |
376 | - <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> |
|
377 | - <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> |
|
378 | - <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> |
|
379 | - <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> |
|
548 | + <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'])) { |
|
549 | + print 'checked'; |
|
550 | +} |
|
551 | +?> ><?php echo _("Display airports on map"); ?></label></div></li> |
|
552 | + <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))) { |
|
553 | + print 'checked'; |
|
554 | +} |
|
555 | +?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
|
556 | + <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))) { |
|
557 | + print 'checked'; |
|
558 | +} |
|
559 | +?> ><?php echo _("Display weather station on map"); ?></label></div></li> |
|
560 | + <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))) { |
|
561 | + print 'checked'; |
|
562 | +} |
|
563 | +?> ><?php echo _("Display lightning on map"); ?></label></div></li> |
|
380 | 564 | <?php |
381 | 565 | if (isset($globalFires)) { |
382 | 566 | ?> |
383 | - <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> |
|
567 | + <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))) { |
|
568 | + print 'checked'; |
|
569 | +} |
|
570 | +?> ><?php echo _("Display fires on map"); ?></label></div></li> |
|
384 | 571 | <?php |
385 | 572 | } |
386 | 573 | if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
387 | 574 | ?> |
388 | - <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> |
|
575 | + <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')) { |
|
576 | + print 'checked'; |
|
577 | +} |
|
578 | +?> ><?php echo _("Show mini-map"); ?></label></div></li> |
|
389 | 579 | <?php |
390 | 580 | } |
391 | 581 | if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
@@ -398,17 +588,25 @@ discard block |
||
398 | 588 | if (function_exists('array_column')) { |
399 | 589 | if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
400 | 590 | ?> |
401 | - <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> |
|
591 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
592 | + print 'checked'; |
|
593 | +} |
|
594 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
402 | 595 | <?php |
403 | 596 | } |
404 | 597 | } elseif (isset($globalSources)) { |
405 | 598 | $dispolar = false; |
406 | 599 | foreach ($globalSources as $testsource) { |
407 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
600 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) { |
|
601 | + $dispolar = true; |
|
602 | + } |
|
408 | 603 | } |
409 | 604 | if ($dispolar) { |
410 | 605 | ?> |
411 | - <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> |
|
606 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
607 | + print 'checked'; |
|
608 | +} |
|
609 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
412 | 610 | <?php |
413 | 611 | } |
414 | 612 | } |
@@ -421,12 +619,22 @@ discard block |
||
421 | 619 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
422 | 620 | if (extension_loaded('gd') && function_exists('gd_info')) { |
423 | 621 | ?> |
424 | - <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> |
|
622 | + <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') { |
|
623 | + print 'checked'; |
|
624 | +} |
|
625 | +?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
|
425 | 626 | <?php |
426 | 627 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
427 | 628 | ?> |
428 | 629 | <li><?php echo _("Aircraft icon color:"); ?> |
429 | - <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'; ?>"> |
|
630 | + <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
631 | + print $_COOKIE['IconColor']; |
|
632 | +} elseif (isset($globalAircraftIconColor)) { |
|
633 | + print $globalAircraftIconColor; |
|
634 | +} else { |
|
635 | + print '1a3151'; |
|
636 | +} |
|
637 | +?>"> |
|
430 | 638 | </li> |
431 | 639 | <?php |
432 | 640 | } |
@@ -438,7 +646,14 @@ discard block |
||
438 | 646 | if (extension_loaded('gd') && function_exists('gd_info')) { |
439 | 647 | ?> |
440 | 648 | <li><?php echo _("Marine icon color:"); ?> |
441 | - <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'; ?>"> |
|
649 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
650 | + print $_COOKIE['MarineIconColor']; |
|
651 | +} elseif (isset($globalMarineIconColor)) { |
|
652 | + print $globalMarineIconColor; |
|
653 | +} else { |
|
654 | + print '1a3151'; |
|
655 | +} |
|
656 | +?>"> |
|
442 | 657 | </li> |
443 | 658 | <?php |
444 | 659 | } |
@@ -449,7 +664,14 @@ discard block |
||
449 | 664 | if (extension_loaded('gd') && function_exists('gd_info')) { |
450 | 665 | ?> |
451 | 666 | <li><?php echo _("Tracker icon color:"); ?> |
452 | - <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'; ?>"> |
|
667 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
668 | + print $_COOKIE['TrackerIconColor']; |
|
669 | +} elseif (isset($globalTrackerIconColor)) { |
|
670 | + print $globalTrackerIconColor; |
|
671 | +} else { |
|
672 | + print '1a3151'; |
|
673 | +} |
|
674 | +?>"> |
|
453 | 675 | </li> |
454 | 676 | <?php |
455 | 677 | } |
@@ -460,8 +682,22 @@ discard block |
||
460 | 682 | ?> |
461 | 683 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
462 | 684 | <div class="range"> |
463 | - <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'; ?>"> |
|
464 | - <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output> |
|
685 | + <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) { |
|
686 | + print $_COOKIE['AirportZoom']; |
|
687 | +} elseif (isset($globalAirportZoom)) { |
|
688 | + print $globalAirportZoom; |
|
689 | +} else { |
|
690 | + print '7'; |
|
691 | +} |
|
692 | +?>"> |
|
693 | + <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) { |
|
694 | + print $_COOKIE['AirportZoom']; |
|
695 | +} elseif (isset($globalAirportZoom)) { |
|
696 | + print $globalAirportZoom; |
|
697 | +} else { |
|
698 | + print '7'; |
|
699 | +} |
|
700 | +?></output> |
|
465 | 701 | </div> |
466 | 702 | </li> |
467 | 703 | <?php |
@@ -473,10 +709,23 @@ discard block |
||
473 | 709 | <?php |
474 | 710 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
475 | 711 | ?> |
476 | - <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> |
|
477 | - <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"); ?></li> |
|
712 | + <li><input type="checkbox" name="useliveries" value="1" onclick="useLiveries(this)" <?php if (isset($_COOKIE['UseLiveries']) && $_COOKIE['UseLiveries'] == 'true') { |
|
713 | + print 'checked'; |
|
714 | +} |
|
715 | +?> ><?php echo _("Use airlines liveries"); ?></li> |
|
716 | + <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') { |
|
717 | + print 'checked'; |
|
718 | +} |
|
719 | +?> ><?php echo _("Force Aircraft color"); ?></li> |
|
478 | 720 | <li><?php echo _("Aircraft icon color:"); ?> |
479 | - <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'; ?>"> |
|
721 | + <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
722 | + print $_COOKIE['IconColor']; |
|
723 | +} elseif (isset($globalAircraftIconColor)) { |
|
724 | + print $globalAircraftIconColor; |
|
725 | +} else { |
|
726 | + print 'ff0000'; |
|
727 | +} |
|
728 | +?>"> |
|
480 | 729 | </li> |
481 | 730 | <?php |
482 | 731 | } |
@@ -484,9 +733,19 @@ discard block |
||
484 | 733 | <?php |
485 | 734 | if (isset($globalMarine) && $globalMarine === TRUE) { |
486 | 735 | ?> |
487 | - <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"); ?></li> |
|
736 | + <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') { |
|
737 | + print 'checked'; |
|
738 | +} |
|
739 | +?> ><?php echo _("Force Marine color"); ?></li> |
|
488 | 740 | <li><?php echo _("Marine icon color:"); ?> |
489 | - <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'; ?>"> |
|
741 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
742 | + print $_COOKIE['MarineIconColor']; |
|
743 | +} elseif (isset($globalMarineIconColor)) { |
|
744 | + print $globalMarineIconColor; |
|
745 | +} else { |
|
746 | + print 'ff0000'; |
|
747 | +} |
|
748 | +?>"> |
|
490 | 749 | </li> |
491 | 750 | <?php |
492 | 751 | } |
@@ -494,9 +753,19 @@ discard block |
||
494 | 753 | <?php |
495 | 754 | if (isset($globalTracker) && $globalTracker === TRUE) { |
496 | 755 | ?> |
497 | - <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"); ?></li> |
|
756 | + <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') { |
|
757 | + print 'checked'; |
|
758 | +} |
|
759 | +?> ><?php echo _("Force Tracker color"); ?></li> |
|
498 | 760 | <li><?php echo _("Tracker icon color:"); ?> |
499 | - <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'; ?>"> |
|
761 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
762 | + print $_COOKIE['TrackerIconColor']; |
|
763 | +} elseif (isset($globalTrackerIconColor)) { |
|
764 | + print $globalTrackerIconColor; |
|
765 | +} else { |
|
766 | + print 'ff0000'; |
|
767 | +} |
|
768 | +?>"> |
|
500 | 769 | </li> |
501 | 770 | <?php |
502 | 771 | } |
@@ -504,22 +773,46 @@ discard block |
||
504 | 773 | ?> |
505 | 774 | <li><?php echo _("Distance unit:"); ?> |
506 | 775 | <select class="selectpicker" onchange="unitdistance(this);"> |
507 | - <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option> |
|
508 | - <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option> |
|
509 | - <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option> |
|
776 | + <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) { |
|
777 | + echo ' selected'; |
|
778 | +} |
|
779 | +?>>km</option> |
|
780 | + <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
|
781 | + echo ' selected'; |
|
782 | +} |
|
783 | +?>>nm</option> |
|
784 | + <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
|
785 | + echo ' selected'; |
|
786 | +} |
|
787 | +?>>mi</option> |
|
510 | 788 | </select> |
511 | 789 | </li> |
512 | 790 | <li><?php echo _("Altitude unit:"); ?> |
513 | 791 | <select class="selectpicker" onchange="unitaltitude(this);"> |
514 | - <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option> |
|
515 | - <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option> |
|
792 | + <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) { |
|
793 | + echo ' selected'; |
|
794 | +} |
|
795 | +?>>m</option> |
|
796 | + <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) { |
|
797 | + echo ' selected'; |
|
798 | +} |
|
799 | +?>>feet</option> |
|
516 | 800 | </select> |
517 | 801 | </li> |
518 | 802 | <li><?php echo _("Speed unit:"); ?> |
519 | 803 | <select class="selectpicker" onchange="unitspeed(this);"> |
520 | - <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> |
|
521 | - <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option> |
|
522 | - <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option> |
|
804 | + <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) { |
|
805 | + echo ' selected'; |
|
806 | +} |
|
807 | +?>>km/h</option> |
|
808 | + <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) { |
|
809 | + echo ' selected'; |
|
810 | +} |
|
811 | +?>>mph</option> |
|
812 | + <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) { |
|
813 | + echo ' selected'; |
|
814 | +} |
|
815 | +?>>knots</option> |
|
523 | 816 | </select> |
524 | 817 | </li> |
525 | 818 | |
@@ -537,9 +830,18 @@ discard block |
||
537 | 830 | <?php |
538 | 831 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
539 | 832 | ?> |
540 | - <?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 } ?> |
|
541 | - <?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 } ?> |
|
542 | - <?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 } ?> |
|
833 | + <?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'])) { |
|
834 | + print 'checked'; |
|
835 | +} |
|
836 | +?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
|
837 | + <?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'])) { |
|
838 | + print 'checked'; |
|
839 | +} |
|
840 | +?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
|
841 | + <?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'])) { |
|
842 | + print 'checked'; |
|
843 | +} |
|
844 | +?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
|
543 | 845 | <?php |
544 | 846 | } |
545 | 847 | ?> |
@@ -547,10 +849,16 @@ discard block |
||
547 | 849 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
548 | 850 | ?> |
549 | 851 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
550 | - <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> |
|
852 | + <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'])) { |
|
853 | + print 'checked'; |
|
854 | +} |
|
855 | +?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
|
551 | 856 | <?php } ?> |
552 | 857 | <?php if (isset($globalAPRS) && $globalAPRS) { ?> |
553 | - <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> |
|
858 | + <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'])) { |
|
859 | + print 'checked'; |
|
860 | +} |
|
861 | +?> ><?php echo _("Display APRS data"); ?></label></div></li> |
|
554 | 862 | <?php } ?> |
555 | 863 | <?php |
556 | 864 | } |
@@ -567,7 +875,9 @@ discard block |
||
567 | 875 | } |
568 | 876 | foreach($allairlinenames as $airline) { |
569 | 877 | $airline_name = $airline['airline_name']; |
570 | - if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...'; |
|
878 | + if (strlen($airline_name) > 30) { |
|
879 | + $airline_name = substr($airline_name,0,30).'...'; |
|
880 | + } |
|
571 | 881 | if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) { |
572 | 882 | echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>'; |
573 | 883 | } else { |
@@ -585,7 +895,10 @@ discard block |
||
585 | 895 | <li><?php echo _("Display alliance:"); ?> |
586 | 896 | <br/> |
587 | 897 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
588 | - <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
898 | + <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') { |
|
899 | + echo ' selected'; |
|
900 | +} |
|
901 | +?>><?php echo _("All"); ?></option> |
|
589 | 902 | <?php |
590 | 903 | foreach($allalliancenames as $alliance) { |
591 | 904 | $alliance_name = $alliance['alliance']; |
@@ -644,10 +957,22 @@ discard block |
||
644 | 957 | ?> |
645 | 958 | <li><?php echo _("Display airlines of type:"); ?><br/> |
646 | 959 | <select class="selectpicker" onchange="airlinestype(this);"> |
647 | - <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
648 | - <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option> |
|
649 | - <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option> |
|
650 | - <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option> |
|
960 | + <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') { |
|
961 | + echo ' selected'; |
|
962 | +} |
|
963 | +?>><?php echo _("All"); ?></option> |
|
964 | + <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') { |
|
965 | + echo ' selected'; |
|
966 | +} |
|
967 | +?>><?php echo _("Passenger"); ?></option> |
|
968 | + <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') { |
|
969 | + echo ' selected'; |
|
970 | +} |
|
971 | +?>><?php echo _("Cargo"); ?></option> |
|
972 | + <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') { |
|
973 | + echo ' selected'; |
|
974 | +} |
|
975 | +?>><?php echo _("Military"); ?></option> |
|
651 | 976 | </select> |
652 | 977 | </li> |
653 | 978 | <?php |
@@ -661,14 +986,20 @@ discard block |
||
661 | 986 | ?> |
662 | 987 | <li> |
663 | 988 | <?php echo _("Display vessels with MMSI:"); ?> |
664 | - <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
|
989 | + <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) { |
|
990 | + print $_COOKIE['filter_mmsi']; |
|
991 | +} |
|
992 | +?>" /> |
|
665 | 993 | </li> |
666 | 994 | <?php |
667 | 995 | } |
668 | 996 | ?> |
669 | 997 | <li> |
670 | 998 | <?php echo _("Display with ident:"); ?> |
671 | - <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
|
999 | + <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) { |
|
1000 | + print $_COOKIE['filter_ident']; |
|
1001 | +} |
|
1002 | +?>" /> |
|
672 | 1003 | </li> |
673 | 1004 | </ul> |
674 | 1005 | </form> |
@@ -684,7 +1015,10 @@ discard block |
||
684 | 1015 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
685 | 1016 | <form> |
686 | 1017 | <ul> |
687 | - <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> |
|
1018 | + <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'])) { |
|
1019 | + print 'checked'; |
|
1020 | +} |
|
1021 | +?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li> |
|
688 | 1022 | <li><?php echo _("Type:"); ?> |
689 | 1023 | <select class="selectpicker" multiple onchange="sattypes(this);"> |
690 | 1024 | <?php |
@@ -692,25 +1026,45 @@ discard block |
||
692 | 1026 | $types = $Satellite->get_tle_types(); |
693 | 1027 | foreach ($types as $type) { |
694 | 1028 | $type_name = $type['tle_type']; |
695 | - if ($type_name == 'musson') $type_name = 'Russian LEO Navigation'; |
|
696 | - else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System'; |
|
697 | - else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System'; |
|
698 | - else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational'; |
|
699 | - else if ($type_name == 'gps-ops') $type_name = 'GPS Operational'; |
|
700 | - else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System'; |
|
701 | - else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System'; |
|
702 | - else if ($type_name == 'sarsat') $type_name = 'Search & Rescue'; |
|
703 | - else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring'; |
|
704 | - else if ($type_name == 'resource') $type_name = 'Earth Resources'; |
|
705 | - else if ($type_name == 'stations') $type_name = 'Space Stations'; |
|
706 | - else if ($type_name == 'geo') $type_name = 'Geostationary'; |
|
707 | - else if ($type_name == 'amateur') $type_name = 'Amateur Radio'; |
|
708 | - else if ($type_name == 'x-comm') $type_name = 'Experimental'; |
|
709 | - else if ($type_name == 'other-comm') $type_name = 'Other Comm'; |
|
710 | - else if ($type_name == 'science') $type_name = 'Space & Earth Science'; |
|
711 | - else if ($type_name == 'military') $type_name = 'Miscellaneous Military'; |
|
712 | - else if ($type_name == 'radar') $type_name = 'Radar Calibration'; |
|
713 | - else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches'; |
|
1029 | + if ($type_name == 'musson') { |
|
1030 | + $type_name = 'Russian LEO Navigation'; |
|
1031 | + } else if ($type_name == 'nnss') { |
|
1032 | + $type_name = 'Navi Navigation Satellite System'; |
|
1033 | + } else if ($type_name == 'sbas') { |
|
1034 | + $type_name = 'Satellite-Based Augmentation System'; |
|
1035 | + } else if ($type_name == 'glo-ops') { |
|
1036 | + $type_name = 'Glonass Operational'; |
|
1037 | + } else if ($type_name == 'gps-ops') { |
|
1038 | + $type_name = 'GPS Operational'; |
|
1039 | + } else if ($type_name == 'argos') { |
|
1040 | + $type_name = 'ARGOS Data Collection System'; |
|
1041 | + } else if ($type_name == 'tdrss') { |
|
1042 | + $type_name = 'Tracking and Data Relay Satellite System'; |
|
1043 | + } else if ($type_name == 'sarsat') { |
|
1044 | + $type_name = 'Search & Rescue'; |
|
1045 | + } else if ($type_name == 'dmc') { |
|
1046 | + $type_name = 'Disaster Monitoring'; |
|
1047 | + } else if ($type_name == 'resource') { |
|
1048 | + $type_name = 'Earth Resources'; |
|
1049 | + } else if ($type_name == 'stations') { |
|
1050 | + $type_name = 'Space Stations'; |
|
1051 | + } else if ($type_name == 'geo') { |
|
1052 | + $type_name = 'Geostationary'; |
|
1053 | + } else if ($type_name == 'amateur') { |
|
1054 | + $type_name = 'Amateur Radio'; |
|
1055 | + } else if ($type_name == 'x-comm') { |
|
1056 | + $type_name = 'Experimental'; |
|
1057 | + } else if ($type_name == 'other-comm') { |
|
1058 | + $type_name = 'Other Comm'; |
|
1059 | + } else if ($type_name == 'science') { |
|
1060 | + $type_name = 'Space & Earth Science'; |
|
1061 | + } else if ($type_name == 'military') { |
|
1062 | + $type_name = 'Miscellaneous Military'; |
|
1063 | + } else if ($type_name == 'radar') { |
|
1064 | + $type_name = 'Radar Calibration'; |
|
1065 | + } else if ($type_name == 'tle-new') { |
|
1066 | + $type_name = 'Last 30 days launches'; |
|
1067 | + } |
|
714 | 1068 | |
715 | 1069 | if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) { |
716 | 1070 | print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>'; |