Completed
Push — master ( e37ce2...f4833e )
by Yannick
10:24 queued 02:21
created
index.php 1 patch
Indentation   +89 added lines, -89 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     <?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 } ?>
41 41
 </tr></table></div>
42 42
 <?php
43
-    if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
43
+	if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
44 44
 
45 45
 ?>
46 46
 <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script>
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
61 61
 <?php
62 62
 	}
63
-    }
63
+	}
64 64
 ?>
65 65
 <div id="dialog" title="<?php echo _("Session has timed-out"); ?>">
66 66
   <p><?php echo _("In order to save data consumption web page times out after 30 minutes. Close this dialog to continue."); ?></p>
@@ -74,34 +74,34 @@  discard block
 block discarded – undo
74 74
 	<li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
75 75
 	<li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
76 76
 <?php
77
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
77
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
78 78
 	if (isset($globalArchive) && $globalArchive == TRUE) {
79 79
 ?>
80 80
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
81 81
 <?php
82 82
 	}
83
-    }
83
+	}
84 84
 ?>
85 85
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
86 86
 	<li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li>
87 87
 	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
88 88
 <?php
89
-    if (isset($globalMap3D) && $globalMap3D) {
89
+	if (isset($globalMap3D) && $globalMap3D) {
90 90
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
91 91
 ?>
92 92
 	<li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
93 93
 <?php
94
-        } else {
95
-    	    if (isset($globalMapSatellites) && $globalMapSatellites) {
94
+		} else {
95
+			if (isset($globalMapSatellites) && $globalMapSatellites) {
96 96
 ?>
97 97
 	<li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li>
98 98
 <?php
99
-	    }
99
+		}
100 100
 ?>
101 101
 	<li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
102 102
 <?php
103 103
 	}
104
-    }
104
+	}
105 105
 ?>
106 106
     </ul>
107 107
 
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 ?>
176 176
         </div>
177 177
 <?php
178
-    if (isset($globalArchive) && $globalArchive == TRUE) {
178
+	if (isset($globalArchive) && $globalArchive == TRUE) {
179 179
 ?>
180 180
         <div class="sidebar-pane" id="archive">
181 181
 	    <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
 	    </form>
236 236
 	</div>
237 237
 <?php
238
-    }
238
+	}
239 239
 ?>
240 240
         <div class="sidebar-pane" id="settings">
241 241
 	    <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -246,56 +246,56 @@  discard block
 block discarded – undo
246 246
 			    <?php
247 247
 				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
248 248
 				else $MapType = $_COOKIE['MapType'];
249
-			    ?>
249
+				?>
250 250
 			    <?php
251 251
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
252
-			    ?>
252
+				?>
253 253
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
254 254
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
255 255
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
256 256
 			    <?php
257 257
 				}
258
-			    ?>
258
+				?>
259 259
 			    <?php
260
-			        if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
261
-			    ?>
260
+					if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
261
+				?>
262 262
 			    <?php
263
-				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
264
-			    ?>
263
+					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
264
+				?>
265 265
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
266 266
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
267 267
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
268 268
 			    <?php
269
-				    }
270
-			    ?>
269
+					}
270
+				?>
271 271
 			    <?php
272
-				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
273
-			    ?>
272
+					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
273
+				?>
274 274
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
275 275
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
276 276
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
277 277
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
278 278
 			    <?php
279
-				    }
280
-			    ?>
279
+					}
280
+				?>
281 281
 			    <?php
282
-				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
283
-			    ?>
282
+					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
283
+				?>
284 284
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
285 285
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
286 286
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
287 287
 			    <?php
288
-				    }
289
-			    ?>
288
+					}
289
+				?>
290 290
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
291 291
 			    <?php
292 292
 				}
293
-			    ?>
293
+				?>
294 294
 			    <?php
295
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
295
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
296 296
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
297 297
 					else $MapBoxId = $_COOKIE['MapTypeId'];
298
-			    ?>
298
+				?>
299 299
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
300 300
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
301 301
 			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
@@ -309,13 +309,13 @@  discard block
 block discarded – undo
309 309
 			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
310 310
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
311 311
 			    <?php
312
-				    }
313
-			    ?>
312
+					}
313
+				?>
314 314
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
315 315
 			</select>
316 316
 		    </li>
317 317
 <?php
318
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
318
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
319 319
 ?>
320 320
 		    <li><?php echo _("Type of Terrain:"); ?>
321 321
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -325,10 +325,10 @@  discard block
 block discarded – undo
325 325
 			</select>
326 326
 		    </li>
327 327
 <?php
328
-    }
328
+	}
329 329
 ?>
330 330
 <?php
331
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
331
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
332 332
 ?>
333 333
 		    
334 334
 		    <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>
@@ -337,76 +337,76 @@  discard block
 block discarded – undo
337 337
 		    <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>
338 338
 		    <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>
339 339
 <?php
340
-    }
340
+	}
341 341
 ?>
342 342
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true') print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li>
343 343
 		    <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>
344 344
 <?php
345
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
345
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
346 346
 ?>
347 347
 		    <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>
348 348
 <?php
349
-    }
350
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
349
+	}
350
+	if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
351 351
 ?>
352 352
 		    <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>
353 353
 <?php
354
-    }
354
+	}
355 355
 ?>
356 356
 
357 357
 		    <?php
358 358
 			if (function_exists('array_column')) {
359
-			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
360
-		    ?>
359
+				if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
360
+			?>
361 361
 		    <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>
362 362
 		    <?php
363
-			    }
363
+				}
364 364
 			} elseif (isset($globalSources)) {
365
-			    $dispolar = false;
366
-			    foreach ($globalSources as $testsource) {
367
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
368
-			    }
369
-			    if ($dispolar) {
370
-		    ?>
365
+				$dispolar = false;
366
+				foreach ($globalSources as $testsource) {
367
+					if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
368
+				}
369
+				if ($dispolar) {
370
+			?>
371 371
 		    <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>
372 372
 		    <?php
373
-			    }
374
-		        }
375
-		    ?>
373
+				}
374
+				}
375
+			?>
376 376
 <?php
377
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
377
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
378 378
 ?>
379 379
 
380 380
 		    <?php
381 381
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
382
-		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
383
-		    ?>
382
+					if (extension_loaded('gd') && function_exists('gd_info')) {
383
+			?>
384 384
 		    <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>
385 385
 		    <?php 
386 386
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
387
-		    ?>
387
+			?>
388 388
 		    <li><?php echo _("Aircraft icon color:"); ?>
389 389
 			<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'; ?>">
390 390
 		    </li>
391 391
 		    <?php
392 392
 				}
393
-			    }
394
-		        }
395
-		    ?>
393
+				}
394
+				}
395
+			?>
396 396
 		    <?php
397 397
 			if (isset($globalMarine) && $globalMarine === TRUE) {
398
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
399
-		    ?>
398
+				if (extension_loaded('gd') && function_exists('gd_info')) {
399
+			?>
400 400
 		    <li><?php echo _("Marine icon color:"); ?>
401 401
 			<input type="color" name="marinecolor" id="html5colorpicker" onchange="iconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>">
402 402
 		    </li>
403 403
 		    <?php
404
-			    }
405
-		        }
406
-		    ?>
404
+				}
405
+				}
406
+			?>
407 407
 		    <?php
408 408
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
409
-		    ?>
409
+			?>
410 410
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
411 411
 			<div class="range">
412 412
 			    <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'; ?>">
@@ -415,9 +415,9 @@  discard block
 block discarded – undo
415 415
 		    </li>
416 416
 		    <?php
417 417
 			}
418
-		    ?>
418
+			?>
419 419
 <?php
420
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
420
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
421 421
 ?>
422 422
 <?php
423 423
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
 		    </li>
439 439
 <?php
440 440
 	}
441
-    }
441
+	}
442 442
 ?>
443 443
 		    <li><?php echo _("Distance unit:"); ?>
444 444
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -471,19 +471,19 @@  discard block
 block discarded – undo
471 471
 		    <ul>
472 472
 		    <?php
473 473
 			if (!isset($globalAircraft) || $globalAircraft) {
474
-		    ?>
474
+			?>
475 475
 		    <?php
476 476
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
477
-		    ?>
477
+			?>
478 478
 			<?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 } ?>
479 479
 			<?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 } ?>
480 480
 			<?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 } ?>
481 481
 		    <?php
482 482
 			}
483
-		    ?>
483
+			?>
484 484
 		    <?php
485 485
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
486
-		    ?>
486
+			?>
487 487
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
488 488
 			    <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>
489 489
 			<?php } ?>
@@ -492,7 +492,7 @@  discard block
 block discarded – undo
492 492
 			<?php } ?>
493 493
 		    <?php
494 494
 			}
495
-		    ?>
495
+			?>
496 496
 		    <li><?php echo _("Display airlines:"); ?>
497 497
 		    <br/>
498 498
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -512,14 +512,14 @@  discard block
 block discarded – undo
512 512
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
513 513
 					}
514 514
 				}
515
-			    ?>
515
+				?>
516 516
 			</select>
517 517
 		    </li>
518 518
 		    <?php
519 519
 			$Spotter = new Spotter();
520 520
 			$allalliancenames = $Spotter->getAllAllianceNames();
521 521
 			if (!empty($allalliancenames)) {
522
-		    ?>
522
+			?>
523 523
 		    <li><?php echo _("Display alliance:"); ?>
524 524
 		    <br/>
525 525
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
@@ -533,18 +533,18 @@  discard block
 block discarded – undo
533 533
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
534 534
 					}
535 535
 				}
536
-			    ?>
536
+				?>
537 537
 			</select>
538 538
 		    </li>
539 539
 		    <?php
540 540
 			}
541
-		    ?>
541
+			?>
542 542
 		    <?php
543 543
 			}
544
-		    ?>
544
+			?>
545 545
 		    <?php
546 546
 			if (isset($globalAPRS) && $globalAPRS) {
547
-		    ?>
547
+			?>
548 548
 		    <li><?php echo _("Display APRS sources name:"); ?>
549 549
 			<select class="selectpicker" multiple onchange="sources(this);">
550 550
 			    <?php
@@ -556,18 +556,18 @@  discard block
 block discarded – undo
556 556
 						echo '<option value="'.$source['source_name'].'">'.$source['source_name'].'</option>';
557 557
 					}
558 558
 				}
559
-			    ?>
559
+				?>
560 560
 			</select>
561 561
 		    </li>
562 562
 		    <?php
563 563
 			}
564
-		    ?>
564
+			?>
565 565
 		    <?php
566 566
 			if (!isset($globalAircraft) && $globalAircraft) {
567
-		    ?>
567
+			?>
568 568
 		    <?php
569 569
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
570
-		    ?>
570
+			?>
571 571
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
572 572
 			<select class="selectpicker" onchange="airlinestype(this);">
573 573
 			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -578,14 +578,14 @@  discard block
 block discarded – undo
578 578
 		    </li>
579 579
 		    <?php
580 580
 			}
581
-		    ?>
581
+			?>
582 582
 		    <li>
583 583
 			<?php echo _("Display flight with ident:"); ?>
584 584
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
585 585
 		    </li>
586 586
 		    <?php
587 587
 			}
588
-		    ?>
588
+			?>
589 589
 		</ul>
590 590
 	    </form>
591 591
 	    <form method="post">
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
 	    </form>
595 595
     	</div>
596 596
 <?php
597
-    if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
597
+	if (isset($globalMapSatellites) && $globalMapSatellites && isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
598 598
 ?>
599 599
         <div class="sidebar-pane" id="satellites">
600 600
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -634,14 +634,14 @@  discard block
 block discarded – undo
634 634
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
635 635
 					}
636 636
 				}
637
-			    ?>
637
+				?>
638 638
 			</select>
639 639
 		    </li>
640 640
 		</ul>
641 641
 	    </form>
642 642
 	</div>
643 643
 <?php
644
-    }
644
+	}
645 645
 ?>
646 646
     </div>
647 647
 </div>
Please login to merge, or discard this patch.
location-geojson.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,14 +16,14 @@  discard block
 block discarded – undo
16 16
 		$coords = explode(',',$_GET['coord']);
17 17
 //		$spotter_array = Source::getAllLocationInfobyCoord($coords);
18 18
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
19
-		    || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
19
+			|| (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
20 20
 			$spotter_array = $Source->getAllLocationInfo();
21 21
 		} else {
22 22
 			$spotter_array = $Source->getLocationInfoByType('');
23 23
 		}
24 24
 	} else {
25 25
 		if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') 
26
-		    || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
26
+			|| (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) {
27 27
 			$spotter_array = $Source->getAllLocationInfo();
28 28
 		} else {
29 29
 			$spotter_array = $Source->getLocationInfoByType('');
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 		date_default_timezone_set('UTC');
40 40
 		//waypoint plotting
41 41
 		$output .= '{"type": "Feature",';
42
-		    $output .= '"properties": {';
42
+			$output .= '"properties": {';
43 43
 			$output .= '"id": "'.$spotter_item['id'].'",';
44 44
 			$output .= '"location_id": "'.$spotter_item['location_id'].'",';
45 45
 			$output .= '"name": "'.$spotter_item['name'].'",';
@@ -53,13 +53,13 @@  discard block
 block discarded – undo
53 53
 			$output .= '"icon": "'.$globalURL.'/images/'.$spotter_item['logo'].'",';
54 54
 			$output .= '"type": "'.$spotter_item['type'].'",';
55 55
 			$output .= '"image_thumb": "'.$spotter_item['image_thumb'].'"';
56
-		    $output .= '},';
57
-		    $output .= '"geometry": {';
56
+			$output .= '},';
57
+			$output .= '"geometry": {';
58 58
 			$output .= '"type": "Point",';
59 59
 			$output .= '"coordinates": [';
60
-			    $output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
60
+				$output .= $spotter_item['longitude'].', '.$spotter_item['latitude'];
61 61
 			$output .= ']';
62
-		    $output .= '}';
62
+			$output .= '}';
63 63
 		$output .= '},';
64 64
 	}
65 65
 	$output  = substr($output, 0, -1);
Please login to merge, or discard this patch.