@@ -5,8 +5,11 @@ discard block |
||
5 | 5 | $file_path = pathinfo($_SERVER['SCRIPT_NAME']); |
6 | 6 | $current_page = $file_path['filename']; |
7 | 7 | date_default_timezone_set($globalTimezone); |
8 | -if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType']; |
|
9 | -else $MapType = $globalMapProvider; |
|
8 | +if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') { |
|
9 | + $MapType = $_COOKIE['MapType']; |
|
10 | +} else { |
|
11 | + $MapType = $globalMapProvider; |
|
12 | +} |
|
10 | 13 | if (isset($_GET['3d'])) { |
11 | 14 | setcookie('MapFormat','3d'); |
12 | 15 | } else if (isset($_GET['2d'])) { |
@@ -240,7 +243,13 @@ discard block |
||
240 | 243 | <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script> |
241 | 244 | <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script> |
242 | 245 | <script src="<?php print $globalURL; ?>/js/map.common.js"></script> |
243 | -<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
246 | +<script src="<?php print $globalURL; ?>/js/map.2d.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) { |
|
247 | + print '&latitude='.$latitude; |
|
248 | +} |
|
249 | +?><?php if(isset($longitude)) { |
|
250 | + print '&longitude='.$longitude; |
|
251 | +} |
|
252 | +?>&<?php print time(); ?>"></script> |
|
244 | 253 | <?php |
245 | 254 | if (!isset($type) || $type == 'aircraft') { |
246 | 255 | ?> |
@@ -310,7 +319,13 @@ discard block |
||
310 | 319 | <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script> |
311 | 320 | <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script> |
312 | 321 | <script src="<?php print $globalURL; ?>/js/map.common.js"></script> |
313 | -<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script> |
|
322 | +<script src="<?php print $globalURL; ?>/js/map.2d.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) { |
|
323 | + print '&latitude='.$latitude; |
|
324 | +} |
|
325 | +?><?php if(isset($longitude)) { |
|
326 | + print '&longitude='.$longitude; |
|
327 | +} |
|
328 | +?>&<?php print time(); ?>"></script> |
|
314 | 329 | <script src="<?php print $globalURL; ?>/js/map-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script> |
315 | 330 | <?php |
316 | 331 | if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) { |
@@ -391,7 +406,12 @@ discard block |
||
391 | 406 | <span class="icon-bar"></span> |
392 | 407 | </button> |
393 | 408 | <a href="<?php print $globalURL; ?>/search" class="navbar-toggle navbar-toggle-search"><i class="fa fa-search"></i></a> |
394 | - <a class="navbar-brand" href="<?php if ($globalURL == '') print '/'; else print $globalURL; ?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a> |
|
409 | + <a class="navbar-brand" href="<?php if ($globalURL == '') { |
|
410 | + print '/'; |
|
411 | +} else { |
|
412 | + print $globalURL; |
|
413 | +} |
|
414 | +?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a> |
|
395 | 415 | </div> |
396 | 416 | <div class="collapse navbar-collapse"> |
397 | 417 | |
@@ -417,7 +437,10 @@ discard block |
||
417 | 437 | <?php |
418 | 438 | } |
419 | 439 | ?> |
420 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a> |
|
440 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) { |
|
441 | + echo 'right-'; |
|
442 | +} |
|
443 | +?>caret"></b></a> |
|
421 | 444 | <ul class="dropdown-menu"> |
422 | 445 | <li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircrafts Types"); ?></a></li> |
423 | 446 | <?php |
@@ -488,8 +511,14 @@ discard block |
||
488 | 511 | </li> |
489 | 512 | <li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li> |
490 | 513 | <li><a href="<?php print $globalURL; ?>/statistics"><?php echo _("Statistics"); ?></a></li> |
491 | - <li class="dropdown<?php if ($sub) echo '-submenu'; ?>"> |
|
492 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a> |
|
514 | + <li class="dropdown<?php if ($sub) { |
|
515 | + echo '-submenu'; |
|
516 | +} |
|
517 | +?>"> |
|
518 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) { |
|
519 | + echo 'right-'; |
|
520 | +} |
|
521 | +?>caret"></b></a> |
|
493 | 522 | <ul class="dropdown-menu"> |
494 | 523 | <li><a href="<?php print $globalURL; ?>/tools/acars"><?php echo _("ACARS translator"); ?></a></li> |
495 | 524 | <li><a href="<?php print $globalURL; ?>/tools/metar"><?php echo _("METAR translator"); ?></a></li> |
@@ -518,7 +547,10 @@ discard block |
||
518 | 547 | <?php |
519 | 548 | } |
520 | 549 | ?> |
521 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a> |
|
550 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) { |
|
551 | + echo 'right-'; |
|
552 | +} |
|
553 | +?>caret"></b></a> |
|
522 | 554 | <ul class="dropdown-menu"> |
523 | 555 | <li><a href="<?php print $globalURL; ?>/marine/currently"><?php echo _("Current Activity"); ?></a></li> |
524 | 556 | <li><a href="<?php print $globalURL; ?>/marine/latest"><?php echo _("Latest Activity"); ?></a></li> |
@@ -550,7 +582,10 @@ discard block |
||
550 | 582 | <?php |
551 | 583 | } |
552 | 584 | ?> |
553 | - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a> |
|
585 | + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) { |
|
586 | + echo 'right-'; |
|
587 | +} |
|
588 | +?>caret"></b></a> |
|
554 | 589 | <ul class="dropdown-menu"> |
555 | 590 | <li><a href="<?php print $globalURL; ?>/tracker/currently"><?php echo _("Current Activity"); ?></a></li> |
556 | 591 | <li><a href="<?php print $globalURL; ?>/tracker/latest"><?php echo _("Latest Activity"); ?></a></li> |
@@ -606,7 +641,9 @@ discard block |
||
606 | 641 | $alllang = $Language->getLanguages(); |
607 | 642 | foreach ($alllang as $key => $lang) { |
608 | 643 | print '<option value="'.$key.'"'; |
609 | - if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected '; |
|
644 | + if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) { |
|
645 | + print ' selected '; |
|
646 | + } |
|
610 | 647 | print '>'.$lang[0].'</option>'; |
611 | 648 | } |
612 | 649 | ?> |
@@ -746,9 +783,24 @@ discard block |
||
746 | 783 | $customid = $globalMapProvider; |
747 | 784 | ?> |
748 | 785 | L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', { |
749 | - maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>, |
|
750 | - minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>, |
|
751 | - noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>, |
|
786 | + maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) { |
|
787 | + print $globalMapCustomLayer[$customid]['maxZoom']; |
|
788 | +} else { |
|
789 | + print '18'; |
|
790 | +} |
|
791 | +?>, |
|
792 | + minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) { |
|
793 | + print $globalMapCustomLayer[$customid]['minZoom']; |
|
794 | +} else { |
|
795 | + print '0'; |
|
796 | +} |
|
797 | +?>, |
|
798 | + noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) { |
|
799 | + print 'false'; |
|
800 | +} else { |
|
801 | + print 'true'; |
|
802 | +} |
|
803 | +?>, |
|
752 | 804 | attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>' |
753 | 805 | }).addTo(map); |
754 | 806 | <?php |
@@ -771,4 +823,7 @@ discard block |
||
771 | 823 | |
772 | 824 | ?> |
773 | 825 | |
774 | -<section class="container main-content <?php if (strtolower($current_page) == 'index') print 'index '; ?>clear"> |
|
826 | +<section class="container main-content <?php if (strtolower($current_page) == 'index') { |
|
827 | + print 'index '; |
|
828 | +} |
|
829 | +?>clear"> |