Completed
Push — master ( 64db21...a57c25 )
by Yannick
07:30
created
header.php 1 patch
Indentation   +64 added lines, -64 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
@@ -391,24 +391,24 @@  discard block
 block discarded – undo
391 391
       <ul class="nav navbar-nav">
392 392
 
393 393
 <?php 
394
-    $sub = false;
395
-    if (((!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE))) || (isset($globalMarine) && $globalMarine === TRUE && isset($globalTracker) && $globalTracker === TRUE)) {
394
+	$sub = false;
395
+	if (((!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE))) || (isset($globalMarine) && $globalMarine === TRUE && isset($globalTracker) && $globalTracker === TRUE)) {
396 396
 	$sub = true;
397
-    }
397
+	}
398 398
 ?>
399 399
 <?php
400
-    if (!isset($globalAircraft) || $globalAircraft === TRUE) {
400
+	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
401 401
 ?>
402 402
     <li class="dropdown">
403 403
 <?php
404
-    if ($sub) {
404
+	if ($sub) {
405 405
 ?>
406 406
       	<li class="dropdown">
407 407
           <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Aircrafts"); ?> <b class="caret"></b></a>
408 408
 	<ul class="dropdown-menu multi-level">
409 409
       	<li class="dropdown-submenu">
410 410
 <?php
411
-    }
411
+	}
412 412
 ?>
413 413
           <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
414 414
           <ul class="dropdown-menu">
@@ -416,15 +416,15 @@  discard block
 block discarded – undo
416 416
 			<li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li>
417 417
 			<li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li>
418 418
 <?php
419
-    if ((!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
419
+	if ((!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
420 420
 ?>
421 421
 			<li><a href="<?php print $globalURL; ?>/owner"><?php echo _("Owners"); ?></a></li>
422 422
 <?php
423
-    } else {
423
+	} else {
424 424
 ?>
425 425
 			<li><a href="<?php print $globalURL; ?>/pilot"><?php echo _("Pilots"); ?></a></li>
426 426
 <?php
427
-    }
427
+	}
428 428
 ?>
429 429
 			<li><hr /></li>
430 430
             <li><a href="<?php print $globalURL; ?>/currently"><?php echo _("Current Activity"); ?></a></li>
@@ -432,34 +432,34 @@  discard block
 block discarded – undo
432 432
             <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li>
433 433
             <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li>
434 434
             <?php
435
-        	if ($globalACARS) {
436
-        	    if (isset($globalDemo) && $globalDemo) {
437
-    	    ?>
435
+			if ($globalACARS) {
436
+				if (isset($globalDemo) && $globalDemo) {
437
+			?>
438 438
             <li><hr /></li>
439 439
             <li><i><?php echo _('ACARS data not available publicly'); ?></i></li>
440 440
             <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li>
441 441
             <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li>
442 442
             <?php
443
-        	    } else {
444
-    	    ?>
443
+				} else {
444
+			?>
445 445
             <li><hr /></li>
446 446
             <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li>
447 447
             <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li>
448 448
             <?php
449
-        	    }
450
-        	}
451
-    	    ?>
449
+				}
450
+			}
451
+			?>
452 452
     	    <?php
453
-    	        if (isset($globalAccidents) && $globalAccidents) {
454
-    	    ?>
453
+				if (isset($globalAccidents) && $globalAccidents) {
454
+			?>
455 455
             <li><hr /></li>
456 456
             <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident"); ?></a></li>
457 457
             <li><a href="<?php print $globalURL; ?>/accident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Accident"); ?></a></li>
458 458
             <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident"); ?></a></li>
459 459
             <li><a href="<?php print $globalURL; ?>/incident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Incident"); ?></a></li>
460 460
             <?php
461
-        	}
462
-    	    ?>
461
+			}
462
+			?>
463 463
             <li><hr /></li>
464 464
             <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li>
465 465
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
@@ -482,14 +482,14 @@  discard block
 block discarded – undo
482 482
     </ul>
483 483
 <?php
484 484
 	}
485
-    }
485
+	}
486 486
 ?>
487 487
 <?php
488
-    if (isset($globalMarine) && $globalMarine) {
488
+	if (isset($globalMarine) && $globalMarine) {
489 489
 ?>
490 490
     <li class="dropdown">
491 491
 <?php
492
-        if ($sub) {
492
+		if ($sub) {
493 493
 ?>
494 494
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Vessels"); ?> <b class="caret"></b></a>
495 495
 	<ul class="dropdown-menu multi-level">
@@ -513,14 +513,14 @@  discard block
 block discarded – undo
513 513
 	}
514 514
 ?>
515 515
 <?php
516
-    }
516
+	}
517 517
 ?>
518 518
 <?php
519
-    if (isset($globalTracker) && $globalTracker) {
519
+	if (isset($globalTracker) && $globalTracker) {
520 520
 ?>
521 521
     <li class="dropdown">
522 522
 <?php
523
-        if ($sub) {
523
+		if ($sub) {
524 524
 ?>
525 525
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Trackers"); ?> <b class="caret"></b></a>
526 526
 	<ul class="dropdown-menu multi-level">
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
 	}
545 545
 ?>
546 546
 <?php
547
-    }
547
+	}
548 548
 ?>
549 549
 
550 550
         <li class="dropdown">
@@ -553,12 +553,12 @@  discard block
 block discarded – undo
553 553
           	<li><a href="<?php print $globalURL; ?>/about"><?php echo _("About The Project"); ?></a></li>
554 554
           	<li><a href="<?php print $globalURL; ?>/about/export"><?php echo _("Exporting Data"); ?></a></li>
555 555
 <?php
556
-    if (!isset($globalAircraft) || $globalAircraft === TRUE) {
556
+	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
557 557
 ?>
558 558
 		<li><hr /></li>
559 559
 		<li><a href="<?php print $globalURL; ?>/about/tv"><?php echo _("Spotter TV"); ?></a></li>
560 560
 <?php
561
-    }
561
+	}
562 562
 ?>
563 563
 	    <?php if (isset($globalContribute) && $globalContribute) { ?>
564 564
                 <li><hr /></li>
@@ -579,14 +579,14 @@  discard block
 block discarded – undo
579 579
   	    <form>
580 580
   		<select class="selectpicker" data-width="120px" onchange="language(this);">
581 581
   		    <?php
582
-  		        $Language = new Language();
583
-  		        $alllang = $Language->getLanguages();
584
-  		        foreach ($alllang as $key => $lang) {
585
-  		            print '<option value="'.$key.'"';
586
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
587
-  		            print '>'.$lang[0].'</option>';
588
-  		        }
589
-  		    ?>
582
+  				$Language = new Language();
583
+  				$alllang = $Language->getLanguages();
584
+  				foreach ($alllang as $key => $lang) {
585
+  					print '<option value="'.$key.'"';
586
+  					if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
587
+  					print '>'.$lang[0].'</option>';
588
+  				}
589
+  			?>
590 590
   		</select>
591 591
   	    </form>
592 592
   	</div>
@@ -617,18 +617,18 @@  discard block
 block discarded – undo
617 617
 ?>
618 618
     <div class="top-header clear" role="main">
619 619
 <?php
620
-    if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
620
+	if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
621 621
 ?>
622 622
     <div id="archive-map"></div>
623 623
 <?php
624
-    }
624
+	}
625 625
 ?>
626 626
     </div>
627 627
 <?php
628 628
 }
629 629
 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))
630 630
 {
631
-    ?>
631
+	?>
632 632
     <div class="top-header clear" role="main">
633 633
         <div id="map"></div>
634 634
 	<link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" />
@@ -639,15 +639,15 @@  discard block
 block discarded – undo
639 639
         var zoom = 13;
640 640
 //create the map
641 641
 <?php
642
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
642
+	if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
643 643
 ?>
644 644
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
645 645
 <?php
646
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
646
+	} elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
647 647
 ?>
648 648
   map = L.map('map', { zoomControl:true });
649 649
 <?php
650
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
650
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
651 651
 ?>
652 652
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
653 653
     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);
@@ -655,22 +655,22 @@  discard block
 block discarded – undo
655 655
     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);
656 656
     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);
657 657
 <?php
658
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
658
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
659 659
 ?>
660 660
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
661 661
 <?php
662
-    } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
662
+	} elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
663 663
 ?>
664 664
   map = L.map('map', { zoomControl:true });
665 665
 <?php
666
-    }
666
+	}
667 667
 ?>
668 668
   //initialize the layer group for the aircrft markers
669 669
   var layer_data = L.layerGroup();
670 670
 
671 671
   //a few title layers
672 672
 <?php
673
-    if ($globalMapProvider == 'Mapbox') {
673
+	if ($globalMapProvider == 'Mapbox') {
674 674
 ?>
675 675
   L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
676 676
     maxZoom: 18,
@@ -681,7 +681,7 @@  discard block
 block discarded – undo
681 681
     token : '<?php print $globalMapboxToken; ?>'
682 682
   }).addTo(map);
683 683
 <?php
684
-    } elseif ($globalMapProvider == 'OpenStreetMap') {
684
+	} elseif ($globalMapProvider == 'OpenStreetMap') {
685 685
 ?>
686 686
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
687 687
     maxZoom: 18,
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
689 689
       '<a href="http://www.openstreetmap.org/copyright">Open Database Licence</a>'
690 690
   }).addTo(map);
691 691
 <?php
692
-    } elseif ($globalMapProvider == 'MapQuest-OSM') {
692
+	} elseif ($globalMapProvider == 'MapQuest-OSM') {
693 693
 ?>
694 694
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
695 695
     maxZoom: 18,
@@ -698,7 +698,7 @@  discard block
 block discarded – undo
698 698
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>'
699 699
   }).addTo(map);
700 700
 <?php
701
-    } elseif ($globalMapProvider == 'MapQuest-Aerial') {
701
+	} elseif ($globalMapProvider == 'MapQuest-Aerial') {
702 702
 ?>
703 703
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
704 704
     maxZoom: 18,
@@ -707,27 +707,27 @@  discard block
 block discarded – undo
707 707
       '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"'
708 708
   }).addTo(map);
709 709
 <?php
710
-    } elseif ($globalMapProvider == 'Google-Roadmap') {
710
+	} elseif ($globalMapProvider == 'Google-Roadmap') {
711 711
 ?>
712 712
     var googleLayer = new L.Google('ROADMAP');
713 713
     map.addLayer(googleLayer);
714 714
 <?php
715
-    } elseif ($globalMapProvider == 'Google-Satellite') {
715
+	} elseif ($globalMapProvider == 'Google-Satellite') {
716 716
 ?>
717 717
     var googleLayer = new L.Google('SATELLITE');
718 718
     map.addLayer(googleLayer);
719 719
 <?php
720
-    } elseif ($globalMapProvider == 'Google-Hybrid') {
720
+	} elseif ($globalMapProvider == 'Google-Hybrid') {
721 721
 ?>
722 722
     var googleLayer = new L.Google('HYBRID');
723 723
     map.addLayer(googleLayer);
724 724
 <?php
725
-    } elseif ($globalMapProvider == 'Google-Terrain') {
725
+	} elseif ($globalMapProvider == 'Google-Terrain') {
726 726
 ?>
727 727
     var googleLayer = new L.Google('Terrain');
728 728
     map.addLayer(googleLayer);
729 729
 <?php
730
-    }
730
+	}
731 731
 ?>
732 732
         </script>
733 733
     </div>
Please login to merge, or discard this patch.