Ysurac / FlightAirMap

js/map.3d.js.php

Spacing +2 added lines, -2 removed lines

@@ -369,7 +369,7 @@ 
 	}
     }
 
-    var tsk_geojson = Cesium.loadJson("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php print filter_input(INPUT_GET,'tsk',FILTER_SANITIZE_URL); ?>");
+    var tsk_geojson = Cesium.loadJson("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php print filter_input(INPUT_GET, 'tsk', FILTER_SANITIZE_URL); ?>");
     tsk_geojson.then(function(geojsondata) {
 	tsk = new Cesium.CustomDataSource('tsk');
 	for (var i =0;i < geojsondata.features.length; i++) {
@@ -456,7 +456,7 @@ 
 <?php
 	if (isset($_COOKIE['lastcentercoord']) || (isset($globalCenterLatitude) && isset($globalCenterLongitude) && $globalCenterLatitude != '' && $globalCenterLongitude != '')) {
 		if (isset($_COOKIE['lastcentercoord'])) {
-			$lastcentercoord = explode(',',$_COOKIE['lastcentercoord']);
+			$lastcentercoord = explode(',', $_COOKIE['lastcentercoord']);
 			if (!isset($lastcentercoord[3])) $zoom = $lastcentercoord[2]*1000000.0;
 			else $zoom = $lastcentercoord[3];
 			$viewcenterlatitude = $lastcentercoord[0];

Indentation +8 added lines, -8 removed lines

@@ -331,15 +331,15 @@ 
     }
 
 <?php
-    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+	if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 ?>
     var loc_geojson = Cesium.loadJson("<?php print $globalURL; ?>/location-geojson.php?coord="+bbox());
 <?php
-    } else {
+	} else {
 ?>
     var loc_geojson = Cesium.loadJson("<?php print $globalURL; ?>/location-geojson.php");
 <?php
-    }
+	}
 ?>
     loc_geojson.then(function(geojsondata) {
 	loc = new Cesium.CustomDataSource('location');
@@ -512,15 +512,15 @@ 
 //	if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') {
 ?>
 <?php
-    if (isset($globalMapOffline) && $globalMapOffline === TRUE) {
+	if (isset($globalMapOffline) && $globalMapOffline === TRUE) {
 ?>
 var MapTerrain = 'ellipsoid';
 <?php
-    } else {
+	} else {
 ?>
 var MapTerrain = getCookie('MapTerrain');
 <?php
-    }
+	}
 ?>
 
 
@@ -574,11 +574,11 @@ 
 }
 
 <?php
-    if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) {
+	if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) {
 ?>
 update_tsk();
 <?php
-    }
+	}
 ?>
 
 update_locationsLayer();

Braces +40 added lines, -13 removed lines

@@ -5,21 +5,30 @@ 
 
 document.cookie =  'MapFormat=3d; expires=Thu, 2 Aug 2100 20:47:11 UTC; path=/'
 <?php
-	if (isset($_COOKIE['MapType'])) $MapType = $_COOKIE['MapType'];
-	else $MapType = $globalMapProvider;
+	if (isset($_COOKIE['MapType'])) {
+		$MapType = $_COOKIE['MapType'];
+	} else {
+		$MapType = $globalMapProvider;
+	}
 
 //	unset($_COOKIE['MapType']);
 	if ($MapType != 'Mapbox' && $MapType != 'OpenStreetMap' && $MapType != 'Bing-Aerial' && $MapType != 'Bing-Hybrid' && $MapType != 'Bing-Road' && $MapType != 'offline' && $MapType != 'ArcGIS-Streetmap' && $MapType != 'ArcGIS-Satellite' && $MapType != 'NatGeo-Street') {
-		if (isset($globalBingMapKey) && $globalBingMapKey != '') $MapType = 'Bing-Aerial';
-		else $MapType = 'OpenStreetMap';
+		if (isset($globalBingMapKey) && $globalBingMapKey != '') {
+			$MapType = 'Bing-Aerial';
+		} else {
+			$MapType = 'OpenStreetMap';
+		}
 	}
 	if (($MapType == 'Bing-Aerial' || $MapType == 'Bing-Hybrid' || $MapType == 'Bing-Road') && (!isset($globalBingMapKey) || $globalBingMapKey == '')) {
 		$MapType = 'OpenStreetMap';
 	}
 	if ($MapType == 'Mapbox') {
-		if ($_COOKIE['MapTypeId'] == 'default') $MapBoxId = $globalMapboxId;
-		else $MapBoxId = $_COOKIE['MapTypeId'];
-?>
+		if ($_COOKIE['MapTypeId'] == 'default') {
+			$MapBoxId = $globalMapboxId;
+		} else {
+			$MapBoxId = $_COOKIE['MapTypeId'];
+		}
+		?>
 	var imProv = Cesium.MapboxImageryProvider({
 		credit: 'Map data © OpenStreetMap contributors, ' +
 	      'CC-BY-SA, ' +
@@ -147,13 +156,23 @@ 
 */
 ?>
 <?php
-	}  elseif (isset($globalMapCustomLayer[$MapType])) {
+	} elseif (isset($globalMapCustomLayer[$MapType])) {
 		$customid = $MapType;
 ?>
 	var imProv = Cesium.createOpenStreetMapImageryProvider({
 		url : '<?php print $globalMapCustomLayer[$customid]['url']; ?>',
-		maximumLevel: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '99'; ?>,
-		minimumLevel: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
+		maximumLevel: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
+	print $globalMapCustomLayer[$customid]['maxZoom'];
+} else {
+	print '99';
+}
+?>,
+		minimumLevel: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
+	print $globalMapCustomLayer[$customid]['minZoom'];
+} else {
+	print '0';
+}
+?>,
 		credit: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
 	});
 <?php
@@ -480,8 +499,11 @@ 
 	if (isset($_COOKIE['lastcentercoord']) || (isset($globalCenterLatitude) && isset($globalCenterLongitude) && $globalCenterLatitude != '' && $globalCenterLongitude != '')) {
 		if (isset($_COOKIE['lastcentercoord'])) {
 			$lastcentercoord = explode(',',$_COOKIE['lastcentercoord']);
-			if (!isset($lastcentercoord[3])) $zoom = $lastcentercoord[2]*1000000.0;
-			else $zoom = $lastcentercoord[3];
+			if (!isset($lastcentercoord[3])) {
+				$zoom = $lastcentercoord[2]*1000000.0;
+			} else {
+				$zoom = $lastcentercoord[3];
+			}
 			$viewcenterlatitude = $lastcentercoord[0];
 			$viewcenterlongitude = $lastcentercoord[1];
 		} else {
@@ -602,7 +624,12 @@ 
 ?>
 
 update_locationsLayer();
-setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
+setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) {
+	print $globalMapRefresh*1000*2;
+} else {
+	print '60000';
+}
+?>);
 /*
 var handlera = new Cesium.ScreenSpaceEventHandler(viewer.canvas, false);
 handlera.setInputAction(

require/class.APRS.php

Doc Comments +4 added lines

@@ -174,6 +174,10 @@
 		'\|' => 'TNC Stream SW',
 		'\~' => 'TNC Stream SW');
 
+	/**
+	 * @param integer $n
+	 * @param integer $s
+	 */
 	private function urshift($n, $s) {
 		return ($n >= 0) ? ($n >> $s) :
 		    (($n & 0x7fffffff) >> $s) | 

Indentation +2 added lines, -2 removed lines

@@ -176,8 +176,8 @@
 
 	private function urshift($n, $s) {
 		return ($n >= 0) ? ($n >> $s) :
-		    (($n & 0x7fffffff) >> $s) | 
-		    (0x40000000 >> ($s - 1));
+			(($n & 0x7fffffff) >> $s) | 
+			(0x40000000 >> ($s - 1));
 	}
 
 	/*

Spacing +157 added lines, -158 removed lines

@@ -175,8 +175,7 @@ 
 		'\~' => 'TNC Stream SW');
 
 	private function urshift($n, $s) {
-		return ($n >= 0) ? ($n >> $s) :
-		    (($n & 0x7fffffff) >> $s) | 
+		return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| 
 		    (0x40000000 >> ($s - 1));
 	}
 
@@ -192,7 +191,7 @@ 
 		$input_len = strlen($input);
 		
 		/* Find the end of header checking for NULL bytes while doing it. */
-		$splitpos = strpos($input,':');
+		$splitpos = strpos($input, ':');
 		
 		/* Check that end was found and body has at least one byte. */
 		if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
@@ -202,14 +201,14 @@ 
 		
 		if ($debug) echo 'input : '.$input."\n";
 		/* Save header and body. */
-		$body = substr($input,$splitpos+1,$input_len);
+		$body = substr($input, $splitpos + 1, $input_len);
 		$body_len = strlen($body);
-		$header = substr($input,0,$splitpos);
+		$header = substr($input, 0, $splitpos);
 		if ($debug) echo 'header : '.$header."\n";
 		
 		/* Parse source, target and path. */
 		//FLRDF0A52>APRS,qAS,LSTB
-		if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
+		if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/', $header, $matches)) {
 			$ident = $matches[1];
 			$all_elements = $matches[2];
 			if ($ident == 'AIRCRAFT') {
@@ -226,13 +225,13 @@ 
 			if ($debug) 'No ident'."\n";
 			return false;
 		}
-		$elements = explode(',',$all_elements);
+		$elements = explode(',', $all_elements);
 		$source = end($elements);
 		$result['source'] = $source;
 		foreach ($elements as $element) {
-			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
+			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/', $element)) {
 			//if ($element == 'TCPIP*') return false;
-			} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
+			} elseif (!preg_match('/^([0-9A-F]{32})$/', $element)) {
 				if ($debug) echo 'element : '.$element."\n";
 				return false;
 			}
@@ -245,14 +244,14 @@ 
 			*/
 		}
 		
-		$type = substr($body,0,1);
+		$type = substr($body, 0, 1);
 		if ($debug) echo 'type : '.$type."\n";
 		if ($type == ';') {
 			if (isset($result['source_type']) && $result['source_type'] == 'modes') {
-				$result['address'] = trim(substr($body,1,9));
+				$result['address'] = trim(substr($body, 1, 9));
 			} elseif (isset($result['source_type']) && $result['source_type'] == 'ais') {
-				$result['mmsi'] = trim(substr($body,1,9));
-			} else $result['ident'] = trim(substr($body,1,9));
+				$result['mmsi'] = trim(substr($body, 1, 9));
+			} else $result['ident'] = trim(substr($body, 1, 9));
 		} elseif ($type == ',') {
 			// Invalid data or test data
 			return false;
@@ -260,20 +259,20 @@ 
 		
 		// Check for Timestamp
 		$find = false;
-		$body_parse = substr($body,1);
-		if (preg_match('/^;(.){9}\*/',$body,$matches)) {
-			$body_parse = substr($body_parse,10);
+		$body_parse = substr($body, 1);
+		if (preg_match('/^;(.){9}\*/', $body, $matches)) {
+			$body_parse = substr($body_parse, 10);
 			$find = true;
 		}
-		if (preg_match('/^`(.*)\//',$body,$matches)) {
-			$body_parse = substr($body_parse,strlen($matches[1])-1);
+		if (preg_match('/^`(.*)\//', $body, $matches)) {
+			$body_parse = substr($body_parse, strlen($matches[1]) - 1);
 			$find = true;
 		}
-		if (preg_match("/^'(.*)\//",$body,$matches)) {
-			$body_parse = substr($body_parse,strlen($matches[1])-1);
+		if (preg_match("/^'(.*)\//", $body, $matches)) {
+			$body_parse = substr($body_parse, strlen($matches[1]) - 1);
 			$find = true;
 		}
-		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
+		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) {
 			$find = true;
 			$timestamp = $matches[0];
 			if ($matches[4] == 'h') {
@@ -286,17 +285,17 @@ 
 				// This work or not ?
 				$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
 			}
-			$body_parse = substr($body_parse,7);
+			$body_parse = substr($body_parse, 7);
 			$result['timestamp'] = $timestamp;
 		}
-		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) {
+		if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $body_parse, $matches)) {
 			$find = true;
 			$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
-			$body_parse = substr($body_parse,8);
+			$body_parse = substr($body_parse, 8);
 			$result['timestamp'] = $timestamp;
 		}
 		//if (strlen($body_parse) > 19) {
-		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) {
+		if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/', $body_parse, $matches)) {
 			$find = true;
 			// 4658.70N/00707.78Ez
 			$sind = strtoupper($matches[3]);
@@ -318,11 +317,11 @@ 
 			    */
 			$latitude = $lat + floatval($lat_min)/60;
 			$longitude = $lon + floatval($lon_min)/60;
-			if ($sind == 'S') $latitude = 0-$latitude;
-			if ($wind == 'W') $longitude = 0-$longitude;
+			if ($sind == 'S') $latitude = 0 - $latitude;
+			if ($wind == 'W') $longitude = 0 - $longitude;
 			$result['latitude'] = $latitude;
 			$result['longitude'] = $longitude;
-			$body_parse = substr($body_parse,18);
+			$body_parse = substr($body_parse, 18);
 			$body_parse_len = strlen($body_parse);
 		}
 		$body_parse_len = strlen($body_parse);
@@ -349,22 +348,22 @@ 
 				//'
 				//if ($type != ';' && $type != '>') {
 				if ($type != '') {
-					$body_parse = substr($body_parse,1);
+					$body_parse = substr($body_parse, 1);
 					$body_parse_len = strlen($body_parse);
 					$result['symbol_code'] = $symbol_code;
 					if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
 					if ($symbol_code != '_') {
 					}
 					if ($body_parse_len >= 7) {
-						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
-							$course = substr($body_parse,0,3);
+						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/', $body_parse)) {
+							$course = substr($body_parse, 0, 3);
 							$tmp_s = intval($course);
 							if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
-							$speed = substr($body_parse,4,3);
+							$speed = substr($body_parse, 4, 3);
 							if ($speed != '...') {
 								$result['speed'] = intval($speed);
 							}
-							$body_parse = substr($body_parse,7);
+							$body_parse = substr($body_parse, 7);
 						}
 						// Check PHGR, PHG, RNG
 					} 
@@ -374,11 +373,11 @@ 
 					}
 					*/
 					if (strlen($body_parse) > 0) {
-						if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
+						if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/', $body_parse, $matches)) {
 							$altitude = intval($matches[1]);
 							$result['altitude'] = $altitude;
 							//$body_parse = trim(substr($body_parse,strlen($matches[0])));
-							$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse));
+							$body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/', '', $body_parse));
 						}
 					}
 					// Telemetry
@@ -388,58 +387,58 @@ 
 					}
 					*/
 					// DAO
-					if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) {
+					if (preg_match('/^!([0-9A-Z]{3})/', $body_parse, $matches)) {
 						$dao = $matches[1];
-						if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) {
+						if (preg_match('/^([A-Z])([0-9]{2})/', $dao)) {
 							$dao_split = str_split($dao);
-							$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
-							$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
+							$lat_off = (($dao_split[1]) - 48.0)*0.001/60.0;
+							$lon_off = (($dao_split[2]) - 48.0)*0.001/60.0;
 							if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
 							else $result['latitude'] += $lat_off;
 							if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
 							else $result['longitude'] += $lon_off;
 						}
-						$body_parse = substr($body_parse,6);
+						$body_parse = substr($body_parse, 6);
 					}
-					if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) {
-						$result['ident'] = str_replace('_',' ',$matches[1]);
+					if (preg_match('/CS=([0-9A-Z_]*)/', $body_parse, $matches)) {
+						$result['ident'] = str_replace('_', ' ', $matches[1]);
 					}
-					if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) {
+					if (preg_match('/SQ=([0-9]{4})/', $body_parse, $matches)) {
 						$result['squawk'] = $matches[1];
 					}
-					if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) {
+					if (preg_match('/AI=([0-9A-Z]{4})/', $body_parse, $matches)) {
 						$result['aircraft_icao'] = $matches[1];
 					}
-					if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) {
+					if (preg_match('/VR=([0-9]*)/', $body_parse, $matches)) {
 						$result['verticalrate'] = $matches[1];
 					}
-					if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) {
+					if (preg_match('/TI=([0-9]*)/', $body_parse, $matches)) {
 						$result['typeid'] = $matches[1];
 					}
-					if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) {
+					if (preg_match('/SI=([0-9]*)/', $body_parse, $matches)) {
 						$result['statusid'] = $matches[1];
 					}
-					if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) {
+					if (preg_match('/IMO=([0-9]{7})/', $body_parse, $matches)) {
 						$result['imo'] = $matches[1];
 					}
-					if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) {
+					if (preg_match('/AD=([0-9]*)/', $body_parse, $matches)) {
 						$result['arrival_date'] = $matches[1];
 					}
-					if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
-						$result['arrival_code'] = str_replace('_',' ',$matches[1]);
+					if (preg_match('/AC=([0-9A-Z_]*)/', $body_parse, $matches)) {
+						$result['arrival_code'] = str_replace('_', ' ', $matches[1]);
 					}
 					// OGN comment
 					//if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) {
-					if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) {
+					if (preg_match('/^id([0-9A-F]{8})/', $body_parse, $matches)) {
 						$id = $matches[1];
 						//$mode = substr($id,0,2);
-						$address = substr($id,2);
-						$addressType = (intval(substr($id,0,2),16))&3;
+						$address = substr($id, 2);
+						$addressType = (intval(substr($id, 0, 2), 16))&3;
 						if ($addressType == 0) $result['addresstype'] = "RANDOM";
 						elseif ($addressType == 1) $result['addresstype'] = "ICAO";
 						elseif ($addressType == 2) $result['addresstype'] = "FLARM";
 						elseif ($addressType == 3) $result['addresstype'] = "OGN";
-						$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
+						$aircraftType = $this->urshift(((intval(substr($id, 0, 2), 16))&0b1111100), 2);
 						$result['aircrafttype_code'] = $aircraftType;
 						if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
 						elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
@@ -456,110 +455,110 @@ 
 						elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
 						elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
 						elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
-						$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
+						$stealth = (intval(substr($id, 0, 2), 16)&0b10000000) != 0;
 						$result['stealth'] = $stealth;
 						$result['address'] = $address;
 					}
 					//Comment
 					$result['comment'] = trim($body_parse);
 					// parse weather
-					if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+					if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 						$result['wind_dir'] = intval($matches[1]);
-						$result['wind_speed'] = round(intval($matches[2])*1.60934,1);
-						$result['wind_gust'] = round(intval($matches[3])*1.60934,1);
-						$result['temp'] = round(5/9*((intval($matches[4]))-32),1);
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
-					} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+						$result['wind_speed'] = round(intval($matches[2])*1.60934, 1);
+						$result['wind_gust'] = round(intval($matches[3])*1.60934, 1);
+						$result['temp'] = round(5/9*((intval($matches[4])) - 32), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
+					} elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 						$result['wind_dir'] = intval($matches[1]);
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
-						$result['temp'] = round(5/9*(($matches[4])-32),1);
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
-					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) {
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
+						$result['temp'] = round(5/9*(($matches[4]) - 32), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
+					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) {
 						$result['wind_dir'] = intval($matches[1]);
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
-					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) {
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
+					} elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/', $body_parse, $matches)) {
 						$result['wind_dir'] = intval($matches[1]);
-						$result['wind_speed'] = round($matches[2]*1.60934,1);
-						$result['wind_gust'] = round($matches[3]*1.60934,1);
-						$body_parse = substr($body_parse,strlen($matches[0])+1);
+						$result['wind_speed'] = round($matches[2]*1.60934, 1);
+						$result['wind_gust'] = round($matches[3]*1.60934, 1);
+						$body_parse = substr($body_parse, strlen($matches[0]) + 1);
 					}
 					// temperature
 					//g012t088r000p000P000h38b10110
 					//g011t086r000p000P000h29b10198
-					if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
+					if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
+						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
+						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
+						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
+						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1, 1);
 						if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
+						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1, 1);
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
 						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
+						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1, 1);
 						if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
 						if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
-						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
-					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
+					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/', $body_parse, $matches)) {
+						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934, 1);
+						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2])) - 32), 1);
+						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1, 1);
 						if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
-						$body_parse = substr($body_parse,strlen($matches[0]));
+						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10), 1);
+						$body_parse = substr($body_parse, strlen($matches[0]));
 					}
 					$result['comment'] = trim($body_parse);
 				}
 			} else $result['comment'] = trim($body_parse);
 		}
-		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
-		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
+		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'], 4);
+		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'], 4);
 		if ($debug) print_r($result);
 		return $result;
 	}
@@ -568,34 +567,34 @@ 
 	 * Connect to APRS server
 	*/
 	public function connect() {
-		global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
+		global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass, $globalName, $globalServerAPRShost, $globalServerAPRSport;
 		$aprs_connect = 0;
 		$aprs_keep = 120;
 		$aprs_last_tx = time();
 		if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-		else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+		else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName);
 		if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
-		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8);
 		if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
 		else $aprs_pass = '-1';
-		$aprs_filter  = '';
+		$aprs_filter = '';
 		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
 		$Common = new Common();
-		$s = $Common->create_socket($globalServerAPRShost,$globalServerAPRSport,$errno,$errstr);
+		$s = $Common->create_socket($globalServerAPRShost, $globalServerAPRSport, $errno, $errstr);
 		if ($s !== false) {
 			echo 'Connected to APRS server! '."\n";
 			$authstart = time();
 			$this->socket = $s;
-			$send = socket_send( $this->socket  , $aprs_login , strlen($aprs_login) , 0 );
-			socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1);
-			while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) {
+			$send = socket_send($this->socket, $aprs_login, strlen($aprs_login), 0);
+			socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE, 1);
+			while ($msgin = socket_read($this->socket, 1000, PHP_NORMAL_READ)) {
 				if (strpos($msgin, "$aprs_ssid verified") !== FALSE) {
 					echo 'APRS user verified !'."\n";
 					$this->connected = true;
 					return true;
 					break;
 				}
-				if (time()-$authstart > 5) {
+				if (time() - $authstart > 5) {
 					echo 'APRS timeout'."\n";
 					break;
 				}
@@ -617,7 +616,7 @@ 
 	public function send($data) {
 		global $globalDebug;
 		if ($this->connected === false) $this->connect();
-		$send = socket_send( $this->socket  , $data , strlen($data),0);
+		$send = socket_send($this->socket, $data, strlen($data), 0);
 		if ($send === FALSE) {
 			if ($globalDebug) echo 'Reconnect...';
 			socket_close($this->socket);
@@ -627,17 +626,17 @@ 
 }
 
 class APRSSpotter extends APRS {
-	public function addLiveSpotterData($id,$ident,$aircraft_icao,$departure_airport,$arrival_airport,$latitude,$longitude,$waypoints,$altitude,$altitude_real,$heading,$speed,$datetime,$departure_airport_time,$arrival_airport_time,$squawk,$route_stop,$hex,$putinarchive,$registration,$pilot_id,$pilot_name, $verticalrate, $noarchive, $ground,$format_source,$source_name,$over_country) {
+	public function addLiveSpotterData($id, $ident, $aircraft_icao, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $speed, $datetime, $departure_airport_time, $arrival_airport_time, $squawk, $route_stop, $hex, $putinarchive, $registration, $pilot_id, $pilot_name, $verticalrate, $noarchive, $ground, $format_source, $source_name, $over_country) {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
 		if ($latitude != '' && $longitude != '') {
 			$lat = $latitude;
 			$long = $longitude;
-			$latitude = $Common->convertDM($latitude,'latitude');
-			$longitude = $Common->convertDM($longitude,'longitude');
-			$coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW'];
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
+			$latitude = $Common->convertDM($latitude, 'latitude');
+			$longitude = $Common->convertDM($longitude, 'longitude');
+			$coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW'];
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
 			$w = $w1.$w2;
 			//$w = '00';
 			$custom = '';
@@ -664,26 +663,26 @@ 
 			$geoid= round($GeoidClass->get($lat,$long)*3.28084,2);
 			$altitude_real = round($altitude_real + $geoid);
 			*/
-			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
+			$this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.'   *'.date('His', strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude_real, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}
 	}
 }
 class APRSMarine extends APRS {
-	public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed,$datetime, $putinarchive,$mmsi,$type,$typeid,$imo,$callsign,$arrival_code,$arrival_date,$status,$statusid,$noarchive,$format_source,$source_name,$over_country) {
+	public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed, $datetime, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $statusid, $noarchive, $format_source, $source_name, $over_country) {
 		$Common = new Common();
 		date_default_timezone_set('UTC');
 		if ($latitude != '' && $longitude != '') {
-			$latitude = $Common->convertDM($latitude,'latitude');
-			$longitude = $Common->convertDM($longitude,'longitude');
-			$coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW'];
-			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000));
-			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000));
+			$latitude = $Common->convertDM($latitude, 'latitude');
+			$longitude = $Common->convertDM($longitude, 'longitude');
+			$coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW'];
+			$w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000));
+			$w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000));
 			$w = $w1.$w2;
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
 				if ($custom != '') $custom .= '/';
-				$custom .= 'CS='.str_replace(' ','_',$ident);
+				$custom .= 'CS='.str_replace(' ', '_', $ident);
 			}
 			if ($typeid != '') {
 				if ($custom != '') $custom .= '/';
@@ -703,11 +702,11 @@ 
 			}
 			if ($arrival_code != '') {
 				if ($custom != '') $custom .= '/';
-				$custom .= 'AC='.str_replace(' ','_',$arrival_code);
+				$custom .= 'AC='.str_replace(' ', '_', $arrival_code);
 			}
 			if ($custom != '') $custom = ' '.$custom;
 			$altitude = 0;
-			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
+			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His', strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}
 	}
 }

Braces +307 added lines, -110 removed lines

@@ -196,16 +196,22 @@ 
 		
 		/* Check that end was found and body has at least one byte. */
 		if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) {
-			if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
+			if ($globalDebug) {
+				echo '!!! APRS invalid : '.$input."\n";
+			}
 			return false;
 		}
 		
-		if ($debug) echo 'input : '.$input."\n";
+		if ($debug) {
+			echo 'input : '.$input."\n";
+		}
 		/* Save header and body. */
 		$body = substr($input,$splitpos+1,$input_len);
 		$body_len = strlen($body);
 		$header = substr($input,0,$splitpos);
-		if ($debug) echo 'header : '.$header."\n";
+		if ($debug) {
+			echo 'header : '.$header."\n";
+		}
 		
 		/* Parse source, target and path. */
 		//FLRDF0A52>APRS,qAS,LSTB
@@ -219,11 +225,15 @@ 
 				$result['format_source'] = 'famaprs';
 				$result['source_type'] = 'ais';
 			} else {
-				if ($debug) echo 'ident : '.$ident."\n";
+				if ($debug) {
+					echo 'ident : '.$ident."\n";
+				}
 				$result['ident'] = $ident;
 			}
 		} else {
-			if ($debug) 'No ident'."\n";
+			if ($debug) {
+				'No ident'."\n";
+			}
 			return false;
 		}
 		$elements = explode(',',$all_elements);
@@ -233,7 +243,9 @@ 
 			if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
 			//if ($element == 'TCPIP*') return false;
 			} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
-				if ($debug) echo 'element : '.$element."\n";
+				if ($debug) {
+					echo 'element : '.$element."\n";
+				}
 				return false;
 			}
 			/*
@@ -246,13 +258,17 @@ 
 		}
 		
 		$type = substr($body,0,1);
-		if ($debug) echo 'type : '.$type."\n";
+		if ($debug) {
+			echo 'type : '.$type."\n";
+		}
 		if ($type == ';') {
 			if (isset($result['source_type']) && $result['source_type'] == 'modes') {
 				$result['address'] = trim(substr($body,1,9));
 			} elseif (isset($result['source_type']) && $result['source_type'] == 'ais') {
 				$result['mmsi'] = trim(substr($body,1,9));
-			} else $result['ident'] = trim(substr($body,1,9));
+			} else {
+				$result['ident'] = trim(substr($body,1,9));
+			}
 		} elseif ($type == ',') {
 			// Invalid data or test data
 			return false;
@@ -309,7 +325,9 @@ 
 			//$symbol_table = $matches[4];
 			$lat = intval($lat_deg);
 			$lon = intval($lon_deg);
-			if ($lat > 89 || $lon > 179) return false;
+			if ($lat > 89 || $lon > 179) {
+				return false;
+			}
 			/*
 			    $tmp_5b = str_replace('.','',$lat_min);
 			    if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) {
@@ -318,8 +336,12 @@ 
 			    */
 			$latitude = $lat + floatval($lat_min)/60;
 			$longitude = $lon + floatval($lon_min)/60;
-			if ($sind == 'S') $latitude = 0-$latitude;
-			if ($wind == 'W') $longitude = 0-$longitude;
+			if ($sind == 'S') {
+				$latitude = 0-$latitude;
+			}
+			if ($wind == 'W') {
+				$longitude = 0-$longitude;
+			}
 			$result['latitude'] = $latitude;
 			$result['longitude'] = $longitude;
 			$body_parse = substr($body_parse,18);
@@ -344,22 +366,29 @@ 
 			if ($find) {
 				$body_split = str_split($body_parse);
 				$symbol_code = $body_split[0];
-				if (!isset($symbolll) || $symbolll == '/') $symbol_code = '/'.$symbol_code;
-				else $symbol_code = '\\'.$symbol_code;
+				if (!isset($symbolll) || $symbolll == '/') {
+					$symbol_code = '/'.$symbol_code;
+				} else {
+					$symbol_code = '\\'.$symbol_code;
+				}
 				//'
 				//if ($type != ';' && $type != '>') {
 				if ($type != '') {
 					$body_parse = substr($body_parse,1);
 					$body_parse_len = strlen($body_parse);
 					$result['symbol_code'] = $symbol_code;
-					if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
+					if (isset($this->symbols[$symbol_code])) {
+						$result['symbol'] = $this->symbols[$symbol_code];
+					}
 					if ($symbol_code != '_') {
 					}
 					if ($body_parse_len >= 7) {
 						if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) {
 							$course = substr($body_parse,0,3);
 							$tmp_s = intval($course);
-							if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course);
+							if ($tmp_s >= 1 && $tmp_s <= 360) {
+								$result['heading'] = intval($course);
+							}
 							$speed = substr($body_parse,4,3);
 							if ($speed != '...') {
 								$result['speed'] = intval($speed);
@@ -394,10 +423,16 @@ 
 							$dao_split = str_split($dao);
 							$lat_off = (($dao_split[1])-48.0)*0.001/60.0;
 							$lon_off = (($dao_split[2])-48.0)*0.001/60.0;
-							if ($result['latitude'] < 0) $result['latitude'] -= $lat_off;
-							else $result['latitude'] += $lat_off;
-							if ($result['longitude'] < 0) $result['longitude'] -= $lon_off;
-							else $result['longitude'] += $lon_off;
+							if ($result['latitude'] < 0) {
+								$result['latitude'] -= $lat_off;
+							} else {
+								$result['latitude'] += $lat_off;
+							}
+							if ($result['longitude'] < 0) {
+								$result['longitude'] -= $lon_off;
+							} else {
+								$result['longitude'] += $lon_off;
+							}
 						}
 						$body_parse = substr($body_parse,6);
 					}
@@ -435,27 +470,48 @@ 
 						//$mode = substr($id,0,2);
 						$address = substr($id,2);
 						$addressType = (intval(substr($id,0,2),16))&3;
-						if ($addressType == 0) $result['addresstype'] = "RANDOM";
-						elseif ($addressType == 1) $result['addresstype'] = "ICAO";
-						elseif ($addressType == 2) $result['addresstype'] = "FLARM";
-						elseif ($addressType == 3) $result['addresstype'] = "OGN";
+						if ($addressType == 0) {
+							$result['addresstype'] = "RANDOM";
+						} elseif ($addressType == 1) {
+							$result['addresstype'] = "ICAO";
+						} elseif ($addressType == 2) {
+							$result['addresstype'] = "FLARM";
+						} elseif ($addressType == 3) {
+							$result['addresstype'] = "OGN";
+						}
 						$aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2);
 						$result['aircrafttype_code'] = $aircraftType;
-						if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN";
-						elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER";
-						elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE";
-						elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
-						elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE";
-						elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE";
-						elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER";
-						elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER";
-						elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT";
-						elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT";
-						elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO";
-						elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON";
-						elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP";
-						elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV";
-						elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT";
+						if ($aircraftType == 0) {
+							$result['aircrafttype'] = "UNKNOWN";
+						} elseif ($aircraftType == 1) {
+							$result['aircrafttype'] = "GLIDER";
+						} elseif ($aircraftType == 2) {
+							$result['aircrafttype'] = "TOW_PLANE";
+						} elseif ($aircraftType == 3) {
+							$result['aircrafttype'] = "HELICOPTER_ROTORCRAFT";
+						} elseif ($aircraftType == 4) {
+							$result['aircrafttype'] = "PARACHUTE";
+						} elseif ($aircraftType == 5) {
+							$result['aircrafttype'] = "DROP_PLANE";
+						} elseif ($aircraftType == 6) {
+							$result['aircrafttype'] = "HANG_GLIDER";
+						} elseif ($aircraftType == 7) {
+							$result['aircrafttype'] = "PARA_GLIDER";
+						} elseif ($aircraftType == 8) {
+							$result['aircrafttype'] = "POWERED_AIRCRAFT";
+						} elseif ($aircraftType == 9) {
+							$result['aircrafttype'] = "JET_AIRCRAFT";
+						} elseif ($aircraftType == 10) {
+							$result['aircrafttype'] = "UFO";
+						} elseif ($aircraftType == 11) {
+							$result['aircrafttype'] = "BALLOON";
+						} elseif ($aircraftType == 12) {
+							$result['aircrafttype'] = "AIRSHIP";
+						} elseif ($aircraftType == 13) {
+							$result['aircrafttype'] = "UAV";
+						} elseif ($aircraftType == 15) {
+							$result['aircrafttype'] = "STATIC_OBJECT";
+						}
 						$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
 						$result['stealth'] = $stealth;
 						$result['address'] = $address;
@@ -490,77 +546,181 @@ 
 					//g012t088r000p000P000h38b10110
 					//g011t086r000p000P000h29b10198
 					if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
-						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						}
+						if ($matches[5] != '...') {
+							$result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
+						}
+						if ($matches[6] != '...') {
+							$result['humidity'] = intval($matches[6]);
+						}
+						if ($matches[7] != '...') {
+							$result['pressure'] = round((intval($matches[7])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[5] != '...') {
+							$result['precipitation'] = round((intval($matches[5])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
+						}
+						if ($matches[6] != '...') {
+							$result['humidity'] = intval($matches[6]);
+						}
+						if ($matches[7] != '...') {
+							$result['pressure'] = round((intval($matches[7])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
-						if ($matches[7] != '...') $result['humidity'] = intval($matches[7]);
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						}
+						if ($matches[5] != '...') {
+							$result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1);
+						}
+						if ($matches[7] != '...') {
+							$result['humidity'] = intval($matches[7]);
+						}
+						if ($matches[6] != '...') {
+							$result['pressure'] = round((intval($matches[6])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1);
+						}
+						if ($matches[6] != '...') {
+							$result['humidity'] = intval($matches[6]);
+						}
+						if ($matches[5] != '...') {
+							$result['pressure'] = round((intval($matches[5])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[6] != '...') $result['humidity'] = intval($matches[6]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						}
+						if ($matches[6] != '...') {
+							$result['humidity'] = intval($matches[6]);
+						}
+						if ($matches[5] != '...') {
+							$result['pressure'] = round((intval($matches[5])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
-						if ($matches[5] != '...') $result['humidity'] = intval($matches[5]);
-						if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['precipitation'] = round((intval($matches[4])/100)*25.1,1);
+						}
+						if ($matches[5] != '...') {
+							$result['humidity'] = intval($matches[5]);
+						}
+						if ($matches[6] != '...') {
+							$result['pressure'] = round((intval($matches[6])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[2] != '...') $result['humidity'] = intval($matches[3]);
-						if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[2] != '...') {
+							$result['humidity'] = intval($matches[3]);
+						}
+						if ($matches[4] != '...') {
+							$result['pressure'] = round((intval($matches[4])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					} elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) {
-						if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1);
-						if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1);
-						if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1);
-						if ($matches[4] != '...') $result['humidity'] = intval($matches[4]);
-						if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1);
+						if ($matches[1] != '...') {
+							$result['wind_gust'] = round($matches[1]*1.60934,1);
+						}
+						if ($matches[2] != '...') {
+							$result['temp'] = round(5/9*((intval($matches[2]))-32),1);
+						}
+						if ($matches[3] != '...') {
+							$result['rain'] = round((intval($matches[3])/100)*25.1,1);
+						}
+						if ($matches[4] != '...') {
+							$result['humidity'] = intval($matches[4]);
+						}
+						if ($matches[5] != '...') {
+							$result['pressure'] = round((intval($matches[5])/10),1);
+						}
 						$body_parse = substr($body_parse,strlen($matches[0]));
 					}
 					$result['comment'] = trim($body_parse);
 				}
-			} else $result['comment'] = trim($body_parse);
+			} else {
+				$result['comment'] = trim($body_parse);
+			}
+		}
+		if (isset($result['latitude'])) {
+			$result['latitude'] = round($result['latitude'],4);
+		}
+		if (isset($result['longitude'])) {
+			$result['longitude'] = round($result['longitude'],4);
+		}
+		if ($debug) {
+			print_r($result);
 		}
-		if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4);
-		if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4);
-		if ($debug) print_r($result);
 		return $result;
 	}
 
@@ -572,12 +732,21 @@ 
 		$aprs_connect = 0;
 		$aprs_keep = 120;
 		$aprs_last_tx = time();
-		if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion;
-		else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
-		if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid;
-		else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
-		if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass;
-		else $aprs_pass = '-1';
+		if (isset($globalAPRSversion)) {
+			$aprs_version = $globalAPRSversion;
+		} else {
+			$aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName);
+		}
+		if (isset($globalServerAPRSssid)) {
+			$aprs_ssid = $globalServerAPRSssid;
+		} else {
+			$aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8);
+		}
+		if (isset($globalServerAPRSpass)) {
+			$aprs_pass = $globalServerAPRSpass;
+		} else {
+			$aprs_pass = '-1';
+		}
 		$aprs_filter  = '';
 		$aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n";
 		$Common = new Common();
@@ -616,10 +785,14 @@ 
 	*/
 	public function send($data) {
 		global $globalDebug;
-		if ($this->connected === false) $this->connect();
+		if ($this->connected === false) {
+			$this->connect();
+		}
 		$send = socket_send( $this->socket  , $data , strlen($data),0);
 		if ($send === FALSE) {
-			if ($globalDebug) echo 'Reconnect...';
+			if ($globalDebug) {
+				echo 'Reconnect...';
+			}
 			socket_close($this->socket);
 			$this->connect();
 		}
@@ -642,22 +815,32 @@ 
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'CS='.$ident;
 			}
 			if ($squawk != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'SQ='.$squawk;
 			}
 			if ($verticalrate != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'VR='.$verticalrate;
 			}
 			if ($aircraft_icao != '' && $aircraft_icao != 'NA') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AI='.$aircraft_icao;
 			}
-			if ($custom != '') $custom = ' '.$custom;
+			if ($custom != '') {
+				$custom = ' '.$custom;
+			}
 			/*
 			// Use AMSL altitude
 			$GeoidClass = new GeoidHeight();
@@ -682,30 +865,44 @@ 
 			//$w = '00';
 			$custom = '';
 			if ($ident != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'CS='.str_replace(' ','_',$ident);
 			}
 			if ($typeid != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'TI='.$typeid;
 			}
 			if ($statusid != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'SI='.$statusid;
 			}
 			if ($imo != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'IMO='.$imo;
 			}
 			if ($arrival_date != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AD='.strtotime($arrival_date);
 			}
 			if ($arrival_code != '') {
-				if ($custom != '') $custom .= '/';
+				if ($custom != '') {
+					$custom .= '/';
+				}
 				$custom .= 'AC='.str_replace(' ','_',$arrival_code);
 			}
-			if ($custom != '') $custom = ' '.$custom;
+			if ($custom != '') {
+				$custom = ' '.$custom;
+			}
 			$altitude = 0;
 			$this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n");
 		}

require/class.SBS.php

Doc Comments +8 added lines

@@ -190,12 +190,20 @@
 		return 1;
 	}
 
+	/**
+	 * @param double $lat
+	 * @param integer $isodd
+	 */
 	private function cprN($lat,$isodd) {
 		$nl = $this->cprNL($lat) - $isodd;
 		if ($nl > 1) return $nl;
 		else return 1;
 	}
 
+	/**
+	 * @param string $msg
+	 * @param string $bin
+	 */
 	private function parityCheck($msg, $bin) {
 		$modes_checksum_table = array(
 		    0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,

Indentation +14 added lines, -14 removed lines

@@ -198,20 +198,20 @@
 
 	private function parityCheck($msg, $bin) {
 		$modes_checksum_table = array(
-		    0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,
-		    0x2c38bc, 0x161c5e, 0x0b0e2f, 0xfa7d13, 0x82c48d, 0xbe9842, 0x5f4c21, 0xd05c14,
-		    0x682e0a, 0x341705, 0xe5f186, 0x72f8c3, 0xc68665, 0x9cb936, 0x4e5c9b, 0xd8d449,
-		    0x939020, 0x49c810, 0x24e408, 0x127204, 0x093902, 0x049c81, 0xfdb444, 0x7eda22,
-		    0x3f6d11, 0xe04c8c, 0x702646, 0x381323, 0xe3f395, 0x8e03ce, 0x4701e7, 0xdc7af7,
-		    0x91c77f, 0xb719bb, 0xa476d9, 0xadc168, 0x56e0b4, 0x2b705a, 0x15b82d, 0xf52612,
-		    0x7a9309, 0xc2b380, 0x6159c0, 0x30ace0, 0x185670, 0x0c2b38, 0x06159c, 0x030ace,
-		    0x018567, 0xff38b7, 0x80665f, 0xbfc92b, 0xa01e91, 0xaff54c, 0x57faa6, 0x2bfd53,
-		    0xea04ad, 0x8af852, 0x457c29, 0xdd4410, 0x6ea208, 0x375104, 0x1ba882, 0x0dd441,
-		    0xf91024, 0x7c8812, 0x3e4409, 0xe0d800, 0x706c00, 0x383600, 0x1c1b00, 0x0e0d80,
-		    0x0706c0, 0x038360, 0x01c1b0, 0x00e0d8, 0x00706c, 0x003836, 0x001c1b, 0xfff409,
-		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
-		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
-		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000
+			0x3935ea, 0x1c9af5, 0xf1b77e, 0x78dbbf, 0xc397db, 0x9e31e9, 0xb0e2f0, 0x587178,
+			0x2c38bc, 0x161c5e, 0x0b0e2f, 0xfa7d13, 0x82c48d, 0xbe9842, 0x5f4c21, 0xd05c14,
+			0x682e0a, 0x341705, 0xe5f186, 0x72f8c3, 0xc68665, 0x9cb936, 0x4e5c9b, 0xd8d449,
+			0x939020, 0x49c810, 0x24e408, 0x127204, 0x093902, 0x049c81, 0xfdb444, 0x7eda22,
+			0x3f6d11, 0xe04c8c, 0x702646, 0x381323, 0xe3f395, 0x8e03ce, 0x4701e7, 0xdc7af7,
+			0x91c77f, 0xb719bb, 0xa476d9, 0xadc168, 0x56e0b4, 0x2b705a, 0x15b82d, 0xf52612,
+			0x7a9309, 0xc2b380, 0x6159c0, 0x30ace0, 0x185670, 0x0c2b38, 0x06159c, 0x030ace,
+			0x018567, 0xff38b7, 0x80665f, 0xbfc92b, 0xa01e91, 0xaff54c, 0x57faa6, 0x2bfd53,
+			0xea04ad, 0x8af852, 0x457c29, 0xdd4410, 0x6ea208, 0x375104, 0x1ba882, 0x0dd441,
+			0xf91024, 0x7c8812, 0x3e4409, 0xe0d800, 0x706c00, 0x383600, 0x1c1b00, 0x0e0d80,
+			0x0706c0, 0x038360, 0x01c1b0, 0x00e0d8, 0x00706c, 0x003836, 0x001c1b, 0xfff409,
+			0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
+			0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
+			0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000
 		);
 		$crc = 0;
 		$checksum = intval(substr($msg,22,6),16);

Spacing +59 added lines, -59 removed lines

@@ -18,82 +18,82 @@ 
 	public function parse($buffer) {
 		// Not yet finished, no CRC checks
 		$data = array();
-		$typehex = substr($buffer,0,1);
-		if ($typehex == '*' || $typehex == ':') $hex = substr($buffer,1,-1);
-		elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-13);
-		else $hex = substr($buffer,1,-1);
-		$bin = gmp_strval( gmp_init($hex,16), 2);
+		$typehex = substr($buffer, 0, 1);
+		if ($typehex == '*' || $typehex == ':') $hex = substr($buffer, 1, -1);
+		elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer, 13, -13);
+		else $hex = substr($buffer, 1, -1);
+		$bin = gmp_strval(gmp_init($hex, 16), 2);
 		//if (strlen($hex) == 28 && $this->parityCheck($hex,$bin)) {
 		if (strlen($hex) == 28) {
-			$df = intval(substr($bin,0,5),2);
+			$df = intval(substr($bin, 0, 5), 2);
 			//$ca = intval(substr($bin,5,3),2);
 			// Only support DF17 for now
 			//if ($df == 17 || ($df == 18 && ($ca == 0 || $ca == 1 || $ca == 6))) {
-			if (($df == 17 || $df == 18) && ($this->parityCheck($hex,$bin) || $typehex == '@')) {
-				$icao = substr($hex,2,6);
+			if (($df == 17 || $df == 18) && ($this->parityCheck($hex, $bin) || $typehex == '@')) {
+				$icao = substr($hex, 2, 6);
 				$data['hex'] = $icao;
-				$tc = intval(substr($bin,32,5),2);
+				$tc = intval(substr($bin, 32, 5), 2);
 				if ($tc >= 1 && $tc <= 4) {
 					//callsign
-					$csbin = substr($bin,40,56);
+					$csbin = substr($bin, 40, 56);
 					$charset = str_split('#ABCDEFGHIJKLMNOPQRSTUVWXYZ#####_###############0123456789######');
 					$cs = '';
-					$cs .= $charset[intval(substr($csbin,0,6),2)];
-					$cs .= $charset[intval(substr($csbin,6,6),2)];
-					$cs .= $charset[intval(substr($csbin,12,6),2)];
-					$cs .= $charset[intval(substr($csbin,18,6),2)];
-					$cs .= $charset[intval(substr($csbin,24,6),2)];
-					$cs .= $charset[intval(substr($csbin,30,6),2)];
-					$cs .= $charset[intval(substr($csbin,36,6),2)];
-					$cs .= $charset[intval(substr($csbin,42,6),2)];
-					$cs = str_replace('_','',$cs);
-					$cs = str_replace('#','',$cs);
+					$cs .= $charset[intval(substr($csbin, 0, 6), 2)];
+					$cs .= $charset[intval(substr($csbin, 6, 6), 2)];
+					$cs .= $charset[intval(substr($csbin, 12, 6), 2)];
+					$cs .= $charset[intval(substr($csbin, 18, 6), 2)];
+					$cs .= $charset[intval(substr($csbin, 24, 6), 2)];
+					$cs .= $charset[intval(substr($csbin, 30, 6), 2)];
+					$cs .= $charset[intval(substr($csbin, 36, 6), 2)];
+					$cs .= $charset[intval(substr($csbin, 42, 6), 2)];
+					$cs = str_replace('_', '', $cs);
+					$cs = str_replace('#', '', $cs);
 					$callsign = $cs;
 					$data['ident'] = $callsign;
 				} elseif ($tc >= 9 && $tc <= 18) {
 					// Check Q-bit
-					$q = substr($bin,47,1);
+					$q = substr($bin, 47, 1);
 					if ($q) {
-						$n = intval(substr($bin,40,7).substr($bin,48,4),2);
-						$alt = $n*25-1000;
+						$n = intval(substr($bin, 40, 7).substr($bin, 48, 4), 2);
+						$alt = $n*25 - 1000;
 						$data['altitude'] = $alt;
 					}
 					// Check odd/even flag
-					$oe = substr($bin,53,1);
+					$oe = substr($bin, 53, 1);
 					//if ($oe) => odd else even
 					//  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
-					$cprlat = intval(substr($bin,54,17),2)/131072.0;
-					$cprlon = intval(substr($bin,71,17),2)/131072.0;
-					if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
+					$cprlat = intval(substr($bin, 54, 17), 2)/131072.0;
+					$cprlon = intval(substr($bin, 71, 17), 2)/131072.0;
+					if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat, 'longitude' => $cprlon, 'created' => time());
 					elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
 						$cprlat_odd = $cprlat;
 						$cprlon_odd = $cprlon;
 						$cprlat_even = $this::$latlon[$icao]['latitude'];
 						$cprlon_even = $this::$latlon[$icao]['longitude'];
-						$j = 59*$cprlat_even-60*$cprlat_odd+0.5;
-						$lat_even = (360.0/60)*($j%60+$cprlat_even);
-						$lat_odd = (360.0/59)*($j%59+$cprlat_odd);
+						$j = 59*$cprlat_even - 60*$cprlat_odd + 0.5;
+						$lat_even = (360.0/60)*($j%60 + $cprlat_even);
+						$lat_odd = (360.0/59)*($j%59 + $cprlat_odd);
 						if ($lat_even >= 270) $lat_even = $lat_even - 360;
 						if ($lat_odd >= 270) $lat_odd = $lat_odd - 360;
 						// check latitude zone
 						if ($this->cprNL($lat_even) == $this->cprNL($lat_odd)) {
 							if ($this::$latlon[$icao]['created'] > time()) {
-								$ni = $this->cprN($lat_even,0);
-								$m = floor($cprlon_even*($this->cprNL($lat_even)-1) - $cprlon_odd * $this->cprNL($lat_even)+0.5);
-								$lon = (360.0/$ni)*($m%$ni+$cprlon_even);
+								$ni = $this->cprN($lat_even, 0);
+								$m = floor($cprlon_even*($this->cprNL($lat_even) - 1) - $cprlon_odd*$this->cprNL($lat_even) + 0.5);
+								$lon = (360.0/$ni)*($m%$ni + $cprlon_even);
 								$lat = $lat_even;
-								if ($lon > 180) $lon = $lon -360;
+								if ($lon > 180) $lon = $lon - 360;
 								if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 									//if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
 									$data['latitude'] = $lat;
 									$data['longitude'] = $lon;
 								}
 							} else {
-								$ni = $this->cprN($lat_odd,1);
-								$m = floor($cprlon_even*($this->cprNL($lat_odd)-1) - $cprlon_odd * $this->cprNL($lat_odd)+0.5);
-								$lon = (360.0/$ni)*($m%$ni+$cprlon_odd);
+								$ni = $this->cprN($lat_odd, 1);
+								$m = floor($cprlon_even*($this->cprNL($lat_odd) - 1) - $cprlon_odd*$this->cprNL($lat_odd) + 0.5);
+								$lon = (360.0/$ni)*($m%$ni + $cprlon_odd);
 								$lat = $lat_odd;
-								if ($lon > 180) $lon = $lon -360;
+								if ($lon > 180) $lon = $lon - 360;
 								if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 									//if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
 									$data['latitude'] = $lat;
@@ -105,15 +105,15 @@ 
 					}
 				} elseif ($tc == 19) {
 					// speed & heading
-					$v_ew_dir = intval(substr($bin,45,1));
-					$v_ew = intval(substr($bin,46,10),2);
-					$v_ns_dir = intval(substr($bin,56,1));
-					$v_ns = intval(substr($bin,57,10),2);
+					$v_ew_dir = intval(substr($bin, 45, 1));
+					$v_ew = intval(substr($bin, 46, 10), 2);
+					$v_ns_dir = intval(substr($bin, 56, 1));
+					$v_ns = intval(substr($bin, 57, 10), 2);
 					if ($v_ew_dir) $v_ew = -1*$v_ew;
 					if ($v_ns_dir) $v_ns = -1*$v_ns;
-					$speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
-					$heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
-					if ($heading <0) $heading = $heading+360;
+					$speed = sqrt($v_ns*$v_ns + $v_ew*$v_ew);
+					$heading = atan2($v_ew, $v_ns)*360.0/(2*pi());
+					if ($heading < 0) $heading = $heading + 360;
 					$data['speed'] = $speed;
 					$data['heading'] = $heading;
 				}
@@ -128,7 +128,7 @@ 
 	 * Lookup table to convert the latitude to index.
 	*/
 	private function cprNL($lat) {
-		if ($lat < 0) $lat = -$lat;             // Table is simmetric about the equator.
+		if ($lat < 0) $lat = -$lat; // Table is simmetric about the equator.
 		if ($lat < 10.47047130) return 59;
 		if ($lat < 14.82817437) return 58;
 		if ($lat < 18.18626357) return 57;
@@ -190,7 +190,7 @@ 
 		return 1;
 	}
 
-	private function cprN($lat,$isodd) {
+	private function cprN($lat, $isodd) {
 		$nl = $this->cprNL($lat) - $isodd;
 		if ($nl > 1) return $nl;
 		else return 1;
@@ -214,9 +214,9 @@ 
 		    0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000
 		);
 		$crc = 0;
-		$checksum = intval(substr($msg,22,6),16);
+		$checksum = intval(substr($msg, 22, 6), 16);
 		for ($j = 0; $j < strlen($bin); $j++) {
-			if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
+			if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j], 0);
 		}
 		if ($crc == $checksum) return true;
 		else {
@@ -238,10 +238,10 @@ 
 			$msg['aircraftid'] = hexdec($data['address']);
 			$msg['hex'] = $data['address'];
 			$msg['flightid'] = hexdec($data['address']);
-			$msg['date_gen'] = date('Y/m/d',$data['timestamp']);
-			$msg['time_gen'] = date('H:i:s',$data['timestamp']).'.180';
-			$msg['date_log'] = date('Y/m/d',$data['timestamp']);
-			$msg['time_log'] = date('H:i:s',$data['timestamp']).'.180';
+			$msg['date_gen'] = date('Y/m/d', $data['timestamp']);
+			$msg['time_gen'] = date('H:i:s', $data['timestamp']).'.180';
+			$msg['date_log'] = date('Y/m/d', $data['timestamp']);
+			$msg['time_log'] = date('H:i:s', $data['timestamp']).'.180';
 			$msg['callsign'] = $data['ident'];
 			$msg['altitude'] = '';
 			$msg['speed'] = '';
@@ -254,7 +254,7 @@ 
 			$msg['emergency'] = '';
 			$msg['SPI'] = '';
 			$msg['ground'] = '';
-			$result[] = implode(',',$msg);
+			$result[] = implode(',', $msg);
 		}
 		if (isset($data['latitude']) && $data['latitude'] != 0) {
 			$msg = array();
@@ -264,10 +264,10 @@ 
 			$msg['aircraftid'] = hexdec($data['address']);
 			$msg['hex'] = $data['address'];
 			$msg['flightid'] = hexdec($data['address']);
-			$msg['date_gen'] = date('Y/m/d',$data['timestamp']);
-			$msg['time_gen'] = date('H:i:s',$data['timestamp']).'.180';
-			$msg['date_log'] = date('Y/m/d',$data['timestamp']);
-			$msg['time_log'] = date('H:i:s',$data['timestamp']).'.180';
+			$msg['date_gen'] = date('Y/m/d', $data['timestamp']);
+			$msg['time_gen'] = date('H:i:s', $data['timestamp']).'.180';
+			$msg['date_log'] = date('Y/m/d', $data['timestamp']);
+			$msg['time_log'] = date('H:i:s', $data['timestamp']).'.180';
 			$msg['callsign'] = '';
 			if (isset($data['altitude'])) $msg['altitude'] = $data['altitude'];
 			else $msg['altitude'] = '';
@@ -285,7 +285,7 @@ 
 			$msg['SPI'] = 0;
 			if (isset($data['ground'])) $msg['ground'] = 1;
 			else $msg['ground'] = 0;
-			$result[] = implode(',',$msg);
+			$result[] = implode(',', $msg);
 		}
 		return $result;
 	}

Braces +248 added lines, -87 removed lines

@@ -19,9 +19,13 @@ 
 		// Not yet finished, no CRC checks
 		$data = array();
 		$typehex = substr($buffer,0,1);
-		if ($typehex == '*' || $typehex == ':') $hex = substr($buffer,1,-1);
-		elseif ($typehex == '@' || $typehex == '%') $hex = substr($buffer,13,-13);
-		else $hex = substr($buffer,1,-1);
+		if ($typehex == '*' || $typehex == ':') {
+			$hex = substr($buffer,1,-1);
+		} elseif ($typehex == '@' || $typehex == '%') {
+			$hex = substr($buffer,13,-13);
+		} else {
+			$hex = substr($buffer,1,-1);
+		}
 		$bin = gmp_strval( gmp_init($hex,16), 2);
 		//if (strlen($hex) == 28 && $this->parityCheck($hex,$bin)) {
 		if (strlen($hex) == 28) {
@@ -64,8 +68,9 @@ 
 					//  131072 is 2^17 since CPR latitude and longitude are encoded in 17 bits.
 					$cprlat = intval(substr($bin,54,17),2)/131072.0;
 					$cprlon = intval(substr($bin,71,17),2)/131072.0;
-					if ($oe == 0) $this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
-					elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
+					if ($oe == 0) {
+						$this::$latlon[$icao] = array('latitude' => $cprlat,'longitude' => $cprlon,'created' => time());
+					} elseif (isset($this::$latlon[$icao]) && (time() - $this::$latlon[$icao]['created']) < 10) {
 						$cprlat_odd = $cprlat;
 						$cprlon_odd = $cprlon;
 						$cprlat_even = $this::$latlon[$icao]['latitude'];
@@ -73,8 +78,12 @@ 
 						$j = 59*$cprlat_even-60*$cprlat_odd+0.5;
 						$lat_even = (360.0/60)*($j%60+$cprlat_even);
 						$lat_odd = (360.0/59)*($j%59+$cprlat_odd);
-						if ($lat_even >= 270) $lat_even = $lat_even - 360;
-						if ($lat_odd >= 270) $lat_odd = $lat_odd - 360;
+						if ($lat_even >= 270) {
+							$lat_even = $lat_even - 360;
+						}
+						if ($lat_odd >= 270) {
+							$lat_odd = $lat_odd - 360;
+						}
 						// check latitude zone
 						if ($this->cprNL($lat_even) == $this->cprNL($lat_odd)) {
 							if ($this::$latlon[$icao]['created'] > time()) {
@@ -82,7 +91,9 @@ 
 								$m = floor($cprlon_even*($this->cprNL($lat_even)-1) - $cprlon_odd * $this->cprNL($lat_even)+0.5);
 								$lon = (360.0/$ni)*($m%$ni+$cprlon_even);
 								$lat = $lat_even;
-								if ($lon > 180) $lon = $lon -360;
+								if ($lon > 180) {
+									$lon = $lon -360;
+								}
 								if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 									//if ($globalDebug) echo 'cs : '.$cs.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon;
 									$data['latitude'] = $lat;
@@ -93,14 +104,18 @@ 
 								$m = floor($cprlon_even*($this->cprNL($lat_odd)-1) - $cprlon_odd * $this->cprNL($lat_odd)+0.5);
 								$lon = (360.0/$ni)*($m%$ni+$cprlon_odd);
 								$lat = $lat_odd;
-								if ($lon > 180) $lon = $lon -360;
+								if ($lon > 180) {
+									$lon = $lon -360;
+								}
 								if ($lat > -91 && $lat < 91 && $lon > -181 && $lon < 181) {
 									//if ($globalDebug) echo 'icao : '.$icao.' - hex : '.$hex.' - lat : '.$lat.' - lon : '.$lon.' second'."\n";
 									$data['latitude'] = $lat;
 									$data['longitude'] = $lon;
 								}
 							}
-						} else echo "Not cprNL";
+						} else {
+							echo "Not cprNL";
+						}
 						unset($this::$latlon[$icao]);
 					}
 				} elseif ($tc == 19) {
@@ -109,11 +124,17 @@ 
 					$v_ew = intval(substr($bin,46,10),2);
 					$v_ns_dir = intval(substr($bin,56,1));
 					$v_ns = intval(substr($bin,57,10),2);
-					if ($v_ew_dir) $v_ew = -1*$v_ew;
-					if ($v_ns_dir) $v_ns = -1*$v_ns;
+					if ($v_ew_dir) {
+						$v_ew = -1*$v_ew;
+					}
+					if ($v_ns_dir) {
+						$v_ns = -1*$v_ns;
+					}
 					$speed = sqrt($v_ns*$v_ns+$v_ew*$v_ew);
 					$heading = atan2($v_ew,$v_ns)*360.0/(2*pi());
-					if ($heading <0) $heading = $heading+360;
+					if ($heading <0) {
+						$heading = $heading+360;
+					}
 					$data['speed'] = $speed;
 					$data['heading'] = $heading;
 				}
@@ -128,72 +149,194 @@ 
 	 * Lookup table to convert the latitude to index.
 	*/
 	private function cprNL($lat) {
-		if ($lat < 0) $lat = -$lat;             // Table is simmetric about the equator.
-		if ($lat < 10.47047130) return 59;
-		if ($lat < 14.82817437) return 58;
-		if ($lat < 18.18626357) return 57;
-		if ($lat < 21.02939493) return 56;
-		if ($lat < 23.54504487) return 55;
-		if ($lat < 25.82924707) return 54;
-		if ($lat < 27.93898710) return 53;
-		if ($lat < 29.91135686) return 52;
-		if ($lat < 31.77209708) return 51;
-		if ($lat < 33.53993436) return 50;
-		if ($lat < 35.22899598) return 49;
-		if ($lat < 36.85025108) return 48;
-		if ($lat < 38.41241892) return 47;
-		if ($lat < 39.92256684) return 46;
-		if ($lat < 41.38651832) return 45;
-		if ($lat < 42.80914012) return 44;
-		if ($lat < 44.19454951) return 43;
-		if ($lat < 45.54626723) return 42;
-		if ($lat < 46.86733252) return 41;
-		if ($lat < 48.16039128) return 40;
-		if ($lat < 49.42776439) return 39;
-		if ($lat < 50.67150166) return 38;
-		if ($lat < 51.89342469) return 37;
-		if ($lat < 53.09516153) return 36;
-		if ($lat < 54.27817472) return 35;
-		if ($lat < 55.44378444) return 34;
-		if ($lat < 56.59318756) return 33;
-		if ($lat < 57.72747354) return 32;
-		if ($lat < 58.84763776) return 31;
-		if ($lat < 59.95459277) return 30;
-		if ($lat < 61.04917774) return 29;
-		if ($lat < 62.13216659) return 28;
-		if ($lat < 63.20427479) return 27;
-		if ($lat < 64.26616523) return 26;
-		if ($lat < 65.31845310) return 25;
-		if ($lat < 66.36171008) return 24;
-		if ($lat < 67.39646774) return 23;
-		if ($lat < 68.42322022) return 22;
-		if ($lat < 69.44242631) return 21;
-		if ($lat < 70.45451075) return 20;
-		if ($lat < 71.45986473) return 19;
-		if ($lat < 72.45884545) return 18;
-		if ($lat < 73.45177442) return 17;
-		if ($lat < 74.43893416) return 16;
-		if ($lat < 75.42056257) return 15;
-		if ($lat < 76.39684391) return 14;
-		if ($lat < 77.36789461) return 13;
-		if ($lat < 78.33374083) return 12;
-		if ($lat < 79.29428225) return 11;
-		if ($lat < 80.24923213) return 10;
-		if ($lat < 81.19801349) return 9;
-		if ($lat < 82.13956981) return 8;
-		if ($lat < 83.07199445) return 7;
-		if ($lat < 83.99173563) return 6;
-		if ($lat < 84.89166191) return 5;
-		if ($lat < 85.75541621) return 4;
-		if ($lat < 86.53536998) return 3;
-		if ($lat < 87.00000000) return 2;
+		if ($lat < 0) {
+			$lat = -$lat;
+		}
+		// Table is simmetric about the equator.
+		if ($lat < 10.47047130) {
+			return 59;
+		}
+		if ($lat < 14.82817437) {
+			return 58;
+		}
+		if ($lat < 18.18626357) {
+			return 57;
+		}
+		if ($lat < 21.02939493) {
+			return 56;
+		}
+		if ($lat < 23.54504487) {
+			return 55;
+		}
+		if ($lat < 25.82924707) {
+			return 54;
+		}
+		if ($lat < 27.93898710) {
+			return 53;
+		}
+		if ($lat < 29.91135686) {
+			return 52;
+		}
+		if ($lat < 31.77209708) {
+			return 51;
+		}
+		if ($lat < 33.53993436) {
+			return 50;
+		}
+		if ($lat < 35.22899598) {
+			return 49;
+		}
+		if ($lat < 36.85025108) {
+			return 48;
+		}
+		if ($lat < 38.41241892) {
+			return 47;
+		}
+		if ($lat < 39.92256684) {
+			return 46;
+		}
+		if ($lat < 41.38651832) {
+			return 45;
+		}
+		if ($lat < 42.80914012) {
+			return 44;
+		}
+		if ($lat < 44.19454951) {
+			return 43;
+		}
+		if ($lat < 45.54626723) {
+			return 42;
+		}
+		if ($lat < 46.86733252) {
+			return 41;
+		}
+		if ($lat < 48.16039128) {
+			return 40;
+		}
+		if ($lat < 49.42776439) {
+			return 39;
+		}
+		if ($lat < 50.67150166) {
+			return 38;
+		}
+		if ($lat < 51.89342469) {
+			return 37;
+		}
+		if ($lat < 53.09516153) {
+			return 36;
+		}
+		if ($lat < 54.27817472) {
+			return 35;
+		}
+		if ($lat < 55.44378444) {
+			return 34;
+		}
+		if ($lat < 56.59318756) {
+			return 33;
+		}
+		if ($lat < 57.72747354) {
+			return 32;
+		}
+		if ($lat < 58.84763776) {
+			return 31;
+		}
+		if ($lat < 59.95459277) {
+			return 30;
+		}
+		if ($lat < 61.04917774) {
+			return 29;
+		}
+		if ($lat < 62.13216659) {
+			return 28;
+		}
+		if ($lat < 63.20427479) {
+			return 27;
+		}
+		if ($lat < 64.26616523) {
+			return 26;
+		}
+		if ($lat < 65.31845310) {
+			return 25;
+		}
+		if ($lat < 66.36171008) {
+			return 24;
+		}
+		if ($lat < 67.39646774) {
+			return 23;
+		}
+		if ($lat < 68.42322022) {
+			return 22;
+		}
+		if ($lat < 69.44242631) {
+			return 21;
+		}
+		if ($lat < 70.45451075) {
+			return 20;
+		}
+		if ($lat < 71.45986473) {
+			return 19;
+		}
+		if ($lat < 72.45884545) {
+			return 18;
+		}
+		if ($lat < 73.45177442) {
+			return 17;
+		}
+		if ($lat < 74.43893416) {
+			return 16;
+		}
+		if ($lat < 75.42056257) {
+			return 15;
+		}
+		if ($lat < 76.39684391) {
+			return 14;
+		}
+		if ($lat < 77.36789461) {
+			return 13;
+		}
+		if ($lat < 78.33374083) {
+			return 12;
+		}
+		if ($lat < 79.29428225) {
+			return 11;
+		}
+		if ($lat < 80.24923213) {
+			return 10;
+		}
+		if ($lat < 81.19801349) {
+			return 9;
+		}
+		if ($lat < 82.13956981) {
+			return 8;
+		}
+		if ($lat < 83.07199445) {
+			return 7;
+		}
+		if ($lat < 83.99173563) {
+			return 6;
+		}
+		if ($lat < 84.89166191) {
+			return 5;
+		}
+		if ($lat < 85.75541621) {
+			return 4;
+		}
+		if ($lat < 86.53536998) {
+			return 3;
+		}
+		if ($lat < 87.00000000) {
+			return 2;
+		}
 		return 1;
 	}
 
 	private function cprN($lat,$isodd) {
 		$nl = $this->cprNL($lat) - $isodd;
-		if ($nl > 1) return $nl;
-		else return 1;
+		if ($nl > 1) {
+			return $nl;
+		} else {
+			return 1;
+		}
 	}
 
 	private function parityCheck($msg, $bin) {
@@ -216,10 +359,13 @@ 
 		$crc = 0;
 		$checksum = intval(substr($msg,22,6),16);
 		for ($j = 0; $j < strlen($bin); $j++) {
-			if ($bin[$j]) $crc = $crc^intval($modes_checksum_table[$j],0);
+			if ($bin[$j]) {
+				$crc = $crc^intval($modes_checksum_table[$j],0);
+			}
 		}
-		if ($crc == $checksum) return true;
-		else {
+		if ($crc == $checksum) {
+			return true;
+		} else {
 			//echo "**** CRC ERROR ****\n";
 			return false;
 		}
@@ -269,22 +415,37 @@ 
 			$msg['date_log'] = date('Y/m/d',$data['timestamp']);
 			$msg['time_log'] = date('H:i:s',$data['timestamp']).'.180';
 			$msg['callsign'] = '';
-			if (isset($data['altitude'])) $msg['altitude'] = $data['altitude'];
-			else $msg['altitude'] = '';
+			if (isset($data['altitude'])) {
+				$msg['altitude'] = $data['altitude'];
+			} else {
+				$msg['altitude'] = '';
+			}
 			$msg['speed'] = $data['speed'];
-			if (isset($data['heading'])) $msg['track'] = $data['heading'];
-			else $msg['track'] = '';
+			if (isset($data['heading'])) {
+				$msg['track'] = $data['heading'];
+			} else {
+				$msg['track'] = '';
+			}
 			$msg['latitude'] = $data['latitude'];
 			$msg['longitude'] = $data['longitude'];
-			if (isset($data['verticalrate'])) $msg['verticalrate'] = $data['verticalrate'];
-			else $msg['verticalrate'] = '';
-			if (isset($data['squawk'])) $msg['squawk'] = $data['squawk'];
-			else $msg['squawk'] = 0;
+			if (isset($data['verticalrate'])) {
+				$msg['verticalrate'] = $data['verticalrate'];
+			} else {
+				$msg['verticalrate'] = '';
+			}
+			if (isset($data['squawk'])) {
+				$msg['squawk'] = $data['squawk'];
+			} else {
+				$msg['squawk'] = 0;
+			}
 			$msg['alert'] = 0;
 			$msg['emergency'] = 0;
 			$msg['SPI'] = 0;
-			if (isset($data['ground'])) $msg['ground'] = 1;
-			else $msg['ground'] = 0;
+			if (isset($data['ground'])) {
+				$msg['ground'] = 1;
+			} else {
+				$msg['ground'] = 0;
+			}
 			$result[] = implode(',',$msg);
 		}
 		return $result;

require/class.METAR.php

Indentation +34 added lines, -34 removed lines

@@ -14,35 +14,35 @@ 
 	public $db;
 	
 	protected $texts = Array(
-	    'MI' => 'Shallow',
-	    'PR' => 'Partial',
-	    'BC' => 'Low drifting',
-	    'BL' => 'Blowing',
-	    'SH' => 'Showers',
-	    'TS' => 'Thunderstorm',
-	    'FZ' => 'Freezing',
-	    'DZ' => 'Drizzle',
-	    'RA' => 'Rain',
-	    'SN' => 'Snow',
-	    'SG' => 'Snow Grains',
-	    'IC' => 'Ice crystals',
-	    'PL' => 'Ice pellets',
-	    'GR' => 'Hail',
-	    'GS' => 'Small hail',
-	    'UP' => 'Unknown',
-	    'BR' => 'Mist',
-	    'FG' => 'Fog',
-	    'FU' => 'Smoke',
-	    'VA' => 'Volcanic ash',
-	    'DU' => 'Widespread dust',
-	    'SA' => 'Sand',
-	    'HZ' => 'Haze',
-	    'PY' => 'Spray',
-	    'PO' => 'Well developed dust / sand whirls',
-	    'SQ' => 'Squalls',
-	    'FC' => 'Funnel clouds inc tornadoes or waterspouts',
-	    'SS' => 'Sandstorm',
-	    'DS' => 'Duststorm'
+		'MI' => 'Shallow',
+		'PR' => 'Partial',
+		'BC' => 'Low drifting',
+		'BL' => 'Blowing',
+		'SH' => 'Showers',
+		'TS' => 'Thunderstorm',
+		'FZ' => 'Freezing',
+		'DZ' => 'Drizzle',
+		'RA' => 'Rain',
+		'SN' => 'Snow',
+		'SG' => 'Snow Grains',
+		'IC' => 'Ice crystals',
+		'PL' => 'Ice pellets',
+		'GR' => 'Hail',
+		'GS' => 'Small hail',
+		'UP' => 'Unknown',
+		'BR' => 'Mist',
+		'FG' => 'Fog',
+		'FU' => 'Smoke',
+		'VA' => 'Volcanic ash',
+		'DU' => 'Widespread dust',
+		'SA' => 'Sand',
+		'HZ' => 'Haze',
+		'PY' => 'Spray',
+		'PO' => 'Well developed dust / sand whirls',
+		'SQ' => 'Squalls',
+		'FC' => 'Funnel clouds inc tornadoes or waterspouts',
+		'SS' => 'Sandstorm',
+		'DS' => 'Duststorm'
 	);
 
 	/*
@@ -177,7 +177,7 @@ 
     				$result['QNH_format'] = $matches[1] == 'Q' ? 'hPa' : 'inHg';
     				*/
 			}
-                     /*
+					 /*
     			// Wind Direction
     			if (preg_match('#^([0-9]{3})V([0-9]{3})$#', $piece, $matches)) {
     				$result['wind_direction'] = $matches[1];
@@ -188,7 +188,7 @@ 
     				$result['speed_variable'] = $matches[1];
     			}
     			*/
-    			// Visibility
+				// Visibility
 			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
 				if (isset($matches[3]) && strlen($matches[3]) > 0) {
 					$result['visibility'] = (float)$matches[3] * 1609.34;
@@ -246,9 +246,9 @@ 
 				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
 				if (isset($matches[3])) {
 					$range = Array(
-					    'from' => (float)$matches[2],
-					    'to'   => (float)$matches[4],
-					    'unit' => $matches[5] ? 'FT' : 'M'
+						'from' => (float)$matches[2],
+						'to'   => (float)$matches[4],
+						'unit' => $matches[5] ? 'FT' : 'M'
 					);
 				}
 				$result['RVR'] = $matches[1];

Spacing +48 added lines, -48 removed lines

@@ -68,7 +68,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
@@ -87,7 +87,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -100,9 +100,9 @@ 
 	public function parse($data) {
 		//$data = str_replace(array('\n','\r','\r','\n'),'',$data);
 		$codes = implode('|', array_keys($this->texts));
-		$regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#';
+		$regWeather = '#^(\+|\-|VC)?('.$codes.')('.$codes.')?$#';
 		//$pieces = explode(' ',$data);
-		$pieces = preg_split('/\s/',$data);
+		$pieces = preg_split('/\s/', $data);
 		$pos = 0;
 		if ($pieces[0] == 'METAR') $pos++;
 		elseif ($pieces[0] == 'SPECI') $pos++;
@@ -112,25 +112,25 @@ 
 		$result['location'] = $pieces[$pos];
 		$pos++;
 		if (!isset($pieces[$pos])) return $result;
-		$result['dayofmonth'] = substr($pieces[$pos],0,2);
-		$result['time'] = substr($pieces[$pos],2,4);
+		$result['dayofmonth'] = substr($pieces[$pos], 0, 2);
+		$result['time'] = substr($pieces[$pos], 2, 4);
 		$c = count($pieces);
-		for($pos++; $pos < $c; $pos++) {
+		for ($pos++; $pos < $c; $pos++) {
 			$piece = $pieces[$pos];
 			if ($piece == 'RMK') break;
 			if ($piece == 'AUTO') $result['auto'] = true;
 			if ($piece == 'COR') $result['correction'] = true;
 			// Wind Speed
 			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
-				$result['wind']['direction'] = (float)$matches[1];
+				$result['wind']['direction'] = (float) $matches[1];
 				$result['wind']['unit'] = $matches[4];
-				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
-				$result['wind']['gust'] = (float)$matches[3];
+				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float) $matches[2])*0.51444444444, 2);
+				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float) $matches[2])*1000, 2);
+				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float) $matches[2]), 2);
+				$result['wind']['gust'] = (float) $matches[3];
 				$result['wind']['unit'] = $matches[4];
-				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
-				$result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0;
+				$result['wind']['min_variation'] = array_key_exists(5, $matches) ? $matches[5] : 0;
+				$result['wind']['max_variation'] = array_key_exists(6, $matches) ? $matches[6] : 0;
 			}
 
 /*    			if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) {
@@ -151,14 +151,14 @@ 
 
 			// Temperature
 			if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) {
-				$temp = (float)$matches[1];
+				$temp = (float) $matches[1];
 				if ($matches[1]{0} == 'M') {
-					$temp = ((float)substr($matches[1], 1)) * -1;
+					$temp = ((float) substr($matches[1], 1))*-1;
 				}
 				$result['temperature'] = $temp;
-				$dew = (float)$matches[2];
+				$dew = (float) $matches[2];
 				if ($matches[2]{0} == 'M') {
-					$dew = ((float)substr($matches[2], 1)) * -1;
+					$dew = ((float) substr($matches[2], 1))*-1;
 				}
 				$result['dew'] = $dew;
 			}
@@ -170,7 +170,7 @@ 
 					$result['QNH'] = $matches[2];
 				} else {
 					// inHg
-					$result['QNH'] = round(($matches[2] / 100)*33.86389,2);
+					$result['QNH'] = round(($matches[2]/100)*33.86389, 2);
 				}
 				/*
     				$result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100);
@@ -191,12 +191,12 @@ 
     			// Visibility
 			if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) {
 				if (isset($matches[3]) && strlen($matches[3]) > 0) {
-					$result['visibility'] = (float)$matches[3] * 1609.34;
+					$result['visibility'] = (float) $matches[3]*1609.34;
 				} else {
 					if ($matches[1] == '9999') {
 						$result['visibility'] = '> 10000';
 					} else {
-						$result['visibility'] = (float)$matches[1];
+						$result['visibility'] = (float) $matches[1];
 					}
 				}
 				if (preg_match('#^CAVOK$#', $piece, $matches)) {
@@ -218,7 +218,7 @@ 
 				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
 				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
 				$cloud['type_code'] = $type;
-				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
+				$cloud['level'] = round(((float) $matches[2])*100*0.3048);
 				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
 				$result['cloud'][] = $cloud;
 			}
@@ -228,8 +228,8 @@ 
 				$rvr['runway'] = $matches[1];
 				$rvr['assessment'] = $matches[2];
 				$rvr['rvr'] = $matches[3];
-				$rvr['rvr_max'] = array_key_exists(4,$matches) ? $matches[4] : 0;
-				$rvr['unit'] = array_key_exists(5,$matches) ? $matches[5] : '';
+				$rvr['rvr_max'] = array_key_exists(4, $matches) ? $matches[4] : 0;
+				$rvr['unit'] = array_key_exists(5, $matches) ? $matches[5] : '';
 				$result['RVR'] = $rvr;
 			}
 			//if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
@@ -242,12 +242,12 @@ 
 				$result['RVR']['friction'] = $matches[5];
 			}
 			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				if (isset($matches[5])) $range = array('exact' => (float) $matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+				else $range = array('exact' => (float) $matches[2], 'unit' => 'M');
 				if (isset($matches[3])) {
 					$range = Array(
-					    'from' => (float)$matches[2],
-					    'to'   => (float)$matches[4],
+					    'from' => (float) $matches[2],
+					    'to'   => (float) $matches[4],
 					    'unit' => $matches[5] ? 'FT' : 'M'
 					);
 				}
@@ -300,7 +300,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$all = $sth->fetchAll(PDO::FETCH_ASSOC);
@@ -316,19 +316,19 @@ 
 	 * @param String $metar METAR text
 	 * @param String $date date of the METAR
 	*/
-	public function addMETAR($location,$metar,$date) {
+	public function addMETAR($location, $metar, $date) {
 		global $globalDBdriver;
-		$date = date('Y-m-d H:i:s',strtotime($date));
+		$date = date('Y-m-d H:i:s', strtotime($date));
 		if ($globalDBdriver == 'mysql') {
 			$query = "INSERT INTO metar (metar_location,metar_date,metar) VALUES (:location,:date,:metar) ON DUPLICATE KEY UPDATE metar_date = :date, metar = :metar";
 		} else {
 			$query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);";
 		}
-		$query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar));
+		$query_values = array(':location' => $location, ':date' => $date, ':metar' => utf8_encode($metar));
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -343,7 +343,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -356,7 +356,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -370,27 +370,27 @@ 
 		date_default_timezone_set("UTC");
 		$Common = new Common();
 		if (isset($globalIVAO) && $globalIVAO) {
-			$Common->download('http://wx.ivao.aero/metar.php',dirname(__FILE__).'/../install/tmp/ivaometar.txt');
-			$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r");
+			$Common->download('http://wx.ivao.aero/metar.php', dirname(__FILE__).'/../install/tmp/ivaometar.txt');
+			$handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt', "r");
 		} else {
-			$Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT',dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT');
-			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
+			$Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT', dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT');
+			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT', "r");
 		}
 		if ($handle) {
 			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
 			$date = '';
 			if ($globalTransaction) $this->db->beginTransaction();
-			while(($line = fgets($handle,4096)) !== false) {
-				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+			while (($line = fgets($handle, 4096)) !== false) {
+				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
 					$date = $line;
 				} elseif ($line != '') {
 					if ($date == '') $date = date('Y/m/d H:m');
 					$pos = 0;
-					$pieces = preg_split('/\s/',$line);
+					$pieces = preg_split('/\s/', $line);
 					if ($pieces[0] == 'METAR') $pos++;
 					if (strlen($pieces[$pos]) != 4) $pos++;
 					$location = $pieces[$pos];
-					echo $this->addMETAR($location,$line,$date);
+					echo $this->addMETAR($location, $line, $date);
 				}
 			}
 			fclose($handle);
@@ -409,22 +409,22 @@ 
 		if ($globalMETARurl == '') return array();
 		date_default_timezone_set("UTC");
 		$Common = new Common();
-		$url = str_replace('{icao}',$icao,$globalMETARurl);
+		$url = str_replace('{icao}', $icao, $globalMETARurl);
 		$cycle = $Common->getData($url);
 		$date = '';
-		foreach(explode("\n",$cycle) as $line) {
-			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
+		foreach (explode("\n", $cycle) as $line) {
+			if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) {
 				$date = $line;
 			} 
 			if ($line != '') {
 				if ($date == '') $date = date('Y/m/d H:m');
 				$pos = 0;
-				$pieces = preg_split('/\s/',$line);
+				$pieces = preg_split('/\s/', $line);
 				if ($pieces[0] == 'METAR') $pos++;
 				if (strlen($pieces[$pos]) != 4) $pos++;
 				$location = $pieces[$pos];
 				if (strlen($location == 4)) {
-					$this->addMETAR($location,$line,$date);
+					$this->addMETAR($location, $line, $date);
 					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
 				} else return array();
 			}

Braces +106 added lines, -40 removed lines

@@ -73,8 +73,11 @@ 
 		}
 		$row = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
-		if ($row['nb'] > 0) return false;
-		else return true;
+		if ($row['nb'] > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	/*
@@ -104,29 +107,48 @@ 
 		//$pieces = explode(' ',$data);
 		$pieces = preg_split('/\s/',$data);
 		$pos = 0;
-		if ($pieces[0] == 'METAR') $pos++;
-		elseif ($pieces[0] == 'SPECI') $pos++;
-		if (strlen($pieces[$pos]) != 4) $pos++;
+		if ($pieces[0] == 'METAR') {
+			$pos++;
+		} elseif ($pieces[0] == 'SPECI') {
+			$pos++;
+		}
+		if (strlen($pieces[$pos]) != 4) {
+			$pos++;
+		}
 		$result = array();
-		if (!isset($pieces[$pos])) return $result;
+		if (!isset($pieces[$pos])) {
+			return $result;
+		}
 		$result['location'] = $pieces[$pos];
 		$pos++;
-		if (!isset($pieces[$pos])) return $result;
+		if (!isset($pieces[$pos])) {
+			return $result;
+		}
 		$result['dayofmonth'] = substr($pieces[$pos],0,2);
 		$result['time'] = substr($pieces[$pos],2,4);
 		$c = count($pieces);
 		for($pos++; $pos < $c; $pos++) {
 			$piece = $pieces[$pos];
-			if ($piece == 'RMK') break;
-			if ($piece == 'AUTO') $result['auto'] = true;
-			if ($piece == 'COR') $result['correction'] = true;
+			if ($piece == 'RMK') {
+				break;
+			}
+			if ($piece == 'AUTO') {
+				$result['auto'] = true;
+			}
+			if ($piece == 'COR') {
+				$result['correction'] = true;
+			}
 			// Wind Speed
 			if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) {
 				$result['wind']['direction'] = (float)$matches[1];
 				$result['wind']['unit'] = $matches[4];
-				if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
-				elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2);
-				elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2);
+				if ($result['wind']['unit'] == 'KT') {
+					$result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2);
+				} elseif ($result['wind']['unit'] == 'KPH') {
+					$result['wind']['speed'] = round(((float)$matches[2])*1000,2);
+				} elseif ($result['wind']['unit'] == 'MPS') {
+					$result['wind']['speed'] = round(((float)$matches[2]),2);
+				}
 				$result['wind']['gust'] = (float)$matches[3];
 				$result['wind']['unit'] = $matches[4];
 				$result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0;
@@ -209,14 +231,23 @@ 
 				//$this->addCloudCover($matches[1], ((float)$matches[2]) * 100, isset($matches[3]) ? $matches[3] : '');
 				$type = $matches[1];
 				$cloud = array();
-				if ($type == 'SKC') $cloud['type'] = 'No cloud/Sky clear';
-				elseif ($type == 'CLR') $cloud['type'] = 'No cloud below 12,000ft (3700m)';
-				elseif ($type == 'NSC') $cloud['type'] = 'No significant cloud';
-				elseif ($type == 'FEW') $cloud['type'] = 'Few';
-				elseif ($type == 'SCT') $cloud['type'] = 'Scattered';
-				elseif ($type == 'BKN') $cloud['type'] = 'Broken';
-				elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage';
-				elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility';
+				if ($type == 'SKC') {
+					$cloud['type'] = 'No cloud/Sky clear';
+				} elseif ($type == 'CLR') {
+					$cloud['type'] = 'No cloud below 12,000ft (3700m)';
+				} elseif ($type == 'NSC') {
+					$cloud['type'] = 'No significant cloud';
+				} elseif ($type == 'FEW') {
+					$cloud['type'] = 'Few';
+				} elseif ($type == 'SCT') {
+					$cloud['type'] = 'Scattered';
+				} elseif ($type == 'BKN') {
+					$cloud['type'] = 'Broken';
+				} elseif ($type == 'OVC') {
+					$cloud['type'] = 'Overcast/Full cloud coverage';
+				} elseif ($type == 'VV') {
+					$cloud['type'] = 'Vertical visibility';
+				}
 				$cloud['type_code'] = $type;
 				$cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048);
 				$cloud['significant'] = isset($matches[3]) ? $matches[3] : '';
@@ -242,8 +273,11 @@ 
 				$result['RVR']['friction'] = $matches[5];
 			}
 			if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) {
-				if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
-				else $range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				if (isset($matches[5])) {
+					$range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M');
+				} else {
+					$range = array('exact' => (float)$matches[2], 'unit' => 'M');
+				}
 				if (isset($matches[3])) {
 					$range = Array(
 					    'from' => (float)$matches[2],
@@ -276,8 +310,11 @@ 
 				if (isset($matches[3])) {
 					$text[] = $this->texts[$matches[3]];
 				}
-				if (!isset($result['weather'])) $result['weather'] = implode(' ', $text);
-				else $result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				if (!isset($result['weather'])) {
+					$result['weather'] = implode(' ', $text);
+				} else {
+					$result['weather'] = $result['weather'].' / '.implode(' ', $text);
+				}
 			}
 		}
 		return $result;
@@ -293,8 +330,11 @@ 
 		if (isset($globalMETARcycle) && $globalMETARcycle) {
 			$query = "SELECT * FROM metar WHERE metar_location = :icao";
 		} else {
-			if ($globalDBdriver == 'mysql') $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
-			else $query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+			if ($globalDBdriver == 'mysql') {
+				$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= DATE_SUB(UTC_TIMESTAMP(), INTERVAL 10 HOUR) LIMIT 1";
+			} else {
+				$query = "SELECT * FROM metar WHERE metar_location = :icao AND metar_date >= now() AT TIMEZONE 'UTC' - '10 HOUR'->INTERVAL LIMIT 0,1";
+			}
 		}
 		$query_values = array(':icao' => $icao);
 		try {
@@ -366,7 +406,9 @@ 
 	*/
 	public function addMETARCycle() {
 		global $globalDebug, $globalIVAO, $globalTransaction;
-		if (isset($globalDebug) && $globalDebug) echo "Downloading METAR cycle...";
+		if (isset($globalDebug) && $globalDebug) {
+			echo "Downloading METAR cycle...";
+		}
 		date_default_timezone_set("UTC");
 		$Common = new Common();
 		if (isset($globalIVAO) && $globalIVAO) {
@@ -377,26 +419,40 @@ 
 			$handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r");
 		}
 		if ($handle) {
-			if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB...";
+			if (isset($globalDebug) && $globalDebug) {
+				echo "Done - Updating DB...";
+			}
 			$date = '';
-			if ($globalTransaction) $this->db->beginTransaction();
+			if ($globalTransaction) {
+				$this->db->beginTransaction();
+			}
 			while(($line = fgets($handle,4096)) !== false) {
 				if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) {
 					$date = $line;
 				} elseif ($line != '') {
-					if ($date == '') $date = date('Y/m/d H:m');
+					if ($date == '') {
+						$date = date('Y/m/d H:m');
+					}
 					$pos = 0;
 					$pieces = preg_split('/\s/',$line);
-					if ($pieces[0] == 'METAR') $pos++;
-					if (strlen($pieces[$pos]) != 4) $pos++;
+					if ($pieces[0] == 'METAR') {
+						$pos++;
+					}
+					if (strlen($pieces[$pos]) != 4) {
+						$pos++;
+					}
 					$location = $pieces[$pos];
 					echo $this->addMETAR($location,$line,$date);
 				}
 			}
 			fclose($handle);
-			if ($globalTransaction) $this->db->commit();
+			if ($globalTransaction) {
+				$this->db->commit();
+			}
+		}
+		if (isset($globalDebug) && $globalDebug) {
+			echo "Done\n";
 		}
-		if (isset($globalDebug) && $globalDebug) echo "Done\n";
 	}
 
 	/*
@@ -406,7 +462,9 @@ 
 	*/
 	public function downloadMETAR($icao) {
 		global $globalMETARurl;
-		if ($globalMETARurl == '') return array();
+		if ($globalMETARurl == '') {
+			return array();
+		}
 		date_default_timezone_set("UTC");
 		$Common = new Common();
 		$url = str_replace('{icao}',$icao,$globalMETARurl);
@@ -417,16 +475,24 @@ 
 				$date = $line;
 			} 
 			if ($line != '') {
-				if ($date == '') $date = date('Y/m/d H:m');
+				if ($date == '') {
+					$date = date('Y/m/d H:m');
+				}
 				$pos = 0;
 				$pieces = preg_split('/\s/',$line);
-				if ($pieces[0] == 'METAR') $pos++;
-				if (strlen($pieces[$pos]) != 4) $pos++;
+				if ($pieces[0] == 'METAR') {
+					$pos++;
+				}
+				if (strlen($pieces[$pos]) != 4) {
+					$pos++;
+				}
 				$location = $pieces[$pos];
 				if (strlen($location == 4)) {
 					$this->addMETAR($location,$line,$date);
 					return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line));
-				} else return array();
+				} else {
+					return array();
+				}
 			}
 		}
 		return array();

require/class.TSK.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 	*/
 	public function parse_xml($url) {
 		$Common = new Common();
-		$filedata = $Common->getData($url,'get','','','','','','',true);
+		$filedata = $Common->getData($url, 'get', '', '', '', '', '', '', true);
 		if ($filedata != '' && $filedata !== false) {
 			$xml = simplexml_load_string($filedata);
 			if ($xml !== false) {

install/install-action.php

Indentation +12 added lines, -12 removed lines

@@ -86,9 +86,9 @@ 
 	if ($check_version == '0') {
 		
 		if ($globalDBdriver == 'mysql') {
-		    $error .= create_db::import_all_db('../db/');
+			$error .= create_db::import_all_db('../db/');
 		} elseif ($globalDBdriver == 'pgsql') {
-		    $error .= create_db::import_all_db('../db/pgsql/');
+			$error .= create_db::import_all_db('../db/pgsql/');
 		}
 		if ($error != '') {
 			$_SESSION['error'] = $error;
@@ -98,8 +98,8 @@ 
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
 		} else {
-		    $_SESSION['install'] = 'sources';
-		    $_SESSION['next'] = 'Insert data in source table';
+			$_SESSION['install'] = 'sources';
+			$_SESSION['next'] = 'Insert data in source table';
 		}
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
@@ -156,10 +156,10 @@ 
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
 	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
-	    $_SESSION['install'] = 'notam';
-	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'notam';
+		$_SESSION['next'] = 'Populate NOTAM table with externals data';
+		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	/*
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
 	    $_SESSION['install'] = 'owner';
@@ -169,10 +169,10 @@ 
 	    print json_encode($result);
 	*/
 	} else {
-	    $_SESSION['install'] = 'sources';
-	    $_SESSION['next'] = 'Insert data in source table';
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'sources';
+		$_SESSION['next'] = 'Insert data in source table';
+		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
 	if (!is_writable('tmp')) {

Spacing +67 added lines, -67 removed lines

@@ -70,15 +70,15 @@ 
 	$globalDebug = FALSE;
 	$dbroot = $_SESSION['database_root'];
 	$dbrootpass = $_SESSION['database_rootpass'];
-	$error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost);
+	$error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost);
 	sleep(5);
 	if ($error != '') {
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create database'));
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create database'));
 	$_SESSION['install'] = 'database_import';
 	$_SESSION['next'] = 'Create and import tables';
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
 	$globalDebug = FALSE;
@@ -92,8 +92,8 @@ 
 		}
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables'));
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
@@ -101,24 +101,24 @@ 
 		    $_SESSION['install'] = 'sources';
 		    $_SESSION['next'] = 'Insert data in source table';
 		}
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} elseif (!is_numeric($check_version)) {
 		$error .= $check_version;
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables'));
 		if (!isset($_SESSION['next'])) $_SESSION['next'] = '';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		$error .= update_schema::check_version(true);
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Update schema if needed'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed'));
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') {
@@ -127,8 +127,8 @@ 
 	$error .= update_db::update_waypoints();
 	if ($error != '') {
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate waypoints database'));
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database'));
 /*
 	$_SESSION['install'] = 'airspace';
 	$_SESSION['next'] = 'Populate airspace table';
@@ -145,7 +145,7 @@ 
 */
 	$_SESSION['install'] = 'countries';
 	$_SESSION['next'] = 'Populate countries table';
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') {
 	include_once('class.update_db.php');
@@ -153,12 +153,12 @@ 
 	$error .= update_db::update_countries();
 	if ($error != '') {
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate countries database'));
+	} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database'));
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	    $_SESSION['install'] = 'notam';
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	    print json_encode($result);
 	/*
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
@@ -171,15 +171,15 @@ 
 	} else {
 	    $_SESSION['install'] = 'sources';
 	    $_SESSION['next'] = 'Insert data in source table';
-	    $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	    $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	    print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -187,19 +187,19 @@ 
 		$error .= update_db::update_ModeS_fam();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B'));
 		$_SESSION['install'] = 'populate_flarm';
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -208,8 +208,8 @@ 
 		$error .= update_db::update_ModeS_ogn();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM'));
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
 			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
@@ -228,15 +228,15 @@ 
 			$_SESSION['install'] = 'routes';
 			$_SESSION['next'] = 'Populate routes table with externals data';
 		}
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -244,19 +244,19 @@ 
 		$error .= update_db::update_routes_fam();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
-		} else 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate routes table with externals data'));
+		} else 	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data'));
 		$_SESSION['install'] = 'translation';
 		$_SESSION['next'] = 'Populate translation table with externals data';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -264,8 +264,8 @@ 
 		$error .= update_db::update_translation_fam();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data'));
 		if ($_SESSION['waypoints'] == 1) {
 			$_SESSION['install'] = 'waypoints';
 			$_SESSION['next'] = 'Populate waypoints table';
@@ -283,15 +283,15 @@ 
 			$_SESSION['install'] = 'sources';
 			$_SESSION['next'] = 'Insert data in source table';
 		}
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data'));
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -299,19 +299,19 @@ 
 		$error = update_db::update_owner_fam();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data'));
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
 	if (!is_writable('tmp')) {
 		$error = 'The directory <i>install/tmp</i> must be writable.';
 		$_SESSION['error'] = $error;
-		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
-		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data'));
+		$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
@@ -320,13 +320,13 @@ 
 			$error .= update_db::update_notam();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data'));
 		} else {
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data (no source defined)'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)'));
 		}
 		/*
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
@@ -339,7 +339,7 @@ 
 		*/
 			$_SESSION['install'] = 'sources';
 			$_SESSION['next'] = 'Insert data in source table';
-			$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+			$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 			print json_encode($result);
 		//}
 	}
@@ -376,9 +376,9 @@ 
 		$Source = new Source();
 		$Source->deleteAllLocation();
 		foreach ($sources as $src) {
-			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png');
 		}
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
 		unset($_SESSION['sources']);
 	}
 	/*
@@ -403,7 +403,7 @@ 
 		$_SESSION['install'] = 'finish';
 		$_SESSION['next'] = 'finish';
 	}
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
 	include_once('../install/class.create_db.php');
@@ -415,48 +415,48 @@ 
 			$error .= update_db::update_IVAO();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
 		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$error .= update_db::update_vatsim();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
-			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data'));
+		} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
-				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data (IVAO not found)'));
+			} else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)'));
 		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
 	}
 	//$_SESSION['install'] = 'routes';
 	//$_SESSION['next'] = 'Populate routes table with externals data';
 	$_SESSION['install'] = 'finish';
 	$_SESSION['next'] = 'finish';
-	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else {
 	//unset($_SESSION['install']);
 	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
-	$result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
+	$result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
 	print json_encode($result);
 }
 ?>
\ No newline at end of file

Braces +78 added lines, -28 removed lines

@@ -75,7 +75,9 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	}
 	$_SESSION['install'] = 'database_import';
 	$_SESSION['next'] = 'Create and import tables';
 	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -93,7 +95,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		}
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
@@ -107,7 +111,9 @@ 
 		$error .= $check_version;
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables'));
-		if (!isset($_SESSION['next'])) $_SESSION['next'] = '';
+		if (!isset($_SESSION['next'])) {
+			$_SESSION['next'] = '';
+		}
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -115,7 +121,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		}
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -128,8 +136,10 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
-/*
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+	}
+	/*
 	$_SESSION['install'] = 'airspace';
 	$_SESSION['next'] = 'Populate airspace table';
 	$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -154,7 +164,9 @@ 
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 		$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database'));
-	} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	} else {
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	}
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	    $_SESSION['install'] = 'notam';
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
@@ -188,7 +200,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		}
 		$_SESSION['install'] = 'populate_flarm';
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -209,18 +223,26 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		}
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data';
+			}
 		} elseif (isset($globalVATSIM) && $globalVATSIM) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert VATSIM data';
 		} elseif (isset($globalIVAO) && $globalIVAO) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			}
 		} elseif (isset($globalphpVMS) && $globalphpVMS) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert phpVMS data';
@@ -245,7 +267,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data'));
-		} else 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		}
 		$_SESSION['install'] = 'translation';
 		$_SESSION['next'] = 'Populate translation table with externals data';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -265,7 +289,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		}
 		if ($_SESSION['waypoints'] == 1) {
 			$_SESSION['install'] = 'waypoints';
 			$_SESSION['next'] = 'Populate waypoints table';
@@ -300,7 +326,9 @@ 
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		}
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
 		$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
@@ -321,12 +349,16 @@ 
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			}
 		} else {
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			}
 		}
 		/*
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
@@ -376,7 +408,9 @@ 
 		$Source = new Source();
 		$Source->deleteAllLocation();
 		foreach ($sources as $src) {
-			if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			if (isset($src['latitude']) && $src['latitude'] != '') {
+				$Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+			}
 		}
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
 		unset($_SESSION['sources']);
@@ -387,15 +421,21 @@ 
 	*/
 	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data';
+		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert VATSIM data';
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert phpVMS data';
@@ -416,33 +456,43 @@ 
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			}
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			}
 		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$error .= update_db::update_vatsim();
 		if ($error != '') {
 			$_SESSION['error'] = $error;
 			$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data'));
-		} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		} else {
+			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		}
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			}
 		} else {
 			$error .= update_db::update_vatsim();
 			if ($error != '') {
 				$_SESSION['error'] = $error;
 				$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)'));
-			} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			} else {
+				$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			}
 		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));

install/index.php

Indentation +42 added lines, -42 removed lines

@@ -188,13 +188,13 @@ 
 			<p>
 				<label for="siteurl">Site directory</label>
 				<?php
-				    // Try to detect site directory
-				    if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) {
+					// Try to detect site directory
+					if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) {
 					if (isset($_SERVER['REQUEST_URI'])) {
 						$URL = $_SERVER['REQUEST_URI'];
 						$globalURL = str_replace('/install','',str_replace('/install/','',str_replace('/install/index.php','',$URL)));
 					}
-				    }
+					}
 				?>
 				<input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) print $globalURL; ?>" />
 				<p class="help-block">ex : <i>/flightairmap</i> if complete URL is <i>http://toto.com/flightairmap</i></p>
@@ -373,17 +373,17 @@ 
 				</tr>
 				
 		<?php
-		    if (isset($globalDBuser) && isset($globalDBpass) && $globalDBuser != '' && $globalDBpass != '') {
+			if (isset($globalDBuser) && isset($globalDBpass) && $globalDBuser != '' && $globalDBpass != '') {
 		?>
 		<!--
 		<?php
-			    require_once(dirname(__FILE__).'/../require/class.Connection.php');
-			    $Connection = new Connection();
+				require_once(dirname(__FILE__).'/../require/class.Connection.php');
+				$Connection = new Connection();
 		?>
 		-->
 		<?php
 			if ($Connection->db != NULL) {
-			    if ($Connection->tableExists('source_location')) {
+				if ($Connection->tableExists('source_location')) {
 				require_once(dirname(__FILE__).'/../require/class.Source.php');
 				$Source = new Source();
 				//$alllocations = $Source->getAllLocationInfo();
@@ -403,9 +403,9 @@ 
 		
 		<?php
 				}
-			    }
+				}
+			}
 			}
-		    }
 		?>
 
 				<tr>
@@ -515,12 +515,12 @@ 
 ?>
 							<tr>
 								<?php
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
+									if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
 								?>
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
 								<?php
-								    } else {
+									} else {
 									$hostport = explode(':',$source['host']);
 									if (isset($hostport[1])) {
 										$host = $hostport[0];
@@ -533,7 +533,7 @@ 
 								<td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td>
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php print $port; ?>" /></td>
 								<?php
-								    }
+									}
 								?>
 								<td>
 									<select name="format[]" id="format">
@@ -673,9 +673,9 @@ 
 			    </thead>
 			    <tbody>
 				<?php
-				    if (isset($globalNewsFeeds) && !empty($globalNewsFeeds)) {
+					if (isset($globalNewsFeeds) && !empty($globalNewsFeeds)) {
 					foreach ($globalNewsFeeds as $type => $feedslng) {
-					    foreach ($feedslng as $lng => $feeds) {
+						foreach ($feedslng as $lng => $feeds) {
 						foreach ($feeds as $feed) {
 				?>
 				<tr>
@@ -700,9 +700,9 @@ 
 				
 				<?php
 						}
-					    }
+						}
+					}
 					}
-				    }
 				?>
 				<tr>
 				    <td><input type="url" name="newsurl[]" /></td>
@@ -1092,7 +1092,7 @@ 
 			<br />
 			<p>
 			<?php 
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
+				if (extension_loaded('gd') && function_exists('gd_info')) {
 			?>
 				<label for="aircrafticoncolor">Color of aircraft icon on map</label>
 				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" />
@@ -1102,11 +1102,11 @@ 
 				<b>The directory cache is not writable, aircraft icon will not be cached</b>
 			<?php
 				}
-			    } else {
+				} else {
 			?>
 				<b>PHP GD is not installed, you can't change color of aircraft icon on map</b>
 			<?php
-			    }
+				}
 			?>
 			</p>
 			<br />
@@ -1130,7 +1130,7 @@ 
 	</p>
 <?php
 	require('../footer.php');
-        exit;
+		exit;
 }
 // '	
 $settings = array();
@@ -1221,8 +1221,8 @@ 
 	
 	$sources = array();
 	foreach ($source_name as $keys => $name) {
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+		if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
+		else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
 	}
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
 
@@ -1232,13 +1232,13 @@ 
 	
 	$newsfeeds = array();
 	foreach($newsurl as $newskey => $url) {
-	    if ($url != '') {
+		if ($url != '') {
 		$type = $newstype[$newskey];
 		$lng = $newslng[$newskey];
 		if (isset($newsfeeds[$type][$lng])) {
-		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
+			$newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
 		} else $newsfeeds[$type][$lng] = array($url);
-	    }
+		}
 	}
 	$settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds));
 
@@ -1681,14 +1681,14 @@ 
 
 	// Set some defaults values...
 	if (!isset($globalAircraftImageSources)) {
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
+		$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
+		$settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
 	}
 
 	if (!isset($globalSchedulesSources)) {
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
-    	}
+		$globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
+			$settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
+		}
 
 	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
 
@@ -1736,21 +1736,21 @@ 
 	$popi = false;
 	$popw = false;
 	foreach ($_SESSION['done'] as $done) {
-	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
-	    if ($done == 'Create database') $pop = true;
-	    if ($_SESSION['install'] == 'database_create') $pop = true;
-	    if ($_SESSION['install'] == 'database_import') $popi = true;
-	    if ($_SESSION['install'] == 'waypoints') $popw = true;
+		print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
+		if ($done == 'Create database') $pop = true;
+		if ($_SESSION['install'] == 'database_create') $pop = true;
+		if ($_SESSION['install'] == 'database_import') $popi = true;
+		if ($_SESSION['install'] == 'waypoints') $popw = true;
 	}
 	if ($pop) {
-	    sleep(5);
-	    print '<li>Create database....<img src="../images/loading.gif" /></li>';
+		sleep(5);
+		print '<li>Create database....<img src="../images/loading.gif" /></li>';
 	} else if ($popi) {
-	    sleep(5);
-	    print '<li>Create and import tables....<img src="../images/loading.gif" /></li>';
+		sleep(5);
+		print '<li>Create and import tables....<img src="../images/loading.gif" /></li>';
 	} else if ($popw) {
-	    sleep(5);
-	    print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
+		sleep(5);
+		print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
 	} else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
 	print '</div></ul>';
 	print '<div id="error"></div>';
@@ -1816,7 +1816,7 @@ 
 	unset($_COOKIE['install']);
 	print '<div class="info column"><ul>';
 	foreach ($_SESSION['done'] as $done) {
-	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
+		print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
 	}
 	print '<li>Reloading page to check all is now ok....<strong>SUCCESS</strong></li>';
 	print '</ul></div>';

Braces +596 added lines, -160 removed lines

@@ -4,11 +4,19 @@ 
 if (isset($_SESSION['error'])) {
 	header('Content-Encoding: none;');
 	echo 'Error : '.$_SESSION['error'].' - Resetting install... You need to fix the problem and run install again.';
-	if (isset($_SESSION['error'])) unset($_SESSION['error']);
-	if (isset($_SESSION['errorlst'])) unset($_SESSION['errorlst']);
-	if (isset($_SESSION['next'])) unset($_SESSION['next']);
-	if (isset($_SESSION['install'])) unset($_SESSION['install']);
-}
+	if (isset($_SESSION['error'])) {
+		unset($_SESSION['error']);
+	}
+	if (isset($_SESSION['errorlst'])) {
+		unset($_SESSION['errorlst']);
+	}
+	if (isset($_SESSION['next'])) {
+		unset($_SESSION['next']);
+	}
+	if (isset($_SESSION['install'])) {
+		unset($_SESSION['install']);
+	}
+	}
 /*
 if (isset($_SESSION['errorlst'])) {
 	header('Content-Encoding: none;');
@@ -168,31 +176,49 @@ 
 			</div>
 			<p>
 				<label for="dbhost">Database hostname</label>
-				<input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) print $globalDBhost; ?>" />
+				<input type="text" name="dbhost" id="dbhost" value="<?php if (isset($globalDBhost)) {
+	print $globalDBhost;
+}
+?>" />
 			</p>
 			<p>
 				<label for="dbport">Database port</label>
-				<input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) print $globalDBport; ?>" />
+				<input type="text" name="dbport" id="dbport" value="<?php if (isset($globalDBport)) {
+	print $globalDBport;
+}
+?>" />
 				<p class="help-block">Default is 3306 for MariaDB/MySQL, 5432 for PostgreSQL</p>
 			</p>
 			<p>
 				<label for="dbname">Database name</label>
-				<input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) print $globalDBname; ?>" />
+				<input type="text" name="dbname" id="dbname" value="<?php if (isset($globalDBname)) {
+	print $globalDBname;
+}
+?>" />
 			</p>
 			<p>
 				<label for="dbuser">Database user</label>
-				<input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) print $globalDBuser; ?>" />
+				<input type="text" name="dbuser" id="dbuser" value="<?php if (isset($globalDBuser)) {
+	print $globalDBuser;
+}
+?>" />
 			</p>
 			<p>
 				<label for="dbuserpass">Database user password</label>
-				<input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) print $globalDBpass; ?>" />
+				<input type="password" name="dbuserpass" id="dbuserpass" value="<?php if (isset($globalDBpass)) {
+	print $globalDBpass;
+}
+?>" />
 			</p>
 		</fieldset>
 		<fieldset id="site">
 			<legend>Site configuration</legend>
 			<p>
 				<label for="sitename">Site name</label>
-				<input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) print $globalName; ?>" />
+				<input type="text" name="sitename" id="sitename" value="<?php if (isset($globalName)) {
+	print $globalName;
+}
+?>" />
 			</p>
 			<p>
 				<label for="siteurl">Site directory</label>
@@ -205,18 +231,27 @@ 
 					}
 				    }
 				?>
-				<input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) print $globalURL; ?>" />
+				<input type="text" name="siteurl" id="siteurl" value="<?php if (isset($globalURL)) {
+	print $globalURL;
+}
+?>" />
 				<p class="help-block">ex : <i>/flightairmap</i> if complete URL is <i>http://toto.com/flightairmap</i></p>
 				<p class="help-block">Can be empty</p>
 			</p>
 			<p>
 				<label for="timezone">Timezone</label>
-				<input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) print $globalTimezone; ?>" />
+				<input type="text" name="timezone" id="timezone" value="<?php if (isset($globalTimezone)) {
+	print $globalTimezone;
+}
+?>" />
 				<p class="help-block">ex : UTC, Europe/Paris,...</p>
 			</p>
 			<p>
 				<label for="language">Language</label>
-				<input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) print $globalLanguage; ?>" />
+				<input type="text" name="language" id="language" value="<?php if (isset($globalLanguage)) {
+	print $globalLanguage;
+}
+?>" />
 				<p class="help-block">Used only when link to wikipedia for now. Can be EN,DE,FR,...</p>
 			</p>
 		</fieldset>
@@ -236,11 +271,17 @@ 
 			<div id="mapbox_data">
 				<p>
 					<label for="mapboxid">Mapbox id</label>
-					<input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) print $globalMapboxId; ?>" />
+					<input type="text" name="mapboxid" id="mapboxid" value="<?php if (isset($globalMapboxId)) {
+	print $globalMapboxId;
+}
+?>" />
 				</p>
 				<p>
 					<label for="mapboxtoken">Mapbox token</label>
-					<input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) print $globalMapboxToken; ?>" />
+					<input type="text" name="mapboxtoken" id="mapboxtoken" value="<?php if (isset($globalMapboxToken)) {
+	print $globalMapboxToken;
+}
+?>" />
 				</p>
 				<p class="help-block">Get a key <a href="https://www.mapbox.com/developers/">here</a></p>
 			</div>
@@ -248,7 +289,10 @@ 
 			<div id="google_data">
 				<p>
 					<label for="googlekey">Google API key</label>
-					<input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) print $globalGoogleAPIKey; ?>" />
+					<input type="text" name="googlekey" id="googlekey" value="<?php if (isset($globalGoogleAPIKey)) {
+	print $globalGoogleAPIKey;
+}
+?>" />
 					<p class="help-block">Get a key <a href="https://developers.google.com/maps/documentation/javascript/get-api-key#get-an-api-key">here</a></p>
 				</p>
 			</div>
@@ -256,7 +300,10 @@ 
 			<div id="bing_data">
 				<p>
 					<label for="bingkey">Bing Map key</label>
-					<input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) print $globalBingMapKey; ?>" />
+					<input type="text" name="bingkey" id="bingkey" value="<?php if (isset($globalBingMapKey)) {
+	print $globalBingMapKey;
+}
+?>" />
 					<p class="help-block">Get a key <a href="https://www.bingmapsportal.com/">here</a></p>
 				</p>
 			</div>
@@ -264,7 +311,10 @@ 
 			<div id="mapquest_data">
 				<p>
 					<label for="mapquestkey">MapQuest key</label>
-					<input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) print $globalMapQuestKey; ?>" />
+					<input type="text" name="mapquestkey" id="mapquestkey" value="<?php if (isset($globalMapQuestKey)) {
+	print $globalMapQuestKey;
+}
+?>" />
 					<p class="help-block">Get a key <a href="https://developer.mapquest.com/user/me/apps">here</a></p>
 				</p>
 			</div>
@@ -272,11 +322,17 @@ 
 			<div id="here_data">
 				<p>
 					<label for="hereappid">Here App_Id</label>
-					<input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) print $globalHereappId; ?>" />
+					<input type="text" name="hereappid" id="hereappid" value="<?php if (isset($globalHereappId)) {
+	print $globalHereappId;
+}
+?>" />
 				</p>
 				<p>
 					<label for="hereappcode">Here App_Code</label>
-					<input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) print $globalHereappCode; ?>" />
+					<input type="text" name="hereappcode" id="hereappcode" value="<?php if (isset($globalHereappCode)) {
+	print $globalHereappCode;
+}
+?>" />
 				</p>
 				<p class="help-block">Get a key <a href="https://developer.here.com/rest-apis/documentation/enterprise-map-tile/topics/quick-start.html">here</a></p>
 			</div>
@@ -284,7 +340,10 @@ 
 			<div id="openweathermap_data">
 				<p>
 					<label for="openweathermapkey">OpenWeatherMap key (weather layer)</label>
-					<input type="text" name="openweathermapkey" id="openweathermapkey" value="<?php if (isset($globalOpenWeatherMapKey)) print $globalOpenWeatherMapKey; ?>" />
+					<input type="text" name="openweathermapkey" id="openweathermapkey" value="<?php if (isset($globalOpenWeatherMapKey)) {
+	print $globalOpenWeatherMapKey;
+}
+?>" />
 					<p class="help-block">Get a key <a href="https://openweathermap.org/">here</a></p>
 				</p>
 			</div>
@@ -313,42 +372,86 @@ 
 			<legend>Coverage area</legend>
 			<p>
 				<label for="latitudemax">The maximum latitude (north)</label>
-				<input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) print $globalLatitudeMax; ?>" />
+				<input type="text" name="latitudemax" id="latitudemax" value="<?php if (isset($globalLatitudeMax)) {
+	print $globalLatitudeMax;
+}
+?>" />
 			</p>
 			<p>
 				<label for="latitudemin">The minimum latitude (south)</label>
-				<input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) print $globalLatitudeMin; ?>" />
+				<input type="text" name="latitudemin" id="latitudemin" value="<?php if (isset($globalLatitudeMin)) {
+	print $globalLatitudeMin;
+}
+?>" />
 			</p>
 			<p>
 				<label for="longitudemax">The maximum longitude (west)</label>
-				<input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) print $globalLongitudeMax; ?>" />
+				<input type="text" name="longitudemax" id="longitudemax" value="<?php if (isset($globalLongitudeMax)) {
+	print $globalLongitudeMax;
+}
+?>" />
 			</p>
 			<p>
 				<label for="longitudemin">The minimum longitude (east)</label>
-				<input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) print $globalLongitudeMin; ?>" />
+				<input type="text" name="longitudemin" id="longitudemin" value="<?php if (isset($globalLongitudeMin)) {
+	print $globalLongitudeMin;
+}
+?>" />
 			</p>
 			<p>
 				<label for="latitudecenter">The latitude center</label>
-				<input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) print $globalCenterLatitude; ?>" />
+				<input type="text" name="latitudecenter" id="latitudecenter" value="<?php if (isset($globalCenterLatitude)) {
+	print $globalCenterLatitude;
+}
+?>" />
 			</p>
 			<p>
 				<label for="longitudecenter">The longitude center</label>
-				<input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) print $globalCenterLongitude; ?>" />
+				<input type="text" name="longitudecenter" id="longitudecenter" value="<?php if (isset($globalCenterLongitude)) {
+	print $globalCenterLongitude;
+}
+?>" />
 			</p>
 			<p>
 				<label for="livezoom">Default Zoom on live map</label>
-				<input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) print $globalLiveZoom; else print '9'; ?>" />
+				<input type="number" name="livezoom" id="livezoom" value="<?php if (isset($globalLiveZoom)) {
+	print $globalLiveZoom;
+} else {
+	print '9';
+}
+?>" />
 			</p>
 			<p>
 				<label for="squawk_country">Country for squawk usage</label>
 				<select name="squawk_country" id="squawk_country">
-					<option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') print ' selected '; ?>>UK</option>
-					<option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') print ' selected '; ?>>NZ</option>
-					<option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') print ' selected '; ?>>US</option>
-					<option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') print ' selected '; ?>>AU</option>
-					<option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') print ' selected '; ?>>NL</option>
-					<option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') print ' selected '; ?>>FR</option>
-					<option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') print ' selected '; ?>>TR</option>
+					<option value="UK"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'UK') {
+	print ' selected ';
+}
+?>>UK</option>
+					<option value="NZ"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NZ') {
+	print ' selected ';
+}
+?>>NZ</option>
+					<option value="US"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'US') {
+	print ' selected ';
+}
+?>>US</option>
+					<option value="AU"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'AU') {
+	print ' selected ';
+}
+?>>AU</option>
+					<option value="NL"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'NL') {
+	print ' selected ';
+}
+?>>NL</option>
+					<option value="FR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'FR') {
+	print ' selected ';
+}
+?>>FR</option>
+					<option value="TR"<?php if (isset($globalSquawkCountry) && $globalSquawkCountry == 'TR') {
+	print ' selected ';
+}
+?>>TR</option>
 				</select>
 			</p>
 		</fieldset>
@@ -357,15 +460,24 @@ 
 			<p><i>Only put in DB flights that are inside a circle</i></p>
 			<p>
 				<label for="latitude">Center latitude</label>
-				<input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) echo $globalDistanceIgnore['latitude']; ?>" />
+				<input type="text" name="zoilatitude" id="latitude" value="<?php if (isset($globalDistanceIgnore['latitude'])) {
+	echo $globalDistanceIgnore['latitude'];
+}
+?>" />
 			</p>
 			<p>
 				<label for="longitude">Center longitude</label>
-				<input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) echo $globalDistanceIgnore['longitude']; ?>" />
+				<input type="text" name="zoilongitude" id="longitude" value="<?php if (isset($globalDistanceIgnore['longitude'])) {
+	echo $globalDistanceIgnore['longitude'];
+}
+?>" />
 			</p>
 			<p>
 				<label for="Distance">Distance (in km)</label>
-				<input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) echo $globalDistanceIgnore['distance']; ?>" />
+				<input type="text" name="zoidistance" id="distance" value="<?php if (isset($globalDistanceIgnore['distance'])) {
+	echo $globalDistanceIgnore['distance'];
+}
+?>" />
 			</p>
 		</fieldset>
 		<fieldset id="sourceloc">
@@ -481,11 +593,17 @@ 
 			<div id="flightaware_data">
 				<p>
 					<label for="flightawareusername">FlightAware username</label>
-					<input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) print $globalFlightAwareUsername; ?>" />
+					<input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) {
+	print $globalFlightAwareUsername;
+}
+?>" />
 				</p>
 				<p>
 					<label for="flightawarepassword">FlightAware password/API key</label>
-					<input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) print $globalFlightAwarePassword; ?>" />
+					<input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) {
+	print $globalFlightAwarePassword;
+}
+?>" />
 				</p>
 			</div>
 -->
@@ -527,7 +645,10 @@ 
 								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
 								?>
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
-								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
+								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) {
+	print $source['port'];
+}
+?>" /></td>
 								<?php
 								    } else {
 									$hostport = explode(':',$source['host']);
@@ -546,36 +667,114 @@ 
 								?>
 								<td>
 									<select name="format[]" id="format">
-										<option value="auto" <?php if (!isset($source['format'])) print 'selected'; ?>>Auto</option>
-										<option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') print 'selected'; ?>>SBS</option>
-										<option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') print 'selected'; ?>>TSV</option>
-										<option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') print 'selected'; ?>>Raw</option>
-										<option value="aircraftjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftjson') print 'selected'; ?>>Dump1090 aircraft.json</option>
-										<option value="planefinderclient" <?php if (isset($source['format']) && $source['format'] == 'planefinderclient') print 'selected'; ?>>Planefinder client</option>
-										<option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') print 'selected'; ?>>APRS</option>
-										<option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') print 'selected'; ?>>Radarcape deltadb.txt</option>
-										<option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') print 'selected'; ?>>Vatsim</option>
-										<option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') print 'selected'; ?>>Virtual Radar Server AircraftList.json</option>
-										<option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') print 'selected'; ?>>Virtual Radar Server TCP</option>
-										<option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') print 'selected'; ?>>phpVMS</option>
-										<option value="vaos" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') print 'selected'; ?>>Virtual Airline Operations System (VAOS)</option>
-										<option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') print 'selected'; ?>>Virtual Airlines Manager</option>
-										<option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') print 'selected'; ?>>IVAO</option>
-										<option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') print 'selected'; ?>>FlightGear Multiplayer</option>
-										<option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') print 'selected'; ?>>FlightGear Singleplayer</option>
-										<option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') print 'selected'; ?>>ACARS from acarsdec/acarsdeco2 over UDP</option>
-										<option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') print 'selected'; ?>>ACARS SBS-3 over TCP</option>
-										<option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') print 'selected'; ?>>NMEA AIS over TCP</option>
-										<option value="airwhere" <?php if (isset($source['format']) && $source['format'] == 'airwhere') print 'selected'; ?>>AirWhere website</option>
-										<option value="hidnseek_callback" <?php if (isset($source['format']) && $source['format'] == 'hidnseek_callback') print 'selected'; ?>>HidnSeek Callback</option>
-										<option value="blitzortung" <?php if (isset($source['format']) && $source['format'] == 'blitzortung') print 'selected'; ?>>Blitzortung</option>
+										<option value="auto" <?php if (!isset($source['format'])) {
+	print 'selected';
+}
+?>>Auto</option>
+										<option value="sbs" <?php if (isset($source['format']) && $source['format'] == 'sbs') {
+	print 'selected';
+}
+?>>SBS</option>
+										<option value="tsv" <?php if (isset($source['format']) && $source['format'] == 'tsv') {
+	print 'selected';
+}
+?>>TSV</option>
+										<option value="raw" <?php if (isset($source['format']) && $source['format'] == 'raw') {
+	print 'selected';
+}
+?>>Raw</option>
+										<option value="aircraftjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftjson') {
+	print 'selected';
+}
+?>>Dump1090 aircraft.json</option>
+										<option value="planefinderclient" <?php if (isset($source['format']) && $source['format'] == 'planefinderclient') {
+	print 'selected';
+}
+?>>Planefinder client</option>
+										<option value="aprs" <?php if (isset($source['format']) && $source['format'] == 'aprs') {
+	print 'selected';
+}
+?>>APRS</option>
+										<option value="deltadbtxt" <?php if (isset($source['format']) && $source['format'] == 'deltadbtxt') {
+	print 'selected';
+}
+?>>Radarcape deltadb.txt</option>
+										<option value="vatsimtxt" <?php if (isset($source['format']) && $source['format'] == 'vatsimtxt') {
+	print 'selected';
+}
+?>>Vatsim</option>
+										<option value="aircraftlistjson" <?php if (isset($source['format']) && $source['format'] == 'aircraftlistjson') {
+	print 'selected';
+}
+?>>Virtual Radar Server AircraftList.json</option>
+										<option value="vrstcp" <?php if (isset($source['format']) && $source['format'] == 'vrstcp') {
+	print 'selected';
+}
+?>>Virtual Radar Server TCP</option>
+										<option value="phpvmacars" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') {
+	print 'selected';
+}
+?>>phpVMS</option>
+										<option value="vaos" <?php if (isset($source['format']) && $source['format'] == 'phpvmacars') {
+	print 'selected';
+}
+?>>Virtual Airline Operations System (VAOS)</option>
+										<option value="vam" <?php if (isset($source['format']) && $source['format'] == 'vam') {
+	print 'selected';
+}
+?>>Virtual Airlines Manager</option>
+										<option value="whazzup" <?php if (isset($source['format']) && $source['format'] == 'whazzup') {
+	print 'selected';
+}
+?>>IVAO</option>
+										<option value="flightgearmp" <?php if (isset($source['format']) && $source['format'] == 'flightgearmp') {
+	print 'selected';
+}
+?>>FlightGear Multiplayer</option>
+										<option value="flightgearsp" <?php if (isset($source['format']) && $source['format'] == 'flightgearsp') {
+	print 'selected';
+}
+?>>FlightGear Singleplayer</option>
+										<option value="acars" <?php if (isset($source['format']) && $source['format'] == 'acars') {
+	print 'selected';
+}
+?>>ACARS from acarsdec/acarsdeco2 over UDP</option>
+										<option value="acarssbs3" <?php if (isset($source['format']) && $source['format'] == 'acarssbs3') {
+	print 'selected';
+}
+?>>ACARS SBS-3 over TCP</option>
+										<option value="ais" <?php if (isset($source['format']) && $source['format'] == 'ais') {
+	print 'selected';
+}
+?>>NMEA AIS over TCP</option>
+										<option value="airwhere" <?php if (isset($source['format']) && $source['format'] == 'airwhere') {
+	print 'selected';
+}
+?>>AirWhere website</option>
+										<option value="hidnseek_callback" <?php if (isset($source['format']) && $source['format'] == 'hidnseek_callback') {
+	print 'selected';
+}
+?>>HidnSeek Callback</option>
+										<option value="blitzortung" <?php if (isset($source['format']) && $source['format'] == 'blitzortung') {
+	print 'selected';
+}
+?>>Blitzortung</option>
 									</select>
 								</td>
 								<td>
-									<input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) print $source['name']; ?>" />
+									<input type="text" name="name[]" id="name" value="<?php if (isset($source['name'])) {
+	print $source['name'];
+}
+?>" />
 								</td>
-								<td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) print 'checked'; ?> /></td>
-								<td><input type="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) print 'checked'; ?> /></td>
+								<td><input type="checkbox" name="sourcestats[]" id="sourcestats" title="Create statistics for the source like number of messages, distance,..." value="1" <?php if (isset($source['sourcestats']) && $source['sourcestats']) {
+	print 'checked';
+}
+?> /></td>
+								<td><input type="checkbox" name="noarchive[]" id="noarchive" title="Don't archive this source" value="1" <?php if (isset($source['noarchive']) && $source['noarchive']) {
+	print 'checked';
+}
+?> /></td>
 								<td>
 									<select name="timezones[]" id="timezones">
 								<?php
@@ -585,7 +784,9 @@ 
 											print '<option selected>'.$timezones.'</option>';
 										} elseif (!isset($source['timezone']) && $timezones == 'UTC') {
 											print '<option selected>'.$timezones.'</option>';
-										} else print '<option>'.$timezones.'</option>';
+										} else {
+											print '<option>'.$timezones.'</option>';
+										}
 									}
 								?>
 									</select>
@@ -638,7 +839,9 @@ 
 									foreach($timezonelist as $timezones){
 										if ($timezones == 'UTC') {
 											print '<option selected>'.$timezones.'</option>';
-										} else print '<option>'.$timezones.'</option>';
+										} else {
+											print '<option>'.$timezones.'</option>';
+										}
 									}
 								?>
 									</select>
@@ -663,11 +866,17 @@ 
 					<p>Listen UDP server for acarsdec/acarsdeco2/... with <i>daemon-acars.php</i> script</p>
 					<p>
 						<label for="acarshost">ACARS UDP host</label>
-						<input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) print $globalACARSHost; ?>" />
+						<input type="text" name="acarshost" id="acarshost" value="<?php if (isset($globalACARSHost)) {
+	print $globalACARSHost;
+}
+?>" />
 					</p>
 					<p>
 						<label for="acarsport">ACARS UDP port</label>
-						<input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) print $globalACARSPort; ?>" />
+						<input type="number" name="acarsport" id="acarsport" value="<?php if (isset($globalACARSPort)) {
+	print $globalACARSPort;
+}
+?>" />
 					</p>
 				</fieldset>
 			</div>
@@ -693,17 +902,38 @@ 
 				    <td><input type="url" name="newsurl[]" value="<?php print $feed; ?>"/></td>
 				    <td>
 					<select name="newslang[]">
-					    <option value="en"<?php if ($lng == 'en') print ' selected'; ?>>English</option>
-					    <option value="fr"<?php if ($lng == 'fr') print ' selected'; ?>>French</option>
+					    <option value="en"<?php if ($lng == 'en') {
+	print ' selected';
+}
+?>>English</option>
+					    <option value="fr"<?php if ($lng == 'fr') {
+	print ' selected';
+}
+?>>French</option>
 					</select>
 				    </td>
 				    <td>
 					<select name="newstype[]">
-					    <option value="global"<?php if ($type == 'global') print ' selected'; ?>>Global</option>
-					    <option value="aircraft"<?php if ($type == 'aircraft') print ' selected'; ?>>Aircraft</option>
-					    <option value="marine"<?php if ($type == 'marine') print ' selected'; ?>>Marine</option>
-					    <option value="tracker"<?php if ($type == 'tracker') print ' selected'; ?>>Tracker</option>
-					    <option value="satellite"<?php if ($type == 'Satellite') print ' selected'; ?>>Satellite</option>
+					    <option value="global"<?php if ($type == 'global') {
+	print ' selected';
+}
+?>>Global</option>
+					    <option value="aircraft"<?php if ($type == 'aircraft') {
+	print ' selected';
+}
+?>>Aircraft</option>
+					    <option value="marine"<?php if ($type == 'marine') {
+	print ' selected';
+}
+?>>Marine</option>
+					    <option value="tracker"<?php if ($type == 'tracker') {
+	print ' selected';
+}
+?>>Tracker</option>
+					    <option value="satellite"<?php if ($type == 'Satellite') {
+	print ' selected';
+}
+?>>Satellite</option>
 					</select>
 				    </td>
 				    <td><input type="button" value="Delete" onclick="deleteRowNews(this)" /> <input type="button" value="Add" onclick="insRowNews()" /></td>
@@ -836,13 +1066,19 @@ 
 			<div id="schedules_options">
 				<p>
 					<label for="britishairways">British Airways API Key</label>
-					<input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) print $globalBritishAirwaysKey; ?>" />
+					<input type="text" name="britishairways" id="britishairways" value="<?php if (isset($globalBritishAirwaysKey)) {
+	print $globalBritishAirwaysKey;
+}
+?>" />
 					<p class="help-block">Register an account on <a href="https://developer.ba.com/">https://developer.ba.com/</a></p>
 				</p>
 				<!--
 				<p>
 					<label for="transavia">Transavia Test API Consumer Key</label>
-					<input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) print $globalTransaviaKey; ?>" />
+					<input type="text" name="transavia" id="transavia" value="<?php if (isset($globalTransaviaKey)) {
+	print $globalTransaviaKey;
+}
+?>" />
 					<p class="help-block">Register an account on <a href="https://developer.transavia.com">https://developer.transavia.com</a></p>
 				</p>
 				-->
@@ -851,10 +1087,16 @@ 
 						<b>Lufthansa API Key</b>
 						<p>
 							<label for="lufthansakey">Key</label>
-							<input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) print $globalLufthansaKey['key']; ?>" />
+							<input type="text" name="lufthansakey" id="lufthansakey" value="<?php if (isset($globalLufthansaKey['key'])) {
+	print $globalLufthansaKey['key'];
+}
+?>" />
 						</p><p>
 							<label for="lufthansasecret">Secret</label>
-							<input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) print $globalLufthansaKey['secret']; ?>" />
+							<input type="text" name="lufthansasecret" id="lufthansasecret" value="<?php if (isset($globalLufthansaKey['secret'])) {
+	print $globalLufthansaKey['secret'];
+}
+?>" />
 						</p>
 					</div>
 					<p class="help-block">Register an account on <a href="https://developer.lufthansa.com/page">https://developer.lufthansa.com/page</a></p>
@@ -864,11 +1106,17 @@ 
 						<b>FlightAware API Key</b>
 						<p>
 							<label for="flightawareusername">Username</label>
-							<input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) print $globalFlightAwareUsername; ?>" />
+							<input type="text" name="flightawareusername" id="flightawareusername" value="<?php if (isset($globalFlightAwareUsername)) {
+	print $globalFlightAwareUsername;
+}
+?>" />
 						</p>
 						<p>
 							<label for="flightawarepassword">API key</label>
-							<input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) print $globalFlightAwarePassword; ?>" />
+							<input type="text" name="flightawarepassword" id="flightawarepassword" value="<?php if (isset($globalFlightAwarePassword)) {
+	print $globalFlightAwarePassword;
+}
+?>" />
 						</p>
 					</div>
 					<p class="help-block">Register an account on <a href="https://www.flightaware.com/">https://www.flightaware.com/</a></p>
@@ -885,10 +1133,22 @@ 
 				<p>
 					<label for="mapmatchingsource">Map Matching source</label>
 					<select name="mapmatchingsource" id="mapmatchingsource">
-						<option value="fam" <?php if ((isset($globalMapMatchingSource) && $globalMapMatchingSource == 'fam') || !isset($globalMatchingSource)) print 'selected="selected" '; ?>>FlightAirMap Map Matching</option>
-						<option value="graphhopper" <?php if (isset($globalMapMatchingSource) && $globalMapMatchingSource == 'graphhopper') print 'selected="selected" '; ?>>GraphHopper</option>
-						<option value="osmr" <?php if (isset($globalMapMatchingSource) && $globalMapMatchingSource == 'osmr') print 'selected="selected" '; ?>>OSMR</option>
-						<option value="mapbox" <?php if (isset($globalMapMatchingSource) && $globalMapMatchingSource == 'mapbox') print 'selected="selected" '; ?>>Mapbox</option>
+						<option value="fam" <?php if ((isset($globalMapMatchingSource) && $globalMapMatchingSource == 'fam') || !isset($globalMatchingSource)) {
+	print 'selected="selected" ';
+}
+?>>FlightAirMap Map Matching</option>
+						<option value="graphhopper" <?php if (isset($globalMapMatchingSource) && $globalMapMatchingSource == 'graphhopper') {
+	print 'selected="selected" ';
+}
+?>>GraphHopper</option>
+						<option value="osmr" <?php if (isset($globalMapMatchingSource) && $globalMapMatchingSource == 'osmr') {
+	print 'selected="selected" ';
+}
+?>>OSMR</option>
+						<option value="mapbox" <?php if (isset($globalMapMatchingSource) && $globalMapMatchingSource == 'mapbox') {
+	print 'selected="selected" ';
+}
+?>>Mapbox</option>
 					</select>
 					<p class="help-block">Mapbox need the API Key defined in map section.</p>
 					<p class="help-block">FlightAirMap Map Matching is free, without API key but limited to about 100 input points to keep fast results.</p>
@@ -896,7 +1156,10 @@ 
 				<br />
 				<p>
 					<label for="graphhopper">GraphHopper API Key</label>
-					<input type="text" name="graphhopper" id="graphhopper" value="<?php if (isset($globalGraphHopperKey)) print $globalGraphHopperKey; ?>" />
+					<input type="text" name="graphhopper" id="graphhopper" value="<?php if (isset($globalGraphHopperKey)) {
+	print $globalGraphHopperKey;
+}
+?>" />
 					<p class="help-block">Register an account on <a href="https://www.graphhopper.com/">https://www.graphhopper.com/</a></p>
 				</p>
 			</div>
@@ -914,7 +1177,10 @@ 
 			</p>
 			<p>
 				<label for="notamsource">URL of your feed from notaminfo.com</label>
-				<input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) print $globalNOTAMSource; ?>" />
+				<input type="text" name="notamsource" id="notamsource" value="<?php if (isset($globalNOTAMSource)) {
+	print $globalNOTAMSource;
+}
+?>" />
 				<p class="help-block">If you want to use world NOTAM from FlightAirMap website, leave it blank</p>
 			</p>
 			<br />
@@ -930,14 +1196,20 @@ 
 			<div id="metarsrc">
 				<p>
 					<label for="metarsource">URL of your METAR source</label>
-					<input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) print $globalMETARurl; ?>" />
+					<input type="text" name="metarsource" id="metarsource" value="<?php if (isset($globalMETARurl)) {
+	print $globalMETARurl;
+}
+?>" />
 					<p class="help-block">Use {icao} to specify where we replace by airport icao. ex : http://metar.vatsim.net/metar.php?id={icao}</p>
 				</p>
 			</div>
 			<br />
 			<p>
 				<label for="bitly">Bit.ly access token api (used in search page)</label>
-				<input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) print $globalBitlyAccessToken; ?>" />
+				<input type="text" name="bitly" id="bitly" value="<?php if (isset($globalBitlyAccessToken)) {
+	print $globalBitlyAccessToken;
+}
+?>" />
 			</p>
 			<br />
 			<p>
@@ -953,11 +1225,26 @@ 
 			<p>
 				<label for="geoid_source">Geoid Source</label>
 				<select name="geoid_source" id="geoid_source">
-					<option value="egm96-15"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-15') print ' selected="selected"'; ?>>EGM96 15' (2.1MB)</option>
-					<option value="egm96-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-5') print ' selected="selected"'; ?>>EGM96 5' (19MB)</option>
-					<option value="egm2008-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-5') print ' selected="selected"'; ?>>EGM2008 5' (19MB)</option>
-					<option value="egm2008-2_5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-2_5') print ' selected="selected"'; ?>>EGM2008 2.5' (75MB)</option>
-					<option value="egm2008-1"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-1') print ' selected="selected"'; ?>>EGM2008 1' (470MB)</option>
+					<option value="egm96-15"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-15') {
+	print ' selected="selected"';
+}
+?>>EGM96 15' (2.1MB)</option>
+					<option value="egm96-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm96-5') {
+	print ' selected="selected"';
+}
+?>>EGM96 5' (19MB)</option>
+					<option value="egm2008-5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-5') {
+	print ' selected="selected"';
+}
+?>>EGM2008 5' (19MB)</option>
+					<option value="egm2008-2_5"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-2_5') {
+	print ' selected="selected"';
+}
+?>>EGM2008 2.5' (75MB)</option>
+					<option value="egm2008-1"<?php if (isset($globalGeoidSource) && $globalGeoidSource == 'egm2008-1') {
+	print ' selected="selected"';
+}
+?>>EGM2008 1' (470MB)</option>
 				</select>
 				<p class="help-block">The geoid is approximated by an "earth gravity model" (EGM).</p>
 			</p>
@@ -979,7 +1266,12 @@ 
 			</p>
 			<p>
 				<label for="archivemonths">Generate statistics, delete or put in archive flights older than xx months</label>
-				<input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) print $globalArchiveMonths; else echo '1'; ?>" />
+				<input type="number" name="archivemonths" id="archivemonths" value="<?php if (isset($globalArchiveMonths)) {
+	print $globalArchiveMonths;
+} else {
+	echo '1';
+}
+?>" />
 				<p class="help-block">0 to disable, delete old flight if <i>Archive all flights data</i> is disabled</p>
 			</p>
 			<p>
@@ -989,12 +1281,22 @@ 
 			</p>
 			<p>
 				<label for="archivekeepmonths">Keep flights data for xx months in archive</label>
-				<input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) print $globalArchiveKeepMonths; else echo '1'; ?>" />
+				<input type="number" name="archivekeepmonths" id="archivekeepmonths" value="<?php if (isset($globalArchiveKeepMonths)) {
+	print $globalArchiveKeepMonths;
+} else {
+	echo '1';
+}
+?>" />
 				<p class="help-block">0 to disable</p>
 			</p>
 			<p>
 				<label for="archivekeeptrackmonths">Keep flights track data for xx months in archive</label>
-				<input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) print $globalArchiveKeepTrackMonths; else echo '1'; ?>" />
+				<input type="number" name="archivekeeptrackmonths" id="archivekeeptrackmonths" value="<?php if (isset($globalArchiveKeepTrackMonths)) {
+	print $globalArchiveKeepTrackMonths;
+} else {
+	echo '1';
+}
+?>" />
 				<p class="help-block">0 to disable, should be less or egal to <i>Keep flights data</i> value</p>
 			</p>
 			<br />
@@ -1004,7 +1306,12 @@ 
 				<p class="help-block">Uncheck if the script is running as cron job. You should always run it as daemon when it's possible.</p>
 				<div id="cronends"> 
 					<label for="cronend">Run script for xx seconds</label>
-					<input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) print $globalCronEnd; else print '0'; ?>" />
+					<input type="number" name="cronend" id="cronend" value="<?php if (isset($globalCronEnd)) {
+	print $globalCronEnd;
+} else {
+	print '0';
+}
+?>" />
 					<p class="help-block">Set to 0 to disable. Should be disabled if source is URL.</p>
 				</div>
 			</p>
@@ -1057,20 +1364,40 @@ 
 			<br />
 			<p>
 				<label for="refresh">Show flights detected since xxx seconds</label>
-				<input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) echo $globalLiveInterval; else echo '200'; ?>" />
+				<input type="number" name="refresh" id="refresh" value="<?php if (isset($globalLiveInterval)) {
+	echo $globalLiveInterval;
+} else {
+	echo '200';
+}
+?>" />
 			</p>
 			<p>
 				<label for="maprefresh">Live map refresh (in seconds)</label>
-				<input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) echo $globalMapRefresh; else echo '30'; ?>" />
+				<input type="number" name="maprefresh" id="maprefresh" value="<?php if (isset($globalMapRefresh)) {
+	echo $globalMapRefresh;
+} else {
+	echo '30';
+}
+?>" />
 			</p>
 			<p>
 				<label for="mapidle">Map idle timeout (in minutes)</label>
-				<input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) echo $globalMapIdleTimeout; else echo '30'; ?>" />
+				<input type="number" name="mapidle" id="mapidle" value="<?php if (isset($globalMapIdleTimeout)) {
+	echo $globalMapIdleTimeout;
+} else {
+	echo '30';
+}
+?>" />
 				<p class="help-block">0 to disable</p>
 			</p>
 			<p>
 				<label for="minfetch">HTTP/file source fetch every xxx seconds</label>
-				<input type="number" name="minfetch" id="minfetch" value="<?php if (isset($globalMinFetch)) echo $globalMinFetch; else echo '20'; ?>" />
+				<input type="number" name="minfetch" id="minfetch" value="<?php if (isset($globalMinFetch)) {
+	echo $globalMinFetch;
+} else {
+	echo '20';
+}
+?>" />
 			</p>
 			<p>
 				<label for="bbox">Only display flights that we can see on screen (bounding box)</label>
@@ -1084,12 +1411,20 @@ 
 			<br />
 			<p>
 				<label for="closestmindist">Distance to airport set as arrival (in km)</label>
-				<input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) echo $globalClosestMinDist; else echo '50'; ?>" />
+				<input type="number" name="closestmindist" id="closestmindist" value="<?php if (isset($globalClosestMinDist)) {
+	echo $globalClosestMinDist;
+} else {
+	echo '50';
+}
+?>" />
 			</p>
 			<br />
 			<p>
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) {
+	echo $globalAircraftSize;
+}
+?>" />
 			</p>
 			<br />
 			<p>
@@ -1108,7 +1443,12 @@ 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
 			?>
 				<label for="aircrafticoncolor">Color of aircraft icon on map</label>
-				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" />
+				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) {
+	echo $globalAircraftIconColor;
+} else {
+	echo '1a3151';
+}
+?>" />
 			<?php
 				if (!is_writable('../cache')) {
 			?>
@@ -1126,14 +1466,27 @@ 
 			<p>
 				<label for="airportzoom">Zoom level minimum to see airports icons</label>
 				<div class="range">
-					<input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?>" />
-					<output id="range"><?php if (isset($globalAirportZoom)) echo $globalAirportZoom; else echo '7'; ?></output>
+					<input type="range" name="airportzoom" id="airportzoom" value="<?php if (isset($globalAirportZoom)) {
+	echo $globalAirportZoom;
+} else {
+	echo '7';
+}
+?>" />
+					<output id="range"><?php if (isset($globalAirportZoom)) {
+	echo $globalAirportZoom;
+} else {
+	echo '7';
+}
+?></output>
 				</div>
 			</p>
 			<br />
 			<p>
 				<label for="customcss">Custom CSS web path</label>
-				<input type="text" name="customcss" id="customcss" value="<?php if (isset($globalCustomCSS)) echo $globalCustomCSS; ?>" />
+				<input type="text" name="customcss" id="customcss" value="<?php if (isset($globalCustomCSS)) {
+	echo $globalCustomCSS;
+}
+?>" />
 			</p>
 		</fieldset>
 		<input type="submit" name="submit" value="Create/Update database & write setup" />
@@ -1160,8 +1513,12 @@ 
 	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
 	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
 
-	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
-	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
+	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) {
+		$error .= 'Mysql driver for PDO must be loaded';
+	}
+	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) {
+		$error .= 'PosgreSQL driver for PDO must be loaded';
+	}
 	
 	$_SESSION['database_root'] = $dbroot;
 	$_SESSION['database_rootpass'] = $dbrootpass;
@@ -1229,15 +1586,23 @@ 
 	$source_city = $_POST['source_city'];
 	$source_country = $_POST['source_country'];
 	$source_ref = $_POST['source_ref'];
-	if (isset($source_id)) $source_id = $_POST['source_id'];
-	else $source_id = array();
+	if (isset($source_id)) {
+		$source_id = $_POST['source_id'];
+	} else {
+		$source_id = array();
+	}
 	
 	$sources = array();
 	foreach ($source_name as $keys => $name) {
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+	    if (isset($source_id[$keys])) {
+	    	$sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
+	    } else {
+	    	$sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+	    }
+	}
+	if (count($sources) > 0) {
+		$_SESSION['sources'] = $sources;
 	}
-	if (count($sources) > 0) $_SESSION['sources'] = $sources;
 
 	$newsurl = $_POST['newsurl'];
 	$newslng = $_POST['newslang'];
@@ -1250,7 +1615,9 @@ 
 		$lng = $newslng[$newskey];
 		if (isset($newsfeeds[$type][$lng])) {
 		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
-		} else $newsfeeds[$type][$lng] = array($url);
+		} else {
+			$newsfeeds[$type][$lng] = array($url);
+		}
 	    }
 	}
 	$settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds));
@@ -1274,17 +1641,29 @@ 
 	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
 
 	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
+	if ($globalaircraft == 'aircraft') {
+		$settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
+	}
 	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
+	if ($globaltracker == 'tracker') {
+		$settings = array_merge($settings,array('globalTracker' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalTracker' => 'FALSE'));
+	}
 	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
+	if ($globalmarine == 'marine') {
+		$settings = array_merge($settings,array('globalMarine' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalMarine' => 'FALSE'));
+	}
 	$globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING);
-	if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
+	if ($globalsatellite == 'satellite') {
+		$settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
+	}
 
 /*	
 	$globalSBS1Hosts = array();
@@ -1306,23 +1685,37 @@ 
 	$name = $_POST['name'];
 	$format = $_POST['format'];
 	$timezones = $_POST['timezones'];
-	if (isset($_POST['sourcestats'])) $sourcestats = $_POST['sourcestats'];
-	else $sourcestats = array();
-	if (isset($_POST['noarchive'])) $noarchive = $_POST['noarchive'];
-	else $noarchive = array();
+	if (isset($_POST['sourcestats'])) {
+		$sourcestats = $_POST['sourcestats'];
+	} else {
+		$sourcestats = array();
+	}
+	if (isset($_POST['noarchive'])) {
+		$noarchive = $_POST['noarchive'];
+	} else {
+		$noarchive = array();
+	}
 	$gSources = array();
 	$forcepilots = false;
 	foreach ($host as $key => $h) {
-		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) $cov = 'TRUE';
-		else $cov = 'FALSE';
-		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
-		else $arch = 'FALSE';
+		if (isset($sourcestats[$key]) && $sourcestats[$key] == 1) {
+			$cov = 'TRUE';
+		} else {
+			$cov = 'FALSE';
+		}
+		if (isset($noarchive[$key]) && $noarchive[$key] == 1) {
+			$arch = 'TRUE';
+		} else {
+			$arch = 'FALSE';
+		}
 		if (strpos($format[$key],'_callback')) {
 			$gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE');
 		} elseif ($h != '' || $name[$key] != '') {
 			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE');
 		}
-		if ($format[$key] == 'airwhere') $forcepilots = true;
+		if ($format[$key] == 'airwhere') {
+			$forcepilots = true;
+		}
 	}
 	$settings = array_merge($settings,array('globalSources' => $gSources));
 
@@ -1353,7 +1746,9 @@ 
 	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
 		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
+	} else {
+		$settings = array_merge($settings,array('globalDistanceIgnore' => array()));
+	}
 
 	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
 	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
@@ -1394,7 +1789,9 @@ 
 
 	// Create in settings.php keys not yet configurable if not already here
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
+	if (!isset($globalDebug)) {
+		$settings = array_merge($settings,array('globalDebug' => 'TRUE'));
+	}
 
 	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
 	if ($resetyearstats == 'resetyearstats') {
@@ -1437,37 +1834,56 @@ 
 	}
 */
 	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
+	if ($globalsbs == 'sbs') {
+		$settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
+	}
+	if ($globalaprs == 'aprs') {
+		$settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
+	}
 	$va = false;
 	if ($globalivao == 'ivao') {
 		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
+	}
 	if ($globalvatsim == 'vatsim') {
 		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
+	}
 	if ($globalphpvms == 'phpvms') {
 		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
+	}
 	if ($globalvam == 'vam') {
 		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+	} else {
+		$settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+	}
 	if ($va) {
 		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
+	} else {
+		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
+	}
 	if ($globalva == 'va' || $va) {
 		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
 		$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
 	} else {
 		$settings = array_merge($settings,array('globalVA' => 'FALSE'));
-		if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
-		else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
+		if ($forcepilots) {
+			$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
+		} else {
+			$settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
+		}
 	}
 	
 	
@@ -1690,7 +2106,9 @@ 
 	$graphhopper = filter_input(INPUT_POST,'graphhopper',FILTER_SANITIZE_STRING);
 	$settings = array_merge($settings,array('globalGraphHopperKey' => $graphhopper));
 
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
+	if (!isset($globalTransaction)) {
+		$settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
+	}
 
 	// Set some defaults values...
 	if (!isset($globalAircraftImageSources)) {
@@ -1705,15 +2123,23 @@ 
 
 	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
 
-	if ($error == '') settings::modify_settings($settings);
-	if ($error == '') settings::comment_settings($settings_comment);
+	if ($error == '') {
+		settings::modify_settings($settings);
+	}
+	if ($error == '') {
+		settings::comment_settings($settings_comment);
+	}
 	if ($error != '') {
 		print '<div class="info column">'.$error.'</div>';
 		require('../footer.php');
 		exit;
 	} else {
-		if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') $_SESSION['waypoints'] = 1;
-		if (isset($_POST['owner']) && $_POST['owner'] == 'owner') $_SESSION['owner'] = 1;
+		if (isset($_POST['waypoints']) && $_POST['waypoints'] == 'waypoints') {
+			$_SESSION['waypoints'] = 1;
+		}
+		if (isset($_POST['owner']) && $_POST['owner'] == 'owner') {
+			$_SESSION['owner'] = 1;
+		}
 		if (isset($_POST['createdb'])) {
 			$_SESSION['install'] = 'database_create';
 		} else {
@@ -1750,10 +2176,18 @@ 
 	$popw = false;
 	foreach ($_SESSION['done'] as $done) {
 	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
-	    if ($done == 'Create database') $pop = true;
-	    if ($_SESSION['install'] == 'database_create') $pop = true;
-	    if ($_SESSION['install'] == 'database_import') $popi = true;
-	    if ($_SESSION['install'] == 'waypoints') $popw = true;
+	    if ($done == 'Create database') {
+	    	$pop = true;
+	    }
+	    if ($_SESSION['install'] == 'database_create') {
+	    	$pop = true;
+	    }
+	    if ($_SESSION['install'] == 'database_import') {
+	    	$popi = true;
+	    }
+	    if ($_SESSION['install'] == 'waypoints') {
+	    	$popw = true;
+	    }
 	}
 	if ($pop) {
 	    sleep(5);
@@ -1764,7 +2198,9 @@ 
 	} else if ($popw) {
 	    sleep(5);
 	    print '<li>Populate waypoints database....<img src="../images/loading.gif" /></li>';
-	} else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
+	} else {
+		print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
+	}
 	print '</div></ul>';
 	print '<div id="error"></div>';
 /*	foreach ($_SESSION['done'] as $done) {

Spacing +287 added lines, -287 removed lines

@@ -22,7 +22,7 @@ 
 require_once(dirname(__FILE__).'/class.create_db.php');
 require_once(dirname(__FILE__).'/class.update_schema.php');
 require_once(dirname(__FILE__).'/class.settings.php');
-$title="Install";
+$title = "Install";
 require(dirname(__FILE__).'/../require/settings.php');
 require_once(dirname(__FILE__).'/../require/class.Common.php');
 require(dirname(__FILE__).'/header.php');
@@ -93,8 +93,8 @@ 
 	if (!extension_loaded('curl')) {
 		$error[] = "Curl is not loaded.";
 	}
-	if(function_exists('apache_get_modules') ){
-		if(!in_array('mod_rewrite',apache_get_modules())) {
+	if (function_exists('apache_get_modules')) {
+		if (!in_array('mod_rewrite', apache_get_modules())) {
 			$error[] = "mod_rewrite is not available.";
 		}
 	/*
@@ -111,12 +111,12 @@ 
 	if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['SERVER_NAME']) && isset($_SERVER['SERVER_PORT']) && isset($_SERVER['REQUEST_URI'])) {
 		if (function_exists('get_headers')) {
 			//$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'search',str_replace('index.php','',$_SERVER["REQUEST_URI"])));
-			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'live/geojson?test',str_replace('index.php','',$_SERVER["REQUEST_URI"])));
-			if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
+			$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/', 'install'), 'live/geojson?test', str_replace('index.php', '', $_SERVER["REQUEST_URI"])));
+			if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
 				print '<div class="alert alert-danger"><strong>Error</strong> Check your configuration, rewrite don\'t seems to work well. If using Apache, you need to desactivate MultiViews <a href="https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration">https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration</a></div>';
 			} else {
-				$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/','install'),'search',str_replace('index.php','',$_SERVER["REQUEST_URI"])));
-				if (isset($check_header[0]) && !stripos($check_header[0],"200 OK")) {
+				$check_header = @get_headers($_SERVER['REQUEST_SCHEME'].'://'.$_SERVER["SERVER_NAME"].':'.$_SERVER["SERVER_PORT"].str_replace(array('install/', 'install'), 'search', str_replace('index.php', '', $_SERVER["REQUEST_URI"])));
+				if (isset($check_header[0]) && !stripos($check_header[0], "200 OK")) {
 					print '<div class="alert alert-danger"><strong>Error</strong> Check your configuration, rewrite don\'t seems to work well. If using Apache, you need to desactivate MultiViews <a href="https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration">https://github.com/Ysurac/FlightAirMap/wiki/Apache-configuration</a></div>';
 				}
 			}
@@ -196,7 +196,7 @@ 
 				    if ((!isset($globalURL) || $globalURL == '') && (!isset($globalDBuser) || $globalDBuser == '')) {
 					if (isset($_SERVER['REQUEST_URI'])) {
 						$URL = $_SERVER['REQUEST_URI'];
-						$globalURL = str_replace('/install','',str_replace('/install/','',str_replace('/install/index.php','',$URL)));
+						$globalURL = str_replace('/install', '', str_replace('/install/', '', str_replace('/install/index.php', '', $URL)));
 					}
 				    }
 				?>
@@ -519,13 +519,13 @@ 
 ?>
 							<tr>
 								<?php
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
+								    if (filter_var($source['host'], FILTER_VALIDATE_URL)) {
 								?>
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
 								<td><input type="text" name="port[]" class="col-xs-2" id="port" value="<?php if (isset($source['port'])) print $source['port']; ?>" /></td>
 								<?php
 								    } else {
-									$hostport = explode(':',$source['host']);
+									$hostport = explode(':', $source['host']);
 									if (isset($hostport[1])) {
 										$host = $hostport[0];
 										$port = $hostport[1];
@@ -575,7 +575,7 @@ 
 									<select name="timezones[]" id="timezones">
 								<?php
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
-									foreach($timezonelist as $timezones){
+									foreach ($timezonelist as $timezones) {
 										if (isset($source['timezone']) && $source['timezone'] == $timezones) {
 											print '<option selected>'.$timezones.'</option>';
 										} elseif (!isset($source['timezone']) && $timezones == 'UTC') {
@@ -630,7 +630,7 @@ 
 									<select name="timezones[]" id="timezones">
 								<?php
 									$timezonelist = DateTimeZone::listIdentifiers(DateTimeZone::ALL);
-									foreach($timezonelist as $timezones){
+									foreach ($timezonelist as $timezones) {
 										if ($timezones == 'UTC') {
 											print '<option selected>'.$timezones.'</option>';
 										} else print '<option>'.$timezones.'</option>';
@@ -1089,7 +1089,7 @@ 
 			<br />
 			<p>
 				<label for="aircraftsize">Size of aircraft icon on map (default to 30px if zoom > 7 else 15px), empty to default</label>
-				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize;?>" />
+				<input type="number" name="aircraftsize" id="aircraftsize" value="<?php if (isset($globalAircraftSize)) echo $globalAircraftSize; ?>" />
 			</p>
 			<br />
 			<p>
@@ -1151,14 +1151,14 @@ 
 $error = '';
 
 if (isset($_POST['dbtype'])) {
-	$dbtype = filter_input(INPUT_POST,'dbtype',FILTER_SANITIZE_STRING);
-	$dbroot = filter_input(INPUT_POST,'dbroot',FILTER_SANITIZE_STRING);
-	$dbrootpass = filter_input(INPUT_POST,'dbrootpass',FILTER_SANITIZE_STRING);
-	$dbname = filter_input(INPUT_POST,'dbname',FILTER_SANITIZE_STRING);
-	$dbuser = filter_input(INPUT_POST,'dbuser',FILTER_SANITIZE_STRING);
-	$dbuserpass = filter_input(INPUT_POST,'dbuserpass',FILTER_SANITIZE_STRING);
-	$dbhost = filter_input(INPUT_POST,'dbhost',FILTER_SANITIZE_STRING);
-	$dbport = filter_input(INPUT_POST,'dbport',FILTER_SANITIZE_STRING);
+	$dbtype = filter_input(INPUT_POST, 'dbtype', FILTER_SANITIZE_STRING);
+	$dbroot = filter_input(INPUT_POST, 'dbroot', FILTER_SANITIZE_STRING);
+	$dbrootpass = filter_input(INPUT_POST, 'dbrootpass', FILTER_SANITIZE_STRING);
+	$dbname = filter_input(INPUT_POST, 'dbname', FILTER_SANITIZE_STRING);
+	$dbuser = filter_input(INPUT_POST, 'dbuser', FILTER_SANITIZE_STRING);
+	$dbuserpass = filter_input(INPUT_POST, 'dbuserpass', FILTER_SANITIZE_STRING);
+	$dbhost = filter_input(INPUT_POST, 'dbhost', FILTER_SANITIZE_STRING);
+	$dbport = filter_input(INPUT_POST, 'dbport', FILTER_SANITIZE_STRING);
 
 	if ($dbtype == 'mysql' && !extension_loaded('pdo_mysql')) $error .= 'Mysql driver for PDO must be loaded';
 	if ($dbtype == 'pgsql' && !extension_loaded('pdo_pgsql')) $error .= 'PosgreSQL driver for PDO must be loaded';
@@ -1178,49 +1178,49 @@ 
 	} else $settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
 	*/
 	
-	$settings = array_merge($settings,array('globalDBdriver' => $dbtype,'globalDBhost' => $dbhost,'globalDBuser' => $dbuser,'globalDBport' => $dbport,'globalDBpass' => $dbuserpass,'globalDBname' => $dbname));
+	$settings = array_merge($settings, array('globalDBdriver' => $dbtype, 'globalDBhost' => $dbhost, 'globalDBuser' => $dbuser, 'globalDBport' => $dbport, 'globalDBpass' => $dbuserpass, 'globalDBname' => $dbname));
 
-	$sitename = filter_input(INPUT_POST,'sitename',FILTER_SANITIZE_STRING);
-	$siteurl = filter_input(INPUT_POST,'siteurl',FILTER_SANITIZE_STRING);
-	$timezone = filter_input(INPUT_POST,'timezone',FILTER_SANITIZE_STRING);
-	$language = filter_input(INPUT_POST,'language',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalName' => $sitename,'globalURL' => $siteurl, 'globalTimezone' => $timezone,'globalLanguage' => $language));
+	$sitename = filter_input(INPUT_POST, 'sitename', FILTER_SANITIZE_STRING);
+	$siteurl = filter_input(INPUT_POST, 'siteurl', FILTER_SANITIZE_STRING);
+	$timezone = filter_input(INPUT_POST, 'timezone', FILTER_SANITIZE_STRING);
+	$language = filter_input(INPUT_POST, 'language', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalName' => $sitename, 'globalURL' => $siteurl, 'globalTimezone' => $timezone, 'globalLanguage' => $language));
 
-	$mapprovider = filter_input(INPUT_POST,'mapprovider',FILTER_SANITIZE_STRING);
-	$mapboxid = filter_input(INPUT_POST,'mapboxid',FILTER_SANITIZE_STRING);
-	$mapboxtoken = filter_input(INPUT_POST,'mapboxtoken',FILTER_SANITIZE_STRING);
-	$googlekey = filter_input(INPUT_POST,'googlekey',FILTER_SANITIZE_STRING);
-	$bingkey = filter_input(INPUT_POST,'bingkey',FILTER_SANITIZE_STRING);
-	$openweathermapkey = filter_input(INPUT_POST,'openweathermapkey',FILTER_SANITIZE_STRING);
-	$mapquestkey = filter_input(INPUT_POST,'mapquestkey',FILTER_SANITIZE_STRING);
-	$hereappid = filter_input(INPUT_POST,'hereappid',FILTER_SANITIZE_STRING);
-	$hereappcode = filter_input(INPUT_POST,'hereappcode',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMapProvider' => $mapprovider,'globalMapboxId' => $mapboxid,'globalMapboxToken' => $mapboxtoken,'globalGoogleAPIKey' => $googlekey,'globalBingMapKey' => $bingkey,'globalHereappID' => $hereappid,'globalHereappCode' => $hereappcode,'globalMapQuestKey' => $mapquestkey,'globalOpenWeatherMapKey' => $openweathermapkey));
+	$mapprovider = filter_input(INPUT_POST, 'mapprovider', FILTER_SANITIZE_STRING);
+	$mapboxid = filter_input(INPUT_POST, 'mapboxid', FILTER_SANITIZE_STRING);
+	$mapboxtoken = filter_input(INPUT_POST, 'mapboxtoken', FILTER_SANITIZE_STRING);
+	$googlekey = filter_input(INPUT_POST, 'googlekey', FILTER_SANITIZE_STRING);
+	$bingkey = filter_input(INPUT_POST, 'bingkey', FILTER_SANITIZE_STRING);
+	$openweathermapkey = filter_input(INPUT_POST, 'openweathermapkey', FILTER_SANITIZE_STRING);
+	$mapquestkey = filter_input(INPUT_POST, 'mapquestkey', FILTER_SANITIZE_STRING);
+	$hereappid = filter_input(INPUT_POST, 'hereappid', FILTER_SANITIZE_STRING);
+	$hereappcode = filter_input(INPUT_POST, 'hereappcode', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMapProvider' => $mapprovider, 'globalMapboxId' => $mapboxid, 'globalMapboxToken' => $mapboxtoken, 'globalGoogleAPIKey' => $googlekey, 'globalBingMapKey' => $bingkey, 'globalHereappID' => $hereappid, 'globalHereappCode' => $hereappcode, 'globalMapQuestKey' => $mapquestkey, 'globalOpenWeatherMapKey' => $openweathermapkey));
 	
-	$latitudemax = filter_input(INPUT_POST,'latitudemax',FILTER_SANITIZE_STRING);
-	$latitudemin = filter_input(INPUT_POST,'latitudemin',FILTER_SANITIZE_STRING);
-	$longitudemax = filter_input(INPUT_POST,'longitudemax',FILTER_SANITIZE_STRING);
-	$longitudemin = filter_input(INPUT_POST,'longitudemin',FILTER_SANITIZE_STRING);
-	$livezoom = filter_input(INPUT_POST,'livezoom',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalLatitudeMax' => $latitudemax,'globalLatitudeMin' => $latitudemin,'globalLongitudeMax' => $longitudemax,'globalLongitudeMin' => $longitudemin,'globalLiveZoom' => $livezoom));
+	$latitudemax = filter_input(INPUT_POST, 'latitudemax', FILTER_SANITIZE_STRING);
+	$latitudemin = filter_input(INPUT_POST, 'latitudemin', FILTER_SANITIZE_STRING);
+	$longitudemax = filter_input(INPUT_POST, 'longitudemax', FILTER_SANITIZE_STRING);
+	$longitudemin = filter_input(INPUT_POST, 'longitudemin', FILTER_SANITIZE_STRING);
+	$livezoom = filter_input(INPUT_POST, 'livezoom', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalLatitudeMax' => $latitudemax, 'globalLatitudeMin' => $latitudemin, 'globalLongitudeMax' => $longitudemax, 'globalLongitudeMin' => $longitudemin, 'globalLiveZoom' => $livezoom));
 
-	$squawk_country = filter_input(INPUT_POST,'squawk_country',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalSquawkCountry' => $squawk_country));
+	$squawk_country = filter_input(INPUT_POST, 'squawk_country', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalSquawkCountry' => $squawk_country));
 
-	$latitudecenter = filter_input(INPUT_POST,'latitudecenter',FILTER_SANITIZE_STRING);
-	$longitudecenter = filter_input(INPUT_POST,'longitudecenter',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalCenterLatitude' => $latitudecenter,'globalCenterLongitude' => $longitudecenter));
+	$latitudecenter = filter_input(INPUT_POST, 'latitudecenter', FILTER_SANITIZE_STRING);
+	$longitudecenter = filter_input(INPUT_POST, 'longitudecenter', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalCenterLatitude' => $latitudecenter, 'globalCenterLongitude' => $longitudecenter));
 
-	$acars = filter_input(INPUT_POST,'acars',FILTER_SANITIZE_STRING);
+	$acars = filter_input(INPUT_POST, 'acars', FILTER_SANITIZE_STRING);
 	if ($acars == 'acars') {
-		$settings = array_merge($settings,array('globalACARS' => 'TRUE'));
+		$settings = array_merge($settings, array('globalACARS' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalACARS' => 'FALSE'));
+		$settings = array_merge($settings, array('globalACARS' => 'FALSE'));
 	}
 
-	$flightawareusername = filter_input(INPUT_POST,'flightawareusername',FILTER_SANITIZE_STRING);
-	$flightawarepassword = filter_input(INPUT_POST,'flightawarepassword',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalFlightAwareUsername' => $flightawareusername,'globalFlightAwarePassword' => $flightawarepassword));
+	$flightawareusername = filter_input(INPUT_POST, 'flightawareusername', FILTER_SANITIZE_STRING);
+	$flightawarepassword = filter_input(INPUT_POST, 'flightawarepassword', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalFlightAwareUsername' => $flightawareusername, 'globalFlightAwarePassword' => $flightawarepassword));
 	
 	$source_name = $_POST['source_name'];
 	$source_latitude = $_POST['source_latitude'];
@@ -1234,8 +1234,8 @@ 
 	
 	$sources = array();
 	foreach ($source_name as $keys => $name) {
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
+	    if (isset($source_id[$keys])) $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'id' => $source_id[$keys], 'source' => $source_ref[$keys]);
+	    else $sources[] = array('name' => $name, 'latitude' => $source_latitude[$keys], 'longitude' => $source_longitude[$keys], 'altitude' => $source_altitude[$keys], 'city' => $source_city[$keys], 'country' => $source_country[$keys], 'source' => $source_ref[$keys]);
 	}
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
 
@@ -1244,16 +1244,16 @@ 
 	$newstype = $_POST['newstype'];
 	
 	$newsfeeds = array();
-	foreach($newsurl as $newskey => $url) {
+	foreach ($newsurl as $newskey => $url) {
 	    if ($url != '') {
 		$type = $newstype[$newskey];
 		$lng = $newslng[$newskey];
 		if (isset($newsfeeds[$type][$lng])) {
-		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng],array($url));
+		    $newsfeeds[$type][$lng] = array_merge($newsfeeds[$type][$lng], array($url));
 		} else $newsfeeds[$type][$lng] = array($url);
 	    }
 	}
-	$settings = array_merge($settings,array('globalNewsFeeds' => $newsfeeds));
+	$settings = array_merge($settings, array('globalNewsFeeds' => $newsfeeds));
 
 	//$sbshost = filter_input(INPUT_POST,'sbshost',FILTER_SANITIZE_STRING);
 	//$sbsport = filter_input(INPUT_POST,'sbsport',FILTER_SANITIZE_NUMBER_INT);
@@ -1264,27 +1264,27 @@ 
 	$sbsurl = $_POST['sbsurl'];
 	*/
 
-	$globalvatsim = filter_input(INPUT_POST,'globalvatsim',FILTER_SANITIZE_STRING);
-	$globalva = filter_input(INPUT_POST,'globalva',FILTER_SANITIZE_STRING);
-	$globalivao = filter_input(INPUT_POST,'globalivao',FILTER_SANITIZE_STRING);
-	$globalphpvms = filter_input(INPUT_POST,'globalphpvms',FILTER_SANITIZE_STRING);
-	$globalvam = filter_input(INPUT_POST,'globalvam',FILTER_SANITIZE_STRING);
-	$globalsbs = filter_input(INPUT_POST,'globalsbs',FILTER_SANITIZE_STRING);
-	$globalaprs = filter_input(INPUT_POST,'globalaprs',FILTER_SANITIZE_STRING);
-	$datasource = filter_input(INPUT_POST,'datasource',FILTER_SANITIZE_STRING);
+	$globalvatsim = filter_input(INPUT_POST, 'globalvatsim', FILTER_SANITIZE_STRING);
+	$globalva = filter_input(INPUT_POST, 'globalva', FILTER_SANITIZE_STRING);
+	$globalivao = filter_input(INPUT_POST, 'globalivao', FILTER_SANITIZE_STRING);
+	$globalphpvms = filter_input(INPUT_POST, 'globalphpvms', FILTER_SANITIZE_STRING);
+	$globalvam = filter_input(INPUT_POST, 'globalvam', FILTER_SANITIZE_STRING);
+	$globalsbs = filter_input(INPUT_POST, 'globalsbs', FILTER_SANITIZE_STRING);
+	$globalaprs = filter_input(INPUT_POST, 'globalaprs', FILTER_SANITIZE_STRING);
+	$datasource = filter_input(INPUT_POST, 'datasource', FILTER_SANITIZE_STRING);
 
-	$globalaircraft = filter_input(INPUT_POST,'globalaircraft',FILTER_SANITIZE_STRING);
-	if ($globalaircraft == 'aircraft') $settings = array_merge($settings,array('globalAircraft' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAircraft' => 'FALSE'));
-	$globaltracker = filter_input(INPUT_POST,'globaltracker',FILTER_SANITIZE_STRING);
-	if ($globaltracker == 'tracker') $settings = array_merge($settings,array('globalTracker' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalTracker' => 'FALSE'));
-	$globalmarine = filter_input(INPUT_POST,'globalmarine',FILTER_SANITIZE_STRING);
-	if ($globalmarine == 'marine') $settings = array_merge($settings,array('globalMarine' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalMarine' => 'FALSE'));
-	$globalsatellite = filter_input(INPUT_POST,'globalsatellite',FILTER_SANITIZE_STRING);
-	if ($globalsatellite == 'satellite') $settings = array_merge($settings,array('globalSatellite' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSatellite' => 'FALSE'));
+	$globalaircraft = filter_input(INPUT_POST, 'globalaircraft', FILTER_SANITIZE_STRING);
+	if ($globalaircraft == 'aircraft') $settings = array_merge($settings, array('globalAircraft' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalAircraft' => 'FALSE'));
+	$globaltracker = filter_input(INPUT_POST, 'globaltracker', FILTER_SANITIZE_STRING);
+	if ($globaltracker == 'tracker') $settings = array_merge($settings, array('globalTracker' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalTracker' => 'FALSE'));
+	$globalmarine = filter_input(INPUT_POST, 'globalmarine', FILTER_SANITIZE_STRING);
+	if ($globalmarine == 'marine') $settings = array_merge($settings, array('globalMarine' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalMarine' => 'FALSE'));
+	$globalsatellite = filter_input(INPUT_POST, 'globalsatellite', FILTER_SANITIZE_STRING);
+	if ($globalsatellite == 'satellite') $settings = array_merge($settings, array('globalSatellite' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalSatellite' => 'FALSE'));
 
 /*	
 	$globalSBS1Hosts = array();
@@ -1300,7 +1300,7 @@ 
 	}
 	$settings = array_merge($settings,array('globalSBS1Hosts' => $globalSBS1Hosts));
 */
-	$settings_comment = array_merge($settings_comment,array('globalSBS1Hosts'));
+	$settings_comment = array_merge($settings_comment, array('globalSBS1Hosts'));
 	$host = $_POST['host'];
 	$port = $_POST['port'];
 	$name = $_POST['name'];
@@ -1317,115 +1317,115 @@ 
 		else $cov = 'FALSE';
 		if (isset($noarchive[$key]) && $noarchive[$key] == 1) $arch = 'TRUE';
 		else $arch = 'FALSE';
-		if (strpos($format[$key],'_callback')) {
-			$gSources[] = array('host' => $h, 'pass' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'TRUE');
+		if (strpos($format[$key], '_callback')) {
+			$gSources[] = array('host' => $h, 'pass' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'TRUE');
 		} elseif ($h != '' || $name[$key] != '') {
-			$gSources[] = array('host' => $h, 'port' => $port[$key],'name' => $name[$key],'format' => $format[$key],'sourcestats' => $cov,'noarchive' => $arch,'timezone' => $timezones[$key],'callback' => 'FALSE');
+			$gSources[] = array('host' => $h, 'port' => $port[$key], 'name' => $name[$key], 'format' => $format[$key], 'sourcestats' => $cov, 'noarchive' => $arch, 'timezone' => $timezones[$key], 'callback' => 'FALSE');
 		}
 		if ($format[$key] == 'airwhere') $forcepilots = true;
 	}
-	$settings = array_merge($settings,array('globalSources' => $gSources));
+	$settings = array_merge($settings, array('globalSources' => $gSources));
 
 /*
 	$sbstimeout = filter_input(INPUT_POST,'sbstimeout',FILTER_SANITIZE_NUMBER_INT);
 	$settings = array_merge($settings,array('globalSourcesTimeOut' => $sbstimeout));
 */
-	$acarshost = filter_input(INPUT_POST,'acarshost',FILTER_SANITIZE_STRING);
-	$acarsport = filter_input(INPUT_POST,'acarsport',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalACARSHost' => $acarshost,'globalACARSPort' => $acarsport));
+	$acarshost = filter_input(INPUT_POST, 'acarshost', FILTER_SANITIZE_STRING);
+	$acarsport = filter_input(INPUT_POST, 'acarsport', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalACARSHost' => $acarshost, 'globalACARSPort' => $acarsport));
 
-	$bitly = filter_input(INPUT_POST,'bitly',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalBitlyAccessToken' => $bitly));
+	$bitly = filter_input(INPUT_POST, 'bitly', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalBitlyAccessToken' => $bitly));
 
-	$customcss = filter_input(INPUT_POST,'customcss',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalCustomCSS' => $customcss));
+	$customcss = filter_input(INPUT_POST, 'customcss', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalCustomCSS' => $customcss));
 
-	$map3dtile = filter_input(INPUT_POST,'map3dtileset',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMap3DTiles' => $map3dtile));
+	$map3dtile = filter_input(INPUT_POST, 'map3dtileset', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMap3DTiles' => $map3dtile));
 
-	$notamsource = filter_input(INPUT_POST,'notamsource',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalNOTAMSource' => $notamsource));
-	$metarsource = filter_input(INPUT_POST,'metarsource',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMETARurl' => $metarsource));
+	$notamsource = filter_input(INPUT_POST, 'notamsource', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalNOTAMSource' => $notamsource));
+	$metarsource = filter_input(INPUT_POST, 'metarsource', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMETARurl' => $metarsource));
 
-	$zoilatitude = filter_input(INPUT_POST,'zoilatitude',FILTER_SANITIZE_STRING);
-	$zoilongitude = filter_input(INPUT_POST,'zoilongitude',FILTER_SANITIZE_STRING);
-	$zoidistance = filter_input(INPUT_POST,'zoidistance',FILTER_SANITIZE_NUMBER_INT);
+	$zoilatitude = filter_input(INPUT_POST, 'zoilatitude', FILTER_SANITIZE_STRING);
+	$zoilongitude = filter_input(INPUT_POST, 'zoilongitude', FILTER_SANITIZE_STRING);
+	$zoidistance = filter_input(INPUT_POST, 'zoidistance', FILTER_SANITIZE_NUMBER_INT);
 	if ($zoilatitude != '' && $zoilongitude != '' && $zoidistance != '') {
-		$settings = array_merge($settings,array('globalDistanceIgnore' => array('latitude' => $zoilatitude,'longitude' => $zoilongitude,'distance' => $zoidistance)));
-	} else $settings = array_merge($settings,array('globalDistanceIgnore' => array()));
+		$settings = array_merge($settings, array('globalDistanceIgnore' => array('latitude' => $zoilatitude, 'longitude' => $zoilongitude, 'distance' => $zoidistance)));
+	} else $settings = array_merge($settings, array('globalDistanceIgnore' => array()));
 
-	$refresh = filter_input(INPUT_POST,'refresh',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalLiveInterval' => $refresh));
-	$maprefresh = filter_input(INPUT_POST,'maprefresh',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalMapRefresh' => $maprefresh));
-	$mapidle = filter_input(INPUT_POST,'mapidle',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalMapIdleTimeout' => $mapidle));
-	$minfetch = filter_input(INPUT_POST,'minfetch',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalMinFetch' => $minfetch));
-	$closestmindist = filter_input(INPUT_POST,'closestmindist',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalClosestMinDist' => $closestmindist));
+	$refresh = filter_input(INPUT_POST, 'refresh', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalLiveInterval' => $refresh));
+	$maprefresh = filter_input(INPUT_POST, 'maprefresh', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalMapRefresh' => $maprefresh));
+	$mapidle = filter_input(INPUT_POST, 'mapidle', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalMapIdleTimeout' => $mapidle));
+	$minfetch = filter_input(INPUT_POST, 'minfetch', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalMinFetch' => $minfetch));
+	$closestmindist = filter_input(INPUT_POST, 'closestmindist', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalClosestMinDist' => $closestmindist));
 
-	$aircraftsize = filter_input(INPUT_POST,'aircraftsize',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalAircraftSize' => $aircraftsize));
+	$aircraftsize = filter_input(INPUT_POST, 'aircraftsize', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalAircraftSize' => $aircraftsize));
 
-	$archivemonths = filter_input(INPUT_POST,'archivemonths',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalArchiveMonths' => $archivemonths));
+	$archivemonths = filter_input(INPUT_POST, 'archivemonths', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalArchiveMonths' => $archivemonths));
 	
-	$archiveyear = filter_input(INPUT_POST,'archiveyear',FILTER_SANITIZE_STRING);
+	$archiveyear = filter_input(INPUT_POST, 'archiveyear', FILTER_SANITIZE_STRING);
 	if ($archiveyear == "archiveyear") {
-		$settings = array_merge($settings,array('globalArchiveYear' => 'TRUE'));
+		$settings = array_merge($settings, array('globalArchiveYear' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalArchiveYear' => 'FALSE'));
+		$settings = array_merge($settings, array('globalArchiveYear' => 'FALSE'));
 	}
-	$archivekeepmonths = filter_input(INPUT_POST,'archivekeepmonths',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalArchiveKeepMonths' => $archivekeepmonths));
-	$archivekeeptrackmonths = filter_input(INPUT_POST,'archivekeeptrackmonths',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
+	$archivekeepmonths = filter_input(INPUT_POST, 'archivekeepmonths', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalArchiveKeepMonths' => $archivekeepmonths));
+	$archivekeeptrackmonths = filter_input(INPUT_POST, 'archivekeeptrackmonths', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalArchiveKeepTrackMonths' => $archivekeeptrackmonths));
 
-	$britishairways = filter_input(INPUT_POST,'britishairways',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalBritishAirwaysKey' => $britishairways));
-	$transavia = filter_input(INPUT_POST,'transavia',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalTransaviaKey' => $transavia));
+	$britishairways = filter_input(INPUT_POST, 'britishairways', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalBritishAirwaysKey' => $britishairways));
+	$transavia = filter_input(INPUT_POST, 'transavia', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalTransaviaKey' => $transavia));
 
-	$lufthansakey = filter_input(INPUT_POST,'lufthansakey',FILTER_SANITIZE_STRING);
-	$lufthansasecret = filter_input(INPUT_POST,'lufthansasecret',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalLufthansaKey' => array('key' => $lufthansakey,'secret' => $lufthansasecret)));
+	$lufthansakey = filter_input(INPUT_POST, 'lufthansakey', FILTER_SANITIZE_STRING);
+	$lufthansasecret = filter_input(INPUT_POST, 'lufthansasecret', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalLufthansaKey' => array('key' => $lufthansakey, 'secret' => $lufthansasecret)));
 
 	// Create in settings.php keys not yet configurable if not already here
 	//if (!isset($globalImageBingKey)) $settings = array_merge($settings,array('globalImageBingKey' => ''));
-	if (!isset($globalDebug)) $settings = array_merge($settings,array('globalDebug' => 'TRUE'));
+	if (!isset($globalDebug)) $settings = array_merge($settings, array('globalDebug' => 'TRUE'));
 
-	$resetyearstats = filter_input(INPUT_POST,'resetyearstats',FILTER_SANITIZE_STRING);
+	$resetyearstats = filter_input(INPUT_POST, 'resetyearstats', FILTER_SANITIZE_STRING);
 	if ($resetyearstats == 'resetyearstats') {
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'TRUE'));
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalDeleteLastYearStats' => 'FALSE'));
+		$settings = array_merge($settings, array('globalDeleteLastYearStats' => 'FALSE'));
 	}
 
-	$archive = filter_input(INPUT_POST,'archive',FILTER_SANITIZE_STRING);
+	$archive = filter_input(INPUT_POST, 'archive', FILTER_SANITIZE_STRING);
 	if ($archive == 'archive') {
-		$settings = array_merge($settings,array('globalArchive' => 'TRUE'));
+		$settings = array_merge($settings, array('globalArchive' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalArchive' => 'FALSE'));
+		$settings = array_merge($settings, array('globalArchive' => 'FALSE'));
 	}
-	$archiveresults = filter_input(INPUT_POST,'archiveresults',FILTER_SANITIZE_STRING);
+	$archiveresults = filter_input(INPUT_POST, 'archiveresults', FILTER_SANITIZE_STRING);
 	if ($archiveresults == 'archiveresults') {
-		$settings = array_merge($settings,array('globalArchiveResults' => 'TRUE'));
+		$settings = array_merge($settings, array('globalArchiveResults' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalArchiveResults' => 'FALSE'));
+		$settings = array_merge($settings, array('globalArchiveResults' => 'FALSE'));
 	}
-	$daemon = filter_input(INPUT_POST,'daemon',FILTER_SANITIZE_STRING);
+	$daemon = filter_input(INPUT_POST, 'daemon', FILTER_SANITIZE_STRING);
 	if ($daemon == 'daemon') {
-		$settings = array_merge($settings,array('globalDaemon' => 'TRUE'));
+		$settings = array_merge($settings, array('globalDaemon' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalDaemon' => 'FALSE'));
+		$settings = array_merge($settings, array('globalDaemon' => 'FALSE'));
 	}
-	$schedules = filter_input(INPUT_POST,'schedules',FILTER_SANITIZE_STRING);
+	$schedules = filter_input(INPUT_POST, 'schedules', FILTER_SANITIZE_STRING);
 	if ($schedules == 'schedules') {
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE'));
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE'));
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE'));
 	}
 
 /*
@@ -1436,280 +1436,280 @@ 
 		$settings = array_merge($settings,array('globalFlightAware' => 'FALSE','globalSBS1' => 'TRUE'));
 	}
 */
-	$settings = array_merge($settings,array('globalFlightAware' => 'FALSE'));
-	if ($globalsbs == 'sbs') $settings = array_merge($settings,array('globalSBS1' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalSBS1' => 'FALSE'));
-	if ($globalaprs == 'aprs') $settings = array_merge($settings,array('globalAPRS' => 'TRUE'));
-	else $settings = array_merge($settings,array('globalAPRS' => 'FALSE'));
+	$settings = array_merge($settings, array('globalFlightAware' => 'FALSE'));
+	if ($globalsbs == 'sbs') $settings = array_merge($settings, array('globalSBS1' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalSBS1' => 'FALSE'));
+	if ($globalaprs == 'aprs') $settings = array_merge($settings, array('globalAPRS' => 'TRUE'));
+	else $settings = array_merge($settings, array('globalAPRS' => 'FALSE'));
 	$va = false;
 	if ($globalivao == 'ivao') {
-		$settings = array_merge($settings,array('globalIVAO' => 'TRUE'));
+		$settings = array_merge($settings, array('globalIVAO' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalIVAO' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalIVAO' => 'FALSE'));
 	if ($globalvatsim == 'vatsim') {
-		$settings = array_merge($settings,array('globalVATSIM' => 'TRUE'));
+		$settings = array_merge($settings, array('globalVATSIM' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalVATSIM' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalVATSIM' => 'FALSE'));
 	if ($globalphpvms == 'phpvms') {
-		$settings = array_merge($settings,array('globalphpVMS' => 'TRUE'));
+		$settings = array_merge($settings, array('globalphpVMS' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalphpVMS' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalphpVMS' => 'FALSE'));
 	if ($globalvam == 'vam') {
-		$settings = array_merge($settings,array('globalVAM' => 'TRUE'));
+		$settings = array_merge($settings, array('globalVAM' => 'TRUE'));
 		$va = true;
-	} else $settings = array_merge($settings,array('globalVAM' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalVAM' => 'FALSE'));
 	if ($va) {
-		$settings = array_merge($settings,array('globalSchedulesFetch' => 'FALSE','globalTranslationFetch' => 'FALSE'));
-	} else $settings = array_merge($settings,array('globalSchedulesFetch' => 'TRUE','globalTranslationFetch' => 'TRUE'));
+		$settings = array_merge($settings, array('globalSchedulesFetch' => 'FALSE', 'globalTranslationFetch' => 'FALSE'));
+	} else $settings = array_merge($settings, array('globalSchedulesFetch' => 'TRUE', 'globalTranslationFetch' => 'TRUE'));
 	if ($globalva == 'va' || $va) {
-		$settings = array_merge($settings,array('globalVA' => 'TRUE'));
-		$settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
+		$settings = array_merge($settings, array('globalVA' => 'TRUE'));
+		$settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
 	} else {
-		$settings = array_merge($settings,array('globalVA' => 'FALSE'));
-		if ($forcepilots) $settings = array_merge($settings,array('globalUsePilot' => 'TRUE','globalUseOwner' => 'FALSE'));
-		else $settings = array_merge($settings,array('globalUsePilot' => 'FALSE','globalUseOwner' => 'TRUE'));
+		$settings = array_merge($settings, array('globalVA' => 'FALSE'));
+		if ($forcepilots) $settings = array_merge($settings, array('globalUsePilot' => 'TRUE', 'globalUseOwner' => 'FALSE'));
+		else $settings = array_merge($settings, array('globalUsePilot' => 'FALSE', 'globalUseOwner' => 'TRUE'));
 	}
 	
 	
-	$mapoffline = filter_input(INPUT_POST,'mapoffline',FILTER_SANITIZE_STRING);
+	$mapoffline = filter_input(INPUT_POST, 'mapoffline', FILTER_SANITIZE_STRING);
 	if ($mapoffline == 'mapoffline') {
-		$settings = array_merge($settings,array('globalMapOffline' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapOffline' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapOffline' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapOffline' => 'FALSE'));
 	}
-	$globaloffline = filter_input(INPUT_POST,'globaloffline',FILTER_SANITIZE_STRING);
+	$globaloffline = filter_input(INPUT_POST, 'globaloffline', FILTER_SANITIZE_STRING);
 	if ($globaloffline == 'globaloffline') {
-		$settings = array_merge($settings,array('globalOffline' => 'TRUE'));
+		$settings = array_merge($settings, array('globalOffline' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalOffline' => 'FALSE'));
+		$settings = array_merge($settings, array('globalOffline' => 'FALSE'));
 	}
 
-	$notam = filter_input(INPUT_POST,'notam',FILTER_SANITIZE_STRING);
+	$notam = filter_input(INPUT_POST, 'notam', FILTER_SANITIZE_STRING);
 	if ($notam == 'notam') {
-		$settings = array_merge($settings,array('globalNOTAM' => 'TRUE'));
+		$settings = array_merge($settings, array('globalNOTAM' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalNOTAM' => 'FALSE'));
+		$settings = array_merge($settings, array('globalNOTAM' => 'FALSE'));
 	}
-	$owner = filter_input(INPUT_POST,'owner',FILTER_SANITIZE_STRING);
+	$owner = filter_input(INPUT_POST, 'owner', FILTER_SANITIZE_STRING);
 	if ($owner == 'owner') {
-		$settings = array_merge($settings,array('globalOwner' => 'TRUE'));
+		$settings = array_merge($settings, array('globalOwner' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalOwner' => 'FALSE'));
+		$settings = array_merge($settings, array('globalOwner' => 'FALSE'));
 	}
-	$map3d = filter_input(INPUT_POST,'map3d',FILTER_SANITIZE_STRING);
+	$map3d = filter_input(INPUT_POST, 'map3d', FILTER_SANITIZE_STRING);
 	if ($map3d == 'map3d') {
-		$settings = array_merge($settings,array('globalMap3D' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3D' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3D' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3D' => 'FALSE'));
 	}
-	$crash = filter_input(INPUT_POST,'crash',FILTER_SANITIZE_STRING);
+	$crash = filter_input(INPUT_POST, 'crash', FILTER_SANITIZE_STRING);
 	if ($crash == 'crash') {
-		$settings = array_merge($settings,array('globalAccidents' => 'TRUE'));
+		$settings = array_merge($settings, array('globalAccidents' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalAccidents' => 'FALSE'));
+		$settings = array_merge($settings, array('globalAccidents' => 'FALSE'));
 	}
-	$fires = filter_input(INPUT_POST,'fires',FILTER_SANITIZE_STRING);
+	$fires = filter_input(INPUT_POST, 'fires', FILTER_SANITIZE_STRING);
 	if ($fires == 'fires') {
-		$settings = array_merge($settings,array('globalMapFires' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapFires' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapFires' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapFires' => 'FALSE'));
 	}
-	$firessupport = filter_input(INPUT_POST,'firessupport',FILTER_SANITIZE_STRING);
+	$firessupport = filter_input(INPUT_POST, 'firessupport', FILTER_SANITIZE_STRING);
 	if ($firessupport == 'firessupport') {
-		$settings = array_merge($settings,array('globalFires' => 'TRUE'));
+		$settings = array_merge($settings, array('globalFires' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalFires' => 'FALSE'));
+		$settings = array_merge($settings, array('globalFires' => 'FALSE'));
 	}
-	$mapsatellites = filter_input(INPUT_POST,'mapsatellites',FILTER_SANITIZE_STRING);
+	$mapsatellites = filter_input(INPUT_POST, 'mapsatellites', FILTER_SANITIZE_STRING);
 	if ($mapsatellites == 'mapsatellites') {
-		$settings = array_merge($settings,array('globalMapSatellites' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapSatellites' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapSatellites' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapSatellites' => 'FALSE'));
 	}
-	$map3ddefault = filter_input(INPUT_POST,'map3ddefault',FILTER_SANITIZE_STRING);
+	$map3ddefault = filter_input(INPUT_POST, 'map3ddefault', FILTER_SANITIZE_STRING);
 	if ($map3ddefault == 'map3ddefault') {
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3Ddefault' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3Ddefault' => 'FALSE'));
 	}
-	$one3dmodel = filter_input(INPUT_POST,'one3dmodel',FILTER_SANITIZE_STRING);
+	$one3dmodel = filter_input(INPUT_POST, 'one3dmodel', FILTER_SANITIZE_STRING);
 	if ($one3dmodel == 'one3dmodel') {
-		$settings = array_merge($settings,array('globalMap3DOneModel' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3DOneModel' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3DOneModel' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3DOneModel' => 'FALSE'));
 	}
-	$map3dliveries = filter_input(INPUT_POST,'map3dliveries',FILTER_SANITIZE_STRING);
+	$map3dliveries = filter_input(INPUT_POST, 'map3dliveries', FILTER_SANITIZE_STRING);
 	if ($map3dliveries == 'map3dliveries') {
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMap3DLiveries' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMap3DLiveries' => 'FALSE'));
 	}
-	$translate = filter_input(INPUT_POST,'translate',FILTER_SANITIZE_STRING);
+	$translate = filter_input(INPUT_POST, 'translate', FILTER_SANITIZE_STRING);
 	if ($translate == 'translate') {
-		$settings = array_merge($settings,array('globalTranslate' => 'TRUE'));
+		$settings = array_merge($settings, array('globalTranslate' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalTranslate' => 'FALSE'));
+		$settings = array_merge($settings, array('globalTranslate' => 'FALSE'));
 	}
-	$realairlines = filter_input(INPUT_POST,'realairlines',FILTER_SANITIZE_STRING);
+	$realairlines = filter_input(INPUT_POST, 'realairlines', FILTER_SANITIZE_STRING);
 	if ($realairlines == 'realairlines') {
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'TRUE'));
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalUseRealAirlines' => 'FALSE'));
+		$settings = array_merge($settings, array('globalUseRealAirlines' => 'FALSE'));
 	}
-	$estimation = filter_input(INPUT_POST,'estimation',FILTER_SANITIZE_STRING);
+	$estimation = filter_input(INPUT_POST, 'estimation', FILTER_SANITIZE_STRING);
 	if ($estimation == 'estimation') {
-		$settings = array_merge($settings,array('globalMapEstimation' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapEstimation' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapEstimation' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapEstimation' => 'FALSE'));
 	}
-	$metar = filter_input(INPUT_POST,'metar',FILTER_SANITIZE_STRING);
+	$metar = filter_input(INPUT_POST, 'metar', FILTER_SANITIZE_STRING);
 	if ($metar == 'metar') {
-		$settings = array_merge($settings,array('globalMETAR' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMETAR' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMETAR' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMETAR' => 'FALSE'));
 	}
-	$metarcycle = filter_input(INPUT_POST,'metarcycle',FILTER_SANITIZE_STRING);
+	$metarcycle = filter_input(INPUT_POST, 'metarcycle', FILTER_SANITIZE_STRING);
 	if ($metarcycle == 'metarcycle') {
-		$settings = array_merge($settings,array('globalMETARcycle' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMETARcycle' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMETARcycle' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMETARcycle' => 'FALSE'));
 	}
-	$fork = filter_input(INPUT_POST,'fork',FILTER_SANITIZE_STRING);
+	$fork = filter_input(INPUT_POST, 'fork', FILTER_SANITIZE_STRING);
 	if ($fork == 'fork') {
-		$settings = array_merge($settings,array('globalFork' => 'TRUE'));
+		$settings = array_merge($settings, array('globalFork' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalFork' => 'FALSE'));
+		$settings = array_merge($settings, array('globalFork' => 'FALSE'));
 	}
 
-	$colormap = filter_input(INPUT_POST,'colormap',FILTER_SANITIZE_STRING);
+	$colormap = filter_input(INPUT_POST, 'colormap', FILTER_SANITIZE_STRING);
 	if ($colormap == 'colormap') {
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapAltitudeColor' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapAltitudeColor' => 'FALSE'));
 	}
 	
 	if (isset($_POST['aircrafticoncolor'])) {
-		$aircrafticoncolor = filter_input(INPUT_POST,'aircrafticoncolor',FILTER_SANITIZE_STRING);
-		$settings = array_merge($settings,array('globalAircraftIconColor' => substr($aircrafticoncolor,1)));
+		$aircrafticoncolor = filter_input(INPUT_POST, 'aircrafticoncolor', FILTER_SANITIZE_STRING);
+		$settings = array_merge($settings, array('globalAircraftIconColor' => substr($aircrafticoncolor, 1)));
 	}
 
-	$airportzoom = filter_input(INPUT_POST,'airportzoom',FILTER_SANITIZE_NUMBER_INT);
-	$settings = array_merge($settings,array('globalAirportZoom' => $airportzoom));
+	$airportzoom = filter_input(INPUT_POST, 'airportzoom', FILTER_SANITIZE_NUMBER_INT);
+	$settings = array_merge($settings, array('globalAirportZoom' => $airportzoom));
 
-	$unitdistance = filter_input(INPUT_POST,'unitdistance',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalUnitDistance' => $unitdistance));
-	$unitaltitude = filter_input(INPUT_POST,'unitaltitude',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalUnitAltitude' => $unitaltitude));
-	$unitspeed = filter_input(INPUT_POST,'unitspeed',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalUnitSpeed' => $unitspeed));
+	$unitdistance = filter_input(INPUT_POST, 'unitdistance', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalUnitDistance' => $unitdistance));
+	$unitaltitude = filter_input(INPUT_POST, 'unitaltitude', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalUnitAltitude' => $unitaltitude));
+	$unitspeed = filter_input(INPUT_POST, 'unitspeed', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalUnitSpeed' => $unitspeed));
 
-	$mappopup = filter_input(INPUT_POST,'mappopup',FILTER_SANITIZE_STRING);
+	$mappopup = filter_input(INPUT_POST, 'mappopup', FILTER_SANITIZE_STRING);
 	if ($mappopup == 'mappopup') {
-		$settings = array_merge($settings,array('globalMapPopup' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapPopup' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapPopup' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapPopup' => 'FALSE'));
 	}
-	$airportpopup = filter_input(INPUT_POST,'airportpopup',FILTER_SANITIZE_STRING);
+	$airportpopup = filter_input(INPUT_POST, 'airportpopup', FILTER_SANITIZE_STRING);
 	if ($airportpopup == 'airportpopup') {
-		$settings = array_merge($settings,array('globalAirportPopup' => 'TRUE'));
+		$settings = array_merge($settings, array('globalAirportPopup' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalAirportPopup' => 'FALSE'));
+		$settings = array_merge($settings, array('globalAirportPopup' => 'FALSE'));
 	}
-	$maphistory = filter_input(INPUT_POST,'maphistory',FILTER_SANITIZE_STRING);
+	$maphistory = filter_input(INPUT_POST, 'maphistory', FILTER_SANITIZE_STRING);
 	if ($maphistory == 'maphistory') {
-		$settings = array_merge($settings,array('globalMapHistory' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapHistory' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapHistory' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapHistory' => 'FALSE'));
 	}
-	$maptooltip = filter_input(INPUT_POST,'maptooltip',FILTER_SANITIZE_STRING);
+	$maptooltip = filter_input(INPUT_POST, 'maptooltip', FILTER_SANITIZE_STRING);
 	if ($maptooltip == 'maptooltip') {
-		$settings = array_merge($settings,array('globalMapTooltip' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapTooltip' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapTooltip' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapTooltip' => 'FALSE'));
 	}
-	$flightroute = filter_input(INPUT_POST,'flightroute',FILTER_SANITIZE_STRING);
+	$flightroute = filter_input(INPUT_POST, 'flightroute', FILTER_SANITIZE_STRING);
 	if ($flightroute == 'flightroute') {
-		$settings = array_merge($settings,array('globalMapRoute' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapRoute' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapRoute' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapRoute' => 'FALSE'));
 	}
-	$flightremainingroute = filter_input(INPUT_POST,'flightremainingroute',FILTER_SANITIZE_STRING);
+	$flightremainingroute = filter_input(INPUT_POST, 'flightremainingroute', FILTER_SANITIZE_STRING);
 	if ($flightremainingroute == 'flightremainingroute') {
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapRemainingRoute' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapRemainingRoute' => 'FALSE'));
 	}
-	$allflights = filter_input(INPUT_POST,'allflights',FILTER_SANITIZE_STRING);
+	$allflights = filter_input(INPUT_POST, 'allflights', FILTER_SANITIZE_STRING);
 	if ($allflights == 'allflights') {
-		$settings = array_merge($settings,array('globalAllFlights' => 'TRUE'));
+		$settings = array_merge($settings, array('globalAllFlights' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalAllFlights' => 'FALSE'));
+		$settings = array_merge($settings, array('globalAllFlights' => 'FALSE'));
 	}
-	$bbox = filter_input(INPUT_POST,'bbox',FILTER_SANITIZE_STRING);
+	$bbox = filter_input(INPUT_POST, 'bbox', FILTER_SANITIZE_STRING);
 	if ($bbox == 'bbox') {
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapUseBbox' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapUseBbox' => 'FALSE'));
 	}
-	$groundaltitude = filter_input(INPUT_POST,'groundaltitude',FILTER_SANITIZE_STRING);
+	$groundaltitude = filter_input(INPUT_POST, 'groundaltitude', FILTER_SANITIZE_STRING);
 	if ($groundaltitude == 'groundaltitude') {
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'TRUE'));
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalGroundAltitude' => 'FALSE'));
+		$settings = array_merge($settings, array('globalGroundAltitude' => 'FALSE'));
 	}
-	$waypoints = filter_input(INPUT_POST,'waypoints',FILTER_SANITIZE_STRING);
+	$waypoints = filter_input(INPUT_POST, 'waypoints', FILTER_SANITIZE_STRING);
 	if ($waypoints == 'waypoints') {
-		$settings = array_merge($settings,array('globalWaypoints' => 'TRUE'));
+		$settings = array_merge($settings, array('globalWaypoints' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalWaypoints' => 'FALSE'));
+		$settings = array_merge($settings, array('globalWaypoints' => 'FALSE'));
 	}
-	$geoid = filter_input(INPUT_POST,'geoid',FILTER_SANITIZE_STRING);
+	$geoid = filter_input(INPUT_POST, 'geoid', FILTER_SANITIZE_STRING);
 	if ($geoid == 'geoid') {
-		$settings = array_merge($settings,array('globalGeoid' => 'TRUE'));
+		$settings = array_merge($settings, array('globalGeoid' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalGeoid' => 'FALSE'));
+		$settings = array_merge($settings, array('globalGeoid' => 'FALSE'));
 	}
-	$geoid_source = filter_input(INPUT_POST,'geoid_source',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalGeoidSource' => $geoid_source));
+	$geoid_source = filter_input(INPUT_POST, 'geoid_source', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalGeoidSource' => $geoid_source));
 
-	$noairlines = filter_input(INPUT_POST,'noairlines',FILTER_SANITIZE_STRING);
+	$noairlines = filter_input(INPUT_POST, 'noairlines', FILTER_SANITIZE_STRING);
 	if ($noairlines == 'noairlines') {
-		$settings = array_merge($settings,array('globalNoAirlines' => 'TRUE'));
+		$settings = array_merge($settings, array('globalNoAirlines' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalNoAirlines' => 'FALSE'));
+		$settings = array_merge($settings, array('globalNoAirlines' => 'FALSE'));
 	}
 
-	$tsk = filter_input(INPUT_POST,'tsk',FILTER_SANITIZE_STRING);
+	$tsk = filter_input(INPUT_POST, 'tsk', FILTER_SANITIZE_STRING);
 	if ($tsk == 'tsk') {
-		$settings = array_merge($settings,array('globalTSK' => 'TRUE'));
+		$settings = array_merge($settings, array('globalTSK' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalTSK' => 'FALSE'));
+		$settings = array_merge($settings, array('globalTSK' => 'FALSE'));
 	}
-	$mapmatching = filter_input(INPUT_POST,'mapmatching',FILTER_SANITIZE_STRING);
+	$mapmatching = filter_input(INPUT_POST, 'mapmatching', FILTER_SANITIZE_STRING);
 	if ($mapmatching == 'mapmatching') {
-		$settings = array_merge($settings,array('globalMapMatching' => 'TRUE'));
+		$settings = array_merge($settings, array('globalMapMatching' => 'TRUE'));
 	} else {
-		$settings = array_merge($settings,array('globalMapMatching' => 'FALSE'));
+		$settings = array_merge($settings, array('globalMapMatching' => 'FALSE'));
 	}
-	$mapmatchingsource = filter_input(INPUT_POST,'mapmatchingsource',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalMapMatchingSource' => $mapmatchingsource));
-	$graphhopper = filter_input(INPUT_POST,'graphhopper',FILTER_SANITIZE_STRING);
-	$settings = array_merge($settings,array('globalGraphHopperKey' => $graphhopper));
+	$mapmatchingsource = filter_input(INPUT_POST, 'mapmatchingsource', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalMapMatchingSource' => $mapmatchingsource));
+	$graphhopper = filter_input(INPUT_POST, 'graphhopper', FILTER_SANITIZE_STRING);
+	$settings = array_merge($settings, array('globalGraphHopperKey' => $graphhopper));
 
-	if (!isset($globalTransaction)) $settings = array_merge($settings,array('globalTransaction' => 'TRUE'));
+	if (!isset($globalTransaction)) $settings = array_merge($settings, array('globalTransaction' => 'TRUE'));
 
 	// Set some defaults values...
 	if (!isset($globalAircraftImageSources)) {
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
+	    $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters');
+	    $settings = array_merge($settings, array('globalAircraftImageSources' => $globalAircraftImageSources));
 	}
 
 	if (!isset($globalSchedulesSources)) {
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
+	    $globalSchedulesSources = array('flightmapper', 'costtotravel', 'flightradar24', 'flightaware');
+    	    $settings = array_merge($settings, array('globalSchedulesSources' => $globalSchedulesSources));
     	}
 
-	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
+	$settings = array_merge($settings, array('globalInstalled' => 'TRUE'));
 
 	if ($error == '') settings::modify_settings($settings);
 	if ($error == '') settings::comment_settings($settings_comment);

require/class.TrackerImport.php

Indentation +174 added lines, -174 removed lines

@@ -7,16 +7,16 @@ 
 require_once(dirname(__FILE__).'/class.Source.php');
 
 class TrackerImport {
-    private $all_tracked = array();
-    private $last_delete_hourly = 0;
-    private $last_delete = 0;
-    private $stats = array();
-    private $tmd = 0;
-    private $source_location = array();
-    public $db = null;
-    public $nb = 0;
+	private $all_tracked = array();
+	private $last_delete_hourly = 0;
+	private $last_delete = 0;
+	private $stats = array();
+	private $tmd = 0;
+	private $source_location = array();
+	public $db = null;
+	public $nb = 0;
 
-    public function __construct($dbc = null) {
+	public function __construct($dbc = null) {
 	global $globalBeta;
 	$Connection = new Connection($dbc);
 	$this->db = $Connection->db();
@@ -38,50 +38,50 @@ 
 	    }
 	}
 	*/
-    }
+	}
 
-    public function checkAll() {
+	public function checkAll() {
 	global $globalDebug;
 	if ($globalDebug) echo "Update last seen tracked data...\n";
 	foreach ($this->all_tracked as $key => $flight) {
-	    if (isset($this->all_tracked[$key]['id'])) {
+		if (isset($this->all_tracked[$key]['id'])) {
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
-    		$Tracker = new Tracker($this->db);
-        	$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
-            }
+			$Tracker = new Tracker($this->db);
+			$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
+			}
+	}
 	}
-    }
 
-    public function del() {
+	public function del() {
 	global $globalDebug;
 	// Delete old infos
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
 	foreach ($this->all_tracked as $key => $flight) {
-    	    if (isset($flight['lastupdate'])) {
-        	if ($flight['lastupdate'] < (time()-3000)) {
-            	    if (isset($this->all_tracked[$key]['id'])) {
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+			if (isset($flight['lastupdate'])) {
+			if ($flight['lastupdate'] < (time()-3000)) {
+					if (isset($this->all_tracked[$key]['id'])) {
+					if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
 			/*
 			$TrackerLive = new TrackerLive();
             		$TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']);
 			$TrackerLive->db = null;
 			*/
-            		//$real_arrival = $this->arrival($key);
-            		$Tracker = new Tracker($this->db);
-            		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
+					//$real_arrival = $this->arrival($key);
+					$Tracker = new Tracker($this->db);
+					if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
 				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			}
 			// Put in archive
 //			$Tracker->db = null;
-            	    }
-            	    unset($this->all_tracked[$key]);
-    	        }
-	    }
-        }
-    }
+					}
+					unset($this->all_tracked[$key]);
+				}
+		}
+		}
+	}
 
-    public function add($line) {
+	public function add($line) {
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChangeTracker, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked;
 	if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') $globalCoordMinChangeTracker = '0.015';
 	date_default_timezone_set('UTC');
@@ -90,47 +90,47 @@ 
 	
 	// SBS format is CSV format
 	if(is_array($line) && isset($line['ident'])) {
-	    //print_r($line);
-  	    if (isset($line['ident'])) {
+		//print_r($line);
+  		if (isset($line['ident'])) {
 
 		
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
-		    $current_date = date('Y-m-d');
-		    if (isset($line['source_name'])) $source = $line['source_name'];
-		    else $source = '';
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
-		    if (!isset($this->stats[$current_date][$source]['msg'])) {
-		    	$this->stats[$current_date][$source]['msg']['date'] = time();
-		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+			$current_date = date('Y-m-d');
+			if (isset($line['source_name'])) $source = $line['source_name'];
+			else $source = '';
+			if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+			if (!isset($this->stats[$current_date][$source]['msg'])) {
+				$this->stats[$current_date][$source]['msg']['date'] = time();
+				$this->stats[$current_date][$source]['msg']['nb'] = 1;
+			} else $this->stats[$current_date][$source]['msg']['nb'] += 1;
 		}
 		
 		
 		$Common = new Common();
-	        if (!isset($line['id'])) $id = trim($line['ident']);
-	        else $id = trim($line['id']);
+			if (!isset($line['id'])) $id = trim($line['ident']);
+			else $id = trim($line['id']);
 		
 		if (!isset($this->all_tracked[$id])) {
-		    $this->all_tracked[$id] = array();
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
-		    if (!isset($line['id'])) {
+			$this->all_tracked[$id] = array();
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
+			if (!isset($line['id'])) {
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
+			 } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+			if ($globalAllTracked !== FALSE) $dataFound = true;
 		}
 		
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
-		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
+			if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
-		    } else {
+			} else {
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
 				return '';
-		    }
+			}
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
 			return '';
@@ -147,38 +147,38 @@ 
 		
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
-		    if ($this->all_tracked[$id]['addedTracker'] == 1) {
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
+			if ($this->all_tracked[$id]['addedTracker'] == 1) {
 			$timeelapsed = microtime(true);
-            		$Tracker = new Tracker($this->db);
-            		$fromsource = NULL;
-            		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
+					$Tracker = new Tracker($this->db);
+					$fromsource = NULL;
+					$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
 			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			$Tracker->db = null;
 			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+			}
+			if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
 		} else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
-		    if ($distance > 100 && $distance < 10000) {
+			$distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
+			if ($distance > 100 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
 			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
-		    }
+			}
 		}
 
-	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
-	    	    else unset($timediff);
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 60 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
+			if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
+				if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+				else unset($timediff);
+				if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 60 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
-			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.08)) {
+				if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.08)) {
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
@@ -192,30 +192,30 @@ 
 				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				$this->tmd = 0;
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
-			    }
+				}
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
-				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
-				    $dataFound = true;
-				    $this->all_tracked[$id]['time_last_coord'] = time();
+					$this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
+					$dataFound = true;
+					$this->all_tracked[$id]['time_last_coord'] = time();
 				}
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+				if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
-				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
-				    $dataFound = true;
-				    $this->all_tracked[$id]['time_last_coord'] = time();
+					$this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
+					$dataFound = true;
+					$this->all_tracked[$id]['time_last_coord'] = time();
 				}
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
 			}
 
-		    } else if ($globalDebug && $timediff > 20) {
+			} else if ($globalDebug && $timediff > 20) {
 			$this->tmd = $this->tmd + 1;
 			if ($line['latitude'] != $this->all_tracked[$id]['latitude'] && $line['longitude'] != $this->all_tracked[$id]['longitude']) {
 				echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
@@ -223,131 +223,131 @@ 
 				echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
 				echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
 			}
-		    }
+			}
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
+			if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
 		}
 		if (isset($line['comment']) && $line['comment'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
-		    //$dataFound = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
+			//$dataFound = true;
 		}
 		if (isset($line['type']) && $line['type'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
-		    //$dataFound = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
+			//$dataFound = true;
 		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
-		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
+			//if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
 			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
-		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
+			//} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
   		}
 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
-		    //$dataFound = true;
+			if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
+			//$dataFound = true;
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
-  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+  			$heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
+			if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+  			if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 
 		if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) {
-		    $this->all_tracked[$id]['lastupdate'] = time();
-		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
+			$this->all_tracked[$id]['lastupdate'] = time();
+			if ($this->all_tracked[$id]['addedTracker'] == 0) {
+				if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+				if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
 				if ($globalDebug) echo "Check if aircraft is already in DB...";
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
 				if (isset($line['id'])) {
-				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$recent_ident = $TrackerLive->checkIdRecent($line['id']);
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
-				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				} else $recent_ident = '';
 				$TrackerLive->db=null;
 
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
-			    } else {
+				} else {
 				$recent_ident = '';
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
-			    }
-			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "")
-			    {
+				}
+				//if there was no aircraft with the same callsign within the last hour and go post it into the archive
+				if($recent_ident == "")
+				{
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
 				//adds the spotter data for the archive
-				    $highlight = '';
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
-				    $timeelapsed = microtime(true);
-				    $Tracker = new Tracker($this->db);
-				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
-				    $Tracker->db = null;
-				    if ($globalDebug && isset($result)) echo $result."\n";
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+					$highlight = '';
+					if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
+					$timeelapsed = microtime(true);
+					$Tracker = new Tracker($this->db);
+					$result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
+					$Tracker->db = null;
+					if ($globalDebug && isset($result)) echo $result."\n";
+					if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
 				    
 				    
-				    // Add source stat in DB
-				    $Stats = new Stats($this->db);
-				    if (!empty($this->stats)) {
+					// Add source stat in DB
+					$Stats = new Stats($this->db);
+					if (!empty($this->stats)) {
 					if ($globalDebug) echo 'Add source stats : ';
-				        foreach($this->stats as $date => $data) {
-					    foreach($data as $source => $sourced) {
-					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
-				    		if (isset($sourced['msg'])) {
-				    		    if (time() - $sourced['msg']['date'] > 10) {
-				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
-			    			        unset($this->stats[$date][$source]['msg']);
-			    			    }
-			    			}
-			    		    }
-			    		    if ($date != date('Y-m-d')) {
-			    			unset($this->stats[$date]);
-			    		    }
-				    	}
-				    	if ($globalDebug) echo 'Done'."\n";
+						foreach($this->stats as $date => $data) {
+						foreach($data as $source => $sourced) {
+							//print_r($sourced);
+								if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
+								if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
+							if (isset($sourced['msg'])) {
+								if (time() - $sourced['msg']['date'] > 10) {
+									$nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
+									echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
+									unset($this->stats[$date][$source]['msg']);
+								}
+							}
+							}
+							if ($date != date('Y-m-d')) {
+							unset($this->stats[$date]);
+							}
+						}
+						if ($globalDebug) echo 'Done'."\n";
 
-				    }
-				    $Stats->db = null;
+					}
+					$Stats->db = null;
 				    
-				    $this->del();
+					$this->del();
 				//$ignoreImport = false;
 				$this->all_tracked[$id]['addedTracker'] = 1;
 				//print_r($this->all_tracked[$id]);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
-				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
-				    $TrackerLive = new TrackerLive($this->db);
-				    $TrackerLive->deleteLiveTrackerData();
-				    $TrackerLive->db=null;
-				    if ($globalDebug) echo " Done\n";
-				    $this->last_delete = time();
+					if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
+					//TrackerLive->deleteLiveTrackerDataNotUpdated();
+					$TrackerLive = new TrackerLive($this->db);
+					$TrackerLive->deleteLiveTrackerData();
+					$TrackerLive->db=null;
+					if ($globalDebug) echo " Done\n";
+					$this->last_delete = time();
 				}
-			    } else {
+				} else {
 				$this->all_tracked[$id]['id'] = $recent_ident;
 				$this->all_tracked[$id]['addedTracker'] = 1;
 				if (isset($globalDaemon) && !$globalDaemon) {
@@ -356,16 +356,16 @@ 
 					$Tracker->db = null;
 				}
 				
-			    }
+				}
 			}
-		    }
-		    //adds the spotter LIVE data
-		    if ($globalDebug) {
+			}
+			//adds the spotter LIVE data
+			if ($globalDebug) {
 			echo 'DATA : ident : '.$this->all_tracked[$id]['ident'].' - type : '.$this->all_tracked[$id]['type'].' - Latitude : '.$this->all_tracked[$id]['latitude'].' - Longitude : '.$this->all_tracked[$id]['longitude'].' - Altitude : '.$this->all_tracked[$id]['altitude'].' - Heading : '.$this->all_tracked[$id]['heading'].' - Speed : '.$this->all_tracked[$id]['speed']."\n";
-		    }
-		    $ignoreImport = false;
+			}
+			$ignoreImport = false;
 
-		    if (!$ignoreImport) {
+			if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
 				$timeelapsed = microtime(true);
@@ -403,7 +403,7 @@ 
 					if ($stats_heading == 16) $stats_heading = 0;
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
-						    $this->stats[$current_date][$source]['polar'][$i] = 0;
+							$this->stats[$current_date][$source]['polar'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
 					} else {
@@ -416,11 +416,11 @@ 
 					//var_dump($this->stats);
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
-						    end($this->stats[$current_date][$source]['hist']);
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
+							end($this->stats[$current_date][$source]['hist']);
+							$mini = key($this->stats[$current_date][$source]['hist'])+10;
 						} else $mini = 0;
 						for ($i=$mini;$i<=$distance;$i+=10) {
-						    $this->stats[$current_date][$source]['hist'][$i] = 0;
+							$this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
 					} else {
@@ -436,22 +436,22 @@ 
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
-			    if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
-			    $TrackerLive = new TrackerLive($this->db);
-			    $TrackerLive->deleteLiveTrackerDataNotUpdated();
-			    $TrackerLive->db = null;
-			    //TrackerLive->deleteLiveTrackerData();
-			    if ($globalDebug) echo " Done\n";
-			    $this->last_delete_hourly = time();
+				if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
+				$TrackerLive = new TrackerLive($this->db);
+				$TrackerLive->deleteLiveTrackerDataNotUpdated();
+				$TrackerLive->db = null;
+				//TrackerLive->deleteLiveTrackerData();
+				if ($globalDebug) echo " Done\n";
+				$this->last_delete_hourly = time();
 			}
 			
-		    }
-		    //$ignoreImport = false;
+			}
+			//$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
 		if ($send) return $this->all_tracked[$id];
-	    }
+		}
+	}
 	}
-    }
 }
 ?>

Spacing +74 added lines, -74 removed lines

@@ -47,7 +47,7 @@ 
 	    if (isset($this->all_tracked[$key]['id'])) {
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
     		$Tracker = new Tracker($this->db);
-        	$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']);
+        	$Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['altitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']);
             }
 	}
     }
@@ -58,7 +58,7 @@ 
 	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
 	foreach ($this->all_tracked as $key => $flight) {
     	    if (isset($flight['lastupdate'])) {
-        	if ($flight['lastupdate'] < (time()-3000)) {
+        	if ($flight['lastupdate'] < (time() - 3000)) {
             	    if (isset($this->all_tracked[$key]['id'])) {
             		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
 			/*
@@ -69,7 +69,7 @@ 
             		//$real_arrival = $this->arrival($key);
             		$Tracker = new Tracker($this->db);
             		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
-				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
+				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['altitude'], $this->all_tracked[$key]['speed']);
 				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			}
 			// Put in archive
@@ -89,7 +89,7 @@ 
 	$send = false;
 	
 	// SBS format is CSV format
-	if(is_array($line) && isset($line['ident'])) {
+	if (is_array($line) && isset($line['ident'])) {
 	    //print_r($line);
   	    if (isset($line['ident'])) {
 
@@ -113,33 +113,33 @@ 
 		
 		if (!isset($this->all_tracked[$id])) {
 		    $this->all_tracked[$id] = array();
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedTracker' => 0));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => ''));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
 			if (!isset($globalDaemon)) $globalDaemon = TRUE;
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi')));
+		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id']));
 		    if ($globalAllTracked !== FALSE) $dataFound = true;
 		}
 		
-		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
+		if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) {
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime']));
 		    } else {
 				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
 				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
 				return '';
 		    }
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) {
 			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
 			return '';
-		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
+		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) {
 			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
 			return '';
 		} elseif (!isset($line['datetime'])) {
 			date_default_timezone_set('UTC');
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s')));
 		} else {
 			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
 			return '';
@@ -147,38 +147,38 @@ 
 		
 		//if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) {
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident'])));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident'])));
 		    if ($this->all_tracked[$id]['addedTracker'] == 1) {
 			$timeelapsed = microtime(true);
             		$Tracker = new Tracker($this->db);
             		$fromsource = NULL;
-            		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
+            		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource);
 			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
 			$Tracker->db = null;
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
+		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident']));
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed'])));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true));
 		} else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) {
-		    $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m');
+		    $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm');
 		    if ($distance > 100 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
+			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed)));
   			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
 		    }
 		}
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']);
 	    	    else unset($timediff);
-	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 60 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
+	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 60 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')))) {
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
-			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.08)) {
+			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['livedb_latitude'], $this->all_tracked[$id]['livedb_longitude'], $line['latitude'], $line['longitude'], 0.08)) {
 				$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
@@ -186,10 +186,10 @@ 
 				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
 				$timeelapsed = microtime(true);
 				$Tracker = new Tracker($this->db);
-				$all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
+				$all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']);
 				if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
 				$Tracker->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				$this->tmd = 0;
 				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
 			    }
@@ -197,75 +197,75 @@ 
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
-				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
+				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
 				    $this->all_tracked[$id]['time_last_coord'] = time();
 				}
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
 			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
 				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
-				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
+				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
 				    $this->all_tracked[$id]['time_last_coord'] = time();
 				}
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude']));
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude']));
 			}
 
 		    } else if ($globalDebug && $timediff > 20) {
 			$this->tmd = $this->tmd + 1;
 			if ($line['latitude'] != $this->all_tracked[$id]['latitude'] && $line['longitude'] != $this->all_tracked[$id]['longitude']) {
 				echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n";
-				echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -";
-				echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - ";
+				echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -";
+				echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - ";
 				echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n";
 			}
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
 		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source']));
 		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name']));
 		}
 		if (isset($line['comment']) && $line['comment'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('comment' => $line['comment']));
 		    //$dataFound = true;
 		}
 		if (isset($line['type']) && $line['type'] != '') {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type']));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type']));
 		    //$dataFound = true;
 		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
-			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
-			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
+			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('altitude' => $line['altitude']));
+			$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
 		    //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n";
   		}
 
 		if (isset($line['noarchive']) && $line['noarchive'] === true) {
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true));
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading'])));
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
-  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
-		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+  		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
+		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading)));
+		    if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
   		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
@@ -273,54 +273,54 @@ 
 		if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) {
 		    $this->all_tracked[$id]['lastupdate'] = time();
 		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
-		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
 				if ($globalDebug) echo "Check if aircraft is already in DB...";
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
 				if (isset($line['id'])) {
 				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
 				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				} else $recent_ident = '';
-				$TrackerLive->db=null;
+				$TrackerLive->db = null;
 
 				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
 				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
 			    } else {
 				$recent_ident = '';
-				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0));
 			    }
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
-			    if($recent_ident == "")
+			    if ($recent_ident == "")
 			    {
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
 				//adds the spotter data for the archive
 				    $highlight = '';
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
+				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
 				    $timeelapsed = microtime(true);
 				    $Tracker = new Tracker($this->db);
-				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
+				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']);
 				    $Tracker->db = null;
 				    if ($globalDebug && isset($result)) echo $result."\n";
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 				    
 				    
 				    // Add source stat in DB
 				    $Stats = new Stats($this->db);
 				    if (!empty($this->stats)) {
 					if ($globalDebug) echo 'Add source stats : ';
-				        foreach($this->stats as $date => $data) {
-					    foreach($data as $source => $sourced) {
+				        foreach ($this->stats as $date => $data) {
+					    foreach ($data as $source => $sourced) {
 					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
+				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar_tracker', $date);
+				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist_tracker', $date);
 				    		if (isset($sourced['msg'])) {
 				    		    if (time() - $sourced['msg']['date'] > 10) {
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
-				    		        echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date);
+				    		        echo $Stats->addStatSource($nbmsg, $source, 'msg_tracker', $date);
 			    			        unset($this->stats[$date][$source]['msg']);
 			    			    }
 			    			}
@@ -343,7 +343,7 @@ 
 				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
 				    $TrackerLive = new TrackerLive($this->db);
 				    $TrackerLive->deleteLiveTrackerData();
-				    $TrackerLive->db=null;
+				    $TrackerLive->db = null;
 				    if ($globalDebug) echo " Done\n";
 				    $this->last_delete = time();
 				}
@@ -352,7 +352,7 @@ 
 				$this->all_tracked[$id]['addedTracker'] = 1;
 				if (isset($globalDaemon) && !$globalDaemon) {
 					$Tracker = new Tracker($this->db);
-					$Tracker->updateLatestTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['altitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']);
+					$Tracker->updateLatestTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime']);
 					$Tracker->db = null;
 				}
 				
@@ -366,14 +366,14 @@ 
 		    $ignoreImport = false;
 
 		    if (!$ignoreImport) {
-			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
+			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
-				$result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
+				$result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['comment'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']);
 				$TrackerLive->db = null;
 				$this->all_tracked[$id]['putinarchive'] = false;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n";
 
 				// Put statistics in $this->stats variable
 				
@@ -390,19 +390,19 @@ 
 							$latitude = $globalCenterLatitude;
 							$longitude = $globalCenterLongitude;
 						}
-						$this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude);
+						$this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude);
 					} else {
 						$latitude = $this->source_location[$source]['latitude'];
 						$longitude = $this->source_location[$source]['longitude'];
 					}
-					$stats_heading = $Common->getHeading($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
+					$stats_heading = $Common->getHeading($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
 					//$stats_heading = $stats_heading%22.5;
 					$stats_heading = round($stats_heading/22.5);
-					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
+					$stats_distance = $Common->distance($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']);
 					$current_date = date('Y-m-d');
 					if ($stats_heading == 16) $stats_heading = 0;
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
-						for ($i=0;$i<=15;$i++) {
+						for ($i = 0; $i <= 15; $i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance;
@@ -417,9 +417,9 @@ 
 					if (!isset($this->stats[$current_date][$source]['hist'][$distance])) {
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
-						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
+						    $mini = key($this->stats[$current_date][$source]['hist']) + 10;
 						} else $mini = 0;
-						for ($i=$mini;$i<=$distance;$i+=10) {
+						for ($i = $mini; $i <= $distance; $i += 10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
 						$this->stats[$current_date][$source]['hist'][$distance] = 1;
@@ -431,7 +431,7 @@ 
 				$this->all_tracked[$id]['lastupdate'] = time();
 				if ($this->all_tracked[$id]['putinarchive']) $send = true;
 				if ($globalDebug) echo $result."\n";
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n";
 			//$this->del();
 			
 			

Braces +190 added lines, -65 removed lines

@@ -42,7 +42,9 @@ 
 
     public function checkAll() {
 	global $globalDebug;
-	if ($globalDebug) echo "Update last seen tracked data...\n";
+	if ($globalDebug) {
+		echo "Update last seen tracked data...\n";
+	}
 	foreach ($this->all_tracked as $key => $flight) {
 	    if (isset($this->all_tracked[$key]['id'])) {
 		//echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].'  '.$this->all_tracked[$key]['longitude']."\n";
@@ -55,12 +57,16 @@ 
     public function del() {
 	global $globalDebug;
 	// Delete old infos
-	if ($globalDebug) echo 'Delete old values and update latest data...'."\n";
+	if ($globalDebug) {
+		echo 'Delete old values and update latest data...'."\n";
+	}
 	foreach ($this->all_tracked as $key => $flight) {
     	    if (isset($flight['lastupdate'])) {
         	if ($flight['lastupdate'] < (time()-3000)) {
             	    if (isset($this->all_tracked[$key]['id'])) {
-            		if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+            		if ($globalDebug) {
+            			echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n";
+            		}
 			/*
 			$TrackerLive = new TrackerLive();
             		$TrackerLive->deleteLiveTrackerDataById($this->all_tracked[$key]['id']);
@@ -70,7 +76,9 @@ 
             		$Tracker = new Tracker($this->db);
             		if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') {
 				$result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']);
-				if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+				if ($globalDebug && $result != 'success') {
+					echo '!!! ERROR : '.$result."\n";
+				}
 			}
 			// Put in archive
 //			$Tracker->db = null;
@@ -83,7 +91,9 @@ 
 
     public function add($line) {
 	global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChangeTracker, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked;
-	if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') $globalCoordMinChangeTracker = '0.015';
+	if (!isset($globalCoordMinChangeTracker) || $globalCoordMinChangeTracker == '') {
+		$globalCoordMinChangeTracker = '0.015';
+	}
 	date_default_timezone_set('UTC');
 	$dataFound = false;
 	$send = false;
@@ -97,19 +107,29 @@ 
 		// Increment message number
 		if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) {
 		    $current_date = date('Y-m-d');
-		    if (isset($line['source_name'])) $source = $line['source_name'];
-		    else $source = '';
-		    if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source'];
+		    if (isset($line['source_name'])) {
+		    	$source = $line['source_name'];
+		    } else {
+		    	$source = '';
+		    }
+		    if ($source == '' || $line['format_source'] == 'aprs') {
+		    	$source = $line['format_source'];
+		    }
 		    if (!isset($this->stats[$current_date][$source]['msg'])) {
 		    	$this->stats[$current_date][$source]['msg']['date'] = time();
 		    	$this->stats[$current_date][$source]['msg']['nb'] = 1;
-		    } else $this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    } else {
+		    	$this->stats[$current_date][$source]['msg']['nb'] += 1;
+		    }
 		}
 		
 		
 		$Common = new Common();
-	        if (!isset($line['id'])) $id = trim($line['ident']);
-	        else $id = trim($line['id']);
+	        if (!isset($line['id'])) {
+	        	$id = trim($line['ident']);
+	        } else {
+	        	$id = trim($line['id']);
+	        }
 		
 		if (!isset($this->all_tracked[$id])) {
 		    $this->all_tracked[$id] = array();
@@ -117,31 +137,46 @@ 
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => ''));
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time()));
 		    if (!isset($line['id'])) {
-			if (!isset($globalDaemon)) $globalDaemon = TRUE;
+			if (!isset($globalDaemon)) {
+				$globalDaemon = TRUE;
+			}
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi')));
-		     } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
-		    if ($globalAllTracked !== FALSE) $dataFound = true;
+		     } else {
+		     	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id']));
+		     }
+		    if ($globalAllTracked !== FALSE) {
+		    	$dataFound = true;
+		    }
 		}
 		
 		if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) {
 		    if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) {
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime']));
 		    } else {
-				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
-				elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
+				if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
+				} elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) {
+					echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n";
+				}
 				return '';
 		    }
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) {
-			if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
+			if ($globalDebug) {
+				echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
+			}
 			return '';
 		} elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) {
-			if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
+			if ($globalDebug) {
+				echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
+			}
 			return '';
 		} elseif (!isset($line['datetime'])) {
 			date_default_timezone_set('UTC');
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s')));
 		} else {
-			if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
+			if ($globalDebug) {
+				echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!\n";
+			}
 			return '';
 		}
 		
@@ -153,11 +188,17 @@ 
             		$Tracker = new Tracker($this->db);
             		$fromsource = NULL;
             		$result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource);
-			if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n";
+			if ($globalDebug && $result != 'success') {
+				echo '!!! ERROR : '.$result."\n";
+			}
 			$Tracker->db = null;
-			if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			if ($globalDebugTimeElapsed) {
+				echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+			}
+		    }
+		    if (!isset($this->all_tracked[$id]['id'])) {
+		    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
 		    }
-		    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident']));
 		}
 
 		if (isset($line['speed']) && $line['speed'] != '') {
@@ -168,14 +209,21 @@ 
 		    if ($distance > 100 && $distance < 10000) {
 			$speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']);
 			$speed = $speed*3.6;
-			if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
-  			if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
+			if ($speed < 1000) {
+				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed)));
+			}
+  			if ($globalDebug) {
+  				echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n";
+  			}
 		    }
 		}
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) {
-	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
-	    	    else unset($timediff);
+	    	    if (isset($this->all_tracked[$id]['time_last_coord'])) {
+	    	    	$timediff = round(time()-$this->all_tracked[$id]['time_last_coord']);
+	    	    } else {
+	    	    	unset($timediff);
+	    	    }
 	    	    if ($this->tmd > 5 || !isset($timediff) || $timediff > 90 || ($timediff > 60 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) {
 			if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) {
 			    if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'],0.08)) {
@@ -183,20 +231,30 @@ 
 				$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
 				$this->all_tracked[$id]['putinarchive'] = true;
 				
-				if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				if ($globalDebug) {
+					echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... ';
+				}
 				$timeelapsed = microtime(true);
 				$Tracker = new Tracker($this->db);
 				$all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']);
-				if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+				if (!empty($all_country)) {
+					$this->all_tracked[$id]['over_country'] = $all_country['iso2'];
+				}
 				$Tracker->db = null;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 				$this->tmd = 0;
-				if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
+				if ($globalDebug) {
+					echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n";
+				}
 			    }
 			}
 
 			if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
-				if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
+				if (!isset($this->all_tracked[$id]['archive_latitude'])) {
+					$this->all_tracked[$id]['archive_latitude'] = $line['latitude'];
+				}
 				if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_latitude'] = $line['latitude'];
 				    $dataFound = true;
@@ -205,8 +263,12 @@ 
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude']));
 			}
 			if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-			    if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
-				if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
+			    if ($line['longitude'] > 180) {
+			    	$line['longitude'] = $line['longitude'] - 360;
+			    }
+				if (!isset($this->all_tracked[$id]['archive_longitude'])) {
+					$this->all_tracked[$id]['archive_longitude'] = $line['longitude'];
+				}
 				if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChangeTracker || $this->all_tracked[$id]['format_source'] == 'aprs') {
 				    $this->all_tracked[$id]['livedb_longitude'] = $line['longitude'];
 				    $dataFound = true;
@@ -226,7 +288,9 @@ 
 		    }
 		}
 		if (isset($line['last_update']) && $line['last_update'] != '') {
-		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true;
+		    if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) {
+		    	$dataFound = true;
+		    }
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update']));
 		}
 		if (isset($line['format_source']) && $line['format_source'] != '') {
@@ -246,7 +310,9 @@ 
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 		    //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) {
-			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true;
+			if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) {
+				$this->all_tracked[$id]['putinarchive'] = true;
+			}
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude']));
 			$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude']));
 			//$dataFound = true;
@@ -258,15 +324,21 @@ 
 		}
 		
 		if (isset($line['heading']) && $line['heading'] != '') {
-		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true;
+		    if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) {
+		    	$this->all_tracked[$id]['putinarchive'] = true;
+		    }
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading'])));
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true));
 		    //$dataFound = true;
   		} elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) {
   		    $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
 		    $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading)));
-		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true;
-  		    if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+		    if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) {
+		    	$this->all_tracked[$id]['putinarchive'] = true;
+		    }
+  		    if ($globalDebug) {
+  		    	echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n";
+  		    }
   		}
 		//if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false;
 
@@ -275,20 +347,31 @@ 
 		    if ($this->all_tracked[$id]['addedTracker'] == 0) {
 		        if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == ''  || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
 			    if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) {
-				if ($globalDebug) echo "Check if aircraft is already in DB...";
+				if ($globalDebug) {
+					echo "Check if aircraft is already in DB...";
+				}
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
 				if (isset($line['id'])) {
 				    $recent_ident = $TrackerLive->checkIdRecent($line['id']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				} elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') {
 				    $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']);
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
-				} else $recent_ident = '';
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
+				} else {
+					$recent_ident = '';
+				}
 				$TrackerLive->db=null;
 
-				if ($globalDebug && $recent_ident == '') echo " Not in DB.\n";
-				elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n";
+				if ($globalDebug && $recent_ident == '') {
+					echo " Not in DB.\n";
+				} elseif ($globalDebug && $recent_ident != '') {
+					echo " Already in DB.\n";
+				}
 			    } else {
 				$recent_ident = '';
 				$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0));
@@ -296,27 +379,41 @@ 
 			    //if there was no aircraft with the same callsign within the last hour and go post it into the archive
 			    if($recent_ident == "")
 			    {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : ";
+				}
 				//adds the spotter data for the archive
 				    $highlight = '';
-				    if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
+				    if (!isset($this->all_tracked[$id]['id'])) {
+				    	$this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi')));
+				    }
 				    $timeelapsed = microtime(true);
 				    $Tracker = new Tracker($this->db);
 				    $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']);
 				    $Tracker->db = null;
-				    if ($globalDebug && isset($result)) echo $result."\n";
-				    if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    if ($globalDebug && isset($result)) {
+				    	echo $result."\n";
+				    }
+				    if ($globalDebugTimeElapsed) {
+				    	echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				    }
 				    
 				    
 				    // Add source stat in DB
 				    $Stats = new Stats($this->db);
 				    if (!empty($this->stats)) {
-					if ($globalDebug) echo 'Add source stats : ';
+					if ($globalDebug) {
+						echo 'Add source stats : ';
+					}
 				        foreach($this->stats as $date => $data) {
 					    foreach($data as $source => $sourced) {
 					        //print_r($sourced);
-				    	        if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
-				    	        if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
+				    	        if (isset($sourced['polar'])) {
+				    	        	echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date);
+				    	        }
+				    	        if (isset($sourced['hist'])) {
+				    	        	echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date);
+				    	        }
 				    		if (isset($sourced['msg'])) {
 				    		    if (time() - $sourced['msg']['date'] > 10) {
 				    		        $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date']));
@@ -329,7 +426,9 @@ 
 			    			unset($this->stats[$date]);
 			    		    }
 				    	}
-				    	if ($globalDebug) echo 'Done'."\n";
+				    	if ($globalDebug) {
+				    		echo 'Done'."\n";
+				    	}
 
 				    }
 				    $Stats->db = null;
@@ -339,12 +438,16 @@ 
 				$this->all_tracked[$id]['addedTracker'] = 1;
 				//print_r($this->all_tracked[$id]);
 				if ($this->last_delete == 0 || time() - $this->last_delete > 1800) {
-				    if ($globalDebug) echo "---- Deleting Live Tracker data older than 9 hours...";
+				    if ($globalDebug) {
+				    	echo "---- Deleting Live Tracker data older than 9 hours...";
+				    }
 				    //TrackerLive->deleteLiveTrackerDataNotUpdated();
 				    $TrackerLive = new TrackerLive($this->db);
 				    $TrackerLive->deleteLiveTrackerData();
 				    $TrackerLive->db=null;
-				    if ($globalDebug) echo " Done\n";
+				    if ($globalDebug) {
+				    	echo " Done\n";
+				    }
 				    $this->last_delete = time();
 				}
 			    } else {
@@ -367,19 +470,25 @@ 
 
 		    if (!$ignoreImport) {
 			if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) {
-				if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
+				if ($globalDebug) {
+					echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : ";
+				}
 				$timeelapsed = microtime(true);
 				$TrackerLive = new TrackerLive($this->db);
 				$result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']);
 				$TrackerLive->db = null;
 				$this->all_tracked[$id]['putinarchive'] = false;
-				if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				if ($globalDebugTimeElapsed) {
+					echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n";
+				}
 
 				// Put statistics in $this->stats variable
 				
 				if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') {
 					$source = $this->all_tracked[$id]['source_name'];
-					if ($source == '') $source = $this->all_tracked[$id]['format_source'];
+					if ($source == '') {
+						$source = $this->all_tracked[$id]['format_source'];
+					}
 					if (!isset($this->source_location[$source])) {
 						$Location = new Source($this->db);
 						$coord = $Location->getLocationInfobySourceName($source);
@@ -400,7 +509,9 @@ 
 					$stats_heading = round($stats_heading/22.5);
 					$stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']);
 					$current_date = date('Y-m-d');
-					if ($stats_heading == 16) $stats_heading = 0;
+					if ($stats_heading == 16) {
+						$stats_heading = 0;
+					}
 					if (!isset($this->stats[$current_date][$source]['polar'][1])) {
 						for ($i=0;$i<=15;$i++) {
 						    $this->stats[$current_date][$source]['polar'][$i] = 0;
@@ -418,7 +529,9 @@ 
 						if (isset($this->stats[$current_date][$source]['hist'][0])) {
 						    end($this->stats[$current_date][$source]['hist']);
 						    $mini = key($this->stats[$current_date][$source]['hist'])+10;
-						} else $mini = 0;
+						} else {
+							$mini = 0;
+						}
 						for ($i=$mini;$i<=$distance;$i+=10) {
 						    $this->stats[$current_date][$source]['hist'][$i] = 0;
 						}
@@ -429,19 +542,29 @@ 
 				}
 
 				$this->all_tracked[$id]['lastupdate'] = time();
-				if ($this->all_tracked[$id]['putinarchive']) $send = true;
-				if ($globalDebug) echo $result."\n";
-			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+				if ($this->all_tracked[$id]['putinarchive']) {
+					$send = true;
+				}
+				if ($globalDebug) {
+					echo $result."\n";
+				}
+			} elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) {
+				echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n";
+			}
 			//$this->del();
 			
 			
 			if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) {
-			    if ($globalDebug) echo "---- Deleting Live Tracker data Not updated since 2 hour...";
+			    if ($globalDebug) {
+			    	echo "---- Deleting Live Tracker data Not updated since 2 hour...";
+			    }
 			    $TrackerLive = new TrackerLive($this->db);
 			    $TrackerLive->deleteLiveTrackerDataNotUpdated();
 			    $TrackerLive->db = null;
 			    //TrackerLive->deleteLiveTrackerData();
-			    if ($globalDebug) echo " Done\n";
+			    if ($globalDebug) {
+			    	echo " Done\n";
+			    }
 			    $this->last_delete_hourly = time();
 			}
 			
@@ -449,7 +572,9 @@ 
 		    //$ignoreImport = false;
 		}
 		//if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN);
-		if ($send) return $this->all_tracked[$id];
+		if ($send) {
+			return $this->all_tracked[$id];
+		}
 	    }
 	}
     }

header.php

Spacing +24 added lines, -24 removed lines

@@ -14,35 +14,35 @@ 
 if (isset($globalMapOffline) && $globalMapOffline) $MapType = 'offline';
 
 if (isset($_GET['3d'])) {
-	setcookie('MapFormat','3d');
+	setcookie('MapFormat', '3d');
 } else if (isset($_GET['2d'])) {
-	setcookie('MapFormat','2d');
+	setcookie('MapFormat', '2d');
 }
 
 if (isset($globalTSK) && $globalTSK && isset($_GET['tsk'])) {
-	$tsk = filter_input(INPUT_GET,'tsk',FILTER_SANITIZE_URL);
+	$tsk = filter_input(INPUT_GET, 'tsk', FILTER_SANITIZE_URL);
 }
 
 if (isset($_POST['archive'])) {
-	setcookie('archive','true');
-	setcookie('archive_begin',strtotime($_POST['start_date']));
-	setcookie('archive_end',strtotime($_POST['end_date']));
-	setcookie('archive_speed',$_POST['archivespeed']);
+	setcookie('archive', 'true');
+	setcookie('archive_begin', strtotime($_POST['start_date']));
+	setcookie('archive_end', strtotime($_POST['end_date']));
+	setcookie('archive_speed', $_POST['archivespeed']);
 }
 if (isset($_POST['noarchive'])) {
-	setcookie('archive','false',-1);
-	setcookie('archive_begin','',-1);
-	setcookie('archive_end','',-1);
-	setcookie('archive_speed','',-1);
+	setcookie('archive', 'false', -1);
+	setcookie('archive_begin', '', -1);
+	setcookie('archive_end', '', -1);
+	setcookie('archive_speed', '', -1);
 }
 // When button "Remove all filters" is clicked
 if (isset($_POST['removefilters'])) {
-	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
-	    return strpos($key,'filter_') === 0;
+	$allfilters = array_filter(array_keys($_COOKIE), function($key) {
+	    return strpos($key, 'filter_') === 0;
 	});
 	foreach ($allfilters as $filt) {
 		unset($_COOKIE[$filt]);
-		setcookie($filt,null,-1);
+		setcookie($filt, null, -1);
 	}
 }
 ?>
@@ -264,7 +264,7 @@ 
 <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.common.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.2d.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.2d.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($type) || $type == 'aircraft') {
 ?>
@@ -337,7 +337,7 @@ 
 <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.common.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.2d.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.2d.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-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
@@ -742,8 +742,8 @@ 
 ?>
       <div class="search">
 	<form action="<?php print $globalURL; ?>/search" method="get">
-		<!--<input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != ""){ print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>-->
-		<input type="text" name="callsign" value="<?php if (isset($GET['callsign'])) { if ($_GET['callsign'] != ""){ print $_GET['callsign']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>
+		<!--<input type="text" name="q" value="<?php if (isset($GET['q'])) { if ($_GET['q'] != "") { print $_GET['q']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>-->
+		<input type="text" name="callsign" value="<?php if (isset($GET['callsign'])) { if ($_GET['callsign'] != "") { print $_GET['callsign']; } else { print _("Search"); } } else { print _("Search"); } ?>" onfocus="if (this.value=='search'){this.value='';}" /><button type="submit"><i class="fa fa-search"></i></button>
 	</form>
 	</div>
   	<div class="social">
@@ -761,7 +761,7 @@ 
 	print '</div>';
 }
 
-if (strtolower($current_page) =='ident-detailed' || strtolower($current_page) == 'flightid-overview') {
+if (strtolower($current_page) == 'ident-detailed' || strtolower($current_page) == 'flightid-overview') {
 ?>
     <div class="top-header clear" role="main">
 <?php
@@ -774,7 +774,7 @@ 
     </div>
 <?php
 }
-if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
+if ((strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) || (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false))
 {
     ?>
     <div class="top-header clear" role="main">
@@ -787,15 +787,15 @@ 
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+    if (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+    } elseif (strpos(strtolower($current_page), 'airport-') !== false && strpos(strtolower($current_page), 'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+    } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -803,7 +803,7 @@ 
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) {
+    } elseif (strpos(strtolower($current_page), 'route-') !== false && strpos(strtolower($current_page), 'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php

Indentation +82 added lines, -82 removed lines

@@ -38,7 +38,7 @@ 
 // When button "Remove all filters" is clicked
 if (isset($_POST['removefilters'])) {
 	$allfilters = array_filter(array_keys($_COOKIE),function($key) {
-	    return strpos($key,'filter_') === 0;
+		return strpos($key,'filter_') === 0;
 	});
 	foreach ($allfilters as $filt) {
 		unset($_COOKIE[$filt]);
@@ -188,17 +188,17 @@ 
 	}
 ?>
 <?php 
-    if (isset($_POST['archive'])) {
+	if (isset($_POST['archive'])) {
 ?>
 <script src="<?php print $globalURL; ?>/js/map.common.js"></script>
 <?php 
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 
 <script src="<?php print $globalURL; ?>/js/map.js.php?<?php print time(); ?>&archive&begindate=<?php print strtotime($_POST['start_date']); ?>&enddate=<?php print strtotime($_POST['end_date']); ?>&archivespeed=<?php print $_POST['archivespeed']; ?>"></script>
 <?php    
-	    }
-    } else {
+		}
+	} else {
 ?>
 <?php
 /*	if (isset($globalBeta) && $globalBeta) {
@@ -210,7 +210,7 @@ 
 */
 ?>
 <?php 
-	    if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
+		if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 <?php
 //		if (isset($globalBeta) && $globalBeta) {
@@ -241,13 +241,13 @@ 
 <script src="<?php print $globalURL; ?>/js/map-satellite.2d.js.php?<?php print time(); ?>"></script>
 <?php
 		}
-	    }
+		}
 ?>
 <?php
 //	}
 ?>
 <?php
-    }
+	}
 }
 ?>
 <?php
@@ -424,34 +424,34 @@ 
 
       <ul class="nav navbar-nav">
 <?php
-    if (isset($globalNewsFeeds['global']) && !empty($globalNewsFeeds['global'])) {
+	if (isset($globalNewsFeeds['global']) && !empty($globalNewsFeeds['global'])) {
 ?>
     <li><a href="<?php print $globalURL; ?>/news"><?php echo _("News"); ?></a></li>
 <?php
-    }
+	}
 ?>
 
 <?php 
-    $sub = false;
-    if (
+	$sub = false;
+	if (
 	(
-	    (!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
+		(!isset($globalAircraft) || (isset($globalAircraft) && $globalAircraft === TRUE)) && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
 	) || 
 	(
-	    isset($globalMarine) && $globalMarine === TRUE && ((isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
+		isset($globalMarine) && $globalMarine === TRUE && ((isset($globalTracker) && $globalTracker === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
 	) || 
 	(
-	    isset($globalTracker) && $globalTracker === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
+		isset($globalTracker) && $globalTracker === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalSatellite) && $globalSatellite === TRUE))
 	) || 
 	(
-	    isset($globalSatellite) && $globalSatellite === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE))
+		isset($globalSatellite) && $globalSatellite === TRUE && ((isset($globalMarine) && $globalMarine === TRUE) || (isset($globalTracker) && $globalTracker === TRUE))
 	)
-    ) {
+	) {
 	$sub = true;
-    }
+	}
 ?>
 <?php
-    if (!isset($globalAircraft) || $globalAircraft === TRUE) {
+	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 ?>
     <li class="dropdown">
 <?php
@@ -462,7 +462,7 @@ 
 	<ul class="dropdown-menu multi-level">
       	<li class="dropdown-submenu">
 <?php
-        }
+		}
 ?>
 <?php
 	if (isset($globalNewsFeeds['aircraft']) && !empty($globalNewsFeeds['aircraft'])) {
@@ -477,25 +477,25 @@ 
           <ul class="dropdown-menu">
           	<li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircraft Types"); ?></a></li>
 <?php
-    if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) {
+	if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) {
 ?>
 			<li><a href="<?php print $globalURL; ?>/airline"><?php echo _("Airlines"); ?></a></li>
 <?php
-    }
+	}
 ?>
 			<li><a href="<?php print $globalURL; ?>/airport"><?php echo _("Airports"); ?></a></li>
 <?php
-    if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) {
+	if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) {
 ?>
 			<li><a href="<?php print $globalURL; ?>/owner"><?php echo _("Owners"); ?></a></li>
 <?php
-    } 
-    if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
+	} 
+	if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) {
 
 ?>
 			<li><a href="<?php print $globalURL; ?>/pilot"><?php echo _("Pilots"); ?></a></li>
 <?php
-    }
+	}
 ?>
 			<li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/currently"><?php echo _("Current Activity"); ?></a></li>
@@ -503,43 +503,43 @@ 
             <li><a href="<?php print $globalURL; ?>/date/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Activity"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/newest"><?php echo _("Newest by Category"); ?></a></li>
             <?php
-        	if ($globalACARS) {
-        	    if (isset($globalDemo) && $globalDemo) {
-    	    ?>
+			if ($globalACARS) {
+				if (isset($globalDemo) && $globalDemo) {
+			?>
             <li><hr /></li>
             <li><i><?php echo _('ACARS data not available publicly'); ?></i></li>
             <li><a href=""><?php echo _('Latest ACARS messages'); ?></a></li>
             <li><a href=""><?php echo _('Archive ACARS messages'); ?></a></li>
             <?php
-        	    } else {
-    	    ?>
+				} else {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/acars-latest"><?php echo _("Latest ACARS messages"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/acars-archive"><?php echo _("Archive ACARS messages"); ?></a></li>
             <?php
-        	    }
-        	}
-    	    ?>
+				}
+			}
+			?>
     	    <?php
-    	        if (isset($globalAccidents) && $globalAccidents) {
-    	    ?>
+				if (isset($globalAccidents) && $globalAccidents) {
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/accident-latest"><?php echo _("Latest accident"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/accident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Accident"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/incident-latest"><?php echo _("Latest incident"); ?></a></li>
             <li><a href="<?php print $globalURL; ?>/incident/<?php print date("Y-m-d"); ?>"><?php echo _("Today's Incident"); ?></a></li>
             <?php
-        	}
-    	    ?>
+			}
+			?>
             <li><hr /></li>
             <li><a href="<?php print $globalURL; ?>/highlights/table"><?php echo _("Special Highlights"); ?></a></li>
             <?php
 		if (!isset($globalNoUpcoming) || $globalNoUpcoming === FALSE) {
-	    ?>
+		?>
             <li><a href="<?php print $globalURL; ?>/upcoming"><?php echo _("Upcoming Flights"); ?></a></li>
 	    <?php
 		}
-	    ?>
+		?>
           </ul>
         </li>
       	<li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li>
@@ -566,14 +566,14 @@ 
     </ul>
 <?php
 	}
-    }
+	}
 ?>
 <?php
-    if (isset($globalMarine) && $globalMarine) {
+	if (isset($globalMarine) && $globalMarine) {
 ?>
     <li class="dropdown">
 <?php
-        if ($sub) {
+		if ($sub) {
 ?>
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Marines"); ?> <b class="caret"></b></a>
 	<ul class="dropdown-menu multi-level">
@@ -607,14 +607,14 @@ 
 	}
 ?>
 <?php
-    }
+	}
 ?>
 <?php
-    if (isset($globalTracker) && $globalTracker) {
+	if (isset($globalTracker) && $globalTracker) {
 ?>
     <li class="dropdown">
 <?php
-        if ($sub) {
+		if ($sub) {
 ?>
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Trackers"); ?> <b class="caret"></b></a>
 	<ul class="dropdown-menu multi-level">
@@ -648,14 +648,14 @@ 
 	}
 ?>
 <?php
-    }
+	}
 ?>
 <?php
-    if (isset($globalSatellite) && $globalSatellite) {
+	if (isset($globalSatellite) && $globalSatellite) {
 ?>
     <li class="dropdown">
 <?php
-        if ($sub) {
+		if ($sub) {
 ?>
     <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Satellites"); ?> <b class="caret"></b></a>
 	<ul class="dropdown-menu multi-level">
@@ -691,7 +691,7 @@ 
 	}
 ?>
 <?php
-    }
+	}
 ?>
 
         <li class="dropdown">
@@ -700,12 +700,12 @@ 
           	<li><a href="<?php print $globalURL; ?>/about"><?php echo _("About The Project"); ?></a></li>
           	<li><a href="<?php print $globalURL; ?>/about/export"><?php echo _("Exporting Data"); ?></a></li>
 <?php
-    if (!isset($globalAircraft) || $globalAircraft === TRUE) {
+	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 ?>
 		<li><hr /></li>
 		<li><a href="<?php print $globalURL; ?>/about/tv"><?php echo _("Spotter TV"); ?></a></li>
 <?php
-    }
+	}
 ?>
 	    <?php if (isset($globalContribute) && $globalContribute) { ?>
                 <li><hr /></li>
@@ -726,14 +726,14 @@ 
   	    <form>
   		<select class="selectpicker" data-width="120px" onchange="language(this);">
   		    <?php
-  		        $Language = new Language();
-  		        $alllang = $Language->getLanguages();
-  		        foreach ($alllang as $key => $lang) {
-  		            print '<option value="'.$key.'"';
-  		            if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
-  		            print '>'.$lang[0].'</option>';
-  		        }
-  		    ?>
+  				$Language = new Language();
+  				$alllang = $Language->getLanguages();
+  				foreach ($alllang as $key => $lang) {
+  					print '<option value="'.$key.'"';
+  					if (isset($_COOKIE['language']) && $_COOKIE['language'] == $key) print ' selected ';
+  					print '>'.$lang[0].'</option>';
+  				}
+  			?>
   		</select>
   	    </form>
   	</div>
@@ -765,18 +765,18 @@ 
 ?>
     <div class="top-header clear" role="main">
 <?php
-    if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
+	if (isset($longitude) && isset($latitude) && $longitude != 0 && $latitude != 0) {
 ?>
     <div id="archive-map"></div>
 <?php
-    }
+	}
 ?>
     </div>
 <?php
 }
 if ((strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) || (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false))
 {
-    ?>
+	?>
     <div class="top-header clear" role="main">
         <div id="map"></div>
 	<link rel="stylesheet" href="<?php print $globalURL; ?>/css/leaflet.css" />
@@ -787,15 +787,15 @@ 
         var zoom = 13;
 //create the map
 <?php
-    if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
+	if (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($airport_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $airport_array[0]['latitude']; ?>,<?php print $airport_array[0]['longitude']; ?>], zoom);
 <?php
-    } elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
+	} elseif (strpos(strtolower($current_page),'airport-') !== false && strpos(strtolower($current_page),'statistics-') === false) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && isset($spotter_array[0]['departure_airport_latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['departure_airport_latitude']; ?>,<?php print $spotter_array[0]['arrival_airport_longitude']; ?>]);
     var line = L.polyline([[<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>],[<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>]]).addTo(map);
@@ -803,22 +803,22 @@ 
     var departure_airport = L.marker([<?php print $spotter_array[0]['departure_airport_latitude']; ?>, <?php print $spotter_array[0]['departure_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/departure_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
     var arrival_airport = L.marker([<?php print $spotter_array[0]['arrival_airport_latitude']; ?>, <?php print $spotter_array[0]['arrival_airport_longitude']; ?>], {icon: L.icon({iconUrl: '<?php print $globalURL; ?>/images/arrival_airport.png',iconSize: [16,18],iconAnchor: [8,16]})}).addTo(map);
 <?php
-    } elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) {
+	} elseif (strpos(strtolower($current_page),'route-') !== false && strpos(strtolower($current_page),'statistics-') === false && !isset($spotter_array[0]['departure_airport_latitude']) && isset($spotter_array[0]['latitude'])) {
 ?>
   map = L.map('map', { zoomControl:true }).setView([<?php print $spotter_array[0]['latitude']; ?>,<?php print $spotter_array[0]['longitude']; ?>]);
 <?php
-    } elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
+	} elseif (!isset($spotter_array[0]['latitude']) && !isset($spotter_array[0]['longitude'])) {
 ?>
   map = L.map('map', { zoomControl:true });
 <?php
-    }
+	}
 ?>
   //initialize the layer group for the aircrft markers
   var layer_data = L.layerGroup();
 
   //a few title layers
 <?php
-    if ($globalMapProvider == 'Mapbox') {
+	if ($globalMapProvider == 'Mapbox') {
 ?>
   L.tileLayer('https://{s}.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={token}', {
     maxZoom: 18,
@@ -829,14 +829,14 @@ 
     token : '<?php print $globalMapboxToken; ?>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'Mapbox-GL') {
+	} elseif ($globalMapProvider == 'Mapbox-GL') {
 ?>
     L.mapboxGL({
 	accessToken: '<?php print $globalMapboxToken; ?>',
 	style: 'mapbox://styles/mapbox/bright-v8'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-OSM') {
+	} elseif ($globalMapProvider == 'MapQuest-OSM') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/map/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -845,7 +845,7 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'MapQuest-Aerial') {
+	} elseif ($globalMapProvider == 'MapQuest-Aerial') {
 ?>
   L.tileLayer('http://otile1.mqcdn.com/tiles/1.0.0/sat/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -854,27 +854,27 @@ 
       'Tiles Courtesy of <a href="http://www.mapquest.com">MapQuest</a>, Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency"'
   }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'Google-Roadmap') {
+	} elseif ($globalMapProvider == 'Google-Roadmap') {
 ?>
     var googleLayer = new L.Google('ROADMAP');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Satellite') {
+	} elseif ($globalMapProvider == 'Google-Satellite') {
 ?>
     var googleLayer = new L.Google('SATELLITE');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Hybrid') {
+	} elseif ($globalMapProvider == 'Google-Hybrid') {
 ?>
     var googleLayer = new L.Google('HYBRID');
     map.addLayer(googleLayer);
 <?php
-    } elseif ($globalMapProvider == 'Google-Terrain') {
+	} elseif ($globalMapProvider == 'Google-Terrain') {
 ?>
     var googleLayer = new L.Google('Terrain');
     map.addLayer(googleLayer);
 <?php
-    } elseif (isset($globalMapCustomLayer[$globalMapProvider])) {
+	} elseif (isset($globalMapCustomLayer[$globalMapProvider])) {
 	$customid = $globalMapProvider;
 ?>
     L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
@@ -884,7 +884,7 @@ 
         attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
     }).addTo(map);
 <?php
-    } elseif ($globalMapProvider == 'offline' || (isset($globalMapOffline) && $globalMapOffline === TRUE)) {
+	} elseif ($globalMapProvider == 'offline' || (isset($globalMapOffline) && $globalMapOffline === TRUE)) {
 ?>
     var center = map.getCenter();
     map.options.crs = L.CRS.EPSG4326;
@@ -899,8 +899,8 @@ 
         attribution: 'Natural Earth'
     }).addTo(map);
 <?php
-    //} elseif ($globalMapProvider == 'OpenStreetMap') {
-    } else {
+	//} elseif ($globalMapProvider == 'OpenStreetMap') {
+	} else {
 ?>
   L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
     maxZoom: 18,
@@ -909,7 +909,7 @@ 
   }).addTo(map);
 
 <?php
-    }
+	}
 ?>
         </script>
     </div>

Braces +90 added lines, -20 removed lines

@@ -6,12 +6,19 @@ 
 //gets the page file and stores it in a variable
 $file_path = pathinfo($_SERVER['SCRIPT_NAME']);
 $current_page = $file_path['filename'];
-if ($globalTimezone == '') $globalTimezone = 'UTC';
+if ($globalTimezone == '') {
+	$globalTimezone = 'UTC';
+}
 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;
+}
 
-if (isset($globalMapOffline) && $globalMapOffline) $MapType = 'offline';
+if (isset($globalMapOffline) && $globalMapOffline) {
+	$MapType = 'offline';
+}
 
 if (isset($_GET['3d'])) {
 	setcookie('MapFormat','3d');
@@ -219,7 +226,10 @@ 
 <?php
 //		}
 ?>
-<script src="<?php print $globalURL; ?>/js/map.2d.js.php?<?php print time(); ?><?php if (isset($tsk)) print '&tsk='.$tsk; ?>"></script>
+<script src="<?php print $globalURL; ?>/js/map.2d.js.php?<?php print time(); ?><?php if (isset($tsk)) {
+	print '&tsk='.$tsk;
+}
+?>"></script>
 <?php
 		if (!isset($globalAircraft) || $globalAircraft) {
 ?>
@@ -264,7 +274,13 @@ 
 <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.common.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.2d.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.2d.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($type) || $type == 'aircraft') {
 ?>
@@ -337,7 +353,13 @@ 
 <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.common.js"></script>
-<script src="<?php print $globalURL; ?>/js/map.2d.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.2d.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-aircraft.2d.js.php?flightaware_id=<?php print $flightaware_id; ?>&<?php print time(); ?>"></script>
 <?php
 		if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '' && ($MapType == 'Google-Roadmap' || $MapType == 'Google-Satellite' || $MapType == 'Google-Hybrid' || $MapType == 'Google-Terrain')) {
@@ -418,7 +440,12 @@ 
         <span class="icon-bar"></span>
       </button>
       <a href="<?php print $globalURL; ?>/search" class="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">
 
@@ -473,7 +500,10 @@ 
 	}
 ?>
 
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
           <ul class="dropdown-menu">
           	<li><a href="<?php print $globalURL; ?>/aircraft"><?php echo _("Aircraft Types"); ?></a></li>
 <?php
@@ -544,8 +574,14 @@ 
         </li>
       	<li><a href="<?php print $globalURL; ?>/search"><?php echo _("Search"); ?></a></li>
       	<li><a href="<?php print $globalURL; ?>/statistics"><?php echo _("Statistics"); ?></a></li>
-        <li class="dropdown<?php if ($sub) echo '-submenu'; ?>">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+        <li class="dropdown<?php if ($sub) {
+	echo '-submenu';
+}
+?>">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Tools"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
           <ul class="dropdown-menu">
           	<li><a href="<?php print $globalURL; ?>/tools/acars"><?php echo _("ACARS translator"); ?></a></li>
           	<li><a href="<?php print $globalURL; ?>/tools/metar"><?php echo _("METAR translator"); ?></a></li>
@@ -589,7 +625,10 @@ 
 <?php
 	}
 ?>
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
 		<ul class="dropdown-menu">
 		    <li><a href="<?php print $globalURL; ?>/marine/currently"><?php echo _("Current Activity"); ?></a></li>
 		    <li><a href="<?php print $globalURL; ?>/marine/latest"><?php echo _("Latest Activity"); ?></a></li>
@@ -630,7 +669,10 @@ 
 <?php
 	}
 ?>
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
 		<ul class="dropdown-menu">
 		    <li><a href="<?php print $globalURL; ?>/tracker/currently"><?php echo _("Current Activity"); ?></a></li>
 		    <li><a href="<?php print $globalURL; ?>/tracker/latest"><?php echo _("Latest Activity"); ?></a></li>
@@ -673,7 +715,10 @@ 
 ?>
 
 <!--
-		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) echo 'right-'; ?>caret"></b></a>
+		<a href="#" class="dropdown-toggle" data-toggle="dropdown"><?php echo _("Explore"); ?> <b class="<?php if ($sub) {
+	echo 'right-';
+}
+?>caret"></b></a>
 		<ul class="dropdown-menu">
 		    <li><a href="<?php print $globalURL; ?>/satellite/currently"><?php echo _("Current Activity"); ?></a></li>
 		    <li><a href="<?php print $globalURL; ?>/satellite/latest"><?php echo _("Latest Activity"); ?></a></li>
@@ -730,7 +775,9 @@ 
   		        $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>';
   		        }
   		    ?>
@@ -878,9 +925,24 @@ 
 	$customid = $globalMapProvider;
 ?>
     L.tileLayer('<?php print $globalMapCustomLayer[$customid]['url']; ?>/{z}/{x}/{y}.png', {
-        maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) print $globalMapCustomLayer[$customid]['maxZoom']; else print '18'; ?>,
-        minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) print $globalMapCustomLayer[$customid]['minZoom']; else print '0'; ?>,
-        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+        maxZoom: <?php if (isset($globalMapCustomLayer[$customid]['maxZoom'])) {
+	print $globalMapCustomLayer[$customid]['maxZoom'];
+} else {
+	print '18';
+}
+?>,
+        minZoom: <?php if (isset($globalMapCustomLayer[$customid]['minZoom'])) {
+	print $globalMapCustomLayer[$customid]['minZoom'];
+} else {
+	print '0';
+}
+?>,
+        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
         attribution: '<?php print $globalMapCustomLayer[$customid]['attribution']; ?>'
     }).addTo(map);
 <?php
@@ -895,7 +957,12 @@ 
         maxZoom: 5,
         tms : true,
         zindex : 3,
-        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) print 'false'; else print 'true'; ?>,
+        noWrap: <?php if (isset($globalMapWrap) && !$globalMapWrap) {
+	print 'false';
+} else {
+	print 'true';
+}
+?>,
         attribution: 'Natural Earth'
     }).addTo(map);
 <?php
@@ -918,4 +985,7 @@ 
 
 ?>
 
-<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">