Inspection of "Add marine image support, aircrafts display should..." - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 6c4f55...213543 )

by Yannick

created 2017-04-06 19:44 UTC

Status

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

@@ -5,11 +5,15 @@
 block discarded – undo
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Arrival Airport by Country");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 require_once('header.php');

Please login to merge, or discard this patch.

statistics-airport-departure-country.php 1 patch

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

@@ -5,11 +5,15 @@
 block discarded – undo
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Departure Airport by Country");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 

Please login to merge, or discard this patch.

statistics-airport-departure.php 1 patch

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

@@ -5,11 +5,15 @@
 block discarded – undo
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Departure Airport");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
 require_once('header.php');

Please login to merge, or discard this patch.

statistics-year.php 1 patch

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

@@ -5,11 +5,15 @@
 block discarded – undo
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Busiest Month of Last Year");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 
 require_once('header.php');
 include('statistics-sub-menu.php');

Please login to merge, or discard this patch.

statistics-manufacturer.php 1 patch

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

@@ -5,11 +5,15 @@
 block discarded – undo
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Aircraft Manufacturer");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);

Please login to merge, or discard this patch.

statistics-time.php 1 patch

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

@@ -5,11 +5,15 @@
 block discarded – undo
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Busiest Time of the Day");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 
 require_once('header.php');
 include('statistics-sub-menu.php');

Please login to merge, or discard this patch.

statistics-sub-menu.php 1 patch

Braces +110 added lines, -27 removed lines patch added patch discarded remove patch

@@ -4,7 +4,13 @@  discard block
 block discarded – undo
 	<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>
 	
 		<form id="changeairline" method="post">
@@ -13,7 +19,9 @@  discard block
 block discarded – undo
 				<?php
 					require_once('require/class.Stats.php');
 					$Stats = new Stats();
-					if (!isset($filter_name)) $filter_name = '';
+					if (!isset($filter_name)) {
+						$filter_name = '';
+					}
 					$airlines = $Stats->getAllAirlineNames($filter_name);
 					if (isset($airline_icao) && ($airline_icao == '' || $airline_icao == 'all')) {
 						print '<option value="all" selected>All</option>';
@@ -41,10 +49,22 @@  discard block
 block discarded – undo
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
-			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Aircraft"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Registration"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Manufacturer"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Country"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Aircraft"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Registration"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Manufacturer"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Country"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -52,9 +72,18 @@  discard block
 block discarded – undo
 		      <?php echo _("Airline"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline by Country"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Callsign"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Airline"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Airline by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Callsign"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -62,10 +91,22 @@  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; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Departure Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Departure Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Arrival Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -73,8 +114,14 @@  discard block
 block discarded – undo
 		      <?php echo _("Route"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Waypoint"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Route by Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Route by Waypoint"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -82,8 +129,14 @@  discard block
 block discarded – undo
 		      <?php echo _("Date &amp; Time"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Date"); ?></a></li>
-			  <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Time"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Date"); ?></a></li>
+			  <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>"><?php echo _("Time"); ?></a></li>
 		    </ul>
 		</li>
 		<?php
@@ -113,9 +166,18 @@  discard block
 block discarded – undo
 		      <?php echo _("Aircraft"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu">
-			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li>
-			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li>
+			<li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li>
 			<!-- <li><a href="<?php print $globalURL; ?>/statistics/country"><?php echo _("Country"); ?></a></li> -->
 		    </ul>
 		</li>
@@ -124,9 +186,18 @@  discard block
 block discarded – undo
 		      <?php echo _("Airline"); ?> <span class="caret"></span>
 		    </a>
 		    <ul class="dropdown-menu" role="menu">
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li>
 		    </ul>
 		</li>
 		<li class="dropdown">
@@ -134,10 +205,22 @@  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; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li>
-		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li>
+		      <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
+	echo '/'.$airline_icao;
+}
+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
 		    </ul>
 		</li>
 		<!--

Please login to merge, or discard this patch.

statistics-pilot.php 1 patch

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

@@ -5,11 +5,15 @@
 block discarded – undo
 $Stats = new Stats();
 $title = _("Statistics").' - '._("Most common Pilots");
 
-if (!isset($filter_name)) $filter_name = '';
+if (!isset($filter_name)) {
+	$filter_name = '';
+}
 $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
 if ($airline_icao == '' && isset($globalFilter)) {
-    if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
-}
+    if (isset($globalFilter['airline'])) {
+    	$airline_icao = $globalFilter['airline'][0];
+    }
+    }
 setcookie('stats_airline_icao',$airline_icao,time()+60*60*24,'/');
 $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
 $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);

Please login to merge, or discard this patch.

require/class.METAR.php 1 patch

Braces +100 added lines, -38 removed lines patch added patch discarded remove patch

@@ -59,8 +59,11 @@  discard block
 block discarded – undo
                 }
                 $row = $sth->fetch(PDO::FETCH_ASSOC);
                 $sth->closeCursor();
-                if ($row['nb'] > 0) return false;
-                else return true;
+                if ($row['nb'] > 0) {
+                	return false;
+                } else {
+                	return true;
+                }
         }
 
         public static function insert_last_update() {
@@ -84,9 +87,14 @@  discard block
 block discarded – undo
     		//$pieces = explode(' ',$data);
     		$pieces = preg_split('/\s/',$data);
     		$pos = 0;
-    		if ($pieces[0] == 'METAR') $pos++;
-    		elseif ($pieces[0] == 'SPECI') $pos++;
-    		if (strlen($pieces[$pos]) != 4) $pos++;
+    		if ($pieces[0] == 'METAR') {
+    			$pos++;
+    		} elseif ($pieces[0] == 'SPECI') {
+    			$pos++;
+    		}
+    		if (strlen($pieces[$pos]) != 4) {
+    			$pos++;
+    		}
     		$result = array();
     		$result['location'] = $pieces[$pos];
     		$pos++;
@@ -95,16 +103,26 @@  discard block
 block discarded – undo
     		$c = count($pieces);
     		for($pos++; $pos < $c; $pos++) {
     			$piece = $pieces[$pos];
-    			if ($piece == 'RMK') break;
-    			if ($piece == 'AUTO') $result['auto'] = true;
-    			if ($piece == 'COR') $result['correction'] = true;
+    			if ($piece == 'RMK') {
+    				break;
+    			}
+    			if ($piece == 'AUTO') {
+    				$result['auto'] = true;
+    			}
+    			if ($piece == 'COR') {
+    				$result['correction'] = true;
+    			}
     			// Wind Speed
     			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
     				$result['wind']['direction'] = (float)$matches[1];
 				$result['wind']['unit'] = $matches[4];
-    				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-    				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-    				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
+    				if ($result['wind']['unit'] == 'KT') {
+    					$result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
+    				} elseif ($result['wind']['unit'] == 'KPH') {
+    					$result['wind']['speed'] = round(((float)$matches[2])*1000,2);
+    				} elseif ($result['wind']['unit'] == 'MPS') {
+    					$result['wind']['speed'] = round(((float)$matches[2]),2);
+    				}
 				$result['wind']['gust'] = (float)$matches[3];
 				$result['wind']['unit'] = $matches[4];
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
@@ -186,14 +204,23 @@  discard block
 block discarded – undo
     				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
     				$type = $matches[1];
     				$cloud = array();
-    				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
-    				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
-    				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
-    				elseif ($type == 'FEW') $cloud['type'] = 'Few';
-    				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
-    				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
-    				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
-    				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
+    				if ($type == 'SKC') {
+    					$cloud['type'] = 'No cloud/Sky clear';
+    				} elseif ($type == 'CLR') {
+    					$cloud['type'] = 'No cloud below 12,000ft (3700m)';
+    				} elseif ($type == 'NSC') {
+    					$cloud['type'] = 'No significant cloud';
+    				} elseif ($type == 'FEW') {
+    					$cloud['type'] = 'Few';
+    				} elseif ($type == 'SCT') {
+    					$cloud['type'] = 'Scattered';
+    				} elseif ($type == 'BKN') {
+    					$cloud['type'] = 'Broken';
+    				} elseif ($type == 'OVC') {
+    					$cloud['type'] = 'Overcast/Full cloud coverage';
+    				} elseif ($type == 'VV') {
+    					$cloud['type'] = 'Vertical visibility';
+    				}
     				$cloud['type_code'] = $type;
     				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
     				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
@@ -223,8 +250,11 @@  discard block
 block discarded – undo
     			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
     				//echo $piece;
     				//print_r($matches);
-    				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-    				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+    				if (isset($matches[5])) {
+    					$range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+    				} else {
+    					$range = array('exact' => (float)$matches[2], 'unit' => 'M');
+    				}
 				if (isset($matches[3])) {
 					$range = Array(
 					    'from' => (float)$matches[2],
@@ -257,8 +287,11 @@  discard block
 block discarded – undo
 				if (isset($matches[3])) {
 					$text[] = $this->texts[$matches[3]];
 				}
-				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
-				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				if (!isset($result['weather'])) {
+					$result['weather'] = implode(' ', $text);
+				} else {
+					$result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				}
     			}
     		}
     		return $result;
@@ -270,8 +303,11 @@  discard block
 block discarded – undo
     		if (isset($globalMETARcycle) && $globalMETARcycle) {
             		$query = "SELECT * FROM metar WHERE metar_location = :icao";
                 } else {
-            		if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
-            		else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+            		if ($globalDBdriver == 'mysql') {
+            			$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
+            		} else {
+            			$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+            		}
                 }
                 $query_values = array(':icao' => $icao);
                  try {
@@ -326,7 +362,9 @@  discard block
 block discarded – undo
         
         public function addMETARCycle() {
     		global $globalDebug, $globalIVAO, $globalTransaction;
-    		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
+    		if (isset($globalDebug) && $globalDebug) {
+    			echo "Downloading METAR cycle...";
+    		}
     		date_default_timezone_set("UTC");
     		$Common = new Common();
     		if (isset($globalIVAO) && $globalIVAO) {
@@ -339,33 +377,49 @@  discard block
 block discarded – undo
     			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
     		}
     		if ($handle) {
-			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
+			if (isset($globalDebug) && $globalDebug) {
+				echo "Done - Updating DB...";
+			}
 			$date = '';
     			//foreach(explode("\n",$cycle) as $line) {
-    			if ($globalTransaction) $this->db->beginTransaction();
+    			if ($globalTransaction) {
+    				$this->db->beginTransaction();
+    			}
 	    		while(($line = fgets($handle,4096)) !== false) {
 				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
 					$date = $line;
     				} elseif ($line != '') {
     				    //$this->parse($line);
-    				    if ($date == '') $date = date('Y/m/d H:m');
+    				    if ($date == '') {
+    				    	$date = date('Y/m/d H:m');
+    				    }
         			    $pos = 0;
         			    $pieces = preg_split('/\s/',$line);
-        			    if ($pieces[0] == 'METAR') $pos++;
-        			    if (strlen($pieces[$pos]) != 4) $pos++;
+        			    if ($pieces[0] == 'METAR') {
+        			    	$pos++;
+        			    }
+        			    if (strlen($pieces[$pos]) != 4) {
+        			    	$pos++;
+        			    }
 		        	    $location = $pieces[$pos];
         	        	    echo $this->addMETAR($location,$line,$date);
     				}
     			}
     			fclose($handle);
-    			if ($globalTransaction) $this->db->commit();
+    			if ($globalTransaction) {
+    				$this->db->commit();
+    			}
+    		}
+    		if (isset($globalDebug) && $globalDebug) {
+    			echo "Done\n";
     		}
-    		if (isset($globalDebug) && $globalDebug) echo "Done\n";
         
         }
         public function downloadMETAR($icao) {
     		global $globalMETARurl;
-    		if ($globalMETARurl == '') return array();
+    		if ($globalMETARurl == '') {
+    			return array();
+    		}
     		date_default_timezone_set("UTC");
     		$Common = new Common();
     		$url = str_replace('{icao}',$icao,$globalMETARurl);
@@ -379,16 +433,24 @@  discard block
 block discarded – undo
     			if ($line != '') {
     			    //$this->parse($line);
     			    //echo $line;
-    			    if ($date == '') $date = date('Y/m/d H:m');
+    			    if ($date == '') {
+    			    	$date = date('Y/m/d H:m');
+    			    }
     			    $pos = 0;
     			    $pieces = preg_split('/\s/',$line);
-    			    if ($pieces[0] == 'METAR') $pos++;
-    			    if (strlen($pieces[$pos]) != 4) $pos++;
+    			    if ($pieces[0] == 'METAR') {
+    			    	$pos++;
+    			    }
+    			    if (strlen($pieces[$pos]) != 4) {
+    			    	$pos++;
+    			    }
 	        	    $location = $pieces[$pos];
 	        	    if (strlen($location == 4)) {
 	        		$this->addMETAR($location,$line,$date);
 	        		return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
-	        	    } else return array();
+	        	    } else {
+	        	    	return array();
+	        	    }
     			}
     			//echo $line."\n";
     		}

Please login to merge, or discard this patch.

		@@ -5,11 +5,15 @@
		block discarded – undo
5	5	$Stats = new Stats();
6	6	$title = _("Statistics").' - '._("Most common Arrival Airport by Country");
7	7
8		-if (!isset($filter_name)) $filter_name = '';
	8	+if (!isset($filter_name)) {
	9	+ $filter_name = '';
	10	+}
9	11	$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING);
10	12	if ($airline_icao == '' && isset($globalFilter)) {
11		- if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0];
12		-}
	13	+ if (isset($globalFilter['airline'])) {
	14	+ $airline_icao = $globalFilter['airline'][0];
	15	+ }
	16	+ }
13	17	$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT);
14	18	$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT);
15	19	require_once('header.php');

		@@ -4,7 +4,13 @@ discard block
		block discarded – undo
4	4	<div class="stats_airline">
5	5
6	6	<form id="changedate" method="post">
7		- <input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') echo $year.'-'; ?><?php if (isset($month) && $month != '') echo $month; ?>" />
	7	+ <input type="month" name="date" onchange="statsdatechange(this);" value="<?php if (isset($year) && $year != '') {
	8	+ echo $year.'-';
	9	+}
	10	+?><?php if (isset($month) && $month != '') {
	11	+ echo $month;
	12	+}
	13	+?>" />
8	14	</form>
9	15
10	16	<form id="changeairline" method="post">
		@@ -13,7 +19,9 @@ discard block
		block discarded – undo
13	19	<?php
14	20	require_once('require/class.Stats.php');
15	21	$Stats = new Stats();
16		- if (!isset($filter_name)) $filter_name = '';
	22	+ if (!isset($filter_name)) {
	23	+ $filter_name = '';
	24	+ }
17	25	$airlines = $Stats->getAllAirlineNames($filter_name);
18	26	if (isset($airline_icao) && ($airline_icao == '' \|\| $airline_icao == 'all')) {
19	27	print '<option value="all" selected>All</option>';
		@@ -41,10 +49,22 @@ discard block
		block discarded – undo
41	49	<?php echo _("Aircraft"); ?> <span class="caret"></span>
42	50	</a>
43	51	<ul class="dropdown-menu">
44		- <li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Aircraft"); ?></a></li>
45		- <li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Registration"); ?></a></li>
46		- <li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Manufacturer"); ?></a></li>
47		- <li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Country"); ?></a></li>
	52	+ <li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	53	+ echo '/'.$airline_icao;
	54	+}
	55	+?>"><?php echo _("Aircraft"); ?></a></li>
	56	+ <li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	57	+ echo '/'.$airline_icao;
	58	+}
	59	+?>"><?php echo _("Registration"); ?></a></li>
	60	+ <li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	61	+ echo '/'.$airline_icao;
	62	+}
	63	+?>"><?php echo _("Manufacturer"); ?></a></li>
	64	+ <li><a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	65	+ echo '/'.$airline_icao;
	66	+}
	67	+?>"><?php echo _("Country"); ?></a></li>
48	68	</ul>
49	69	</li>
50	70	<li class="dropdown">
		@@ -52,9 +72,18 @@ discard block
		block discarded – undo
52	72	<?php echo _("Airline"); ?> <span class="caret"></span>
53	73	</a>
54	74	<ul class="dropdown-menu" role="menu">
55		- <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline"); ?></a></li>
56		- <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Airline by Country"); ?></a></li>
57		- <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Callsign"); ?></a></li>
	75	+ <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	76	+ echo '/'.$airline_icao;
	77	+}
	78	+?>"><?php echo _("Airline"); ?></a></li>
	79	+ <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	80	+ echo '/'.$airline_icao;
	81	+}
	82	+?>"><?php echo _("Airline by Country"); ?></a></li>
	83	+ <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	84	+ echo '/'.$airline_icao;
	85	+}
	86	+?>"><?php echo _("Callsign"); ?></a></li>
58	87	</ul>
59	88	</li>
60	89	<li class="dropdown">
		@@ -62,10 +91,22 @@ discard block
		block discarded – undo
62	91	<?php echo _("Airport"); ?> <span class="caret"></span>
63	92	</a>
64	93	<ul class="dropdown-menu" role="menu">
65		- <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport"); ?></a></li>
66		- <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
67		- <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport"); ?></a></li>
68		- <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
	94	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	95	+ echo '/'.$airline_icao;
	96	+}
	97	+?>"><?php echo _("Departure Airport"); ?></a></li>
	98	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	99	+ echo '/'.$airline_icao;
	100	+}
	101	+?>"><?php echo _("Departure Airport by Country"); ?></a></li>
	102	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	103	+ echo '/'.$airline_icao;
	104	+}
	105	+?>"><?php echo _("Arrival Airport"); ?></a></li>
	106	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	107	+ echo '/'.$airline_icao;
	108	+}
	109	+?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
69	110	</ul>
70	111	</li>
71	112	<li class="dropdown">
		@@ -73,8 +114,14 @@ discard block
		block discarded – undo
73	114	<?php echo _("Route"); ?> <span class="caret"></span>
74	115	</a>
75	116	<ul class="dropdown-menu" role="menu">
76		- <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Airport"); ?></a></li>
77		- <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Route by Waypoint"); ?></a></li>
	117	+ <li><a href="<?php print $globalURL; ?>/statistics/route-airport<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	118	+ echo '/'.$airline_icao;
	119	+}
	120	+?>"><?php echo _("Route by Airport"); ?></a></li>
	121	+ <li><a href="<?php print $globalURL; ?>/statistics/route-waypoint<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	122	+ echo '/'.$airline_icao;
	123	+}
	124	+?>"><?php echo _("Route by Waypoint"); ?></a></li>
78	125	</ul>
79	126	</li>
80	127	<li class="dropdown">
		@@ -82,8 +129,14 @@ discard block
		block discarded – undo
82	129	<?php echo _("Date & Time"); ?> <span class="caret"></span>
83	130	</a>
84	131	<ul class="dropdown-menu" role="menu">
85		- <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Date"); ?></a></li>
86		- <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>"><?php echo _("Time"); ?></a></li>
	132	+ <li><a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	133	+ echo '/'.$airline_icao;
	134	+}
	135	+?>"><?php echo _("Date"); ?></a></li>
	136	+ <li><a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	137	+ echo '/'.$airline_icao;
	138	+}
	139	+?>"><?php echo _("Time"); ?></a></li>
87	140	</ul>
88	141	</li>
89	142	<?php
		@@ -113,9 +166,18 @@ discard block
		block discarded – undo
113	166	<?php echo _("Aircraft"); ?> <span class="caret"></span>
114	167	</a>
115	168	<ul class="dropdown-menu">
116		- <li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li>
117		- <li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li>
118		- <li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li>
	169	+ <li><a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	170	+ echo '/'.$airline_icao;
	171	+}
	172	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Aircraft"); ?></a></li>
	173	+ <li><a href="<?php print $globalURL; ?>/statistics/registration<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	174	+ echo '/'.$airline_icao;
	175	+}
	176	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Registration"); ?></a></li>
	177	+ <li><a href="<?php print $globalURL; ?>/statistics/manufacturer<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	178	+ echo '/'.$airline_icao;
	179	+}
	180	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Manufacturer"); ?></a></li>
119	181	<!-- <li><a href="<?php print $globalURL; ?>/statistics/country"><?php echo _("Country"); ?></a></li> -->
120	182	</ul>
121	183	</li>
		@@ -124,9 +186,18 @@ discard block
		block discarded – undo
124	186	<?php echo _("Airline"); ?> <span class="caret"></span>
125	187	</a>
126	188	<ul class="dropdown-menu" role="menu">
127		- <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li>
128		- <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li>
129		- <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li>
	189	+ <li><a href="<?php print $globalURL; ?>/statistics/airline<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	190	+ echo '/'.$airline_icao;
	191	+}
	192	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline"); ?></a></li>
	193	+ <li><a href="<?php print $globalURL; ?>/statistics/airline-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	194	+ echo '/'.$airline_icao;
	195	+}
	196	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Airline by Country"); ?></a></li>
	197	+ <li><a href="<?php print $globalURL; ?>/statistics/callsign<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	198	+ echo '/'.$airline_icao;
	199	+}
	200	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Callsign"); ?></a></li>
130	201	</ul>
131	202	</li>
132	203	<li class="dropdown">
		@@ -134,10 +205,22 @@ discard block
		block discarded – undo
134	205	<?php echo _("Airport"); ?> <span class="caret"></span>
135	206	</a>
136	207	<ul class="dropdown-menu" role="menu">
137		- <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li>
138		- <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
139		- <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li>
140		- <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
	208	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-departure<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	209	+ echo '/'.$airline_icao;
	210	+}
	211	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport"); ?></a></li>
	212	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-departure-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	213	+ echo '/'.$airline_icao;
	214	+}
	215	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Departure Airport by Country"); ?></a></li>
	216	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	217	+ echo '/'.$airline_icao;
	218	+}
	219	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport"); ?></a></li>
	220	+ <li><a href="<?php print $globalURL; ?>/statistics/airport-arrival-country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') {
	221	+ echo '/'.$airline_icao;
	222	+}
	223	+?>/<?php echo $year.'/'.$month.'/'; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li>
141	224	</ul>
142	225	</li>
143	226	<!--

		@@ -59,8 +59,11 @@ discard block
		block discarded – undo
59	59	}
60	60	$row = $sth->fetch(PDO::FETCH_ASSOC);
61	61	$sth->closeCursor();
62		- if ($row['nb'] > 0) return false;
63		- else return true;
	62	+ if ($row['nb'] > 0) {
	63	+ return false;
	64	+ } else {
	65	+ return true;
	66	+ }
64	67	}
65	68
66	69	public static function insert_last_update() {
		@@ -84,9 +87,14 @@ discard block
		block discarded – undo
84	87	//$pieces = explode(' ',$data);
85	88	$pieces = preg_split('/\s/',$data);
86	89	$pos = 0;
87		- if ($pieces[0] == 'METAR') $pos++;
88		- elseif ($pieces[0] == 'SPECI') $pos++;
89		- if (strlen($pieces[$pos]) != 4) $pos++;
	90	+ if ($pieces[0] == 'METAR') {
	91	+ $pos++;
	92	+ } elseif ($pieces[0] == 'SPECI') {
	93	+ $pos++;
	94	+ }
	95	+ if (strlen($pieces[$pos]) != 4) {
	96	+ $pos++;
	97	+ }
90	98	$result = array();
91	99	$result['location'] = $pieces[$pos];
92	100	$pos++;
		@@ -95,16 +103,26 @@ discard block
		block discarded – undo
95	103	$c = count($pieces);
96	104	for($pos++; $pos < $c; $pos++) {
97	105	$piece = $pieces[$pos];
98		- if ($piece == 'RMK') break;
99		- if ($piece == 'AUTO') $result['auto'] = true;
100		- if ($piece == 'COR') $result['correction'] = true;
	106	+ if ($piece == 'RMK') {
	107	+ break;
	108	+ }
	109	+ if ($piece == 'AUTO') {
	110	+ $result['auto'] = true;
	111	+ }
	112	+ if ($piece == 'COR') {
	113	+ $result['correction'] = true;
	114	+ }
101	115	// Wind Speed
102	116	if (preg_match('#(VRB\|\d\d\d)(\d\d)(?:G(\d\d))?(KT\|MPS\|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
103	117	$result['wind']['direction'] = (float)$matches[1];
104	118	$result['wind']['unit'] = $matches[4];
105		- if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
106		- elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
107		- elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
	119	+ if ($result['wind']['unit'] == 'KT') {
	120	+ $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
	121	+ } elseif ($result['wind']['unit'] == 'KPH') {
	122	+ $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
	123	+ } elseif ($result['wind']['unit'] == 'MPS') {
	124	+ $result['wind']['speed'] = round(((float)$matches[2]),2);
	125	+ }
108	126	$result['wind']['gust'] = (float)$matches[3];
109	127	$result['wind']['unit'] = $matches[4];
110	128	$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
		@@ -186,14 +204,23 @@ discard block
		block discarded – undo
186	204	//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
187	205	$type = $matches[1];
188	206	$cloud = array();
189		- if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
190		- elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
191		- elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
192		- elseif ($type == 'FEW') $cloud['type'] = 'Few';
193		- elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
194		- elseif ($type == 'BKN') $cloud['type'] = 'Broken';
195		- elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
196		- elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
	207	+ if ($type == 'SKC') {
	208	+ $cloud['type'] = 'No cloud/Sky clear';
	209	+ } elseif ($type == 'CLR') {
	210	+ $cloud['type'] = 'No cloud below 12,000ft (3700m)';
	211	+ } elseif ($type == 'NSC') {
	212	+ $cloud['type'] = 'No significant cloud';
	213	+ } elseif ($type == 'FEW') {
	214	+ $cloud['type'] = 'Few';
	215	+ } elseif ($type == 'SCT') {
	216	+ $cloud['type'] = 'Scattered';
	217	+ } elseif ($type == 'BKN') {
	218	+ $cloud['type'] = 'Broken';
	219	+ } elseif ($type == 'OVC') {
	220	+ $cloud['type'] = 'Overcast/Full cloud coverage';
	221	+ } elseif ($type == 'VV') {
	222	+ $cloud['type'] = 'Vertical visibility';
	223	+ }
197	224	$cloud['type_code'] = $type;
198	225	$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
199	226	$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
		@@ -223,8 +250,11 @@ discard block
		block discarded – undo
223	250	if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
224	251	//echo $piece;
225	252	//print_r($matches);
226		- if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
227		- else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
	253	+ if (isset($matches[5])) {
	254	+ $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
	255	+ } else {
	256	+ $range = array('exact' => (float)$matches[2], 'unit' => 'M');
	257	+ }
228	258	if (isset($matches[3])) {
229	259	$range = Array(
230	260	'from' => (float)$matches[2],
		@@ -257,8 +287,11 @@ discard block
		block discarded – undo
257	287	if (isset($matches[3])) {
258	288	$text[] = $this->texts[$matches[3]];
259	289	}
260		- if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
261		- else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
	290	+ if (!isset($result['weather'])) {
	291	+ $result['weather'] = implode(' ', $text);
	292	+ } else {
	293	+ $result['weather'] = $result['weather'].' / '.implode(' ', $text);
	294	+ }
262	295	}
263	296	}
264	297	return $result;
		@@ -270,8 +303,11 @@ discard block
		block discarded – undo
270	303	if (isset($globalMETARcycle) && $globalMETARcycle) {
271	304	$query = "SELECT * FROM metar WHERE metar_location = :icao";
272	305	} else {
273		- if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
274		- else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
	306	+ if ($globalDBdriver == 'mysql') {
	307	+ $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
	308	+ } else {
	309	+ $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
	310	+ }
275	311	}
276	312	$query_values = array(':icao' => $icao);
277	313	try {
		@@ -326,7 +362,9 @@ discard block
		block discarded – undo
326	362
327	363	public function addMETARCycle() {
328	364	global $globalDebug, $globalIVAO, $globalTransaction;
329		- if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
	365	+ if (isset($globalDebug) && $globalDebug) {
	366	+ echo "Downloading METAR cycle...";
	367	+ }
330	368	date_default_timezone_set("UTC");
331	369	$Common = new Common();
332	370	if (isset($globalIVAO) && $globalIVAO) {
		@@ -339,33 +377,49 @@ discard block
		block discarded – undo
339	377	$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
340	378	}
341	379	if ($handle) {
342		- if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
	380	+ if (isset($globalDebug) && $globalDebug) {
	381	+ echo "Done - Updating DB...";
	382	+ }
343	383	$date = '';
344	384	//foreach(explode("\n",$cycle) as $line) {
345		- if ($globalTransaction) $this->db->beginTransaction();
	385	+ if ($globalTransaction) {
	386	+ $this->db->beginTransaction();
	387	+ }
346	388	while(($line = fgets($handle,4096)) !== false) {
347	389	if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
348	390	$date = $line;
349	391	} elseif ($line != '') {
350	392	//$this->parse($line);
351		- if ($date == '') $date = date('Y/m/d H:m');
	393	+ if ($date == '') {
	394	+ $date = date('Y/m/d H:m');
	395	+ }
352	396	$pos = 0;
353	397	$pieces = preg_split('/\s/',$line);
354		- if ($pieces[0] == 'METAR') $pos++;
355		- if (strlen($pieces[$pos]) != 4) $pos++;
	398	+ if ($pieces[0] == 'METAR') {
	399	+ $pos++;
	400	+ }
	401	+ if (strlen($pieces[$pos]) != 4) {
	402	+ $pos++;
	403	+ }
356	404	$location = $pieces[$pos];
357	405	echo $this->addMETAR($location,$line,$date);
358	406	}
359	407	}
360	408	fclose($handle);
361		- if ($globalTransaction) $this->db->commit();
	409	+ if ($globalTransaction) {
	410	+ $this->db->commit();
	411	+ }
	412	+ }
	413	+ if (isset($globalDebug) && $globalDebug) {
	414	+ echo "Done\n";
362	415	}
363		- if (isset($globalDebug) && $globalDebug) echo "Done\n";
364	416
365	417	}
366	418	public function downloadMETAR($icao) {
367	419	global $globalMETARurl;
368		- if ($globalMETARurl == '') return array();
	420	+ if ($globalMETARurl == '') {
	421	+ return array();
	422	+ }
369	423	date_default_timezone_set("UTC");
370	424	$Common = new Common();
371	425	$url = str_replace('{icao}',$icao,$globalMETARurl);
		@@ -379,16 +433,24 @@ discard block
		block discarded – undo
379	433	if ($line != '') {
380	434	//$this->parse($line);
381	435	//echo $line;
382		- if ($date == '') $date = date('Y/m/d H:m');
	436	+ if ($date == '') {
	437	+ $date = date('Y/m/d H:m');
	438	+ }
383	439	$pos = 0;
384	440	$pieces = preg_split('/\s/',$line);
385		- if ($pieces[0] == 'METAR') $pos++;
386		- if (strlen($pieces[$pos]) != 4) $pos++;
	441	+ if ($pieces[0] == 'METAR') {
	442	+ $pos++;
	443	+ }
	444	+ if (strlen($pieces[$pos]) != 4) {
	445	+ $pos++;
	446	+ }
387	447	$location = $pieces[$pos];
388	448	if (strlen($location == 4)) {
389	449	$this->addMETAR($location,$line,$date);
390	450	return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
391		- } else return array();
	451	+ } else {
	452	+ return array();
	453	+ }
392	454	}
393	455	//echo $line."\n";
394	456	}

Ysurac / FlightAirMap

Push — master ( 6c4f55...213543 )

Status

Category

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

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

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

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

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

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

Braces +110 added lines, -27 removed lines patch added patch discarded remove patch

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

Braces +100 added lines, -38 removed lines patch added patch discarded remove patch