Completed
Push — master ( cc589d...2874a1 )
by Yannick
08:48
created
header.php 1 patch
Indentation   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 // When button "Remove all filters" is clicked
29 29
 if (isset($_POST['removefilters'])) {
30 30
 	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
31
-	    return strpos($key,'filter_') === 0;
31
+		return strpos($key,'filter_') === 0;
32 32
 	});
33 33
 	foreach ($allfilters as $filt) {
34 34
 		unset($_COOKIE[$filt]);
@@ -167,17 +167,17 @@  discard block
 block discarded – undo
167 167
 	}
168 168
 ?>
169 169
 <?php 
170
-    if (isset($_POST['archive'])) {
170
+	if (isset($_POST['archive'])) {
171 171
 ?>
172 172
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
173 173
 <?php 
174
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
174
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
175 175
 ?>
176 176
 
177 177
 <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>&archive&begindate=<?php print strtotime($_POST['start_date']); ?>&enddate=<?php print strtotime($_POST['end_date']); ?>&archivespeed=<?php print $_POST['archivespeed']; ?>"></script>
178 178
 <?php    
179
-	    }
180
-    } else {
179
+		}
180
+	} else {
181 181
 ?>
182 182
 <?php
183 183
 /*	if (isset($globalBeta) && $globalBeta) {
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 */
190 190
 ?>
191 191
 <?php 
192
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
192
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
193 193
 ?>
194 194
 <?php
195 195
 //		if (isset($globalBeta) && $globalBeta) {
@@ -216,13 +216,13 @@  discard block
 block discarded – undo
216 216
 <script src="<?php print $globalURL; ?>/js/map-marine.2d.js.php?<?php print time(); ?>"></script>
217 217
 <?php
218 218
 		}
219
-	    }
219
+		}
220 220
 ?>
221 221
 <?php
222 222
 //	}
223 223
 ?>
224 224
 <?php
225
-    }
225
+	}
226 226
 }
227 227
 ?>
228 228
 <?php
@@ -398,24 +398,24 @@  discard block
 block discarded – undo
398 398
       <ul class="nav navbar-nav">
399 399
 
400 400
 <?php 
401
-    $sub = false;
402
-    if (((!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE))) || (isset($globalMarine) && $globalMarine === TRUE && isset($globalTracker) && $globalTracker === TRUE)) {
401
+	$sub = false;
402
+	if (((!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE))) || (isset($globalMarine) && $globalMarine === TRUE && isset($globalTracker) && $globalTracker === TRUE)) {
403 403
 	$sub = true;
404
-    }
404
+	}
405 405
 ?>
406 406
 <?php
407
-    if (!isset($globalAircraft) || $globalAircraft === TRUE) {
407
+	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
408 408
 ?>
409 409
     <li class="dropdown">
410 410
 <?php
411
-    if ($sub) {
411
+	if ($sub) {
412 412
 ?>
413 413
       	<li class="dropdown">
414 414
           <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Aircrafts"); ?> <b class="caret"></b></a>
415 415
 	<ul class="dropdown-menu multi-level">
416 416
       	<li class="dropdown-submenu">
417 417
 <?php
418
-    }
418
+	}
419 419
 ?>
420 420
           <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
421 421
           <ul class="dropdown-menu">
@@ -423,15 +423,15 @@  discard block
 block discarded – undo
423 423
 			<li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li>
424 424
 			<li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li>
425 425
 <?php
426
-    if ((!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
426
+	if ((!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
427 427
 ?>
428 428
 			<li><a href="<?php print $globalURL; ?>/owner"><?php echo _("Owners"); ?></a></li>
429 429
 <?php
430
-    } else {
430
+	} else {
431 431
 ?>
432 432
 			<li><a href="<?php print $globalURL; ?>/pilot"><?php echo _("Pilots"); ?></a></li>
433 433
 <?php
434
-    }
434
+	}
435 435
 ?>
436 436
 			<li><hr /></li>
437 437
             <li><a href="<?php print $globalURL; ?>/currently"><?php echo _("Current Activity"); ?></a></li>
@@ -439,34 +439,34 @@  discard block
 block discarded – undo
439 439
             <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li>
440 440
             <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li>
441 441
             <?php
442
-        	if ($globalACARS) {
443
-        	    if (isset($globalDemo) && $globalDemo) {
444
-    	    ?>
442
+			if ($globalACARS) {
443
+				if (isset($globalDemo) && $globalDemo) {
444
+			?>
445 445
             <li><hr /></li>
446 446
             <li><i><?php echo _('ACARS data not available publicly'); ?></i></li>
447 447
             <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li>
448 448
             <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li>
449 449
             <?php
450
-        	    } else {
451
-    	    ?>
450
+				} else {
451
+			?>
452 452
             <li><hr /></li>
453 453
             <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li>
454 454
             <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li>
455 455
             <?php
456
-        	    }
457
-        	}
458
-    	    ?>
456
+				}
457
+			}
458
+			?>
459 459
     	    <?php
460
-    	        if (isset($globalAccidents) && $globalAccidents) {
461
-    	    ?>
460
+				if (isset($globalAccidents) && $globalAccidents) {
461
+			?>
462 462
             <li><hr /></li>
463 463
             <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident"); ?></a></li>
464 464
             <li><a href="<?php print $globalURL; ?>/accident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Accident"); ?></a></li>
465 465
             <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident"); ?></a></li>
466 466
             <li><a href="<?php print $globalURL; ?>/incident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Incident"); ?></a></li>
467 467
             <?php
468
-        	}
469
-    	    ?>
468
+			}
469
+			?>
470 470
             <li><hr /></li>
471 471
             <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li>
472 472
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
@@ -489,14 +489,14 @@  discard block
 block discarded – undo
489 489
     </ul>
490 490
 <?php
491 491
 	}
492
-    }
492
+	}
493 493
 ?>
494 494
 <?php
495
-    if (isset($globalMarine) && $globalMarine) {
495
+	if (isset($globalMarine) && $globalMarine) {
496 496
 ?>
497 497
     <li class="dropdown">
498 498
 <?php
499
-        if ($sub) {
499
+		if ($sub) {
500 500
 ?>
501 501
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Vessels"); ?> <b class="caret"></b></a>
502 502
 	<ul class="dropdown-menu multi-level">
@@ -521,14 +521,14 @@  discard block
 block discarded – undo
521 521
 	}
522 522
 ?>
523 523
 <?php
524
-    }
524
+	}
525 525
 ?>
526 526
 <?php
527
-    if (isset($globalTracker) && $globalTracker) {
527
+	if (isset($globalTracker) && $globalTracker) {
528 528
 ?>
529 529
     <li class="dropdown">
530 530
 <?php
531
-        if ($sub) {
531
+		if ($sub) {
532 532
 ?>
533 533
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Trackers"); ?> <b class="caret"></b></a>
534 534
 	<ul class="dropdown-menu multi-level">
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
553 553
 	}
554 554
 ?>
555 555
 <?php
556
-    }
556
+	}
557 557
 ?>
558 558
 
559 559
         <li class="dropdown">
@@ -562,12 +562,12 @@  discard block
 block discarded – undo
562 562
           	<li><a href="<?php print $globalURL; ?>/about"><?php echo _("About The Project"); ?></a></li>
563 563
           	<li><a href="<?php print $globalURL; ?>/about/export"><?php echo _("Exporting Data"); ?></a></li>
564 564
 <?php
565
-    if (!isset($globalAircraft) || $globalAircraft === TRUE) {
565
+	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
566 566
 ?>
567 567
 		<li><hr /></li>
568 568
 		<li><a href="<?php print $globalURL; ?>/about/tv"><?php echo _("Spotter TV"); ?></a></li>
569 569
 <?php
570
-    }
570
+	}
571 571
 ?>
572 572
 	    <?php if (isset($globalContribute) && $globalContribute) { ?>
573 573
                 <li><hr /></li>
@@ -588,14 +588,14 @@  discard block
 block discarded – undo
588 588
   	    <form>
589 589
   		<select class="selectpicker" data-width="120px" onchange="language(this);">
590 590
   		    <?php
591
-  		        $Language = new Language();
592
-  		        $alllang = $Language->getLanguages();
593
-  		        foreach ($alllang as $key => $lang) {
594
-  		            print '<option value="'.$key.'"';
595
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
596
-  		            print '>'.$lang[0].'</option>';
597
-  		        }
598
-  		    ?>
591
+  				$Language = new Language();
592
+  				$alllang = $Language->getLanguages();
593
+  				foreach ($alllang as $key => $lang) {
594
+  					print '<option value="'.$key.'"';
595
+  					if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
596
+  					print '>'.$lang[0].'</option>';
597
+  				}
598
+  			?>
599 599
   		</select>
600 600
   	    </form>
601 601
   	</div>
@@ -626,18 +626,18 @@  discard block
 block discarded – undo
626 626
 ?>
627 627
     <div class="top-header clear" role="main">
628 628
 <?php
629
-    if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
629
+	if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
630 630
 ?>
631 631
     <div id="archive-map"></div>
632 632
 <?php
633
-    }
633
+	}
634 634
 ?>
635 635
     </div>
636 636
 <?php
637 637
 }
638 638
 if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
639 639
 {
640
-    ?>
640
+	?>
641 641
     <div class="top-header clear" role="main">
642 642
         <div id="map"></div>
643 643
 	<link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" />
@@ -648,15 +648,15 @@  discard block
 block discarded – undo
648 648
         var zoom = 13;
649 649
 //create the map
650 650
 <?php
651
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
651
+	if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
652 652
 ?>
653 653
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
654 654
 <?php
655
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
655
+	} elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
656 656
 ?>
657 657
   map = L.map('map', { zoomControl:true });
658 658
 <?php
659
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
659
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
660 660
 ?>
661 661
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
662 662
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -664,22 +664,22 @@  discard block
 block discarded – undo
664 664
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
665 665
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
666 666
 <?php
667
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
667
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
668 668
 ?>
669 669
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
670 670
 <?php
671
-    } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
671
+	} elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
672 672
 ?>
673 673
   map = L.map('map', { zoomControl:true });
674 674
 <?php
675
-    }
675
+	}
676 676
 ?>
677 677
   //initialize the layer group for the aircrft markers
678 678
   var layer_data = L.layerGroup();
679 679
 
680 680
   //a few title layers
681 681
 <?php
682
-    if ($globalMapProvider == 'Mapbox') {
682
+	if ($globalMapProvider == 'Mapbox') {
683 683
 ?>
684 684
   L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
685 685
     maxZoom: 18,
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
     token : '<?php print $globalMapboxToken; ?>'
691 691
   }).addTo(map);
692 692
 <?php
693
-    } elseif ($globalMapProvider == 'MapQuest-OSM') {
693
+	} elseif ($globalMapProvider == 'MapQuest-OSM') {
694 694
 ?>
695 695
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
696 696
     maxZoom: 18,
@@ -699,7 +699,7 @@  discard block
 block discarded – undo
699 699
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>'
700 700
   }).addTo(map);
701 701
 <?php
702
-    } elseif ($globalMapProvider == 'MapQuest-Aerial') {
702
+	} elseif ($globalMapProvider == 'MapQuest-Aerial') {
703 703
 ?>
704 704
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
705 705
     maxZoom: 18,
@@ -708,27 +708,27 @@  discard block
 block discarded – undo
708 708
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency"'
709 709
   }).addTo(map);
710 710
 <?php
711
-    } elseif ($globalMapProvider == 'Google-Roadmap') {
711
+	} elseif ($globalMapProvider == 'Google-Roadmap') {
712 712
 ?>
713 713
     var googleLayer = new L.Google('ROADMAP');
714 714
     map.addLayer(googleLayer);
715 715
 <?php
716
-    } elseif ($globalMapProvider == 'Google-Satellite') {
716
+	} elseif ($globalMapProvider == 'Google-Satellite') {
717 717
 ?>
718 718
     var googleLayer = new L.Google('SATELLITE');
719 719
     map.addLayer(googleLayer);
720 720
 <?php
721
-    } elseif ($globalMapProvider == 'Google-Hybrid') {
721
+	} elseif ($globalMapProvider == 'Google-Hybrid') {
722 722
 ?>
723 723
     var googleLayer = new L.Google('HYBRID');
724 724
     map.addLayer(googleLayer);
725 725
 <?php
726
-    } elseif ($globalMapProvider == 'Google-Terrain') {
726
+	} elseif ($globalMapProvider == 'Google-Terrain') {
727 727
 ?>
728 728
     var googleLayer = new L.Google('Terrain');
729 729
     map.addLayer(googleLayer);
730 730
 <?php
731
-    } elseif (isset($globalMapCustomLayer[$globalMapProvider])) {
731
+	} elseif (isset($globalMapCustomLayer[$globalMapProvider])) {
732 732
 	$customid = $globalMapProvider;
733 733
 ?>
734 734
     L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
@@ -738,8 +738,8 @@  discard block
 block discarded – undo
738 738
         attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
739 739
     }).addTo(map);
740 740
 <?php
741
-    //} elseif ($globalMapProvider == 'OpenStreetMap') {
742
-    } else {
741
+	//} elseif ($globalMapProvider == 'OpenStreetMap') {
742
+	} else {
743 743
 ?>
744 744
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
745 745
     maxZoom: 18,
@@ -748,7 +748,7 @@  discard block
 block discarded – undo
748 748
   }).addTo(map);
749 749
 
750 750
 <?php
751
-    }
751
+	}
752 752
 ?>
753 753
         </script>
754 754
     </div>
Please login to merge, or discard this patch.