Ysurac /
FlightAirMap
@@ -329,15 +329,15 @@ discard block |
||
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | <?php |
| 332 | - if (isset($globalMapUseBbox) && $globalMapUseBbox) { |
|
| 332 | + if (isset($globalMapUseBbox) && $globalMapUseBbox) { |
|
| 333 | 333 | ?> |
| 334 | 334 | var loc_geojson = Cesium.loadJson("<?php print $globalURL; ?>/location-geojson.php?coord="+bbox()); |
| 335 | 335 | <?php |
| 336 | - } else { |
|
| 336 | + } else { |
|
| 337 | 337 | ?> |
| 338 | 338 | var loc_geojson = Cesium.loadJson("<?php print $globalURL; ?>/location-geojson.php"); |
| 339 | 339 | <?php |
| 340 | - } |
|
| 340 | + } |
|
| 341 | 341 | ?> |
| 342 | 342 | loc_geojson.then(function(geojsondata) { |
| 343 | 343 | loc = new Cesium.CustomDataSource('location'); |
@@ -560,11 +560,11 @@ discard block |
||
| 560 | 560 | } |
| 561 | 561 | |
| 562 | 562 | <?php |
| 563 | - if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) { |
|
| 563 | + if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) { |
|
| 564 | 564 | ?> |
| 565 | 565 | update_tsk(); |
| 566 | 566 | <?php |
| 567 | - } |
|
| 567 | + } |
|
| 568 | 568 | ?> |
| 569 | 569 | |
| 570 | 570 | update_locationsLayer(); |
@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | } |
| 370 | 370 | } |
| 371 | 371 | |
| 372 | - var tsk_geojson = Cesium.loadJson("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php print filter_input(INPUT_GET,'tsk',FILTER_SANITIZE_URL); ?>"); |
|
| 372 | + var tsk_geojson = Cesium.loadJson("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php print filter_input(INPUT_GET, 'tsk', FILTER_SANITIZE_URL); ?>"); |
|
| 373 | 373 | tsk_geojson.then(function(geojsondata) { |
| 374 | 374 | tsk = new Cesium.CustomDataSource('tsk'); |
| 375 | 375 | for (var i =0;i < geojsondata.features.length; i++) { |
@@ -456,7 +456,7 @@ discard block |
||
| 456 | 456 | <?php |
| 457 | 457 | if (isset($_COOKIE['lastcentercoord']) || (isset($globalCenterLatitude) && isset($globalCenterLongitude) && $globalCenterLatitude != '' && $globalCenterLongitude != '')) { |
| 458 | 458 | if (isset($_COOKIE['lastcentercoord'])) { |
| 459 | - $lastcentercoord = explode(',',$_COOKIE['lastcentercoord']); |
|
| 459 | + $lastcentercoord = explode(',', $_COOKIE['lastcentercoord']); |
|
| 460 | 460 | if (!isset($lastcentercoord[3])) $zoom = $lastcentercoord[2]*1000000.0; |
| 461 | 461 | else $zoom = $lastcentercoord[3]; |
| 462 | 462 | $viewcenterlatitude = $lastcentercoord[0]; |
@@ -5,21 +5,30 @@ discard block |
||
| 5 | 5 | |
| 6 | 6 | document.cookie = 'MapFormat=3d; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/' |
| 7 | 7 | <?php |
| 8 | - if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType']; |
|
| 9 | - else $MapType = $globalMapProvider; |
|
| 8 | + if (isset($_COOKIE['MapType'])) { |
|
| 9 | + $MapType = $_COOKIE['MapType']; |
|
| 10 | + } else { |
|
| 11 | + $MapType = $globalMapProvider; |
|
| 12 | + } |
|
| 10 | 13 | |
| 11 | 14 | // unset($_COOKIE['MapType']); |
| 12 | 15 | if ($MapType != 'Mapbox' && $MapType != 'OpenStreetMap' && $MapType != 'Bing-Aerial' && $MapType != 'Bing-Hybrid' && $MapType != 'Bing-Road') { |
| 13 | - if (isset($globalBingMapKey) && $globalBingMapKey != '') $MapType = 'Bing-Aerial'; |
|
| 14 | - else $MapType = 'OpenStreetMap'; |
|
| 16 | + if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
| 17 | + $MapType = 'Bing-Aerial'; |
|
| 18 | + } else { |
|
| 19 | + $MapType = 'OpenStreetMap'; |
|
| 20 | + } |
|
| 15 | 21 | } |
| 16 | 22 | if (($MapType == 'Bing-Aerial' || $MapType == 'Bing-Hybrid' || $MapType == 'Bing-Road') && (!isset($globalBingMapKey) || $globalBingMapKey == '')) { |
| 17 | 23 | $MapType = 'OpenStreetMap'; |
| 18 | 24 | } |
| 19 | 25 | if ($MapType == 'Mapbox') { |
| 20 | - if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId; |
|
| 21 | - else $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 22 | -?> |
|
| 26 | + if ($_COOKIE['MapTypeId'] == 'default') { |
|
| 27 | + $MapBoxId = $globalMapboxId; |
|
| 28 | + } else { |
|
| 29 | + $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 30 | + } |
|
| 31 | + ?> |
|
| 23 | 32 | var imProv = Cesium.MapboxImageryProvider({ |
| 24 | 33 | credit: 'Map data © OpenStreetMap contributors, ' + |
| 25 | 34 | 'CC-BY-SA, ' + |
@@ -124,13 +133,23 @@ discard block |
||
| 124 | 133 | */ |
| 125 | 134 | ?> |
| 126 | 135 | <?php |
| 127 | - } elseif (isset($globalMapCustomLayer[$MapType])) { |
|
| 136 | + } elseif (isset($globalMapCustomLayer[$MapType])) { |
|
| 128 | 137 | $customid = $MapType; |
| 129 | 138 | ?> |
| 130 | 139 | var imProv = Cesium.createOpenStreetMapImageryProvider({ |
| 131 | 140 | url : '<?php print $globalMapCustomLayer[$customid]['url']; ?>', |
| 132 | - maximumLevel: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '99'; ?>, |
|
| 133 | - minimumLevel: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>, |
|
| 141 | + maximumLevel: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) { |
|
| 142 | + print $globalMapCustomLayer[$customid]['maxZoom']; |
|
| 143 | +} else { |
|
| 144 | + print '99'; |
|
| 145 | +} |
|
| 146 | +?>, |
|
| 147 | + minimumLevel: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) { |
|
| 148 | + print $globalMapCustomLayer[$customid]['minZoom']; |
|
| 149 | +} else { |
|
| 150 | + print '0'; |
|
| 151 | +} |
|
| 152 | +?>, |
|
| 134 | 153 | credit: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>' |
| 135 | 154 | }); |
| 136 | 155 | <?php |
@@ -457,8 +476,11 @@ discard block |
||
| 457 | 476 | if (isset($_COOKIE['lastcentercoord']) || (isset($globalCenterLatitude) && isset($globalCenterLongitude) && $globalCenterLatitude != '' && $globalCenterLongitude != '')) { |
| 458 | 477 | if (isset($_COOKIE['lastcentercoord'])) { |
| 459 | 478 | $lastcentercoord = explode(',',$_COOKIE['lastcentercoord']); |
| 460 | - if (!isset($lastcentercoord[3])) $zoom = $lastcentercoord[2]*1000000.0; |
|
| 461 | - else $zoom = $lastcentercoord[3]; |
|
| 479 | + if (!isset($lastcentercoord[3])) { |
|
| 480 | + $zoom = $lastcentercoord[2]*1000000.0; |
|
| 481 | + } else { |
|
| 482 | + $zoom = $lastcentercoord[3]; |
|
| 483 | + } |
|
| 462 | 484 | $viewcenterlatitude = $lastcentercoord[0]; |
| 463 | 485 | $viewcenterlongitude = $lastcentercoord[1]; |
| 464 | 486 | } else { |
@@ -568,7 +590,12 @@ discard block |
||
| 568 | 590 | ?> |
| 569 | 591 | |
| 570 | 592 | update_locationsLayer(); |
| 571 | -setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>); |
|
| 593 | +setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) { |
|
| 594 | + print $globalMapRefresh*1000*2; |
|
| 595 | +} else { |
|
| 596 | + print '60000'; |
|
| 597 | +} |
|
| 598 | +?>); |
|
| 572 | 599 | /* |
| 573 | 600 | var handlera = new Cesium.ScreenSpaceEventHandler(viewer.canvas, false); |
| 574 | 601 | handlera.setInputAction( |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | <?php }; if (isset($globalSatellite) && $globalSatellite) { ?><td><div id="ibxsatellite"><h4><?php echo _("Satellites Displayed"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?> |
| 48 | 48 | </tr></table></div> |
| 49 | 49 | <?php |
| 50 | - if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
| 50 | + if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
| 51 | 51 | ?> |
| 52 | 52 | <script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script> |
| 53 | 53 | <?php |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script> |
| 72 | 72 | <?php |
| 73 | 73 | } |
| 74 | - } |
|
| 74 | + } |
|
| 75 | 75 | ?> |
| 76 | 76 | |
| 77 | 77 | <div id="sidebar" class="sidebar collapsed"> |
@@ -82,34 +82,34 @@ discard block |
||
| 82 | 82 | <li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li> |
| 83 | 83 | <li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li> |
| 84 | 84 | <?php |
| 85 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 85 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 86 | 86 | if (isset($globalArchive) && $globalArchive == TRUE) { |
| 87 | 87 | ?> |
| 88 | 88 | <li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li> |
| 89 | 89 | <?php |
| 90 | 90 | } |
| 91 | - } |
|
| 91 | + } |
|
| 92 | 92 | ?> |
| 93 | 93 | <li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li> |
| 94 | 94 | <li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li> |
| 95 | 95 | <li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li> |
| 96 | 96 | <?php |
| 97 | - if (isset($globalMap3D) && $globalMap3D) { |
|
| 97 | + if (isset($globalMap3D) && $globalMap3D) { |
|
| 98 | 98 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
| 99 | 99 | ?> |
| 100 | 100 | <li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li> |
| 101 | 101 | <?php |
| 102 | - if (isset($globalSatellite) && $globalSatellite) { |
|
| 102 | + if (isset($globalSatellite) && $globalSatellite) { |
|
| 103 | 103 | ?> |
| 104 | 104 | <li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li> |
| 105 | 105 | <?php |
| 106 | - } |
|
| 106 | + } |
|
| 107 | 107 | } else { |
| 108 | 108 | ?> |
| 109 | 109 | <li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li> |
| 110 | 110 | <?php |
| 111 | 111 | } |
| 112 | - } |
|
| 112 | + } |
|
| 113 | 113 | ?> |
| 114 | 114 | </ul> |
| 115 | 115 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | ?> |
| 185 | 185 | </div> |
| 186 | 186 | <?php |
| 187 | - if (isset($globalArchive) && $globalArchive == TRUE) { |
|
| 187 | + if (isset($globalArchive) && $globalArchive == TRUE) { |
|
| 188 | 188 | ?> |
| 189 | 189 | <div class="sidebar-pane" id="archive"> |
| 190 | 190 | <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | </form> |
| 244 | 244 | </div> |
| 245 | 245 | <?php |
| 246 | - } |
|
| 246 | + } |
|
| 247 | 247 | ?> |
| 248 | 248 | <div class="sidebar-pane" id="settings"> |
| 249 | 249 | <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -254,56 +254,56 @@ discard block |
||
| 254 | 254 | <?php |
| 255 | 255 | if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
| 256 | 256 | else $MapType = $_COOKIE['MapType']; |
| 257 | - ?> |
|
| 257 | + ?> |
|
| 258 | 258 | <?php |
| 259 | 259 | if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
| 260 | - ?> |
|
| 260 | + ?> |
|
| 261 | 261 | <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
| 262 | 262 | <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
| 263 | 263 | <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
| 264 | 264 | <?php |
| 265 | 265 | } |
| 266 | - ?> |
|
| 266 | + ?> |
|
| 267 | 267 | <?php |
| 268 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 269 | - ?> |
|
| 268 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 269 | + ?> |
|
| 270 | 270 | <?php |
| 271 | - if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
| 272 | - ?> |
|
| 271 | + if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
| 272 | + ?> |
|
| 273 | 273 | <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
| 274 | 274 | <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
| 275 | 275 | <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
| 276 | 276 | <?php |
| 277 | - } |
|
| 278 | - ?> |
|
| 277 | + } |
|
| 278 | + ?> |
|
| 279 | 279 | <?php |
| 280 | - if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
| 281 | - ?> |
|
| 280 | + if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
| 281 | + ?> |
|
| 282 | 282 | <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
| 283 | 283 | <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
| 284 | 284 | <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
| 285 | 285 | <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
| 286 | 286 | <?php |
| 287 | - } |
|
| 288 | - ?> |
|
| 287 | + } |
|
| 288 | + ?> |
|
| 289 | 289 | <?php |
| 290 | - if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
| 291 | - ?> |
|
| 290 | + if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
| 291 | + ?> |
|
| 292 | 292 | <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
| 293 | 293 | <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
| 294 | 294 | <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
| 295 | 295 | <?php |
| 296 | - } |
|
| 297 | - ?> |
|
| 296 | + } |
|
| 297 | + ?> |
|
| 298 | 298 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
| 299 | 299 | <?php |
| 300 | 300 | } |
| 301 | - ?> |
|
| 301 | + ?> |
|
| 302 | 302 | <?php |
| 303 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 303 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 304 | 304 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
| 305 | 305 | else $MapBoxId = $_COOKIE['MapTypeId']; |
| 306 | - ?> |
|
| 306 | + ?> |
|
| 307 | 307 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
| 308 | 308 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
| 309 | 309 | <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
@@ -317,13 +317,13 @@ discard block |
||
| 317 | 317 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
| 318 | 318 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
| 319 | 319 | <?php |
| 320 | - } |
|
| 321 | - ?> |
|
| 320 | + } |
|
| 321 | + ?> |
|
| 322 | 322 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
| 323 | 323 | </select> |
| 324 | 324 | </li> |
| 325 | 325 | <?php |
| 326 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 326 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 327 | 327 | ?> |
| 328 | 328 | <li><?php echo _("Type of Terrain:"); ?> |
| 329 | 329 | <select class="selectpicker" onchange="terrainType(this);"> |
@@ -334,10 +334,10 @@ discard block |
||
| 334 | 334 | </select> |
| 335 | 335 | </li> |
| 336 | 336 | <?php |
| 337 | - } |
|
| 337 | + } |
|
| 338 | 338 | ?> |
| 339 | 339 | <?php |
| 340 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 340 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 341 | 341 | ?> |
| 342 | 342 | <?php |
| 343 | 343 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Satellites animate between updates"); ?></label></div></li> |
| 355 | 355 | <?php |
| 356 | 356 | } |
| 357 | - } |
|
| 357 | + } |
|
| 358 | 358 | ?> |
| 359 | 359 | <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li> |
| 360 | 360 | <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
@@ -366,81 +366,81 @@ discard block |
||
| 366 | 366 | <li><div class="checkbox"><label><input type="checkbox" name="displayfires" value="1" onclick="clickDisplayFires(this)" <?php if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) print 'checked'; ?> ><?php echo _("Display fires on map"); ?></label></div></li> |
| 367 | 367 | <?php |
| 368 | 368 | } |
| 369 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 369 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 370 | 370 | ?> |
| 371 | 371 | <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li> |
| 372 | 372 | <?php |
| 373 | - } |
|
| 374 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 373 | + } |
|
| 374 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 375 | 375 | ?> |
| 376 | 376 | <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li> |
| 377 | 377 | <?php |
| 378 | - } |
|
| 378 | + } |
|
| 379 | 379 | ?> |
| 380 | 380 | <?php |
| 381 | 381 | if (function_exists('array_column')) { |
| 382 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 383 | - ?> |
|
| 382 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 383 | + ?> |
|
| 384 | 384 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
| 385 | 385 | <?php |
| 386 | - } |
|
| 386 | + } |
|
| 387 | 387 | } elseif (isset($globalSources)) { |
| 388 | - $dispolar = false; |
|
| 389 | - foreach ($globalSources as $testsource) { |
|
| 390 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 391 | - } |
|
| 392 | - if ($dispolar) { |
|
| 393 | - ?> |
|
| 388 | + $dispolar = false; |
|
| 389 | + foreach ($globalSources as $testsource) { |
|
| 390 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 391 | + } |
|
| 392 | + if ($dispolar) { |
|
| 393 | + ?> |
|
| 394 | 394 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
| 395 | 395 | <?php |
| 396 | - } |
|
| 397 | - } |
|
| 398 | - ?> |
|
| 396 | + } |
|
| 397 | + } |
|
| 398 | + ?> |
|
| 399 | 399 | <?php |
| 400 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 400 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 401 | 401 | ?> |
| 402 | 402 | |
| 403 | 403 | <?php |
| 404 | 404 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 405 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 406 | - ?> |
|
| 405 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 406 | + ?> |
|
| 407 | 407 | <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
| 408 | 408 | <?php |
| 409 | 409 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
| 410 | - ?> |
|
| 410 | + ?> |
|
| 411 | 411 | <li><?php echo _("Aircraft icon color:"); ?> |
| 412 | 412 | <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"> |
| 413 | 413 | </li> |
| 414 | 414 | <?php |
| 415 | 415 | } |
| 416 | - } |
|
| 417 | - } |
|
| 418 | - ?> |
|
| 416 | + } |
|
| 417 | + } |
|
| 418 | + ?> |
|
| 419 | 419 | <?php |
| 420 | 420 | if (isset($globalMarine) && $globalMarine === TRUE) { |
| 421 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 422 | - ?> |
|
| 421 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 422 | + ?> |
|
| 423 | 423 | <li><?php echo _("Marine icon color:"); ?> |
| 424 | 424 | <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>"> |
| 425 | 425 | </li> |
| 426 | 426 | <?php |
| 427 | - } |
|
| 428 | - } |
|
| 429 | - ?> |
|
| 427 | + } |
|
| 428 | + } |
|
| 429 | + ?> |
|
| 430 | 430 | <?php |
| 431 | 431 | if (isset($globalTracker) && $globalTracker === TRUE) { |
| 432 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 433 | - ?> |
|
| 432 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 433 | + ?> |
|
| 434 | 434 | <li><?php echo _("Tracker icon color:"); ?> |
| 435 | 435 | <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>"> |
| 436 | 436 | </li> |
| 437 | 437 | <?php |
| 438 | - } |
|
| 439 | - } |
|
| 440 | - ?> |
|
| 438 | + } |
|
| 439 | + } |
|
| 440 | + ?> |
|
| 441 | 441 | <?php |
| 442 | 442 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 443 | - ?> |
|
| 443 | + ?> |
|
| 444 | 444 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
| 445 | 445 | <div class="range"> |
| 446 | 446 | <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>"> |
@@ -449,9 +449,9 @@ discard block |
||
| 449 | 449 | </li> |
| 450 | 450 | <?php |
| 451 | 451 | } |
| 452 | - ?> |
|
| 452 | + ?> |
|
| 453 | 453 | <?php |
| 454 | - } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
| 454 | + } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
| 455 | 455 | ?> |
| 456 | 456 | <?php |
| 457 | 457 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
@@ -483,7 +483,7 @@ discard block |
||
| 483 | 483 | </li> |
| 484 | 484 | <?php |
| 485 | 485 | } |
| 486 | - } |
|
| 486 | + } |
|
| 487 | 487 | ?> |
| 488 | 488 | <li><?php echo _("Distance unit:"); ?> |
| 489 | 489 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -516,19 +516,19 @@ discard block |
||
| 516 | 516 | <ul> |
| 517 | 517 | <?php |
| 518 | 518 | if (!isset($globalAircraft) || $globalAircraft) { |
| 519 | - ?> |
|
| 519 | + ?> |
|
| 520 | 520 | <?php |
| 521 | 521 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
| 522 | - ?> |
|
| 522 | + ?> |
|
| 523 | 523 | <?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
| 524 | 524 | <?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
| 525 | 525 | <?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
| 526 | 526 | <?php |
| 527 | 527 | } |
| 528 | - ?> |
|
| 528 | + ?> |
|
| 529 | 529 | <?php |
| 530 | 530 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
| 531 | - ?> |
|
| 531 | + ?> |
|
| 532 | 532 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
| 533 | 533 | <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
| 534 | 534 | <?php } ?> |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | <?php } ?> |
| 538 | 538 | <?php |
| 539 | 539 | } |
| 540 | - ?> |
|
| 540 | + ?> |
|
| 541 | 541 | <li><?php echo _("Display airlines:"); ?> |
| 542 | 542 | <br/> |
| 543 | 543 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -557,14 +557,14 @@ discard block |
||
| 557 | 557 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
| 558 | 558 | } |
| 559 | 559 | } |
| 560 | - ?> |
|
| 560 | + ?> |
|
| 561 | 561 | </select> |
| 562 | 562 | </li> |
| 563 | 563 | <?php |
| 564 | 564 | $Spotter = new Spotter(); |
| 565 | 565 | $allalliancenames = $Spotter->getAllAllianceNames(); |
| 566 | 566 | if (!empty($allalliancenames)) { |
| 567 | - ?> |
|
| 567 | + ?> |
|
| 568 | 568 | <li><?php echo _("Display alliance:"); ?> |
| 569 | 569 | <br/> |
| 570 | 570 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -578,18 +578,18 @@ discard block |
||
| 578 | 578 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
| 579 | 579 | } |
| 580 | 580 | } |
| 581 | - ?> |
|
| 581 | + ?> |
|
| 582 | 582 | </select> |
| 583 | 583 | </li> |
| 584 | 584 | <?php |
| 585 | 585 | } |
| 586 | - ?> |
|
| 586 | + ?> |
|
| 587 | 587 | <?php |
| 588 | 588 | } |
| 589 | - ?> |
|
| 589 | + ?> |
|
| 590 | 590 | <?php |
| 591 | 591 | if (isset($globalAPRS) && $globalAPRS) { |
| 592 | - ?> |
|
| 592 | + ?> |
|
| 593 | 593 | <li><?php echo _("Display APRS sources name:"); ?> |
| 594 | 594 | <select class="selectpicker" multiple onchange="sources(this);"> |
| 595 | 595 | <?php |
@@ -613,18 +613,18 @@ discard block |
||
| 613 | 613 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
| 614 | 614 | } |
| 615 | 615 | } |
| 616 | - ?> |
|
| 616 | + ?> |
|
| 617 | 617 | </select> |
| 618 | 618 | </li> |
| 619 | 619 | <?php |
| 620 | 620 | } |
| 621 | - ?> |
|
| 621 | + ?> |
|
| 622 | 622 | <?php |
| 623 | 623 | if (!isset($globalAircraft) || $globalAircraft) { |
| 624 | - ?> |
|
| 624 | + ?> |
|
| 625 | 625 | <?php |
| 626 | - if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
| 627 | - ?> |
|
| 626 | + if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
| 627 | + ?> |
|
| 628 | 628 | <li><?php echo _("Display airlines of type:"); ?><br/> |
| 629 | 629 | <select class="selectpicker" onchange="airlinestype(this);"> |
| 630 | 630 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -634,21 +634,21 @@ discard block |
||
| 634 | 634 | </select> |
| 635 | 635 | </li> |
| 636 | 636 | <?php |
| 637 | - } |
|
| 638 | - ?> |
|
| 637 | + } |
|
| 638 | + ?> |
|
| 639 | 639 | <?php |
| 640 | 640 | } |
| 641 | - ?> |
|
| 641 | + ?> |
|
| 642 | 642 | <?php |
| 643 | 643 | if (isset($globalMarine) && $globalMarine) { |
| 644 | - ?> |
|
| 644 | + ?> |
|
| 645 | 645 | <li> |
| 646 | 646 | <?php echo _("Display vessels with MMSI:"); ?> |
| 647 | 647 | <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
| 648 | 648 | </li> |
| 649 | 649 | <?php |
| 650 | 650 | } |
| 651 | - ?> |
|
| 651 | + ?> |
|
| 652 | 652 | <li> |
| 653 | 653 | <?php echo _("Display with ident:"); ?> |
| 654 | 654 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | </form> |
| 662 | 662 | </div> |
| 663 | 663 | <?php |
| 664 | - if (isset($globalSatellite) && $globalSatellite) { |
|
| 664 | + if (isset($globalSatellite) && $globalSatellite) { |
|
| 665 | 665 | ?> |
| 666 | 666 | <div class="sidebar-pane" id="satellites"> |
| 667 | 667 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -701,14 +701,14 @@ discard block |
||
| 701 | 701 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
| 702 | 702 | } |
| 703 | 703 | } |
| 704 | - ?> |
|
| 704 | + ?> |
|
| 705 | 705 | </select> |
| 706 | 706 | </li> |
| 707 | 707 | </ul> |
| 708 | 708 | </form> |
| 709 | 709 | </div> |
| 710 | 710 | <?php |
| 711 | - } |
|
| 711 | + } |
|
| 712 | 712 | ?> |
| 713 | 713 | </div> |
| 714 | 714 | </div> |
@@ -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,15 +292,27 @@ 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($globalBingMapKey) && $globalBingMapKey != '') { |
| 260 | 303 | ?> |
| 261 | - <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
|
| 262 | - <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
|
| 263 | - <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
|
| 304 | + <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') { |
|
| 305 | + print ' selected'; |
|
| 306 | +} |
|
| 307 | +?>>Bing-Aerial</option> |
|
| 308 | + <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') { |
|
| 309 | + print ' selected'; |
|
| 310 | +} |
|
| 311 | +?>>Bing-Hybrid</option> |
|
| 312 | + <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') { |
|
| 313 | + print ' selected'; |
|
| 314 | +} |
|
| 315 | +?>>Bing-Road</option> |
|
| 264 | 316 | <?php |
| 265 | 317 | } |
| 266 | 318 | ?> |
@@ -270,56 +322,131 @@ discard block |
||
| 270 | 322 | <?php |
| 271 | 323 | if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
| 272 | 324 | ?> |
| 273 | - <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
|
| 274 | - <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
|
| 275 | - <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
|
| 325 | + <option value="Here-Aerial"<?php if ($MapType == 'Here') { |
|
| 326 | + print ' selected'; |
|
| 327 | +} |
|
| 328 | +?>>Here-Aerial</option> |
|
| 329 | + <option value="Here-Hybrid"<?php if ($MapType == 'Here') { |
|
| 330 | + print ' selected'; |
|
| 331 | +} |
|
| 332 | +?>>Here-Hybrid</option> |
|
| 333 | + <option value="Here-Road"<?php if ($MapType == 'Here') { |
|
| 334 | + print ' selected'; |
|
| 335 | +} |
|
| 336 | +?>>Here-Road</option> |
|
| 276 | 337 | <?php |
| 277 | 338 | } |
| 278 | 339 | ?> |
| 279 | 340 | <?php |
| 280 | 341 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
| 281 | 342 | ?> |
| 282 | - <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
|
| 283 | - <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
|
| 284 | - <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
|
| 285 | - <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
|
| 343 | + <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') { |
|
| 344 | + print ' selected'; |
|
| 345 | +} |
|
| 346 | +?>>Google Roadmap</option> |
|
| 347 | + <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') { |
|
| 348 | + print ' selected'; |
|
| 349 | +} |
|
| 350 | +?>>Google Satellite</option> |
|
| 351 | + <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') { |
|
| 352 | + print ' selected'; |
|
| 353 | +} |
|
| 354 | +?>>Google Hybrid</option> |
|
| 355 | + <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') { |
|
| 356 | + print ' selected'; |
|
| 357 | +} |
|
| 358 | +?>>Google Terrain</option> |
|
| 286 | 359 | <?php |
| 287 | 360 | } |
| 288 | 361 | ?> |
| 289 | 362 | <?php |
| 290 | 363 | if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
| 291 | 364 | ?> |
| 292 | - <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
|
| 293 | - <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
|
| 294 | - <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
|
| 365 | + <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') { |
|
| 366 | + print ' selected'; |
|
| 367 | +} |
|
| 368 | +?>>MapQuest-OSM</option> |
|
| 369 | + <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') { |
|
| 370 | + print ' selected'; |
|
| 371 | +} |
|
| 372 | +?>>MapQuest-Aerial</option> |
|
| 373 | + <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') { |
|
| 374 | + print ' selected'; |
|
| 375 | +} |
|
| 376 | +?>>MapQuest-Hybrid</option> |
|
| 295 | 377 | <?php |
| 296 | 378 | } |
| 297 | 379 | ?> |
| 298 | - <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
|
| 380 | + <option value="Yandex"<?php if ($MapType == 'Yandex') { |
|
| 381 | + print ' selected'; |
|
| 382 | +} |
|
| 383 | +?>>Yandex</option> |
|
| 299 | 384 | <?php |
| 300 | 385 | } |
| 301 | 386 | ?> |
| 302 | 387 | <?php |
| 303 | 388 | if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
| 304 | - if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
|
| 305 | - else $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 389 | + if (!isset($_COOKIE['MapTypeId'])) { |
|
| 390 | + $MapBoxId = 'default'; |
|
| 391 | + } else { |
|
| 392 | + $MapBoxId = $_COOKIE['MapTypeId']; |
|
| 393 | + } |
|
| 306 | 394 | ?> |
| 307 | - <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
|
| 308 | - <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
|
| 309 | - <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
|
| 310 | - <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option> |
|
| 311 | - <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option> |
|
| 312 | - <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option> |
|
| 313 | - <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option> |
|
| 314 | - <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option> |
|
| 315 | - <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option> |
|
| 316 | - <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option> |
|
| 317 | - <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
|
| 318 | - <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
|
| 395 | + <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') { |
|
| 396 | + print ' selected'; |
|
| 397 | +} |
|
| 398 | +?>>Mapbox default</option> |
|
| 399 | + <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') { |
|
| 400 | + print ' selected'; |
|
| 401 | +} |
|
| 402 | +?>>Mapbox streets</option> |
|
| 403 | + <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') { |
|
| 404 | + print ' selected'; |
|
| 405 | +} |
|
| 406 | +?>>Mapbox light</option> |
|
| 407 | + <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') { |
|
| 408 | + print ' selected'; |
|
| 409 | +} |
|
| 410 | +?>>Mapbox dark</option> |
|
| 411 | + <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') { |
|
| 412 | + print ' selected'; |
|
| 413 | +} |
|
| 414 | +?>>Mapbox satellite</option> |
|
| 415 | + <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') { |
|
| 416 | + print ' selected'; |
|
| 417 | +} |
|
| 418 | +?>>Mapbox streets-satellite</option> |
|
| 419 | + <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') { |
|
| 420 | + print ' selected'; |
|
| 421 | +} |
|
| 422 | +?>>Mapbox streets-basic</option> |
|
| 423 | + <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') { |
|
| 424 | + print ' selected'; |
|
| 425 | +} |
|
| 426 | +?>>Mapbox comic</option> |
|
| 427 | + <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') { |
|
| 428 | + print ' selected'; |
|
| 429 | +} |
|
| 430 | +?>>Mapbox outdoors</option> |
|
| 431 | + <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') { |
|
| 432 | + print ' selected'; |
|
| 433 | +} |
|
| 434 | +?>>Mapbox pencil</option> |
|
| 435 | + <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') { |
|
| 436 | + print ' selected'; |
|
| 437 | +} |
|
| 438 | +?>>Mapbox pirates</option> |
|
| 439 | + <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') { |
|
| 440 | + print ' selected'; |
|
| 441 | +} |
|
| 442 | +?>>Mapbox emerald</option> |
|
| 319 | 443 | <?php |
| 320 | 444 | } |
| 321 | 445 | ?> |
| 322 | - <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
|
| 446 | + <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') { |
|
| 447 | + print ' selected'; |
|
| 448 | +} |
|
| 449 | +?>>OpenStreetMap</option> |
|
| 323 | 450 | </select> |
| 324 | 451 | </li> |
| 325 | 452 | <?php |
@@ -327,10 +454,22 @@ discard block |
||
| 327 | 454 | ?> |
| 328 | 455 | <li><?php echo _("Type of Terrain:"); ?> |
| 329 | 456 | <select class="selectpicker" onchange="terrainType(this);"> |
| 330 | - <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option> |
|
| 331 | - <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option> |
|
| 332 | - <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option> |
|
| 333 | - <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option> |
|
| 457 | + <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') { |
|
| 458 | + print ' selected'; |
|
| 459 | +} |
|
| 460 | +?>>stk terrain</option> |
|
| 461 | + <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') { |
|
| 462 | + print ' selected'; |
|
| 463 | +} |
|
| 464 | +?>>ellipsoid</option> |
|
| 465 | + <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') { |
|
| 466 | + print ' selected'; |
|
| 467 | +} |
|
| 468 | +?>>vr terrain</option> |
|
| 469 | + <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') { |
|
| 470 | + print ' selected'; |
|
| 471 | +} |
|
| 472 | +?>>ArticDEM</option> |
|
| 334 | 473 | </select> |
| 335 | 474 | </li> |
| 336 | 475 | <?php |
@@ -342,33 +481,69 @@ discard block |
||
| 342 | 481 | <?php |
| 343 | 482 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 344 | 483 | ?> |
| 345 | - <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> |
|
| 346 | - <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> |
|
| 347 | - <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> |
|
| 348 | - <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> |
|
| 349 | - <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> |
|
| 484 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') { |
|
| 485 | + print 'checked'; |
|
| 486 | +} |
|
| 487 | +?> ><?php echo _("Display flight info as popup"); ?></label></div></li> |
|
| 488 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) { |
|
| 489 | + print 'checked'; |
|
| 490 | +} |
|
| 491 | +?> ><?php echo _("Display flight path"); ?></label></div></li> |
|
| 492 | + <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)) { |
|
| 493 | + print 'checked'; |
|
| 494 | +} |
|
| 495 | +?> ><?php echo _("Display flight route on click"); ?></label></div></li> |
|
| 496 | + <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)) { |
|
| 497 | + print 'checked'; |
|
| 498 | +} |
|
| 499 | +?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li> |
|
| 500 | + <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)) { |
|
| 501 | + print 'checked'; |
|
| 502 | +} |
|
| 503 | +?> ><?php echo _("Planes animate between updates"); ?></label></div></li> |
|
| 350 | 504 | <?php |
| 351 | 505 | } |
| 352 | 506 | if (isset($globalSatellite) && $globalSatellite === TRUE) { |
| 353 | 507 | ?> |
| 354 | - <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Satellites animate between updates"); ?></label></div></li> |
|
| 508 | + <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)) { |
|
| 509 | + print 'checked'; |
|
| 510 | +} |
|
| 511 | +?> ><?php echo _("Satellites animate between updates"); ?></label></div></li> |
|
| 355 | 512 | <?php |
| 356 | 513 | } |
| 357 | 514 | } |
| 358 | 515 | ?> |
| 359 | - <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li> |
|
| 360 | - <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> |
|
| 361 | - <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> |
|
| 362 | - <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> |
|
| 516 | + <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'])) { |
|
| 517 | + print 'checked'; |
|
| 518 | +} |
|
| 519 | +?> ><?php echo _("Display airports on map"); ?></label></div></li> |
|
| 520 | + <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))) { |
|
| 521 | + print 'checked'; |
|
| 522 | +} |
|
| 523 | +?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
|
| 524 | + <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))) { |
|
| 525 | + print 'checked'; |
|
| 526 | +} |
|
| 527 | +?> ><?php echo _("Display weather station on map"); ?></label></div></li> |
|
| 528 | + <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))) { |
|
| 529 | + print 'checked'; |
|
| 530 | +} |
|
| 531 | +?> ><?php echo _("Display lightning on map"); ?></label></div></li> |
|
| 363 | 532 | <?php |
| 364 | 533 | if (isset($globalFires)) { |
| 365 | 534 | ?> |
| 366 | - <li><div class="checkbox"><label><input type="checkbox" name="displayfires" value="1" onclick="clickDisplayFires(this)" <?php if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) print 'checked'; ?> ><?php echo _("Display fires on map"); ?></label></div></li> |
|
| 535 | + <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))) { |
|
| 536 | + print 'checked'; |
|
| 537 | +} |
|
| 538 | +?> ><?php echo _("Display fires on map"); ?></label></div></li> |
|
| 367 | 539 | <?php |
| 368 | 540 | } |
| 369 | 541 | if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
| 370 | 542 | ?> |
| 371 | - <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li> |
|
| 543 | + <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')) { |
|
| 544 | + print 'checked'; |
|
| 545 | +} |
|
| 546 | +?> ><?php echo _("Show mini-map"); ?></label></div></li> |
|
| 372 | 547 | <?php |
| 373 | 548 | } |
| 374 | 549 | if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
@@ -381,17 +556,25 @@ discard block |
||
| 381 | 556 | if (function_exists('array_column')) { |
| 382 | 557 | if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
| 383 | 558 | ?> |
| 384 | - <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 559 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
| 560 | + print 'checked'; |
|
| 561 | +} |
|
| 562 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 385 | 563 | <?php |
| 386 | 564 | } |
| 387 | 565 | } elseif (isset($globalSources)) { |
| 388 | 566 | $dispolar = false; |
| 389 | 567 | foreach ($globalSources as $testsource) { |
| 390 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 568 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) { |
|
| 569 | + $dispolar = true; |
|
| 570 | + } |
|
| 391 | 571 | } |
| 392 | 572 | if ($dispolar) { |
| 393 | 573 | ?> |
| 394 | - <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 574 | + <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) { |
|
| 575 | + print 'checked'; |
|
| 576 | +} |
|
| 577 | +?> ><?php echo _("Display polar on map"); ?></label></div></li> |
|
| 395 | 578 | <?php |
| 396 | 579 | } |
| 397 | 580 | } |
@@ -404,12 +587,22 @@ discard block |
||
| 404 | 587 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 405 | 588 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 406 | 589 | ?> |
| 407 | - <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
|
| 590 | + <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') { |
|
| 591 | + print 'checked'; |
|
| 592 | +} |
|
| 593 | +?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
|
| 408 | 594 | <?php |
| 409 | 595 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
| 410 | 596 | ?> |
| 411 | 597 | <li><?php echo _("Aircraft icon color:"); ?> |
| 412 | - <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"> |
|
| 598 | + <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
| 599 | + print $_COOKIE['IconColor']; |
|
| 600 | +} elseif (isset($globalAircraftIconColor)) { |
|
| 601 | + print $globalAircraftIconColor; |
|
| 602 | +} else { |
|
| 603 | + print '1a3151'; |
|
| 604 | +} |
|
| 605 | +?>"> |
|
| 413 | 606 | </li> |
| 414 | 607 | <?php |
| 415 | 608 | } |
@@ -421,7 +614,14 @@ discard block |
||
| 421 | 614 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 422 | 615 | ?> |
| 423 | 616 | <li><?php echo _("Marine icon color:"); ?> |
| 424 | - <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>"> |
|
| 617 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
| 618 | + print $_COOKIE['MarineIconColor']; |
|
| 619 | +} elseif (isset($globalMarineIconColor)) { |
|
| 620 | + print $globalMarineIconColor; |
|
| 621 | +} else { |
|
| 622 | + print '1a3151'; |
|
| 623 | +} |
|
| 624 | +?>"> |
|
| 425 | 625 | </li> |
| 426 | 626 | <?php |
| 427 | 627 | } |
@@ -432,7 +632,14 @@ discard block |
||
| 432 | 632 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 433 | 633 | ?> |
| 434 | 634 | <li><?php echo _("Tracker icon color:"); ?> |
| 435 | - <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>"> |
|
| 635 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
| 636 | + print $_COOKIE['TrackerIconColor']; |
|
| 637 | +} elseif (isset($globalTrackerIconColor)) { |
|
| 638 | + print $globalTrackerIconColor; |
|
| 639 | +} else { |
|
| 640 | + print '1a3151'; |
|
| 641 | +} |
|
| 642 | +?>"> |
|
| 436 | 643 | </li> |
| 437 | 644 | <?php |
| 438 | 645 | } |
@@ -443,8 +650,22 @@ discard block |
||
| 443 | 650 | ?> |
| 444 | 651 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
| 445 | 652 | <div class="range"> |
| 446 | - <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>"> |
|
| 447 | - <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output> |
|
| 653 | + <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) { |
|
| 654 | + print $_COOKIE['AirportZoom']; |
|
| 655 | +} elseif (isset($globalAirportZoom)) { |
|
| 656 | + print $globalAirportZoom; |
|
| 657 | +} else { |
|
| 658 | + print '7'; |
|
| 659 | +} |
|
| 660 | +?>"> |
|
| 661 | + <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) { |
|
| 662 | + print $_COOKIE['AirportZoom']; |
|
| 663 | +} elseif (isset($globalAirportZoom)) { |
|
| 664 | + print $globalAirportZoom; |
|
| 665 | +} else { |
|
| 666 | + print '7'; |
|
| 667 | +} |
|
| 668 | +?></output> |
|
| 448 | 669 | </div> |
| 449 | 670 | </li> |
| 450 | 671 | <?php |
@@ -456,10 +677,23 @@ discard block |
||
| 456 | 677 | <?php |
| 457 | 678 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 458 | 679 | ?> |
| 459 | - <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> |
|
| 460 | - <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> |
|
| 680 | + <li><input type="checkbox" name="useliveries" value="1" onclick="useLiveries(this)" <?php if (isset($_COOKIE['UseLiveries']) && $_COOKIE['UseLiveries'] == 'true') { |
|
| 681 | + print 'checked'; |
|
| 682 | +} |
|
| 683 | +?> ><?php echo _("Use airlines liveries"); ?></li> |
|
| 684 | + <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') { |
|
| 685 | + print 'checked'; |
|
| 686 | +} |
|
| 687 | +?> ><?php echo _("Force Aircraft color"); ?></li> |
|
| 461 | 688 | <li><?php echo _("Aircraft icon color:"); ?> |
| 462 | - <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'; ?>"> |
|
| 689 | + <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) { |
|
| 690 | + print $_COOKIE['IconColor']; |
|
| 691 | +} elseif (isset($globalAircraftIconColor)) { |
|
| 692 | + print $globalAircraftIconColor; |
|
| 693 | +} else { |
|
| 694 | + print 'ff0000'; |
|
| 695 | +} |
|
| 696 | +?>"> |
|
| 463 | 697 | </li> |
| 464 | 698 | <?php |
| 465 | 699 | } |
@@ -467,9 +701,19 @@ discard block |
||
| 467 | 701 | <?php |
| 468 | 702 | if (isset($globalMarine) && $globalMarine === TRUE) { |
| 469 | 703 | ?> |
| 470 | - <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> |
|
| 704 | + <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') { |
|
| 705 | + print 'checked'; |
|
| 706 | +} |
|
| 707 | +?> ><?php echo _("Force Marine color"); ?></li> |
|
| 471 | 708 | <li><?php echo _("Marine icon color:"); ?> |
| 472 | - <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'; ?>"> |
|
| 709 | + <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) { |
|
| 710 | + print $_COOKIE['MarineIconColor']; |
|
| 711 | +} elseif (isset($globalMarineIconColor)) { |
|
| 712 | + print $globalMarineIconColor; |
|
| 713 | +} else { |
|
| 714 | + print 'ff0000'; |
|
| 715 | +} |
|
| 716 | +?>"> |
|
| 473 | 717 | </li> |
| 474 | 718 | <?php |
| 475 | 719 | } |
@@ -477,9 +721,19 @@ discard block |
||
| 477 | 721 | <?php |
| 478 | 722 | if (isset($globalTracker) && $globalTracker === TRUE) { |
| 479 | 723 | ?> |
| 480 | - <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> |
|
| 724 | + <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') { |
|
| 725 | + print 'checked'; |
|
| 726 | +} |
|
| 727 | +?> ><?php echo _("Force Tracker color"); ?></li> |
|
| 481 | 728 | <li><?php echo _("Tracker icon color:"); ?> |
| 482 | - <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'; ?>"> |
|
| 729 | + <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) { |
|
| 730 | + print $_COOKIE['TrackerIconColor']; |
|
| 731 | +} elseif (isset($globalTrackerIconColor)) { |
|
| 732 | + print $globalTrackerIconColor; |
|
| 733 | +} else { |
|
| 734 | + print 'ff0000'; |
|
| 735 | +} |
|
| 736 | +?>"> |
|
| 483 | 737 | </li> |
| 484 | 738 | <?php |
| 485 | 739 | } |
@@ -487,22 +741,46 @@ discard block |
||
| 487 | 741 | ?> |
| 488 | 742 | <li><?php echo _("Distance unit:"); ?> |
| 489 | 743 | <select class="selectpicker" onchange="unitdistance(this);"> |
| 490 | - <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option> |
|
| 491 | - <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option> |
|
| 492 | - <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option> |
|
| 744 | + <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) { |
|
| 745 | + echo ' selected'; |
|
| 746 | +} |
|
| 747 | +?>>km</option> |
|
| 748 | + <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
|
| 749 | + echo ' selected'; |
|
| 750 | +} |
|
| 751 | +?>>nm</option> |
|
| 752 | + <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
|
| 753 | + echo ' selected'; |
|
| 754 | +} |
|
| 755 | +?>>mi</option> |
|
| 493 | 756 | </select> |
| 494 | 757 | </li> |
| 495 | 758 | <li><?php echo _("Altitude unit:"); ?> |
| 496 | 759 | <select class="selectpicker" onchange="unitaltitude(this);"> |
| 497 | - <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option> |
|
| 498 | - <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option> |
|
| 760 | + <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) { |
|
| 761 | + echo ' selected'; |
|
| 762 | +} |
|
| 763 | +?>>m</option> |
|
| 764 | + <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) { |
|
| 765 | + echo ' selected'; |
|
| 766 | +} |
|
| 767 | +?>>feet</option> |
|
| 499 | 768 | </select> |
| 500 | 769 | </li> |
| 501 | 770 | <li><?php echo _("Speed unit:"); ?> |
| 502 | 771 | <select class="selectpicker" onchange="unitspeed(this);"> |
| 503 | - <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> |
|
| 504 | - <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option> |
|
| 505 | - <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option> |
|
| 772 | + <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) { |
|
| 773 | + echo ' selected'; |
|
| 774 | +} |
|
| 775 | +?>>km/h</option> |
|
| 776 | + <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) { |
|
| 777 | + echo ' selected'; |
|
| 778 | +} |
|
| 779 | +?>>mph</option> |
|
| 780 | + <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) { |
|
| 781 | + echo ' selected'; |
|
| 782 | +} |
|
| 783 | +?>>knots</option> |
|
| 506 | 784 | </select> |
| 507 | 785 | </li> |
| 508 | 786 | |
@@ -520,9 +798,18 @@ discard block |
||
| 520 | 798 | <?php |
| 521 | 799 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
| 522 | 800 | ?> |
| 523 | - <?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
|
| 524 | - <?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
|
| 525 | - <?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 } ?> |
|
| 801 | + <?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'])) { |
|
| 802 | + print 'checked'; |
|
| 803 | +} |
|
| 804 | +?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
|
| 805 | + <?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'])) { |
|
| 806 | + print 'checked'; |
|
| 807 | +} |
|
| 808 | +?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
|
| 809 | + <?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'])) { |
|
| 810 | + print 'checked'; |
|
| 811 | +} |
|
| 812 | +?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
|
| 526 | 813 | <?php |
| 527 | 814 | } |
| 528 | 815 | ?> |
@@ -530,10 +817,16 @@ discard block |
||
| 530 | 817 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
| 531 | 818 | ?> |
| 532 | 819 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
| 533 | - <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
|
| 820 | + <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'])) { |
|
| 821 | + print 'checked'; |
|
| 822 | +} |
|
| 823 | +?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
|
| 534 | 824 | <?php } ?> |
| 535 | 825 | <?php if (isset($globalAPRS) && $globalAPRS) { ?> |
| 536 | - <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> |
|
| 826 | + <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'])) { |
|
| 827 | + print 'checked'; |
|
| 828 | +} |
|
| 829 | +?> ><?php echo _("Display APRS data"); ?></label></div></li> |
|
| 537 | 830 | <?php } ?> |
| 538 | 831 | <?php |
| 539 | 832 | } |
@@ -550,7 +843,9 @@ discard block |
||
| 550 | 843 | } |
| 551 | 844 | foreach($allairlinenames as $airline) { |
| 552 | 845 | $airline_name = $airline['airline_name']; |
| 553 | - if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...'; |
|
| 846 | + if (strlen($airline_name) > 30) { |
|
| 847 | + $airline_name = substr($airline_name,0,30).'...'; |
|
| 848 | + } |
|
| 554 | 849 | if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) { |
| 555 | 850 | echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>'; |
| 556 | 851 | } else { |
@@ -568,7 +863,10 @@ discard block |
||
| 568 | 863 | <li><?php echo _("Display alliance:"); ?> |
| 569 | 864 | <br/> |
| 570 | 865 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
| 571 | - <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
| 866 | + <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') { |
|
| 867 | + echo ' selected'; |
|
| 868 | +} |
|
| 869 | +?>><?php echo _("All"); ?></option> |
|
| 572 | 870 | <?php |
| 573 | 871 | foreach($allalliancenames as $alliance) { |
| 574 | 872 | $alliance_name = $alliance['alliance']; |
@@ -627,10 +925,22 @@ discard block |
||
| 627 | 925 | ?> |
| 628 | 926 | <li><?php echo _("Display airlines of type:"); ?><br/> |
| 629 | 927 | <select class="selectpicker" onchange="airlinestype(this);"> |
| 630 | - <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
|
| 631 | - <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option> |
|
| 632 | - <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option> |
|
| 633 | - <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option> |
|
| 928 | + <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') { |
|
| 929 | + echo ' selected'; |
|
| 930 | +} |
|
| 931 | +?>><?php echo _("All"); ?></option> |
|
| 932 | + <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') { |
|
| 933 | + echo ' selected'; |
|
| 934 | +} |
|
| 935 | +?>><?php echo _("Passenger"); ?></option> |
|
| 936 | + <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') { |
|
| 937 | + echo ' selected'; |
|
| 938 | +} |
|
| 939 | +?>><?php echo _("Cargo"); ?></option> |
|
| 940 | + <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') { |
|
| 941 | + echo ' selected'; |
|
| 942 | +} |
|
| 943 | +?>><?php echo _("Military"); ?></option> |
|
| 634 | 944 | </select> |
| 635 | 945 | </li> |
| 636 | 946 | <?php |
@@ -644,14 +954,20 @@ discard block |
||
| 644 | 954 | ?> |
| 645 | 955 | <li> |
| 646 | 956 | <?php echo _("Display vessels with MMSI:"); ?> |
| 647 | - <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
|
| 957 | + <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) { |
|
| 958 | + print $_COOKIE['filter_mmsi']; |
|
| 959 | +} |
|
| 960 | +?>" /> |
|
| 648 | 961 | </li> |
| 649 | 962 | <?php |
| 650 | 963 | } |
| 651 | 964 | ?> |
| 652 | 965 | <li> |
| 653 | 966 | <?php echo _("Display with ident:"); ?> |
| 654 | - <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
|
| 967 | + <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) { |
|
| 968 | + print $_COOKIE['filter_ident']; |
|
| 969 | +} |
|
| 970 | +?>" /> |
|
| 655 | 971 | </li> |
| 656 | 972 | </ul> |
| 657 | 973 | </form> |
@@ -667,7 +983,10 @@ discard block |
||
| 667 | 983 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
| 668 | 984 | <form> |
| 669 | 985 | <ul> |
| 670 | - <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> |
|
| 986 | + <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'])) { |
|
| 987 | + print 'checked'; |
|
| 988 | +} |
|
| 989 | +?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li> |
|
| 671 | 990 | <li><?php echo _("Type:"); ?> |
| 672 | 991 | <select class="selectpicker" multiple onchange="sattypes(this);"> |
| 673 | 992 | <?php |
@@ -675,25 +994,45 @@ discard block |
||
| 675 | 994 | $types = $Satellite->get_tle_types(); |
| 676 | 995 | foreach ($types as $type) { |
| 677 | 996 | $type_name = $type['tle_type']; |
| 678 | - if ($type_name == 'musson') $type_name = 'Russian LEO Navigation'; |
|
| 679 | - else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System'; |
|
| 680 | - else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System'; |
|
| 681 | - else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational'; |
|
| 682 | - else if ($type_name == 'gps-ops') $type_name = 'GPS Operational'; |
|
| 683 | - else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System'; |
|
| 684 | - else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System'; |
|
| 685 | - else if ($type_name == 'sarsat') $type_name = 'Search & Rescue'; |
|
| 686 | - else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring'; |
|
| 687 | - else if ($type_name == 'resource') $type_name = 'Earth Resources'; |
|
| 688 | - else if ($type_name == 'stations') $type_name = 'Space Stations'; |
|
| 689 | - else if ($type_name == 'geo') $type_name = 'Geostationary'; |
|
| 690 | - else if ($type_name == 'amateur') $type_name = 'Amateur Radio'; |
|
| 691 | - else if ($type_name == 'x-comm') $type_name = 'Experimental'; |
|
| 692 | - else if ($type_name == 'other-comm') $type_name = 'Other Comm'; |
|
| 693 | - else if ($type_name == 'science') $type_name = 'Space & Earth Science'; |
|
| 694 | - else if ($type_name == 'military') $type_name = 'Miscellaneous Military'; |
|
| 695 | - else if ($type_name == 'radar') $type_name = 'Radar Calibration'; |
|
| 696 | - else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches'; |
|
| 997 | + if ($type_name == 'musson') { |
|
| 998 | + $type_name = 'Russian LEO Navigation'; |
|
| 999 | + } else if ($type_name == 'nnss') { |
|
| 1000 | + $type_name = 'Navi Navigation Satellite System'; |
|
| 1001 | + } else if ($type_name == 'sbas') { |
|
| 1002 | + $type_name = 'Satellite-Based Augmentation System'; |
|
| 1003 | + } else if ($type_name == 'glo-ops') { |
|
| 1004 | + $type_name = 'Glonass Operational'; |
|
| 1005 | + } else if ($type_name == 'gps-ops') { |
|
| 1006 | + $type_name = 'GPS Operational'; |
|
| 1007 | + } else if ($type_name == 'argos') { |
|
| 1008 | + $type_name = 'ARGOS Data Collection System'; |
|
| 1009 | + } else if ($type_name == 'tdrss') { |
|
| 1010 | + $type_name = 'Tracking and Data Relay Satellite System'; |
|
| 1011 | + } else if ($type_name == 'sarsat') { |
|
| 1012 | + $type_name = 'Search & Rescue'; |
|
| 1013 | + } else if ($type_name == 'dmc') { |
|
| 1014 | + $type_name = 'Disaster Monitoring'; |
|
| 1015 | + } else if ($type_name == 'resource') { |
|
| 1016 | + $type_name = 'Earth Resources'; |
|
| 1017 | + } else if ($type_name == 'stations') { |
|
| 1018 | + $type_name = 'Space Stations'; |
|
| 1019 | + } else if ($type_name == 'geo') { |
|
| 1020 | + $type_name = 'Geostationary'; |
|
| 1021 | + } else if ($type_name == 'amateur') { |
|
| 1022 | + $type_name = 'Amateur Radio'; |
|
| 1023 | + } else if ($type_name == 'x-comm') { |
|
| 1024 | + $type_name = 'Experimental'; |
|
| 1025 | + } else if ($type_name == 'other-comm') { |
|
| 1026 | + $type_name = 'Other Comm'; |
|
| 1027 | + } else if ($type_name == 'science') { |
|
| 1028 | + $type_name = 'Space & Earth Science'; |
|
| 1029 | + } else if ($type_name == 'military') { |
|
| 1030 | + $type_name = 'Miscellaneous Military'; |
|
| 1031 | + } else if ($type_name == 'radar') { |
|
| 1032 | + $type_name = 'Radar Calibration'; |
|
| 1033 | + } else if ($type_name == 'tle-new') { |
|
| 1034 | + $type_name = 'Last 30 days launches'; |
|
| 1035 | + } |
|
| 697 | 1036 | |
| 698 | 1037 | if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) { |
| 699 | 1038 | print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>'; |
