Ysurac / FlightAirMap

index.php

Indentation +93 added lines, -93 removed lines

@@ -47,7 +47,7 @@ 
     <?php }; if (isset($globalSatellite) && $globalSatellite) { ?><td><div id="ibxsatellite"><h4><?php echo _("Satellites Displayed"); ?></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>
 <?php
@@ -71,7 +71,7 @@ 
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
 <?php
 	}
-    }
+	}
 ?>
 
 <div id="sidebar" class="sidebar collapsed">
@@ -82,34 +82,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
-	    if (isset($globalSatellite) && $globalSatellite) {
+		if (isset($globalSatellite) && $globalSatellite) {
 ?>
 	<li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li>
 <?php
-	    }
+		}
 	} else {
 ?>
 	<li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
 <?php
 	}
-    }
+	}
 ?>
     </ul>
 
@@ -184,7 +184,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>
@@ -243,7 +243,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>
@@ -254,56 +254,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>
@@ -317,13 +317,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);">
@@ -334,10 +334,10 @@ 
 			</select>
 		    </li>
 <?php
-    }
+	}
 ?>
 <?php
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 <?php
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
@@ -354,7 +354,7 @@ 
 		    <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Satellites 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>
@@ -366,81 +366,81 @@ 
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayfires" value="1" onclick="clickDisplayFires(this)" <?php if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) print 'checked'; ?> ><?php echo _("Display fires 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'; ?>">
@@ -449,9 +449,9 @@ 
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 <?php
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
 ?>
 <?php
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
@@ -482,7 +482,7 @@ 
 		    </li>
 <?php
 	}
-    }
+	}
 ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -515,19 +515,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 } ?>
@@ -536,7 +536,7 @@ 
 			<?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines:"); ?>
 		    <br/>
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -556,14 +556,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">
@@ -577,18 +577,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
@@ -612,18 +612,18 @@ 
 						echo '<option value="'.$src['name'].'">'.$src['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>
@@ -634,14 +634,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">
@@ -650,7 +650,7 @@ 
 	    </form>
     	</div>
 <?php
-    if (isset($globalSatellite) && $globalSatellite) {
+	if (isset($globalSatellite) && $globalSatellite) {
 ?>
         <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>
@@ -690,14 +690,14 @@ 
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		</ul>
 	    </form>
 	</div>
 <?php
-    }
+	}
 ?>
     </div>
 </div>

location-geojson.php

Indentation +8 added lines, -8 removed lines

@@ -14,40 +14,40 @@
 	{
 		$coords = explode(',',$_GET['coord']);
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
-		    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
+			|| (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
 			//$spotter_array = $Source->getAllLocationInfo();
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs',$coords));
 		}
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') 
-		    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
+			|| (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx',$coords));
 		}
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') 
-		    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
+			|| (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning',$coords));
 		}
 		
 		if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') 
-		    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
+			|| (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',$coords,true));
 		}
 		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
 	} else {
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
-		    || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
+			|| (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) {
 			//$spotter_array = $Source->getAllLocationInfo();
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs'));
 		}
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') 
-		    || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
+			|| (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) {
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx'));
 		}
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') 
-		    || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
+			|| (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) {
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning'));
 		}
 		if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') 
-		    || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
+			|| (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) {
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',array(),true));
 		}
 		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));

require/class.TrackerArchive.php

Indentation +593 added lines, -593 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, $globalDBdriver;
 		$filters = array();
@@ -106,44 +106,44 @@ 
 	}
 
 
-        /**
-        * Gets all the spotter information based on a particular callsign
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLastArchiveTrackerDataByIdent($ident)
-        {
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getLastArchiveTrackerDataByIdent($ident)
+		{
 		$Tracker = new Tracker($this->db);
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				//$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
+				$query  = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
 
-                $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident));
+				$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
-        /**
-        * Gets last the spotter information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLastArchiveTrackerDataById($id)
-        {
-    		$Tracker = new Tracker($this->db);
-                date_default_timezone_set('UTC');
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                //$query  = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id";
-                //$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
+		/**
+		 * Gets last the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getLastArchiveTrackerDataById($id)
+		{
+			$Tracker = new Tracker($this->db);
+				date_default_timezone_set('UTC');
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				//$query  = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id";
+				//$query  = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
+				$query  = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
-                  /*
+				  /*
                 try {
                         $Connection = new Connection();
                         $sth = Connection->$db->prepare($query);
@@ -153,188 +153,188 @@ 
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-                $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id));
-
-                return $spotter_array;
-        }
-
-        /**
-        * Gets all the spotter information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAllArchiveTrackerDataById($id)
+				$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id));
+
+				return $spotter_array;
+		}
+
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAllArchiveTrackerDataById($id)
 	{
-                date_default_timezone_set('UTC');
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
+				date_default_timezone_set('UTC');
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date";
 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
-
-                return $spotter_array;
-        }
-
-        /**
-        * Gets coordinate & time spotter information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getCoordArchiveTrackerDataById($id)
-        {
-                date_default_timezone_set('UTC');
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+
+				return $spotter_array;
+		}
+
+		/**
+		 * Gets coordinate & time spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getCoordArchiveTrackerDataById($id)
+		{
+				date_default_timezone_set('UTC');
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id";
 
 //              $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id));
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
-        /**
-        * Gets altitude information based on a particular callsign
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAltitudeArchiveTrackerDataByIdent($ident)
-        {
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAltitudeArchiveTrackerDataByIdent($ident)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				$query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':ident' => $ident));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
-        /**
-        * Gets altitude information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAltitudeArchiveTrackerDataById($id)
-        {
+		/**
+		 * Gets altitude information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAltitudeArchiveTrackerDataById($id)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
-        /**
-        * Gets altitude & speed information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAltitudeSpeedArchiveTrackerDataById($id)
-        {
+		/**
+		 * Gets altitude & speed information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAltitudeSpeedArchiveTrackerDataById($id)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date";
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
-        /**
-        * Gets altitude information based on a particular callsign
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLastAltitudeArchiveTrackerDataByIdent($ident)
-        {
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getLastAltitudeArchiveTrackerDataByIdent($ident)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				$query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1";
 //                $query  = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':ident' => $ident));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
 
-       /**
-        * Gets all the archive spotter information
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getTrackerArchiveData($ident,$famtrackid,$date)
-        {
-    		$Tracker = new Tracker($this->db);
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
+	   /**
+	    * Gets all the archive spotter information
+	    *
+	    * @return Array the spotter information
+	    *
+	    */
+		public function getTrackerArchiveData($ident,$famtrackid,$date)
+		{
+			$Tracker = new Tracker($this->db);
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				$query  = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate";
 
-                $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%'));
+				$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%'));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 	public function deleteTrackerArchiveTrackData()
 	{
@@ -354,34 +354,34 @@ 
 	}
 
 	/**
-        * Gets Minimal Live Tracker data
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getMinLiveTrackerData($begindate,$enddate,$filter = array())
-        {
-                global $globalDBdriver, $globalLiveInterval;
-                date_default_timezone_set('UTC');
-
-                $filter_query = '';
-                if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
-                }
-                // Use spotter_output also ?
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
-                }
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
-                }
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
-                }
+	 * Gets Minimal Live Tracker data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+		public function getMinLiveTrackerData($begindate,$enddate,$filter = array())
+		{
+				global $globalDBdriver, $globalLiveInterval;
+				date_default_timezone_set('UTC');
 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-                if ($globalDBdriver == 'mysql') {
-                        /*
+				$filter_query = '';
+				if (isset($filter['source']) && !empty($filter['source'])) {
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+				}
+				// Use spotter_output also ?
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
+						$filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
+				}
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+						$filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
+				}
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				}
+
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+				if ($globalDBdriver == 'mysql') {
+						/*
                         $query  = 'SELECT a.aircraft_shadow, tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk 
                     		    FROM tracker_archive 
                     		    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
@@ -400,56 +400,56 @@ 
 				    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
 				    WHERE tracker_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
                         	    '.$filter_query.' ORDER BY famtrackid';
-                } else {
-                        //$query  = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao';
-                        $query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+				} else {
+						//$query  = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao';
+						$query  = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
                         	    FROM tracker_archive 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao
                         	    WHERE tracker_archive.date >= '."'".$begindate."'".' AND tracker_archive.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' ORDER BY famtrackid';
-                }
-                //echo $query;
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				}
+				//echo $query;
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 	/**
-        * Gets Minimal Live Tracker data
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array())
-        {
-                global $globalDBdriver, $globalLiveInterval;
-                date_default_timezone_set('UTC');
-
-                $filter_query = '';
-                if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
-                }
-                // Should use spotter_output also ?
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
-                }
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
-                }
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
-                }
+	 * Gets Minimal Live Tracker data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+		public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array())
+		{
+				global $globalDBdriver, $globalLiveInterval;
+				date_default_timezone_set('UTC');
+
+				$filter_query = '';
+				if (isset($filter['source']) && !empty($filter['source'])) {
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+				}
+				// Should use spotter_output also ?
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
+						$filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
+				}
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+						$filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
+				}
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				}
 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-                if ($globalDBdriver == 'mysql') {
-                        /*
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+				if ($globalDBdriver == 'mysql') {
+						/*
                         $query  = 'SELECT a.aircraft_shadow, tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk 
                     		    FROM tracker_archive 
                     		    INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao';
@@ -460,95 +460,95 @@ 
 				    WHERE (tracker_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
                         	    '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow';
 
-                } else {
-                        //$query  = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow FROM tracker_archive_output INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive_output.famtrackid = s.famtrackid AND tracker_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao';
-                       /*
+				} else {
+						//$query  = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow FROM tracker_archive_output INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive_output.famtrackid = s.famtrackid AND tracker_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao';
+					   /*
                         $query  = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
                         	    FROM tracker_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow';
                         */
-                        $query  = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
+						$query  = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow
                         	    FROM tracker_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao
                         	    WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' LIMIT 200 OFFSET 0';
 //                        	    .' GROUP BY spotter_output.famtrackid, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow';
                         	    
-                }
-                //echo $query;
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				}
+				//echo $query;
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 	 /**
-        * Gets count Live Tracker data
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLiveTrackerCount($begindate,$enddate,$filter = array())
-        {
-                global $globalDBdriver, $globalLiveInterval;
-                date_default_timezone_set('UTC');
-
-                $filter_query = '';
-                if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
-                }
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
-                }
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-                        $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
-                }
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
-                }
+	  * Gets count Live Tracker data
+	  *
+	  * @return Array the spotter information
+	  *
+	  */
+		public function getLiveTrackerCount($begindate,$enddate,$filter = array())
+		{
+				global $globalDBdriver, $globalLiveInterval;
+				date_default_timezone_set('UTC');
 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-                if ($globalDBdriver == 'mysql') {
+				$filter_query = '';
+				if (isset($filter['source']) && !empty($filter['source'])) {
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+				}
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
+						$filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid ";
+				}
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+						$filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid ";
+				}
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				}
+
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+				if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT COUNT(DISTINCT famtrackid) as nb 
 			FROM tracker_archive l 
 			WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query;
-                } else {
+				} else {
 			$query = 'SELECT COUNT(DISTINCT famtrackid) as nb FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query;
-                }
-                //echo $query;
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
+				}
+				//echo $query;
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
-                return $result['nb'];
+				return $result['nb'];
 
-        }
+		}
 
 
 
 	// tracker_archive_output
 	
-    /**
-    * Gets all the spotter information
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function searchTrackerData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
-    {
+	/**
+	 * Gets all the spotter information
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function searchTrackerData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
+	{
 	global $globalTimezone, $globalDBdriver;
 	require_once(dirname(__FILE__).'/class.Translation.php');
 	$Translation = new Translation($this->db);
@@ -562,159 +562,159 @@ 
 	$filter_query = $this->getFilter($filters);
 	if ($q != "")
 	{
-	    if (!is_string($q))
-	    {
+		if (!is_string($q))
+		{
 		return false;
-	    } else {
+		} else {
 	        
 		$q_array = explode(" ", $q);
 		
 		foreach ($q_array as $q_item){
-		    $additional_query .= " AND (";
-		    $additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.aircraft_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.airline_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.airline_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.airline_country like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.departure_airport_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.departure_airport_city like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.departure_airport_country like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.registration like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.owner_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.pilot_id like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR ";
-		    $translate = $Translation->ident2icao($q_item);
-		    if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
-		    $additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')";
-		    $additional_query .= ")";
+			$additional_query .= " AND (";
+			$additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.aircraft_name like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.airline_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.airline_name like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.airline_country like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.departure_airport_name like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.departure_airport_city like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.departure_airport_country like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.registration like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.owner_name like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.pilot_id like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR ";
+			$additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR ";
+			$translate = $Translation->ident2icao($q_item);
+			if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR ";
+			$additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')";
+			$additional_query .= ")";
+		}
 		}
-	    }
 	}
 	
 	if ($registration != "")
 	{
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
-	    if (!is_string($registration))
-	    {
+		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		if (!is_string($registration))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (tracker_archive_output.registration = '".$registration."')";
-	    }
+		}
 	}
 	
 	if ($aircraft_icao != "")
 	{
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-	    if (!is_string($aircraft_icao))
-	    {
+		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+		if (!is_string($aircraft_icao))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (tracker_archive_output.aircraft_icao = '".$aircraft_icao."')";
-	    }
+		}
 	}
 	
 	if ($aircraft_manufacturer != "")
 	{
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-	    if (!is_string($aircraft_manufacturer))
-	    {
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+		if (!is_string($aircraft_manufacturer))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (tracker_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')";
-	    }
+		}
 	}
 	
 	if ($highlights == "true")
 	{
-	    if (!is_string($highlights))
-	    {
+		if (!is_string($highlights))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (tracker_archive_output.highlight <> '')";
-	    }
+		}
 	}
 	
 	if ($airline_icao != "")
 	{
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-	    if (!is_string($airline_icao))
-	    {
+		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+		if (!is_string($airline_icao))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (tracker_archive_output.airline_icao = '".$airline_icao."')";
-	    }
+		}
 	}
 	
 	if ($airline_country != "")
 	{
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
-	    if (!is_string($airline_country))
-	    {
+		$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+		if (!is_string($airline_country))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (tracker_archive_output.airline_country = '".$airline_country."')";
-	    }
+		}
 	}
 	
 	if ($airline_type != "")
 	{
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
-	    if (!is_string($airline_type))
-	    {
+		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+		if (!is_string($airline_type))
+		{
 		return false;
-	    } else {
+		} else {
 		if ($airline_type == "passenger")
 		{
-		    $additional_query .= " AND (tracker_archive_output.airline_type = 'passenger')";
+			$additional_query .= " AND (tracker_archive_output.airline_type = 'passenger')";
 		}
 		if ($airline_type == "cargo")
 		{
-		    $additional_query .= " AND (tracker_archive_output.airline_type = 'cargo')";
+			$additional_query .= " AND (tracker_archive_output.airline_type = 'cargo')";
 		}
 		if ($airline_type == "military")
 		{
-		    $additional_query .= " AND (tracker_archive_output.airline_type = 'military')";
+			$additional_query .= " AND (tracker_archive_output.airline_type = 'military')";
+		}
 		}
-	    }
 	}
 	
 	if ($airport != "")
 	{
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
-	    if (!is_string($airport))
-	    {
+		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
+		if (!is_string($airport))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND ((tracker_archive_output.departure_airport_icao = '".$airport."') OR (tracker_archive_output.arrival_airport_icao = '".$airport."'))";
-	    }
+		}
 	}
 	
 	if ($airport_country != "")
 	{
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
-	    if (!is_string($airport_country))
-	    {
+		$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+		if (!is_string($airport_country))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND ((tracker_archive_output.departure_airport_country = '".$airport_country."') OR (tracker_archive_output.arrival_airport_country = '".$airport_country."'))";
-	    }
+		}
 	}
     
 	if ($callsign != "")
 	{
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-	    if (!is_string($callsign))
-	    {
+		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+		if (!is_string($callsign))
+		{
 		return false;
-	    } else {
+		} else {
 		$translate = $Translation->ident2icao($callsign);
 		if ($translate != $callsign) {
 			$additional_query .= " AND (tracker_archive_output.ident = :callsign OR tracker_archive_output.ident = :translate)";
@@ -722,99 +722,99 @@ 
 		} else {
 			$additional_query .= " AND (tracker_archive_output.ident = '".$callsign."')";
 		}
-	    }
+		}
 	}
 
 	if ($owner != "")
 	{
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
-	    if (!is_string($owner))
-	    {
+		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
+		if (!is_string($owner))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (tracker_archive_output.owner_name = '".$owner."')";
-	    }
+		}
 	}
 
 	if ($pilot_name != "")
 	{
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
-	    if (!is_string($pilot_name))
-	    {
+		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+		if (!is_string($pilot_name))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (tracker_archive_output.pilot_name = '".$pilot_name."')";
-	    }
+		}
 	}
 	
 	if ($pilot_id != "")
 	{
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
-	    if (!is_string($pilot_id))
-	    {
+		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+		if (!is_string($pilot_id))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (tracker_archive_output.pilot_id = '".$pilot_id."')";
-	    }
+		}
 	}
 	
 	if ($departure_airport_route != "")
 	{
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
-	    if (!is_string($departure_airport_route))
-	    {
+		$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+		if (!is_string($departure_airport_route))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (tracker_archive_output.departure_airport_icao = '".$departure_airport_route."')";
-	    }
+		}
 	}
 	
 	if ($arrival_airport_route != "")
 	{
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
-	    if (!is_string($arrival_airport_route))
-	    {
+		$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+		if (!is_string($arrival_airport_route))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (tracker_archive_output.arrival_airport_icao = '".$arrival_airport_route."')";
-	    }
+		}
 	}
 	
 	if ($altitude != "")
 	{
-	    $altitude_array = explode(",", $altitude);
+		$altitude_array = explode(",", $altitude);
 	    
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 	    
 
-	    if ($altitude_array[1] != "")
-	    {                
+		if ($altitude_array[1] != "")
+		{                
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
 		$altitude_array[1] = substr($altitude_array[1], 0, -2);
 		$additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' ";
-	    } else {
+		} else {
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
 		$additional_query .= " AND altitude <= '".$altitude_array[0]."' ";
-	    }
+		}
 	}
 	
 	if ($date_posted != "")
 	{
-	    $date_array = explode(",", $date_posted);
+		$date_array = explode(",", $date_posted);
 	    
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+		$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
+		$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
 	    
-	    if ($globalTimezone != '') {
+		if ($globalTimezone != '') {
 		date_default_timezone_set($globalTimezone);
 		$datetime = new DateTime();
 		$offset = $datetime->format('P');
-	    } else $offset = '+00:00';
+		} else $offset = '+00:00';
 
 
-	    if ($date_array[1] != "")
-	    {                
+		if ($date_array[1] != "")
+		{                
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
 		$date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1]));
 		if ($globalDBdriver == 'mysql') {
@@ -822,28 +822,28 @@ 
 		} else {
 			$additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) ";
 		}
-	    } else {
+		} else {
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
-                if ($globalDBdriver == 'mysql') {
+				if ($globalDBdriver == 'mysql') {
 			$additional_query .= " AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' ";
 		} else {
 			$additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) ";
 		}
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 	
 
@@ -874,33 +874,33 @@ 
 	$spotter_array = $Tracker->getDataFromDB($query, $query_values,$limit_query);
 
 	return $spotter_array;
-    }
+	}
 
-    public function deleteTrackerArchiveData()
-    {
+	public function deleteTrackerArchiveData()
+	{
 		global $globalArchiveKeepMonths, $globalDBdriver;
-                date_default_timezone_set('UTC');
-                if ($globalDBdriver == 'mysql') {
+				date_default_timezone_set('UTC');
+				if ($globalDBdriver == 'mysql') {
 			$query = 'DELETE FROM tracker_archive_output WHERE tracker_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)';
 		} else {
 			$query = "DELETE FROM tracker_archive_output WHERE tracker_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'";
 		}
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error";
-                }
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error";
+				}
 	}
 
-    /**
-    * Gets all the spotter information based on the callsign
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '')
-    {
+	/**
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '')
+	{
 	$global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -912,35 +912,35 @@ 
 	
 	if ($ident != "")
 	{
-	    if (!is_string($ident))
-	    {
+		if (!is_string($ident))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query = " AND (tracker_archive_output.ident = :ident)";
 		$query_values = array(':ident' => $ident);
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Tracker->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Tracker->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY tracker_archive_output.date DESC";
+		$orderby_query = " ORDER BY tracker_archive_output.date DESC";
 	}
 
 	$query = $global_query." WHERE tracker_archive_output.ident <> '' ".$additional_query." ".$orderby_query;
@@ -948,17 +948,17 @@ 
 	$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
+	}
 
 
-    /**
-    * Gets all the spotter information based on the owner
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getTrackerDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
-    {
+	/**
+	 * Gets all the spotter information based on the owner
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getTrackerDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
+	{
 	$global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -971,35 +971,35 @@ 
 	
 	if ($owner != "")
 	{
-	    if (!is_string($owner))
-	    {
+		if (!is_string($owner))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query = " AND (tracker_archive_output.owner_name = :owner)";
 		$query_values = array(':owner' => $owner);
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Tracker->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Tracker->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY tracker_archive_output.date DESC";
+		$orderby_query = " ORDER BY tracker_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." tracker_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query;
@@ -1007,16 +1007,16 @@ 
 	$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all the spotter information based on the pilot
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getTrackerDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on the pilot
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getTrackerDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
+	{
 	$global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -1035,24 +1035,24 @@ 
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Tracker->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Tracker->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY tracker_archive_output.date DESC";
+		$orderby_query = " ORDER BY tracker_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." tracker_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query;
@@ -1060,16 +1060,16 @@ 
 	$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all number of flight over countries
-    *
-    * @return Array the airline country list
-    *
-    */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
-    {
+	}
+
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
+	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
+	{
 	global $globalDBdriver;
 	/*
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1079,14 +1079,14 @@ 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
 		    FROM countries c, tracker_archive s
 		    WHERE c.iso2 = s.over_country ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
 	if ($limit) $query .= " LIMIT 0,10";
       
@@ -1099,23 +1099,23 @@ 
         
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
-	    $temp_array['flight_count'] = $row['nb'];
-	    $temp_array['flight_country'] = $row['name'];
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
-	    $flight_array[] = $temp_array;
+		$temp_array['flight_count'] = $row['nb'];
+		$temp_array['flight_country'] = $row['name'];
+		$temp_array['flight_country_iso3'] = $row['iso3'];
+		$temp_array['flight_country_iso2'] = $row['iso2'];
+		$flight_array[] = $temp_array;
 	}
 	return $flight_array;
-    }
-
-    /**
-    * Gets all number of flight over countries
-    *
-    * @return Array the airline country list
-    *
-    */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
-    {
+	}
+
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
+	public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
+	{
 	global $globalDBdriver;
 	/*
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1125,14 +1125,14 @@ 
 	$query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb
 		    FROM countries c, tracker_archive s, spotter_output o
 		    WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.famtrackid = s.famtrackid ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
+				if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
 	if ($limit) $query .= " LIMIT 0,10";
       
@@ -1145,24 +1145,24 @@ 
         
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
-	    $temp_array['airline_icao'] = $row['airline_icao'];
-	    $temp_array['flight_count'] = $row['nb'];
-	    $temp_array['flight_country'] = $row['name'];
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
-	    $flight_array[] = $temp_array;
+		$temp_array['airline_icao'] = $row['airline_icao'];
+		$temp_array['flight_count'] = $row['nb'];
+		$temp_array['flight_country'] = $row['name'];
+		$temp_array['flight_country_iso3'] = $row['iso3'];
+		$temp_array['flight_country_iso2'] = $row['iso2'];
+		$flight_array[] = $temp_array;
 	}
 	return $flight_array;
-    }
-
-    /**
-    * Gets last spotter information based on a particular callsign
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getDateArchiveTrackerDataById($id,$date)
-    {
+	}
+
+	/**
+	 * Gets last spotter information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getDateArchiveTrackerDataById($id,$date)
+	{
 	$Tracker = new Tracker($this->db);
 	date_default_timezone_set('UTC');
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -1170,16 +1170,16 @@ 
 	$date = date('c',$date);
 	$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date));
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all the spotter information based on a particular callsign
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getDateArchiveTrackerDataByIdent($ident,$date)
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getDateArchiveTrackerDataByIdent($ident,$date)
+	{
 	$Tracker = new Tracker($this->db);
 	date_default_timezone_set('UTC');
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
@@ -1187,16 +1187,16 @@ 
 	$date = date('c',$date);
 	$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all the spotter information based on the airport
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on the airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+	{
 	global $global_query;
 	$Tracker = new Tracker($this->db);
 	date_default_timezone_set('UTC');
@@ -1207,35 +1207,35 @@ 
 	
 	if ($airport != "")
 	{
-	    if (!is_string($airport))
-	    {
+		if (!is_string($airport))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND ((tracker_archive_output.departure_airport_icao = :airport) OR (tracker_archive_output.arrival_airport_icao = :airport))";
 		$query_values = array(':airport' => $airport);
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 	
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Tracker->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Tracker->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY tracker_archive_output.date DESC";
+		$orderby_query = " ORDER BY tracker_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." tracker_archive_output.ident <> '' ".$additional_query." AND ((tracker_archive_output.departure_airport_icao <> 'NA') AND (tracker_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query;
@@ -1243,6 +1243,6 @@ 
 	$spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
+	}
 }
 ?>
\ No newline at end of file

require/class.MarineArchive.php

Indentation +589 added lines, -589 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, $globalDBdriver;
 		$filters = array();
@@ -110,44 +110,44 @@ 
 	}
 
 
-        /**
-        * Gets all the spotter information based on a particular callsign
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLastArchiveMarineDataByIdent($ident)
-        {
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getLastArchiveMarineDataByIdent($ident)
+		{
 		$Marine = new Marine($this->db);
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				//$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
+				$query  = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1";
 
-                $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident));
+				$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
-        /**
-        * Gets last the spotter information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLastArchiveMarineDataById($id)
-        {
-    		$Marine = new Marine($this->db);
-                date_default_timezone_set('UTC');
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                //$query  = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id";
-                //$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
-                $query  = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
+		/**
+		 * Gets last the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getLastArchiveMarineDataById($id)
+		{
+			$Marine = new Marine($this->db);
+				date_default_timezone_set('UTC');
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				//$query  = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id";
+				//$query  = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
+				$query  = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1";
 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
-                  /*
+				  /*
                 try {
                         $Connection = new Connection();
                         $sth = Connection->$db->prepare($query);
@@ -157,178 +157,178 @@ 
                 }
                 $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC);
                 */
-                $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id));
-
-                return $spotter_array;
-        }
-
-        /**
-        * Gets all the spotter information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAllArchiveMarineDataById($id)
+				$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id));
+
+				return $spotter_array;
+		}
+
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAllArchiveMarineDataById($id)
 	{
-                date_default_timezone_set('UTC');
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
+				date_default_timezone_set('UTC');
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date";
 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
-
-                return $spotter_array;
-        }
-
-        /**
-        * Gets coordinate & time spotter information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getCoordArchiveMarineDataById($id)
-        {
-                date_default_timezone_set('UTC');
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+
+				return $spotter_array;
+		}
+
+		/**
+		 * Gets coordinate & time spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getCoordArchiveMarineDataById($id)
+		{
+				date_default_timezone_set('UTC');
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id";
 
 //              $spotter_array = Marine->getDataFromDB($query,array(':id' => $id));
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
-        /**
-        * Gets altitude information based on a particular callsign
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAltitudeArchiveMarineDataByIdent($ident)
-        {
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAltitudeArchiveMarineDataByIdent($ident)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				$query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':ident' => $ident));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
-        /**
-        * Gets altitude information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAltitudeArchiveMarineDataById($id)
-        {
+		/**
+		 * Gets altitude information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAltitudeArchiveMarineDataById($id)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
-        /**
-        * Gets altitude & speed information based on a particular id
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getAltitudeSpeedArchiveMarineDataById($id)
-        {
+		/**
+		 * Gets altitude & speed information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getAltitudeSpeedArchiveMarineDataById($id)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date";
+				$id = filter_var($id, FILTER_SANITIZE_STRING);
+				$query  = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':id' => $id));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':id' => $id));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
-        /**
-        * Gets altitude information based on a particular callsign
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLastAltitudeArchiveMarineDataByIdent($ident)
-        {
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
+		public function getLastAltitudeArchiveMarineDataByIdent($ident)
+		{
 
-                date_default_timezone_set('UTC');
+				date_default_timezone_set('UTC');
 
-                $ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
+				$ident = filter_var($ident, FILTER_SANITIZE_STRING);
+				$query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1";
 //                $query  = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident";
 
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute(array(':ident' => $ident));
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute(array(':ident' => $ident));
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 
 
-       /**
-        * Gets all the archive spotter information
-        *
-        * @return Array the spotter information
-        *
-        */
+	   /**
+	    * Gets all the archive spotter information
+	    *
+	    * @return Array the spotter information
+	    *
+	    */
 	public function getMarineArchiveData($ident,$fammarine_id,$date)
 	{
 		$Marine = new Marine($this->db);
@@ -338,10 +338,10 @@ 
 		return $spotter_array;
 	}
 
-       /**
-        * Delete all tracking data
-        *
-        */
+	   /**
+	    * Delete all tracking data
+	    *
+	    */
 	public function deleteMarineArchiveTrackData()
 	{
 		global $globalArchiveKeepTrackMonths, $globalDBdriver;
@@ -360,34 +360,34 @@ 
 	}
 
 	/**
-        * Gets Minimal Live Marine data
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getMinLiveMarineData($begindate,$enddate,$filter = array())
-        {
-                global $globalDBdriver, $globalLiveInterval;
-                date_default_timezone_set('UTC');
-
-                $filter_query = '';
-                if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
-                }
-                // Use spotter_output also ?
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
-                }
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
-                }
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
-                }
+	 * Gets Minimal Live Marine data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+		public function getMinLiveMarineData($begindate,$enddate,$filter = array())
+		{
+				global $globalDBdriver, $globalLiveInterval;
+				date_default_timezone_set('UTC');
 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-                if ($globalDBdriver == 'mysql') {
-                        /*
+				$filter_query = '';
+				if (isset($filter['source']) && !empty($filter['source'])) {
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+				}
+				// Use spotter_output also ?
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
+				}
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
+				}
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				}
+
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+				if ($globalDBdriver == 'mysql') {
+						/*
                         $query  = 'SELECT a.aircraft_shadow, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk 
                     		    FROM marine_archive 
                     		    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
@@ -406,56 +406,56 @@ 
 				    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
 				    WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' 
                         	    '.$filter_query.' ORDER BY fammarine_id';
-                } else {
-                        //$query  = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao';
-                        $query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
+				} else {
+						//$query  = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao';
+						$query  = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category 
                         	    FROM marine_archive 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao
                         	    WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' ORDER BY fammarine_id';
-                }
-                //echo $query;
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				}
+				//echo $query;
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 	/**
-        * Gets Minimal Live Marine data
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array())
-        {
-                global $globalDBdriver, $globalLiveInterval;
-                date_default_timezone_set('UTC');
-
-                $filter_query = '';
-                if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
-                }
-                // Should use spotter_output also ?
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
-                }
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
-                }
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
-                }
+	 * Gets Minimal Live Marine data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+		public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array())
+		{
+				global $globalDBdriver, $globalLiveInterval;
+				date_default_timezone_set('UTC');
 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-                if ($globalDBdriver == 'mysql') {
-                        /*
+				$filter_query = '';
+				if (isset($filter['source']) && !empty($filter['source'])) {
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+				}
+				// Should use spotter_output also ?
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
+				}
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
+				}
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				}
+
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+				if ($globalDBdriver == 'mysql') {
+						/*
                         $query  = 'SELECT a.aircraft_shadow, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk 
                     		    FROM marine_archive 
                     		    INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao';
@@ -466,95 +466,95 @@ 
 				    WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') 
                         	    '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow';
 
-                } else {
-                        //$query  = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow FROM marine_archive_output INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive_output.fammarine_id = s.fammarine_id AND marine_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao';
-                       /*
+				} else {
+						//$query  = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow FROM marine_archive_output INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive_output.fammarine_id = s.fammarine_id AND marine_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao';
+					   /*
                         $query  = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
                         	    FROM marine_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow';
                         */
-                        $query  = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
+						$query  = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow
                         	    FROM marine_archive_output 
                         	    INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao
                         	    WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".'
                         	    '.$filter_query.' LIMIT 200 OFFSET 0';
 //                        	    .' GROUP BY spotter_output.fammarine_id, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow';
                         	    
-                }
-                //echo $query;
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
-                $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
+				}
+				//echo $query;
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
+				$spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC);
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
 	 /**
-        * Gets count Live Marine data
-        *
-        * @return Array the spotter information
-        *
-        */
-        public function getLiveMarineCount($begindate,$enddate,$filter = array())
-        {
-                global $globalDBdriver, $globalLiveInterval;
-                date_default_timezone_set('UTC');
-
-                $filter_query = '';
-                if (isset($filter['source']) && !empty($filter['source'])) {
-                        $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
-                }
-                if (isset($filter['airlines']) && !empty($filter['airlines'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
-                }
-                if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
-                        $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
-                }
-                if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
-                        $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
-                }
+	  * Gets count Live Marine data
+	  *
+	  * @return Array the spotter information
+	  *
+	  */
+		public function getLiveMarineCount($begindate,$enddate,$filter = array())
+		{
+				global $globalDBdriver, $globalLiveInterval;
+				date_default_timezone_set('UTC');
 
-                //if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
-                if ($globalDBdriver == 'mysql') {
+				$filter_query = '';
+				if (isset($filter['source']) && !empty($filter['source'])) {
+						$filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') ";
+				}
+				if (isset($filter['airlines']) && !empty($filter['airlines'])) {
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id ";
+				}
+				if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) {
+						$filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id ";
+				}
+				if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) {
+						$filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')";
+				}
+
+				//if (!isset($globalLiveInterval)) $globalLiveInterval = '200';
+				if ($globalDBdriver == 'mysql') {
 			$query = 'SELECT COUNT(DISTINCT fammarine_id) as nb 
 			FROM marine_archive l 
 			WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query;
-                } else {
+				} else {
 			$query = 'SELECT COUNT(DISTINCT fammarine_id) as nb FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query;
-                }
-                //echo $query;
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        echo $e->getMessage();
-                        die;
-                }
+				}
+				//echo $query;
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						echo $e->getMessage();
+						die;
+				}
 		$result = $sth->fetch(PDO::FETCH_ASSOC);
 		$sth->closeCursor();
-                return $result['nb'];
+				return $result['nb'];
 
-        }
+		}
 
 
 
 	// marine_archive_output
 	
-    /**
-    * Gets all the spotter information
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function searchMarineData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
-    {
+	/**
+	 * Gets all the spotter information
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function searchMarineData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array())
+	{
 	global $globalTimezone, $globalDBdriver;
 	require_once(dirname(__FILE__).'/class.Translation.php');
 	$Translation = new Translation($this->db);
@@ -568,159 +568,159 @@ 
 	$filter_query = $this->getFilter($filters);
 	if ($q != "")
 	{
-	    if (!is_string($q))
-	    {
+		if (!is_string($q))
+		{
 		return false;
-	    } else {
+		} else {
 	        
 		$q_array = explode(" ", $q);
 		
 		foreach ($q_array as $q_item){
-		    $additional_query .= " AND (";
-		    $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR ";
-		    $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR ";
-		    $translate = $Translation->ident2icao($q_item);
-		    if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
-		    $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')";
-		    $additional_query .= ")";
+			$additional_query .= " AND (";
+			$additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR ";
+			$additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR ";
+			$translate = $Translation->ident2icao($q_item);
+			if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR ";
+			$additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')";
+			$additional_query .= ")";
+		}
 		}
-	    }
 	}
 	
 	if ($registration != "")
 	{
-	    $registration = filter_var($registration,FILTER_SANITIZE_STRING);
-	    if (!is_string($registration))
-	    {
+		$registration = filter_var($registration,FILTER_SANITIZE_STRING);
+		if (!is_string($registration))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.registration = '".$registration."')";
-	    }
+		}
 	}
 	
 	if ($aircraft_icao != "")
 	{
-	    $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
-	    if (!is_string($aircraft_icao))
-	    {
+		$aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING);
+		if (!is_string($aircraft_icao))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.aircraft_icao = '".$aircraft_icao."')";
-	    }
+		}
 	}
 	
 	if ($aircraft_manufacturer != "")
 	{
-	    $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
-	    if (!is_string($aircraft_manufacturer))
-	    {
+		$aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING);
+		if (!is_string($aircraft_manufacturer))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')";
-	    }
+		}
 	}
 	
 	if ($highlights == "true")
 	{
-	    if (!is_string($highlights))
-	    {
+		if (!is_string($highlights))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.highlight <> '')";
-	    }
+		}
 	}
 	
 	if ($airline_icao != "")
 	{
-	    $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
-	    if (!is_string($airline_icao))
-	    {
+		$airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING);
+		if (!is_string($airline_icao))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.airline_icao = '".$airline_icao."')";
-	    }
+		}
 	}
 	
 	if ($airline_country != "")
 	{
-	    $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
-	    if (!is_string($airline_country))
-	    {
+		$airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING);
+		if (!is_string($airline_country))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.airline_country = '".$airline_country."')";
-	    }
+		}
 	}
 	
 	if ($airline_type != "")
 	{
-	    $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
-	    if (!is_string($airline_type))
-	    {
+		$airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING);
+		if (!is_string($airline_type))
+		{
 		return false;
-	    } else {
+		} else {
 		if ($airline_type == "passenger")
 		{
-		    $additional_query .= " AND (marine_archive_output.airline_type = 'passenger')";
+			$additional_query .= " AND (marine_archive_output.airline_type = 'passenger')";
 		}
 		if ($airline_type == "cargo")
 		{
-		    $additional_query .= " AND (marine_archive_output.airline_type = 'cargo')";
+			$additional_query .= " AND (marine_archive_output.airline_type = 'cargo')";
 		}
 		if ($airline_type == "military")
 		{
-		    $additional_query .= " AND (marine_archive_output.airline_type = 'military')";
+			$additional_query .= " AND (marine_archive_output.airline_type = 'military')";
+		}
 		}
-	    }
 	}
 	
 	if ($airport != "")
 	{
-	    $airport = filter_var($airport,FILTER_SANITIZE_STRING);
-	    if (!is_string($airport))
-	    {
+		$airport = filter_var($airport,FILTER_SANITIZE_STRING);
+		if (!is_string($airport))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND ((marine_archive_output.departure_airport_icao = '".$airport."') OR (marine_archive_output.arrival_airport_icao = '".$airport."'))";
-	    }
+		}
 	}
 	
 	if ($airport_country != "")
 	{
-	    $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
-	    if (!is_string($airport_country))
-	    {
+		$airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING);
+		if (!is_string($airport_country))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND ((marine_archive_output.departure_airport_country = '".$airport_country."') OR (marine_archive_output.arrival_airport_country = '".$airport_country."'))";
-	    }
+		}
 	}
     
 	if ($callsign != "")
 	{
-	    $callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
-	    if (!is_string($callsign))
-	    {
+		$callsign = filter_var($callsign,FILTER_SANITIZE_STRING);
+		if (!is_string($callsign))
+		{
 		return false;
-	    } else {
+		} else {
 		$translate = $Translation->ident2icao($callsign);
 		if ($translate != $callsign) {
 			$additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)";
@@ -728,99 +728,99 @@ 
 		} else {
 			$additional_query .= " AND (marine_archive_output.ident = '".$callsign."')";
 		}
-	    }
+		}
 	}
 
 	if ($owner != "")
 	{
-	    $owner = filter_var($owner,FILTER_SANITIZE_STRING);
-	    if (!is_string($owner))
-	    {
+		$owner = filter_var($owner,FILTER_SANITIZE_STRING);
+		if (!is_string($owner))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.owner_name = '".$owner."')";
-	    }
+		}
 	}
 
 	if ($pilot_name != "")
 	{
-	    $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
-	    if (!is_string($pilot_name))
-	    {
+		$pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING);
+		if (!is_string($pilot_name))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.pilot_name = '".$pilot_name."')";
-	    }
+		}
 	}
 	
 	if ($pilot_id != "")
 	{
-	    $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
-	    if (!is_string($pilot_id))
-	    {
+		$pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT);
+		if (!is_string($pilot_id))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.pilot_id = '".$pilot_id."')";
-	    }
+		}
 	}
 	
 	if ($departure_airport_route != "")
 	{
-	    $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
-	    if (!is_string($departure_airport_route))
-	    {
+		$departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING);
+		if (!is_string($departure_airport_route))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.departure_airport_icao = '".$departure_airport_route."')";
-	    }
+		}
 	}
 	
 	if ($arrival_airport_route != "")
 	{
-	    $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
-	    if (!is_string($arrival_airport_route))
-	    {
+		$arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING);
+		if (!is_string($arrival_airport_route))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND (marine_archive_output.arrival_airport_icao = '".$arrival_airport_route."')";
-	    }
+		}
 	}
 	
 	if ($altitude != "")
 	{
-	    $altitude_array = explode(",", $altitude);
+		$altitude_array = explode(",", $altitude);
 	    
-	    $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-	    $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
+		$altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 	    
 
-	    if ($altitude_array[1] != "")
-	    {                
+		if ($altitude_array[1] != "")
+		{                
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
 		$altitude_array[1] = substr($altitude_array[1], 0, -2);
 		$additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' ";
-	    } else {
+		} else {
 		$altitude_array[0] = substr($altitude_array[0], 0, -2);
 		$additional_query .= " AND altitude <= '".$altitude_array[0]."' ";
-	    }
+		}
 	}
 	
 	if ($date_posted != "")
 	{
-	    $date_array = explode(",", $date_posted);
+		$date_array = explode(",", $date_posted);
 	    
-	    $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
-	    $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
+		$date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING);
+		$date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING);
 	    
-	    if ($globalTimezone != '') {
+		if ($globalTimezone != '') {
 		date_default_timezone_set($globalTimezone);
 		$datetime = new DateTime();
 		$offset = $datetime->format('P');
-	    } else $offset = '+00:00';
+		} else $offset = '+00:00';
 
 
-	    if ($date_array[1] != "")
-	    {                
+		if ($date_array[1] != "")
+		{                
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
 		$date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1]));
 		if ($globalDBdriver == 'mysql') {
@@ -828,28 +828,28 @@ 
 		} else {
 			$additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) ";
 		}
-	    } else {
+		} else {
 		$date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0]));
-                if ($globalDBdriver == 'mysql') {
+				if ($globalDBdriver == 'mysql') {
 			$additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' ";
 		} else {
 			$additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) ";
 		}
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 	
 
@@ -880,33 +880,33 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query);
 
 	return $spotter_array;
-    }
+	}
 
-    public function deleteMarineArchiveData()
-    {
+	public function deleteMarineArchiveData()
+	{
 		global $globalArchiveKeepMonths, $globalDBdriver;
-                date_default_timezone_set('UTC');
-                if ($globalDBdriver == 'mysql') {
+				date_default_timezone_set('UTC');
+				if ($globalDBdriver == 'mysql') {
 			$query = 'DELETE FROM marine_archive_output WHERE marine_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)';
 		} else {
 			$query = "DELETE FROM marine_archive_output WHERE marine_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'";
 		}
-                try {
-                        $sth = $this->db->prepare($query);
-                        $sth->execute();
-                } catch(PDOException $e) {
-                        return "error";
-                }
+				try {
+						$sth = $this->db->prepare($query);
+						$sth->execute();
+				} catch(PDOException $e) {
+						return "error";
+				}
 	}
 
-    /**
-    * Gets all the spotter information based on the callsign
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getMarineDataByIdent($ident = '', $limit = '', $sort = '')
-    {
+	/**
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getMarineDataByIdent($ident = '', $limit = '', $sort = '')
+	{
 	$global_query = "SELECT marine_archive_output.* FROM marine_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -918,35 +918,35 @@ 
 	
 	if ($ident != "")
 	{
-	    if (!is_string($ident))
-	    {
+		if (!is_string($ident))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query = " AND (marine_archive_output.ident = :ident)";
 		$query_values = array(':ident' => $ident);
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Marine->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Marine->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
 	}
 
 	$query = $global_query." WHERE marine_archive_output.ident <> '' ".$additional_query." ".$orderby_query;
@@ -954,17 +954,17 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
+	}
 
 
-    /**
-    * Gets all the spotter information based on the owner
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
-    {
+	/**
+	 * Gets all the spotter information based on the owner
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array())
+	{
 	$global_query = "SELECT marine_archive_output.* FROM marine_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -977,35 +977,35 @@ 
 	
 	if ($owner != "")
 	{
-	    if (!is_string($owner))
-	    {
+		if (!is_string($owner))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query = " AND (marine_archive_output.owner_name = :owner)";
 		$query_values = array(':owner' => $owner);
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Marine->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Marine->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." marine_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query;
@@ -1013,16 +1013,16 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all the spotter information based on the pilot
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on the pilot
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array())
+	{
 	$global_query = "SELECT marine_archive_output.* FROM marine_archive_output";
 	
 	date_default_timezone_set('UTC');
@@ -1041,24 +1041,24 @@ 
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Marine->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Marine->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." marine_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query;
@@ -1066,16 +1066,16 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all number of flight over countries
-    *
-    * @return Array the airline country list
-    *
-    */
-    public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
-    {
+	}
+
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
+	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '')
+	{
 	global $globalDBdriver;
 	/*
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1085,14 +1085,14 @@ 
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb
 		    FROM countries c, marine_archive s
 		    WHERE c.iso2 = s.over_country ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
+				if ($sincedate != '') $query .= "AND date > '".$sincedate."' ";
 	$query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC";
 	if ($limit) $query .= " LIMIT 0,10";
       
@@ -1105,23 +1105,23 @@ 
         
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
-	    $temp_array['flight_count'] = $row['nb'];
-	    $temp_array['flight_country'] = $row['name'];
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
-	    $flight_array[] = $temp_array;
+		$temp_array['flight_count'] = $row['nb'];
+		$temp_array['flight_country'] = $row['name'];
+		$temp_array['flight_country_iso3'] = $row['iso3'];
+		$temp_array['flight_country_iso2'] = $row['iso2'];
+		$flight_array[] = $temp_array;
 	}
 	return $flight_array;
-    }
-
-    /**
-    * Gets all number of flight over countries
-    *
-    * @return Array the airline country list
-    *
-    */
-    public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
-    {
+	}
+
+	/**
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
+	public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '')
+	{
 	global $globalDBdriver;
 	/*
 	$query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb 
@@ -1131,14 +1131,14 @@ 
 	$query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb
 		    FROM countries c, marine_archive s, spotter_output o
 		    WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.fammarine_id = s.fammarine_id ";
-                if ($olderthanmonths > 0) {
-            		if ($globalDBdriver == 'mysql') {
+				if ($olderthanmonths > 0) {
+					if ($globalDBdriver == 'mysql') {
 				$query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) ';
 			} else {
 				$query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'";
 			}
 		}
-                if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
+				if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' ";
 	$query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC";
 	if ($limit) $query .= " LIMIT 0,10";
       
@@ -1151,24 +1151,24 @@ 
         
 	while($row = $sth->fetch(PDO::FETCH_ASSOC))
 	{
-	    $temp_array['airline_icao'] = $row['airline_icao'];
-	    $temp_array['flight_count'] = $row['nb'];
-	    $temp_array['flight_country'] = $row['name'];
-	    $temp_array['flight_country_iso3'] = $row['iso3'];
-	    $temp_array['flight_country_iso2'] = $row['iso2'];
-	    $flight_array[] = $temp_array;
+		$temp_array['airline_icao'] = $row['airline_icao'];
+		$temp_array['flight_count'] = $row['nb'];
+		$temp_array['flight_country'] = $row['name'];
+		$temp_array['flight_country_iso3'] = $row['iso3'];
+		$temp_array['flight_country_iso2'] = $row['iso2'];
+		$flight_array[] = $temp_array;
 	}
 	return $flight_array;
-    }
-
-    /**
-    * Gets last spotter information based on a particular callsign
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getDateArchiveMarineDataById($id,$date)
-    {
+	}
+
+	/**
+	 * Gets last spotter information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getDateArchiveMarineDataById($id,$date)
+	{
 	$Marine = new Marine($this->db);
 	date_default_timezone_set('UTC');
 	$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -1176,16 +1176,16 @@ 
 	$date = date('c',$date);
 	$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date));
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all the spotter information based on a particular callsign
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getDateArchiveMarineDataByIdent($ident,$date)
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on a particular callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getDateArchiveMarineDataByIdent($ident,$date)
+	{
 	$Marine = new Marine($this->db);
 	date_default_timezone_set('UTC');
 	$ident = filter_var($ident, FILTER_SANITIZE_STRING);
@@ -1193,16 +1193,16 @@ 
 	$date = date('c',$date);
 	$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
 	return $spotter_array;
-    }
-
-    /**
-    * Gets all the spotter information based on the airport
-    *
-    * @return Array the spotter information
-    *
-    */
-    public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
-    {
+	}
+
+	/**
+	 * Gets all the spotter information based on the airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
+	public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array())
+	{
 	global $global_query;
 	$Marine = new Marine($this->db);
 	date_default_timezone_set('UTC');
@@ -1213,35 +1213,35 @@ 
 	
 	if ($airport != "")
 	{
-	    if (!is_string($airport))
-	    {
+		if (!is_string($airport))
+		{
 		return false;
-	    } else {
+		} else {
 		$additional_query .= " AND ((marine_archive_output.departure_airport_icao = :airport) OR (marine_archive_output.arrival_airport_icao = :airport))";
 		$query_values = array(':airport' => $airport);
-	    }
+		}
 	}
 	
 	if ($limit != "")
 	{
-	    $limit_array = explode(",", $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)
-	    {
+		if ($limit_array[0] >= 0 && $limit_array[1] >= 0)
+		{
 		//$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1];
 		$limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0];
-	    }
+		}
 	}
 	
 	if ($sort != "")
 	{
-	    $search_orderby_array = $Marine->getOrderBy();
-	    $orderby_query = $search_orderby_array[$sort]['sql'];
+		$search_orderby_array = $Marine->getOrderBy();
+		$orderby_query = $search_orderby_array[$sort]['sql'];
 	} else {
-	    $orderby_query = " ORDER BY marine_archive_output.date DESC";
+		$orderby_query = " ORDER BY marine_archive_output.date DESC";
 	}
 
 	$query = $global_query.$filter_query." marine_archive_output.ident <> '' ".$additional_query." AND ((marine_archive_output.departure_airport_icao <> 'NA') AND (marine_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query;
@@ -1249,6 +1249,6 @@ 
 	$spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query);
 
 	return $spotter_array;
-    }
+	}
 }
 ?>
\ No newline at end of file

js/map-tracker.2d.js.php

Indentation +5 added lines, -5 removed lines

@@ -554,8 +554,8 @@ 
 			}
                     }
 		    <?php
-            		} else {
-            	    ?>
+					} else {
+					?>
 		    if (map.getZoom() > 7) {
                 	var style = {
                     	    "color": "#1a3151",
@@ -574,7 +574,7 @@ 
                 	layer_tracker_data.addLayer(layer);
 		    }
 <?php
-            		}
+					}
 ?>
 				}
 			    }
@@ -599,11 +599,11 @@ 
 $( document ).ready(function() {
 	map.on('moveend', function() {
 <?php
-    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+	if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 ?>
 		getLiveTrackerData(1);
 <?php
-    }
+	}
 ?>
 	});
  //load the function on startup

require/class.TrackerLive.php

Indentation +193 added lines, -193 removed lines

@@ -13,10 +13,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, $globalDBdriver;
 		$filters = array();
@@ -87,11 +87,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveTrackerData($limit = '', $sort = '', $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -133,11 +133,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveTrackerData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -171,11 +171,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data since xx seconds
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data since xx seconds
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLastLiveTrackerData($coord,$filter = array(),$limit = false)
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalArchive, $globalMap3DTrackersLimit;
@@ -249,11 +249,11 @@ 
 	}
 
 	/**
-	* Gets number of latest data entry
-	*
-	* @return String number of entry
-	*
-	*/
+	 * Gets number of latest data entry
+	 *
+	 * @return String number of entry
+	 *
+	 */
 	public function getLiveTrackerCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -278,11 +278,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveTrackerDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -306,11 +306,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveTrackerDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
@@ -378,11 +378,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on a user's latitude and longitude
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestTrackerForLayar($lat, $lng, $radius, $interval)
 	{
 		$Tracker = new Tracker($this->db);
@@ -395,142 +395,142 @@ 
 		if ($lng != '')
 		{
 			if (!is_numeric($lng))
-                        {
-                                return false;
-                        }
-                }
-
-                if ($radius != '')
-                {
-                        if (!is_numeric($radius))
-                        {
-                                return false;
-                        }
-                }
+						{
+								return false;
+						}
+				}
+
+				if ($radius != '')
+				{
+						if (!is_numeric($radius))
+						{
+								return false;
+						}
+				}
 		$additional_query = '';
 		if ($interval != '')
-                {
-                        if (!is_string($interval))
-                        {
-                                //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date ';
-			        return false;
-                        } else {
-                if ($interval == '1m')
-                {
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date ';
-                } else if ($interval == '15m'){
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= tracker_live.date ';
-                } 
-            }
-                } else {
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date ';   
-        }
-
-                $query  = "SELECT tracker_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM tracker_live 
+				{
+						if (!is_string($interval))
+						{
+								//$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date ';
+					return false;
+						} else {
+				if ($interval == '1m')
+				{
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date ';
+				} else if ($interval == '15m'){
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= tracker_live.date ';
+				} 
+			}
+				} else {
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= tracker_live.date ';   
+		}
+
+				$query  = "SELECT tracker_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM tracker_live 
                    WHERE tracker_live.latitude <> '' 
                                    AND tracker_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Tracker->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
+				$spotter_array = $Tracker->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
     
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveTrackerDataByIdent($ident)
 	{
 		$Tracker = new Tracker($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
+				$query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
 
 		$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveTrackerDataByIdent($ident,$date)
 	{
 		$Tracker = new Tracker($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
+				$query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
 
-                $date = date('c',$date);
+				$date = date('c',$date);
 		$spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveTrackerDataById($id)
 	{
 		$Tracker = new Tracker($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
+				$query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
 
 		$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveTrackerDataById($id,$date)
 	{
 		$Tracker = new Tracker($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
-                $date = date('c',$date);
+				$query  = 'SELECT tracker_live.* FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l WHERE l.famtrackid = :id AND l.date <= :date GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate ORDER BY tracker_live.date DESC';
+				$date = date('c',$date);
 		$spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets altitude information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets altitude information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAltitudeLiveTrackerDataByIdent($ident)
 	{
 
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT tracker_live.altitude, tracker_live.date FROM tracker_live WHERE tracker_live.ident = :ident';
+				$query  = 'SELECT tracker_live.altitude, tracker_live.date FROM tracker_live WHERE tracker_live.ident = :ident';
 
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -543,12 +543,12 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveTrackerDataById($id,$liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -576,18 +576,18 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular ident
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular ident
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveTrackerDataByIdent($ident)
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = self::$global_query.' WHERE tracker_live.ident = :ident';
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -601,23 +601,23 @@ 
 
 
 	/**
-	* Deletes all info in the table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveTrackerData()
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "DELETE FROM tracker_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= tracker_live.date";
 			$query  = 'DELETE FROM tracker_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= tracker_live.date';
-            		//$query  = "DELETE FROM tracker_live WHERE tracker_live.id IN (SELECT tracker_live.id FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= tracker_live.date)";
+					//$query  = "DELETE FROM tracker_live WHERE tracker_live.id IN (SELECT tracker_live.id FROM tracker_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_live l GROUP BY l.famtrackid) s on tracker_live.famtrackid = s.famtrackid AND tracker_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= tracker_live.date)";
 		} else {
 			$query  = "DELETE FROM tracker_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= tracker_live.date";
 		}
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
@@ -629,18 +629,18 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveTrackerDataNotUpdated()
 	{
 		global $globalDBdriver, $globalDebug;
 		if ($globalDBdriver == 'mysql') {
 			//$query = 'SELECT famtrackid FROM tracker_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= tracker_live.date AND tracker_live.famtrackid NOT IN (SELECT famtrackid FROM tracker_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < tracker_live.date) LIMIT 800 OFFSET 0';
-    			$query = "SELECT tracker_live.famtrackid FROM tracker_live INNER JOIN (SELECT famtrackid,MAX(date) as max_date FROM tracker_live GROUP BY famtrackid) s ON s.famtrackid = tracker_live.famtrackid AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
-    			try {
+				$query = "SELECT tracker_live.famtrackid FROM tracker_live INNER JOIN (SELECT famtrackid,MAX(date) as max_date FROM tracker_live GROUP BY famtrackid) s ON s.famtrackid = tracker_live.famtrackid AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -648,8 +648,8 @@ 
 				return "error";
 			}
 			$query_delete = 'DELETE FROM tracker_live WHERE famtrackid IN (';
-                        $i = 0;
-                        $j =0;
+						$i = 0;
+						$j =0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			foreach($all as $row)
 			{
@@ -657,20 +657,20 @@ 
 				$j++;
 				if ($j == 30) {
 					if ($globalDebug) echo ".";
-				    	try {
+						try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 						$sth->execute();
 					} catch(PDOException $e) {
 						return "error";
 					}
-                                	$query_delete = 'DELETE FROM tracker_live WHERE famtrackid IN (';
-                                	$j = 0;
+									$query_delete = 'DELETE FROM tracker_live WHERE famtrackid IN (';
+									$j = 0;
 				}
 				$query_delete .= "'".$row['famtrackid']."',";
 			}
 			if ($i > 0) {
-    				try {
+					try {
 					
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 					$sth->execute();
@@ -681,9 +681,9 @@ 
 			return "success";
 		} elseif ($globalDBdriver == 'pgsql') {
 			//$query = "SELECT famtrackid FROM tracker_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= tracker_live.date AND tracker_live.famtrackid NOT IN (SELECT famtrackid FROM tracker_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < tracker_live.date) LIMIT 800 OFFSET 0";
-    			//$query = "SELECT tracker_live.famtrackid FROM tracker_live INNER JOIN (SELECT famtrackid,MAX(date) as max_date FROM tracker_live GROUP BY famtrackid) s ON s.famtrackid = tracker_live.famtrackid AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
-    			$query = "DELETE FROM tracker_live WHERE famtrackid IN (SELECT tracker_live.famtrackid FROM tracker_live INNER JOIN (SELECT famtrackid,MAX(date) as max_date FROM tracker_live GROUP BY famtrackid) s ON s.famtrackid = tracker_live.famtrackid AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
-    			try {
+				//$query = "SELECT tracker_live.famtrackid FROM tracker_live INNER JOIN (SELECT famtrackid,MAX(date) as max_date FROM tracker_live GROUP BY famtrackid) s ON s.famtrackid = tracker_live.famtrackid AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
+				$query = "DELETE FROM tracker_live WHERE famtrackid IN (SELECT tracker_live.famtrackid FROM tracker_live INNER JOIN (SELECT famtrackid,MAX(date) as max_date FROM tracker_live GROUP BY famtrackid) s ON s.famtrackid = tracker_live.famtrackid AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -727,17 +727,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an ident
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an ident
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveTrackerDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM tracker_live WHERE ident = :ident';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -749,17 +749,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an id
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an id
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveTrackerDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM tracker_live WHERE famtrackid = :id';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -772,11 +772,11 @@ 
 
 
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -802,14 +802,14 @@ 
 			$ident_result = $row['ident'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdentRecent($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -835,14 +835,14 @@ 
 			$ident_result = $row['famtrackid'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by id
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by id
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdRecent($id)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -868,19 +868,19 @@ 
 			$ident_result = $row['famtrackid'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $famtrackid the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $famtrackid the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */
 	public function addLiveTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $comment = '', $type = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
@@ -953,8 +953,8 @@ 
 		$comment = filter_var($comment,FILTER_SANITIZE_STRING);
 		$type = filter_var($type,FILTER_SANITIZE_STRING);
 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
             	
 		$query = '';
 		if ($globalArchive) {
@@ -972,15 +972,15 @@ 
 		} catch(PDOException $e) {
 			return "error : ".$e->getMessage();
 		}
-                /*
+				/*
                 echo 'putinarchive : '.$putinarchive."\n";
                 echo 'noarchive : '.$noarchive."\n";
                 */
 		if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) {
-		    if ($globalDebug) echo '(Add to Tracker archive '.$famtrackid.' : ';
-		    $TrackerArchive = new TrackerArchive($this->db);
-		    $result =  $TrackerArchive->addTrackerArchiveData($famtrackid, $ident,$latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type,$noarchive,$format_source, $source_name, $over_country);
-		    if ($globalDebug) echo $result.')';
+			if ($globalDebug) echo '(Add to Tracker archive '.$famtrackid.' : ';
+			$TrackerArchive = new TrackerArchive($this->db);
+			$result =  $TrackerArchive->addTrackerArchiveData($famtrackid, $ident,$latitude, $longitude, $altitude, $heading, $groundspeed, $date, $putinarchive, $comment, $type,$noarchive,$format_source, $source_name, $over_country);
+			if ($globalDebug) echo $result.')';
 		}
 
 		return "success";

require/class.MarineLive.php

Indentation +188 added lines, -188 removed lines

@@ -13,10 +13,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, $globalDBdriver;
 		$filters = array();
@@ -87,11 +87,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveMarineData($limit = '', $sort = '', $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -134,11 +134,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveMarineData($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -168,11 +168,11 @@ 
 	}
 
 	/**
-	* Gets Minimal Live Spotter data since xx seconds
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets Minimal Live Spotter data since xx seconds
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLastLiveMarineData($coord = array(),$filter = array(), $limit = false)
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalMap3DMarinesLimit, $globalArchive;
@@ -243,11 +243,11 @@ 
 	}
 
 	/**
-	* Gets number of latest data entry
-	*
-	* @return String number of entry
-	*
-	*/
+	 * Gets number of latest data entry
+	 *
+	 * @return String number of entry
+	 *
+	 */
 	public function getLiveMarineCount($filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -272,11 +272,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveMarineDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -300,11 +300,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the latest data entry and coord
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the latest data entry and coord
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveMarineDatabyCoord($coord, $filter = array())
 	{
 		global $globalDBdriver, $globalLiveInterval, $globalArchive;
@@ -373,11 +373,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on a user's latitude and longitude
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on a user's latitude and longitude
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLatestMarineForLayar($lat, $lng, $radius, $interval)
 	{
 		$Marine = new Marine($this->db);
@@ -390,134 +390,134 @@ 
 		if ($lng != '')
 		{
 			if (!is_numeric($lng))
-                        {
-                                return false;
-                        }
-                }
-
-                if ($radius != '')
-                {
-                        if (!is_numeric($radius))
-                        {
-                                return false;
-                        }
-                }
+						{
+								return false;
+						}
+				}
+
+				if ($radius != '')
+				{
+						if (!is_numeric($radius))
+						{
+								return false;
+						}
+				}
 		$additional_query = '';
 		if ($interval != '')
-                {
-                        if (!is_string($interval))
-                        {
-                                //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
-			        return false;
-                        } else {
-                if ($interval == '1m')
-                {
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
-                } else if ($interval == '15m'){
-                    $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date ';
-                } 
-            }
-                } else {
-         $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';   
-        }
-
-                $query  = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live 
+				{
+						if (!is_string($interval))
+						{
+								//$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
+					return false;
+						} else {
+				if ($interval == '1m')
+				{
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';
+				} else if ($interval == '15m'){
+					$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date ';
+				} 
+			}
+				} else {
+		 $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date ';   
+		}
+
+				$query  = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live 
                    WHERE marine_live.latitude <> '' 
                                    AND marine_live.longitude <> '' 
                    ".$additional_query."
                    HAVING distance < :radius  
                                    ORDER BY distance";
 
-                $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
+				$spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius));
 
-                return $spotter_array;
-        }
+				return $spotter_array;
+		}
 
     
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveMarineDataByIdent($ident)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
 
 		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveMarineDataByIdent($ident,$date)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
 
-                $date = date('c',$date);
+				$date = date('c',$date);
 		$spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date));
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getLastLiveMarineDataById($id)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
 
 		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id),'',true);
 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets last spotter information based on a particular callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets last spotter information based on a particular callsign
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getDateLiveMarineDataById($id,$date)
 	{
 		$Marine = new Marine($this->db);
 		date_default_timezone_set('UTC');
 
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
-                $query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
-                $date = date('c',$date);
+				$query  = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC';
+				$date = date('c',$date);
 		$spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true);
 
 		return $spotter_array;
 	}
 
 
-        /**
-	* Gets all the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular id
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveMarineDataById($id,$liveinterval = false)
 	{
 		global $globalDBdriver, $globalLiveInterval;
@@ -545,18 +545,18 @@ 
 		return $spotter_array;
 	}
 
-        /**
-	* Gets all the spotter information based on a particular ident
-	*
-	* @return Array the spotter information
-	*
-	*/
+		/**
+		 * Gets all the spotter information based on a particular ident
+		 *
+		 * @return Array the spotter information
+		 *
+		 */
 	public function getAllLiveMarineDataByIdent($ident)
 	{
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = self::$global_query.' WHERE marine_live.ident = :ident';
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -570,23 +570,23 @@ 
 
 
 	/**
-	* Deletes all info in the table
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineData()
 	{
 		global $globalDBdriver;
 		if ($globalDBdriver == 'mysql') {
 			//$query  = "DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= marine_live.date";
 			$query  = 'DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= marine_live.date';
-            		//$query  = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)";
+					//$query  = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)";
 		} else {
 			$query  = "DELETE FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date";
 		}
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute();
@@ -598,18 +598,18 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for aircraft not seen since 2 HOUR
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for aircraft not seen since 2 HOUR
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataNotUpdated()
 	{
 		global $globalDBdriver, $globalDebug;
 		if ($globalDBdriver == 'mysql') {
 			//$query = 'SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < marine_live.date) LIMIT 800 OFFSET 0';
-    			$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
-    			try {
+				$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -617,8 +617,8 @@ 
 				return "error";
 			}
 			$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
-                        $i = 0;
-                        $j =0;
+						$i = 0;
+						$j =0;
 			$all = $sth->fetchAll(PDO::FETCH_ASSOC);
 			foreach($all as $row)
 			{
@@ -626,20 +626,20 @@ 
 				$j++;
 				if ($j == 30) {
 					if ($globalDebug) echo ".";
-				    	try {
+						try {
 						
 						$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 						$sth->execute();
 					} catch(PDOException $e) {
 						return "error";
 					}
-                                	$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
-                                	$j = 0;
+									$query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN (';
+									$j = 0;
 				}
 				$query_delete .= "'".$row['fammarine_id']."',";
 			}
 			if ($i > 0) {
-    				try {
+					try {
 					
 					$sth = $this->db->prepare(substr($query_delete,0,-1).")");
 					$sth->execute();
@@ -650,9 +650,9 @@ 
 			return "success";
 		} elseif ($globalDBdriver == 'pgsql') {
 			//$query = "SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < marine_live.date) LIMIT 800 OFFSET 0";
-    			//$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
-    			$query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
-    			try {
+				//$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0";
+				$query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)";
+				try {
 				
 				$sth = $this->db->prepare($query);
 				$sth->execute();
@@ -696,17 +696,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an ident
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an ident
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataByIdent($ident)
 	{
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM marine_live WHERE ident = :ident';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':ident' => $ident));
@@ -718,17 +718,17 @@ 
 	}
 
 	/**
-	* Deletes all info in the table for an id
-	*
-	* @return String success or false
-	*
-	*/
+	 * Deletes all info in the table for an id
+	 *
+	 * @return String success or false
+	 *
+	 */
 	public function deleteLiveMarineDataById($id)
 	{
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
 		$query  = 'DELETE FROM marine_live WHERE fammarine_id = :id';
         
-    		try {
+			try {
 			
 			$sth = $this->db->prepare($query);
 			$sth->execute(array(':id' => $id));
@@ -741,11 +741,11 @@ 
 
 
 	/**
-	* Gets the aircraft ident within the last hour
-	*
-	* @return String the ident
-	*
-	*/
+	 * Gets the aircraft ident within the last hour
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function getIdentFromLastHour($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -771,14 +771,14 @@ 
 			$ident_result = $row['ident'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdentRecent($ident)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -804,14 +804,14 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by id
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by id
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkIdRecent($id)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -837,14 +837,14 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Check recent aircraft by mmsi
-	*
-	* @return String the ident
-	*
-	*/
+	 * Check recent aircraft by mmsi
+	 *
+	 * @return String the ident
+	 *
+	 */
 	public function checkMMSIRecent($mmsi)
 	{
 		global $globalDBdriver, $globalTimezone;
@@ -870,19 +870,19 @@ 
 			$ident_result = $row['fammarine_id'];
 		}
 		return $ident_result;
-        }
+		}
 
 	/**
-	* Adds a new spotter data
-	*
-	* @param String $fammarine_id the ID from flightaware
-	* @param String $ident the flight ident
-	* @param String $aircraft_icao the aircraft type
-	* @param String $departure_airport_icao the departure airport
-	* @param String $arrival_airport_icao the arrival airport
-	* @return String success or false
-	*
-	*/
+	 * Adds a new spotter data
+	 *
+	 * @param String $fammarine_id the ID from flightaware
+	 * @param String $ident the flight ident
+	 * @param String $aircraft_icao the aircraft type
+	 * @param String $departure_airport_icao the departure airport
+	 * @param String $arrival_airport_icao the arrival airport
+	 * @return String success or false
+	 *
+	 */
 	public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '')
 	{
 		global $globalURL, $globalArchive, $globalDebug;
@@ -953,10 +953,10 @@ 
 		$arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING);
 		
 
-            	if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
-            	if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
-            	if ($arrival_date == '') $arrival_date = NULL;
-            	$query = '';
+				if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0;
+				if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0;
+				if ($arrival_date == '') $arrival_date = NULL;
+				$query = '';
 		if ($globalArchive) {
 			if ($globalDebug) echo '-- Delete previous data -- ';
 			$query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;';

js/map-marine.2d.js.php

Indentation +5 added lines, -5 removed lines

@@ -553,8 +553,8 @@ 
 			}
                     }
 		    <?php
-            		} else {
-            	    ?>
+					} else {
+					?>
 		    if (map.getZoom() > 7) {
                 	var style = {
                     	    "color": "#1a3151",
@@ -573,7 +573,7 @@ 
                 	layer_marine_data.addLayer(layer);
 		    }
 <?php
-            		}
+					}
 ?>
 				}
 			    }
@@ -598,11 +598,11 @@ 
 $( document ).ready(function() {
     map.on('moveend', function() {
 <?php
-    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+	if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 ?>
 	getLiveMarineData(1);
 <?php
-    }
+	}
 ?>
     });
  //load the function on startup

js/map-tracker.3d.js.php

Indentation +8 added lines, -8 removed lines

@@ -81,21 +81,21 @@ 
 			var entityid = entity.id;
 			var lastupdateentity = entity.properties.valueOf('lastupdate')._lastupdate._value;
 			<?php 
-			    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+				if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 			?>
 			if (lastupdateentity != lastupdatetracker) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 				czmldstracker.entities.removeById(entityid);
 			}
 			<?php
-			    } else {
+				} else {
 			?>
 			if (parseInt(lastupdateentity) < Math.floor(Date.now()-<?php if (isset($globalMapRefresh)) print $globalMapRefresh*2000; else print '60000'; ?>)) {
 				viewer.dataSources.get(dsn).entities.remove(entity);
 				czmldstracker.entities.removeById(entityid);
 			}
 			<?php
-			    }
+				}
 			?>
 		}
 	}
@@ -116,15 +116,15 @@ 
 function updateTrackerData() {
 	lastupdatetracker = Date.now();
 <?php
-    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+	if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 ?>
 	var livetrackerdata = czmldstracker.process('<?php print $globalURL; ?>/live-czml.php?tracker&coord='+bbox()+'&update=' + lastupdatetracker);
 <?php
-    } else {
+	} else {
 ?>
 	var livetrackerdata = czmldstracker.process('<?php print $globalURL; ?>/live-czml.php?tracker&update=' + lastupdatetracker);
 <?php
-    }
+	}
 ?>  
 	livetrackerdata.then(function (data) { 
 		displayTrackerData(data);
@@ -171,11 +171,11 @@ 
 }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
 camera.moveEnd.addEventListener(function() {
 <?php
-    if (isset($globalMapUseBbox) && $globalMapUseBbox) {
+	if (isset($globalMapUseBbox) && $globalMapUseBbox) {
 ?>
 	updateTrackerData();
 <?php
-    }
+	}
 ?>
 });