Ysurac / FlightAirMap

index.php

Spacing +15 added lines, -15 removed lines

@@ -4,7 +4,7 @@ 
 require_once('require/class.Language.php');
 require_once('require/class.Satellite.php');
 
-$trackident = filter_input(INPUT_GET,'trackid',FILTER_SANITIZE_STRING);
+$trackident = filter_input(INPUT_GET, 'trackid', FILTER_SANITIZE_STRING);
 if ($trackident != '') {
 	require_once('require/class.SpotterLive.php');
 	$SpotterLive = new SpotterLive();
@@ -14,7 +14,7 @@ 
 		$spotterid = $Spotter->getSpotterIDBasedOnFlightAwareID($trackident);
 		header('Location: '.$globalURL.'/flightid/'.$spotterid);
 	} else {
-		setcookie('MapTrack',$resulttrackident[0]['flightaware_id']);
+		setcookie('MapTrack', $resulttrackident[0]['flightaware_id']);
 	}
 } else {
 	unset($_COOKIE['MapTrack']);
@@ -189,7 +189,7 @@ 
 		        <div class="form-group">
 			    <label>From (UTC):</label>
 		            <div class='input-group date' id='datetimepicker1'>
-            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
+            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a", $_COOKIE['archive_begin']); ?>" required />
 		                <span class="input-group-addon">
             			    <span class="glyphicon glyphicon-calendar"></span>
 		                </span>
@@ -198,7 +198,7 @@ 
 		        <div class="form-group">
 			    <label>To (UTC):</label>
 		            <div class='input-group date' id='datetimepicker2'>
-		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" />
+		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a", $_COOKIE['archive_end']); ?>" />
             			<span class="input-group-addon">
 		                    <span class="glyphicon glyphicon-calendar"></span>
             			</span>
@@ -323,9 +323,9 @@ 
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
 			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option>
-			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option>
-			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option>
-			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option>
+			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected'; ?>>ellipsoid</option>
+			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected'; ?>>vr terrain</option>
+			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected'; ?>>ArticDEM</option>
 			</select>
 		    </li>
 <?php
@@ -351,7 +351,7 @@ 
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
 <?php
     }
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
+    if (time() > mktime(0, 0, 0, 12, 1, date("Y")) && time() < mktime(0, 0, 0, 12, 31, date("Y"))) {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li>
 <?php
@@ -507,10 +507,10 @@ 
 					$Spotter = new Spotter();
 					$allairlinenames = $Spotter->getAllAirlineNames();
 				}
-				foreach($allairlinenames as $airline) {
+				foreach ($allairlinenames as $airline) {
 					$airline_name = $airline['airline_name'];
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
-					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) {
+					if (strlen($airline_name) > 30) $airline_name = substr($airline_name, 0, 30).'...';
+					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'], explode(',', $_COOKIE['filter_Airlines']))) {
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
 					} else {
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
@@ -529,7 +529,7 @@ 
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
 			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
 			    <?php
-				foreach($allalliancenames as $alliance) {
+				foreach ($allalliancenames as $alliance) {
 					$alliance_name = $alliance['alliance'];
 					if (isset($_COOKIE['filter_alliance']) && $_COOKIE['filter_alliance'] == $alliance_name) {
 						echo '<option value="'.$alliance_name.'" selected>'.$alliance_name.'</option>';
@@ -553,8 +553,8 @@ 
 			<select class="selectpicker" multiple onchange="sources(this);">
 			    <?php
 				$Spotter = new Spotter();
-				foreach($Spotter->getAllSourceName('aprs') as $source) {
-					if (isset($_COOKIE['filter_Sources']) && in_array($source['source_name'],explode(',',$_COOKIE['filter_Sources']))) {
+				foreach ($Spotter->getAllSourceName('aprs') as $source) {
+					if (isset($_COOKIE['filter_Sources']) && in_array($source['source_name'], explode(',', $_COOKIE['filter_Sources']))) {
 						echo '<option value="'.$source['source_name'].'" selected>'.$source['source_name'].'</option>';
 					} else {
 						echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';
@@ -632,7 +632,7 @@ 
 					else if ($type_name == 'radar') $type_name = 'Radar Calibration';
 					else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches';
 					
-					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) {
+					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'], explode(',', $_COOKIE['sattypes']))) {
 						print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>';
 					} else {
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';

Indentation +94 added lines, -94 removed lines

@@ -45,7 +45,7 @@ 
     <?php }; if (isset($globalTracker) && $globalTracker) { ?><td><div id="ibxtracker"><h4><?php echo _("Trackers Detected"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?>
 </tr></table></div>
 <?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 echo $globalURL; ?>/js/map.3d.js.php"></script>
@@ -65,7 +65,7 @@ 
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
 <?php
 	}
-    }
+	}
 ?>
 
 <div id="sidebar" class="sidebar collapsed">
@@ -76,34 +76,34 @@ 
 	<li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
 	<li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 	if (isset($globalArchive) && $globalArchive == TRUE) {
 ?>
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
 <?php
 	}
-    }
+	}
 ?>
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
 	<li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li>
 	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
 <?php
-    if (isset($globalMap3D) && $globalMap3D) {
+	if (isset($globalMap3D) && $globalMap3D) {
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 	<li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
 <?php
-        } else {
-    	    if (isset($globalMapSatellites) && $globalMapSatellites) {
+		} else {
+			if (isset($globalMapSatellites) && $globalMapSatellites) {
 ?>
 	<li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li>
 <?php
-	    }
+		}
 ?>
 	<li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
 <?php
 	}
-    }
+	}
 ?>
     </ul>
 
@@ -178,7 +178,7 @@ 
 ?>
         </div>
 <?php
-    if (isset($globalArchive) && $globalArchive == TRUE) {
+	if (isset($globalArchive) && $globalArchive == TRUE) {
 ?>
         <div class="sidebar-pane" id="archive">
 	    <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -238,7 +238,7 @@ 
 	    </form>
 	</div>
 <?php
-    }
+	}
 ?>
         <div class="sidebar-pane" id="settings">
 	    <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -249,56 +249,56 @@ 
 			    <?php
 				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
 				else $MapType = $_COOKIE['MapType'];
-			    ?>
+				?>
 			    <?php
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
-			    ?>
+				?>
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <?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($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
-			    ?>
+					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
+				?>
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <?php
-				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
-			    ?>
+					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
+				?>
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <?php
-				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
-			    ?>
+					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
+				?>
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
 			    <?php
 				}
-			    ?>
+				?>
 			    <?php
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
 					else $MapBoxId = $_COOKIE['MapTypeId'];
-			    ?>
+				?>
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
 			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
@@ -312,13 +312,13 @@ 
 			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
 			</select>
 		    </li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -329,10 +329,10 @@ 
 			</select>
 		    </li>
 <?php
-    }
+	}
 ?>
 <?php
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 		    
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
@@ -341,89 +341,89 @@ 
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) print 'checked'; ?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
 <?php
-    }
+	}
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) print 'checked'; ?> ><?php echo _("Display lightning on map"); ?></label></div></li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
 <?php
-    }
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
+	}
+	if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li>
 <?php
-    }
+	}
 ?>
 
 		    <?php
 			if (function_exists('array_column')) {
-			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
-		    ?>
+				if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
+			?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
-			    }
+				}
 			} elseif (isset($globalSources)) {
-			    $dispolar = false;
-			    foreach ($globalSources as $testsource) {
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
-			    }
-			    if ($dispolar) {
-		    ?>
+				$dispolar = false;
+				foreach ($globalSources as $testsource) {
+					if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
+				}
+				if ($dispolar) {
+			?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 <?php
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 
 		    <?php
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
-		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
-		    ?>
+					if (extension_loaded('gd') && function_exists('gd_info')) {
+			?>
 		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
 		    <?php 
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
-		    ?>
+			?>
 		    <li><?php echo _("Aircraft icon color:"); ?>
 			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
 		    </li>
 		    <?php
 				}
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 		    <?php
 			if (isset($globalMarine) && $globalMarine === TRUE) {
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
-		    ?>
+				if (extension_loaded('gd') && function_exists('gd_info')) {
+			?>
 		    <li><?php echo _("Marine icon color:"); ?>
 			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>">
 		    </li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 		    <?php
 			if (isset($globalTracker) && $globalTracker === TRUE) {
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
-		    ?>
+				if (extension_loaded('gd') && function_exists('gd_info')) {
+			?>
 		    <li><?php echo _("Tracker icon color:"); ?>
 			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>">
 		    </li>
 		    <?php
-			    }
-		        }
-		    ?>
+				}
+				}
+			?>
 		    <?php
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
-		    ?>
+			?>
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
 			<div class="range">
 			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
@@ -432,9 +432,9 @@ 
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 <?php
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
 ?>
 <?php
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
@@ -465,7 +465,7 @@ 
 		    </li>
 <?php
 	}
-    }
+	}
 ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -498,19 +498,19 @@ 
 		    <ul>
 		    <?php
 			if (!isset($globalAircraft) || $globalAircraft) {
-		    ?>
+			?>
 		    <?php
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
-		    ?>
+			?>
 			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
 			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
 			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
-		    ?>
+			?>
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
 			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
 			<?php } ?>
@@ -519,7 +519,7 @@ 
 			<?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines:"); ?>
 		    <br/>
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -539,14 +539,14 @@ 
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			$Spotter = new Spotter();
 			$allalliancenames = $Spotter->getAllAllianceNames();
 			if (!empty($allalliancenames)) {
-		    ?>
+			?>
 		    <li><?php echo _("Display alliance:"); ?>
 		    <br/>
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
@@ -560,18 +560,18 @@ 
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (isset($globalAPRS) && $globalAPRS) {
-		    ?>
+			?>
 		    <li><?php echo _("Display APRS sources name:"); ?>
 			<select class="selectpicker" multiple onchange="sources(this);">
 			    <?php
@@ -583,18 +583,18 @@ 
 						echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (!isset($globalAircraft) && $globalAircraft) {
-		    ?>
+			?>
 		    <?php
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
 			<select class="selectpicker" onchange="airlinestype(this);">
 			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -605,14 +605,14 @@ 
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li>
 			<?php echo _("Display flight with ident:"); ?>
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		</ul>
 	    </form>
 	    <form method="post">
@@ -621,7 +621,7 @@ 
 	    </form>
     	</div>
 <?php
-    if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
+	if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
         <div class="sidebar-pane" id="satellites">
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -661,14 +661,14 @@ 
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		</ul>
 	    </form>
 	</div>
 <?php
-    }
+	}
 ?>
     </div>
 </div>

Braces +433 added lines, -109 removed lines

@@ -157,11 +157,26 @@ 
 				<li><div class="checkbox"><label><input type="checkbox" name="notamcb" value="1" onclick="showNotam();" /><?php echo _("Display NOTAM"); ?></label></div></li>
 				<li><?php echo _("NOTAM scope:"); ?>
 					<select class="selectpicker" onchange="notamscope(this);">
-						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') print ' selected'; ?>>All</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') print ' selected'; ?>>Airport/Enroute warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') print ' selected'; ?>>Airport warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') print ' selected'; ?>>Navigation warning</option>
-						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') print ' selected'; ?>>Enroute warning</option>
+						<option<?php if (!isset($_COOKIE['notamscope']) || $_COOKIE['notamscope'] == 'All') {
+	print ' selected';
+}
+?>>All</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport/Enroute warning') {
+	print ' selected';
+}
+?>>Airport/Enroute warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Airport warning') {
+	print ' selected';
+}
+?>>Airport warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Navigation warning') {
+	print ' selected';
+}
+?>>Navigation warning</option>
+						<option<?php if (isset($_COOKIE['notamscope']) && $_COOKIE['notamscope'] == 'Enroute warning') {
+	print ' selected';
+}
+?>>Enroute warning</option>
 					</select
 				</li>
 			</ul>
@@ -189,7 +204,12 @@ 
 		        <div class="form-group">
 			    <label>From (UTC):</label>
 		            <div class='input-group date' id='datetimepicker1'>
-            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) print $_POST['start_date']; elseif (isset($_COOKIE['archive_begin'])) print date("m/d/Y h:i a",$_COOKIE['archive_begin']); ?>" required />
+            			<input type='text' name="start_date" class="form-control" value="<?php if (isset($_POST['start_date'])) {
+	print $_POST['start_date'];
+} elseif (isset($_COOKIE['archive_begin'])) {
+	print date("m/d/Y h:i a",$_COOKIE['archive_begin']);
+}
+?>" required />
 		                <span class="input-group-addon">
             			    <span class="glyphicon glyphicon-calendar"></span>
 		                </span>
@@ -198,7 +218,12 @@ 
 		        <div class="form-group">
 			    <label>To (UTC):</label>
 		            <div class='input-group date' id='datetimepicker2'>
-		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) print $_POST['end_date']; elseif (isset($_COOKIE['archive_end'])) print date("m/d/Y h:i a",$_COOKIE['archive_end']); ?>" />
+		                <input type='text' name="end_date" class="form-control" value="<?php if (isset($_POST['end_date'])) {
+	print $_POST['end_date'];
+} elseif (isset($_COOKIE['archive_end'])) {
+	print date("m/d/Y h:i a",$_COOKIE['archive_end']);
+}
+?>" />
             			<span class="input-group-addon">
 		                    <span class="glyphicon glyphicon-calendar"></span>
             			</span>
@@ -224,8 +249,20 @@ 
 
 		    <li><?php echo _("Playback speed:"); ?>
 			<div class="range">
-			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_POST['archivespeed'])) print $_POST['archivespeed']; elseif (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?>">
-			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) print $_COOKIE['archive_speed']; else print '1'; ?></output>
+			    <input type="range" min="0" max="50" step="1" name="archivespeed" onChange="archivespeedrange.value=value;" value="<?php  if (isset($_POST['archivespeed'])) {
+	print $_POST['archivespeed'];
+} elseif (isset($_COOKIE['archive_speed'])) {
+	print $_COOKIE['archive_speed'];
+} else {
+	print '1';
+}
+?>">
+			    <output id="archivespeedrange"><?php  if (isset($_COOKIE['archive_speed'])) {
+	print $_COOKIE['archive_speed'];
+} else {
+	print '1';
+}
+?></output>
 			</div>
 		    </li>
 		    <li><input type="submit" name="archive" value="Show archive" class="btn btn-primary" /></li>
@@ -247,15 +284,27 @@ 
 		    <li><?php echo _("Type of Map:"); ?>
 			<select  class="selectpicker" onchange="mapType(this);">
 			    <?php
-				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
-				else $MapType = $_COOKIE['MapType'];
+				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') {
+					$MapType = $globalMapProvider;
+				} else {
+					$MapType = $_COOKIE['MapType'];
+				}
 			    ?>
 			    <?php
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
 			    ?>
-			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
-			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
-			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
+			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') {
+	print ' selected';
+}
+?>>Bing-Aerial</option>
+			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') {
+	print ' selected';
+}
+?>>Bing-Hybrid</option>
+			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') {
+	print ' selected';
+}
+?>>Bing-Road</option>
 			    <?php
 				}
 			    ?>
@@ -265,56 +314,131 @@ 
 			    <?php
 				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
 			    ?>
-			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
-			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
-			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
+			    <option value="Here-Aerial"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Aerial</option>
+			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Hybrid</option>
+			    <option value="Here-Road"<?php if ($MapType == 'Here') {
+	print ' selected';
+}
+?>>Here-Road</option>
 			    <?php
 				    }
 			    ?>
 			    <?php
 				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
 			    ?>
-			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
-			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
-			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
-			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
+			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') {
+	print ' selected';
+}
+?>>Google Roadmap</option>
+			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') {
+	print ' selected';
+}
+?>>Google Satellite</option>
+			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') {
+	print ' selected';
+}
+?>>Google Hybrid</option>
+			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') {
+	print ' selected';
+}
+?>>Google Terrain</option>
 			    <?php
 				    }
 			    ?>
 			    <?php
 				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
 			    ?>
-			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
-			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
-			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
+			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') {
+	print ' selected';
+}
+?>>MapQuest-OSM</option>
+			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') {
+	print ' selected';
+}
+?>>MapQuest-Aerial</option>
+			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') {
+	print ' selected';
+}
+?>>MapQuest-Hybrid</option>
 			    <?php
 				    }
 			    ?>
-			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
+			    <option value="Yandex"<?php if ($MapType == 'Yandex') {
+	print ' selected';
+}
+?>>Yandex</option>
 			    <?php
 				}
 			    ?>
 			    <?php
 				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
-					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
-					else $MapBoxId = $_COOKIE['MapTypeId'];
+					if (!isset($_COOKIE['MapTypeId'])) {
+						$MapBoxId = 'default';
+					} else {
+						$MapBoxId = $_COOKIE['MapTypeId'];
+					}
 			    ?>
-			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
-			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
-			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
-			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') print ' selected'; ?>>Mapbox dark</option>
-			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') print ' selected'; ?>>Mapbox satellite</option>
-			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') print ' selected'; ?>>Mapbox streets-satellite</option>
-			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') print ' selected'; ?>>Mapbox streets-basic</option>
-			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') print ' selected'; ?>>Mapbox comic</option>
-			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') print ' selected'; ?>>Mapbox outdoors</option>
-			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') print ' selected'; ?>>Mapbox pencil</option>
-			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
-			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
+			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') {
+	print ' selected';
+}
+?>>Mapbox default</option>
+			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') {
+	print ' selected';
+}
+?>>Mapbox streets</option>
+			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') {
+	print ' selected';
+}
+?>>Mapbox light</option>
+			    <option value="Mapbox-mapbox.dark"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.dark') {
+	print ' selected';
+}
+?>>Mapbox dark</option>
+			    <option value="Mapbox-mapbox.satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.satellite') {
+	print ' selected';
+}
+?>>Mapbox satellite</option>
+			    <option value="Mapbox-mapbox.streets-satellite"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-satellite') {
+	print ' selected';
+}
+?>>Mapbox streets-satellite</option>
+			    <option value="Mapbox-mapbox.streets-basic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets-basic') {
+	print ' selected';
+}
+?>>Mapbox streets-basic</option>
+			    <option value="Mapbox-mapbox.comic"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.comic') {
+	print ' selected';
+}
+?>>Mapbox comic</option>
+			    <option value="Mapbox-mapbox.outdoors"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.outdoors') {
+	print ' selected';
+}
+?>>Mapbox outdoors</option>
+			    <option value="Mapbox-mapbox.pencil"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pencil') {
+	print ' selected';
+}
+?>>Mapbox pencil</option>
+			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') {
+	print ' selected';
+}
+?>>Mapbox pirates</option>
+			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') {
+	print ' selected';
+}
+?>>Mapbox emerald</option>
 			    <?php
 				    }
 			    ?>
-			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
+			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') {
+	print ' selected';
+}
+?>>OpenStreetMap</option>
 			</select>
 		    </li>
 <?php
@@ -322,10 +446,22 @@ 
 ?>
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
-			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') print ' selected'; ?>>stk terrain</option>
-			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') print ' selected';?>>ellipsoid</option>
-			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') print ' selected';?>>vr terrain</option>
-			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') print ' selected';?>>ArticDEM</option>
+			    <option value="stk"<?php if (!isset($_COOKIE['MapTerrain']) || $_COOKIE['MapTerrain'] == 'stk') {
+	print ' selected';
+}
+?>>stk terrain</option>
+			    <option value="ellipsoid"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'ellipsoid') {
+	print ' selected';
+}
+?>>ellipsoid</option>
+			    <option value="vrterrain"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'vrterrain') {
+	print ' selected';
+}
+?>>vr terrain</option>
+			    <option value="articdem"<?php if (isset($_COOKIE['MapTerrain']) && $_COOKIE['MapTerrain'] == 'articdem') {
+	print ' selected';
+}
+?>>ArticDEM</option>
 			</select>
 		    </li>
 <?php
@@ -335,22 +471,52 @@ 
     if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 		    
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) print 'checked'; ?> ><?php echo _("Display flight path"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) print 'checked'; ?> ><?php echo _("Display flight route on click"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) print 'checked'; ?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpath" value="1" onclick="clickFlightPath(this)" <?php if ((isset($_COOKIE['flightpath']) && $_COOKIE['flightpath'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight path"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightroute" value="1" onclick="clickFlightRoute(this)" <?php if ((isset($_COOKIE['MapRoute']) && $_COOKIE['MapRoute'] == 'true') || (isset($globalMapRoute) && $globalMapRoute)) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight route on click"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) {
+	print 'checked';
+}
+?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) {
+	print 'checked';
+}
+?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
 <?php
     }
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) print 'checked'; ?> ><?php echo _("Display lightning on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display airports on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
+	print 'checked';
+}
+?> ><?php echo _("Display ground station on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) {
+	print 'checked';
+}
+?> ><?php echo _("Display weather station on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) {
+	print 'checked';
+}
+?> ><?php echo _("Display lightning on map"); ?></label></div></li>
 <?php
     if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
 ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Show mini-map"); ?></label></div></li>
 <?php
     }
     if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
@@ -364,17 +530,25 @@ 
 			if (function_exists('array_column')) {
 			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
 		    ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
 			    }
 			} elseif (isset($globalSources)) {
 			    $dispolar = false;
 			    foreach ($globalSources as $testsource) {
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
+			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) {
+			        	$dispolar = true;
+			        }
 			    }
 			    if ($dispolar) {
 		    ?>
-		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) {
+	print 'checked';
+}
+?> ><?php echo _("Display polar on map"); ?></label></div></li>
 		    <?php
 			    }
 		        }
@@ -387,12 +561,22 @@ 
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
 		    ?>
-		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
+		    <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Aircraft icon color based on altitude"); ?></li>
 		    <?php 
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
 		    ?>
 		    <li><?php echo _("Aircraft icon color:"); ?>
-			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>">
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
+	print $_COOKIE['IconColor'];
+} elseif (isset($globalAircraftIconColor)) {
+	print $globalAircraftIconColor;
+} else {
+	print '1a3151';
+}
+?>">
 		    </li>
 		    <?php
 				}
@@ -404,7 +588,14 @@ 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
 		    ?>
 		    <li><?php echo _("Marine icon color:"); ?>
-			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>">
+			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) {
+	print $_COOKIE['MarineIconColor'];
+} elseif (isset($globalMarineIconColor)) {
+	print $globalMarineIconColor;
+} else {
+	print '1a3151';
+}
+?>">
 		    </li>
 		    <?php
 			    }
@@ -415,7 +606,14 @@ 
 			    if (extension_loaded('gd') && function_exists('gd_info')) {
 		    ?>
 		    <li><?php echo _("Tracker icon color:"); ?>
-			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>">
+			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) {
+	print $_COOKIE['TrackerIconColor'];
+} elseif (isset($globalTrackerIconColor)) {
+	print $globalTrackerIconColor;
+} else {
+	print '1a3151';
+}
+?>">
 		    </li>
 		    <?php
 			    }
@@ -426,8 +624,22 @@ 
 		    ?>
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
 			<div class="range">
-			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
-			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?></output>
+			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) {
+	print $_COOKIE['AirportZoom'];
+} elseif (isset($globalAirportZoom)) {
+	print $globalAirportZoom;
+} else {
+	print '7';
+}
+?>">
+			    <output id="range"><?php if (isset($_COOKIE['AirportZoom'])) {
+	print $_COOKIE['AirportZoom'];
+} elseif (isset($globalAirportZoom)) {
+	print $globalAirportZoom;
+} else {
+	print '7';
+}
+?></output>
 			</div>
 		    </li>
 		    <?php
@@ -439,9 +651,19 @@ 
 <?php
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
 ?>
-		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Aircraft color"); ?></li>
+		    <li><input type="checkbox" name="aircraftcolorforce" value="1" onclick="iconColorForce(this)" <?php if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Force Aircraft color"); ?></li>
 		    <li><?php echo _("Aircraft icon color:"); ?>
-			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print 'ff0000'; ?>">
+			<input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) {
+	print $_COOKIE['IconColor'];
+} elseif (isset($globalAircraftIconColor)) {
+	print $globalAircraftIconColor;
+} else {
+	print 'ff0000';
+}
+?>">
 		    </li>
 <?php
 	}
@@ -449,9 +671,19 @@ 
 <?php
 	if (isset($globalMarine) && $globalMarine === TRUE) {
 ?>
-		    <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Marine color"); ?></li>
+		    <li><input type="checkbox" name="marinecolorforce" value="1" onclick="MarineiconColorForce(this)" <?php if (isset($_COOKIE['MarineIconColorForce']) && $_COOKIE['MarineIconColorForce'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Force Marine color"); ?></li>
 		    <li><?php echo _("Marine icon color:"); ?>
-			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print 'ff0000'; ?>">
+			<input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) {
+	print $_COOKIE['MarineIconColor'];
+} elseif (isset($globalMarineIconColor)) {
+	print $globalMarineIconColor;
+} else {
+	print 'ff0000';
+}
+?>">
 		    </li>
 <?php
 	}
@@ -459,9 +691,19 @@ 
 <?php
 	if (isset($globalTracker) && $globalTracker === TRUE) {
 ?>
-		    <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') print 'checked'; ?> ><?php echo _("Force Tracker color"); ?></li>
+		    <li><input type="checkbox" name="trackercolorforce" value="1" onclick="TrackericonColorForce(this)" <?php if (isset($_COOKIE['TrackerIconColorForce']) && $_COOKIE['TrackerIconColorForce'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Force Tracker color"); ?></li>
 		    <li><?php echo _("Tracker icon color:"); ?>
-			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print 'ff0000'; ?>">
+			<input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) {
+	print $_COOKIE['TrackerIconColor'];
+} elseif (isset($globalTrackerIconColor)) {
+	print $globalTrackerIconColor;
+} else {
+	print 'ff0000';
+}
+?>">
 		    </li>
 <?php
 	}
@@ -469,22 +711,46 @@ 
 ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
-			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) echo ' selected'; ?>>km</option>
-			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) echo ' selected'; ?>>nm</option>
-			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) echo ' selected'; ?>>mi</option>
+			    <option value="km"<?php if ((!isset($_COOKIE['unitdistance']) && (!isset($globalUnitDistance) || (isset($globalUnitDistance) && $globalUnitDistance == 'km'))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) {
+	echo ' selected';
+}
+?>>km</option>
+			    <option value="nm"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
+	echo ' selected';
+}
+?>>nm</option>
+			    <option value="mi"<?php if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
+	echo ' selected';
+}
+?>>mi</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Altitude unit:"); ?>
 			<select class="selectpicker" onchange="unitaltitude(this);">
-			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) echo ' selected'; ?>>m</option>
-			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) echo ' selected'; ?>>feet</option>
+			    <option value="m"<?php if ((!isset($_COOKIE['unitaltitude']) && (!isset($globalUnitAltitude) || (isset($globalUnitAltitude) && $globalUnitAltitude == 'm'))) || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'm')) {
+	echo ' selected';
+}
+?>>m</option>
+			    <option value="feet"<?php if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) {
+	echo ' selected';
+}
+?>>feet</option>
 		        </select>
 		    </li>
 		    <li><?php echo _("Speed unit:"); ?>
 			<select class="selectpicker" onchange="unitspeed(this);">
-			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) echo ' selected'; ?>>km/h</option>
-			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) echo ' selected'; ?>>mph</option>
-			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) echo ' selected'; ?>>knots</option>
+			    <option value="kmh"<?php if ((!isset($_COOKIE['unitspeed']) && (!isset($globalUnitSpeed) || (isset($globalUnitSpeed) && $globalUnitSpeed == 'kmh'))) || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'kmh')) {
+	echo ' selected';
+}
+?>>km/h</option>
+			    <option value="mph"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'mph') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'mph')) {
+	echo ' selected';
+}
+?>>mph</option>
+			    <option value="knots"<?php if ((!isset($_COOKIE['unitspeed']) && isset($globalUnitSpeed) && $globalUnitSpeed == 'knots') || (isset($_COOKIE['unitspeed']) && $_COOKIE['unitspeed'] == 'knots')) {
+	echo ' selected';
+}
+?>>knots</option>
 		        </select>
 		    </li>
 
@@ -502,9 +768,18 @@ 
 		    <?php
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
 		    ?>
-			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
-			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
-			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
+			<?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?>
+			<?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display IVAO data"); ?></li><?php } ?>
+			<?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?>
 		    <?php
 			}
 		    ?>
@@ -512,10 +787,16 @@ 
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
 		    ?>
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
-			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
+			    <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display ADS-B data"); ?></label></div></li>
 			<?php } ?>
 			<?php if (isset($globalAPRS) && $globalAPRS) { ?>
-			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) print 'checked'; ?> ><?php echo _("Display APRS data"); ?></label></div></li>
+			    <li><div class="checkbox"><label><input type="checkbox" name="aprs" value="1" onclick="clickAPRS(this)" <?php if ((isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') || !isset($_COOKIE['ShowAPRS'])) {
+	print 'checked';
+}
+?> ><?php echo _("Display APRS data"); ?></label></div></li>
 			<?php } ?>
 		    <?php
 			}
@@ -532,7 +813,9 @@ 
 				}
 				foreach($allairlinenames as $airline) {
 					$airline_name = $airline['airline_name'];
-					if (strlen($airline_name) > 30) $airline_name = substr($airline_name,0,30).'...';
+					if (strlen($airline_name) > 30) {
+						$airline_name = substr($airline_name,0,30).'...';
+					}
 					if (isset($_COOKIE['filter_Airlines']) && in_array($airline['airline_icao'],explode(',',$_COOKIE['filter_Airlines']))) {
 						echo '<option value="'.$airline['airline_icao'].'" selected>'.$airline_name.'</option>';
 					} else {
@@ -550,7 +833,10 @@ 
 		    <li><?php echo _("Display alliance:"); ?>
 		    <br/>
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
-			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
+			    <option value="all"<?php if (!isset($_COOKIE['filter_alliance']) || $_COOKIE['filter_alliance'] == 'all' || $_COOKIE['filter_alliance'] == '') {
+	echo ' selected';
+}
+?>><?php echo _("All"); ?></option>
 			    <?php
 				foreach($allalliancenames as $alliance) {
 					$alliance_name = $alliance['alliance'];
@@ -597,10 +883,22 @@ 
 		    ?>
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
 			<select class="selectpicker" onchange="airlinestype(this);">
-			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
-			    <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') echo ' selected'; ?>><?php echo _("Passenger"); ?></option>
-			    <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') echo ' selected'; ?>><?php echo _("Cargo"); ?></option>
-			    <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') echo ' selected'; ?>><?php echo _("Military"); ?></option>
+			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') {
+	echo ' selected';
+}
+?>><?php echo _("All"); ?></option>
+			    <option value="passenger"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'passenger') {
+	echo ' selected';
+}
+?>><?php echo _("Passenger"); ?></option>
+			    <option value="cargo"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'cargo') {
+	echo ' selected';
+}
+?>><?php echo _("Cargo"); ?></option>
+			    <option value="military"<?php if (isset($_COOKIE['filter_airlinestype']) && $_COOKIE['filter_airlinestype'] == 'military') {
+	echo ' selected';
+}
+?>><?php echo _("Military"); ?></option>
 			</select>
 		    </li>
 		    <?php
@@ -608,7 +906,10 @@ 
 		    ?>
 		    <li>
 			<?php echo _("Display flight with ident:"); ?>
-			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
+			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) {
+	print $_COOKIE['filter_ident'];
+}
+?>" />
 		    </li>
 		    <?php
 			}
@@ -627,7 +928,10 @@ 
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
 	    <form>
 		<ul>
-		    <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if (isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') print 'checked'; ?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
+		    <li><div class="checkbox"><label><input type="checkbox" name="displayiss" value="1" onclick="clickDisplayISS(this)" <?php if (isset($_COOKIE['displayiss']) && $_COOKIE['displayiss'] == 'true') {
+	print 'checked';
+}
+?> ><?php echo _("Show ISS, Tiangong-1 and Tiangong-2 on map"); ?></label></div></li>
 		    <li><?php echo _("Type:"); ?>
 			<select class="selectpicker" multiple onchange="sattypes(this);">
 			    <?php
@@ -635,25 +939,45 @@ 
 				$types = $Satellite->get_tle_types();
 				foreach ($types as $type) {
 					$type_name = $type['tle_type'];
-					if ($type_name == 'musson') $type_name = 'Russian LEO Navigation';
-					else if ($type_name == 'nnss') $type_name = 'Navi Navigation Satellite System';
-					else if ($type_name == 'sbas') $type_name = 'Satellite-Based Augmentation System';
-					else if ($type_name == 'glo-ops') $type_name = 'Glonass Operational';
-					else if ($type_name == 'gps-ops') $type_name = 'GPS Operational';
-					else if ($type_name == 'argos') $type_name = 'ARGOS Data Collection System';
-					else if ($type_name == 'tdrss') $type_name = 'Tracking and Data Relay Satellite System';
-					else if ($type_name == 'sarsat') $type_name = 'Search & Rescue';
-					else if ($type_name == 'dmc') $type_name = 'Disaster Monitoring';
-					else if ($type_name == 'resource') $type_name = 'Earth Resources';
-					else if ($type_name == 'stations') $type_name = 'Space Stations';
-					else if ($type_name == 'geo') $type_name = 'Geostationary';
-					else if ($type_name == 'amateur') $type_name = 'Amateur Radio';
-					else if ($type_name == 'x-comm') $type_name = 'Experimental';
-					else if ($type_name == 'other-comm') $type_name = 'Other Comm';
-					else if ($type_name == 'science') $type_name = 'Space & Earth Science';
-					else if ($type_name == 'military') $type_name = 'Miscellaneous Military';
-					else if ($type_name == 'radar') $type_name = 'Radar Calibration';
-					else if ($type_name == 'tle-new') $type_name = 'Last 30 days launches';
+					if ($type_name == 'musson') {
+						$type_name = 'Russian LEO Navigation';
+					} else if ($type_name == 'nnss') {
+						$type_name = 'Navi Navigation Satellite System';
+					} else if ($type_name == 'sbas') {
+						$type_name = 'Satellite-Based Augmentation System';
+					} else if ($type_name == 'glo-ops') {
+						$type_name = 'Glonass Operational';
+					} else if ($type_name == 'gps-ops') {
+						$type_name = 'GPS Operational';
+					} else if ($type_name == 'argos') {
+						$type_name = 'ARGOS Data Collection System';
+					} else if ($type_name == 'tdrss') {
+						$type_name = 'Tracking and Data Relay Satellite System';
+					} else if ($type_name == 'sarsat') {
+						$type_name = 'Search & Rescue';
+					} else if ($type_name == 'dmc') {
+						$type_name = 'Disaster Monitoring';
+					} else if ($type_name == 'resource') {
+						$type_name = 'Earth Resources';
+					} else if ($type_name == 'stations') {
+						$type_name = 'Space Stations';
+					} else if ($type_name == 'geo') {
+						$type_name = 'Geostationary';
+					} else if ($type_name == 'amateur') {
+						$type_name = 'Amateur Radio';
+					} else if ($type_name == 'x-comm') {
+						$type_name = 'Experimental';
+					} else if ($type_name == 'other-comm') {
+						$type_name = 'Other Comm';
+					} else if ($type_name == 'science') {
+						$type_name = 'Space & Earth Science';
+					} else if ($type_name == 'military') {
+						$type_name = 'Miscellaneous Military';
+					} else if ($type_name == 'radar') {
+						$type_name = 'Radar Calibration';
+					} else if ($type_name == 'tle-new') {
+						$type_name = 'Last 30 days launches';
+					}
 					
 					if (isset($_COOKIE['sattypes']) && in_array($type['tle_type'],explode(',',$_COOKIE['sattypes']))) {
 						print '<option value="'.$type['tle_type'].'" selected>'.$type_name.'</option>';

import/callback.php

Braces +39 added lines, -13 removed lines

@@ -27,15 +27,21 @@ 
 		}
 	}
 }
-if ($authorize === false) die;
+if ($authorize === false) {
+	die;
+}
 
-if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+if (isset($globalTracker) && $globalTracker) {
+	require_once(dirname(__FILE__).'/../require/class.TrackerImport.php');
+}
 if (isset($globalMarine) && $globalMarine) {
 	require_once(dirname(__FILE__).'/../require/class.AIS.php');
 	require_once(dirname(__FILE__).'/../require/class.MarineImport.php');
 }
 
-if (!isset($globalDebug)) $globalDebug = FALSE;
+if (!isset($globalDebug)) {
+	$globalDebug = FALSE;
+}
 
 // Check if schema is at latest version
 $Connection = new Connection();
@@ -45,10 +51,16 @@ 
 }
 
 if (isset($globalServer) && $globalServer) {
-	if ($globalDebug) echo "Using Server Mode\n";
+	if ($globalDebug) {
+		echo "Using Server Mode\n";
+	}
 	$SI=new SpotterServer();
-} else $SI=new SpotterImport($Connection->db);
-if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
+} else {
+	$SI=new SpotterImport($Connection->db);
+}
+if (isset($globalTracker) && $globalTracker) {
+	$TI = new TrackerImport($Connection->db);
+}
 if (isset($globalMarine) && $globalMarine) {
 	$AIS = new AIS();
 	$MI = new MarineImport($Connection->db);
@@ -57,7 +69,9 @@ 
 date_default_timezone_set('UTC');
 
 $buffer = '';
-if (isset($_POST)) $buffer = $_POST;
+if (isset($_POST)) {
+	$buffer = $_POST;
+}
 $data = array();
 if (isset($buffer['type_event']) && isset($buffer['lat']) && isset($buffer['lon'])) {
 	$data['ident'] = $buffer['device_id'];
@@ -68,15 +82,27 @@ 
 	//$data['heading'] = $buffer['cap']; // Only N/S/E/W
 	$data['datetime'] = date('Y-m-d H:i:s',$buffer['timestamp']);
 	$data['comment'] = '';
-	if (isset($buffer['battery']) && $buffer['battery'] != '') $data['comment'] .= 'Battery: '.$buffer['battery'].'% ';
+	if (isset($buffer['battery']) && $buffer['battery'] != '') {
+		$data['comment'] .= 'Battery: '.$buffer['battery'].'% ';
+	}
 	//if (isset($buffer['snr']) && $buffer['snr'] != '') $data['comment'] .= 'SNR: '.$buffer['snr'].' ';
-	if (isset($buffer['temp']) && $buffer['temp'] != '') $data['comment'] .= 'Temperature: '.$buffer['temp'].'°C ';
-	if (isset($buffer['press']) && $buffer['press'] != '') $data['comment'] .= 'Pressure: '.$buffer['press'].'hPa ';
+	if (isset($buffer['temp']) && $buffer['temp'] != '') {
+		$data['comment'] .= 'Temperature: '.$buffer['temp'].'°C ';
+	}
+	if (isset($buffer['press']) && $buffer['press'] != '') {
+		$data['comment'] .= 'Pressure: '.$buffer['press'].'hPa ';
+	}
 	$TI->add($data);
 	unset($data);
 }
-if (isset($SI)) $SI->checkAll();
-if (isset($MI)) $MI->checkAll();
-if (isset($TI)) $TI->checkAll();
+if (isset($SI)) {
+	$SI->checkAll();
+}
+if (isset($MI)) {
+	$MI->checkAll();
+}
+if (isset($TI)) {
+	$TI->checkAll();
+}
 
 ?>

Spacing +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
 require_once(dirname(__FILE__).'/../require/class.Source.php');
 require_once(dirname(__FILE__).'/../require/class.Connection.php');
 require_once(dirname(__FILE__).'/../require/class.Common.php');
-$Common=new Common();
+$Common = new Common();
 $authorize = false;
 $params = array();
 $userip = $Common->getUserIP();
@@ -20,7 +20,7 @@ 
 			$authorize = true;
 			break;
 		}
-		if ($userip != '' && isset($cb['host']) && in_array($userip,explode(',',$cb['host']))) {
+		if ($userip != '' && isset($cb['host']) && in_array($userip, explode(',', $cb['host']))) {
 			$params = $globalSources[$key];
 			$authorize = true;
 			break;
@@ -46,14 +46,14 @@ 
 
 if (isset($globalServer) && $globalServer) {
 	if ($globalDebug) echo "Using Server Mode\n";
-	$SI=new SpotterServer();
-} else $SI=new SpotterImport($Connection->db);
+	$SI = new SpotterServer();
+} else $SI = new SpotterImport($Connection->db);
 if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db);
 if (isset($globalMarine) && $globalMarine) {
 	$AIS = new AIS();
 	$MI = new MarineImport($Connection->db);
 }
-$Source=new Source($Connection->db);
+$Source = new Source($Connection->db);
 date_default_timezone_set('UTC');
 
 $buffer = '';
@@ -66,7 +66,7 @@ 
 	$data['altitude'] = round($buffer['altitude']*3.28084);
 	$data['speed'] = $buffer['speed'];
 	//$data['heading'] = $buffer['cap']; // Only N/S/E/W
-	$data['datetime'] = date('Y-m-d H:i:s',$buffer['timestamp']);
+	$data['datetime'] = date('Y-m-d H:i:s', $buffer['timestamp']);
 	$data['comment'] = '';
 	if (isset($buffer['battery']) && $buffer['battery'] != '') $data['comment'] .= 'Battery: '.$buffer['battery'].'% ';
 	//if (isset($buffer['snr']) && $buffer['snr'] != '') $data['comment'] .= 'SNR: '.$buffer['snr'].' ';

require/class.APRS.php

Doc Comments +7 added lines

@@ -165,6 +165,10 @@ 
 	'\~' => 'TNC Stream SW');
 	
 
+    /**
+     * @param integer $n
+     * @param integer $s
+     */
     private function urshift($n, $s) {
 	return ($n >= 0) ? ($n >> $s) :
 	    (($n & 0x7fffffff) >> $s) | 
@@ -565,6 +569,9 @@ 
 	socket_close($this->socket);
     }
     
+    /**
+     * @param string $data
+     */
     public function send($data) {
 	global $globalDebug;
 	if ($this->connected === false) $this->connect();

Indentation +165 added lines, -165 removed lines

@@ -3,10 +3,10 @@ 
 require_once(dirname(__FILE__).'/class.Common.php');
 require_once(dirname(__FILE__).'/class.GeoidHeight.php');
 class aprs {
-    private $socket;
-    private $connected = false;
+	private $socket;
+	private $connected = false;
 
-    protected $symbols = array('/!' => 'Police',
+	protected $symbols = array('/!' => 'Police',
 	'/#' => 'DIGI',
 	'/$' => 'Phone',
 	'/%' => 'DX Cluster',
@@ -166,13 +166,13 @@ 
 	'\~' => 'TNC Stream SW');
 	
 
-    private function urshift($n, $s) {
+	private function urshift($n, $s) {
 	return ($n >= 0) ? ($n >> $s) :
-	    (($n & 0x7fffffff) >> $s) | 
+		(($n & 0x7fffffff) >> $s) | 
 		(0x40000000 >> ($s - 1));
-    }
+	}
 
-    public function parse($input) {
+	public function parse($input) {
 	global $globalDebug;
 	$debug = false;
 	$result = array();
@@ -184,8 +184,8 @@ 
 	
 	/* 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";
-	    return false;
+		if ($globalDebug) echo '!!! APRS invalid : '.$input."\n";
+		return false;
 	}
 	
 	if ($debug) echo 'input : '.$input."\n";
@@ -199,34 +199,34 @@ 
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
 	if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) {
-	    $ident = $matches[1];
-	    $all_elements = $matches[2];
-	    if ($ident == 'AIRCRAFT') {
+		$ident = $matches[1];
+		$all_elements = $matches[2];
+		if ($ident == 'AIRCRAFT') {
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'modes';
-	    } elseif ($ident == 'MARINE') {
+		} elseif ($ident == 'MARINE') {
 		$result['format_source'] = 'famaprs';
 		$result['source_type'] = 'ais';
-	    } else {
+		} else {
 		if ($debug) echo 'ident : '.$ident."\n";
 		$result['ident'] = $ident;
-	    }
+		}
 	} else {
-	    if ($debug) 'No ident'."\n";
-	    return false;
+		if ($debug) 'No ident'."\n";
+		return false;
 	}
 	$elements = explode(',',$all_elements);
 	$source = end($elements);
 	$result['source'] = $source;
 	foreach ($elements as $element) {
-	    if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
-	        //echo "ok";
-	        //if ($element == 'TCPIP*') return false;
-	    } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
+		if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) {
+			//echo "ok";
+			//if ($element == 'TCPIP*') return false;
+		} elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) {
 		if ($debug) echo 'element : '.$element."\n";
 		return false;
-	    }
-	    /*
+		}
+		/*
 	    } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) {
 		//echo "ok";
 	    } else {
@@ -253,48 +253,48 @@ 
 	$body_parse = substr($body,1);
 	//echo 'Body : '.$body."\n";
 	if (preg_match('/^;(.){9}\*/',$body,$matches)) {
-	    $body_parse = substr($body_parse,10);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,10);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match('/^`(.*)\//',$body,$matches)) {
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match("/^'(.*)\//",$body,$matches)) {
-	    $body_parse = substr($body_parse,strlen($matches[1])-1);
-	    $find = true;
-	    //echo $body_parse."\n";
+		$body_parse = substr($body_parse,strlen($matches[1])-1);
+		$find = true;
+		//echo $body_parse."\n";
 	}
 	if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) {
-	    $find = true;
-	    //print_r($matches);
-	    $timestamp = $matches[0];
-	    if ($matches[4] == 'h') {
+		$find = true;
+		//print_r($matches);
+		$timestamp = $matches[0];
+		if ($matches[4] == 'h') {
 		$timestamp = strtotime(date('Ymd').' '.$matches[1].':'.$matches[2].':'.$matches[3]);
 		//echo 'timestamp : '.$timestamp.' - now : '.time()."\n";
 		/*
 		if (time() + 3900 < $timestamp) $timestamp -= 86400;
 		elseif (time() - 82500 > $timestamp) $timestamp += 86400;
 		*/
-	    } elseif ($matches[4] == 'z' || $matches[4] == '/') {
+		} elseif ($matches[4] == 'z' || $matches[4] == '/') {
 		// This work or not ?
 		$timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]);
-	    }
-	    $body_parse = substr($body_parse,7);
-	    $result['timestamp'] = $timestamp;
-	    //echo date('Ymd H:i:s',$timestamp);
+		}
+		$body_parse = substr($body_parse,7);
+		$result['timestamp'] = $timestamp;
+		//echo date('Ymd H:i:s',$timestamp);
 	}
 	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);
-	    $result['timestamp'] = $timestamp;
-	    //echo date('Ymd H:i:s',$timestamp);
+		$find = true;
+		$timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]);
+		$body_parse = substr($body_parse,8);
+		$result['timestamp'] = $timestamp;
+		//echo date('Ymd H:i:s',$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
 		//print_r(str_split($body_parse));
@@ -313,7 +313,7 @@ 
 		$lon = intval($lon_deg);
 		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)) {
 	        print_r($matches);
@@ -327,9 +327,9 @@ 
 		$result['longitude'] = $longitude;
 		$body_parse = substr($body_parse,18);
 		$body_parse_len = strlen($body_parse);
-	    }
-	    $body_parse_len = strlen($body_parse);
-	    if ($body_parse_len > 0) {
+		}
+		$body_parse_len = strlen($body_parse);
+		if ($body_parse_len > 0) {
 		/*
 		if (!isset($result['timestamp']) && !isset($result['latitude'])) {
 			$body_split = str_split($body);
@@ -363,95 +363,95 @@ 
 			if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code];
 			if ($symbol_code != '_') {
 			}
-		    //$body_parse = substr($body_parse,1);
-		    //$body_parse = trim($body_parse);
-		    //$body_parse_len = strlen($body_parse);
-		    if ($body_parse_len >= 7) {
+			//$body_parse = substr($body_parse,1);
+			//$body_parse = trim($body_parse);
+			//$body_parse_len = strlen($body_parse);
+			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);
-		    	    $speed = substr($body_parse,4,3);
-		    	    if ($speed != '...') {
-		    		//$result['speed'] = round($speed*1.852);
-		    		$result['speed'] = intval($speed);
-		    	    }
-		    	    $body_parse = substr($body_parse,7);
-		        }
-		        // Check PHGR, PHG, RNG
-		    } 
-		    /*
+				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);
+					if ($speed != '...') {
+					//$result['speed'] = round($speed*1.852);
+					$result['speed'] = intval($speed);
+					}
+					$body_parse = substr($body_parse,7);
+				}
+				// Check PHGR, PHG, RNG
+			} 
+			/*
 		    else if ($body_parse_len > 0) {
 			$rest = $body_parse;
 		    }
 		    */
-		    if (strlen($body_parse) > 0) {
-		        if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
-		            $altitude = intval($matches[1]);
-		            //$result['altitude'] = round($altitude*0.3048);
-		            $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));
-		        }
-		    }
+			if (strlen($body_parse) > 0) {
+				if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) {
+					$altitude = intval($matches[1]);
+					//$result['altitude'] = round($altitude*0.3048);
+					$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));
+				}
+			}
 		    
-		    // Telemetry
-		    /*
+			// Telemetry
+			/*
 		    if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) {
 		        // Nothing yet...
 		    }
 		    */
-		    // DAO
+			// 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)) {
+				$dao = $matches[1];
+				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)) {
+			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)) {
+			}
+			if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) {
 			$result['arrival_code'] = str_replace('_',' ',$matches[1]);
-		    }
-		    // OGN comment
+			}
+			// OGN comment
 		   // echo "Before OGN : ".$body_parse."\n";
-		    //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}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$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);
@@ -481,42 +481,42 @@ 
 			$stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0;
 			$result['stealth'] = $stealth;
 			$result['address'] = $address;
-		    }
+			}
 		    
-		    //Comment
-		    $result['comment'] = trim($body_parse);
+			//Comment
+			$result['comment'] = trim($body_parse);
 		//} else {
-		    // parse weather
-		    //$body_parse = substr($body_parse,1);
-		    //$body_parse_len = strlen($body_parse);
-		    //echo 'weather'."\n";
-		    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)) {
+			// parse weather
+			//$body_parse = substr($body_parse,1);
+			//$body_parse_len = strlen($body_parse);
+			//echo 'weather'."\n";
+			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_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)) {
+				$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)) {
+				$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);
-		    }
-		    //if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
-		    //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)) {
+				$body_parse = substr($body_parse,strlen($matches[0])+1);
+			}
+			//if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
+			//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);
@@ -524,8 +524,8 @@ 
 			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)) {
+				$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);
@@ -533,8 +533,8 @@ 
 			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)) {
+				$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);
@@ -542,58 +542,58 @@ 
 			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)) {
+				$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)) {
+				$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)) {
+				$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)) {
+				$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)) {
+				$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]));
-		    }
-		    $result['comment'] = trim($body_parse);
+				$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 ($debug) print_r($result);
 	return $result;
-    }
+	}
     
-    public function connect() {
+	public function connect() {
 	global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport;
 	$aprs_connect = 0;
 	$aprs_keep = 120;
@@ -617,24 +617,24 @@ 
 		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;
+				echo 'APRS user verified !'."\n";
+				$this->connected = true;
+				return true;
+				break;
 			}
 			if (time()-$authstart > 5) {
-			    echo 'APRS timeout'."\n";
-			    break;
+				echo 'APRS timeout'."\n";
+				break;
 			}
 		}
 	}
-    }
+	}
 
-    public function disconnect() {
+	public function disconnect() {
 	socket_close($this->socket);
-    }
+	}
     
-    public function send($data) {
+	public function send($data) {
 	global $globalDebug;
 	if ($this->connected === false) $this->connect();
 	$send = socket_send( $this->socket  , $data , strlen($data),0);
@@ -643,7 +643,7 @@ 
 		socket_close($this->socket);
 		$this->connect();
 	}
-    }
+	}
 }
 
 class APRSSpotter extends APRS {

Spacing +157 added lines, -158 removed lines

@@ -167,8 +167,7 @@ 
 	
 
     private function urshift($n, $s) {
-	return ($n >= 0) ? ($n >> $s) :
-	    (($n & 0x7fffffff) >> $s) | 
+	return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| 
 		(0x40000000 >> ($s - 1));
     }
 
@@ -180,7 +179,7 @@ 
 	//$split_input = str_split($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) {
@@ -190,15 +189,15 @@ 
 	
 	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);
 	//$header_len = strlen($header);
 	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') {
@@ -215,14 +214,14 @@ 
 	    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)) {
 	        //echo "ok";
 	        //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;
 	    }
@@ -235,14 +234,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;
@@ -250,24 +249,24 @@ 
 	
 	// Check for Timestamp
 	$find = false;
-	$body_parse = substr($body,1);
+	$body_parse = substr($body, 1);
 	//echo 'Body : '.$body."\n";
-	if (preg_match('/^;(.){9}\*/',$body,$matches)) {
-	    $body_parse = substr($body_parse,10);
+	if (preg_match('/^;(.){9}\*/', $body, $matches)) {
+	    $body_parse = substr($body_parse, 10);
 	    $find = true;
 	    //echo $body_parse."\n";
 	}
-	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;
 	    //echo $body_parse."\n";
 	}
-	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;
 	    //echo $body_parse."\n";
 	}
-	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;
 	    //print_r($matches);
 	    $timestamp = $matches[0];
@@ -282,19 +281,19 @@ 
 		// 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;
 	    //echo date('Ymd H:i:s',$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;
 	    //echo date('Ymd H:i:s',$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
 		//print_r(str_split($body_parse));
@@ -321,11 +320,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);
@@ -357,7 +356,7 @@ 
 		//echo $body_parse;
 			//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];
@@ -368,16 +367,16 @@ 
 		    //$body_parse_len = strlen($body_parse);
 		    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'] = round($speed*1.852);
 		    		$result['speed'] = intval($speed);
 		    	    }
-		    	    $body_parse = substr($body_parse,7);
+		    	    $body_parse = substr($body_parse, 7);
 		        }
 		        // Check PHGR, PHG, RNG
 		    } 
@@ -387,12 +386,12 @@ 
 		    }
 		    */
 		    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'] = round($altitude*0.3048);
 		            $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));
 		        }
 		    }
 		    
@@ -404,13 +403,13 @@ 
 		    */
 		    // 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;
@@ -418,50 +417,50 @@ 
 				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
 		   // echo "Before OGN : ".$body_parse."\n";
 		    //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);
+			$address = substr($id, 2);
 			//print_r($matches);
-			$addressType = (intval(substr($id,0,2),16))&3;
+			$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";
@@ -478,7 +477,7 @@ 
 			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;
 		    }
@@ -490,96 +489,96 @@ 
 		    //$body_parse = substr($body_parse,1);
 		    //$body_parse_len = strlen($body_parse);
 		    //echo 'weather'."\n";
-		    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);
 		    }
 		    //if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) {
 		    //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);
 		}
@@ -587,42 +586,42 @@ 
 
 	    }
 	//}
-	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;
     }
     
     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;
 			}
@@ -637,7 +636,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);
@@ -647,16 +646,16 @@ 
 }
 
 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();
 		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 = '';
@@ -683,25 +682,25 @@ 
 			$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();
 		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 .= '/';
@@ -721,11 +720,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

@@ -184,17 +184,23 @@ 
 	
 	/* 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);
 	//$header_len = strlen($header);
-	if ($debug) echo 'header : '.$header."\n";
+	if ($debug) {
+		echo 'header : '.$header."\n";
+	}
 	
 	/* Parse source, target and path. */
 	//FLRDF0A52>APRS,qAS,LSTB
@@ -208,11 +214,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);
@@ -223,7 +233,9 @@ 
 	        //echo "ok";
 	        //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;
 	    }
 	    /*
@@ -236,13 +248,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;
@@ -311,7 +327,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);
@@ -321,8 +339,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);
@@ -350,8 +372,11 @@ 
 			//echo 'find'."\n";
 			$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;
+			}
 		//'
 		//}
 		//echo $body_parse;
@@ -360,7 +385,9 @@ 
 			$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 != '_') {
 			}
 		    //$body_parse = substr($body_parse,1);
@@ -371,7 +398,9 @@ 
 		        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'] = round($speed*1.852);
@@ -412,10 +441,16 @@ 
 			        $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);
@@ -457,27 +492,48 @@ 
 			$address = substr($id,2);
 			//print_r($matches);
 			$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;
@@ -517,79 +573,183 @@ 
 		    //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;
     }
     
@@ -598,12 +758,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";
@@ -636,10 +805,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();
 	}
@@ -661,22 +834,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();
@@ -700,30 +883,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.ATC.php

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 	/**
 	* Get SQL query part for filter used
 	* @param Array $filter the filter
-	* @return Array the SQL part
+	* @return string the SQL part
 	*/
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName;

Indentation +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@
 	}
 
 	/**
-	* Get SQL query part for filter used
-	* @param Array $filter the filter
-	* @return Array the SQL part
-	*/
+	 * Get SQL query part for filter used
+	 * @param Array $filter the filter
+	 * @return Array the SQL part
+	 */
 	public function getFilter($filter = array(),$where = false,$and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {

Spacing +31 added lines, -31 removed lines

@@ -14,22 +14,22 @@ 
 	* @param Array $filter the filter
 	* @return Array the SQL part
 	*/
-	public function getFilter($filter = array(),$where = false,$and = false) {
+	public function getFilter($filter = array(), $where = false, $and = false) {
 		global $globalFilter, $globalStatsFilters, $globalFilterName;
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
-				foreach($globalStatsFilters[$globalFilterName] as $source) {
+				foreach ($globalStatsFilters[$globalFilterName] as $source) {
 					if (isset($source['source'])) $filter['source'][] = $source['source'];
 				}
 			} else {
 				$filter = $globalStatsFilters[$globalFilterName];
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter);
 		$filter_query_join = '';
 		$filter_query_where = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
-			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
+			$filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')";
 		}
 		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
 		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
@@ -44,7 +44,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);
@@ -52,66 +52,66 @@ 
 	}
 
 	public function getById($id) {
-		$filter_query = $this->getFilter(array(),true);
+		$filter_query = $this->getFilter(array(), true);
 		$query = "SELECT * FROM atc".$filter_query." atc_id = :id";
 		$query_values = array(':id' => $id);
 		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);
 		return $all;
 	}
 
-	public function getByIdent($ident,$format_source = '') {
-		$filter_query = $this->getFilter(array(),true);
+	public function getByIdent($ident, $format_source = '') {
+		$filter_query = $this->getFilter(array(), true);
 		if ($format_source == '') {
 			$query = "SELECT * FROM atc".$filter_query." ident = :ident";
 			$query_values = array(':ident' => $ident);
 		} else {
 			$query = "SELECT * FROM atc".$filter_query." ident = :ident AND format_source = :format_source";
-			$query_values = array(':ident' => $ident,':format_source' => $format_source);
+			$query_values = array(':ident' => $ident, ':format_source' => $format_source);
 		}
 		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);
 		return $all;
 	}
 
-	public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
-		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
-		$info = str_replace('^','<br />',$info);
-		$info = str_replace('&amp;sect;','',$info);
-		$info = str_replace('"','',$info);
+	public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
+		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
+		$info = str_replace('^', '<br />', $info);
+		$info = str_replace('&amp;sect;', '', $info);
+		$info = str_replace('"', '', $info);
 		if ($type == '') $type = NULL;
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
-		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
+		$query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
 
-	public function update($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') {
-		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
-		$info = str_replace('^','<br />',$info);
-		$info = str_replace('&amp;sect;','',$info);
-		$info = str_replace('"','',$info);
+	public function update($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') {
+		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
+		$info = str_replace('^', '<br />', $info);
+		$info = str_replace('&amp;sect;', '', $info);
+		$info = str_replace('"', '', $info);
 		if ($type == '') $type = NULL;
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
-		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
+		$query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -122,18 +122,18 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
 
-	public function deleteByIdent($ident,$format_source) {
+	public function deleteByIdent($ident, $format_source) {
 		$query = "DELETE FROM atc WHERE ident = :ident AND format_source = :format_source";
-		$query_values = array(':ident' => $ident,':format_source' => $format_source);
+		$query_values = array(':ident' => $ident, ':format_source' => $format_source);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -144,7 +144,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -159,7 +159,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";

Braces +17 added lines, -6 removed lines

@@ -19,20 +19,27 @@ 
 		if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) {
 			if (isset($globalStatsFilters[$globalFilterName][0]['source'])) {
 				foreach($globalStatsFilters[$globalFilterName] as $source) {
-					if (isset($source['source'])) $filter['source'][] = $source['source'];
+					if (isset($source['source'])) {
+						$filter['source'][] = $source['source'];
+					}
 				}
 			} else {
 				$filter = $globalStatsFilters[$globalFilterName];
 			}
 		}
-		if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter);
+		if (is_array($globalFilter)) {
+			$filter = array_merge($filter,$globalFilter);
+		}
 		$filter_query_join = '';
 		$filter_query_where = '';
 		if (isset($filter['source']) && !empty($filter['source'])) {
 			$filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')";
 		}
-		if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE';
-		elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND';
+		if ($filter_query_where == '' && $where) {
+			$filter_query_where = ' WHERE';
+		} elseif ($filter_query_where != '' && $and) {
+			$filter_query_where .= ' AND';
+		}
 		$filter_query = $filter_query_join.$filter_query_where;
 		return $filter_query;
 	}
@@ -89,7 +96,9 @@ 
 		$info = str_replace('^','<br />',$info);
 		$info = str_replace('&amp;sect;','',$info);
 		$info = str_replace('"','',$info);
-		if ($type == '') $type = NULL;
+		if ($type == '') {
+			$type = NULL;
+		}
 		$query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)";
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
 		try {
@@ -105,7 +114,9 @@ 
 		$info = str_replace('^','<br />',$info);
 		$info = str_replace('&amp;sect;','',$info);
 		$info = str_replace('"','',$info);
-		if ($type == '') $type = NULL;
+		if ($type == '') {
+			$type = NULL;
+		}
 		$query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name";
 		$query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name);
 		try {

tools-geoid.php

Indentation +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 try {
 $GeoidHeight = new GeoidHeight();
 } catch (Exception $e) {
-    echo $e;
+	echo $e;
 }
 $title = _("Geoid Height Calculator");
 require_once('header.php');

Spacing +5 added lines, -5 removed lines

@@ -12,9 +12,9 @@ 
 
 $page_url = $globalURL.'/tools-geoid';
 
-$latitude = filter_input(INPUT_POST,'latitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-$longitude = filter_input(INPUT_POST,'longitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-$altitude = filter_input(INPUT_POST,'altitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+$latitude = filter_input(INPUT_POST, 'latitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+$longitude = filter_input(INPUT_POST, 'longitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+$altitude = filter_input(INPUT_POST, 'altitude', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
 
 print '<div class="info column">';
 print '<h1>'._("Geoid Height Calculator").'</h1>';
@@ -51,14 +51,14 @@ 
 
 if ($latitude != '' && $longitude != '') {
 	$globalDebug = FALSE;
-	$geoid = $GeoidHeight->get($latitude,$longitude);
+	$geoid = $GeoidHeight->get($latitude, $longitude);
 	print '<div class="row">';
 	print '<div class="col-md-3 col-md-offset-5">';
 	print '<div class="col-sm-6"><b>Geoid</b></div>';
 	print '<div class="col-sm-6">'.$geoid.'</div>';
 	if ($altitude != '') {
 		print '<div class="col-sm-6"><b>AMSL Elevation</b></div>';
-		print '<div class="col-sm-6">'.round($altitude-$geoid,3).'</div>';
+		print '<div class="col-sm-6">'.round($altitude - $geoid, 3).'</div>';
 	}
 	print '<div class="col-sm-6"><b>Earth Gravity Model</b></div>';
 	if (isset($globalGeoidSource) && $globalGeoidSource != '') $geoidsource = $globalGeoidSource;

Braces +5 added lines, -2 removed lines

@@ -61,8 +61,11 @@
 		print '<div class="col-sm-6">'.round($altitude-$geoid,3).'</div>';
 	}
 	print '<div class="col-sm-6"><b>Earth Gravity Model</b></div>';
-	if (isset($globalGeoidSource) && $globalGeoidSource != '') $geoidsource = $globalGeoidSource;
-	else $geoidsource = 'EGM96-15';
+	if (isset($globalGeoidSource) && $globalGeoidSource != '') {
+		$geoidsource = $globalGeoidSource;
+	} else {
+		$geoidsource = 'EGM96-15';
+	}
 	print '<div class="col-sm-6">'.$geoidsource.'</div>';
 	print '</div>';
 }

require/class.ACARS.php

Indentation +72 added lines, -72 removed lines

@@ -16,11 +16,11 @@ 
 		$this->SI = new SpotterImport($this->db);
 	}
 	/**
-	* Change IATA to ICAO value for ident
-	*
-	* @param String $ident ident
-	* @return String the icao
-	*/
+	 * Change IATA to ICAO value for ident
+	 *
+	 * @param String $ident ident
+	 * @return String the icao
+	 */
 	public function ident2icao($ident) {
 		if (substr($ident,0,2) == 'AF') {
 			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
@@ -36,11 +36,11 @@ 
 	}
 
 	/**
-	* Deletes all info in the live table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the live table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveAcarsData()
 	{
 		global $globalDBdriver;
@@ -60,11 +60,11 @@ 
 	}
 
 	/**
-	* Deletes all info in the archive table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the archive table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteArchiveAcarsData()
 	{
 		global $globalACARSArchiveKeepMonths, $globalDBdriver;
@@ -85,11 +85,11 @@ 
 
 
 	/**
-	* Parse ACARS data
-	*
-	* @param String ACARS data in acarsdec data
-	*
-	*/
+	 * Parse ACARS data
+	 *
+	 * @param String ACARS data in acarsdec data
+	 *
+	 */
 	public function parse($data) {
 		global $globalDebug, $globalACARSArchive;
 		//$Image = new Image($this->db);
@@ -719,11 +719,11 @@ 
 	}
 
 	/**
-	* Add ACARS data
-	*
-	* @param String ACARS data in acarsdec data
-	*
-	*/
+	 * Add ACARS data
+	 *
+	 * @param String ACARS data in acarsdec data
+	 *
+	 */
 	function add($data) {
 		global $globalDebug, $globalACARSArchive;
 		$Image = new Image($this->db);
@@ -770,15 +770,15 @@ 
 	}
 
 	/**
-	* Add Live ACARS data in DB
-	*
-	* @param String $ident ident
-	* @param String $registration Registration of the aircraft
-	* @param String $label Label of the ACARS message
-	* @param String $block_id Block id of the ACARS message
-	* @param String $msg_no Number of the ACARS message
-	* @param String $message ACARS message
-	*/
+	 * Add Live ACARS data in DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $label Label of the ACARS message
+	 * @param String $block_id Block id of the ACARS message
+	 * @param String $msg_no Number of the ACARS message
+	 * @param String $message ACARS message
+	 */
 	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
@@ -814,15 +814,15 @@ 
 	}
 
 	/**
-	* Add Archive ACARS data in DB
-	*
-	* @param String $ident ident
-	* @param String $registration Registration of the aircraft
-	* @param String $label Label of the ACARS message
-	* @param String $block_id Block id of the ACARS message
-	* @param String $msg_no Number of the ACARS message
-	* @param String $message ACARS message
-	*/
+	 * Add Archive ACARS data in DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $label Label of the ACARS message
+	 * @param String $block_id Block id of the ACARS message
+	 * @param String $msg_no Number of the ACARS message
+	 * @param String $message ACARS message
+	 */
 	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
@@ -853,11 +853,11 @@ 
 	}
 
 	/**
-	* Get Message title from label from DB
-	*
-	* @param String $label
-	* @return String Return ACARS title
-	*/
+	 * Get Message title from label from DB
+	 *
+	 * @param String $label
+	 * @return String Return ACARS title
+	 */
 	public function getTitlefromLabel($label) {
 		$Connection = new Connection($this->db);
 		$this->db = $Connection->db;
@@ -876,10 +876,10 @@ 
 	}
 
 	/**
-	* List all Message title & label from DB
-	*
-	* @return Array Return ACARS data in array
-	*/
+	 * List all Message title & label from DB
+	 *
+	 * @return Array Return ACARS data in array
+	 */
 	public function getAllTitleLabel() {
 		$query = "SELECT * FROM acars_label ORDER BY title";
 		$query_values = array();
@@ -896,11 +896,11 @@ 
 	}
 
 	/**
-	* Get Live ACARS data from DB
-	*
-	* @param String $ident
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Live ACARS data from DB
+	 *
+	 * @param String $ident
+	 * @return Array Return ACARS data in array
+	 */
 	public function getLiveAcarsData($ident) {
 		$query = "SELECT * FROM acars_live WHERE ident = :ident ORDER BY acars_live_id DESC";
 		$query_values = array(':ident' => $ident);
@@ -917,10 +917,10 @@ 
 	}
 
 	/**
-	* Get Latest ACARS data from DB
-	*
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Latest ACARS data from DB
+	 *
+	 * @return Array Return ACARS data in array
+	 */
 	public function getLatestAcarsData($limit = '',$label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
@@ -1008,10 +1008,10 @@ 
 	}
 
 	/**
-	* Get Archive ACARS data from DB
-	*
-	* @return Array Return ACARS data in array
-	*/
+	 * Get Archive ACARS data from DB
+	 *
+	 * @return Array Return ACARS data in array
+	 */
 	public function getArchiveAcarsData($limit = '',$label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
@@ -1099,13 +1099,13 @@ 
 	}
 
 	/**
-	* Add ModeS data to DB
-	*
-	* @param String $ident ident
-	* @param String $registration Registration of the aircraft
-	* @param String $icao
-	* @param String $ICAOTypeCode
-	*/
+	 * Add ModeS data to DB
+	 *
+	 * @param String $ident ident
+	 * @param String $registration Registration of the aircraft
+	 * @param String $icao
+	 * @param String $ICAOTypeCode
+	 */
 	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
 		global $globalDebug, $globalDBdriver;
 		$ident = trim($ident);

Spacing +255 added lines, -255 removed lines

@@ -22,14 +22,14 @@ 
 	* @return String the icao
 	*/
 	public function ident2icao($ident) {
-		if (substr($ident,0,2) == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+		if (substr($ident, 0, 2) == 'AF') {
+			if (filter_var(substr($ident, 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
+			else $icao = 'AFR'.ltrim(substr($ident, 2), '0');
 		} else {
 			$Spotter = new Spotter($this->db);
-			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
+			$identicao = $Spotter->getAllAirlineInfo(substr($ident, 0, 2));
 			if (isset($identicao[0])) {
-				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
+				$icao = $identicao[0]['icao'].ltrim(substr($ident, 2), '0');
 			} else $icao = $ident;
 		}
 		return $icao;
@@ -53,7 +53,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";
@@ -77,7 +77,7 @@ 
 
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error";
 		}
 		return "success";
@@ -102,13 +102,13 @@ 
 		$ident = '';
 		$message = '';
 		$result = array();
-		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		$n = sscanf($data, '(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0) $n = sscanf($data, 'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
+		if ($n == 0) $n = sscanf($data, '%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]', $registration, $label, $block_id, $msg_no, $ident, $message);
 		if ($n != 0) {
-			$registration = str_replace('.','',$registration);
-			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
+			$registration = str_replace('.', '', $registration);
+			$result = array('registration' => $registration, 'ident' => $ident, 'label' => $label, 'block_id' => $block_id, 'msg_no' => $msg_no, 'message' => $message);
 			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
 		} else $message = $data;
 		$decode = array();
@@ -128,14 +128,14 @@ 
 				$temp = '';
 				$n = sscanf($message, "FST01%4c%4c%c%06d%c%07d%03d%*8[0-9a-zA-Z ]-%02dC", $dair, $darr, $lac, $la, $lnc, $ln, $alt, $temp);
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
-					$latitude = $la / 10000.0;
-					$longitude = $ln / 10000.0;
+					$latitude = $la/10000.0;
+					$longitude = $ln/10000.0;
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 					// Temp not always available
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
+					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => $alt);
+					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt, 'Temperature' => $temp.'°C');
 
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -147,19 +147,19 @@ 
 				$dhour = '';
 				$darr = '';
 				$ahour = '';
-				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
+				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr, $ahour);
 				if ($n == 4 && strlen($darr) == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
+					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '.$darr.' - departure hour : '.$dhour.' - arrival hour : '.$ahour."\n";
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
 					$found = true;
 				}
-				elseif ($n == 2 || $n  == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+				elseif ($n == 2 || $n == 4) {
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
 					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
@@ -217,11 +217,11 @@ 
 				$ahour = '';
 				$aair = '';
 				$apiste = '';
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao, $aident, $dair, $darr, $ddate, $dhour, $ahour, $aair, $apiste);
 				if ($n > 8) {
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					if ($globalDebug) echo 'airicao : '.$airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '.$darr.' - date depart : '.$ddate.' - departure hour : '.$dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
+					if ($dhour != '') $dhour = substr(sprintf('%04d', $dhour), 0, 2).':'.substr(sprintf('%04d', $dhour), 2);
+					if ($ahour != '') $ahour = substr(sprintf('%04d', $ahour), 0, 2).':'.substr(sprintf('%04d', $ahour), 2);
 					$icao = trim($aident);
 
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
@@ -246,8 +246,8 @@ 
 				if ($n == 10 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
 					$las = $las.'.'.$lass;
 					$lns = $lns.'.'.$lns;
-					$latitude = $las / 1000.0;
-					$longitude = $lns / 1000.0;
+					$latitude = $las/1000.0;
+					$longitude = $lns/1000.0;
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
@@ -342,17 +342,17 @@ 
 				$alt = '';
 				$fuel = '';
 				$speed = '';
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "#DFB(POS-%s -%4d%c%5d%c/%*d F%dRMK/FUEL %f M%f", $aident, $las, $lac, $lns, $lnc, $alt, $fuel, $speed);
 				if ($n == 9) {
 					//if (self->$debug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					$icao = trim($aident);
 					$decode['icao'] = $icao;
-					$latitude = $las / 100.0;
-					$longitude = $lns / 100.0;
+					$latitude = $las/100.0;
+					$longitude = $lns/100.0;
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude, 'Altitude' => 'FL'.$alt, 'Fuel' => $fuel, 'speed' => $speed);
 					$found = true;
 				}
 			}
@@ -371,7 +371,7 @@ 
 					if ($lac == 'S') $latitude = '-'.$latitude;
 					if ($lnc == 'W') $longitude = '-'.$longitude;
 
-					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
+					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
 					$found = true;
 				}
 			}
@@ -404,7 +404,7 @@ 
 				$dair = '';
 				$darr = '';
 				$aident = '';
-				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
+				$n = sscanf(str_replace(array("\r\n", "\n", "\r"), '', $message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
 				if ($n == 8) {
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					$icao = trim($aident);
@@ -436,7 +436,7 @@ 
 				*/
 				$dair = '';
 				$darr = '';
-				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
+				$n = sscanf($message, '%4[A-Z]%4[A-Z]%*4d', $dair, $darr);
 				if ($n == 3) {
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					//$icao = $Translation->checkTranslation($ident);
@@ -451,7 +451,7 @@ 
 				*/
 				$dair = '';
 				$darr = '';
-				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
+				$n = sscanf($message, '3J01 DSPTCH %*d/%*d %4s/%4s .%*6s', $dair, $darr);
 				if ($n == 3) {
 					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
 					//$icao = $Translation->checkTranslation($ident);
@@ -461,7 +461,7 @@ 
 				}
 			}
 			if (!$found) {
-				$n = sscanf($message,'MET01%4c',$airport);
+				$n = sscanf($message, 'MET01%4c', $airport);
 				if ($n == 1) {
 					if ($globalDebug) echo 'airport name : '.$airport;
 					$decode = array('Airport/Waypoint name' => $airport);
@@ -469,241 +469,241 @@ 
 				}
 			}
 			if ($label == 'H1') {
-				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
+				if (preg_match('/^#CFBFLR/', $message) || preg_match('/^#CFBWRN/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Equipment failure'), $decode);
 				}
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
+				elseif (preg_match('/^#DFB\*TKO/', $message) || preg_match('/^#DFBTKO/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Take off performance data'), $decode);
 				}
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
+				elseif (preg_match('/^#DFB\*CRZ/', $message) || preg_match('/^#DFBCRZ/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Cruise performance data'), $decode);
 				}
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
+				elseif (preg_match('/^#DFB\*WOB/', $message) || preg_match('/^#DFBWOB/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weather observation'), $decode);
 				}
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
+				elseif (preg_match(':^#DFB/PIREP:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Pilot Report'), $decode);
 				}
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
-					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
+				elseif (preg_match('/^#DFBEDA/', $message) || preg_match('/^#DFBENG/', $message)) {
+					$decode = array_merge(array('Message nature' => 'Engine Data'), $decode);
 				}
-				elseif (preg_match(':^#M1AAEP:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
+				elseif (preg_match(':^#M1AAEP:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Position/Weather Report'), $decode);
 				}
-				elseif (preg_match(':^#M2APWD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
+				elseif (preg_match(':^#M2APWD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'), $decode);
 				}
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
+				elseif (preg_match(':^#M1BREQPWI:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Predicted wind info request'), $decode);
 				}
-				elseif (preg_match(':^#CF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
+				elseif (preg_match(':^#CF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Central Fault Display'), $decode);
 				}
-				elseif (preg_match(':^#DF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
+				elseif (preg_match(':^#DF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'), $decode);
 				}
-				elseif (preg_match(':^#EC:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
+				elseif (preg_match(':^#EC:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Engine Display System'), $decode);
 				}
-				elseif (preg_match(':^#EI:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
+				elseif (preg_match(':^#EI:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Engine Report'), $decode);
 				}
-				elseif (preg_match(':^#H1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
+				elseif (preg_match(':^#H1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'), $decode);
 				}
-				elseif (preg_match(':^#H2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
+				elseif (preg_match(':^#H2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'), $decode);
 				}
-				elseif (preg_match(':^#HD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
+				elseif (preg_match(':^#HD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'), $decode);
 				}
-				elseif (preg_match(':^#M1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
+				elseif (preg_match(':^#M1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'), $decode);
 				}
-				elseif (preg_match(':^#M2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
+				elseif (preg_match(':^#M2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'), $decode);
 				}
-				elseif (preg_match(':^#M3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
+				elseif (preg_match(':^#M3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'), $decode);
 				}
-				elseif (preg_match(':^#MD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
+				elseif (preg_match(':^#MD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'), $decode);
 				}
-				elseif (preg_match(':^#PS:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
+				elseif (preg_match(':^#PS:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'), $decode);
 				}
-				elseif (preg_match(':^#S1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
+				elseif (preg_match(':^#S1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'SDU - Left'), $decode);
 				}
-				elseif (preg_match(':^#S2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
+				elseif (preg_match(':^#S2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'SDU - Right'), $decode);
 				}
-				elseif (preg_match(':^#SD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
+				elseif (preg_match(':^#SD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'SDU - Selected'), $decode);
 				}
-				elseif (preg_match(':^#T[0-8]:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
+				elseif (preg_match(':^#T[0-8]:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'), $decode);
 				}
-				elseif (preg_match(':^#WO:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
+				elseif (preg_match(':^#WO:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weather Observation Report'), $decode);
 				}
-				elseif (preg_match(':^#A1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
+				elseif (preg_match(':^#A1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'), $decode);
 				}
-				elseif (preg_match(':^#A3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
+				elseif (preg_match(':^#A3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'), $decode);
 				}
-				elseif (preg_match(':^#A4:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
+				elseif (preg_match(':^#A4:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Systems Message'), $decode);
 				}
-				elseif (preg_match(':^#A6:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
+				elseif (preg_match(':^#A6:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request ADS Reports'), $decode);
 				}
-				elseif (preg_match(':^#A8:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
+				elseif (preg_match(':^#A8:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'), $decode);
 				}
-				elseif (preg_match(':^#A9:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
+				elseif (preg_match(':^#A9:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATIS report'), $decode);
 				}
-				elseif (preg_match(':^#A0:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
+				elseif (preg_match(':^#A0:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'), $decode);
 				}
-				elseif (preg_match(':^#AA:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
+				elseif (preg_match(':^#AA:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
 				}
-				elseif (preg_match(':^#AB:',$message)) {
-					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
+				elseif (preg_match(':^#AB:', $message)) {
+					$decode = array_merge(array('Message nature' => 'TWIP Report'), $decode);
 				}
-				elseif (preg_match(':^#AC:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
+				elseif (preg_match(':^#AC:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance'), $decode);
 				}
-				elseif (preg_match(':^#AD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
+				elseif (preg_match(':^#AD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'), $decode);
 				}
-				elseif (preg_match(':^#AF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
+				elseif (preg_match(':^#AF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'CPC Command/Response'), $decode);
 				}
-				elseif (preg_match(':^#B1:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
+				elseif (preg_match(':^#B1:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'), $decode);
 				}
-				elseif (preg_match(':^#B2:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
+				elseif (preg_match(':^#B2:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'), $decode);
 				}
-				elseif (preg_match(':^#B3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
+				elseif (preg_match(':^#B3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'), $decode);
 				}
-				elseif (preg_match(':^#B4:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
+				elseif (preg_match(':^#B4:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'), $decode);
 				}
-				elseif (preg_match(':^#B6:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
+				elseif (preg_match(':^#B6:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Provide ADS Report'), $decode);
 				}
-				elseif (preg_match(':^#B8:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
+				elseif (preg_match(':^#B8:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request Departure Slot'), $decode);
 				}
-				elseif (preg_match(':^#B9:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
+				elseif (preg_match(':^#B9:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request ATIS Report'), $decode);
 				}
-				elseif (preg_match(':^#B0:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
+				elseif (preg_match(':^#B0:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'), $decode);
 				}
-				elseif (preg_match(':^#BA:',$message)) {
-					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
+				elseif (preg_match(':^#BA:', $message)) {
+					$decode = array_merge(array('Message nature' => 'ATCComm'), $decode);
 				}
-				elseif (preg_match(':^#BB:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
+				elseif (preg_match(':^#BB:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Request TWIP Report'), $decode);
 				}
-				elseif (preg_match(':^#BC:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
+				elseif (preg_match(':^#BC:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'), $decode);
 				}
-				elseif (preg_match(':^#BD:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
+				elseif (preg_match(':^#BD:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'), $decode);
 				}
-				elseif (preg_match(':^#BE:',$message)) {
-					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
+				elseif (preg_match(':^#BE:', $message)) {
+					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'), $decode);
 				}
-				elseif (preg_match(':^#BF:',$message)) {
-					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
+				elseif (preg_match(':^#BF:', $message)) {
+					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'), $decode);
 				}
-				elseif (preg_match(':^#H3:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
+				elseif (preg_match(':^#H3:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Icing Report'), $decode);
 				}
 			}
 			if ($label == '10') {
-				if (preg_match(':^DTO01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
+				if (preg_match(':^DTO01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'), $decode);
 				}
-				elseif (preg_match(':^AIS01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
+				elseif (preg_match(':^AIS01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'AIS Request'), $decode);
 				}
-				elseif (preg_match(':^FTX01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
+				elseif (preg_match(':^FTX01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Free Text Downlink'), $decode);
 				}
-				elseif (preg_match(':^FPL01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
+				elseif (preg_match(':^FPL01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Plan Request'), $decode);
 				}
-				elseif (preg_match(':^WAB01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
+				elseif (preg_match(':^WAB01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'), $decode);
 				}
-				elseif (preg_match(':^MET01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
+				elseif (preg_match(':^MET01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weather Data Request'), $decode);
 				}
-				elseif (preg_match(':^WAB02:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
+				elseif (preg_match(':^WAB02:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'), $decode);
 				}
 			}
 			if ($label == '15') {
-				if (preg_match(':^FST01:',$message)) {
-					$decode = array_merge(array('Message nature' => 'Flight Status Report'),$decode);
+				if (preg_match(':^FST01:', $message)) {
+					$decode = array_merge(array('Message nature' => 'Flight Status Report'), $decode);
 				}
 			}
 			if (!$found && $label == 'SA') {
-				$n = sscanf($message, "%d%c%c%6[0-9]", $version,$state,$type,$at);
+				$n = sscanf($message, "%d%c%c%6[0-9]", $version, $state, $type, $at);
 				if ($n == 4) {
 					$vsta = array('Version' => $version);
 					if ($state == 'E') {
-						$vsta = array_merge($vsta,array('Link state' => 'Established'));
+						$vsta = array_merge($vsta, array('Link state' => 'Established'));
 					}
 					elseif ($state == 'L') {
-						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
+						$vsta = array_merge($vsta, array('Link state' => 'Lost'));
 					}
 					else {
-						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
+						$vsta = array_merge($vsta, array('Link state' => 'Unknown'));
 					}
 					if ($type == 'V') {
-						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
+						$vsta = array_merge($vsta, array('Link type' => 'VHF ACARS'));
 					}
 					elseif ($type == 'S') {
-						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'Generic SATCOM'));
 					}
 					elseif ($type == 'H') {
-						$vsta = array_merge($vsta,array('Link type' => 'HF'));
+						$vsta = array_merge($vsta, array('Link type' => 'HF'));
 					}
 					elseif ($type == 'G') {
-						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'GlobalStar SATCOM'));
 					}
 					elseif ($type == 'C') {
-						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'ICO SATCOM'));
 					}
 					elseif ($type == '2') {
-						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
+						$vsta = array_merge($vsta, array('Link type' => 'VDL Mode 2'));
 					}
 					elseif ($type == 'X') {
-						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
+						$vsta = array_merge($vsta, array('Link type' => 'Inmarsat Aero'));
 					}
 					elseif ($type == 'I') {
-						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
+						$vsta = array_merge($vsta, array('Link type' => 'Irridium SATCOM'));
 					}
 					else {
-						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
+						$vsta = array_merge($vsta, array('Link type' => 'Unknown'));
 					}
-					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
-					$decode = array_merge($vsta,$decode);
+					$vsta = array_merge($vsta, array('Event occured at' => implode(':', str_split($at, 2))));
+					$decode = array_merge($vsta, $decode);
 				}
 			}
 
 			$title = $this->getTitlefromLabel($label);
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
+			if ($title != '') $decode = array_merge(array('Message title' => $title), $decode);
 			/*
 			// Business jets always use GS0001
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
@@ -731,13 +731,13 @@ 
 		$Translation = new Translation($this->db);
 		$message = $this->parse($data);
 		if (isset($message['registration']) && $message['registration'] != '' && $message['ident'] != '' && $message['registration'] != '!') {
-			$ident = (string)$message['ident'];
+			$ident = (string) $message['ident'];
 			$label = $message['label'];
 			$block_id = $message['block_id'];
 			$msg_no = $message['msg_no'];
 			$msg = $message['message'];
 			$decode = $message['decode'];
-			$registration = (string)$message['registration'];
+			$registration = (string) $message['registration'];
 			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
 			else $latitude = '';
 			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
@@ -751,20 +751,20 @@ 
 				$Image->addSpotterImage($registration);
 			}
 			// Business jets always use GS0001
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
+			if ($ident != 'GS0001') $info = $this->addModeSData($ident, $registration, $icao, $airicao, $latitude, $longitude);
 			if ($globalDebug && isset($info) && $info != '') echo $info;
 			if (count($decode) > 0) $decode_json = json_encode($decode);
 			else $decode_json = '';
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
-				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
+				$Schedule->addSchedule($icao, $decode['Departure airport'], $decode['Departure hour'], $decode['Arrival airport'], $decode['Arrival hour'], 'ACARS');
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
-				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
+				$Schedule->addSchedule($icao, $decode['Departure airport'], '', $decode['Arrival airport'], '', 'ACARS');
 			}
-			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
+			$result = $this->addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
+			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10', '80', '81', '82', '3F');
+			if ($result && in_array($label, $globalACARSArchive)) $this->addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $msg, $decode_json);
 			if ($globalDebug && count($decode) > 0) {
-				echo "Human readable data : ".implode(' - ',$decode)."\n";
+				echo "Human readable data : ".implode(' - ', $decode)."\n";
 			}
 		}
 	}
@@ -779,7 +779,7 @@ 
 	* @param String $msg_no Number of the ACARS message
 	* @param String $message ACARS message
 	*/
-	public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
+	public function addLiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
@@ -787,21 +787,21 @@ 
 			$this->db = $Connection->db;
 			if ($globalDebug) echo "Test if not already in Live ACARS table...";
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
-			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
+			$query_test_values = array(':ident' => $ident, ':registration' => $registration, ':message' => $message);
 			try {
 				$stht = $this->db->prepare($query_test);
 				$stht->execute($query_test_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 			if ($stht->fetchColumn() == 0) {
 				if ($globalDebug) echo "Add Live ACARS data...";
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
-				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
+				$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode, ':date' => date("Y-m-d H:i:s"));
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					return "error : ".$e->getMessage();
 				}
 			} else {
@@ -823,10 +823,10 @@ 
 	* @param String $msg_no Number of the ACARS message
 	* @param String $message ACARS message
 	*/
-	public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') {
+	public function addArchiveAcarsData($ident, $registration, $label, $block_id, $msg_no, $message, $decode = '') {
 		global $globalDebug;
 		date_default_timezone_set('UTC');
-		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/',$message) === 0 && preg_match('/^ARR0/',$message) === 0 && preg_match('/^ETA/',$message) === 0 && preg_match('/^WXR/',$message) === 0 && preg_match('/^FTX01.FIC/',$message) === 0) {
+		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '' && preg_match('/^MET0/', $message) === 0 && preg_match('/^ARR0/', $message) === 0 && preg_match('/^ETA/', $message) === 0 && preg_match('/^WXR/', $message) === 0 && preg_match('/^FTX01.FIC/', $message) === 0) {
 			/*
 				    if ($globalDebug) echo "Test if not already in Archive ACARS table...";
 			    	    $query_test = "SELECT COUNT(*) as nb FROM acars_archive WHERE ident = :ident AND registration = :registration AND message = :message";
@@ -841,11 +841,11 @@ 
 			*/
 			if ($globalDebug) echo "Add Live ACARS data...";
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
-			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
+			$query_values = array(':ident' => $ident, ':registration' => $registration, ':label' => $label, ':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
 			try {
 				$sth = $this->db->prepare($query);
 				$sth->execute($query_values);
-			} catch(PDOException $e) {
+			} catch (PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
 			if ($globalDebug) echo "Done\n";
@@ -866,7 +866,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			die;
 		}
@@ -886,7 +886,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			die;
 		}
@@ -907,7 +907,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error : ".$e->getMessage();
 			die;
 		}
@@ -921,7 +921,7 @@ 
 	*
 	* @return Array Return ACARS data in array
 	*/
-	public function getLatestAcarsData($limit = '',$label = '') {
+	public function getLatestAcarsData($limit = '', $label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
@@ -932,8 +932,8 @@ 
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -949,46 +949,46 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 		$i = 0;
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$data = array();
 			if ($row['registration'] != '') {
-				$row['registration'] = str_replace('.','',$row['registration']);
+				$row['registration'] = str_replace('.', '', $row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+				else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
+			} else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 			if ($row['registration'] == '') $row['registration'] = 'NA';
 			if ($row['ident'] == '') $row['ident'] = 'NA';
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
 			if (isset($identicao[0])) {
-				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+				if (substr($row['ident'], 0, 2) == 'AF') {
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 			} else $icao = $row['ident'];
-			$icao = $Translation->checkTranslation($icao,false);
-			$decode = json_decode($row['decode'],true);
+			$icao = $Translation->checkTranslation($icao, false);
+			$decode = json_decode($row['decode'], true);
 			$found = false;
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 					$found = true;
 				}
 			}
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 					$found = true;
 				}
 			}
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
@@ -996,7 +996,7 @@ 
 				}
 			}
 			if ($found) $row['decode'] = json_encode($decode);
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
 		}
@@ -1012,7 +1012,7 @@ 
 	*
 	* @return Array Return ACARS data in array
 	*/
-	public function getArchiveAcarsData($limit = '',$label = '') {
+	public function getArchiveAcarsData($limit = '', $label = '') {
 		global $globalURL, $globalDBdriver;
 		$Image = new Image($this->db);
 		$Spotter = new Spotter($this->db);
@@ -1022,8 +1022,8 @@ 
 		if ($limit != "")
 		{
 			$limit_array = explode(",", $limit);
-			$limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT);
-			$limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT);
+			$limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT);
 			if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
 			{
 				$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
@@ -1044,43 +1044,43 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
-		$i=0;
+		$i = 0;
 		while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
 			$data = array();
 			if ($row['registration'] != '') {
-				$row['registration'] = str_replace('.','',$row['registration']);
+				$row['registration'] = str_replace('.', '', $row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) $data = array_merge($data, array('image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website']));
+				else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
+			} else $data = array_merge($data, array('image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => ''));
 			$icao = '';
 			if ($row['registration'] == '') $row['registration'] = 'NA';
 			if ($row['ident'] == '') $row['ident'] = 'NA';
-			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
+			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 2));
 			if (isset($identicao[0])) {
-				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
-				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
+				if (substr($row['ident'], 0, 2) == 'AF') {
+					if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
+					else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0');
+				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0');
+				$data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name']));
 			} else $icao = $row['ident'];
 			$icao = $Translation->checkTranslation($icao);
-			$decode = json_decode($row['decode'],true);
+			$decode = json_decode($row['decode'], true);
 			$found = false;
-			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
+			if ($decode != '' && array_key_exists('Departure airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
 				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 				$found = true;
 			}
-			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
+			if ($decode != '' && array_key_exists('Arrival airport', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
 				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
 				$found = true;
 			}
-			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
+			if ($decode != '' && array_key_exists('Airport/Waypoint name', $decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Airport/Waypoint name']);
 				if (isset($airport_info[0]['icao'])) {
 					$decode['Airport/Waypoint name'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
@@ -1088,7 +1088,7 @@ 
 				}
 			}
 			if ($found) $row['decode'] = json_encode($decode);
-			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
+			$data = array_merge($data, array('registration' => $row['registration'], 'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
 		}
@@ -1106,7 +1106,7 @@ 
 	* @param String $icao
 	* @param String $ICAOTypeCode
 	*/
-	public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') {
+	public function addModeSData($ident, $registration, $icao = '', $ICAOTypeCode = '', $latitude = '', $longitude = '') {
 		global $globalDebug, $globalDBdriver;
 		$ident = trim($ident);
 		$Translation = new Translation($this->db);
@@ -1119,7 +1119,7 @@ 
 			if ($globalDebug) echo "Ident or registration null, exit\n";
 			return '';
 		}
-		$registration = str_replace('.','',$registration);
+		$registration = str_replace('.', '', $registration);
 		$ident = $Translation->ident2icao($ident);
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
 		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
@@ -1128,7 +1128,7 @@ 
 		try {
 			$sthsi = $this->db->prepare($querysi);
 			$sthsi->execute($querysi_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalDebug) echo $e->getMessage();
 			return "error : ".$e->getMessage();
 		}
@@ -1138,8 +1138,8 @@ 
 			$Translation = new Translation($this->db);
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
 			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
+			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'], $ident, 'ACARS');
+			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'], $ident, 'ACARS');
 		} else {
 			if ($registration != '' && $latitude != '' && $longitude != '') {
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1147,7 +1147,7 @@ 
 				try {
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					if ($globalDebug) echo $e->getMessage();
 					return "error : ".$e->getMessage();
 				}
@@ -1155,7 +1155,7 @@ 
 				$sth->closeCursor();
 				if (isset($result['modes'])) $hex = $result['modes'];
 				else $hex = '';
-				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
+				$SI_data = array('hex' => $hex, 'ident' => $ident, 'aircraft_icao' => $ICAOTypeCode, 'registration' => $registration, 'latitude' => $latitude, '$longitude' => $longitude, 'format_source' => 'ACARS');
 				$this->SI->add($SI_data);
 			}
 		}
@@ -1165,7 +1165,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			if ($globalDebug) echo $e->getMessage();
 			return "error : ".$e->getMessage();
 		}
@@ -1175,7 +1175,7 @@ 
 			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
 			else $ModeS = '';
 			if ($ModeS == '') {
-				$id = explode('-',$result['flightaware_id']);
+				$id = explode('-', $result['flightaware_id']);
 				$ModeS = $id[0];
 			}
 			if ($ModeS != '') {
@@ -1185,20 +1185,20 @@ 
 				try {
 					$sthc = $this->db->prepare($queryc);
 					$sthc->execute($queryc_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					if ($globalDebug) echo $e->getMessage();
 					return "error : ".$e->getMessage();
 				}
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
 				$sthc->closeCursor();
-				if (count($row) ==  0) {
+				if (count($row) == 0) {
 					if ($globalDebug) echo " Add to ModeS table - ";
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
-					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
+					$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 					try {
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						if ($globalDebug) echo $e->getMessage();
 						return "error : ".$e->getMessage();
 					}
@@ -1206,15 +1206,15 @@ 
 					if ($globalDebug) echo " Update ModeS table - ";
 					if ($ICAOTypeCode != '') {
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 					} else {
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
-						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration);
+						$queryi_values = array(':ModeS' => $ModeS, ':ModeSCountry' => $country, ':Registration' => $registration);
 					}
 					try {
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
-					} catch(PDOException $e) {
+					} catch (PDOException $e) {
 						if ($globalDebug) echo $e->getMessage();
 						return "error : ".$e->getMessage();
 					}
@@ -1251,12 +1251,12 @@ 
 					elseif ($globalDBdriver == 'pgsql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
 					}
-					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
+					$queryi_values = array(':Registration' => $registration, ':ident' => $icao);
 				}
 				try {
 					$sthi = $this->db->prepare($queryi);
 					$sthi->execute($queryi_values);
-				} catch(PDOException $e) {
+				} catch (PDOException $e) {
 					if ($globalDebug) echo $e->getMessage();
 					return "error : ".$e->getMessage();
 				}

Braces +409 added lines, -261 removed lines

@@ -23,14 +23,19 @@ 
 	*/
 	public function ident2icao($ident) {
 		if (substr($ident,0,2) == 'AF') {
-			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident;
-			else $icao = 'AFR'.ltrim(substr($ident,2),'0');
+			if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+				$icao = $ident;
+			} else {
+				$icao = 'AFR'.ltrim(substr($ident,2),'0');
+			}
 		} else {
 			$Spotter = new Spotter($this->db);
 			$identicao = $Spotter->getAllAirlineInfo(substr($ident,0,2));
 			if (isset($identicao[0])) {
 				$icao = $identicao[0]['icao'].ltrim(substr($ident,2),'0');
-			} else $icao = $ident;
+			} else {
+				$icao = $ident;
+			}
 		}
 		return $icao;
 	}
@@ -103,14 +108,24 @@ 
 		$message = '';
 		$result = array();
 		$n = sscanf($data,'(null) %*d %*02d/%*02d/%*04d %*02d:%*02d:%*02d %*d %*[0-9-] %*[A-Z0-9] %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
-		if ($n == 0) $n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		if ($n == 0) {
+			$n = sscanf($data,'AC%*c %7s %*c %2[0-9a-zA-Z_] %d %4[0-9A-Z] %6[0-9A-Z] %[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
+		if ($n == 0) {
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%6[0-9A-Z-],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
+		if ($n == 0) {
+			$n = sscanf($data,'%*04d-%*02d-%*02d,%*02d:%*02d:%*02d,%*7s,%*c,%5[0-9A-Z],%*c,%2[0-9a-zA-Z_],%d,%4[0-9A-Z],%6[0-9A-Z],%[^\r\n]',$registration,$label,$block_id,$msg_no,$ident,$message);
+		}
 		if ($n != 0) {
 			$registration = str_replace('.','',$registration);
 			$result = array('registration' => $registration, 'ident' => $ident,'label' => $label, 'block_id' => $block_id,'msg_no' => $msg_no,'message' => $message);
-			if ($globalDebug) echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
-		} else $message = $data;
+			if ($globalDebug) {
+				echo "Reg. : ".$registration." - Ident : ".$ident." - Label : ".$label." - Message : ".$message."\n";
+			}
+		} else {
+			$message = $data;
+		}
 		$decode = array();
 		$found = false;
 //		if ($registration != '' && $ident != '' && $registration != '!') {
@@ -130,12 +145,21 @@ 
 				if ($n > 5 && ($lac == 'N' || $lac == 'S') && ($lnc == 'E' || $lnc == 'W')) {
 					$latitude = $la / 10000.0;
 					$longitude = $ln / 10000.0;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
 					// Temp not always available
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
-					if ($temp == '') $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
-					else $decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
+					if ($globalDebug) {
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude.' - airport depart : '.$dair.' - airport arrival : '.$darr.' - température : '.$temp."°C\n";
+					}
+					if ($temp == '') {
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr,'Altitude' => $alt);
+					} else {
+						$decode = array('Latitude' => $latitude, 'Longitude' =>  $longitude, 'Departure airport' => $dair, 'Arrival airport' => $darr, 'Altitude' => 'FL'.$alt,'Temperature' => $temp.'°C');
+					}
 
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -149,25 +173,35 @@ 
 				$ahour = '';
 				$n = sscanf($message, "ARR01 %4[A-Z]%4d %4[A-Z]%4d", $dair, $dhour, $darr,$ahour);
 				if ($n == 4 && strlen($darr) == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
-					if ($globalDebug) echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
+					if ($dhour != '') {
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+					}
+					if ($ahour != '') {
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					}
+					if ($globalDebug) {
+						echo 'departure airport : '.$dair.' - arrival airport : '. $darr.' - departure hour : '. $dhour.' - arrival hour : '.$ahour."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
 					$decode = array('Departure airport' => $dair, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour);
 					$found = true;
-				}
-				elseif ($n == 2 || $n  == 4) {
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($globalDebug) echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
+				} elseif ($n == 2 || $n  == 4) {
+					if ($dhour != '') {
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+					}
+					if ($globalDebug) {
+						echo 'airport arrival : '.$dair.' - arrival hour : '.$dhour."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					$decode = array('Arrival airport' => $dair, 'Arrival hour' => $dhour);
 					$found = true;
-				}
-				elseif ($n == 1) {
-					if ($globalDebug) echo 'airport arrival : '.$darr."\n";
+				} elseif ($n == 1) {
+					if ($globalDebug) {
+						echo 'airport arrival : '.$darr."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					$decode = array('Arrival airport' => $darr);
@@ -185,7 +219,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%4c,%4c,%*7s,%*d", $dair, $darr);
 				if ($n == 4) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = ACARS->ident2icao($ident);
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -219,14 +255,23 @@ 
 				$apiste = '';
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z]/%*3d/%4s/%*cSCH/%6[0-9A-Z ]/%4c/%4c/%5s/%4d%*3c/%4d/%4c/%[0-9A-Z ]/", $airicao,$aident,$dair, $darr, $ddate, $dhour,$ahour, $aair, $apiste);
 				if ($n > 8) {
-					if ($globalDebug) echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
-					if ($dhour != '') $dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
-					if ($ahour != '') $ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					if ($globalDebug) {
+						echo 'airicao : '. $airicao.' - ident : '.$aident.' - departure airport : '.$dair.' - arrival airport : '. $darr.' - date depart : '.$ddate.' - departure hour : '. $dhour.' - arrival hour : '.$ahour.' - arrival airport : '.$aair.' - arrival piste : '.$apiste."\n";
+					}
+					if ($dhour != '') {
+						$dhour = substr(sprintf('%04d',$dhour),0,2).':'.substr(sprintf('%04d',$dhour),2);
+					}
+					if ($ahour != '') {
+						$ahour = substr(sprintf('%04d',$ahour),0,2).':'.substr(sprintf('%04d',$ahour),2);
+					}
 					$icao = trim($aident);
 
 					//$decode = 'Departure airport : '.$dair.' ('.$ddate.' at '.$dhour.') - Arrival Airport : '.$aair.' (at '.$ahour.') way '.$apiste;
-					if ($ahour == '') $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
-					else $decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
+					if ($ahour == '') {
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr);
+					} else {
+						$decode = array('Departure airport' => $dair, 'Departure date' => $ddate, 'Departure hour' => $dhour, 'Arrival airport' => $darr, 'Arrival hour' => $ahour, 'Arrival way' => $apiste);
+					}
 					//$Schedule->addSchedule($icao,$dair,$dhour,$darr,$ahour,'ACARS');
 					$decode['icao'] = $icao;
 					$found = true;
@@ -248,9 +293,15 @@ 
 					$lns = $lns.'.'.$lns;
 					$latitude = $las / 1000.0;
 					$longitude = $lns / 1000.0;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
-					if ($globalDebug) echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
+					if ($globalDebug) {
+						echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
+					}
 					$decode = array('Latitude' => $latitude, 'Longitude' => $longitude);
 					$found = true;
 				}
@@ -268,7 +319,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*[0-9A-Z ]/%*s %4c/%4c .", $dair, $darr);
 				if ($n == 4) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -281,7 +334,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*[0-9],%4c,%4c,", $dair, $darr);
 				if ($n == 4) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -294,7 +349,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "002AF %4c %4c ", $dair, $darr);
 				if ($n == 2) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
@@ -308,7 +365,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "#DFBA%*02d/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
 				if ($n == 6) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -321,7 +380,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "#DFBA%*02d/%*[0-9A-Z,]/%*[A-Z-],%*[0-9A-Z],%*d,%4c,%4c", $dair, $darr);
 				if ($n == 7) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -349,8 +410,12 @@ 
 					$decode['icao'] = $icao;
 					$latitude = $las / 100.0;
 					$longitude = $lns / 100.0;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
 
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude,'Altitude' => 'FL'.$alt,'Fuel' => $fuel,'speed' => $speed);
 					$found = true;
@@ -368,8 +433,12 @@ 
 				if ($n == 4) {
 					$latitude = $las;
 					$longitude = $lns;
-					if ($lac == 'S') $latitude = '-'.$latitude;
-					if ($lnc == 'W') $longitude = '-'.$longitude;
+					if ($lac == 'S') {
+						$latitude = '-'.$latitude;
+					}
+					if ($lnc == 'W') {
+						$longitude = '-'.$longitude;
+					}
 
 					$decode = array('Latitude' => $latitude,'Longitude' => $longitude);
 					$found = true;
@@ -385,7 +454,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*[0-9A-Z] NLINFO %*d/%*d %4c/%4c .", $dair, $darr);
 				if ($n == 5) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -406,7 +477,9 @@ 
 				$aident = '';
 				$n = sscanf(str_replace(array("\r\n", "\n", "\r"),'',$message), "%*[0-9A-Z],,%*[0-9A-Z],%*[0-9A-Z],%4s,%4s,.%*6s,%*4[A-Z],%[0-9A-Z],", $dair, $darr, $aident);
 				if ($n == 8) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					$icao = trim($aident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode['icao'] = $icao;
@@ -423,7 +496,9 @@ 
 				$darr = '';
 				$n = sscanf($message, "%*d/%*d %4s/%4s .%*6s", $dair, $darr);
 				if ($n == 5) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -438,7 +513,9 @@ 
 				$darr = '';
 				$n = sscanf($message,'%4[A-Z]%4[A-Z]%*4d',$dair,$darr);
 				if ($n == 3) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -453,7 +530,9 @@ 
 				$darr = '';
 				$n = sscanf($message,'3J01 DSPTCH %*d/%*d %4s/%4s .%*6s',$dair,$darr);
 				if ($n == 3) {
-					if ($globalDebug) echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					if ($globalDebug) {
+						echo 'airport depart : '.$dair.' - airport arrival : '.$darr."\n";
+					}
 					//$icao = $Translation->checkTranslation($ident);
 					//$Schedule->addSchedule($icao,$dair,'',$darr,'','ACARS');
 					$decode = array('Departure airport' => $dair, 'Arrival airport' => $darr);
@@ -463,7 +542,9 @@ 
 			if (!$found) {
 				$n = sscanf($message,'MET01%4c',$airport);
 				if ($n == 1) {
-					if ($globalDebug) echo 'airport name : '.$airport;
+					if ($globalDebug) {
+						echo 'airport name : '.$airport;
+					}
 					$decode = array('Airport/Waypoint name' => $airport);
 					$found = true;
 				}
@@ -471,184 +552,126 @@ 
 			if ($label == 'H1') {
 				if (preg_match('/^#CFBFLR/',$message) || preg_match('/^#CFBWRN/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Equipment failure'),$decode);
-				}
-				elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
+				} elseif (preg_match('/^#DFB\*TKO/',$message) || preg_match('/^#DFBTKO/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Take off performance data'),$decode);
-				}
-				elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
+				} elseif (preg_match('/^#DFB\*CRZ/',$message) || preg_match('/^#DFBCRZ/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Cruise performance data'),$decode);
-				}
-				elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
+				} elseif (preg_match('/^#DFB\*WOB/',$message) || preg_match('/^#DFBWOB/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weather observation'),$decode);
-				}
-				elseif (preg_match(':^#DFB/PIREP:',$message)) {
+				} elseif (preg_match(':^#DFB/PIREP:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Pilot Report'),$decode);
-				}
-				elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
+				} elseif (preg_match('/^#DFBEDA/',$message) || preg_match('/^#DFBENG/',$message)) {
 					$decode = array_merge(array('Message nature' => 'Engine Data'),$decode);
-				}
-				elseif (preg_match(':^#M1AAEP:',$message)) {
+				} elseif (preg_match(':^#M1AAEP:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Position/Weather Report'),$decode);
-				}
-				elseif (preg_match(':^#M2APWD:',$message)) {
+				} elseif (preg_match(':^#M2APWD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight plan predicted wind data'),$decode);
-				}
-				elseif (preg_match(':^#M1BREQPWI:',$message)) {
+				} elseif (preg_match(':^#M1BREQPWI:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Predicted wind info request'),$decode);
-				}
-				elseif (preg_match(':^#CF:',$message)) {
+				} elseif (preg_match(':^#CF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Central Fault Display'),$decode);
-				}
-				elseif (preg_match(':^#DF:',$message)) {
+				} elseif (preg_match(':^#DF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Digital Flight Data Acquisition Unit'),$decode);
-				}
-				elseif (preg_match(':^#EC:',$message)) {
+				} elseif (preg_match(':^#EC:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Engine Display System'),$decode);
-				}
-				elseif (preg_match(':^#EI:',$message)) {
+				} elseif (preg_match(':^#EI:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Engine Report'),$decode);
-				}
-				elseif (preg_match(':^#H1:',$message)) {
+				} elseif (preg_match(':^#H1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Left'),$decode);
-				}
-				elseif (preg_match(':^#H2:',$message)) {
+				} elseif (preg_match(':^#H2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Right'),$decode);
-				}
-				elseif (preg_match(':^#HD:',$message)) {
+				} elseif (preg_match(':^#HD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'HF Data Radio - Selected'),$decode);
-				}
-				elseif (preg_match(':^#M1:',$message)) {
+				} elseif (preg_match(':^#M1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Left'),$decode);
-				}
-				elseif (preg_match(':^#M2:',$message)) {
+				} elseif (preg_match(':^#M2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Right'),$decode);
-				}
-				elseif (preg_match(':^#M3:',$message)) {
+				} elseif (preg_match(':^#M3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Center'),$decode);
-				}
-				elseif (preg_match(':^#MD:',$message)) {
+				} elseif (preg_match(':^#MD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Management Computer - Selected'),$decode);
-				}
-				elseif (preg_match(':^#PS:',$message)) {
+				} elseif (preg_match(':^#PS:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Keyboard/Display Unit'),$decode);
-				}
-				elseif (preg_match(':^#S1:',$message)) {
+				} elseif (preg_match(':^#S1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'SDU - Left'),$decode);
-				}
-				elseif (preg_match(':^#S2:',$message)) {
+				} elseif (preg_match(':^#S2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'SDU - Right'),$decode);
-				}
-				elseif (preg_match(':^#SD:',$message)) {
+				} elseif (preg_match(':^#SD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'SDU - Selected'),$decode);
-				}
-				elseif (preg_match(':^#T[0-8]:',$message)) {
+				} elseif (preg_match(':^#T[0-8]:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Cabin Terminal Messages'),$decode);
-				}
-				elseif (preg_match(':^#WO:',$message)) {
+				} elseif (preg_match(':^#WO:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weather Observation Report'),$decode);
-				}
-				elseif (preg_match(':^#A1:',$message)) {
+				} elseif (preg_match(':^#A1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance'),$decode);
-				}
-				elseif (preg_match(':^#A3:',$message)) {
+				} elseif (preg_match(':^#A3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Response'),$decode);
-				}
-				elseif (preg_match(':^#A4:',$message)) {
+				} elseif (preg_match(':^#A4:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Systems Message'),$decode);
-				}
-				elseif (preg_match(':^#A6:',$message)) {
+				} elseif (preg_match(':^#A6:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request ADS Reports'),$decode);
-				}
-				elseif (preg_match(':^#A8:',$message)) {
+				} elseif (preg_match(':^#A8:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Deliver Departure Slot'),$decode);
-				}
-				elseif (preg_match(':^#A9:',$message)) {
+				} elseif (preg_match(':^#A9:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATIS report'),$decode);
-				}
-				elseif (preg_match(':^#A0:',$message)) {
+				} elseif (preg_match(':^#A0:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATIS Facility Notification (AFN)'),$decode);
-				}
-				elseif (preg_match(':^#AA:',$message)) {
+				} elseif (preg_match(':^#AA:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
-				}
-				elseif (preg_match(':^#AB:',$message)) {
+				} elseif (preg_match(':^#AB:',$message)) {
 					$decode = array_merge(array('Message nature' => 'TWIP Report'),$decode);
-				}
-				elseif (preg_match(':^#AC:',$message)) {
+				} elseif (preg_match(':^#AC:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance'),$decode);
-				}
-				elseif (preg_match(':^#AD:',$message)) {
+				} elseif (preg_match(':^#AD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance'),$decode);
-				}
-				elseif (preg_match(':^#AF:',$message)) {
+				} elseif (preg_match(':^#AF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'CPC Command/Response'),$decode);
-				}
-				elseif (preg_match(':^#B1:',$message)) {
+				} elseif (preg_match(':^#B1:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request Oceanic Clearance'),$decode);
-				}
-				elseif (preg_match(':^#B2:',$message)) {
+				} elseif (preg_match(':^#B2:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Oceanic Clearance Readback'),$decode);
-				}
-				elseif (preg_match(':^#B3:',$message)) {
+				} elseif (preg_match(':^#B3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request Departure Clearance'),$decode);
-				}
-				elseif (preg_match(':^#B4:',$message)) {
+				} elseif (preg_match(':^#B4:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Departure Clearance Readback'),$decode);
-				}
-				elseif (preg_match(':^#B6:',$message)) {
+				} elseif (preg_match(':^#B6:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Provide ADS Report'),$decode);
-				}
-				elseif (preg_match(':^#B8:',$message)) {
+				} elseif (preg_match(':^#B8:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request Departure Slot'),$decode);
-				}
-				elseif (preg_match(':^#B9:',$message)) {
+				} elseif (preg_match(':^#B9:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request ATIS Report'),$decode);
-				}
-				elseif (preg_match(':^#B0:',$message)) {
+				} elseif (preg_match(':^#B0:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATS Facility Notification'),$decode);
-				}
-				elseif (preg_match(':^#BA:',$message)) {
+				} elseif (preg_match(':^#BA:',$message)) {
 					$decode = array_merge(array('Message nature' => 'ATCComm'),$decode);
-				}
-				elseif (preg_match(':^#BB:',$message)) {
+				} elseif (preg_match(':^#BB:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Request TWIP Report'),$decode);
-				}
-				elseif (preg_match(':^#BC:',$message)) {
+				} elseif (preg_match(':^#BC:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Pushback Clearance Request'),$decode);
-				}
-				elseif (preg_match(':^#BD:',$message)) {
+				} elseif (preg_match(':^#BD:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Expected Taxi Clearance Request'),$decode);
-				}
-				elseif (preg_match(':^#BE:',$message)) {
+				} elseif (preg_match(':^#BE:',$message)) {
 					$decode = array_merge(array('Message nature' => 'CPC Aircraft Log-On/Off Request'),$decode);
-				}
-				elseif (preg_match(':^#BF:',$message)) {
+				} elseif (preg_match(':^#BF:',$message)) {
 					$decode = array_merge(array('Message nature' => 'CPC WILCO/UNABLE Response'),$decode);
-				}
-				elseif (preg_match(':^#H3:',$message)) {
+				} elseif (preg_match(':^#H3:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Icing Report'),$decode);
 				}
 			}
 			if ($label == '10') {
 				if (preg_match(':^DTO01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Delayed Takeoff Report'),$decode);
-				}
-				elseif (preg_match(':^AIS01:',$message)) {
+				} elseif (preg_match(':^AIS01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'AIS Request'),$decode);
-				}
-				elseif (preg_match(':^FTX01:',$message)) {
+				} elseif (preg_match(':^FTX01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Free Text Downlink'),$decode);
-				}
-				elseif (preg_match(':^FPL01:',$message)) {
+				} elseif (preg_match(':^FPL01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Flight Plan Request'),$decode);
-				}
-				elseif (preg_match(':^WAB01:',$message)) {
+				} elseif (preg_match(':^WAB01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weight & Balance Request'),$decode);
-				}
-				elseif (preg_match(':^MET01:',$message)) {
+				} elseif (preg_match(':^MET01:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weather Data Request'),$decode);
-				}
-				elseif (preg_match(':^WAB02:',$message)) {
+				} elseif (preg_match(':^WAB02:',$message)) {
 					$decode = array_merge(array('Message nature' => 'Weight and Balance Acknowledgement'),$decode);
 				}
 			}
@@ -663,38 +686,28 @@ 
 					$vsta = array('Version' => $version);
 					if ($state == 'E') {
 						$vsta = array_merge($vsta,array('Link state' => 'Established'));
-					}
-					elseif ($state == 'L') {
+					} elseif ($state == 'L') {
 						$vsta = array_merge($vsta,array('Link state' => 'Lost'));
-					}
-					else {
+					} else {
 						$vsta = array_merge($vsta,array('Link state' => 'Unknown'));
 					}
 					if ($type == 'V') {
 						$vsta = array_merge($vsta,array('Link type' => 'VHF ACARS'));
-					}
-					elseif ($type == 'S') {
+					} elseif ($type == 'S') {
 						$vsta = array_merge($vsta,array('Link type' => 'Generic SATCOM'));
-					}
-					elseif ($type == 'H') {
+					} elseif ($type == 'H') {
 						$vsta = array_merge($vsta,array('Link type' => 'HF'));
-					}
-					elseif ($type == 'G') {
+					} elseif ($type == 'G') {
 						$vsta = array_merge($vsta,array('Link type' => 'GlobalStar SATCOM'));
-					}
-					elseif ($type == 'C') {
+					} elseif ($type == 'C') {
 						$vsta = array_merge($vsta,array('Link type' => 'ICO SATCOM'));
-					}
-					elseif ($type == '2') {
+					} elseif ($type == '2') {
 						$vsta = array_merge($vsta,array('Link type' => 'VDL Mode 2'));
-					}
-					elseif ($type == 'X') {
+					} elseif ($type == 'X') {
 						$vsta = array_merge($vsta,array('Link type' => 'Inmarsat Aero'));
-					}
-					elseif ($type == 'I') {
+					} elseif ($type == 'I') {
 						$vsta = array_merge($vsta,array('Link type' => 'Irridium SATCOM'));
-					}
-					else {
+					} else {
 						$vsta = array_merge($vsta,array('Link type' => 'Unknown'));
 					}
 					$vsta = array_merge($vsta,array('Event occured at' => implode(':',str_split($at,2))));
@@ -703,7 +716,9 @@ 
 			}
 
 			$title = $this->getTitlefromLabel($label);
-			if ($title != '') $decode = array_merge(array('Message title' => $title),$decode);
+			if ($title != '') {
+				$decode = array_merge(array('Message title' => $title),$decode);
+			}
 			/*
 			// Business jets always use GS0001
 			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
@@ -738,31 +753,54 @@ 
 			$msg = $message['message'];
 			$decode = $message['decode'];
 			$registration = (string)$message['registration'];
-			if (isset($decode['latitude'])) $latitude = $decode['latitude'];
-			else $latitude = '';
-			if (isset($decode['longitude'])) $longitude = $decode['longitude'];
-			else $longitude = '';
-			if (isset($decode['airicao'])) $airicao = $decode['airicao'];
-			else $airicao = '';
-			if (isset($decode['icao'])) $icao = $decode['icao'];
-			else $icao = $Translation->checkTranslation($ident);
+			if (isset($decode['latitude'])) {
+				$latitude = $decode['latitude'];
+			} else {
+				$latitude = '';
+			}
+			if (isset($decode['longitude'])) {
+				$longitude = $decode['longitude'];
+			} else {
+				$longitude = '';
+			}
+			if (isset($decode['airicao'])) {
+				$airicao = $decode['airicao'];
+			} else {
+				$airicao = '';
+			}
+			if (isset($decode['icao'])) {
+				$icao = $decode['icao'];
+			} else {
+				$icao = $Translation->checkTranslation($ident);
+			}
 			$image_array = $Image->getSpotterImage($registration);
 			if (!isset($image_array[0]['registration'])) {
 				$Image->addSpotterImage($registration);
 			}
 			// Business jets always use GS0001
-			if ($ident != 'GS0001') $info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
-			if ($globalDebug && isset($info) && $info != '') echo $info;
-			if (count($decode) > 0) $decode_json = json_encode($decode);
-			else $decode_json = '';
+			if ($ident != 'GS0001') {
+				$info = $this->addModeSData($ident,$registration,$icao,$airicao,$latitude,$longitude);
+			}
+			if ($globalDebug && isset($info) && $info != '') {
+				echo $info;
+			}
+			if (count($decode) > 0) {
+				$decode_json = json_encode($decode);
+			} else {
+				$decode_json = '';
+			}
 			if (isset($decode['Departure airport']) && isset($decode['Departure hour']) && isset($decode['Arrival airport']) && isset($decode['Arrival hour'])) {
 				$Schedule->addSchedule($icao,$decode['Departure airport'],$decode['Departure hour'],$decode['Arrival airport'],$decode['Arrival hour'],'ACARS');
 			} elseif (isset($decode['Departure airport']) && isset($decode['Arrival airport'])) {
 				$Schedule->addSchedule($icao,$decode['Departure airport'],'',$decode['Arrival airport'],'','ACARS');
 			}
 			$result = $this->addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
-			if (!isset($globalACARSArchive)) $globalACARSArchive = array('10','80','81','82','3F');
-			if ($result && in_array($label,$globalACARSArchive)) $this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
+			if (!isset($globalACARSArchive)) {
+				$globalACARSArchive = array('10','80','81','82','3F');
+			}
+			if ($result && in_array($label,$globalACARSArchive)) {
+				$this->addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$msg,$decode_json);
+			}
 			if ($globalDebug && count($decode) > 0) {
 				echo "Human readable data : ".implode(' - ',$decode)."\n";
 			}
@@ -785,7 +823,9 @@ 
 		if ($label != 'SQ' && $label != 'Q0' && $label != '_d' && $message != '') {
 			$Connection = new Connection($this->db);
 			$this->db = $Connection->db;
-			if ($globalDebug) echo "Test if not already in Live ACARS table...";
+			if ($globalDebug) {
+				echo "Test if not already in Live ACARS table...";
+			}
 			$query_test = "SELECT COUNT(*) as nb FROM acars_live WHERE ident = :ident AND registration = :registration AND message = :message";
 			$query_test_values = array(':ident' => $ident,':registration' => $registration, ':message' => $message);
 			try {
@@ -795,7 +835,9 @@ 
 				return "error : ".$e->getMessage();
 			}
 			if ($stht->fetchColumn() == 0) {
-				if ($globalDebug) echo "Add Live ACARS data...";
+				if ($globalDebug) {
+					echo "Add Live ACARS data...";
+				}
 				$query = "INSERT INTO acars_live (ident,registration,label,block_id,msg_no,message,decode,date) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode,:date)";
 				$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode,':date' => date("Y-m-d H:i:s"));
 				try {
@@ -805,10 +847,14 @@ 
 					return "error : ".$e->getMessage();
 				}
 			} else {
-				if ($globalDebug) echo "Data already in DB...\n";
+				if ($globalDebug) {
+					echo "Data already in DB...\n";
+				}
 				return false;
 			}
-			if ($globalDebug) echo "Done\n";
+			if ($globalDebug) {
+				echo "Done\n";
+			}
 			return true;
 		}
 	}
@@ -839,7 +885,9 @@ 
 			    	    }
 				    if ($stht->fetchColumn() == 0) {
 			*/
-			if ($globalDebug) echo "Add Live ACARS data...";
+			if ($globalDebug) {
+				echo "Add Live ACARS data...";
+			}
 			$query = "INSERT INTO acars_archive (ident,registration,label,block_id,msg_no,message,decode) VALUES (:ident,:registration,:label,:block_id,:msg_no,:message,:decode)";
 			$query_values = array(':ident' => $ident,':registration' => $registration, ':label' => $label,':block_id' => $block_id, ':msg_no' => $msg_no, ':message' => $message, ':decode' => $decode);
 			try {
@@ -848,7 +896,9 @@ 
 			} catch(PDOException $e) {
 				return "error : ".$e->getMessage();
 			}
-			if ($globalDebug) echo "Done\n";
+			if ($globalDebug) {
+				echo "Done\n";
+			}
 		}
 	}
 
@@ -871,8 +921,11 @@ 
 			die;
 		}
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (count($row) > 0) return $row[0]['title'];
-		else return '';
+		if (count($row) > 0) {
+			return $row[0]['title'];
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -891,8 +944,11 @@ 
 			die;
 		}
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (count($row) > 0) return $row;
-		else return array();
+		if (count($row) > 0) {
+			return $row;
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -912,8 +968,11 @@ 
 			die;
 		}
 		$row = $sth->fetchAll(PDO::FETCH_ASSOC);
-		if (count($row) > 0) return $row[0];
-		else return array();
+		if (count($row) > 0) {
+			return $row[0];
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -958,19 +1017,35 @@ 
 			if ($row['registration'] != '') {
 				$row['registration'] = str_replace('.','',$row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			if ($row['registration'] == '') $row['registration'] = 'NA';
-			if ($row['ident'] == '') $row['ident'] = 'NA';
+				if (count($image_array) > 0) {
+					$data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+				} else {
+					$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
+			} else {
+				$data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+			}
+			if ($row['registration'] == '') {
+				$row['registration'] = 'NA';
+			}
+			if ($row['ident'] == '') {
+				$row['ident'] = 'NA';
+			}
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
 			if (isset($identicao[0])) {
 				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+						$icao = $row['ident'];
+					} else {
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+					}
+				} else {
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+				}
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-			} else $icao = $row['ident'];
+			} else {
+				$icao = $row['ident'];
+			}
 			$icao = $Translation->checkTranslation($icao,false);
 			$decode = json_decode($row['decode'],true);
 			$found = false;
@@ -995,7 +1070,9 @@ 
 					$found = true;
 				}
 			}
-			if ($found) $row['decode'] = json_encode($decode);
+			if ($found) {
+				$row['decode'] = json_encode($decode);
+			}
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
@@ -1003,8 +1080,9 @@ 
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
+		} else {
+			return array();
 		}
-		else return array();
 	}
 
 	/**
@@ -1053,31 +1131,51 @@ 
 			if ($row['registration'] != '') {
 				$row['registration'] = str_replace('.','',$row['registration']);
 				$image_array = $Image->getSpotterImage($row['registration']);
-				if (count($image_array) > 0) $data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
-				else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
-			} else $data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				if (count($image_array) > 0) {
+					$data = array_merge($data,array('image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website']));
+				} else {
+					$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+				}
+			} else {
+				$data = array_merge($data,array('image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => ''));
+			}
 			$icao = '';
-			if ($row['registration'] == '') $row['registration'] = 'NA';
-			if ($row['ident'] == '') $row['ident'] = 'NA';
+			if ($row['registration'] == '') {
+				$row['registration'] = 'NA';
+			}
+			if ($row['ident'] == '') {
+				$row['ident'] = 'NA';
+			}
 			$identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,2));
 			if (isset($identicao[0])) {
 				if (substr($row['ident'],0,2) == 'AF') {
-					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident'];
-					else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
-				} else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+					if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) {
+						$icao = $row['ident'];
+					} else {
+						$icao = 'AFR'.ltrim(substr($row['ident'],2),'0');
+					}
+				} else {
+					$icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0');
+				}
 				$data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name']));
-			} else $icao = $row['ident'];
+			} else {
+				$icao = $row['ident'];
+			}
 			$icao = $Translation->checkTranslation($icao);
 			$decode = json_decode($row['decode'],true);
 			$found = false;
 			if ($decode != '' && array_key_exists('Departure airport',$decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Departure airport']);
-				if (isset($airport_info[0]['icao'])) $decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				if (isset($airport_info[0]['icao'])) {
+					$decode['Departure airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				}
 				$found = true;
 			}
 			if ($decode != '' && array_key_exists('Arrival airport',$decode)) {
 				$airport_info = $Spotter->getAllAirportInfo($decode['Arrival airport']);
-				if (isset($airport_info[0]['icao'])) $decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				if (isset($airport_info[0]['icao'])) {
+					$decode['Arrival airport'] = '<a href="'.$globalURL.'/airport/'.$airport_info[0]['icao'].'">'.$airport_info[0]['city'].','.$airport_info[0]['country'].' ('.$airport_info[0]['icao'].')</a>';
+				}
 				$found = true;
 			}
 			if ($decode != '' && array_key_exists('Airport/Waypoint name',$decode)) {
@@ -1087,7 +1185,9 @@ 
 					$found = true;
 				}
 			}
-			if ($found) $row['decode'] = json_encode($decode);
+			if ($found) {
+				$row['decode'] = json_encode($decode);
+			}
 			$data = array_merge($data,array('registration' => $row['registration'],'message' => $row['message'], 'date' => $row['date'], 'ident' => $icao, 'decode' => $row['decode']));
 			$result[] = $data;
 			$i++;
@@ -1095,7 +1195,9 @@ 
 		if (isset($result)) {
 			$result[0]['query_number_rows'] = $i;
 			return $result;
-		} else return array();
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -1111,25 +1213,37 @@ 
 		$ident = trim($ident);
 		$Translation = new Translation($this->db);
 		$Spotter = new Spotter($this->db);
-		if ($globalDebug) echo "Test if we add ModeS data...";
+		if ($globalDebug) {
+			echo "Test if we add ModeS data...";
+		}
 		//if ($icao == '') $icao = ACARS->ident2icao($ident);
-		if ($icao == '') $icao = $Translation->checkTranslation($ident);
-		if ($globalDebug) echo '- Ident : '.$icao.' - ';
+		if ($icao == '') {
+			$icao = $Translation->checkTranslation($ident);
+		}
+		if ($globalDebug) {
+			echo '- Ident : '.$icao.' - ';
+		}
 		if ($ident == '' || $registration == '') {
-			if ($globalDebug) echo "Ident or registration null, exit\n";
+			if ($globalDebug) {
+				echo "Ident or registration null, exit\n";
+			}
 			return '';
 		}
 		$registration = str_replace('.','',$registration);
 		$ident = $Translation->ident2icao($ident);
 		// Check if a flight with same registration is flying now, if ok check if callsign = name in ACARS, else add it to translation
-		if ($globalDebug) echo "Check if needed to add translation ".$ident.'... ';
+		if ($globalDebug) {
+			echo "Check if needed to add translation ".$ident.'... ';
+		}
 		$querysi = "SELECT ident FROM spotter_live s,aircraft_modes a WHERE a.ModeS = s.ModeS AND a.Registration = :registration AND s.format_source <> 'ACARS' LIMIT 1";
 		$querysi_values = array(':registration' => $registration);
 		try {
 			$sthsi = $this->db->prepare($querysi);
 			$sthsi->execute($querysi_values);
 		} catch(PDOException $e) {
-			if ($globalDebug) echo $e->getMessage();
+			if ($globalDebug) {
+				echo $e->getMessage();
+			}
 			return "error : ".$e->getMessage();
 		}
 		$resultsi = $sthsi->fetch(PDO::FETCH_ASSOC);
@@ -1137,9 +1251,14 @@ 
 		if (count($resultsi) > 0 && $resultsi['ident'] != $ident && $resultsi['ident'] != '') {
 			$Translation = new Translation($this->db);
 			$trans_ident = $Translation->getOperator($resultsi['ident']);
-			if ($globalDebug) echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
-			if ($ident != $trans_ident) $Translation->addOperator($resultsi['ident'],$ident,'ACARS');
-			elseif ($trans_ident == $ident) $Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
+			if ($globalDebug) {
+				echo 'Add translation to table : '.$ident.' -> '.$resultsi['ident'].' ';
+			}
+			if ($ident != $trans_ident) {
+				$Translation->addOperator($resultsi['ident'],$ident,'ACARS');
+			} elseif ($trans_ident == $ident) {
+				$Translation->updateOperator($resultsi['ident'],$ident,'ACARS');
+			}
 		} else {
 			if ($registration != '' && $latitude != '' && $longitude != '') {
 				$query = "SELECT ModeS FROM aircraft_modes WHERE Registration = :registration LIMIT 1";
@@ -1148,32 +1267,44 @@ 
 					$sth = $this->db->prepare($query);
 					$sth->execute($query_values);
 				} catch(PDOException $e) {
-					if ($globalDebug) echo $e->getMessage();
+					if ($globalDebug) {
+						echo $e->getMessage();
+					}
 					return "error : ".$e->getMessage();
 				}
 				$result = $sth->fetch(PDO::FETCH_ASSOC);
 				$sth->closeCursor();
-				if (isset($result['modes'])) $hex = $result['modes'];
-				else $hex = '';
+				if (isset($result['modes'])) {
+					$hex = $result['modes'];
+				} else {
+					$hex = '';
+				}
 				$SI_data = array('hex' => $hex,'ident' => $ident,'aircraft_icao' => $ICAOTypeCode,'registration' => $registration,'latitude' => $latitude,'$longitude' => $longitude,'format_source' => 'ACARS');
 				$this->SI->add($SI_data);
 			}
 		}
-		if ($globalDebug) echo 'Done'."\n";
+		if ($globalDebug) {
+			echo 'Done'."\n";
+		}
 		$query = "SELECT flightaware_id, ModeS FROM spotter_output WHERE ident = :ident AND format_source <> 'ACARS' ORDER BY spotter_id DESC LIMIT 1";
 		$query_values = array(':ident' => $icao);
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
 		} catch(PDOException $e) {
-			if ($globalDebug) echo $e->getMessage();
+			if ($globalDebug) {
+				echo $e->getMessage();
+			}
 			return "error : ".$e->getMessage();
 		}
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
 		if (isset($result['flightaware_id'])) {
-			if (isset($result['ModeS'])) $ModeS = $result['ModeS'];
-			else $ModeS = '';
+			if (isset($result['ModeS'])) {
+				$ModeS = $result['ModeS'];
+			} else {
+				$ModeS = '';
+			}
 			if ($ModeS == '') {
 				$id = explode('-',$result['flightaware_id']);
 				$ModeS = $id[0];
@@ -1186,24 +1317,32 @@ 
 					$sthc = $this->db->prepare($queryc);
 					$sthc->execute($queryc_values);
 				} catch(PDOException $e) {
-					if ($globalDebug) echo $e->getMessage();
+					if ($globalDebug) {
+						echo $e->getMessage();
+					}
 					return "error : ".$e->getMessage();
 				}
 				$row = $sthc->fetch(PDO::FETCH_ASSOC);
 				$sthc->closeCursor();
 				if (count($row) ==  0) {
-					if ($globalDebug) echo " Add to ModeS table - ";
+					if ($globalDebug) {
+						echo " Add to ModeS table - ";
+					}
 					$queryi = "INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:ModeS,:ModeSCountry,:Registration, :ICAOTypeCode,'ACARS')";
 					$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
 					try {
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
 					} catch(PDOException $e) {
-						if ($globalDebug) echo $e->getMessage();
+						if ($globalDebug) {
+							echo $e->getMessage();
+						}
 						return "error : ".$e->getMessage();
 					}
 				} else {
-					if ($globalDebug) echo " Update ModeS table - ";
+					if ($globalDebug) {
+						echo " Update ModeS table - ";
+					}
 					if ($ICAOTypeCode != '') {
 						$queryi = "UPDATE aircraft_modes SET ModeSCountry = :ModeSCountry,Registration = :Registration,ICAOTypeCode = :ICAOTypeCode,Source = 'ACARS',LastModified = NOW() WHERE ModeS = :ModeS";
 						$queryi_values = array(':ModeS' => $ModeS,':ModeSCountry' => $country,':Registration' => $registration, ':ICAOTypeCode' => $ICAOTypeCode);
@@ -1215,7 +1354,9 @@ 
 						$sthi = $this->db->prepare($queryi);
 						$sthi->execute($queryi_values);
 					} catch(PDOException $e) {
-						if ($globalDebug) echo $e->getMessage();
+						if ($globalDebug) {
+							echo $e->getMessage();
+						}
 						return "error : ".$e->getMessage();
 					}
 				}
@@ -1236,7 +1377,9 @@ 
 					    return "error : ".$e->getMessage();
 				}
 				*/
-				if ($globalDebug) echo " Update Spotter_output table - ";
+				if ($globalDebug) {
+					echo " Update Spotter_output table - ";
+				}
 				if ($ICAOTypeCode != '') {
 					if ($globalDBdriver == 'mysql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration,aircraft_icao = :ICAOTypeCode WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
@@ -1247,8 +1390,7 @@ 
 				} else {
 					if ($globalDBdriver == 'mysql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= date_sub(UTC_TIMESTAMP(), INTERVAL 1 HOUR)";
-					}
-					elseif ($globalDBdriver == 'pgsql') {
+					} elseif ($globalDBdriver == 'pgsql') {
 						$queryi = "UPDATE spotter_output SET registration = :Registration WHERE ident = :ident AND date >= NOW() AT TIME ZONE 'UTC' - INTERVAL '1 HOUR'";
 					}
 					$queryi_values = array(':Registration' => $registration,':ident' => $icao);
@@ -1257,14 +1399,20 @@ 
 					$sthi = $this->db->prepare($queryi);
 					$sthi->execute($queryi_values);
 				} catch(PDOException $e) {
-					if ($globalDebug) echo $e->getMessage();
+					if ($globalDebug) {
+						echo $e->getMessage();
+					}
 					return "error : ".$e->getMessage();
 				}
 			}
 		} else {
-			if ($globalDebug) echo " Can't find ModeS in spotter_output - ";
+			if ($globalDebug) {
+				echo " Can't find ModeS in spotter_output - ";
+			}
+		}
+		if ($globalDebug) {
+			echo "Done\n";
 		}
-		if ($globalDebug) echo "Done\n";
 	}
 }
 ?>

require/class.METAR.php

Indentation +35 added lines, -35 removed lines

@@ -7,35 +7,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'
 	);
 
 	public function __construct($dbc = null) {
@@ -153,7 +153,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];
@@ -164,7 +164,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;
@@ -222,9 +222,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];
@@ -257,7 +257,7 @@ 
 			}
 		}
 		return $result;
-        }
+		}
 
 	public function getMETAR($icao) {
 		global $globalMETARcycle, $globalDBdriver;

Spacing +48 added lines, -48 removed lines

@@ -54,7 +54,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);
@@ -70,7 +70,7 @@ 
 			$Connection = new Connection();
 			$sth = $Connection->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -78,9 +78,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++;
@@ -88,25 +88,25 @@ 
 		$result = array();
 		$result['location'] = $pieces[$pos];
 		$pos++;
-		$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)) {
@@ -127,14 +127,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;
 			}
@@ -146,7 +146,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);
@@ -167,12 +167,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)) {
@@ -194,7 +194,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;
 			}
@@ -204,8 +204,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)) {
@@ -218,12 +218,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'
 					);
 				}
@@ -271,7 +271,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);
@@ -281,19 +281,19 @@ 
 		return $all;
 	}
 
-	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();
 		}
 	}
@@ -304,7 +304,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute($query_values);
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -314,7 +314,7 @@ 
 		try {
 			$sth = $this->db->prepare($query);
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
 	}
@@ -325,27 +325,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);
@@ -359,22 +359,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 +100 added lines, -38 removed lines

@@ -59,8 +59,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;
+		}
 	}
 
 	public static function insert_last_update() {
@@ -82,9 +85,14 @@ 
 		//$pieces = explode(' ',$data);
 		$pieces = preg_split('/\s/',$data);
 		$pos = 0;
-		if ($pieces[0] == 'METAR') $pos++;
-		elseif ($pieces[0] == 'SPECI') $pos++;
-		if (strlen($pieces[$pos]) != 4) $pos++;
+		if ($pieces[0] == 'METAR') {
+			$pos++;
+		} elseif ($pieces[0] == 'SPECI') {
+			$pos++;
+		}
+		if (strlen($pieces[$pos]) != 4) {
+			$pos++;
+		}
 		$result = array();
 		$result['location'] = $pieces[$pos];
 		$pos++;
@@ -93,16 +101,26 @@ 
 		$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;
@@ -185,14 +203,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] : '';
@@ -218,8 +245,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],
@@ -252,8 +282,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;
@@ -264,8 +297,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 {
@@ -321,7 +357,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) {
@@ -332,31 +370,47 @@ 
 			$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";
 	}
 
 	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);
@@ -367,16 +421,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();

flightid-overview.php

Spacing +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-$id = filter_input(INPUT_GET,'id',FILTER_SANITIZE_STRING);
+$id = filter_input(INPUT_GET, 'id', FILTER_SANITIZE_STRING);
 if ($id == "")
 {
 	header('Location: /');
@@ -16,30 +16,30 @@ 
 
 if (!empty($spotter_array))
 {
-	if(isset($spotter_array[0]['flightaware_id'])) {
+	if (isset($spotter_array[0]['flightaware_id'])) {
 		$flightaware_id = $spotter_array[0]['flightaware_id'];
 	}
-	if(isset($spotter_array[0]['last_latitude']) && $spotter_array[0]['last_latitude'] != '') {
+	if (isset($spotter_array[0]['last_latitude']) && $spotter_array[0]['last_latitude'] != '') {
 		$latitude = $spotter_array[0]['last_latitude'];
-	} elseif(isset($spotter_array[0]['latitude'])) {
+	} elseif (isset($spotter_array[0]['latitude'])) {
 		$latitude = $spotter_array[0]['latitude'];
 	}
-	if(isset($spotter_array[0]['last_longitude']) && $spotter_array[0]['last_longitude'] != '') {
+	if (isset($spotter_array[0]['last_longitude']) && $spotter_array[0]['last_longitude'] != '') {
 		$longitude = $spotter_array[0]['last_longitude'];
-	} elseif(isset($spotter_array[0]['longitude'])) {
+	} elseif (isset($spotter_array[0]['longitude'])) {
 		$longitude = $spotter_array[0]['longitude'];
 	}
 	$title = '';
-	if(isset($spotter_array[0]['ident'])) {
+	if (isset($spotter_array[0]['ident'])) {
 		$title .= $spotter_array[0]['ident'];
 	}
-	if(isset($spotter_array[0]['airline_name'])) {
+	if (isset($spotter_array[0]['airline_name'])) {
 		$title .= ' - '.$spotter_array[0]['airline_name'];
 	}
-	if(isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
+	if (isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
 		$title .= ' - '.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')';
 	}
-	if(isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA' && $spotter_array[0]['registration'] != 'N/A') {
+	if (isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA' && $spotter_array[0]['registration'] != 'N/A') {
 		$title .= ' - '.$spotter_array[0]['registration'];
 	}
 	//$facebook_meta_image = $spotter_array[0]['image'];
@@ -59,7 +59,7 @@ 
 			$altitude_data = '';
 			$hour_data = '';
 			$speed_data = '';
-			foreach($all_data as $data)
+			foreach ($all_data as $data)
 			{
 				$hour_data .= '"'.$data['date'].'",';
 				if (isset($data['real_altitude']) && $data['real_altitude'] != '') {
@@ -87,8 +87,8 @@ 
 				$speed_data .= $speed.',';
 			}
 			$hour_data = "['x',".substr($hour_data, 0, -1)."]";
-			$altitude_data = "['altitude',".substr($altitude_data,0,-1)."]";
-			$speed_data = "['speed',".substr($speed_data,0,-1)."]";
+			$altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]";
+			$speed_data = "['speed',".substr($speed_data, 0, -1)."]";
 			print 'c3.generate({
 			    bindto: "#chart",
 			    data: {
@@ -134,16 +134,16 @@ 
 			print '<a href="'.$globalURL.'/airline/'.$spotter_array[0]['airline_icao'].'">'.$spotter_array[0]['airline_name'].'</a> ';
 		}
 	}
-	if(isset($spotter_array[0]['ident'])) {
+	if (isset($spotter_array[0]['ident'])) {
 		print $spotter_array[0]['ident'];
 	}
-	if(isset($spotter_array[0]['airline_name'])) {
+	if (isset($spotter_array[0]['airline_name'])) {
 		print ' - '.$spotter_array[0]['airline_name'];
 	}
-	if(isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
+	if (isset($spotter_array[0]['aircraft_name']) && $spotter_array[0]['aircraft_name'] != 'Not Available') {
 		print ' - '.$spotter_array[0]['aircraft_name'].' ('.$spotter_array[0]['aircraft_type'].')';
 	}
-	if(isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA') {
+	if (isset($spotter_array[0]['registration']) && $spotter_array[0]['registration'] != 'NA') {
 		print ' - '.$spotter_array[0]['registration'];
 	}
 	print '</h1>';
@@ -297,7 +297,7 @@ 
 	 print '</div>';
 */
 
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		print '<div class="details">';
 		print '<h3>'._("Flight Information").'</h3>';
@@ -397,7 +397,7 @@ 
 			if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != '') {
 				if ($spotter_item['departure_airport_time'] > 2460) {
 					print '<div class="time">';
-					print 'at '.date('H:m',$spotter_item['departure_airport_time']);
+					print 'at '.date('H:m', $spotter_item['departure_airport_time']);
 					print '</div>';
 				} else {
 					print '<div class="time">';
@@ -546,19 +546,19 @@ 
 			$departure_airport_info = $Spotter->getAllAirportInfo($spotter_item['departure_airport']);
 			if (isset($spotter_item['last_latitude']) && $spotter_item['last_latitude'] != '') {
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'nm').' nm';
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'nm').' nm';
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'mi').' mi';
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'mi').' mi';
 				} else {
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'km').' km';
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'km').' km';
 				}
 			} else {
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'nm').' nm';
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'nm').' nm';
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'mi').' mi';
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'mi').' mi';
 				} else {
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$departure_airport_info[0]['latitude'],$departure_airport_info[0]['longitude'],'km').' km';
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $departure_airport_info[0]['latitude'], $departure_airport_info[0]['longitude'], 'km').' km';
 				}
 			}
 			print '</div>';
@@ -572,19 +572,19 @@ 
 			$arrival_airport_info = $Spotter->getAllAirportInfo($spotter_item['arrival_airport']);
 			if (isset($spotter_item['last_latitude']) && $spotter_item['last_latitude'] != '') {
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'nm').' nm';
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'nm').' nm';
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'mi').' mi';
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'mi').' mi';
 				} else {
-					print $Common->distance($spotter_item['last_latitude'],$spotter_item['last_longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'km').' km';
+					print $Common->distance($spotter_item['last_latitude'], $spotter_item['last_longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'km').' km';
 				}
 			} else {
 				if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) {
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'nm').' nm';
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'nm').' nm';
 				} elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) {
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'mi').' mi';
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'mi').' mi';
 				} else {
-					print $Common->distance($spotter_item['latitude'],$spotter_item['longitude'],$arrival_airport_info[0]['latitude'],$arrival_airport_info[0]['longitude'],'km').' km';
+					print $Common->distance($spotter_item['latitude'], $spotter_item['longitude'], $arrival_airport_info[0]['latitude'], $arrival_airport_info[0]['longitude'], 'km').' km';
 				}
 			}
 			print '</div>';
@@ -603,7 +603,7 @@ 
 		print '<div class="last-flights">';
 		print '<h3>'._("Last 5 Flights of this Aircraft").' ('.$spotter_array[0]['registration'].')</h3>';
 		$hide_th_links = true;
-		$spotter_array = $Spotter->getSpotterDataByRegistration($spotter_array[0]['registration'],"0,5", "");
+		$spotter_array = $Spotter->getSpotterDataByRegistration($spotter_array[0]['registration'], "0,5", "");
 		include('table-output.php'); 
 		print '<div class="more">';
 		print '<a href="'.$globalURL.'/registration/'.$spotter_array[0]['registration'].'" class="btn btn-default btn" role="button">See all Flights&raquo;</a>';

Braces +10 added lines, -4 removed lines

@@ -48,7 +48,9 @@ 
 		$all_data = $SpotterArchive->getAltitudeSpeedArchiveSpotterDataById($spotter_array[0]['flightaware_id']);
 		if (isset($globalTimezone)) {
 			date_default_timezone_set($globalTimezone);
-		} else date_default_timezone_set('UTC');
+		} else {
+			date_default_timezone_set('UTC');
+		}
 		
 		if (is_array($all_data) && count($all_data) > 1) {
 			print '<br/>';
@@ -327,9 +329,13 @@ 
 			print '<div>';
 			if (isset($spotter_item['pilot_id']) && $spotter_item['pilot_id'] != "")
 			{
-				if ($spotter_item['format_source'] == 'whazzup') print '<a href="https://www.ivao.aero/Member.aspx?ID='.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
-				elseif ($spotter_item['format_source'] == 'vatsimtxt') print '<a href="http://www.vataware.com/pilot/'.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
-				else print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
+				if ($spotter_item['format_source'] == 'whazzup') {
+					print '<a href="https://www.ivao.aero/Member.aspx?ID='.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
+				} elseif ($spotter_item['format_source'] == 'vatsimtxt') {
+					print '<a href="http://www.vataware.com/pilot/'.$spotter_item['pilot_id'].'">'.$spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')</a>';
+				} else {
+					print $spotter_item['pilot_name'].' ('.$spotter_item['pilot_id'].')';
+				}
 			} else {
 				if (isset($spotter_item['pilot_name']) && $spotter_item['pilot_name'] != "")
 				{

ident-detailed.php

Spacing +27 added lines, -27 removed lines

@@ -3,7 +3,7 @@ 
 require_once('require/class.Language.php');
 require_once('require/class.Translation.php');
 $type = '';
-$ident = urldecode(filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING));
+$ident = urldecode(filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING));
 if (isset($_GET['marine'])) {
 	require_once('require/class.Marine.php');
 	require_once('require/class.MarineLive.php');
@@ -30,12 +30,12 @@ 
 	$page_url = $globalURL.'/ident/'.$_GET['ident'];
 }
 
-if (!isset($_GET['ident'])){
+if (!isset($_GET['ident'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	$Translation = new Translation();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
@@ -54,18 +54,18 @@ 
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
 	
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	if ($type == 'aircraft') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array)) {
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array)) {
-				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 		if (empty($spotter_array)) {
@@ -74,14 +74,14 @@ 
 				$ident = $new_ident;
 				if ($sort != '') 
 				{
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 					if (empty($spotter_array)) {
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 					}
 				} else {
-					$spotter_array = $Spotter->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+					$spotter_array = $Spotter->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 					if (empty($spotter_array)) {
-						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident,$limit_start.",".$absolute_difference);
+						$spotter_array = $SpotterArchive->getSpotterDataByIdent($ident, $limit_start.",".$absolute_difference);
 					}
 				}
 			}
@@ -89,34 +89,34 @@ 
 	} elseif ($type == 'marine') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array)) {
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Marine->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Marine->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array)) {
-				$spotter_array = $MarineArchive->getMarineDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $MarineArchive->getMarineDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 	} elseif ($type == 'tracker') {
 		if ($sort != '') 
 		{
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			if (empty($spotter_array)) {
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference, $sort);
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference, $sort);
 			}
 		} else {
-			$spotter_array = $Tracker->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
+			$spotter_array = $Tracker->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
 			if (empty($spotter_array)) {
-				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident,$limit_start.",".$absolute_difference);
+				$spotter_array = $TrackerArchive->getTrackerDataByIdent($ident, $limit_start.",".$absolute_difference);
 			}
 		}
 	}
 
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
+		$title = sprintf(_("Detailed View for %s"), $spotter_array[0]['ident']);
 		$ident = $spotter_array[0]['ident'];
 		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
 		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
@@ -136,7 +136,7 @@ 
 				$altitude_data = '';
 				$hour_data = '';
 				$speed_data = '';
-				foreach($all_data as $data)
+				foreach ($all_data as $data)
 				{
 					$hour_data .= '"'.$data['date'].'",';
 					if (isset($data['real_altitude']) && $data['real_altitude'] != '') {
@@ -164,8 +164,8 @@ 
 					$speed_data .= $speed.',';
 				}
 				$hour_data = "['x',".substr($hour_data, 0, -1)."]";
-				$altitude_data = "['altitude',".substr($altitude_data,0,-1)."]";
-				$speed_data = "['speed',".substr($speed_data,0,-1)."]";
+				$altitude_data = "['altitude',".substr($altitude_data, 0, -1)."]";
+				$speed_data = "['speed',".substr($speed_data, 0, -1)."]";
 				print 'c3.generate({
 				    bindto: "#chart",
 				    data: {
@@ -209,9 +209,9 @@ 
 	
 		if ($type == 'aircraft') include('ident-sub-menu.php');
 		print '<div class="table column">';
-		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
+		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
+		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
 
 		include('table-output.php'); 
 		print '<div class="pagination">';

Braces +22 added lines, -8 removed lines

@@ -118,8 +118,12 @@ 
 	{
 		$title = sprintf(_("Detailed View for %s"),$spotter_array[0]['ident']);
 		$ident = $spotter_array[0]['ident'];
-		if (isset($spotter_array[0]['latitude'])) $latitude = $spotter_array[0]['latitude'];
-		if (isset($spotter_array[0]['longitude'])) $longitude = $spotter_array[0]['longitude'];
+		if (isset($spotter_array[0]['latitude'])) {
+			$latitude = $spotter_array[0]['latitude'];
+		}
+		if (isset($spotter_array[0]['longitude'])) {
+			$longitude = $spotter_array[0]['longitude'];
+		}
 		require_once('header.php');
 		if (isset($globalArchive) && $globalArchive && $type == 'aircraft') {
 			// Requirement for altitude graph
@@ -127,7 +131,9 @@ 
 			$all_data = $SpotterArchive->getAltitudeSpeedArchiveSpotterDataById($spotter_array[0]['flightaware_id']);
 			if (isset($globalTimezone)) {
 				date_default_timezone_set($globalTimezone);
-			} else date_default_timezone_set('UTC');
+			} else {
+				date_default_timezone_set('UTC');
+			}
 			if (is_array($all_data) && count($all_data) > 1) {
 				print '<link href="'.$globalURL.'/css/c3.min.css" rel="stylesheet" type="text/css">';
 				print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>';
@@ -204,14 +210,22 @@ 
 		if (isset($spotter_array[0]['airline_icao'])) {
 			print '<div><span class="label">'._("Airline").'</span><a href="'.$globalURL.'/airline/'.$spotter_array[0]['airline_icao'].'">'.$spotter_array[0]['airline_name'].'</a></div>'; 
 		}
-		if ($type == 'aircraft') print '<div><span class="label">'._("Flight History").'</span><a href="http://flightaware.com/live/flight/'.$spotter_array[0]['ident'].'" target="_blank">'._("View the Flight History of this callsign").'</a></div>';
+		if ($type == 'aircraft') {
+			print '<div><span class="label">'._("Flight History").'</span><a href="http://flightaware.com/live/flight/'.$spotter_array[0]['ident'].'" target="_blank">'._("View the Flight History of this callsign").'</a></div>';
+		}
 		print '</div>';
 	
-		if ($type == 'aircraft') include('ident-sub-menu.php');
+		if ($type == 'aircraft') {
+			include('ident-sub-menu.php');
+		}
 		print '<div class="table column">';
-		if ($type == 'aircraft') print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
-		elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		if ($type == 'aircraft') {
+			print '<p>'.sprintf(_("The table below shows the detailed information of all flights with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		} elseif ($type == 'marine') {
+			print '<p>'.sprintf(_("The table below shows the detailed information of all vessels with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		} elseif ($type == 'tracker') {
+			print '<p>'.sprintf(_("The table below shows the detailed information of all trackers with the ident/callsign of <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+		}
 
 		include('table-output.php'); 
 		print '<div class="pagination">';