@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | <?php }; if (isset($globalSatellite) && $globalSatellite) { ?><td><div id="ibxsatellite"><h4><?php echo _("Satellites Displayed"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?> |
48 | 48 | </tr></table></div> |
49 | 49 | <?php |
50 | - if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
50 | + if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
51 | 51 | ?> |
52 | 52 | <script src="<?php echo $globalURL; ?>/js/map.3d.js.php<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script> |
53 | 53 | <?php |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script> |
72 | 72 | <?php |
73 | 73 | } |
74 | - } |
|
74 | + } |
|
75 | 75 | ?> |
76 | 76 | |
77 | 77 | <div id="sidebar" class="sidebar collapsed"> |
@@ -82,34 +82,34 @@ discard block |
||
82 | 82 | <li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li> |
83 | 83 | <li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li> |
84 | 84 | <?php |
85 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
85 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
86 | 86 | if (isset($globalArchive) && $globalArchive == TRUE) { |
87 | 87 | ?> |
88 | 88 | <li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li> |
89 | 89 | <?php |
90 | 90 | } |
91 | - } |
|
91 | + } |
|
92 | 92 | ?> |
93 | 93 | <li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li> |
94 | 94 | <li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li> |
95 | 95 | <li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li> |
96 | 96 | <?php |
97 | - if (isset($globalMap3D) && $globalMap3D) { |
|
97 | + if (isset($globalMap3D) && $globalMap3D) { |
|
98 | 98 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
99 | 99 | ?> |
100 | 100 | <li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li> |
101 | 101 | <?php |
102 | 102 | } else { |
103 | - if (isset($globalSatellite) && $globalSatellite) { |
|
103 | + if (isset($globalSatellite) && $globalSatellite) { |
|
104 | 104 | ?> |
105 | 105 | <li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li> |
106 | 106 | <?php |
107 | - } |
|
107 | + } |
|
108 | 108 | ?> |
109 | 109 | <li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li> |
110 | 110 | <?php |
111 | 111 | } |
112 | - } |
|
112 | + } |
|
113 | 113 | ?> |
114 | 114 | </ul> |
115 | 115 | |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | ?> |
185 | 185 | </div> |
186 | 186 | <?php |
187 | - if (isset($globalArchive) && $globalArchive == TRUE) { |
|
187 | + if (isset($globalArchive) && $globalArchive == TRUE) { |
|
188 | 188 | ?> |
189 | 189 | <div class="sidebar-pane" id="archive"> |
190 | 190 | <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | </form> |
244 | 244 | </div> |
245 | 245 | <?php |
246 | - } |
|
246 | + } |
|
247 | 247 | ?> |
248 | 248 | <div class="sidebar-pane" id="settings"> |
249 | 249 | <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -254,72 +254,72 @@ discard block |
||
254 | 254 | <?php |
255 | 255 | if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
256 | 256 | else $MapType = $_COOKIE['MapType']; |
257 | - ?> |
|
257 | + ?> |
|
258 | 258 | <?php |
259 | 259 | if (isset($globalMapOffline) && $globalMapOffline === TRUE) { |
260 | - ?> |
|
260 | + ?> |
|
261 | 261 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
262 | 262 | <?php |
263 | 263 | } else { |
264 | - if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
|
265 | - ?> |
|
264 | + if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) { |
|
265 | + ?> |
|
266 | 266 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option> |
267 | 267 | <?php |
268 | - } |
|
269 | - ?> |
|
268 | + } |
|
269 | + ?> |
|
270 | 270 | <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') print ' selected'; ?>>ArcGIS Streetmap</option> |
271 | 271 | <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') print ' selected'; ?>>ArcGIS Satellite</option> |
272 | 272 | <?php |
273 | - if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
274 | - ?> |
|
273 | + if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
|
274 | + ?> |
|
275 | 275 | <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
276 | 276 | <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
277 | 277 | <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
278 | 278 | <?php |
279 | - } |
|
280 | - ?> |
|
279 | + } |
|
280 | + ?> |
|
281 | 281 | <?php |
282 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
283 | - ?> |
|
282 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
283 | + ?> |
|
284 | 284 | <?php |
285 | 285 | if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
286 | - ?> |
|
286 | + ?> |
|
287 | 287 | <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
288 | 288 | <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
289 | 289 | <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
290 | 290 | <?php |
291 | 291 | } |
292 | - ?> |
|
292 | + ?> |
|
293 | 293 | <?php |
294 | 294 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
295 | - ?> |
|
295 | + ?> |
|
296 | 296 | <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
297 | 297 | <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
298 | 298 | <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
299 | 299 | <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
300 | 300 | <?php |
301 | 301 | } |
302 | - ?> |
|
302 | + ?> |
|
303 | 303 | <?php |
304 | 304 | if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
305 | - ?> |
|
305 | + ?> |
|
306 | 306 | <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
307 | 307 | <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
308 | 308 | <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
309 | 309 | <?php |
310 | 310 | } |
311 | - ?> |
|
311 | + ?> |
|
312 | 312 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
313 | 313 | <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option> |
314 | 314 | <?php |
315 | - } |
|
316 | - ?> |
|
315 | + } |
|
316 | + ?> |
|
317 | 317 | <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option> |
318 | 318 | <?php |
319 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
319 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
320 | 320 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
321 | 321 | else $MapBoxId = $_COOKIE['MapTypeId']; |
322 | - ?> |
|
322 | + ?> |
|
323 | 323 | <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option> |
324 | 324 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
325 | 325 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
@@ -334,16 +334,16 @@ discard block |
||
334 | 334 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
335 | 335 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
336 | 336 | <?php |
337 | - } |
|
338 | - ?> |
|
337 | + } |
|
338 | + ?> |
|
339 | 339 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
340 | 340 | <?php |
341 | 341 | } |
342 | - ?> |
|
342 | + ?> |
|
343 | 343 | </select> |
344 | 344 | </li> |
345 | 345 | <?php |
346 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) { |
|
346 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) { |
|
347 | 347 | ?> |
348 | 348 | <li><?php echo _("Type of Terrain:"); ?> |
349 | 349 | <select class="selectpicker" onchange="terrainType(this);"> |
@@ -354,10 +354,10 @@ discard block |
||
354 | 354 | </select> |
355 | 355 | </li> |
356 | 356 | <?php |
357 | - } |
|
357 | + } |
|
358 | 358 | ?> |
359 | 359 | <?php |
360 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
360 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
361 | 361 | ?> |
362 | 362 | <li><div class="checkbox"><label><input type="checkbox" name="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if (isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') print 'checked'; ?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li> |
363 | 363 | |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | <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> |
381 | 381 | <?php |
382 | 382 | } |
383 | - } |
|
383 | + } |
|
384 | 384 | ?> |
385 | 385 | <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> |
386 | 386 | <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> |
@@ -392,82 +392,82 @@ discard block |
||
392 | 392 | <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> |
393 | 393 | <?php |
394 | 394 | } |
395 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
395 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
396 | 396 | ?> |
397 | 397 | <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> |
398 | 398 | <li><div class="checkbox"><label><input type="checkbox" name="one3dmodel" value="1" onclick="useOne3Dmodel(this)" <?php if ((isset($_COOKIE['one3dmodel']) && $_COOKIE['one3dmodel'] == 'true') || (!isset($_COOKIE['one3dmodel']) && isset($globalMap3DOneModel) && $globalMap3DOneModel)) print 'checked'; ?> ><?php echo _("Use same 3D model for all aircraft (use fewer resources)"); ?></label></div></li> |
399 | 399 | <?php |
400 | - } |
|
401 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
400 | + } |
|
401 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
402 | 402 | ?> |
403 | 403 | <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> |
404 | 404 | <?php |
405 | - } |
|
405 | + } |
|
406 | 406 | ?> |
407 | 407 | <?php |
408 | 408 | if (function_exists('array_column')) { |
409 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
410 | - ?> |
|
409 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
410 | + ?> |
|
411 | 411 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
412 | 412 | <?php |
413 | - } |
|
413 | + } |
|
414 | 414 | } elseif (isset($globalSources)) { |
415 | - $dispolar = false; |
|
416 | - foreach ($globalSources as $testsource) { |
|
417 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
418 | - } |
|
419 | - if ($dispolar) { |
|
420 | - ?> |
|
415 | + $dispolar = false; |
|
416 | + foreach ($globalSources as $testsource) { |
|
417 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
418 | + } |
|
419 | + if ($dispolar) { |
|
420 | + ?> |
|
421 | 421 | <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> |
422 | 422 | <?php |
423 | - } |
|
424 | - } |
|
425 | - ?> |
|
423 | + } |
|
424 | + } |
|
425 | + ?> |
|
426 | 426 | <?php |
427 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
427 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
428 | 428 | ?> |
429 | 429 | |
430 | 430 | <?php |
431 | 431 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
432 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
433 | - ?> |
|
432 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
433 | + ?> |
|
434 | 434 | <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> |
435 | 435 | <?php |
436 | 436 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
437 | - ?> |
|
437 | + ?> |
|
438 | 438 | <li><?php echo _("Aircraft icon color:"); ?> |
439 | 439 | <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'; ?>"> |
440 | 440 | </li> |
441 | 441 | <?php |
442 | 442 | } |
443 | - } |
|
444 | - } |
|
445 | - ?> |
|
443 | + } |
|
444 | + } |
|
445 | + ?> |
|
446 | 446 | <?php |
447 | 447 | if (isset($globalMarine) && $globalMarine === TRUE) { |
448 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
449 | - ?> |
|
448 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
449 | + ?> |
|
450 | 450 | <li><?php echo _("Marine icon color:"); ?> |
451 | 451 | <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'; ?>"> |
452 | 452 | </li> |
453 | 453 | <?php |
454 | - } |
|
455 | - } |
|
456 | - ?> |
|
454 | + } |
|
455 | + } |
|
456 | + ?> |
|
457 | 457 | <?php |
458 | 458 | if (isset($globalTracker) && $globalTracker === TRUE) { |
459 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
460 | - ?> |
|
459 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
460 | + ?> |
|
461 | 461 | <li><?php echo _("Tracker icon color:"); ?> |
462 | 462 | <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'; ?>"> |
463 | 463 | </li> |
464 | 464 | <?php |
465 | - } |
|
466 | - } |
|
467 | - ?> |
|
465 | + } |
|
466 | + } |
|
467 | + ?> |
|
468 | 468 | <?php |
469 | 469 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
470 | - ?> |
|
470 | + ?> |
|
471 | 471 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
472 | 472 | <div class="range"> |
473 | 473 | <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'; ?>"> |
@@ -476,9 +476,9 @@ discard block |
||
476 | 476 | </li> |
477 | 477 | <?php |
478 | 478 | } |
479 | - ?> |
|
479 | + ?> |
|
480 | 480 | <?php |
481 | - } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
481 | + } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
482 | 482 | ?> |
483 | 483 | <?php |
484 | 484 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
@@ -510,7 +510,7 @@ discard block |
||
510 | 510 | </li> |
511 | 511 | <?php |
512 | 512 | } |
513 | - } |
|
513 | + } |
|
514 | 514 | ?> |
515 | 515 | <li><?php echo _("Distance unit:"); ?> |
516 | 516 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -543,19 +543,19 @@ discard block |
||
543 | 543 | <ul> |
544 | 544 | <?php |
545 | 545 | if (!isset($globalAircraft) || $globalAircraft) { |
546 | - ?> |
|
546 | + ?> |
|
547 | 547 | <?php |
548 | 548 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
549 | - ?> |
|
549 | + ?> |
|
550 | 550 | <?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 } ?> |
551 | 551 | <?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 } ?> |
552 | 552 | <?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 } ?> |
553 | 553 | <?php |
554 | 554 | } |
555 | - ?> |
|
555 | + ?> |
|
556 | 556 | <?php |
557 | 557 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
558 | - ?> |
|
558 | + ?> |
|
559 | 559 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
560 | 560 | <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> |
561 | 561 | <?php } ?> |
@@ -564,7 +564,7 @@ discard block |
||
564 | 564 | <?php } ?> |
565 | 565 | <?php |
566 | 566 | } |
567 | - ?> |
|
567 | + ?> |
|
568 | 568 | <li><?php echo _("Display airlines:"); ?> |
569 | 569 | <br/> |
570 | 570 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -584,14 +584,14 @@ discard block |
||
584 | 584 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
585 | 585 | } |
586 | 586 | } |
587 | - ?> |
|
587 | + ?> |
|
588 | 588 | </select> |
589 | 589 | </li> |
590 | 590 | <?php |
591 | 591 | $Spotter = new Spotter(); |
592 | 592 | $allalliancenames = $Spotter->getAllAllianceNames(); |
593 | 593 | if (!empty($allalliancenames)) { |
594 | - ?> |
|
594 | + ?> |
|
595 | 595 | <li><?php echo _("Display alliance:"); ?> |
596 | 596 | <br/> |
597 | 597 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -605,18 +605,18 @@ discard block |
||
605 | 605 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
606 | 606 | } |
607 | 607 | } |
608 | - ?> |
|
608 | + ?> |
|
609 | 609 | </select> |
610 | 610 | </li> |
611 | 611 | <?php |
612 | 612 | } |
613 | - ?> |
|
613 | + ?> |
|
614 | 614 | <?php |
615 | 615 | } |
616 | - ?> |
|
616 | + ?> |
|
617 | 617 | <?php |
618 | 618 | if (isset($globalAPRS) && $globalAPRS) { |
619 | - ?> |
|
619 | + ?> |
|
620 | 620 | <li><?php echo _("Display APRS sources name:"); ?> |
621 | 621 | <select class="selectpicker" multiple onchange="sources(this);"> |
622 | 622 | <?php |
@@ -640,18 +640,18 @@ discard block |
||
640 | 640 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
641 | 641 | } |
642 | 642 | } |
643 | - ?> |
|
643 | + ?> |
|
644 | 644 | </select> |
645 | 645 | </li> |
646 | 646 | <?php |
647 | 647 | } |
648 | - ?> |
|
648 | + ?> |
|
649 | 649 | <?php |
650 | 650 | if (!isset($globalAircraft) || $globalAircraft) { |
651 | - ?> |
|
651 | + ?> |
|
652 | 652 | <?php |
653 | - if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
654 | - ?> |
|
653 | + if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
|
654 | + ?> |
|
655 | 655 | <li><?php echo _("Display airlines of type:"); ?><br/> |
656 | 656 | <select class="selectpicker" onchange="airlinestype(this);"> |
657 | 657 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -661,21 +661,21 @@ discard block |
||
661 | 661 | </select> |
662 | 662 | </li> |
663 | 663 | <?php |
664 | - } |
|
665 | - ?> |
|
664 | + } |
|
665 | + ?> |
|
666 | 666 | <?php |
667 | 667 | } |
668 | - ?> |
|
668 | + ?> |
|
669 | 669 | <?php |
670 | 670 | if (isset($globalMarine) && $globalMarine) { |
671 | - ?> |
|
671 | + ?> |
|
672 | 672 | <li> |
673 | 673 | <?php echo _("Display vessels with MMSI:"); ?> |
674 | 674 | <input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" /> |
675 | 675 | </li> |
676 | 676 | <?php |
677 | 677 | } |
678 | - ?> |
|
678 | + ?> |
|
679 | 679 | <li> |
680 | 680 | <?php echo _("Display with ident:"); ?> |
681 | 681 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
@@ -688,7 +688,7 @@ discard block |
||
688 | 688 | </form> |
689 | 689 | </div> |
690 | 690 | <?php |
691 | - if (isset($globalSatellite) && $globalSatellite) { |
|
691 | + if (isset($globalSatellite) && $globalSatellite) { |
|
692 | 692 | ?> |
693 | 693 | <div class="sidebar-pane" id="satellites"> |
694 | 694 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -728,14 +728,14 @@ discard block |
||
728 | 728 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
729 | 729 | } |
730 | 730 | } |
731 | - ?> |
|
731 | + ?> |
|
732 | 732 | </select> |
733 | 733 | </li> |
734 | 734 | </ul> |
735 | 735 | </form> |
736 | 736 | </div> |
737 | 737 | <?php |
738 | - } |
|
738 | + } |
|
739 | 739 | ?> |
740 | 740 | </div> |
741 | 741 | </div> |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | require_once('require/class.Satellite.php'); |
6 | 6 | |
7 | -$trackident = filter_input(INPUT_GET,'trackid',FILTER_SANITIZE_STRING); |
|
7 | +$trackident = filter_input(INPUT_GET, 'trackid', FILTER_SANITIZE_STRING); |
|
8 | 8 | if ($trackident != '') { |
9 | 9 | require_once('require/class.SpotterLive.php'); |
10 | 10 | $SpotterLive = new SpotterLive(); |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | $spotterid = $Spotter->getSpotterIDBasedOnFlightAwareID($trackident); |
15 | 15 | header('Location: '.$globalURL.'/flightid/'.$spotterid); |
16 | 16 | } else { |
17 | - setcookie('MapTrack',$resulttrackident[0]['flightaware_id']); |
|
17 | + setcookie('MapTrack', $resulttrackident[0]['flightaware_id']); |
|
18 | 18 | } |
19 | 19 | } else { |
20 | 20 | unset($_COOKIE['MapTrack']); |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | <div class="form-group"> |
196 | 196 | <label>From (UTC):</label> |
197 | 197 | <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 /> |
|
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 /> |
|
199 | 199 | <span class="input-group-addon"> |
200 | 200 | <span class="glyphicon glyphicon-calendar"></span> |
201 | 201 | </span> |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | <div class="form-group"> |
205 | 205 | <label>To (UTC):</label> |
206 | 206 | <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']); ?>" /> |
|
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']); ?>" /> |
|
208 | 208 | <span class="input-group-addon"> |
209 | 209 | <span class="glyphicon glyphicon-calendar"></span> |
210 | 210 | </span> |
@@ -348,9 +348,9 @@ discard block |
||
348 | 348 | <li><?php echo _("Type of Terrain:"); ?> |
349 | 349 | <select class="selectpicker" onchange="terrainType(this);"> |
350 | 350 | <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option> |
351 | - <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option> |
|
352 | - <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option> |
|
353 | - <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option> |
|
351 | + <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected'; ?>>ellipsoid</option> |
|
352 | + <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected'; ?>>vr terrain</option> |
|
353 | + <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected'; ?>>ArticDEM</option> |
|
354 | 354 | </select> |
355 | 355 | </li> |
356 | 356 | <?php |
@@ -398,7 +398,7 @@ discard block |
||
398 | 398 | <li><div class="checkbox"><label><input type="checkbox" name="one3dmodel" value="1" onclick="useOne3Dmodel(this)" <?php if ((isset($_COOKIE['one3dmodel']) && $_COOKIE['one3dmodel'] == 'true') || (!isset($_COOKIE['one3dmodel']) && isset($globalMap3DOneModel) && $globalMap3DOneModel)) print 'checked'; ?> ><?php echo _("Use same 3D model for all aircraft (use fewer resources)"); ?></label></div></li> |
399 | 399 | <?php |
400 | 400 | } |
401 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
401 | + if (time() > mktime(0, 0, 0, 12, 1, date("Y")) && time() < mktime(0, 0, 0, 12, 31, date("Y"))) { |
|
402 | 402 | ?> |
403 | 403 | <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> |
404 | 404 | <?php |
@@ -575,10 +575,10 @@ discard block |
||
575 | 575 | $Spotter = new Spotter(); |
576 | 576 | $allairlinenames = $Spotter->getAllAirlineNames(); |
577 | 577 | } |
578 | - foreach($allairlinenames as $airline) { |
|
578 | + foreach ($allairlinenames as $airline) { |
|
579 | 579 | $airline_name = $airline['airline_name']; |
580 | - if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...'; |
|
581 | - if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) { |
|
580 | + if (strlen($airline_name) > 30) $airline_name = substr($airline_name, 0, 30).'...'; |
|
581 | + if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'], explode(',', $_COOKIE['filter_Airlines']))) { |
|
582 | 582 | echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>'; |
583 | 583 | } else { |
584 | 584 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
@@ -597,7 +597,7 @@ discard block |
||
597 | 597 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
598 | 598 | <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
599 | 599 | <?php |
600 | - foreach($allalliancenames as $alliance) { |
|
600 | + foreach ($allalliancenames as $alliance) { |
|
601 | 601 | $alliance_name = $alliance['alliance']; |
602 | 602 | if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] == $alliance_name) { |
603 | 603 | echo '<option value="'.$alliance_name.'" selected>'.$alliance_name.'</option>'; |
@@ -633,8 +633,8 @@ discard block |
||
633 | 633 | */ |
634 | 634 | $Source = new Source(); |
635 | 635 | $datasource = $Source->getLocationInfoByType('gs'); |
636 | - foreach($datasource as $src) { |
|
637 | - if (isset($_COOKIE['filter_Sources']) && in_array($src['name'],explode(',',$_COOKIE['filter_Sources']))) { |
|
636 | + foreach ($datasource as $src) { |
|
637 | + if (isset($_COOKIE['filter_Sources']) && in_array($src['name'], explode(',', $_COOKIE['filter_Sources']))) { |
|
638 | 638 | echo '<option value="'.$src['name'].'" selected>'.$src['name'].'</option>'; |
639 | 639 | } else { |
640 | 640 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
@@ -722,7 +722,7 @@ discard block |
||
722 | 722 | else if ($type_name == 'radar') $type_name = 'Radar Calibration'; |
723 | 723 | else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches'; |
724 | 724 | |
725 | - if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) { |
|
725 | + if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'], explode(',', $_COOKIE['sattypes']))) { |
|
726 | 726 | print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>'; |
727 | 727 | } else { |
728 | 728 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |