View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 39ba61...af51ab )
by Yannick
30:55
created
Status
Category
Toggle Patches
live-czml.php 1 patch
Braces   +122 added lines, -44 removed lines patch added patch discarded remove patch 
@@ -16,8 +16,12 @@  discard block
 
 block discarded – undo
16 16 
 }
17 17 
 $tracker = false;
18 18 
 $marine = false;
19 
-if (isset($_GET['tracker'])) $tracker = true;
20 
-if (isset($_GET['marine'])) $marine = true;
19 
+if (isset($_GET['tracker'])) {
20 
+	$tracker = true;
21 
+}
22 
+if (isset($_GET['marine'])) {
23 
+	$marine = true;
24 
+}
21 25 
 if ($tracker) {
22 26 
 	require_once('require/class.Tracker.php');
23 27 
 	require_once('require/class.TrackerLive.php');
 
@@ -74,24 +78,49 @@  discard block
 
 block discarded – undo
74 78 
 }
75 79 
 header('Content-Type: text/javascript');
76 80
77 
-if (!isset($globalJsonCompress)) $compress = true;
78 
-else $compress = $globalJsonCompress;
81 
+if (!isset($globalJsonCompress)) {
82 
+	$compress = true;
83 
+} else {
84 
+	$compress = $globalJsonCompress;
85 
+}
79 86
80 87 
 $from_archive = false;
81 88 
 $min = false;
82 89 
 $allhistory = false;
83 90 
 $filter['source'] = array();
84 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
85 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup'));
86 
-if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars'));
87 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
88 
-if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs'));
89 
-if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') $filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
90 
-if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') $filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
91 
-if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') $filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
92 
-if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') $filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
93 
-if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') $filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
94 
-if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') $filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
91 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['filter_ShowVATSIM']) && $_COOKIE['filter_ShowVATSIM'] == 'true') {
92 
+	$filter['source'] = array_merge($filter['source'],array('vatsimtxt'));
93 
+}
94 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['filter_ShowIVAO']) && $_COOKIE['filter_ShowIVAO'] == 'true') {
95 
+	$filter['source'] = array_merge($filter['source'],array('whazzup'));
96 
+}
97 
+if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['filter_ShowVMS']) && $_COOKIE['filter_ShowVMS'] == 'true') {
98 
+	$filter['source'] = array_merge($filter['source'],array('phpvmacars'));
99 
+}
100 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['filter_ShowSBS1']) && $_COOKIE['filter_ShowSBS1'] == 'true') {
101 
+	$filter['source'] = array_merge($filter['source'],array('sbs','famaprs'));
102 
+}
103 
+if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['filter_ShowAPRS']) && $_COOKIE['filter_ShowAPRS'] == 'true') {
104 
+	$filter['source'] = array_merge($filter['source'],array('aprs'));
105 
+}
106 
+if (isset($_COOKIE['filter_ident']) && $_COOKIE['filter_ident'] != '') {
107 
+	$filter['ident'] = filter_var($_COOKIE['filter_ident'],FILTER_SANITIZE_STRING);
108 
+}
109 
+if (isset($_COOKIE['filter_mmsi']) && $_COOKIE['filter_mmsi'] != '') {
110 
+	$filter['mmsi'] = filter_var($_COOKIE['filter_mmsi'],FILTER_SANITIZE_STRING);
111 
+}
112 
+if (isset($_COOKIE['filter_Airlines']) && $_COOKIE['filter_Airlines'] != '') {
113 
+	$filter['airlines'] = filter_var_array(explode(',',$_COOKIE['filter_Airlines']),FILTER_SANITIZE_STRING);
114 
+}
115 
+if (isset($_COOKIE['filter_Sources']) && $_COOKIE['filter_Sources'] != '') {
116 
+	$filter['source_aprs'] = filter_var_array(explode(',',$_COOKIE['filter_Sources']),FILTER_SANITIZE_STRING);
117 
+}
118 
+if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] != 'all') {
119 
+	$filter['airlinestype'] = filter_var($_COOKIE['filter_airlinestype'],FILTER_SANITIZE_STRING);
120 
+}
121 
+if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] != 'all') {
122 
+	$filter['alliance'] = filter_var($_COOKIE['filter_alliance'],FILTER_SANITIZE_STRING);
123 
+}
95 124 
 /*
96 125 
 if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) {
97 126 
 	$min = true;
 
@@ -200,8 +229,12 @@  discard block
 
 block discarded – undo
200 229 
 	} else {
201 230 
 		$flightcnt = $SpotterLive->getLiveSpotterCount($filter);
202 231 
 	}
203 
-	if ($flightcnt == '') $flightcnt = 0;
204 
-} else $flightcnt = 0;
232 
+	if ($flightcnt == '') {
233 
+		$flightcnt = 0;
234 
+	}
235 
+	} else {
236 
+	$flightcnt = 0;
237 
+}
205 238
206 239 
 $sqltime = round(microtime(true)-$begintime,2);
207 240 
 $minitime = time();
 
@@ -237,7 +270,9 @@  discard block
 
 block discarded – undo
237 270 
 $prev_flightaware_id = '';
238 271 
 $speed = 1;
239 272 
 $gltf2 = false;
240 
-if (isset($archivespeed)) $speed = $archivespeed;
273 
+if (isset($archivespeed)) {
274 
+	$speed = $archivespeed;
275 
+}
241 276 
 $output = '[';
242 277 
 if ($tracker) {
243 278 
 	$output .= '{"id" : "document", "name" : "tracker","version" : "1.0"';
 
@@ -273,9 +308,13 @@  discard block
 
 block discarded – undo
273 308 
 			$image = "images/placeholder_thumb.png";
274 309 
 		}
275 310
276 
-                if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id'];
277 
-                elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid'];
278 
-                elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id'];
311 
+                if (isset($spotter_item['flightaware_id'])) {
312 
+                	$id = $spotter_item['flightaware_id'];
313 
+                } elseif (isset($spotter_item['famtrackid'])) {
314 
+                	$id = $spotter_item['famtrackid'];
315 
+                } elseif (isset($spotter_item['fammarine_id'])) {
316 
+                	$id = $spotter_item['fammarine_id'];
317 
+                }
279 318 
                 if ($prev_flightaware_id != $id) {
280 319 
 			if ($prev_flightaware_id != '') {
281 320 
 				/*
 
@@ -301,7 +340,9 @@  discard block
 
 block discarded – undo
301 340 
 			$output .= '"flightcnt": "'.$flightcnt.'",';
302 341 
 			$output .= '"onground": %onground%,';
303 342 
 			$output .= '"lastupdate": "'.$lastupdate.'",';
304 
-			if (isset($spotter_item['format_source'])) $output .= '"format": "'.$spotter_item['format_source'].'",';
343 
+			if (isset($spotter_item['format_source'])) {
344 
+				$output .= '"format": "'.$spotter_item['format_source'].'",';
345 
+			}
305 346 
 			if ($tracker) {
306 347 
 				$output.= '"type": "tracker"';
307 348 
 			} elseif ($marine) {
 
@@ -323,7 +364,9 @@  discard block
 
 block discarded – undo
323 364 
 							}
324 365 
 						}
325 366 
 					}
326 
-					if ($ident != '') $output.= '"ident": "'.$ident.'",';
367 
+					if ($ident != '') {
368 
+						$output.= '"ident": "'.$ident.'",';
369 
+					}
327 370 
 				}
328 371 
 				$output.= '"gltf2": %gltf2%,';
329 372 
 				$output.= '"type": "flight"';
 
@@ -355,7 +398,9 @@  discard block
 
 block discarded – undo
355 398 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
356 399 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
357 400 
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
358 
-						} else $aircraft_shadow = '';
401 
+						} else {
402 
+							$aircraft_shadow = '';
403 
+						}
359 404 
 	    					$output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5';
360 405 
 						if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true' && isset($_COOKIE['IconColor'])) {
361 406 
 							$rgb = $Common->hex2rgb($_COOKIE['IconColor']);
 
@@ -363,7 +408,9 @@  discard block
 
 block discarded – undo
363 408 
 						}
364 409 
 						$output .= '},';
365 410 
 					}
366 
-				} else $output .= ' "billboard" : {"image" : "data:image/png;base64,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","scale" : 0.5},';
411 
+				} else {
412 
+					$output .= ' "billboard" : {"image" : "data:image/png;base64,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","scale" : 0.5},';
413 
+				}
367 414 
 			} elseif ($one3dmodel) {
368 415 
 				if (isset($globalMap3DForceModel) && $globalMap3DForceModel != '') {
369 416 
 					$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$globalMap3DForceModel.'","scale" : 1.0,"minimumPixelSize": 20';
 
@@ -403,7 +450,9 @@  discard block
 
 block discarded – undo
403 450 
 							$spotter_item['engine_type'] = $aircraft_info[0]['engine_type'];
404 451 
 							$spotter_item['wake_category'] = $aircraft_info[0]['wake_category'];
405 452 
 							$spotter_item['engine_count'] = $aircraft_info[0]['engine_count'];
406 
-						} else $aircraft_shadow = '';
453 
+						} else {
454 
+							$aircraft_shadow = '';
455 
+						}
407 456 
 						if ($aircraft_shadow != '') {
408 457 
 							if (isset($modelsdb[$aircraft_shadow])) {
409 458 
 								$output .= '"model": {"gltf" : "'.$globalURL.'/models/'.$modelsdb[$aircraft_shadow].'","scale" : 1.0,"minimumPixelSize": 20';
 
@@ -540,7 +589,9 @@  discard block
 
 block discarded – undo
540 589 
 								}
541 590 
 								$output .= '},';
542 591 
 								//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
543 
-								if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
592 
+								if ($spotter_item['aircraft_icao'] != '') {
593 
+									$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
594 
+								}
544 595 
 								$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
545 596 
 							}
546 597 
 						} elseif (isset($spotter_item['format_source']) && $spotter_item['format_source'] == 'aprs') {
 
@@ -562,7 +613,9 @@  discard block
 
 block discarded – undo
562 613 
 							}
563 614 
 							$output .= '},';
564 615 
 							//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
565 
-							if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
616 
+							if ($spotter_item['aircraft_icao'] != '') {
617 
+								$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
618 
+							}
566 619 
 							$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
567 620 
 						}
568 621 
 					} else {
 
@@ -575,7 +628,9 @@  discard block
 
 block discarded – undo
575 628 
 						}
576 629 
 						$output .= '},';
577 630 
 						//if ($spotter_item['aircraft_shadow'] != '') $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",';
578 
-						if ($spotter_item['aircraft_icao'] != '') $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
631 
+						if ($spotter_item['aircraft_icao'] != '') {
632 
+							$output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",';
633 
+						}
579 634 
 						$modelsdb[$aircraft_icao] = 'Cesium_Air.glb';
580 635 
 					}
581 636 
 				} elseif ($tracker && isset($spotter_item['type'])) {
 
@@ -679,8 +734,11 @@  discard block
 
 block discarded – undo
679 734 
 					$output .= '},';
680 735 
 				}
681 736 
 			}
682 
-			if (isset($onground) && $onground) $output = str_replace('%onground%','true',$output);
683 
-			else $output = str_replace('%onground%','false',$output);
737 
+			if (isset($onground) && $onground) {
738 
+				$output = str_replace('%onground%','true',$output);
739 
+			} else {
740 
+				$output = str_replace('%onground%','false',$output);
741 
+			}
684 742
685 743 
 	//		$output .= '"heightReference": "CLAMP_TO_GROUND",';
686 744 
 			//$output .= '"heightReference": "'.$heightrelative.'",';
 
@@ -693,8 +751,12 @@  discard block
 
 block discarded – undo
693 751 
 	//		$output .= '"interpolationDegree" : 5,';
694 752 
 	//		$output .= '"epoch" : "'.date("c",strtotime($spotter_item['date'])).'", ';
695 753 
 			$output .= '"cartographicDegrees": [';
696 
-			if ($minitime > strtotime($spotter_item['date'])) $minitime = strtotime($spotter_item['date']);
697 
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
754 
+			if ($minitime > strtotime($spotter_item['date'])) {
755 
+				$minitime = strtotime($spotter_item['date']);
756 
+			}
757 
+			if ($maxitime < strtotime($spotter_item['date'])) {
758 
+				$maxitime = strtotime($spotter_item['date']);
759 
+			}
698 760 
 			$output .= '"'.date("c",strtotime($spotter_item['date'])).'", ';
699 761 
 			$output .= $spotter_item['longitude'].', ';
700 762 
 			$output .= $spotter_item['latitude'];
 
@@ -717,7 +779,9 @@  discard block
 
 block discarded – undo
717 779 
 					$output .= ', '.round($spotter_item['altitude']*30.48);
718 780 
 					$prevalt = round($spotter_item['altitude']*30.48);
719 781 
 				}
720 
-			} else $output .= ', 0';
782 
+			} else {
783 
+				$output .= ', 0';
784 
+			}
721 785 
 			//$orientation = '"orientation" : { ';
722 786 
 			//$orientation .= '"unitQuaternion": [';
723 787 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
 
@@ -725,13 +789,18 @@  discard block
 
 block discarded – undo
725 789 
 		} else {
726 790 
 			$nblatlong = $nblatlong+1;
727 791 
 			$output .= ',"'.date("c",strtotime($spotter_item['date'])).'", ';
728 
-			if ($maxitime < strtotime($spotter_item['date'])) $maxitime = strtotime($spotter_item['date']);
792 
+			if ($maxitime < strtotime($spotter_item['date'])) {
793 
+				$maxitime = strtotime($spotter_item['date']);
794 
+			}
729 795 
 			if ($spotter_item['ground_speed'] == 0) {
730 796 
 				$output .= $prevlong.', ';
731 797 
 				$output .= $prevlat;
732 798 
 				//if (!$marine && (!isset($onground) || !$onground)) $output .= ', '.$prevalt;
733 
-				if (!$marine) $output .= ', '.$prevalt;
734 
-				else $output .= ', 0';
799 
+				if (!$marine) {
800 
+					$output .= ', '.$prevalt;
801 
+				} else {
802 
+					$output .= ', 0';
803 
+				}
735 804 
 			} else {
736 805 
 				$output .= $spotter_item['longitude'].', ';
737 806 
 				$output .= $spotter_item['latitude'];
 
@@ -744,14 +813,17 @@  discard block
 
 block discarded – undo
744 813 
 							$output .= ', 0';
745 814 
 						}
746 815 
 					} else {
747 
-						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') $output .= ', '.round($spotter_item['real_altitude']*0.3048);
748 
-						elseif ($tracker) {
816 
+						if (isset($spotter_item['real_altitude']) && $spotter_item['real_altitude'] != '') {
817 
+							$output .= ', '.round($spotter_item['real_altitude']*0.3048);
818 
+						} elseif ($tracker) {
749 819 
 							$output .= ', '.round($spotter_item['altitude']*0.3048);
750 820 
 						} else {
751 821 
 							$output .= ', '.round($spotter_item['altitude']*30.48);
752 822 
 						}
753 823 
 					}
754 
-				} else $output .= ', 0';
824 
+				} else {
825 
+					$output .= ', 0';
826 
+				}
755 827 
 			}
756 828 
 			//$quat = quaternionrotate(deg2rad($spotter_item['heading']),deg2rad(0),deg2rad(0));
757 829 
 			//$orientation .= ',"'.date("c",strtotime($spotter_item['date'])).'",'.$quat['x'].','.$quat['y'].','.$quat['z'].','.$quat['w'];
 
@@ -770,11 +842,17 @@  discard block
 
 block discarded – undo
770 842 
 		} else {
771 843 
 			$output = str_replace('%minitime%',date("c",time()-$globalLiveInterval),$output);
772 844 
 		}
845 
+	} else {
846 
+		$output = str_replace('%minitime%',date("c",$minitime),$output);
773 847 
 	}
774 
-	else $output = str_replace('%minitime%',date("c",$minitime),$output);
775 
-} else $output = str_replace('%minitime%',date("c",$minitime),$output);
848 
+	} else {
849 
+	$output = str_replace('%minitime%',date("c",$minitime),$output);
850 
+}
776 851 
 $output = str_replace('%maxitime%',date("c",$maxitime),$output);
777 
-if ($gltf2) $output = str_replace('%gltf2%','true',$output);
778 
-else $output = str_replace('%gltf2%','false',$output);
852 
+if ($gltf2) {
853 
+	$output = str_replace('%gltf2%','true',$output);
854 
+} else {
855 
+	$output = str_replace('%gltf2%','false',$output);
856 
+}
779 857 
 print $output;
780 858 
 ?>
Please login to merge, or discard this patch.
owner-sub-menu.php 1 patch
Braces   +77 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -3,7 +3,13 @@  discard block
 
 block discarded – undo
3 3 
 </span>
4 4 
 <div class="stats_airline">
5 5 
 	<form id="changedate" method="post">
6 
-		<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') echo $year.'-'; ?><?php if (isset($month) && $month != '') echo $month; ?>" />
6 
+		<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') {
7 
+	echo $year.'-';
8 
+}
9 
+?><?php if (isset($month) && $month != '') {
10 
+	echo $month;
11 
+}
12 
+?>" />
7 13 
 	</form>
8 14 
 </div>
9 15 
 <?php
 
@@ -11,15 +17,39 @@  discard block
 
 block discarded – undo
11 17 
 ?>
12 18 
 <div class="sub-menu sub-menu-container">
13 19 
 	<ul class="nav nav-pills">
14 
-		<li><a href="<?php print $globalURL; ?>/owner/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
20 
+		<li><a href="<?php print $globalURL; ?>/owner/<?php print $owner; ?><?php if (isset($year) && $year != '') {
21 
+	echo '/'.$year;
22 
+}
23 
+?><?php if (isset($month) && $month != '') {
24 
+	echo '/'.$month;
25 
+}
26 
+?>" <?php if (strtolower($current_page) == "owner-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
15 27 
 		<li class="dropdown">
16 28 
 		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "owner-statistics-aircraft" || strtolower($current_page) == "owner-statistics-registration" || strtolower($current_page) == "owner-statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
17 29 
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
18 30 
 		    </a>
19 31 
 		    <ul class="dropdown-menu" role="menu">
20 
-		      <li><a href="<?php print $globalURL; ?>/owner/statistics/aircraft/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Aircraft Type"); ?></a></li>
21 
-					<li><a href="<?php print $globalURL; ?>/owner/statistics/registration/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Registration"); ?></a></li>
22 
-					<li><a href="<?php print $globalURL; ?>/owner/statistics/manufacturer/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Manufacturer"); ?></a></li>
32 
+		      <li><a href="<?php print $globalURL; ?>/owner/statistics/aircraft/<?php print $owner; ?><?php if (isset($year) && $year != '') {
33 
+	echo '/'.$year;
34 
+}
35 
+?><?php if (isset($month) && $month != '') {
36 
+	echo '/'.$month;
37 
+}
38 
+?>"><?php echo _("Aircraft Type"); ?></a></li>
39 
+					<li><a href="<?php print $globalURL; ?>/owner/statistics/registration/<?php print $owner; ?><?php if (isset($year) && $year != '') {
40 
+	echo '/'.$year;
41 
+}
42 
+?><?php if (isset($month) && $month != '') {
43 
+	echo '/'.$month;
44 
+}
45 
+?>"><?php echo _("Registration"); ?></a></li>
46 
+					<li><a href="<?php print $globalURL; ?>/owner/statistics/manufacturer/<?php print $owner; ?><?php if (isset($year) && $year != '') {
47 
+	echo '/'.$year;
48 
+}
49 
+?><?php if (isset($month) && $month != '') {
50 
+	echo '/'.$month;
51 
+}
52 
+?>"><?php echo _("Manufacturer"); ?></a></li>
23 53 
 		    </ul>
24 54 
 		</li>
25 55 
 		<li class="dropdown">
 
@@ -27,14 +57,50 @@  discard block
 
 block discarded – undo
27 57 
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
28 58 
 		    </a>
29 59 
 		    <ul class="dropdown-menu" role="menu">
30 
-		      <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Departure Airport"); ?></a></li>
31 
-		      <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
32 
-			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Arrival Airport"); ?></a></li>
33 
-			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
60 
+		      <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') {
61 
+	echo '/'.$year;
62 
+}
63 
+?><?php if (isset($month) && $month != '') {
64 
+	echo '/'.$month;
65 
+}
66 
+?>"><?php echo _("Departure Airport"); ?></a></li>
67 
+		      <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') {
68 
+	echo '/'.$year;
69 
+}
70 
+?><?php if (isset($month) && $month != '') {
71 
+	echo '/'.$month;
72 
+}
73 
+?>"><?php echo _("Departure Airport by Country"); ?></a></li>
74 
+			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') {
75 
+	echo '/'.$year;
76 
+}
77 
+?><?php if (isset($month) && $month != '') {
78 
+	echo '/'.$month;
79 
+}
80 
+?>"><?php echo _("Arrival Airport"); ?></a></li>
81 
+			  <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') {
82 
+	echo '/'.$year;
83 
+}
84 
+?><?php if (isset($month) && $month != '') {
85 
+	echo '/'.$month;
86 
+}
87 
+?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
34 88 
 		    </ul>
35 89 
 		</li>
36 
-		<li><a href="<?php print $globalURL; ?>/owner/statistics/route/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
37 
-		<li><a href="<?php print $globalURL; ?>/owner/statistics/time/<?php print $owner; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "owner-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
90 
+		<li><a href="<?php print $globalURL; ?>/owner/statistics/route/<?php print $owner; ?><?php if (isset($year) && $year != '') {
91 
+	echo '/'.$year;
92 
+}
93 
+?><?php if (isset($month) && $month != '') {
94 
+	echo '/'.$month;
95 
+}
96 
+?>" <?php if (strtolower($current_page) == "owner-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
97 
+		<li><a href="<?php print $globalURL; ?>/owner/statistics/time/<?php print $owner; ?><?php if (isset($year) && $year != '') {
98 
+	echo '/'.$year;
99 
+}
100 
+?><?php if (isset($month) && $month != '') {
101 
+	echo '/'.$month;
102 
+}
103 
+?>" <?php if (strtolower($current_page) == "owner-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
38 104 
 	</ul>
39 105 
 </div>
40 106 
 <?php
Please login to merge, or discard this patch.