Completed
Push — master ( 0d46aa...9d1f31 )
by Yannick
28:02
created
location-geojson.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -14,31 +14,31 @@  discard block
 block discarded – undo
14 14
 	{
15 15
 		$coords = explode(',',$_GET['coord']);
16 16
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
17
-		    || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
17
+			|| (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
18 18
 			//$spotter_array = $Source->getAllLocationInfo();
19 19
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs'));
20 20
 		}
21 21
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') 
22
-		    || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) {
22
+			|| (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) {
23 23
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx'));
24 24
 		}
25 25
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') 
26
-		    || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) {
26
+			|| (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) {
27 27
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning'));
28 28
 		}
29 29
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
30 30
 	} else {
31 31
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
32
-		    || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
32
+			|| (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
33 33
 			//$spotter_array = $Source->getAllLocationInfo();
34 34
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs'));
35 35
 		}
36 36
 		if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') 
37
-		    || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) {
37
+			|| (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) {
38 38
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx'));
39 39
 		}
40 40
 		if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') 
41
-		    || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) {
41
+			|| (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) {
42 42
 			$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning'));
43 43
 		}
44 44
 		$spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType(''));
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 		date_default_timezone_set('UTC');
54 54
 		//waypoint plotting
55 55
 		$output .= '{"type": "Feature",';
56
-		    $output .= '"properties": {';
56
+			$output .= '"properties": {';
57 57
 			$output .= '"id": "'.$spotter_item['id'].'",';
58 58
 			$output .= '"location_id": "'.$spotter_item['location_id'].'",';
59 59
 			$output .= '"name": "'.$spotter_item['name'].'",';
@@ -71,13 +71,13 @@  discard block
 block discarded – undo
71 71
 				if (isset($weather['temp'])) $output.= '"temp": "'.$weather['temp'].'",';
72 72
 			}
73 73
 			$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
74
-		    $output .= '},';
75
-		    $output .= '"geometry": {';
74
+			$output .= '},';
75
+			$output .= '"geometry": {';
76 76
 			$output .= '"type": "Point",';
77 77
 			$output .= '"coordinates": [';
78
-			    $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
78
+				$output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
79 79
 			$output .= ']';
80
-		    $output .= '}';
80
+			$output .= '}';
81 81
 		$output .= '},';
82 82
 	}
83 83
 	$output  = substr($output, 0, -1);
Please login to merge, or discard this patch.
index.php 1 patch
Indentation   +94 added lines, -94 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
     <?php }; if (isset($globalTracker) && $globalTracker) { ?><td><div id="ibxtracker"><h4><?php echo _("Trackers Detected"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?>
46 46
 </tr></table></div>
47 47
 <?php
48
-    if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
48
+	if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
49 49
 
50 50
 ?>
51 51
 <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script>
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
66 66
 <?php
67 67
 	}
68
-    }
68
+	}
69 69
 ?>
70 70
 
71 71
 <div id="sidebar" class="sidebar collapsed">
@@ -76,34 +76,34 @@  discard block
 block discarded – undo
76 76
 	<li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
77 77
 	<li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
78 78
 <?php
79
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
79
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
80 80
 	if (isset($globalArchive) && $globalArchive == TRUE) {
81 81
 ?>
82 82
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
83 83
 <?php
84 84
 	}
85
-    }
85
+	}
86 86
 ?>
87 87
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
88 88
 	<li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li>
89 89
 	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
90 90
 <?php
91
-    if (isset($globalMap3D) && $globalMap3D) {
91
+	if (isset($globalMap3D) && $globalMap3D) {
92 92
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
93 93
 ?>
94 94
 	<li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
95 95
 <?php
96
-        } else {
97
-    	    if (isset($globalMapSatellites) && $globalMapSatellites) {
96
+		} else {
97
+			if (isset($globalMapSatellites) && $globalMapSatellites) {
98 98
 ?>
99 99
 	<li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li>
100 100
 <?php
101
-	    }
101
+		}
102 102
 ?>
103 103
 	<li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
104 104
 <?php
105 105
 	}
106
-    }
106
+	}
107 107
 ?>
108 108
     </ul>
109 109
 
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 ?>
179 179
         </div>
180 180
 <?php
181
-    if (isset($globalArchive) && $globalArchive == TRUE) {
181
+	if (isset($globalArchive) && $globalArchive == TRUE) {
182 182
 ?>
183 183
         <div class="sidebar-pane" id="archive">
184 184
 	    <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 	    </form>
239 239
 	</div>
240 240
 <?php
241
-    }
241
+	}
242 242
 ?>
243 243
         <div class="sidebar-pane" id="settings">
244 244
 	    <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -249,56 +249,56 @@  discard block
 block discarded – undo
249 249
 			    <?php
250 250
 				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
251 251
 				else $MapType = $_COOKIE['MapType'];
252
-			    ?>
252
+				?>
253 253
 			    <?php
254 254
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
255
-			    ?>
255
+				?>
256 256
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
257 257
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
258 258
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
259 259
 			    <?php
260 260
 				}
261
-			    ?>
261
+				?>
262 262
 			    <?php
263
-			        if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
264
-			    ?>
263
+					if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
264
+				?>
265 265
 			    <?php
266
-				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
267
-			    ?>
266
+					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
267
+				?>
268 268
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
269 269
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
270 270
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
271 271
 			    <?php
272
-				    }
273
-			    ?>
272
+					}
273
+				?>
274 274
 			    <?php
275
-				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
276
-			    ?>
275
+					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
276
+				?>
277 277
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
278 278
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
279 279
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
280 280
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
281 281
 			    <?php
282
-				    }
283
-			    ?>
282
+					}
283
+				?>
284 284
 			    <?php
285
-				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
286
-			    ?>
285
+					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
286
+				?>
287 287
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
288 288
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
289 289
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
290 290
 			    <?php
291
-				    }
292
-			    ?>
291
+					}
292
+				?>
293 293
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
294 294
 			    <?php
295 295
 				}
296
-			    ?>
296
+				?>
297 297
 			    <?php
298
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
298
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
299 299
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
300 300
 					else $MapBoxId = $_COOKIE['MapTypeId'];
301
-			    ?>
301
+				?>
302 302
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
303 303
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
304 304
 			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
@@ -312,13 +312,13 @@  discard block
 block discarded – undo
312 312
 			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
313 313
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
314 314
 			    <?php
315
-				    }
316
-			    ?>
315
+					}
316
+				?>
317 317
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
318 318
 			</select>
319 319
 		    </li>
320 320
 <?php
321
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
321
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
322 322
 ?>
323 323
 		    <li><?php echo _("Type of Terrain:"); ?>
324 324
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -329,10 +329,10 @@  discard block
 block discarded – undo
329 329
 			</select>
330 330
 		    </li>
331 331
 <?php
332
-    }
332
+	}
333 333
 ?>
334 334
 <?php
335
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
335
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
336 336
 ?>
337 337
 		    
338 338
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightpopup" value="1" onclick="clickFlightPopup(this)" <?php if (isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true') print 'checked'; ?> ><?php echo _("Display flight info as popup"); ?></label></div></li>
@@ -341,89 +341,89 @@  discard block
 block discarded – undo
341 341
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightremainingroute" value="1" onclick="clickFlightRemainingRoute(this)" <?php if ((isset($_COOKIE['MapRemainingRoute']) && $_COOKIE['MapRemainingRoute'] == 'true') || !isset($_COOKIE['MapRemainingRoute']) || (isset($globalMapRemainingRoute) && $globalMapRemainingRoute)) print 'checked'; ?> ><?php echo _("Display flight remaining route on click"); ?></label></div></li>
342 342
 		    <li><div class="checkbox"><label><input type="checkbox" name="flightestimation" value="1" onclick="clickFlightEstimation(this)" <?php if ((isset($_COOKIE['flightestimation']) && $_COOKIE['flightestimation'] == 'true') || (!isset($_COOKIE['flightestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['flightestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Planes animate between updates"); ?></label></div></li>
343 343
 <?php
344
-    }
344
+	}
345 345
 ?>
346 346
 		    <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>
347 347
 		    <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>
348 348
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatcherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li>
349 349
 		    <li><div class="checkbox"><label><input type="checkbox" name="displaylightning" value="1" onclick="clickDisplayLightning(this)" <?php if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') || (!isset($_COOKIE['show_Lightning']) && (!isset($globalMapLightning) || $globalMapLightning === TRUE))) print 'checked'; ?> ><?php echo _("Display lightning on map"); ?></label></div></li>
350 350
 <?php
351
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
351
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
352 352
 ?>
353 353
 		    <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>
354 354
 <?php
355
-    }
356
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
355
+	}
356
+	if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
357 357
 ?>
358 358
 		    <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>
359 359
 <?php
360
-    }
360
+	}
361 361
 ?>
362 362
 
363 363
 		    <?php
364 364
 			if (function_exists('array_column')) {
365
-			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
366
-		    ?>
365
+				if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
366
+			?>
367 367
 		    <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>
368 368
 		    <?php
369
-			    }
369
+				}
370 370
 			} elseif (isset($globalSources)) {
371
-			    $dispolar = false;
372
-			    foreach ($globalSources as $testsource) {
373
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
374
-			    }
375
-			    if ($dispolar) {
376
-		    ?>
371
+				$dispolar = false;
372
+				foreach ($globalSources as $testsource) {
373
+					if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
374
+				}
375
+				if ($dispolar) {
376
+			?>
377 377
 		    <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>
378 378
 		    <?php
379
-			    }
380
-		        }
381
-		    ?>
379
+				}
380
+				}
381
+			?>
382 382
 <?php
383
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
383
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
384 384
 ?>
385 385
 
386 386
 		    <?php
387 387
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
388
-		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
389
-		    ?>
388
+					if (extension_loaded('gd') && function_exists('gd_info')) {
389
+			?>
390 390
 		    <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>
391 391
 		    <?php 
392 392
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
393
-		    ?>
393
+			?>
394 394
 		    <li><?php echo _("Aircraft icon color:"); ?>
395 395
 			<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'; ?>">
396 396
 		    </li>
397 397
 		    <?php
398 398
 				}
399
-			    }
400
-		        }
401
-		    ?>
399
+				}
400
+				}
401
+			?>
402 402
 		    <?php
403 403
 			if (isset($globalMarine) && $globalMarine === TRUE) {
404
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
405
-		    ?>
404
+				if (extension_loaded('gd') && function_exists('gd_info')) {
405
+			?>
406 406
 		    <li><?php echo _("Marine icon color:"); ?>
407 407
 			<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'; ?>">
408 408
 		    </li>
409 409
 		    <?php
410
-			    }
411
-		        }
412
-		    ?>
410
+				}
411
+				}
412
+			?>
413 413
 		    <?php
414 414
 			if (isset($globalTracker) && $globalTracker === TRUE) {
415
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
416
-		    ?>
415
+				if (extension_loaded('gd') && function_exists('gd_info')) {
416
+			?>
417 417
 		    <li><?php echo _("Tracker icon color:"); ?>
418 418
 			<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'; ?>">
419 419
 		    </li>
420 420
 		    <?php
421
-			    }
422
-		        }
423
-		    ?>
421
+				}
422
+				}
423
+			?>
424 424
 		    <?php
425 425
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
426
-		    ?>
426
+			?>
427 427
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
428 428
 			<div class="range">
429 429
 			    <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>">
@@ -432,9 +432,9 @@  discard block
 block discarded – undo
432 432
 		    </li>
433 433
 		    <?php
434 434
 			}
435
-		    ?>
435
+			?>
436 436
 <?php
437
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
437
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
438 438
 ?>
439 439
 <?php
440 440
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
@@ -465,7 +465,7 @@  discard block
 block discarded – undo
465 465
 		    </li>
466 466
 <?php
467 467
 	}
468
-    }
468
+	}
469 469
 ?>
470 470
 		    <li><?php echo _("Distance unit:"); ?>
471 471
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -498,19 +498,19 @@  discard block
 block discarded – undo
498 498
 		    <ul>
499 499
 		    <?php
500 500
 			if (!isset($globalAircraft) || $globalAircraft) {
501
-		    ?>
501
+			?>
502 502
 		    <?php
503 503
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
504
-		    ?>
504
+			?>
505 505
 			<?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 } ?>
506 506
 			<?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 } ?>
507 507
 			<?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 } ?>
508 508
 		    <?php
509 509
 			}
510
-		    ?>
510
+			?>
511 511
 		    <?php
512 512
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
513
-		    ?>
513
+			?>
514 514
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
515 515
 			    <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>
516 516
 			<?php } ?>
@@ -519,7 +519,7 @@  discard block
 block discarded – undo
519 519
 			<?php } ?>
520 520
 		    <?php
521 521
 			}
522
-		    ?>
522
+			?>
523 523
 		    <li><?php echo _("Display airlines:"); ?>
524 524
 		    <br/>
525 525
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -539,14 +539,14 @@  discard block
 block discarded – undo
539 539
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
540 540
 					}
541 541
 				}
542
-			    ?>
542
+				?>
543 543
 			</select>
544 544
 		    </li>
545 545
 		    <?php
546 546
 			$Spotter = new Spotter();
547 547
 			$allalliancenames = $Spotter->getAllAllianceNames();
548 548
 			if (!empty($allalliancenames)) {
549
-		    ?>
549
+			?>
550 550
 		    <li><?php echo _("Display alliance:"); ?>
551 551
 		    <br/>
552 552
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
@@ -560,18 +560,18 @@  discard block
 block discarded – undo
560 560
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
561 561
 					}
562 562
 				}
563
-			    ?>
563
+				?>
564 564
 			</select>
565 565
 		    </li>
566 566
 		    <?php
567 567
 			}
568
-		    ?>
568
+			?>
569 569
 		    <?php
570 570
 			}
571
-		    ?>
571
+			?>
572 572
 		    <?php
573 573
 			if (isset($globalAPRS) && $globalAPRS) {
574
-		    ?>
574
+			?>
575 575
 		    <li><?php echo _("Display APRS sources name:"); ?>
576 576
 			<select class="selectpicker" multiple onchange="sources(this);">
577 577
 			    <?php
@@ -583,18 +583,18 @@  discard block
 block discarded – undo
583 583
 						echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';
584 584
 					}
585 585
 				}
586
-			    ?>
586
+				?>
587 587
 			</select>
588 588
 		    </li>
589 589
 		    <?php
590 590
 			}
591
-		    ?>
591
+			?>
592 592
 		    <?php
593 593
 			if (!isset($globalAircraft) && $globalAircraft) {
594
-		    ?>
594
+			?>
595 595
 		    <?php
596 596
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
597
-		    ?>
597
+			?>
598 598
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
599 599
 			<select class="selectpicker" onchange="airlinestype(this);">
600 600
 			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -605,14 +605,14 @@  discard block
 block discarded – undo
605 605
 		    </li>
606 606
 		    <?php
607 607
 			}
608
-		    ?>
608
+			?>
609 609
 		    <li>
610 610
 			<?php echo _("Display flight with ident:"); ?>
611 611
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
612 612
 		    </li>
613 613
 		    <?php
614 614
 			}
615
-		    ?>
615
+			?>
616 616
 		</ul>
617 617
 	    </form>
618 618
 	    <form method="post">
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
 	    </form>
622 622
     	</div>
623 623
 <?php
624
-    if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
624
+	if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
625 625
 ?>
626 626
         <div class="sidebar-pane" id="satellites">
627 627
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -661,14 +661,14 @@  discard block
 block discarded – undo
661 661
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
662 662
 					}
663 663
 				}
664
-			    ?>
664
+				?>
665 665
 			</select>
666 666
 		    </li>
667 667
 		</ul>
668 668
 	    </form>
669 669
 	</div>
670 670
 <?php
671
-    }
671
+	}
672 672
 ?>
673 673
     </div>
674 674
 </div>
Please login to merge, or discard this patch.
js/map.2d.js.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -385,10 +385,10 @@  discard block
 block discarded – undo
385 385
 setInterval(function(){update_locationsLayer()},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000*2; else print '60000'; ?>);
386 386
 
387 387
 <?php
388
-    // Add support for custom json via $globalMapJson
389
-    if (isset($globalMapJson) && is_array($globalMapJson)) {
388
+	// Add support for custom json via $globalMapJson
389
+	if (isset($globalMapJson) && is_array($globalMapJson)) {
390 390
 	foreach ($globalMapJson as $json) {
391
-	    if (isset($json['url'])) {
391
+		if (isset($json['url'])) {
392 392
 ?>
393 393
 update_genLayer('<?php print $json['url']; ?>');
394 394
 <?php
@@ -397,9 +397,9 @@  discard block
 block discarded – undo
397 397
 setInterval(function(){update_genLayer('<?php print $json['url']; ?>')}, <?php print $json['refresh']; ?>);
398 398
 <?php
399 399
 		}
400
-	    }
400
+		}
401
+	}
401 402
 	}
402
-    }
403 403
 
404 404
 ?>
405 405
 //adds the bootstrap tooltip to the map icons
Please login to merge, or discard this patch.