Completed
Push — master ( f1954e...8053db )
by Yannick
07:25
created
header.php 2 patches
Indentation   +62 added lines, -62 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]);
@@ -168,17 +168,17 @@  discard block
 block discarded – undo
168 168
 	}
169 169
 ?>
170 170
 <?php 
171
-    if (isset($_POST['archive'])) {
171
+	if (isset($_POST['archive'])) {
172 172
 ?>
173 173
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
174 174
 <?php 
175
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
175
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
176 176
 ?>
177 177
 
178 178
 <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>
179 179
 <?php    
180
-	    }
181
-    } else {
180
+		}
181
+	} else {
182 182
 ?>
183 183
 <?php
184 184
 /*	if (isset($globalBeta) && $globalBeta) {
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 */
191 191
 ?>
192 192
 <?php 
193
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
193
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
194 194
 ?>
195 195
 <?php
196 196
 //		if (isset($globalBeta) && $globalBeta) {
@@ -217,13 +217,13 @@  discard block
 block discarded – undo
217 217
 <script src="<?php print $globalURL; ?>/js/map-marine.2d.js.php?<?php print time(); ?>"></script>
218 218
 <?php
219 219
 		}
220
-	    }
220
+		}
221 221
 ?>
222 222
 <?php
223 223
 //	}
224 224
 ?>
225 225
 <?php
226
-    }
226
+	}
227 227
 }
228 228
 ?>
229 229
 <?php
@@ -376,24 +376,24 @@  discard block
 block discarded – undo
376 376
       <ul class="nav navbar-nav">
377 377
 
378 378
 <?php 
379
-    $sub = false;
380
-    if (((!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE)) || (isset($globalTracker) && $globalTracker === TRUE)) || (isset($globalMarine) && $globalMarine === TRUE && isset($globalTracker) && $globalTracker === TRUE)) {
379
+	$sub = false;
380
+	if (((!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE)) || (isset($globalTracker) && $globalTracker === TRUE)) || (isset($globalMarine) && $globalMarine === TRUE && isset($globalTracker) && $globalTracker === TRUE)) {
381 381
 	$sub = true;
382
-    }
382
+	}
383 383
 ?>
384 384
 <?php
385
-    if (!isset($globalAircraft) || $globalAircraft === TRUE) {
385
+	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
386 386
 ?>
387 387
     <li class="dropdown">
388 388
 <?php
389
-    if ($sub) {
389
+	if ($sub) {
390 390
 ?>
391 391
       	<li class="dropdown">
392 392
           <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Aircrafts"); ?> <b class="caret"></b></a>
393 393
 	<ul class="dropdown-menu multi-level">
394 394
       	<li class="dropdown-submenu">
395 395
 <?php
396
-    }
396
+	}
397 397
 ?>
398 398
           <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
399 399
           <ul class="dropdown-menu">
@@ -401,15 +401,15 @@  discard block
 block discarded – undo
401 401
 			<li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li>
402 402
 			<li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li>
403 403
 <?php
404
-    if ((!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
404
+	if ((!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM)) {
405 405
 ?>
406 406
 			<li><a href="<?php print $globalURL; ?>/owner"><?php echo _("Owners"); ?></a></li>
407 407
 <?php
408
-    } else {
408
+	} else {
409 409
 ?>
410 410
 			<li><a href="<?php print $globalURL; ?>/pilot"><?php echo _("Pilots"); ?></a></li>
411 411
 <?php
412
-    }
412
+	}
413 413
 ?>
414 414
 			<li><hr /></li>
415 415
             <li><a href="<?php print $globalURL; ?>/currently"><?php echo _("Current Activity"); ?></a></li>
@@ -417,34 +417,34 @@  discard block
 block discarded – undo
417 417
             <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li>
418 418
             <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li>
419 419
             <?php
420
-        	if ($globalACARS) {
421
-        	    if (isset($globalDemo) && $globalDemo) {
422
-    	    ?>
420
+			if ($globalACARS) {
421
+				if (isset($globalDemo) && $globalDemo) {
422
+			?>
423 423
             <li><hr /></li>
424 424
             <li><i><?php echo _('ACARS data not available publicly'); ?></i></li>
425 425
             <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li>
426 426
             <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li>
427 427
             <?php
428
-        	    } else {
429
-    	    ?>
428
+				} else {
429
+			?>
430 430
             <li><hr /></li>
431 431
             <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li>
432 432
             <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li>
433 433
             <?php
434
-        	    }
435
-        	}
436
-    	    ?>
434
+				}
435
+			}
436
+			?>
437 437
     	    <?php
438
-    	        if (isset($globalAccidents) && $globalAccidents) {
439
-    	    ?>
438
+				if (isset($globalAccidents) && $globalAccidents) {
439
+			?>
440 440
             <li><hr /></li>
441 441
             <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident"); ?></a></li>
442 442
             <li><a href="<?php print $globalURL; ?>/accident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Accident"); ?></a></li>
443 443
             <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident"); ?></a></li>
444 444
             <li><a href="<?php print $globalURL; ?>/incident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Incident"); ?></a></li>
445 445
             <?php
446
-        	}
447
-    	    ?>
446
+			}
447
+			?>
448 448
             <li><hr /></li>
449 449
             <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li>
450 450
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
@@ -467,14 +467,14 @@  discard block
 block discarded – undo
467 467
     </ul>
468 468
 <?php
469 469
 	}
470
-    }
470
+	}
471 471
 ?>
472 472
 <?php
473
-    if (isset($globalMarine) && $globalMarine) {
473
+	if (isset($globalMarine) && $globalMarine) {
474 474
 ?>
475 475
     <li class="dropdown">
476 476
 <?php
477
-        if ($sub) {
477
+		if ($sub) {
478 478
 ?>
479 479
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Vessels"); ?> <b class="caret"></b></a>
480 480
 	<ul class="dropdown-menu multi-level">
@@ -498,14 +498,14 @@  discard block
 block discarded – undo
498 498
 	}
499 499
 ?>
500 500
 <?php
501
-    }
501
+	}
502 502
 ?>
503 503
 <?php
504
-    if (isset($globalTracker) && $globalTracker) {
504
+	if (isset($globalTracker) && $globalTracker) {
505 505
 ?>
506 506
     <li class="dropdown">
507 507
 <?php
508
-        if ($sub) {
508
+		if ($sub) {
509 509
 ?>
510 510
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Trackers"); ?> <b class="caret"></b></a>
511 511
 	<ul class="dropdown-menu multi-level">
@@ -529,7 +529,7 @@  discard block
 block discarded – undo
529 529
 	}
530 530
 ?>
531 531
 <?php
532
-    }
532
+	}
533 533
 ?>
534 534
 
535 535
         <li class="dropdown">
@@ -558,14 +558,14 @@  discard block
 block discarded – undo
558 558
   	    <form>
559 559
   		<select class="selectpicker" data-width="120px" onchange="language(this);">
560 560
   		    <?php
561
-  		        $Language = new Language();
562
-  		        $alllang = $Language->getLanguages();
563
-  		        foreach ($alllang as $key => $lang) {
564
-  		            print '<option value="'.$key.'"';
565
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
566
-  		            print '>'.$lang[0].'</option>';
567
-  		        }
568
-  		    ?>
561
+  				$Language = new Language();
562
+  				$alllang = $Language->getLanguages();
563
+  				foreach ($alllang as $key => $lang) {
564
+  					print '<option value="'.$key.'"';
565
+  					if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
566
+  					print '>'.$lang[0].'</option>';
567
+  				}
568
+  			?>
569 569
   		</select>
570 570
   	    </form>
571 571
   	</div>
@@ -596,18 +596,18 @@  discard block
 block discarded – undo
596 596
 ?>
597 597
     <div class="top-header clear" role="main">
598 598
 <?php
599
-    if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
599
+	if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
600 600
 ?>
601 601
     <div id="archive-map"></div>
602 602
 <?php
603
-    }
603
+	}
604 604
 ?>
605 605
     </div>
606 606
 <?php
607 607
 }
608 608
 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))
609 609
 {
610
-    ?>
610
+	?>
611 611
     <div class="top-header clear" role="main">
612 612
         <div id="map"></div>
613 613
 	<link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" />
@@ -618,15 +618,15 @@  discard block
 block discarded – undo
618 618
         var zoom = 13;
619 619
 //create the map
620 620
 <?php
621
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
621
+	if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
622 622
 ?>
623 623
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
624 624
 <?php
625
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
625
+	} elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
626 626
 ?>
627 627
   map = L.map('map', { zoomControl:true });
628 628
 <?php
629
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
629
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
630 630
 ?>
631 631
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
632 632
     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);
@@ -634,22 +634,22 @@  discard block
 block discarded – undo
634 634
     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);
635 635
     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);
636 636
 <?php
637
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
637
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude'])) {
638 638
 ?>
639 639
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
640 640
 <?php
641
-    } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
641
+	} elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
642 642
 ?>
643 643
   map = L.map('map', { zoomControl:true });
644 644
 <?php
645
-    }
645
+	}
646 646
 ?>
647 647
   //initialize the layer group for the aircrft markers
648 648
   var layer_data = L.layerGroup();
649 649
 
650 650
   //a few title layers
651 651
 <?php
652
-    if ($globalMapProvider == 'Mapbox') {
652
+	if ($globalMapProvider == 'Mapbox') {
653 653
 ?>
654 654
   L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
655 655
     maxZoom: 18,
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
660 660
     token : '<?php print $globalMapboxToken; ?>'
661 661
   }).addTo(map);
662 662
 <?php
663
-    } elseif ($globalMapProvider == 'OpenStreetMap') {
663
+	} elseif ($globalMapProvider == 'OpenStreetMap') {
664 664
 ?>
665 665
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
666 666
     maxZoom: 18,
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
       '<a href="http://www.openstreetmap.org/copyright">Open Database Licence</a>'
669 669
   }).addTo(map);
670 670
 <?php
671
-    } elseif ($globalMapProvider == 'MapQuest-OSM') {
671
+	} elseif ($globalMapProvider == 'MapQuest-OSM') {
672 672
 ?>
673 673
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
674 674
     maxZoom: 18,
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>'
678 678
   }).addTo(map);
679 679
 <?php
680
-    } elseif ($globalMapProvider == 'MapQuest-Aerial') {
680
+	} elseif ($globalMapProvider == 'MapQuest-Aerial') {
681 681
 ?>
682 682
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
683 683
     maxZoom: 18,
@@ -686,27 +686,27 @@  discard block
 block discarded – undo
686 686
       '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"'
687 687
   }).addTo(map);
688 688
 <?php
689
-    } elseif ($globalMapProvider == 'Google-Roadmap') {
689
+	} elseif ($globalMapProvider == 'Google-Roadmap') {
690 690
 ?>
691 691
     var googleLayer = new L.Google('ROADMAP');
692 692
     map.addLayer(googleLayer);
693 693
 <?php
694
-    } elseif ($globalMapProvider == 'Google-Satellite') {
694
+	} elseif ($globalMapProvider == 'Google-Satellite') {
695 695
 ?>
696 696
     var googleLayer = new L.Google('SATELLITE');
697 697
     map.addLayer(googleLayer);
698 698
 <?php
699
-    } elseif ($globalMapProvider == 'Google-Hybrid') {
699
+	} elseif ($globalMapProvider == 'Google-Hybrid') {
700 700
 ?>
701 701
     var googleLayer = new L.Google('HYBRID');
702 702
     map.addLayer(googleLayer);
703 703
 <?php
704
-    } elseif ($globalMapProvider == 'Google-Terrain') {
704
+	} elseif ($globalMapProvider == 'Google-Terrain') {
705 705
 ?>
706 706
     var googleLayer = new L.Google('Terrain');
707 707
     map.addLayer(googleLayer);
708 708
 <?php
709
-    }
709
+	}
710 710
 ?>
711 711
         </script>
712 712
     </div>
Please login to merge, or discard this patch.
Braces   +52 added lines, -12 removed lines patch added patch discarded remove patch
@@ -5,8 +5,11 @@  discard block
 block discarded – undo
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'])) {
@@ -241,7 +244,13 @@  discard block
 block discarded – undo
241 244
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
242 245
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
243 246
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
244
-<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
247
+<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) {
248
+	print '&latitude='.$latitude;
249
+}
250
+?><?php if(isset($longitude)) {
251
+	print '&longitude='.$longitude;
252
+}
253
+?>&<?php print time(); ?>"></script>
245 254
 <?php
246 255
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
247 256
 ?>
@@ -296,7 +305,13 @@  discard block
 block discarded – undo
296 305
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
297 306
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
298 307
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
299
-<script src="<?php print $globalURL; ?>/js/map.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>
308
+<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) {
309
+	print '&latitude='.$latitude;
310
+}
311
+?><?php if(isset($longitude)) {
312
+	print '&longitude='.$longitude;
313
+}
314
+?>&<?php print time(); ?>"></script>
300 315
 <?php
301 316
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
302 317
 ?>
@@ -369,7 +384,12 @@  discard block
 block discarded – undo
369 384
         <span class="icon-bar"></span>
370 385
       </button>
371 386
       <a href="<?php print $globalURL; ?>/search" class="navbar-toggle navbar-toggle-search"><i class="fa fa-search"></i></a>
372
-      <a class="navbar-brand" href="<?php if ($globalURL == '') print '/'; else print $globalURL; ?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
387
+      <a class="navbar-brand" href="<?php if ($globalURL == '') {
388
+	print '/';
389
+} else {
390
+	print $globalURL;
391
+}
392
+?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
373 393
     </div>
374 394
     <div class="collapse navbar-collapse">
375 395
 
@@ -395,7 +415,10 @@  discard block
 block discarded – undo
395 415
 <?php
396 416
     }
397 417
 ?>
398
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
418
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
419
+	echo 'right-';
420
+}
421
+?>caret"></b></a>
399 422
           <ul class="dropdown-menu">
400 423
           	<li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircrafts Types"); ?></a></li>
401 424
 			<li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li>
@@ -452,8 +475,14 @@  discard block
 block discarded – undo
452 475
         </li>
453 476
       	<li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li>
454 477
       	<li><a href="<?php print $globalURL; ?>/statistics"><?php echo _("Statistics"); ?></a></li>
455
-        <li class="dropdown<?php if ($sub) echo '-submenu'; ?>">
456
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
478
+        <li class="dropdown<?php if ($sub) {
479
+	echo '-submenu';
480
+}
481
+?>">
482
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) {
483
+	echo 'right-';
484
+}
485
+?>caret"></b></a>
457 486
           <ul class="dropdown-menu">
458 487
           	<li><a href="<?php print $globalURL; ?>/tools/acars"><?php echo _("ACARS translator"); ?></a></li>
459 488
           	<li><a href="<?php print $globalURL; ?>/tools/metar"><?php echo _("METAR translator"); ?></a></li>
@@ -482,7 +511,10 @@  discard block
 block discarded – undo
482 511
 <?php
483 512
 	}
484 513
 ?>
485
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
514
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
515
+	echo 'right-';
516
+}
517
+?>caret"></b></a>
486 518
 		<ul class="dropdown-menu">
487 519
 		    <li><a href="<?php print $globalURL; ?>/marine/currently"><?php echo _("Current Activity"); ?></a></li>
488 520
 		    <li><a href="<?php print $globalURL; ?>/marine/latest"><?php echo _("Latest Activity"); ?></a></li>
@@ -513,7 +545,10 @@  discard block
 block discarded – undo
513 545
 <?php
514 546
 	}
515 547
 ?>
516
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
548
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
549
+	echo 'right-';
550
+}
551
+?>caret"></b></a>
517 552
 		<ul class="dropdown-menu">
518 553
 		    <li><a href="<?php print $globalURL; ?>/tracker/currently"><?php echo _("Current Activity"); ?></a></li>
519 554
 		    <li><a href="<?php print $globalURL; ?>/tracker/latest"><?php echo _("Latest Activity"); ?></a></li>
@@ -562,7 +597,9 @@  discard block
 block discarded – undo
562 597
   		        $alllang = $Language->getLanguages();
563 598
   		        foreach ($alllang as $key => $lang) {
564 599
   		            print '<option value="'.$key.'"';
565
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
600
+  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) {
601
+  		            	print ' selected ';
602
+  		            }
566 603
   		            print '>'.$lang[0].'</option>';
567 604
   		        }
568 605
   		    ?>
@@ -715,4 +752,7 @@  discard block
 block discarded – undo
715 752
 
716 753
 ?>
717 754
 
718
-<section class="container main-content <?php if (strtolower($current_page) == 'index') print 'index '; ?>clear">
755
+<section class="container main-content <?php if (strtolower($current_page) == 'index') {
756
+	print 'index ';
757
+}
758
+?>clear">
Please login to merge, or discard this patch.