Inspection of "Strip all png, should work without problem with li..." - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( ada087...bf5a9f )

by Yannick

created 2017-07-07 15:03 UTC

Status

Braces +37 added lines, -13 removed lines patch added patch discarded remove patch

@@ -26,7 +26,9 @@  discard block
 block discarded – undo
 	if (isset($filter[0]['source'])) {
 		$filters = array_merge($filters,$filter);
 	}
-	if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+	if (is_array($globalFilter)) {
+		$filter = array_merge($filter,$globalFilter);
+	}
 	$filter_query_join = '';
 	$filter_query_where = '';
 	foreach($filters as $flt) {
@@ -99,8 +101,11 @@  discard block
 block discarded – undo
 	    }
 	    $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
 	}
-	if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-	elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+	if ($filter_query_where == '' && $where) {
+		$filter_query_where = ' WHERE';
+	} elseif ($filter_query_where != '' && $and) {
+		$filter_query_where .= ' AND';
+	}
 	if ($filter_query_where != '') {
 		$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
 	}
@@ -114,10 +119,17 @@  discard block
 block discarded – undo
 		if ($over_country == '') {
 			$Spotter = new Spotter($this->db);
 			$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
-			if (!empty($data_country)) $country = $data_country['iso2'];
-			else $country = '';
-		} else $country = $over_country;
-		if ($airline_type === NULL) $airline_type ='';
+			if (!empty($data_country)) {
+				$country = $data_country['iso2'];
+			} else {
+				$country = '';
+			}
+		} else {
+			$country = $over_country;
+		}
+		if ($airline_type === NULL) {
+			$airline_type ='';
+		}
 	
 		//if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n";
 		//else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n";
@@ -620,7 +632,9 @@  discard block
 block discarded – undo
 		    $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
 		    $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
 		    $translate = $Translation->ident2icao($q_item);
-		    if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
+		    if ($translate != $q_item) {
+		    	$additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
+		    }
 		    $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
 		    $additional_query .= ")";
 		}
@@ -838,7 +852,9 @@  discard block
 block discarded – undo
 		date_default_timezone_set($globalTimezone);
 		$datetime = new DateTime();
 		$offset = $datetime->format('P');
-	    } else $offset = '+00:00';
+	    } else {
+	    	$offset = '+00:00';
+	    }
 
 
 	    if ($date_array[1] != "")
@@ -1114,9 +1130,13 @@  discard block
 block discarded – undo
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+                if ($sincedate != '') {
+                	$query .= "AND date > '".$sincedate."' ";
+                }
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-	if ($limit) $query .= " LIMIT 0,10";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);
@@ -1160,9 +1180,13 @@  discard block
 block discarded – undo
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
+                if ($sincedate != '') {
+                	$query .= "AND s.date > '".$sincedate."' ";
+                }
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
-	if ($limit) $query .= " LIMIT 0,10";
+	if ($limit) {
+		$query .= " LIMIT 0,10";
+	}
       
 	
 	$sth = $this->db->prepare($query);

Please login to merge, or discard this patch.

route-statistics-manufacturer.php 1 patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -14,7 +14,9 @@
 block discarded – undo
 $arrival_airport = filter_input(INPUT_GET,'arrival_airport',FILTER_SANITIZE_STRING);
 if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
 	$spotter_array = $Spotter->getSpotterDataByRoute($departure_airport, $arrival_airport, "0,1", $sort);
-} else $spotter_array = array();  
+} else {
+	$spotter_array = array();
+}
 
 if (!empty($spotter_array))
 {

Please login to merge, or discard this patch.

pilot-sub-menu.php 1 patch

Braces +70 added lines, -10 removed lines patch added patch discarded remove patch

@@ -3,15 +3,39 @@  discard block
 block discarded – undo
 </span>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
-		<li><a href="<?php print $globalURL; ?>/pilot/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "pilot-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/pilot/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>" <?php if (strtolower($current_page) == "pilot-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
 		<li class="dropdown">
 		    <a class="dropdown-toggle <?php if(strtolower($current_page) == "pilot-statistics-aircraft" || strtolower($current_page) == "pilot-statistics-registration" || strtolower($current_page) == "pilot-statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/pilot/statistics/aircraft/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Aircraft Type"); ?></a></li>
-					<li><a href="<?php print $globalURL; ?>/pilot/statistics/registration/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Registration"); ?></a></li>
-					<li><a href="<?php print $globalURL; ?>/pilot/statistics/manufacturer/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Manufacturer"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/pilot/statistics/aircraft/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Aircraft Type"); ?></a></li>
+					<li><a href="<?php print $globalURL; ?>/pilot/statistics/registration/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Registration"); ?></a></li>
+					<li><a href="<?php print $globalURL; ?>/pilot/statistics/manufacturer/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Manufacturer"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -19,13 +43,49 @@  discard block
 block discarded – undo
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/pilot/statistics/departure-airport/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Departure Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/pilot/statistics/departure-airport-country/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
-			  <li><a href="<?php print $globalURL; ?>/pilot/statistics/arrival-airport/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Arrival Airport"); ?></a></li>
-			  <li><a href="<?php print $globalURL; ?>/pilot/statistics/arrival-airport-country/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/pilot/statistics/departure-airport/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Departure Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/pilot/statistics/departure-airport-country/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Departure Airport by Country"); ?></a></li>
+			  <li><a href="<?php print $globalURL; ?>/pilot/statistics/arrival-airport/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Arrival Airport"); ?></a></li>
+			  <li><a href="<?php print $globalURL; ?>/pilot/statistics/arrival-airport-country/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
-		<li><a href="<?php print $globalURL; ?>/pilot/statistics/route/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "pilot-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
-		<li><a href="<?php print $globalURL; ?>/pilot/statistics/time/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "pilot-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/pilot/statistics/route/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>" <?php if (strtolower($current_page) == "pilot-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
+		<li><a href="<?php print $globalURL; ?>/pilot/statistics/time/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
+	echo '/'.$year;
+}
+?><?php if (isset($month) && $month != '') {
+	echo '/'.$month;
+}
+?>" <?php if (strtolower($current_page) == "pilot-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
 	</ul>
 </div>
\ No newline at end of file

Please login to merge, or discard this patch.

route-statistics-registration.php 1 patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -14,7 +14,9 @@
 block discarded – undo
 $arrival_airport = filter_input(INPUT_GET,'arrival_airport',FILTER_SANITIZE_STRING);
 if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
 	$spotter_array = $Spotter->getSpotterDataByRoute($departure_airport, $arrival_airport, "0,1", $sort);
-} else $spotter_array = array();
+} else {
+	$spotter_array = array();
+}
   
 if (!empty($spotter_array))
 {

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,20 +3,50 @@  discard block
 block discarded – undo
 </span>
 <div class="stats_airline">
 	<form id="changedate" method="post">
-		<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') echo $year.'-'; ?><?php if (isset($month) && $month != '') echo $month; ?>" />
+		<input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') {
+	echo $year.'-';
+}
+?><?php if (isset($month) && $month != '') {
+	echo $month;
+}
+?>" />
 	</form>
 </div>
 <div class="sub-menu sub-menu-container">
 	<ul class="nav nav-pills">
-		<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>
+		<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>
 		<li class="dropdown">
 		    <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="#">
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <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>
-					<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>
-					<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>
+		      <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>
+					<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>
+					<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>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -24,13 +54,49 @@  discard block
 block discarded – undo
 		      <?php echo _("Airport"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <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>
-		      <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>
-			  <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>
-			  <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>
+		      <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>
+		      <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>
+			  <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>
+			  <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>
 		    </ul>
 		</li>
-		<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>
-		<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>
+		<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>
+		<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>
 	</ul>
 </div>
\ No newline at end of file

Please login to merge, or discard this patch.

route-statistics-time.php 1 patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -14,7 +14,9 @@
 block discarded – undo
 $arrival_airport = filter_input(INPUT_GET,'arrival_airport',FILTER_SANITIZE_STRING);
 if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
 	$spotter_array = $Spotter->getSpotterDataByRoute($departure_airport, $arrival_airport, "0,1", $sort);
-} else $spotter_array = array();
+} else {
+	$spotter_array = array();
+}
   
 if (!empty($spotter_array))
 {

Please login to merge, or discard this patch.

route-statistics-airline.php 1 patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -14,7 +14,9 @@
 block discarded – undo
 $arrival_airport = filter_input(INPUT_GET,'arrival_airport',FILTER_SANITIZE_STRING);
 if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
 	$spotter_array = $Spotter->getSpotterDataByRoute($departure_airport, $arrival_airport, "0,1", $sort);
-} else $spotter_array = array();
+} else {
+	$spotter_array = array();
+}
   
 if (!empty($spotter_array))
 {

Please login to merge, or discard this patch.

js/map-marine.3d.js.php 1 patch

Braces +12 added lines, -2 removed lines patch added patch discarded remove patch

@@ -53,7 +53,12 @@  discard block
 block discarded – undo
 	} else {
 		for (var i = 0; i < viewer.dataSources.get(dsn).entities.values.length; i++) {
 			var entity = viewer.dataSources.get(dsn).entities.values[i];
-			if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
+			if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*2000;
+} else {
+	print '60000';
+}
+?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 			} else {
 				//console.log(parseInt(entity.lastupdate)+' > '+Math.floor(Date.now()-100));
@@ -127,7 +132,12 @@  discard block
 block discarded – undo
 		function(){
 			updateMarineData();
 		}
-	,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+	,<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 } else {
 	var clockViewModel = new Cesium.ClockViewModel(viewer.clock);
 	var animationViewModel = new Cesium.AnimationViewModel(clockViewModel);

Please login to merge, or discard this patch.

js/map-aircraft.2d.js.php 1 patch

Braces +66 added lines, -17 removed lines patch added patch discarded remove patch

@@ -3,11 +3,18 @@  discard block
 block discarded – undo
 require_once('../require/class.Language.php'); 
 
 // Compressed GeoJson is used if true
-if (!isset($globalJsonCompress)) $compress = true;
-else $compress = $globalJsonCompress;
+if (!isset($globalJsonCompress)) {
+	$compress = true;
+} else {
+	$compress = $globalJsonCompress;
+}
 
-if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
-if (isset($_GET['flightaware_id'])) $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+if (isset($_GET['ident'])) {
+	$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
+}
+if (isset($_GET['flightaware_id'])) {
+	$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
+}
 ?>
 
 
@@ -72,9 +79,12 @@  discard block
 block discarded – undo
 
 function update_airportsLayer() {
 <?php
-	if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom'];
-	else $getZoom = '7';
-?>
+	if (isset($_COOKIE['AirportZoom'])) {
+		$getZoom = $_COOKIE['AirportZoom'];
+	} else {
+		$getZoom = '7';
+	}
+	?>
 	if (typeof airportsLayer != 'undefined') {
 		if (map.hasLayer(airportsLayer) == true) {
 			map.removeLayer(airportsLayer);
@@ -290,9 +300,13 @@  discard block
 block discarded – undo
 					if (callsign != ""){ markerLabel += callsign; }
 					if (departure_airport_code != "" && arrival_airport_code != "" && departure_airport_code != "NA" && arrival_airport_code != "NA"){ markerLabel += ' ( '+departure_airport_code+' - '+arrival_airport_code+' )'; }
 <?php
-	if (isset($_COOKIE['IconColor'])) $IconColor = $_COOKIE['IconColor'];
-	elseif (isset($globalAircraftIconColor)) $IconColor = $globalAircraftIconColor;
-	else $IconColor = '1a3151';
+	if (isset($_COOKIE['IconColor'])) {
+		$IconColor = $_COOKIE['IconColor'];
+	} elseif (isset($globalAircraftIconColor)) {
+		$IconColor = $globalAircraftIconColor;
+	} else {
+		$IconColor = '1a3151';
+	}
 	if (!isset($ident) && !isset($flightaware_id)) {
 ?>
 					info_update(feature.properties.fc);
@@ -340,7 +354,12 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-					var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+					var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 					return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -382,7 +401,12 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-						var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+						var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 						return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -422,7 +446,12 @@  discard block
 block discarded – undo
 <?php
 		} else {
 ?>
-							var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
+							var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
+	print $archiveupdatetime*1000;
+} else {
+	print $globalMapRefresh*1000+20000;
+}
+?>+feature.properties.sqt*1000);
 							return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
 <?php
 		}
@@ -759,13 +788,23 @@  discard block
 block discarded – undo
 	if (isset($archive) && $archive) {
 ?>
 	//then load it again every 30 seconds
-	//  var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
+	//  var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
+	print ($globalMapRefresh*1000)/2;
+} else {
+	print '15000';
+}
+?>);
 	reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php print $archiveupdatetime*1000; ?>);
 <?php
 	} else {
 ?>
 	//then load it again every 30 seconds
-	reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
+	reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000;
+} else {
+	print '30000';
+}
+?>);
 	var currentdate = new Date();
 	var currentyear = new Date().getFullYear();
 	var begindate = new Date(Date.UTC(currentyear,11,24,2,0,0,0));
@@ -777,7 +816,12 @@  discard block
 block discarded – undo
 		if (!((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
 ?>
 	update_polarLayer();
-	setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+	setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 		}
 ?>
@@ -792,7 +836,12 @@  discard block
 block discarded – undo
 	if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) {
 ?>
 	update_atcLayer();
-	setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+	setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 <?php
 	}
 ?>

Please login to merge, or discard this patch.

		@@ -26,7 +26,9 @@ discard block
		block discarded – undo
26	26	if (isset($filter[0]['source'])) {
27	27	$filters = array_merge($filters,$filter);
28	28	}
29		- if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
	29	+ if (is_array($globalFilter)) {
	30	+ $filter = array_merge($filter,$globalFilter);
	31	+ }
30	32	$filter_query_join = '';
31	33	$filter_query_where = '';
32	34	foreach($filters as $flt) {
		@@ -99,8 +101,11 @@ discard block
		block discarded – undo
99	101	}
100	102	$filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id";
101	103	}
102		- if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
103		- elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
	104	+ if ($filter_query_where == '' && $where) {
	105	+ $filter_query_where = ' WHERE';
	106	+ } elseif ($filter_query_where != '' && $and) {
	107	+ $filter_query_where .= ' AND';
	108	+ }
104	109	if ($filter_query_where != '') {
105	110	$filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where);
106	111	}
		@@ -114,10 +119,17 @@ discard block
		block discarded – undo
114	119	if ($over_country == '') {
115	120	$Spotter = new Spotter($this->db);
116	121	$data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude);
117		- if (!empty($data_country)) $country = $data_country['iso2'];
118		- else $country = '';
119		- } else $country = $over_country;
120		- if ($airline_type === NULL) $airline_type ='';
	122	+ if (!empty($data_country)) {
	123	+ $country = $data_country['iso2'];
	124	+ } else {
	125	+ $country = '';
	126	+ }
	127	+ } else {
	128	+ $country = $over_country;
	129	+ }
	130	+ if ($airline_type === NULL) {
	131	+ $airline_type ='';
	132	+ }
121	133
122	134	//if ($country == '') echo "\n".'********** UNKNOW COUNTRY **************'."\n";
123	135	//else echo "\n".'/////// Country : '.$country.' /////////'."\n";
		@@ -620,7 +632,9 @@ discard block
		block discarded – undo
620	632	$additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR ";
621	633	$additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR ";
622	634	$translate = $Translation->ident2icao($q_item);
623		- if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
	635	+ if ($translate != $q_item) {
	636	+ $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR ";
	637	+ }
624	638	$additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')";
625	639	$additional_query .= ")";
626	640	}
		@@ -838,7 +852,9 @@ discard block
		block discarded – undo
838	852	date_default_timezone_set($globalTimezone);
839	853	$datetime = new DateTime();
840	854	$offset = $datetime->format('P');
841		- } else $offset = '+00:00';
	855	+ } else {
	856	+ $offset = '+00:00';
	857	+ }
842	858
843	859
844	860	if ($date_array[1] != "")
		@@ -1114,9 +1130,13 @@ discard block
		block discarded – undo
1114	1130	$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1115	1131	}
1116	1132	}
1117		- if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
	1133	+ if ($sincedate != '') {
	1134	+ $query .= "AND date > '".$sincedate."' ";
	1135	+ }
1118	1136	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1119		- if ($limit) $query .= " LIMIT 0,10";
	1137	+ if ($limit) {
	1138	+ $query .= " LIMIT 0,10";
	1139	+ }
1120	1140
1121	1141
1122	1142	$sth = $this->db->prepare($query);
		@@ -1160,9 +1180,13 @@ discard block
		block discarded – undo
1160	1180	$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
1161	1181	}
1162	1182	}
1163		- if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
	1183	+ if ($sincedate != '') {
	1184	+ $query .= "AND s.date > '".$sincedate."' ";
	1185	+ }
1164	1186	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
1165		- if ($limit) $query .= " LIMIT 0,10";
	1187	+ if ($limit) {
	1188	+ $query .= " LIMIT 0,10";
	1189	+ }
1166	1190
1167	1191
1168	1192	$sth = $this->db->prepare($query);

		@@ -14,7 +14,9 @@
		block discarded – undo
14	14	$arrival_airport = filter_input(INPUT_GET,'arrival_airport',FILTER_SANITIZE_STRING);
15	15	if (isset($_GET['departure_airport']) && isset($_GET['arrival_airport'])) {
16	16	$spotter_array = $Spotter->getSpotterDataByRoute($departure_airport, $arrival_airport, "0,1", $sort);
17		-} else $spotter_array = array();
	17	+} else {
	18	+ $spotter_array = array();
	19	+}
18	20
19	21	if (!empty($spotter_array))
20	22	{

		@@ -3,15 +3,39 @@ discard block
		block discarded – undo
3	3	</span>
4	4	<div class="sub-menu sub-menu-container">
5	5	<ul class="nav nav-pills">
6		- <li><a href="<?php print $globalURL; ?>/pilot/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "pilot-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
	6	+ <li><a href="<?php print $globalURL; ?>/pilot/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
	7	+ echo '/'.$year;
	8	+}
	9	+?><?php if (isset($month) && $month != '') {
	10	+ echo '/'.$month;
	11	+}
	12	+?>" <?php if (strtolower($current_page) == "pilot-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
7	13	<li class="dropdown">
8	14	<a class="dropdown-toggle <?php if(strtolower($current_page) == "pilot-statistics-aircraft" \|\| strtolower($current_page) == "pilot-statistics-registration" \|\| strtolower($current_page) == "pilot-statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#">
9	15	<?php echo _("Aircraft"); ?> <span class="caret"></span>
10	16	</a>
11	17	<ul class="dropdown-menu" role="menu">
12		- <li><a href="<?php print $globalURL; ?>/pilot/statistics/aircraft/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Aircraft Type"); ?></a></li>
13		- <li><a href="<?php print $globalURL; ?>/pilot/statistics/registration/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Registration"); ?></a></li>
14		- <li><a href="<?php print $globalURL; ?>/pilot/statistics/manufacturer/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Manufacturer"); ?></a></li>
	18	+ <li><a href="<?php print $globalURL; ?>/pilot/statistics/aircraft/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
	19	+ echo '/'.$year;
	20	+}
	21	+?><?php if (isset($month) && $month != '') {
	22	+ echo '/'.$month;
	23	+}
	24	+?>"><?php echo _("Aircraft Type"); ?></a></li>
	25	+ <li><a href="<?php print $globalURL; ?>/pilot/statistics/registration/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
	26	+ echo '/'.$year;
	27	+}
	28	+?><?php if (isset($month) && $month != '') {
	29	+ echo '/'.$month;
	30	+}
	31	+?>"><?php echo _("Registration"); ?></a></li>
	32	+ <li><a href="<?php print $globalURL; ?>/pilot/statistics/manufacturer/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
	33	+ echo '/'.$year;
	34	+}
	35	+?><?php if (isset($month) && $month != '') {
	36	+ echo '/'.$month;
	37	+}
	38	+?>"><?php echo _("Manufacturer"); ?></a></li>
15	39	</ul>
16	40	</li>
17	41	<li class="dropdown">
		@@ -19,13 +43,49 @@ discard block
		block discarded – undo
19	43	<?php echo _("Airport"); ?> <span class="caret"></span>
20	44	</a>
21	45	<ul class="dropdown-menu" role="menu">
22		- <li><a href="<?php print $globalURL; ?>/pilot/statistics/departure-airport/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Departure Airport"); ?></a></li>
23		- <li><a href="<?php print $globalURL; ?>/pilot/statistics/departure-airport-country/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
24		- <li><a href="<?php print $globalURL; ?>/pilot/statistics/arrival-airport/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Arrival Airport"); ?></a></li>
25		- <li><a href="<?php print $globalURL; ?>/pilot/statistics/arrival-airport-country/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
	46	+ <li><a href="<?php print $globalURL; ?>/pilot/statistics/departure-airport/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
	47	+ echo '/'.$year;
	48	+}
	49	+?><?php if (isset($month) && $month != '') {
	50	+ echo '/'.$month;
	51	+}
	52	+?>"><?php echo _("Departure Airport"); ?></a></li>
	53	+ <li><a href="<?php print $globalURL; ?>/pilot/statistics/departure-airport-country/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
	54	+ echo '/'.$year;
	55	+}
	56	+?><?php if (isset($month) && $month != '') {
	57	+ echo '/'.$month;
	58	+}
	59	+?>"><?php echo _("Departure Airport by Country"); ?></a></li>
	60	+ <li><a href="<?php print $globalURL; ?>/pilot/statistics/arrival-airport/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
	61	+ echo '/'.$year;
	62	+}
	63	+?><?php if (isset($month) && $month != '') {
	64	+ echo '/'.$month;
	65	+}
	66	+?>"><?php echo _("Arrival Airport"); ?></a></li>
	67	+ <li><a href="<?php print $globalURL; ?>/pilot/statistics/arrival-airport-country/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
	68	+ echo '/'.$year;
	69	+}
	70	+?><?php if (isset($month) && $month != '') {
	71	+ echo '/'.$month;
	72	+}
	73	+?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
26	74	</ul>
27	75	</li>
28		- <li><a href="<?php print $globalURL; ?>/pilot/statistics/route/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "pilot-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
29		- <li><a href="<?php print $globalURL; ?>/pilot/statistics/time/<?php print $pilot; ?><?php if (isset($year) && $year != '') echo '/'.$year; ?><?php if (isset($month) && $month != '') echo '/'.$month; ?>" <?php if (strtolower($current_page) == "pilot-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
	76	+ <li><a href="<?php print $globalURL; ?>/pilot/statistics/route/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
	77	+ echo '/'.$year;
	78	+}
	79	+?><?php if (isset($month) && $month != '') {
	80	+ echo '/'.$month;
	81	+}
	82	+?>" <?php if (strtolower($current_page) == "pilot-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
	83	+ <li><a href="<?php print $globalURL; ?>/pilot/statistics/time/<?php print $pilot; ?><?php if (isset($year) && $year != '') {
	84	+ echo '/'.$year;
	85	+}
	86	+?><?php if (isset($month) && $month != '') {
	87	+ echo '/'.$month;
	88	+}
	89	+?>" <?php if (strtolower($current_page) == "pilot-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
30	90	</ul>
31	91	</div>
32	92	\ No newline at end of file

		@@ -3,20 +3,50 @@ 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	<div class="sub-menu sub-menu-container">
10	16	<ul class="nav nav-pills">
11		- <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>
	17	+ <li><a href="<?php print $globalURL; ?>/owner/<?php print $owner; ?><?php if (isset($year) && $year != '') {
	18	+ echo '/'.$year;
	19	+}
	20	+?><?php if (isset($month) && $month != '') {
	21	+ echo '/'.$month;
	22	+}
	23	+?>" <?php if (strtolower($current_page) == "owner-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li>
12	24	<li class="dropdown">
13	25	<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="#">
14	26	<?php echo _("Aircraft"); ?> <span class="caret"></span>
15	27	</a>
16	28	<ul class="dropdown-menu" role="menu">
17		- <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>
18		- <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>
19		- <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>
	29	+ <li><a href="<?php print $globalURL; ?>/owner/statistics/aircraft/<?php print $owner; ?><?php if (isset($year) && $year != '') {
	30	+ echo '/'.$year;
	31	+}
	32	+?><?php if (isset($month) && $month != '') {
	33	+ echo '/'.$month;
	34	+}
	35	+?>"><?php echo _("Aircraft Type"); ?></a></li>
	36	+ <li><a href="<?php print $globalURL; ?>/owner/statistics/registration/<?php print $owner; ?><?php if (isset($year) && $year != '') {
	37	+ echo '/'.$year;
	38	+}
	39	+?><?php if (isset($month) && $month != '') {
	40	+ echo '/'.$month;
	41	+}
	42	+?>"><?php echo _("Registration"); ?></a></li>
	43	+ <li><a href="<?php print $globalURL; ?>/owner/statistics/manufacturer/<?php print $owner; ?><?php if (isset($year) && $year != '') {
	44	+ echo '/'.$year;
	45	+}
	46	+?><?php if (isset($month) && $month != '') {
	47	+ echo '/'.$month;
	48	+}
	49	+?>"><?php echo _("Manufacturer"); ?></a></li>
20	50	</ul>
21	51	</li>
22	52	<li class="dropdown">
		@@ -24,13 +54,49 @@ discard block
		block discarded – undo
24	54	<?php echo _("Airport"); ?> <span class="caret"></span>
25	55	</a>
26	56	<ul class="dropdown-menu" role="menu">
27		- <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>
28		- <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>
29		- <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>
30		- <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>
	57	+ <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') {
	58	+ echo '/'.$year;
	59	+}
	60	+?><?php if (isset($month) && $month != '') {
	61	+ echo '/'.$month;
	62	+}
	63	+?>"><?php echo _("Departure Airport"); ?></a></li>
	64	+ <li><a href="<?php print $globalURL; ?>/owner/statistics/departure-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') {
	65	+ echo '/'.$year;
	66	+}
	67	+?><?php if (isset($month) && $month != '') {
	68	+ echo '/'.$month;
	69	+}
	70	+?>"><?php echo _("Departure Airport by Country"); ?></a></li>
	71	+ <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport/<?php print $owner; ?><?php if (isset($year) && $year != '') {
	72	+ echo '/'.$year;
	73	+}
	74	+?><?php if (isset($month) && $month != '') {
	75	+ echo '/'.$month;
	76	+}
	77	+?>"><?php echo _("Arrival Airport"); ?></a></li>
	78	+ <li><a href="<?php print $globalURL; ?>/owner/statistics/arrival-airport-country/<?php print $owner; ?><?php if (isset($year) && $year != '') {
	79	+ echo '/'.$year;
	80	+}
	81	+?><?php if (isset($month) && $month != '') {
	82	+ echo '/'.$month;
	83	+}
	84	+?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
31	85	</ul>
32	86	</li>
33		- <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>
34		- <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>
	87	+ <li><a href="<?php print $globalURL; ?>/owner/statistics/route/<?php print $owner; ?><?php if (isset($year) && $year != '') {
	88	+ echo '/'.$year;
	89	+}
	90	+?><?php if (isset($month) && $month != '') {
	91	+ echo '/'.$month;
	92	+}
	93	+?>" <?php if (strtolower($current_page) == "owner-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li>
	94	+ <li><a href="<?php print $globalURL; ?>/owner/statistics/time/<?php print $owner; ?><?php if (isset($year) && $year != '') {
	95	+ echo '/'.$year;
	96	+}
	97	+?><?php if (isset($month) && $month != '') {
	98	+ echo '/'.$month;
	99	+}
	100	+?>" <?php if (strtolower($current_page) == "owner-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li>
35	101	</ul>
36	102	</div>
37	103	\ No newline at end of file

		@@ -53,7 +53,12 @@ discard block
		block discarded – undo
53	53	} else {
54	54	for (var i = 0; i < viewer.dataSources.get(dsn).entities.values.length; i++) {
55	55	var entity = viewer.dataSources.get(dsn).entities.values[i];
56		- if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
	56	+ if (parseInt(entity.lastupdate) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) {
	57	+ print $globalMapRefresh*2000;
	58	+} else {
	59	+ print '60000';
	60	+}
	61	+?>)) {
57	62	viewer.dataSources.get(dsn).entities.remove(entity);
58	63	} else {
59	64	//console.log(parseInt(entity.lastupdate)+' > '+Math.floor(Date.now()-100));
		@@ -127,7 +132,12 @@ discard block
		block discarded – undo
127	132	function(){
128	133	updateMarineData();
129	134	}
130		- ,<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
	135	+ ,<?php if (isset($globalMapRefresh)) {
	136	+ print $globalMapRefresh*1000;
	137	+} else {
	138	+ print '30000';
	139	+}
	140	+?>);
131	141	} else {
132	142	var clockViewModel = new Cesium.ClockViewModel(viewer.clock);
133	143	var animationViewModel = new Cesium.AnimationViewModel(clockViewModel);

		@@ -3,11 +3,18 @@ discard block
		block discarded – undo
3	3	require_once('../require/class.Language.php');
4	4
5	5	// Compressed GeoJson is used if true
6		-if (!isset($globalJsonCompress)) $compress = true;
7		-else $compress = $globalJsonCompress;
	6	+if (!isset($globalJsonCompress)) {
	7	+ $compress = true;
	8	+} else {
	9	+ $compress = $globalJsonCompress;
	10	+}
8	11
9		-if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
10		-if (isset($_GET['flightaware_id'])) $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
	12	+if (isset($_GET['ident'])) {
	13	+ $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
	14	+}
	15	+if (isset($_GET['flightaware_id'])) {
	16	+ $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
	17	+}
11	18	?>
12	19
13	20
		@@ -72,9 +79,12 @@ discard block
		block discarded – undo
72	79
73	80	function update_airportsLayer() {
74	81	<?php
75		- if (isset($_COOKIE['AirportZoom'])) $getZoom = $_COOKIE['AirportZoom'];
76		- else $getZoom = '7';
77		-?>
	82	+ if (isset($_COOKIE['AirportZoom'])) {
	83	+ $getZoom = $_COOKIE['AirportZoom'];
	84	+ } else {
	85	+ $getZoom = '7';
	86	+ }
	87	+ ?>
78	88	if (typeof airportsLayer != 'undefined') {
79	89	if (map.hasLayer(airportsLayer) == true) {
80	90	map.removeLayer(airportsLayer);
		@@ -290,9 +300,13 @@ discard block
		block discarded – undo
290	300	if (callsign != ""){ markerLabel += callsign; }
291	301	if (departure_airport_code != "" && arrival_airport_code != "" && departure_airport_code != "NA" && arrival_airport_code != "NA"){ markerLabel += ' ( '+departure_airport_code+' - '+arrival_airport_code+' )'; }
292	302	<?php
293		- if (isset($_COOKIE['IconColor'])) $IconColor = $_COOKIE['IconColor'];
294		- elseif (isset($globalAircraftIconColor)) $IconColor = $globalAircraftIconColor;
295		- else $IconColor = '1a3151';
	303	+ if (isset($_COOKIE['IconColor'])) {
	304	+ $IconColor = $_COOKIE['IconColor'];
	305	+ } elseif (isset($globalAircraftIconColor)) {
	306	+ $IconColor = $globalAircraftIconColor;
	307	+ } else {
	308	+ $IconColor = '1a3151';
	309	+ }
296	310	if (!isset($ident) && !isset($flightaware_id)) {
297	311	?>
298	312	info_update(feature.properties.fc);
		@@ -340,7 +354,12 @@ discard block
		block discarded – undo
340	354	<?php
341	355	} else {
342	356	?>
343		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	357	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
	358	+ print $archiveupdatetime*1000;
	359	+} else {
	360	+ print $globalMapRefresh*1000+20000;
	361	+}
	362	+?>+feature.properties.sqt*1000);
344	363	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
345	364	<?php
346	365	}
		@@ -382,7 +401,12 @@ discard block
		block discarded – undo
382	401	<?php
383	402	} else {
384	403	?>
385		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	404	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
	405	+ print $archiveupdatetime*1000;
	406	+} else {
	407	+ print $globalMapRefresh*1000+20000;
	408	+}
	409	+?>+feature.properties.sqt*1000);
386	410	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
387	411	<?php
388	412	}
		@@ -422,7 +446,12 @@ discard block
		block discarded – undo
422	446	<?php
423	447	} else {
424	448	?>
425		- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime1000; else print $globalMapRefresh1000+20000; ?>+feature.properties.sqt*1000);
	449	+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) {
	450	+ print $archiveupdatetime*1000;
	451	+} else {
	452	+ print $globalMapRefresh*1000+20000;
	453	+}
	454	+?>+feature.properties.sqt*1000);
426	455	return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
427	456	<?php
428	457	}
		@@ -759,13 +788,23 @@ discard block
		block discarded – undo
759	788	if (isset($archive) && $archive) {
760	789	?>
761	790	//then load it again every 30 seconds
762		- // var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>);
	791	+ // var reload = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
	792	+ print ($globalMapRefresh*1000)/2;
	793	+} else {
	794	+ print '15000';
	795	+}
	796	+?>);
763	797	reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php print $archiveupdatetime*1000; ?>);
764	798	<?php
765	799	} else {
766	800	?>
767	801	//then load it again every 30 seconds
768		- reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>);
	802	+ reloadPage = setInterval(function(){if (noTimeout) getLiveData(0)},<?php if (isset($globalMapRefresh)) {
	803	+ print $globalMapRefresh*1000;
	804	+} else {
	805	+ print '30000';
	806	+}
	807	+?>);
769	808	var currentdate = new Date();
770	809	var currentyear = new Date().getFullYear();
771	810	var begindate = new Date(Date.UTC(currentyear,11,24,2,0,0,0));
		@@ -777,7 +816,12 @@ discard block
		block discarded – undo
777	816	if (!((isset($globalIVAO) && $globalIVAO) \|\| (isset($globalVATSIM) && $globalVATSIM) \|\| (isset($globalphpVMS) && $globalphpVMS)) && (isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
778	817	?>
779	818	update_polarLayer();
780		- setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh10002; else print '60000'; ?>);
	819	+ setInterval(function(){map.removeLayer(polarLayer);update_polarLayer()},<?php if (isset($globalMapRefresh)) {
	820	+ print $globalMapRefresh10002;
	821	+} else {
	822	+ print '60000';
	823	+}
	824	+?>);
781	825	<?php
782	826	}
783	827	?>
		@@ -792,7 +836,12 @@ discard block
		block discarded – undo
792	836	if ((isset($globalIVAO) && $globalIVAO) \|\| (isset($globalVATSIM) && $globalVATSIM)) {
793	837	?>
794	838	update_atcLayer();
795		- setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh10002; else print '60000'; ?>);
	839	+ setInterval(function(){map.removeLayer(atcLayer);update_atcLayer()},<?php if (isset($globalMapRefresh)) {
	840	+ print $globalMapRefresh10002;
	841	+} else {
	842	+ print '60000';
	843	+}
	844	+?>);
796	845	<?php
797	846	}
798	847	?>

Ysurac / FlightAirMap

Push — master ( ada087...bf5a9f )

Status

Category

Braces +37 added lines, -13 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Braces +70 added lines, -10 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Braces +77 added lines, -11 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Braces +12 added lines, -2 removed lines patch added patch discarded remove patch

Braces +66 added lines, -17 removed lines patch added patch discarded remove patch