Ysurac / FlightAirMap

index.php

Indentation +98 added lines, -98 removed lines

@@ -49,7 +49,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<?php if (isset($tsk)) print '?tsk='.$tsk; ?>"></script>
 <?php
@@ -73,7 +73,7 @@ 
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
 <?php
 	}
-    }
+	}
 ?>
 
 <div id="sidebar" class="sidebar collapsed">
@@ -84,34 +84,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') || (isset($globalBeta) && $globalBeta === TRUE)) {
+	//if ((isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') || (isset($globalBeta) && $globalBeta === TRUE)) {
 	if (isset($globalArchive) && $globalArchive == TRUE) {
 ?>
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
 <?php
 	}
-    //}
+	//}
 ?>
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
 	<li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li>
 	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
 <?php
-    if (isset($globalMap3D) && $globalMap3D) {
+	if (isset($globalMap3D) && $globalMap3D) {
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
 ?>
 	<li><a href="" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
 <?php
 	} else {
-	    if (isset($globalSatellite) && $globalSatellite) {
+		if (isset($globalSatellite) && $globalSatellite) {
 ?>
 	<li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li>
 <?php
-	    }
+		}
 ?>
 	<li><a href="" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
 <?php
 	}
-    }
+	}
 ?>
     </ul>
 
@@ -260,72 +260,72 @@ 
 			    <?php
 				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
 				else $MapType = $_COOKIE['MapType'];
-			    ?>
+				?>
 			    <?php
 				if (isset($globalMapOffline) && $globalMapOffline === TRUE) {
-			    ?>
+				?>
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option>
 			    <?php
 				} else {
-				    if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) {
-			    ?>
+					if (file_exists(dirname(__FILE__).'/js/Cesium/Assets/Textures/NaturalEarthII/tilemapresource.xml')) {
+				?>
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth (local)</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <option value="ArcGIS-Streetmap"<?php if ($MapType == 'ArcGIS-Streetmap') print ' selected'; ?>>ArcGIS Streetmap</option>
 			    <option value="ArcGIS-Satellite"<?php if ($MapType == 'ArcGIS-Satellite') print ' selected'; ?>>ArcGIS Satellite</option>
 			    <?php
-				    if (isset($globalBingMapKey) && $globalBingMapKey != '') {
-			    ?>
+					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 != '') {
-			    ?>
+				?>
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
 			    <?php
 					}
-			    ?>
+				?>
 			    <?php
 					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
-			    ?>
+				?>
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
 			    <?php
 					}
-			    ?>
+				?>
 			    <?php
 					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
-			    ?>
+				?>
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
 			    <?php
 					}
-			    ?>
+				?>
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
 			    <option value="offline"<?php if ($MapType == 'offline') print ' selected'; ?>>Natural Earth</option>
 			    <?php
-				    }
-			    ?>
+					}
+				?>
 			    <option value="NatGeo-Street"<?php if ($MapType == 'NatGeo-Street') print ' selected'; ?>>National Geographic Street</option>
 			    <?php
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
 					else $MapBoxId = $_COOKIE['MapTypeId'];
-			    ?>
+				?>
 			    <option value="MapboxGL"<?php if ($MapType == 'MapboxGL') print ' selected'; ?>>Mapbox GL</option>
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
@@ -340,16 +340,16 @@ 
 			    <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>
 			    <?php
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 <?php
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) {
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d' && (!isset($globalMapOffline) || $globalMapOffline === FALSE)) {
 ?>
 		    <li><?php echo _("Type of Terrain:"); ?>
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -360,10 +360,10 @@ 
 			</select>
 		    </li>
 <?php
-    }
+	}
 ?>
 <?php
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
 ?>
 		    <li><div class="checkbox"><label><input type="checkbox" name="display2dbuildings" value="1" onclick="clickDisplay2DBuildings(this)" <?php if (isset($_COOKIE['Map2DBuildings']) && $_COOKIE['Map2DBuildings'] == 'true') print 'checked'; ?> ><?php echo _("Display 2.5D buidings on map"); ?></label></div></li>
 
@@ -386,7 +386,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>
@@ -405,80 +405,80 @@ 
 	}
 ?>
 <?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>
 		    <li><div class="checkbox"><label><input type="checkbox" name="one3dmodel" value="1" onclick="useOne3Dmodel(this)" <?php if ((isset($_COOKIE['one3dmodel']) && $_COOKIE['one3dmodel'] == 'true') || (!isset($_COOKIE['one3dmodel']) && isset($globalMap3DOneModel) && $globalMap3DOneModel)) print 'checked'; ?> ><?php echo _("Use same 3D model for all aircraft (use fewer resources)"); ?></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'; ?>">
@@ -487,9 +487,9 @@ 
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 <?php
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
 ?>
 <?php
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
@@ -521,7 +521,7 @@ 
 		    </li>
 <?php
 	}
-    }
+	}
 ?>
 		    <li><?php echo _("Distance unit:"); ?>
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -554,19 +554,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 } ?>
@@ -575,7 +575,7 @@ 
 			<?php } ?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li><?php echo _("Display airlines:"); ?>
 		    <br/>
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -595,14 +595,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">
@@ -616,18 +616,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
@@ -651,18 +651,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)) {
-		    ?>
+				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>
@@ -672,21 +672,21 @@ 
 			</select>
 		    </li>
 		    <?php
-			    }
-		    ?>
+				}
+			?>
 		    <?php
 			}
-		    ?>
+			?>
 		    <?php
 			if (isset($globalMarine) && $globalMarine) {
-		    ?>
+			?>
 		    <li>
 			<?php echo _("Display vessels with MMSI:"); ?>
 			<input type="text" name="mmsifilter" onchange="mmsifilter();" id="mmsifilter" value="<?php if (isset($_COOKIE['filter_mmsi'])) print $_COOKIE['filter_mmsi']; ?>" />
 		    </li>
 		    <?php
 			}
-		    ?>
+			?>
 		    <li>
 			<?php echo _("Display with ident:"); ?>
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
@@ -699,7 +699,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>
@@ -739,14 +739,14 @@ 
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
 					}
 				}
-			    ?>
+				?>
 			</select>
 		    </li>
 		</ul>
 	    </form>
 	</div>
 <?php
-    }
+	}
 ?>
     </div>
 </div>

require/class.SpotterArchive.php

Indentation +104 added lines, -104 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();
@@ -159,11 +159,11 @@ 
 
 
 	/**
-	* 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 getLastArchiveSpotterDataByIdent($ident) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
@@ -179,11 +179,11 @@ 
 
 
 	/**
-	* Gets last the spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets last the spotter information based on a particular id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLastArchiveSpotterDataById($id) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
@@ -209,11 +209,11 @@ 
 	}
 
 	/**
-	* 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 getAllArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -234,11 +234,11 @@ 
 	}
 
 	/**
-	* Gets coordinate & time spotter information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets coordinate & time spotter information based on a particular id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getCoordArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -256,11 +256,11 @@ 
 
 
 	/**
-	* 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 getAltitudeArchiveSpotterDataByIdent($ident) {
 
 		date_default_timezone_set('UTC');
@@ -281,11 +281,11 @@ 
 	}
 
 	/**
-	* Gets altitude information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets altitude information based on a particular id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getAltitudeArchiveSpotterDataById($id) {
 
 		date_default_timezone_set('UTC');
@@ -306,11 +306,11 @@ 
 	}
 
 	/**
-	* Gets altitude & speed information based on a particular id
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets altitude & speed information based on a particular id
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getAltitudeSpeedArchiveSpotterDataById($id) {
 		date_default_timezone_set('UTC');
 		$id = filter_var($id, FILTER_SANITIZE_STRING);
@@ -327,11 +327,11 @@ 
 	}
 
 	/**
-	* 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 getLastAltitudeArchiveSpotterDataByIdent($ident) {
 		date_default_timezone_set('UTC');
 		$ident = filter_var($ident, FILTER_SANITIZE_STRING);
@@ -381,11 +381,11 @@ 
 	}
 
 	/**
-	    * Gets Minimal Live Spotter data
-	    *
-	    * @return Array the spotter information
-	    *
-	    */
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
@@ -433,11 +433,11 @@ 
 	}
 
 	/**
-	    * Gets Minimal Live Spotter data
-	    *
-	    * @return Array the spotter information
-	    *
-	    */
+	 * Gets Minimal Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
@@ -501,11 +501,11 @@ 
 	}
 
 	/**
-	   * Gets count Live Spotter data
-	   *
-	   * @return Array the spotter information
-	   *
-	   */
+	 * Gets count Live Spotter data
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getLiveSpotterCount($begindate,$enddate,$filter = array()) {
 		global $globalDBdriver, $globalLiveInterval;
 		date_default_timezone_set('UTC');
@@ -551,11 +551,11 @@ 
 	// Spotter_Archive_output
 
 	/**
-	* Gets all the spotter information
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function searchSpotterData($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');
@@ -847,11 +847,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the callsign
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the callsign
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') {
 		$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
 
@@ -899,11 +899,11 @@ 
 
 
 	/**
-	* Gets all the spotter information based on the owner
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the owner
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) {
 		$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
 
@@ -951,11 +951,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the pilot
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the pilot
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) {
 		$global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output";
 
@@ -999,11 +999,11 @@ 
 	}
 
 	/**
-	* Gets all number of flight over countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') {
 		global $globalDBdriver;
 		/*
@@ -1043,11 +1043,11 @@ 
 	}
 
 	/**
-	* Gets all number of flight over countries
-	*
-	* @return Array the airline country list
-	*
-	*/
+	 * Gets all number of flight over countries
+	 *
+	 * @return Array the airline country list
+	 *
+	 */
 	public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') {
 		global $globalDBdriver;
 		/*
@@ -1088,11 +1088,11 @@ 
 	}
 
 	/**
-	* 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 getDateArchiveSpotterDataById($id,$date) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
@@ -1104,11 +1104,11 @@ 
 	}
 
 	/**
-	* 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 getDateArchiveSpotterDataByIdent($ident,$date) {
 		$Spotter = new Spotter($this->db);
 		date_default_timezone_set('UTC');
@@ -1120,11 +1120,11 @@ 
 	}
 
 	/**
-	* Gets all the spotter information based on the airport
-	*
-	* @return Array the spotter information
-	*
-	*/
+	 * Gets all the spotter information based on the airport
+	 *
+	 * @return Array the spotter information
+	 *
+	 */
 	public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) {
 		global $global_query;
 		$Spotter = new Spotter($this->db);