|
@@ -4,7 +4,7 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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') 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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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>'; |