Completed
Push — master ( 1a2d60...d53e0e )
by Yannick
06:20
created
header.php 1 patch
Indentation   +49 added lines, -49 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,16 +167,16 @@  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
 <?php 
173
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
173
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
174 174
 ?>
175 175
 
176 176
 <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>
177 177
 <?php    
178
-	    }
179
-    } else {
178
+		}
179
+	} else {
180 180
 ?>
181 181
 <?php
182 182
 /*	if (isset($globalBeta) && $globalBeta) {
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 */
189 189
 ?>
190 190
 <?php 
191
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
191
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
192 192
 ?>
193 193
 <?php
194 194
 //		if (isset($globalBeta) && $globalBeta) {
@@ -199,13 +199,13 @@  discard block
 block discarded – undo
199 199
 ?>
200 200
 <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>"></script>
201 201
 <?php
202
-	    }
202
+		}
203 203
 ?>
204 204
 <?php
205 205
 //	}
206 206
 ?>
207 207
 <?php
208
-    }
208
+	}
209 209
 }
210 210
 ?>
211 211
 <?php
@@ -360,15 +360,15 @@  discard block
 block discarded – undo
360 360
 			<li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li>
361 361
 			<li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li>
362 362
 <?php
363
-    if ((!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
363
+	if ((!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
364 364
 ?>
365 365
 			<li><a href="<?php print $globalURL; ?>/owner"><?php echo _("Owners"); ?></a></li>
366 366
 <?php
367
-    } else {
367
+	} else {
368 368
 ?>
369 369
 			<li><a href="<?php print $globalURL; ?>/pilot"><?php echo _("Pilots"); ?></a></li>
370 370
 <?php
371
-    }
371
+	}
372 372
 ?>
373 373
 			<li><hr /></li>
374 374
             <li><a href="<?php print $globalURL; ?>/currently"><?php echo _("Current Activity"); ?></a></li>
@@ -376,34 +376,34 @@  discard block
 block discarded – undo
376 376
             <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li>
377 377
             <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li>
378 378
             <?php
379
-        	if ($globalACARS) {
380
-        	    if (isset($globalDemo) && $globalDemo) {
381
-    	    ?>
379
+			if ($globalACARS) {
380
+				if (isset($globalDemo) && $globalDemo) {
381
+			?>
382 382
             <li><hr /></li>
383 383
             <li><i><?php echo _('ACARS data not available publicly'); ?></i></li>
384 384
             <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li>
385 385
             <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li>
386 386
             <?php
387
-        	    } else {
388
-    	    ?>
387
+				} else {
388
+			?>
389 389
             <li><hr /></li>
390 390
             <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li>
391 391
             <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li>
392 392
             <?php
393
-        	    }
394
-        	}
395
-    	    ?>
393
+				}
394
+			}
395
+			?>
396 396
     	    <?php
397
-    	        if (isset($globalAccidents) && $globalAccidents) {
398
-    	    ?>
397
+				if (isset($globalAccidents) && $globalAccidents) {
398
+			?>
399 399
             <li><hr /></li>
400 400
             <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident"); ?></a></li>
401 401
             <li><a href="<?php print $globalURL; ?>/accident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Accident"); ?></a></li>
402 402
             <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident"); ?></a></li>
403 403
             <li><a href="<?php print $globalURL; ?>/incident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Incident"); ?></a></li>
404 404
             <?php
405
-        	}
406
-    	    ?>
405
+			}
406
+			?>
407 407
             <li><hr /></li>
408 408
             <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li>
409 409
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
@@ -445,14 +445,14 @@  discard block
 block discarded – undo
445 445
   	    <form>
446 446
   		<select class="selectpicker" data-width="120px" onchange="language(this);">
447 447
   		    <?php
448
-  		        $Language = new Language();
449
-  		        $alllang = $Language->getLanguages();
450
-  		        foreach ($alllang as $key => $lang) {
451
-  		            print '<option value="'.$key.'"';
452
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
453
-  		            print '>'.$lang[0].'</option>';
454
-  		        }
455
-  		    ?>
448
+  				$Language = new Language();
449
+  				$alllang = $Language->getLanguages();
450
+  				foreach ($alllang as $key => $lang) {
451
+  					print '<option value="'.$key.'"';
452
+  					if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
453
+  					print '>'.$lang[0].'</option>';
454
+  				}
455
+  			?>
456 456
   		</select>
457 457
   	    </form>
458 458
   	</div>
@@ -483,18 +483,18 @@  discard block
 block discarded – undo
483 483
 ?>
484 484
     <div class="top-header clear" role="main">
485 485
 <?php
486
-    if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
486
+	if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
487 487
 ?>
488 488
     <div id="archive-map"></div>
489 489
 <?php
490
-    }
490
+	}
491 491
 ?>
492 492
     </div>
493 493
 <?php
494 494
 }
495 495
 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))
496 496
 {
497
-    ?>
497
+	?>
498 498
     <div class="top-header clear" role="main">
499 499
         <div id="map"></div>
500 500
 	<link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" />
@@ -505,15 +505,15 @@  discard block
 block discarded – undo
505 505
         var zoom = 13;
506 506
 //create the map
507 507
 <?php
508
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
508
+	if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
509 509
 ?>
510 510
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
511 511
 <?php
512
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
512
+	} elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
513 513
 ?>
514 514
   map = L.map('map', { zoomControl:true });
515 515
 <?php
516
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
516
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
517 517
 ?>
518 518
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
519 519
     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);
@@ -521,22 +521,22 @@  discard block
 block discarded – undo
521 521
     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);
522 522
     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);
523 523
 <?php
524
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
524
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
525 525
 ?>
526 526
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
527 527
 <?php
528
-    } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
528
+	} elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
529 529
 ?>
530 530
   map = L.map('map', { zoomControl:true });
531 531
 <?php
532
-    }
532
+	}
533 533
 ?>
534 534
   //initialize the layer group for the aircrft markers
535 535
   var layer_data = L.layerGroup();
536 536
 
537 537
   //a few title layers
538 538
 <?php
539
-    if ($globalMapProvider == 'Mapbox') {
539
+	if ($globalMapProvider == 'Mapbox') {
540 540
 ?>
541 541
   L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
542 542
     maxZoom: 18,
@@ -547,7 +547,7 @@  discard block
 block discarded – undo
547 547
     token : '<?php print $globalMapboxToken; ?>'
548 548
   }).addTo(map);
549 549
 <?php
550
-    } elseif ($globalMapProvider == 'OpenStreetMap') {
550
+	} elseif ($globalMapProvider == 'OpenStreetMap') {
551 551
 ?>
552 552
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
553 553
     maxZoom: 18,
@@ -555,7 +555,7 @@  discard block
 block discarded – undo
555 555
       '<a href="http://www.openstreetmap.org/copyright">Open Database Licence</a>'
556 556
   }).addTo(map);
557 557
 <?php
558
-    } elseif ($globalMapProvider == 'MapQuest-OSM') {
558
+	} elseif ($globalMapProvider == 'MapQuest-OSM') {
559 559
 ?>
560 560
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
561 561
     maxZoom: 18,
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
564 564
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>'
565 565
   }).addTo(map);
566 566
 <?php
567
-    } elseif ($globalMapProvider == 'MapQuest-Aerial') {
567
+	} elseif ($globalMapProvider == 'MapQuest-Aerial') {
568 568
 ?>
569 569
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
570 570
     maxZoom: 18,
@@ -573,27 +573,27 @@  discard block
 block discarded – undo
573 573
       '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"'
574 574
   }).addTo(map);
575 575
 <?php
576
-    } elseif ($globalMapProvider == 'Google-Roadmap') {
576
+	} elseif ($globalMapProvider == 'Google-Roadmap') {
577 577
 ?>
578 578
     var googleLayer = new L.Google('ROADMAP');
579 579
     map.addLayer(googleLayer);
580 580
 <?php
581
-    } elseif ($globalMapProvider == 'Google-Satellite') {
581
+	} elseif ($globalMapProvider == 'Google-Satellite') {
582 582
 ?>
583 583
     var googleLayer = new L.Google('SATELLITE');
584 584
     map.addLayer(googleLayer);
585 585
 <?php
586
-    } elseif ($globalMapProvider == 'Google-Hybrid') {
586
+	} elseif ($globalMapProvider == 'Google-Hybrid') {
587 587
 ?>
588 588
     var googleLayer = new L.Google('HYBRID');
589 589
     map.addLayer(googleLayer);
590 590
 <?php
591
-    } elseif ($globalMapProvider == 'Google-Terrain') {
591
+	} elseif ($globalMapProvider == 'Google-Terrain') {
592 592
 ?>
593 593
     var googleLayer = new L.Google('Terrain');
594 594
     map.addLayer(googleLayer);
595 595
 <?php
596
-    }
596
+	}
597 597
 ?>
598 598
         </script>
599 599
     </div>
Please login to merge, or discard this patch.