Inspection of "Add filter for many functions" - Ysurac/FlightAirMap - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 0da4d1...d670f0 )

by Yannick

created 2016-11-02 13:37 UTC

Status

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

@@ -146,8 +146,7 @@
 block discarded – undo
             $obs_geodetic->lat = $qth->lat * Predict::de2ra;
             $obs_geodetic->alt = $qth->alt / 1000.0;
             $obs_geodetic->theta = 0;
-        }
-        else {
+        } else {
             $obs_geodetic->lon = 0.0;
             $obs_geodetic->lat = 0.0;
             $obs_geodetic->alt = 0.0;

Please login to merge, or discard this patch.

require/class.Satellite.php 1 patch

Braces +23 added lines, -9 removed lines patch added patch discarded remove patch

@@ -23,8 +23,11 @@  discard block
 block discarded – undo
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result[0];
-		else return array();
+		if (isset($result[0])) {
+			return $result[0];
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_types() {
 		$query = 'SELECT DISTINCT tle_type FROM tle ORDER BY tle_type';
@@ -35,8 +38,11 @@  discard block
 block discarded – undo
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_names() {
 		$query = 'SELECT DISTINCT tle_name, tle_type FROM tle';
@@ -47,8 +53,11 @@  discard block
 block discarded – undo
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	public function get_tle_names_type($type) {
 		$query = 'SELECT tle_name, tle_type FROM tle WHERE tle_type = :type ORDER BY tle_name';
@@ -59,8 +68,11 @@  discard block
 block discarded – undo
 			echo $e->getMessage();
 		}
 		$result = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (isset($result[0])) return $result;
-		else return array();
+		if (isset($result[0])) {
+			return $result;
+		} else {
+			return array();
+		}
 	}
 	
 	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
@@ -95,7 +107,9 @@  discard block
 block discarded – undo
 		$sat = new Predict_Sat($tle);
 		$predict = new Predict();
 		//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
-		if ($timestamp_begin == '') $timestamp_begin = time();
+		if ($timestamp_begin == '') {
+			$timestamp_begin = time();
+		}
 		if ($timestamp_end == '') {
 			$now = Predict_Time::unix2daynum($timestamp_begin);
 			//echo $now;

Please login to merge, or discard this patch.

install/class.settings.php 1 patch

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

@@ -54,7 +54,9 @@  discard block
 block discarded – undo
 								}
 							}
 							if (!isset($array_value)) {
-								if (!isset($arrayd_value)) $arrayd_value = '';
+								if (!isset($arrayd_value)) {
+									$arrayd_value = '';
+								}
 								//$array_value = "'".$key."' => array(".$arrayd_value.")";
 								$array_value = "array(".$arrayd_value.")";
 							} elseif (isset($arrayd_value)) {
@@ -71,7 +73,9 @@  discard block
 block discarded – undo
 						}
 					}
 				}
-				if (!isset($array_value)) $array_value = '';
+				if (!isset($array_value)) {
+					$array_value = '';
+				}
 				$replace = "\n".'\$'.$settingname." = array(".$array_value.")";
 				unset($array_value);
 			} else {

Please login to merge, or discard this patch.

header.php 1 patch

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

@@ -5,8 +5,11 @@  discard block
 block discarded – undo
 $file_path = pathinfo($_SERVER['SCRIPT_NAME']);
 $current_page = $file_path['filename'];
 date_default_timezone_set($globalTimezone);
-if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType'];
-else $MapType = $globalMapProvider;
+if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') {
+	$MapType = $_COOKIE['MapType'];
+} else {
+	$MapType = $globalMapProvider;
+}
 ?>
 <!DOCTYPE html>
 <html>
@@ -181,7 +184,13 @@  discard block
 block discarded – undo
 <script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) {
+	print '&latitude='.$latitude;
+}
+?><?php if(isset($longitude)) {
+	print '&longitude='.$longitude;
+}
+?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
 ?>
@@ -235,7 +244,13 @@  discard block
 block discarded – undo
 <script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
 <script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
 <script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) {
+	print '&latitude='.$latitude;
+}
+?><?php if(isset($longitude)) {
+	print '&longitude='.$longitude;
+}
+?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
 ?>
@@ -308,7 +323,12 @@  discard block
 block discarded – undo
         <span class="icon-bar"></span>
       </button>
       <a href="<?php print $globalURL; ?>/search" class="navbar-toggle navbar-toggle-search"><i class="fa fa-search"></i></a>
-      <a class="navbar-brand" href="<?php if ($globalURL == '') print '/'; else print $globalURL; ?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
+      <a class="navbar-brand" href="<?php if ($globalURL == '') {
+	print '/';
+} else {
+	print $globalURL;
+}
+?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
     </div>
     <div class="collapse navbar-collapse">
       <ul class="nav navbar-nav">
@@ -386,7 +406,9 @@  discard block
 block discarded – undo
   		        $alllang = $Language->getLanguages();
   		        foreach ($alllang as $key => $lang) {
   		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
+  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) {
+  		            	print ' selected ';
+  		            }
   		            print '>'.$lang[0].'</option>';
   		        }
   		    ?>
@@ -533,4 +555,7 @@  discard block
 block discarded – undo
 
 ?>
 
-<section class="container main-content <?php if (strtolower($current_page) == 'index') print 'index '; ?>clear">
+<section class="container main-content <?php if (strtolower($current_page) == 'index') {
+	print 'index ';
+}
+?>clear">

Please login to merge, or discard this patch.

aircraft.php 1 patch

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

@@ -16,7 +16,9 @@  discard block
 block discarded – undo
 	print '<h1>'._("Aircrafts Types").'</h1>';
 
 	$aircraft_types = $Stats->getAllAircraftTypes();
-	if (empty($aircraft_types) || $aircraft_types[0]['aircraft_manufacturer'] == '') $aircraft_types = $Spotter->getAllAircraftTypes();
+	if (empty($aircraft_types) || $aircraft_types[0]['aircraft_manufacturer'] == '') {
+		$aircraft_types = $Spotter->getAllAircraftTypes();
+	}
 	$previous = null;
 	print '<div class="alphabet-legend">';
 	foreach($aircraft_types as $value) {
@@ -24,7 +26,9 @@  discard block
 block discarded – undo
 		$firstLetter = substr($value['aircraft_manufacturer'], 0, 1);
 		if($previous !== $firstLetter)
 		{
-			if ($previous !== null) print ' | ';
+			if ($previous !== null) {
+				print ' | ';
+			}
 			print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
 		}
 		$previous = $firstLetter;
@@ -38,7 +42,9 @@  discard block
 block discarded – undo
 		{
 			if($previous !== $firstLetter)
 			{
-				if ($previous !== null) print '</div>';
+				if ($previous !== null) {
+					print '</div>';
+				}
 				print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
 			}
 			$previous = $firstLetter;

Please login to merge, or discard this patch.

table-output.php 1 patch

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

@@ -339,7 +339,9 @@  discard block
 block discarded – undo
 	if (isset($globalTimezone))
 	{
 		date_default_timezone_set($globalTimezone);
-	} else date_default_timezone_set('UTC');
+	} else {
+		date_default_timezone_set('UTC');
+	}
 	if ($showSpecial === true)
 	{
 		print '<tr class="special">'."\n";
@@ -358,8 +360,9 @@  discard block
 block discarded – undo
 			print '<td class="aircraft_thumbnail">'."\n";
 			
 			if ($spotter_item['image_source'] == 'planespotters') {
-				if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
-				else {
+				if ($spotter_item['image_source_website'] != '') {
+					$image_src = $spotter_item['image_source_website'];
+				} else {
 					$planespotter_url_array = explode("_", $spotter_item['image']);
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
@@ -372,7 +375,9 @@  discard block
 block discarded – undo
                         } else {
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
                     		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+                    		} else {
+                    			$image_thumbnail = $spotter_item['image_thumbnail'];
+                    		}
 				if (isset($spotter_item['airline_name'])) {
 					print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} else {
@@ -395,8 +400,9 @@  discard block
 block discarded – undo
 			print '<td class="aircraft_thumbnail">'."\n";
 			//print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
 			if ($spotter_item['image_source'] == 'planespotters') {
-				if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
-				else {
+				if ($spotter_item['image_source_website'] != '') {
+					$image_src = $spotter_item['image_source_website'];
+				} else {
 					$planespotter_url_array = explode("_", $spotter_array[0]['image']);
 					$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
                                         $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
@@ -413,7 +419,9 @@  discard block
 block discarded – undo
 			} else {
                     		if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') {
                     		$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
-                    		} else 	$image_thumbnail = $spotter_item['image_thumbnail'];
+                    		} else {
+                    			$image_thumbnail = $spotter_item['image_thumbnail'];
+                    		}
 				if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
 					print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">&copy; '.$spotter_item['image_copyright'].'</div>';
 				} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
@@ -494,15 +502,21 @@  discard block
 block discarded – undo
 	if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
 		if ($spotter_item['departure_airport_time'] > 2460) {
 			$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
-		} else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+		} else {
+			$departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
+		}
 		if ($spotter_item['real_departure_airport_time'] > 2460) {
 			$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
-		} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+		} else {
+			$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+		}
 		print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
 	} elseif (isset($spotter_item['real_departure_airport_time'])) {
 		if ($spotter_item['real_departure_airport_time'] > 2460) {
 			$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
-		} else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+		} else {
+			$real_departure_airport_time = $spotter_item['real_departure_airport_time'];
+		}
 		print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
 	} elseif (isset($spotter_item['departure_airport_time'])) {
 		if ($spotter_item['departure_airport_time'] > 2460) {
@@ -524,7 +538,9 @@  discard block
 block discarded – undo
 				$longitude = $spotter_item['longitude'];
 			}
 			$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
-		} else $distance = '';
+		} else {
+			$distance = '';
+		}
 		if ($distance != '') {
 		    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 			    echo '<br/><i>'.round($distance*0.539957).' nm</i>';
@@ -549,7 +565,9 @@  discard block
 block discarded – undo
 	} else {
 		if (isset($spotter_item['real_arrival_airport']) && $spotter_item['real_arrival_airport'] != $spotter_item['arrival_airport']) {
 			print '<span class="nomobile">Scheduled : <a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a></span>'."\n";
-			if (!isset($Spotter)) $Spotter = new Spotter();
+			if (!isset($Spotter)) {
+				$Spotter = new Spotter();
+			}
 			$arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 			print '<br /><span class="nomobile">'._("Real:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$arrival_airport_info[0]['city'].','.$arrival_airport_info[0]['country'].' ('.$spotter_item['real_arrival_airport'].')</a></span>'."\n";
 			print '<span class="mobile">'._("Scheduled:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$spotter_item['real_arrival_airport'].'</a></span>'."\n";
@@ -565,20 +583,28 @@  discard block
 block discarded – undo
 	if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
 		if ($spotter_item['arrival_airport_time'] > 2460) {
 			$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
-		} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
+		} else {
+			$arrival_airport_time = $spotter_item['arrival_airport_time'];
+		}
 		if ($spotter_item['real_arrival_airport_time'] > 2460) {
 			$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
-		} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+		} else {
+			$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+		}
 		print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
 	} elseif (isset($spotter_item['real_arrival_airport_time'])) {
 		if ($spotter_item['real_arrival_airport_time'] > 2460) {
 			$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
-		} else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+		} else {
+			$real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
+		}
 		print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
 	} elseif (isset($spotter_item['arrival_airport_time'])) {
 		if ($spotter_item['arrival_airport_time'] > 2460) {
 			$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
-		} else $arrival_airport_time = $spotter_item['arrival_airport_time'];
+		} else {
+			$arrival_airport_time = $spotter_item['arrival_airport_time'];
+		}
 		print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
 	}
 	if (!isset($spotter_item['real_arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
@@ -591,7 +617,9 @@  discard block
 block discarded – undo
 				$longitude = $spotter_item['longitude'];
 			}
 			$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
-		} else $distance = '';
+		} else {
+			$distance = '';
+		}
 		if ($distance != '') {
 		    if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
 			    echo '<br/><i>'.round($distance*0.539957).' nm</i>';

Please login to merge, or discard this patch.

footer.php 1 patch

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

@@ -9,7 +9,10 @@
 block discarded – undo
 	<?php
 	    }
 	?>
-	<span>Developed in Barrie by <a href="http://mtru.nz/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) print $globalURL; ?>/about#source">Source &amp; Credits</a></span> - <span><a href="https://github.com/Ysurac/FlightAirMap/issues" target="_blank">Report any issues</a></span>
+	<span>Developed in Barrie by <a href="http://mtru.nz/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) {
+	print $globalURL;
+}
+?>/about#source">Source &amp; Credits</a></span> - <span><a href="https://github.com/Ysurac/FlightAirMap/issues" target="_blank">Report any issues</a></span>
 </footer>
 
 <div class="notifications bottom-left"></div>

Please login to merge, or discard this patch.

install/class.update_schema.php 1 patch

Braces +220 added lines, -82 removed lines patch added patch discarded remove patch

@@ -258,7 +258,9 @@  discard block
 block discarded – undo
     		// Update table countries
     		if ($Connection->tableExists('airspace')) {
     		    $error .= update_db::update_countries();
-		    if ($error != '') return $error;
+		    if ($error != '') {
+		    	return $error;
+		    }
 		}
 		// Update schema_version to 7
 		$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
@@ -314,7 +316,9 @@  discard block
 block discarded – undo
     		$error = '';
     		// Update table aircraft
 		$error .= create_db::import_file('../db/source_location.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		// Update schema_version to 6
 		$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
         	try {
@@ -331,7 +335,9 @@  discard block
 block discarded – undo
     		$error = '';
     		// Update table aircraft
 		$error .= create_db::import_file('../db/notam.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "DELETE FROM config WHERE name = 'last_update_db';
                         INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
                         DELETE FROM config WHERE name = 'last_update_notam_db';
@@ -365,7 +371,9 @@  discard block
 block discarded – undo
 		$error = '';
     		// Update table atc
 		$error .= create_db::import_file('../db/atc.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
         	try {
@@ -389,13 +397,21 @@  discard block
 block discarded – undo
 		$error = '';
     		// Add tables
 		$error .= create_db::import_file('../db/aircraft_owner.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/metar.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/taf.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/airport.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
         	try {
@@ -469,19 +485,33 @@  discard block
 block discarded – undo
 		$error = '';
     		// Add tables
 		$error .= create_db::import_file('../db/stats.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_aircraft.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_airline.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_airport.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_owner.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/stats_pilot.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$error .= create_db::import_file('../db/spotter_archive_output.sql');
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		
 		$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
         	try {
@@ -521,7 +551,9 @@  discard block
 block discarded – undo
     		// Add tables
     		if (!$Connection->tableExists('stats_flight')) {
 			$error .= create_db::import_file('../db/stats_flight.sql');
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
         	try {
@@ -545,7 +577,9 @@  discard block
 block discarded – undo
     		} catch(PDOException $e) {
 		    return "error (update stats) : ".$e->getMessage()."\n";
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -566,7 +600,9 @@  discard block
 block discarded – undo
     		if (!$Connection->tableExists('stats_callsign')) {
 			$error .= create_db::import_file('../db/stats_callsign.sql');
 		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -584,7 +620,9 @@  discard block
 block discarded – undo
     		if (!$Connection->tableExists('stats_country')) {
 			$error .= create_db::import_file('../db/stats_country.sql');
 		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -607,7 +645,9 @@  discard block
 block discarded – undo
 			    return "error (update stats) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -623,7 +663,9 @@  discard block
 block discarded – undo
 		$error = '';
     		// Update airport table
 		$error .= create_db::import_file('../db/airport.sql');
-		if ($error != '') return 'Import airport.sql : '.$error;
+		if ($error != '') {
+			return 'Import airport.sql : '.$error;
+		}
 		// Remove primary key on Spotter_Archive
 		$query = "alter table spotter_archive drop spotter_archive_id";
         	try {
@@ -699,7 +741,9 @@  discard block
 block discarded – undo
 				return "error (add source_name column) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
         	try {
             	    $sth = $Connection->db->prepare($query);
@@ -717,7 +761,9 @@  discard block
 block discarded – undo
     		// Update airline table
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$error .= create_db::import_file('../db/airlines.sql');
-			if ($error != '') return 'Import airlines.sql : '.$error;
+			if ($error != '') {
+				return 'Import airlines.sql : '.$error;
+			}
 		}
 		if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
 			// Add column over_country
@@ -729,7 +775,9 @@  discard block
 block discarded – undo
 				return "error (add over_country) : ".$e->getMessage()."\n";
     			}
     		}
-		if ($error != '') return $error;
+		if ($error != '') {
+			return $error;
+		}
 		/*
     		if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			// Force update ModeS (this will put type_flight data
@@ -759,7 +807,9 @@  discard block
 block discarded – undo
 			} catch(PDOException $e) {
 				return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
 			}
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
         	try {
@@ -782,7 +832,9 @@  discard block
 block discarded – undo
 			} else {
 				$error .= create_db::import_file('../db/pgsql/stats_source.sql');
 			}
-			if ($error != '') return $error;
+			if ($error != '') {
+				return $error;
+			}
 		}
 		$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
         	try {
@@ -804,12 +856,16 @@  discard block
 block discarded – undo
 		if ($globalDBdriver == 'mysql') {
 			if (!$Connection->tableExists('tle')) {
 				$error .= create_db::import_file('../db/tle.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 		} else {
 			if (!$Connection->tableExists('tle')) {
 				$error .= create_db::import_file('../db/pgsql/tle.sql');
-				if ($error != '') return $error;
+				if ($error != '') {
+					return $error;
+				}
 			}
 			$query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)";
 			try {
@@ -849,7 +905,9 @@  discard block
 block discarded – undo
 		} else {
 			$error .= create_db::import_file('../db/pgsql/airlines.sql');
 		}
-		if ($error != '') return 'Import airlines.sql : '.$error;
+		if ($error != '') {
+			return 'Import airlines.sql : '.$error;
+		}
 		if (!$Connection->checkColumnName('airlines','forsource')) {
 			// Add forsource to airlines
 			$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
@@ -1102,8 +1160,11 @@  discard block
 block discarded – undo
     	    if ($Connection->tableExists('aircraft')) {
     		if (!$Connection->tableExists('config')) {
     		    $version = '1';
-    		    if ($update) return self::update_from_1();
-    		    else return $version;
+    		    if ($update) {
+    		    	return self::update_from_1();
+    		    } else {
+    		    	return $version;
+    		    }
 		} else {
     		    $Connection = new Connection();
 		    $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
@@ -1117,106 +1178,183 @@  discard block
 block discarded – undo
     		    if ($update) {
     			if ($result['value'] == '2') {
     			    $error = self::update_from_2();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '3') {
     			    $error = self::update_from_3();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '4') {
     			    $error = self::update_from_4();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '5') {
     			    $error = self::update_from_5();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '6') {
     			    $error = self::update_from_6();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '7') {
     			    $error = self::update_from_7();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '8') {
     			    $error = self::update_from_8();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '9') {
     			    $error = self::update_from_9();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '10') {
     			    $error = self::update_from_10();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '11') {
     			    $error = self::update_from_11();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '12') {
     			    $error = self::update_from_12();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '13') {
     			    $error = self::update_from_13();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '14') {
     			    $error = self::update_from_14();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '15') {
     			    $error = self::update_from_15();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '16') {
     			    $error = self::update_from_16();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '17') {
     			    $error = self::update_from_17();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '18') {
     			    $error = self::update_from_18();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '19') {
     			    $error = self::update_from_19();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '20') {
     			    $error = self::update_from_20();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '21') {
     			    $error = self::update_from_21();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '22') {
     			    $error = self::update_from_22();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '23') {
     			    $error = self::update_from_23();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '24') {
     			    $error = self::update_from_24();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
     			} elseif ($result['value'] == '25') {
     			    $error = self::update_from_25();
-    			    if ($error != '') return $error;
-    			    else return self::check_version(true);
-    			} else return '';
+    			    if ($error != '') {
+    			    	return $error;
+    			    } else {
+    			    	return self::check_version(true);
+    			    }
+    			} else {
+    				return '';
+    			}
+    		    } else {
+    		    	return $result['value'];
     		    }
-    		    else return $result['value'];
 		}
 		
-	    } else return $version;
+	    } else {
+	    	return $version;
+	    }
     	}
     	
 }

Please login to merge, or discard this patch.

index.php 1 patch

Braces +347 added lines, -94 removed lines patch added patch discarded remove patch

@@ -108,11 +108,26 @@  discard block
 block discarded – undo
 				<li><div class="checkbox"><label><input type="checkbox" name="notam" value="1" onclick="showNotam();" /><?php echo _("NOTAM"); ?></label></div></li>
 				<li><?php echo _("NOTAM scope:"); ?>
 					<select class="selectpicker" onchange="notamscope(this);">
-						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') print ' selected'; ?>>All</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') print ' selected'; ?>>Airport/Enroute warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') print ' selected'; ?>>Airport warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') print ' selected'; ?>>Navigation warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') print ' selected'; ?>>Enroute warning</option>
+						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') {
+	print ' selected';
+}
+?>>All</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') {
+	print ' selected';
+}
+?>>Airport/Enroute warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') {
+	print ' selected';
+}
+?>>Airport warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') {
+	print ' selected';
+}
+?>>Navigation warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') {
+	print ' selected';
+}
+?>>Enroute warning</option>
 					</select
 				</li>
 <?php
@@ -133,7 +148,10 @@  discard block
 block discarded – undo
 		        <div class="form-group">
 			    <label>From (UTC):</label>
 		            <div class='input-group date' id='datetimepicker1'>
-            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_COOKIE['archive_begin'])) print date("d/m/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
+            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_COOKIE['archive_begin'])) {
+	print date("d/m/Y h:i a",$_COOKIE['archive_begin']);
+}
+?>" required />
 		                <span class="input-group-addon">
             			    <span class="glyphicon glyphicon-calendar"></span>
 		                </span>
@@ -142,7 +160,10 @@  discard block
 block discarded – undo
 		        <div class="form-group">
 			    <label>To (UTC):</label>
 		            <div class='input-group date' id='datetimepicker2'>
-		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_COOKIE['archive_end'])) print date("d/m/Y h:i a",$_COOKIE['archive_end']); ?>" />
+		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_COOKIE['archive_end'])) {
+	print date("d/m/Y h:i a",$_COOKIE['archive_end']);
+}
+?>" />
             			<span class="input-group-addon">
 		                    <span class="glyphicon glyphicon-calendar"></span>
             			</span>
@@ -165,8 +186,18 @@  discard block
 block discarded – undo
 
 		    <li><?php echo _("Playback speed:"); ?>
 			<div class="range">
-			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?>">
-			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output>
+			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_COOKIE['archive_speed'])) {
+	print $_COOKIE['archive_speed'];
+} else {
+	print '1';
+}
+?>">
+			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) {
+	print $_COOKIE['archive_speed'];
+} else {
+	print '1';
+}
+?></output>
 			</div>
 		    </li>
 
@@ -187,15 +218,27 @@  discard block
 block discarded – undo
 		    <li><?php echo _("Type of Map:"); ?>
 			<select  class="selectpicker" onchange="mapType(this);">
 			    <?php
-				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
-				else $MapType = $_COOKIE['MapType'];
+				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') {
+					$MapType = $globalMapProvider;
+				} else {
+					$MapType = $_COOKIE['MapType'];
+				}
 			    ?>
 			    <?php
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
 			    ?>
-			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
-			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
-			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
+			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') {
+	print ' selected';
+}
+?>>Bing-Aerial</option>
+			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') {
+	print ' selected';
+}
+?>>Bing-Hybrid</option>
+			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') {
+	print ' selected';
+}
+?>>Bing-Road</option>
 			    <?php
 				}
 			    ?>
@@ -205,56 +248,131 @@  discard block
 block discarded – undo
 			    <?php
 				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
 			    ?>
-			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
-			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
-			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
+			    <option value="Here-Aerial"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Aerial</option>
+			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Hybrid</option>
+			    <option value="Here-Road"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Road</option>
 			    <?php
 				    }
 			    ?>
 			    <?php
 				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
 			    ?>
-			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
-			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
-			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
-			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
+			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') {
+	print ' selected';
+}
+?>>Google Roadmap</option>
+			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') {
+	print ' selected';
+}
+?>>Google Satellite</option>
+			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') {
+	print ' selected';
+}
+?>>Google Hybrid</option>
+			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') {
+	print ' selected';
+}
+?>>Google Terrain</option>
 			    <?php
 				    }
 			    ?>
 			    <?php
 				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
 			    ?>
-			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
-			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
-			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
+			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') {
+	print ' selected';
+}
+?>>MapQuest-OSM</option>
+			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') {
+	print ' selected';
+}
+?>>MapQuest-Aerial</option>
+			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') {
+	print ' selected';
+}
+?>>MapQuest-Hybrid</option>
 			    <?php
 				    }
 			    ?>
-			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
+			    <option value="Yandex"<?php if ($MapType == 'Yandex') {
+	print ' selected';
+}
+?>>Yandex</option>
 			    <?php
 				}
 			    ?>
 			    <?php
 				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
-					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
-					else $MapBoxId = $_COOKIE['MapTypeId'];
+					if (!isset($_COOKIE['MapTypeId'])) {
+						$MapBoxId = 'default';
+					} else {
+						$MapBoxId = $_COOKIE['MapTypeId'];
+					}
 			    ?>
-			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
-			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
-			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
-			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option>
-			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option>
-			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option>
-			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option>
-			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option>
-			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option>
-			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option>
-			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
-			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
+			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') {
+	print ' selected';
+}
+?>>Mapbox default</option>
+			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') {
+	print ' selected';
+}
+?>>Mapbox streets</option>
+			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') {
+	print ' selected';
+}
+?>>Mapbox light</option>
+			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') {
+	print ' selected';
+}
+?>>Mapbox dark</option>
+			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') {
+	print ' selected';
+}
+?>>Mapbox satellite</option>
+			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') {
+	print ' selected';
+}
+?>>Mapbox streets-satellite</option>
+			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') {
+	print ' selected';
+}
+?>>Mapbox streets-basic</option>
+			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') {
+	print ' selected';
+}
+?>>Mapbox comic</option>
+			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') {
+	print ' selected';
+}
+?>>Mapbox outdoors</option>
+			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') {
+	print ' selected';
+}
+?>>Mapbox pencil</option>
+			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') {
+	print ' selected';
+}
+?>>Mapbox pirates</option>
+			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') {
+	print ' selected';
+}
+?>>Mapbox emerald</option>
 			    <?php
 				    }
 			    ?>
-			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
+			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') {
+	print ' selected';
+}
+?>>OpenStreetMap</option>
 			</select>
 		    </li>
 <?php
@@ -262,9 +380,18 @@  discard block
 block discarded – undo
 ?>
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
-			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option>
-			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option>
-			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option>
+			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') {
+	print ' selected';
+}
+?>>stk terrain</option>
+			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') {
+	print ' selected';
+}
+?>>ellipsoid</option>
+			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') {
+	print ' selected';
+}
+?>>vr terrain</option>
 			</select>
 		    </li>
 <?php
@@ -274,18 +401,36 @@  discard block
 block discarded – undo
     if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 		    
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || !isset($_COOKIE['flightpath'])) print 'checked'; ?> ><?php echo _("Display flight path"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || !isset($_COOKIE['MapRoute'])) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true') || !isset($_COOKIE['flightpath'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight path"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || !isset($_COOKIE['MapRoute'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight route on click"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) {
+	print 'checked';
+}
+?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
 <?php
     }
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true') print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Display airports on map"); ?></label></div></li>
 <?php
     if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Show mini-map"); ?></label></div></li>
 <?php
     }
 ?>
@@ -294,17 +439,25 @@  discard block
 block discarded – undo
 			if (function_exists('array_column')) {
 			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
 		    ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
 			    }
 			} elseif (isset($globalSources)) {
 			    $dispolar = false;
 			    foreach ($globalSources as $testsource) {
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
+			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) {
+			        	$dispolar = true;
+			        }
 			    }
 			    if ($dispolar) {
 		    ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
 			    }
 		        }
@@ -316,12 +469,22 @@  discard block
 block discarded – undo
 		    <?php
 		        if (extension_loaded('gd') && function_exists('gd_info')) {
 		    ?>
-		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
+		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
 		    <?php 
 			if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
 		    ?>
 		    <li><?php echo _("Aircraft icon color:"); ?>
-			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
+	print $_COOKIE['IconColor'];
+} elseif (isset($globalAircraftIconColor)) {
+	print $globalAircraftIconColor;
+} else {
+	print '1a3151';
+}
+?>">
 		    </li>
 		    <?php
 			    }
@@ -329,8 +492,22 @@  discard block
 block discarded – undo
 		    ?>
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
 			<div class="range">
-			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
-			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output>
+			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) {
+	print $_COOKIE['AirportZoom'];
+} elseif (isset($globalAirportZoom)) {
+	print $globalAirportZoom;
+} else {
+	print '7';
+}
+?>">
+			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) {
+	print $_COOKIE['AirportZoom'];
+} elseif (isset($globalAirportZoom)) {
+	print $globalAirportZoom;
+} else {
+	print '7';
+}
+?></output>
 			</div>
 		    </li>
 <?php
@@ -339,9 +516,18 @@  discard block
 block discarded – undo
 		    <?php
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
 		    ?>
-			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
-			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
-			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
+			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
+			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
+			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
 		    <?php
 			}
 		    ?>
@@ -349,10 +535,16 @@  discard block
 block discarded – undo
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
 		    ?>
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
-			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
+			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
 			<?php } ?>
 			<?php if (isset($globalAPRS) && $globalAPRS) { ?>
-			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) print 'checked'; ?> ><?php echo _("Display APRS data"); ?></label></div></li>
+			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display APRS data"); ?></label></div></li>
 			<?php } ?>
 		    <?php
 			}
@@ -363,7 +555,9 @@  discard block
 block discarded – undo
 				$Spotter = new Spotter();
 				foreach($Spotter->getAllAirlineNames() as $airline) {
 					$airline_name = $airline['airline_name'];
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
+					if (strlen($airline_name) > 30) {
+						$airline_name = substr($airline_name,0,30).'...';
+					}
 					if (isset($_COOKIE['Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['Airlines']))) {
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
 					} else {
@@ -398,10 +592,22 @@  discard block
 block discarded – undo
 		    ?>
 		    <li><?php echo _("Display airlines of type:"); ?>
 			<select class="selectpicker" onchange="airlinestype(this);">
-			    <option value="all"<?php if (!isset($_COOKIE['airlinestype']) || $_COOKIE['airlinestype'] == 'all' || $_COOKIE['airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
-			    <option value="passenger"<?php if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option>
-			    <option value="cargo"<?php if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option>
-			    <option value="military"<?php if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option>
+			    <option value="all"<?php if (!isset($_COOKIE['airlinestype']) || $_COOKIE['airlinestype'] == 'all' || $_COOKIE['airlinestype'] == '') {
+	echo ' selected';
+}
+?>><?php echo _("All"); ?></option>
+			    <option value="passenger"<?php if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] == 'passenger') {
+	echo ' selected';
+}
+?>><?php echo _("Passenger"); ?></option>
+			    <option value="cargo"<?php if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] == 'cargo') {
+	echo ' selected';
+}
+?>><?php echo _("Cargo"); ?></option>
+			    <option value="military"<?php if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] == 'military') {
+	echo ' selected';
+}
+?>><?php echo _("Military"); ?></option>
 			</select>
 		    </li>
 		    <?php
@@ -409,22 +615,46 @@  discard block
 block discarded – undo
 		    ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
-			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option>
-			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option>
-			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option>
+			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
+	echo ' selected';
+}
+?>>km</option>
+			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
+	echo ' selected';
+}
+?>>nm</option>
+			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
+	echo ' selected';
+}
+?>>mi</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Altitude unit:"); ?>
 			<select class="selectpicker" onchange="unitaltitude(this);">
-			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option>
-			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option>
+			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) {
+	echo ' selected';
+}
+?>>m</option>
+			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
+	echo ' selected';
+}
+?>>feet</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Speed unit:"); ?>
 			<select class="selectpicker" onchange="unitspeed(this);">
-			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) echo ' selected'; ?>>km/h</option>
-			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option>
-			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option>
+			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) {
+	echo ' selected';
+}
+?>>km/h</option>
+			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
+	echo ' selected';
+}
+?>>mph</option>
+			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) {
+	echo ' selected';
+}
+?>>knots</option>
 		        </select>
 		    </li>
 		</ul>
@@ -438,7 +668,10 @@  discard block
 block discarded – undo
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
 	    <form>
 		<ul>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if (isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') print 'checked'; ?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if (isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
 		    <li><?php echo _("Type:"); ?>
 			<select class="selectpicker" multiple onchange="sattypes(this);">
 			    <?php
@@ -446,25 +679,45 @@  discard block
 block discarded – undo
 				$types = $Satellite->get_tle_types();
 				foreach ($types as $type) {
 					$type_name = $type['tle_type'];
-					if ($type_name == 'musson') $type_name = 'Russian LEO Navigation';
-					else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System';
-					else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System';
-					else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational';
-					else if ($type_name == 'gps-ops') $type_name = 'GPS Operational';
-					else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System';
-					else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System';
-					else if ($type_name == 'sarsat') $type_name = 'Search & Rescue';
-					else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring';
-					else if ($type_name == 'resource') $type_name = 'Earth Resources';
-					else if ($type_name == 'stations') $type_name = 'Space Stations';
-					else if ($type_name == 'geo') $type_name = 'Geostationary';
-					else if ($type_name == 'amateur') $type_name = 'Amateur Radio';
-					else if ($type_name == 'x-comm') $type_name = 'Experimental';
-					else if ($type_name == 'other-comm') $type_name = 'Other Comm';
-					else if ($type_name == 'science') $type_name = 'Space & Earth Science';
-					else if ($type_name == 'military') $type_name = 'Miscellaneous Military';
-					else if ($type_name == 'radar') $type_name = 'Radar Calibration';
-					else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches';
+					if ($type_name == 'musson') {
+						$type_name = 'Russian LEO Navigation';
+					} else if ($type_name == 'nnss') {
+						$type_name = 'Navi Navigation Satellite System';
+					} else if ($type_name == 'sbas') {
+						$type_name = 'Satellite-Based Augmentation System';
+					} else if ($type_name == 'glo-ops') {
+						$type_name = 'Glonass Operational';
+					} else if ($type_name == 'gps-ops') {
+						$type_name = 'GPS Operational';
+					} else if ($type_name == 'argos') {
+						$type_name = 'ARGOS Data Collection System';
+					} else if ($type_name == 'tdrss') {
+						$type_name = 'Tracking and Data Relay Satellite System';
+					} else if ($type_name == 'sarsat') {
+						$type_name = 'Search & Rescue';
+					} else if ($type_name == 'dmc') {
+						$type_name = 'Disaster Monitoring';
+					} else if ($type_name == 'resource') {
+						$type_name = 'Earth Resources';
+					} else if ($type_name == 'stations') {
+						$type_name = 'Space Stations';
+					} else if ($type_name == 'geo') {
+						$type_name = 'Geostationary';
+					} else if ($type_name == 'amateur') {
+						$type_name = 'Amateur Radio';
+					} else if ($type_name == 'x-comm') {
+						$type_name = 'Experimental';
+					} else if ($type_name == 'other-comm') {
+						$type_name = 'Other Comm';
+					} else if ($type_name == 'science') {
+						$type_name = 'Space & Earth Science';
+					} else if ($type_name == 'military') {
+						$type_name = 'Miscellaneous Military';
+					} else if ($type_name == 'radar') {
+						$type_name = 'Radar Calibration';
+					} else if ($type_name == 'tle-new') {
+						$type_name = 'Last 30 days launches';
+					}
 					
 					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) {
 						print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>';

Please login to merge, or discard this patch.

		@@ -146,8 +146,7 @@
		block discarded – undo
146	146	$obs_geodetic->lat = $qth->lat * Predict::de2ra;
147	147	$obs_geodetic->alt = $qth->alt / 1000.0;
148	148	$obs_geodetic->theta = 0;
149		- }
150		- else {
	149	+ } else {
151	150	$obs_geodetic->lon = 0.0;
152	151	$obs_geodetic->lat = 0.0;
153	152	$obs_geodetic->alt = 0.0;

		@@ -23,8 +23,11 @@ discard block
		block discarded – undo
23	23	echo $e->getMessage();
24	24	}
25	25	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
26		- if (isset($result[0])) return $result[0];
27		- else return array();
	26	+ if (isset($result[0])) {
	27	+ return $result[0];
	28	+ } else {
	29	+ return array();
	30	+ }
28	31	}
29	32	public function get_tle_types() {
30	33	$query = 'SELECT DISTINCT tle_type FROM tle ORDER BY tle_type';
		@@ -35,8 +38,11 @@ discard block
		block discarded – undo
35	38	echo $e->getMessage();
36	39	}
37	40	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
38		- if (isset($result[0])) return $result;
39		- else return array();
	41	+ if (isset($result[0])) {
	42	+ return $result;
	43	+ } else {
	44	+ return array();
	45	+ }
40	46	}
41	47	public function get_tle_names() {
42	48	$query = 'SELECT DISTINCT tle_name, tle_type FROM tle';
		@@ -47,8 +53,11 @@ discard block
		block discarded – undo
47	53	echo $e->getMessage();
48	54	}
49	55	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
50		- if (isset($result[0])) return $result;
51		- else return array();
	56	+ if (isset($result[0])) {
	57	+ return $result;
	58	+ } else {
	59	+ return array();
	60	+ }
52	61	}
53	62	public function get_tle_names_type($type) {
54	63	$query = 'SELECT tle_name, tle_type FROM tle WHERE tle_type = :type ORDER BY tle_name';
		@@ -59,8 +68,11 @@ discard block
		block discarded – undo
59	68	echo $e->getMessage();
60	69	}
61	70	$result = $sth->fetchAll(PDO::FETCH_ASSOC);
62		- if (isset($result[0])) return $result;
63		- else return array();
	71	+ if (isset($result[0])) {
	72	+ return $result;
	73	+ } else {
	74	+ return array();
	75	+ }
64	76	}
65	77
66	78	public function position_all($timestamp_begin = '',$timestamp_end = '',$second = 10) {
		@@ -95,7 +107,9 @@ discard block
		block discarded – undo
95	107	$sat = new Predict_Sat($tle);
96	108	$predict = new Predict();
97	109	//if ($timestamp == '') $now = Predict_Time::get_current_daynum();
98		- if ($timestamp_begin == '') $timestamp_begin = time();
	110	+ if ($timestamp_begin == '') {
	111	+ $timestamp_begin = time();
	112	+ }
99	113	if ($timestamp_end == '') {
100	114	$now = Predict_Time::unix2daynum($timestamp_begin);
101	115	//echo $now;

		@@ -54,7 +54,9 @@ discard block
		block discarded – undo
54	54	}
55	55	}
56	56	if (!isset($array_value)) {
57		- if (!isset($arrayd_value)) $arrayd_value = '';
	57	+ if (!isset($arrayd_value)) {
	58	+ $arrayd_value = '';
	59	+ }
58	60	//$array_value = "'".$key."' => array(".$arrayd_value.")";
59	61	$array_value = "array(".$arrayd_value.")";
60	62	} elseif (isset($arrayd_value)) {
		@@ -71,7 +73,9 @@ discard block
		block discarded – undo
71	73	}
72	74	}
73	75	}
74		- if (!isset($array_value)) $array_value = '';
	76	+ if (!isset($array_value)) {
	77	+ $array_value = '';
	78	+ }
75	79	$replace = "\n".'\$'.$settingname." = array(".$array_value.")";
76	80	unset($array_value);
77	81	} else {

		@@ -5,8 +5,11 @@ discard block
		block discarded – undo
5	5	$file_path = pathinfo($_SERVER['SCRIPT_NAME']);
6	6	$current_page = $file_path['filename'];
7	7	date_default_timezone_set($globalTimezone);
8		-if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') $MapType = $_COOKIE['MapType'];
9		-else $MapType = $globalMapProvider;
	8	+if (isset($_COOKIE['MapType']) && $_COOKIE['MapType'] != '') {
	9	+ $MapType = $_COOKIE['MapType'];
	10	+} else {
	11	+ $MapType = $globalMapProvider;
	12	+}
10	13	?>
11	14	<!DOCTYPE html>
12	15	<html>
		@@ -181,7 +184,13 @@ discard block
		block discarded – undo
181	184	<script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
182	185	<script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
183	186	<script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
184		-<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
	187	+<script src="<?php print $globalURL; ?>/js/map.js.php?ident=<?php print $ident; ?><?php if(isset($latitude)) {
	188	+ print '&latitude='.$latitude;
	189	+}
	190	+?><?php if(isset($longitude)) {
	191	+ print '&longitude='.$longitude;
	192	+}
	193	+?>&<?php print time(); ?>"></script>
185	194	<?php
186	195	if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' \|\| $MapType == 'Google-Satellite' \|\| $MapType == 'Google-Hybrid' \|\| $MapType == 'Google-Terrain')) {
187	196	?>
		@@ -235,7 +244,13 @@ discard block
		block discarded – undo
235	244	<script src="<?php print $globalURL; ?>/js/Marker.Rotate.js"></script>
236	245	<script src="<?php print $globalURL; ?>/js/MovingMarker.js"></script>
237	246	<script src="<?php print $globalURL; ?>/js/jquery.idle.min.js"></script>
238		-<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) print '&latitude='.$latitude; ?><?php if(isset($longitude)) print '&longitude='.$longitude; ?>&<?php print time(); ?>"></script>
	247	+<script src="<?php print $globalURL; ?>/js/map.js.php?flightaware_id=<?php print $flightaware_id; ?><?php if(isset($latitude)) {
	248	+ print '&latitude='.$latitude;
	249	+}
	250	+?><?php if(isset($longitude)) {
	251	+ print '&longitude='.$longitude;
	252	+}
	253	+?>&<?php print time(); ?>"></script>
239	254	<?php
240	255	if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' \|\| $MapType == 'Google-Satellite' \|\| $MapType == 'Google-Hybrid' \|\| $MapType == 'Google-Terrain')) {
241	256	?>
		@@ -308,7 +323,12 @@ discard block
		block discarded – undo
308	323	<span class="icon-bar"></span>
309	324	</button>
310	325	<a href="<?php print $globalURL; ?>/search" class="navbar-toggle navbar-toggle-search"><i class="fa fa-search"></i></a>
311		- <a class="navbar-brand" href="<?php if ($globalURL == '') print '/'; else print $globalURL; ?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
	326	+ <a class="navbar-brand" href="<?php if ($globalURL == '') {
	327	+ print '/';
	328	+} else {
	329	+ print $globalURL;
	330	+}
	331	+?>"><img src="<?php print $globalURL.$logoURL; ?>" height="30px" /></a>
312	332	</div>
313	333	<div class="collapse navbar-collapse">
314	334	<ul class="nav navbar-nav">
		@@ -386,7 +406,9 @@ discard block
		block discarded – undo
386	406	$alllang = $Language->getLanguages();
387	407	foreach ($alllang as $key => $lang) {
388	408	print '<option value="'.$key.'"';
389		- if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
	409	+ if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) {
	410	+ print ' selected ';
	411	+ }
390	412	print '>'.$lang[0].'</option>';
391	413	}
392	414	?>
		@@ -533,4 +555,7 @@ discard block
		block discarded – undo
533	555
534	556	?>
535	557
536		-<section class="container main-content <?php if (strtolower($current_page) == 'index') print 'index '; ?>clear">
	558	+<section class="container main-content <?php if (strtolower($current_page) == 'index') {
	559	+ print 'index ';
	560	+}
	561	+?>clear">

		@@ -16,7 +16,9 @@ discard block
		block discarded – undo
16	16	print '<h1>'._("Aircrafts Types").'</h1>';
17	17
18	18	$aircraft_types = $Stats->getAllAircraftTypes();
19		- if (empty($aircraft_types) \|\| $aircraft_types[0]['aircraft_manufacturer'] == '') $aircraft_types = $Spotter->getAllAircraftTypes();
	19	+ if (empty($aircraft_types) \|\| $aircraft_types[0]['aircraft_manufacturer'] == '') {
	20	+ $aircraft_types = $Spotter->getAllAircraftTypes();
	21	+ }
20	22	$previous = null;
21	23	print '<div class="alphabet-legend">';
22	24	foreach($aircraft_types as $value) {
		@@ -24,7 +26,9 @@ discard block
		block discarded – undo
24	26	$firstLetter = substr($value['aircraft_manufacturer'], 0, 1);
25	27	if($previous !== $firstLetter)
26	28	{
27		- if ($previous !== null) print ' \| ';
	29	+ if ($previous !== null) {
	30	+ print ' \| ';
	31	+ }
28	32	print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>';
29	33	}
30	34	$previous = $firstLetter;
		@@ -38,7 +42,9 @@ discard block
		block discarded – undo
38	42	{
39	43	if($previous !== $firstLetter)
40	44	{
41		- if ($previous !== null) print '</div>';
	45	+ if ($previous !== null) {
	46	+ print '</div>';
	47	+ }
42	48	print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">';
43	49	}
44	50	$previous = $firstLetter;

		@@ -339,7 +339,9 @@ discard block
		block discarded – undo
339	339	if (isset($globalTimezone))
340	340	{
341	341	date_default_timezone_set($globalTimezone);
342		- } else date_default_timezone_set('UTC');
	342	+ } else {
	343	+ date_default_timezone_set('UTC');
	344	+ }
343	345	if ($showSpecial === true)
344	346	{
345	347	print '<tr class="special">'."\n";
		@@ -358,8 +360,9 @@ discard block
		block discarded – undo
358	360	print '<td class="aircraft_thumbnail">'."\n";
359	361
360	362	if ($spotter_item['image_source'] == 'planespotters') {
361		- if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
362		- else {
	363	+ if ($spotter_item['image_source_website'] != '') {
	364	+ $image_src = $spotter_item['image_source_website'];
	365	+ } else {
363	366	$planespotter_url_array = explode("_", $spotter_item['image']);
364	367	$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
365	368	$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
		@@ -372,7 +375,9 @@ discard block
		block discarded – undo
372	375	} else {
373	376	if ($spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart' \|\| $spotter_item['image_source'] == 'flickr') {
374	377	$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
375		- } else $image_thumbnail = $spotter_item['image_thumbnail'];
	378	+ } else {
	379	+ $image_thumbnail = $spotter_item['image_thumbnail'];
	380	+ }
376	381	if (isset($spotter_item['airline_name'])) {
377	382	print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>';
378	383	} else {
		@@ -395,8 +400,9 @@ discard block
		block discarded – undo
395	400	print '<td class="aircraft_thumbnail">'."\n";
396	401	//print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$spotter_item['image_thumbnail'].'" alt="Click to see more information about this flight" title="Click to see more information about this flight" width="100px" /></a>';
397	402	if ($spotter_item['image_source'] == 'planespotters') {
398		- if ($spotter_item['image_source_website'] != '') $image_src = $spotter_item['image_source_website'];
399		- else {
	403	+ if ($spotter_item['image_source_website'] != '') {
	404	+ $image_src = $spotter_item['image_source_website'];
	405	+ } else {
400	406	$planespotter_url_array = explode("_", $spotter_array[0]['image']);
401	407	$planespotter_id = str_replace(".jpg", "", $planespotter_url_array[1]);
402	408	$image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id;
		@@ -413,7 +419,9 @@ discard block
		block discarded – undo
413	419	} else {
414	420	if ($spotter_item['image_source'] == 'wikimedia' \|\| $spotter_item['image_source'] == 'devianart' \|\| $spotter_item['image_source'] == 'flickr') {
415	421	$image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']);
416		- } else $image_thumbnail = $spotter_item['image_thumbnail'];
	422	+ } else {
	423	+ $image_thumbnail = $spotter_item['image_thumbnail'];
	424	+ }
417	425	if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) {
418	426	print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>';
419	427	} elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) {
		@@ -494,15 +502,21 @@ discard block
		block discarded – undo
494	502	if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) {
495	503	if ($spotter_item['departure_airport_time'] > 2460) {
496	504	$departure_airport_time = date('H:m',$spotter_item['departure_airport_time']);
497		- } else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
	505	+ } else {
	506	+ $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2);
	507	+ }
498	508	if ($spotter_item['real_departure_airport_time'] > 2460) {
499	509	$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
500		- } else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
	510	+ } else {
	511	+ $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
	512	+ }
501	513	print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n";
502	514	} elseif (isset($spotter_item['real_departure_airport_time'])) {
503	515	if ($spotter_item['real_departure_airport_time'] > 2460) {
504	516	$real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']);
505		- } else $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
	517	+ } else {
	518	+ $real_departure_airport_time = $spotter_item['real_departure_airport_time'];
	519	+ }
506	520	print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n";
507	521	} elseif (isset($spotter_item['departure_airport_time'])) {
508	522	if ($spotter_item['departure_airport_time'] > 2460) {
		@@ -524,7 +538,9 @@ discard block
		block discarded – undo
524	538	$longitude = $spotter_item['longitude'];
525	539	}
526	540	$distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude);
527		- } else $distance = '';
	541	+ } else {
	542	+ $distance = '';
	543	+ }
528	544	if ($distance != '') {
529	545	if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') \|\| (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
530	546	echo '<br/><i>'.round($distance*0.539957).' nm</i>';
		@@ -549,7 +565,9 @@ discard block
		block discarded – undo
549	565	} else {
550	566	if (isset($spotter_item['real_arrival_airport']) && $spotter_item['real_arrival_airport'] != $spotter_item['arrival_airport']) {
551	567	print '<span class="nomobile">Scheduled : <a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'">'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].' ('.$spotter_item['arrival_airport'].')</a></span>'."\n";
552		- if (!isset($Spotter)) $Spotter = new Spotter();
	568	+ if (!isset($Spotter)) {
	569	+ $Spotter = new Spotter();
	570	+ }
553	571	$arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
554	572	print '<br /><span class="nomobile">'._("Real:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$arrival_airport_info[0]['city'].','.$arrival_airport_info[0]['country'].' ('.$spotter_item['real_arrival_airport'].')</a></span>'."\n";
555	573	print '<span class="mobile">'._("Scheduled:").' <a href="'.$globalURL.'/airport/'.$spotter_item['real_arrival_airport'].'">'.$spotter_item['real_arrival_airport'].'</a></span>'."\n";
		@@ -565,20 +583,28 @@ discard block
		block discarded – undo
565	583	if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) {
566	584	if ($spotter_item['arrival_airport_time'] > 2460) {
567	585	$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
568		- } else $arrival_airport_time = $spotter_item['arrival_airport_time'];
	586	+ } else {
	587	+ $arrival_airport_time = $spotter_item['arrival_airport_time'];
	588	+ }
569	589	if ($spotter_item['real_arrival_airport_time'] > 2460) {
570	590	$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
571		- } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
	591	+ } else {
	592	+ $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
	593	+ }
572	594	print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n";
573	595	} elseif (isset($spotter_item['real_arrival_airport_time'])) {
574	596	if ($spotter_item['real_arrival_airport_time'] > 2460) {
575	597	$real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']);
576		- } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
	598	+ } else {
	599	+ $real_arrival_airport_time = $spotter_item['real_arrival_airport_time'];
	600	+ }
577	601	print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n";
578	602	} elseif (isset($spotter_item['arrival_airport_time'])) {
579	603	if ($spotter_item['arrival_airport_time'] > 2460) {
580	604	$arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']);
581		- } else $arrival_airport_time = $spotter_item['arrival_airport_time'];
	605	+ } else {
	606	+ $arrival_airport_time = $spotter_item['arrival_airport_time'];
	607	+ }
582	608	print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n";
583	609	}
584	610	if (!isset($spotter_item['real_arrival_airport']) && $spotter_item['arrival_airport'] != 'NA') {
		@@ -591,7 +617,9 @@ discard block
		block discarded – undo
591	617	$longitude = $spotter_item['longitude'];
592	618	}
593	619	$distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude);
594		- } else $distance = '';
	620	+ } else {
	621	+ $distance = '';
	622	+ }
595	623	if ($distance != '') {
596	624	if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') \|\| (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
597	625	echo '<br/><i>'.round($distance*0.539957).' nm</i>';

		@@ -9,7 +9,10 @@
		block discarded – undo
9	9	<?php
10	10	}
11	11	?>
12		- <span>Developed in Barrie by <a href="http://mtru.nz/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) print $globalURL; ?>/about#source">Source & Credits</a></span> - <span><a href="https://github.com/Ysurac/FlightAirMap/issues" target="_blank">Report any issues</a></span>
	12	+ <span>Developed in Barrie by <a href="http://mtru.nz/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) {
	13	+ print $globalURL;
	14	+}
	15	+?>/about#source">Source & Credits</a></span> - <span><a href="https://github.com/Ysurac/FlightAirMap/issues" target="_blank">Report any issues</a></span>
13	16	</footer>
14	17
15	18	<div class="notifications bottom-left"></div>

		@@ -258,7 +258,9 @@ discard block
		block discarded – undo
258	258	// Update table countries
259	259	if ($Connection->tableExists('airspace')) {
260	260	$error .= update_db::update_countries();
261		- if ($error != '') return $error;
	261	+ if ($error != '') {
	262	+ return $error;
	263	+ }
262	264	}
263	265	// Update schema_version to 7
264	266	$query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'";
		@@ -314,7 +316,9 @@ discard block
		block discarded – undo
314	316	$error = '';
315	317	// Update table aircraft
316	318	$error .= create_db::import_file('../db/source_location.sql');
317		- if ($error != '') return $error;
	319	+ if ($error != '') {
	320	+ return $error;
	321	+ }
318	322	// Update schema_version to 6
319	323	$query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'";
320	324	try {
		@@ -331,7 +335,9 @@ discard block
		block discarded – undo
331	335	$error = '';
332	336	// Update table aircraft
333	337	$error .= create_db::import_file('../db/notam.sql');
334		- if ($error != '') return $error;
	338	+ if ($error != '') {
	339	+ return $error;
	340	+ }
335	341	$query = "DELETE FROM config WHERE name = 'last_update_db';
336	342	INSERT INTO config (name,value) VALUES ('last_update_db',NOW());
337	343	DELETE FROM config WHERE name = 'last_update_notam_db';
		@@ -365,7 +371,9 @@ discard block
		block discarded – undo
365	371	$error = '';
366	372	// Update table atc
367	373	$error .= create_db::import_file('../db/atc.sql');
368		- if ($error != '') return $error;
	374	+ if ($error != '') {
	375	+ return $error;
	376	+ }
369	377
370	378	$query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'";
371	379	try {
		@@ -389,13 +397,21 @@ discard block
		block discarded – undo
389	397	$error = '';
390	398	// Add tables
391	399	$error .= create_db::import_file('../db/aircraft_owner.sql');
392		- if ($error != '') return $error;
	400	+ if ($error != '') {
	401	+ return $error;
	402	+ }
393	403	$error .= create_db::import_file('../db/metar.sql');
394		- if ($error != '') return $error;
	404	+ if ($error != '') {
	405	+ return $error;
	406	+ }
395	407	$error .= create_db::import_file('../db/taf.sql');
396		- if ($error != '') return $error;
	408	+ if ($error != '') {
	409	+ return $error;
	410	+ }
397	411	$error .= create_db::import_file('../db/airport.sql');
398		- if ($error != '') return $error;
	412	+ if ($error != '') {
	413	+ return $error;
	414	+ }
399	415
400	416	$query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'";
401	417	try {
		@@ -469,19 +485,33 @@ discard block
		block discarded – undo
469	485	$error = '';
470	486	// Add tables
471	487	$error .= create_db::import_file('../db/stats.sql');
472		- if ($error != '') return $error;
	488	+ if ($error != '') {
	489	+ return $error;
	490	+ }
473	491	$error .= create_db::import_file('../db/stats_aircraft.sql');
474		- if ($error != '') return $error;
	492	+ if ($error != '') {
	493	+ return $error;
	494	+ }
475	495	$error .= create_db::import_file('../db/stats_airline.sql');
476		- if ($error != '') return $error;
	496	+ if ($error != '') {
	497	+ return $error;
	498	+ }
477	499	$error .= create_db::import_file('../db/stats_airport.sql');
478		- if ($error != '') return $error;
	500	+ if ($error != '') {
	501	+ return $error;
	502	+ }
479	503	$error .= create_db::import_file('../db/stats_owner.sql');
480		- if ($error != '') return $error;
	504	+ if ($error != '') {
	505	+ return $error;
	506	+ }
481	507	$error .= create_db::import_file('../db/stats_pilot.sql');
482		- if ($error != '') return $error;
	508	+ if ($error != '') {
	509	+ return $error;
	510	+ }
483	511	$error .= create_db::import_file('../db/spotter_archive_output.sql');
484		- if ($error != '') return $error;
	512	+ if ($error != '') {
	513	+ return $error;
	514	+ }
485	515
486	516	$query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'";
487	517	try {
		@@ -521,7 +551,9 @@ discard block
		block discarded – undo
521	551	// Add tables
522	552	if (!$Connection->tableExists('stats_flight')) {
523	553	$error .= create_db::import_file('../db/stats_flight.sql');
524		- if ($error != '') return $error;
	554	+ if ($error != '') {
	555	+ return $error;
	556	+ }
525	557	}
526	558	$query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'";
527	559	try {
		@@ -545,7 +577,9 @@ discard block
		block discarded – undo
545	577	} catch(PDOException $e) {
546	578	return "error (update stats) : ".$e->getMessage()."\n";
547	579	}
548		- if ($error != '') return $error;
	580	+ if ($error != '') {
	581	+ return $error;
	582	+ }
549	583	$query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'";
550	584	try {
551	585	$sth = $Connection->db->prepare($query);
		@@ -566,7 +600,9 @@ discard block
		block discarded – undo
566	600	if (!$Connection->tableExists('stats_callsign')) {
567	601	$error .= create_db::import_file('../db/stats_callsign.sql');
568	602	}
569		- if ($error != '') return $error;
	603	+ if ($error != '') {
	604	+ return $error;
	605	+ }
570	606	$query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'";
571	607	try {
572	608	$sth = $Connection->db->prepare($query);
		@@ -584,7 +620,9 @@ discard block
		block discarded – undo
584	620	if (!$Connection->tableExists('stats_country')) {
585	621	$error .= create_db::import_file('../db/stats_country.sql');
586	622	}
587		- if ($error != '') return $error;
	623	+ if ($error != '') {
	624	+ return $error;
	625	+ }
588	626	$query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'";
589	627	try {
590	628	$sth = $Connection->db->prepare($query);
		@@ -607,7 +645,9 @@ discard block
		block discarded – undo
607	645	return "error (update stats) : ".$e->getMessage()."\n";
608	646	}
609	647	}
610		- if ($error != '') return $error;
	648	+ if ($error != '') {
	649	+ return $error;
	650	+ }
611	651	$query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'";
612	652	try {
613	653	$sth = $Connection->db->prepare($query);
		@@ -623,7 +663,9 @@ discard block
		block discarded – undo
623	663	$error = '';
624	664	// Update airport table
625	665	$error .= create_db::import_file('../db/airport.sql');
626		- if ($error != '') return 'Import airport.sql : '.$error;
	666	+ if ($error != '') {
	667	+ return 'Import airport.sql : '.$error;
	668	+ }
627	669	// Remove primary key on Spotter_Archive
628	670	$query = "alter table spotter_archive drop spotter_archive_id";
629	671	try {
		@@ -699,7 +741,9 @@ discard block
		block discarded – undo
699	741	return "error (add source_name column) : ".$e->getMessage()."\n";
700	742	}
701	743	}
702		- if ($error != '') return $error;
	744	+ if ($error != '') {
	745	+ return $error;
	746	+ }
703	747	$query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'";
704	748	try {
705	749	$sth = $Connection->db->prepare($query);
		@@ -717,7 +761,9 @@ discard block
		block discarded – undo
717	761	// Update airline table
718	762	if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
719	763	$error .= create_db::import_file('../db/airlines.sql');
720		- if ($error != '') return 'Import airlines.sql : '.$error;
	764	+ if ($error != '') {
	765	+ return 'Import airlines.sql : '.$error;
	766	+ }
721	767	}
722	768	if (!$Connection->checkColumnName('aircraft_modes','type_flight')) {
723	769	// Add column over_country
		@@ -729,7 +775,9 @@ discard block
		block discarded – undo
729	775	return "error (add over_country) : ".$e->getMessage()."\n";
730	776	}
731	777	}
732		- if ($error != '') return $error;
	778	+ if ($error != '') {
	779	+ return $error;
	780	+ }
733	781	/*
734	782	if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
735	783	// Force update ModeS (this will put type_flight data
		@@ -759,7 +807,9 @@ discard block
		block discarded – undo
759	807	} catch(PDOException $e) {
760	808	return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n";
761	809	}
762		- if ($error != '') return $error;
	810	+ if ($error != '') {
	811	+ return $error;
	812	+ }
763	813	}
764	814	$query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'";
765	815	try {
		@@ -782,7 +832,9 @@ discard block
		block discarded – undo
782	832	} else {
783	833	$error .= create_db::import_file('../db/pgsql/stats_source.sql');
784	834	}
785		- if ($error != '') return $error;
	835	+ if ($error != '') {
	836	+ return $error;
	837	+ }
786	838	}
787	839	$query = "UPDATE config SET value = '23' WHERE name = 'schema_version'";
788	840	try {
		@@ -804,12 +856,16 @@ discard block
		block discarded – undo
804	856	if ($globalDBdriver == 'mysql') {
805	857	if (!$Connection->tableExists('tle')) {
806	858	$error .= create_db::import_file('../db/tle.sql');
807		- if ($error != '') return $error;
	859	+ if ($error != '') {
	860	+ return $error;
	861	+ }
808	862	}
809	863	} else {
810	864	if (!$Connection->tableExists('tle')) {
811	865	$error .= create_db::import_file('../db/pgsql/tle.sql');
812		- if ($error != '') return $error;
	866	+ if ($error != '') {
	867	+ return $error;
	868	+ }
813	869	}
814	870	$query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)";
815	871	try {
		@@ -849,7 +905,9 @@ discard block
		block discarded – undo
849	905	} else {
850	906	$error .= create_db::import_file('../db/pgsql/airlines.sql');
851	907	}
852		- if ($error != '') return 'Import airlines.sql : '.$error;
	908	+ if ($error != '') {
	909	+ return 'Import airlines.sql : '.$error;
	910	+ }
853	911	if (!$Connection->checkColumnName('airlines','forsource')) {
854	912	// Add forsource to airlines
855	913	$query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL";
		@@ -1102,8 +1160,11 @@ discard block
		block discarded – undo
1102	1160	if ($Connection->tableExists('aircraft')) {
1103	1161	if (!$Connection->tableExists('config')) {
1104	1162	$version = '1';
1105		- if ($update) return self::update_from_1();
1106		- else return $version;
	1163	+ if ($update) {
	1164	+ return self::update_from_1();
	1165	+ } else {
	1166	+ return $version;
	1167	+ }
1107	1168	} else {
1108	1169	$Connection = new Connection();
1109	1170	$query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1";
		@@ -1117,106 +1178,183 @@ discard block
		block discarded – undo
1117	1178	if ($update) {
1118	1179	if ($result['value'] == '2') {
1119	1180	$error = self::update_from_2();
1120		- if ($error != '') return $error;
1121		- else return self::check_version(true);
	1181	+ if ($error != '') {
	1182	+ return $error;
	1183	+ } else {
	1184	+ return self::check_version(true);
	1185	+ }
1122	1186	} elseif ($result['value'] == '3') {
1123	1187	$error = self::update_from_3();
1124		- if ($error != '') return $error;
1125		- else return self::check_version(true);
	1188	+ if ($error != '') {
	1189	+ return $error;
	1190	+ } else {
	1191	+ return self::check_version(true);
	1192	+ }
1126	1193	} elseif ($result['value'] == '4') {
1127	1194	$error = self::update_from_4();
1128		- if ($error != '') return $error;
1129		- else return self::check_version(true);
	1195	+ if ($error != '') {
	1196	+ return $error;
	1197	+ } else {
	1198	+ return self::check_version(true);
	1199	+ }
1130	1200	} elseif ($result['value'] == '5') {
1131	1201	$error = self::update_from_5();
1132		- if ($error != '') return $error;
1133		- else return self::check_version(true);
	1202	+ if ($error != '') {
	1203	+ return $error;
	1204	+ } else {
	1205	+ return self::check_version(true);
	1206	+ }
1134	1207	} elseif ($result['value'] == '6') {
1135	1208	$error = self::update_from_6();
1136		- if ($error != '') return $error;
1137		- else return self::check_version(true);
	1209	+ if ($error != '') {
	1210	+ return $error;
	1211	+ } else {
	1212	+ return self::check_version(true);
	1213	+ }
1138	1214	} elseif ($result['value'] == '7') {
1139	1215	$error = self::update_from_7();
1140		- if ($error != '') return $error;
1141		- else return self::check_version(true);
	1216	+ if ($error != '') {
	1217	+ return $error;
	1218	+ } else {
	1219	+ return self::check_version(true);
	1220	+ }
1142	1221	} elseif ($result['value'] == '8') {
1143	1222	$error = self::update_from_8();
1144		- if ($error != '') return $error;
1145		- else return self::check_version(true);
	1223	+ if ($error != '') {
	1224	+ return $error;
	1225	+ } else {
	1226	+ return self::check_version(true);
	1227	+ }
1146	1228	} elseif ($result['value'] == '9') {
1147	1229	$error = self::update_from_9();
1148		- if ($error != '') return $error;
1149		- else return self::check_version(true);
	1230	+ if ($error != '') {
	1231	+ return $error;
	1232	+ } else {
	1233	+ return self::check_version(true);
	1234	+ }
1150	1235	} elseif ($result['value'] == '10') {
1151	1236	$error = self::update_from_10();
1152		- if ($error != '') return $error;
1153		- else return self::check_version(true);
	1237	+ if ($error != '') {
	1238	+ return $error;
	1239	+ } else {
	1240	+ return self::check_version(true);
	1241	+ }
1154	1242	} elseif ($result['value'] == '11') {
1155	1243	$error = self::update_from_11();
1156		- if ($error != '') return $error;
1157		- else return self::check_version(true);
	1244	+ if ($error != '') {
	1245	+ return $error;
	1246	+ } else {
	1247	+ return self::check_version(true);
	1248	+ }
1158	1249	} elseif ($result['value'] == '12') {
1159	1250	$error = self::update_from_12();
1160		- if ($error != '') return $error;
1161		- else return self::check_version(true);
	1251	+ if ($error != '') {
	1252	+ return $error;
	1253	+ } else {
	1254	+ return self::check_version(true);
	1255	+ }
1162	1256	} elseif ($result['value'] == '13') {
1163	1257	$error = self::update_from_13();
1164		- if ($error != '') return $error;
1165		- else return self::check_version(true);
	1258	+ if ($error != '') {
	1259	+ return $error;
	1260	+ } else {
	1261	+ return self::check_version(true);
	1262	+ }
1166	1263	} elseif ($result['value'] == '14') {
1167	1264	$error = self::update_from_14();
1168		- if ($error != '') return $error;
1169		- else return self::check_version(true);
	1265	+ if ($error != '') {
	1266	+ return $error;
	1267	+ } else {
	1268	+ return self::check_version(true);
	1269	+ }
1170	1270	} elseif ($result['value'] == '15') {
1171	1271	$error = self::update_from_15();
1172		- if ($error != '') return $error;
1173		- else return self::check_version(true);
	1272	+ if ($error != '') {
	1273	+ return $error;
	1274	+ } else {
	1275	+ return self::check_version(true);
	1276	+ }
1174	1277	} elseif ($result['value'] == '16') {
1175	1278	$error = self::update_from_16();
1176		- if ($error != '') return $error;
1177		- else return self::check_version(true);
	1279	+ if ($error != '') {
	1280	+ return $error;
	1281	+ } else {
	1282	+ return self::check_version(true);
	1283	+ }
1178	1284	} elseif ($result['value'] == '17') {
1179	1285	$error = self::update_from_17();
1180		- if ($error != '') return $error;
1181		- else return self::check_version(true);
	1286	+ if ($error != '') {
	1287	+ return $error;
	1288	+ } else {
	1289	+ return self::check_version(true);
	1290	+ }
1182	1291	} elseif ($result['value'] == '18') {
1183	1292	$error = self::update_from_18();
1184		- if ($error != '') return $error;
1185		- else return self::check_version(true);
	1293	+ if ($error != '') {
	1294	+ return $error;
	1295	+ } else {
	1296	+ return self::check_version(true);
	1297	+ }
1186	1298	} elseif ($result['value'] == '19') {
1187	1299	$error = self::update_from_19();
1188		- if ($error != '') return $error;
1189		- else return self::check_version(true);
	1300	+ if ($error != '') {
	1301	+ return $error;
	1302	+ } else {
	1303	+ return self::check_version(true);
	1304	+ }
1190	1305	} elseif ($result['value'] == '20') {
1191	1306	$error = self::update_from_20();
1192		- if ($error != '') return $error;
1193		- else return self::check_version(true);
	1307	+ if ($error != '') {
	1308	+ return $error;
	1309	+ } else {
	1310	+ return self::check_version(true);
	1311	+ }
1194	1312	} elseif ($result['value'] == '21') {
1195	1313	$error = self::update_from_21();
1196		- if ($error != '') return $error;
1197		- else return self::check_version(true);
	1314	+ if ($error != '') {
	1315	+ return $error;
	1316	+ } else {
	1317	+ return self::check_version(true);
	1318	+ }
1198	1319	} elseif ($result['value'] == '22') {
1199	1320	$error = self::update_from_22();
1200		- if ($error != '') return $error;
1201		- else return self::check_version(true);
	1321	+ if ($error != '') {
	1322	+ return $error;
	1323	+ } else {
	1324	+ return self::check_version(true);
	1325	+ }
1202	1326	} elseif ($result['value'] == '23') {
1203	1327	$error = self::update_from_23();
1204		- if ($error != '') return $error;
1205		- else return self::check_version(true);
	1328	+ if ($error != '') {
	1329	+ return $error;
	1330	+ } else {
	1331	+ return self::check_version(true);
	1332	+ }
1206	1333	} elseif ($result['value'] == '24') {
1207	1334	$error = self::update_from_24();
1208		- if ($error != '') return $error;
1209		- else return self::check_version(true);
	1335	+ if ($error != '') {
	1336	+ return $error;
	1337	+ } else {
	1338	+ return self::check_version(true);
	1339	+ }
1210	1340	} elseif ($result['value'] == '25') {
1211	1341	$error = self::update_from_25();
1212		- if ($error != '') return $error;
1213		- else return self::check_version(true);
1214		- } else return '';
	1342	+ if ($error != '') {
	1343	+ return $error;
	1344	+ } else {
	1345	+ return self::check_version(true);
	1346	+ }
	1347	+ } else {
	1348	+ return '';
	1349	+ }
	1350	+ } else {
	1351	+ return $result['value'];
1215	1352	}
1216		- else return $result['value'];
1217	1353	}
1218	1354
1219		- } else return $version;
	1355	+ } else {
	1356	+ return $version;
	1357	+ }
1220	1358	}
1221	1359
1222	1360	}

Ysurac / FlightAirMap

Push — master ( 0da4d1...d670f0 )

Status

Category

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

Braces +23 added lines, -9 removed lines patch added patch discarded remove patch

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

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

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

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

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

Braces +220 added lines, -82 removed lines patch added patch discarded remove patch

Braces +347 added lines, -94 removed lines patch added patch discarded remove patch