Completed
Push — master ( 34bbca...f606e5 )
by Yannick
27:16
created
location-data.php 2 patches
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 $Source = new Source();
6 6
 
7 7
 if (isset($_GET['sourceid'])) {
8
-	$sourceid = filter_input(INPUT_GET,'sourceid',FILTER_SANITIZE_NUMBER_INT);
8
+	$sourceid = filter_input(INPUT_GET, 'sourceid', FILTER_SANITIZE_NUMBER_INT);
9 9
 	$source_data = $Source->getLocationInfoById($sourceid);
10 10
 	if (isset($source_data[0])) {
11 11
  ?>
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 print '</div>';
42 42
 
43 43
 if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>';
44
-if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
45
-print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],4).', '.round($spotter_item['longitude'],4).'</div>';
44
+if ($spotter_item['country'] != '') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
45
+print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 4).', '.round($spotter_item['longitude'], 4).'</div>';
46 46
 /*
47 47
 if ($spotter_item['atc_range'] > 0) {
48 48
     print '<div><span>'._("Range").'</span>';
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 }
52 52
 */
53 53
 if ($spotter_item['type'] == 'wx') {
54
-	$weather = json_decode($spotter_item['description'],true);
54
+	$weather = json_decode($spotter_item['description'], true);
55 55
 	//print_r($weather);
56 56
 	if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>';
57 57
 	if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>';
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	if (isset($weather['precipitation24h'])) print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>';
63 63
 	$spotter_item['description'] = $weather['comment'];
64 64
 } elseif ($spotter_item['type'] == 'fires') {
65
-	print_r(json_decode($spotter_item['description'],true));
65
+	print_r(json_decode($spotter_item['description'], true));
66 66
 }
67 67
 print '</div>';
68 68
 if ($spotter_item['type'] != 'wx' && $spotter_item['type'] != 'fires') {
Please login to merge, or discard this patch.
Braces   +40 added lines, -15 removed lines patch added patch discarded remove patch
@@ -17,12 +17,19 @@  discard block
 block discarded – undo
17 17
 date_default_timezone_set('UTC');
18 18
 
19 19
 print '<div class="top">';
20
-if ($spotter_item['name'] != '') print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>';
21
-elseif ($spotter_item['location_id'] != 0) print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>';
22
-elseif ($spotter_item['type'] == 'lightning') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>';
23
-elseif ($spotter_item['type'] == 'wx') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>';
24
-elseif ($spotter_item['type'] == 'fires') print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Fire").'</div>';
25
-else print '<div class="right"><div class="callsign-details"><div class="callsign"></div>';
20
+if ($spotter_item['name'] != '') {
21
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['name'].'</div>';
22
+} elseif ($spotter_item['location_id'] != 0) {
23
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'.$spotter_item['location_id'].'</div>';
24
+} elseif ($spotter_item['type'] == 'lightning') {
25
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Lightning").'</div>';
26
+} elseif ($spotter_item['type'] == 'wx') {
27
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Weather Station").'</div>';
28
+} elseif ($spotter_item['type'] == 'fires') {
29
+	print '<div class="right"><div class="callsign-details"><div class="callsign">'._("Fire").'</div>';
30
+} else {
31
+	print '<div class="right"><div class="callsign-details"><div class="callsign"></div>';
32
+}
26 33
 print '</div>';
27 34
 
28 35
 print '</div></div>';
@@ -40,8 +47,12 @@  discard block
 block discarded – undo
40 47
 print $spotter_item['last_seen'].' UTC';
41 48
 print '</div>';
42 49
 
43
-if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>';
44
-if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
50
+if ($spotter_item['city'] != '') {
51
+	print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>';
52
+}
53
+if ($spotter_item['country'] !='') {
54
+	print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>';
55
+}
45 56
 print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],4).', '.round($spotter_item['longitude'],4).'</div>';
46 57
 /*
47 58
 if ($spotter_item['atc_range'] > 0) {
@@ -53,13 +64,27 @@  discard block
 block discarded – undo
53 64
 if ($spotter_item['type'] == 'wx') {
54 65
 	$weather = json_decode($spotter_item['description'],true);
55 66
 	//print_r($weather);
56
-	if (isset($weather['temp'])) print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>';
57
-	if (isset($weather['pressure'])) print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>';
58
-	if (isset($weather['wind_gust'])) print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>';
59
-	if (isset($weather['humidity'])) print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>';
60
-	if (isset($weather['rain'])) print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>';
61
-	if (isset($weather['precipitation'])) print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>';
62
-	if (isset($weather['precipitation24h'])) print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>';
67
+	if (isset($weather['temp'])) {
68
+		print '<div><span>'._("Temperature").'</span>'.$weather['temp'].'°C</div>';
69
+	}
70
+	if (isset($weather['pressure'])) {
71
+		print '<div><span>'._("Pressure").'</span>'.$weather['pressure'].'hPa</div>';
72
+	}
73
+	if (isset($weather['wind_gust'])) {
74
+		print '<div><span>'._("Wind Gust").'</span>'.$weather['wind_gust'].' km/h</div>';
75
+	}
76
+	if (isset($weather['humidity'])) {
77
+		print '<div><span>'._("Humidity").'</span>'.$weather['humidity'].'%</div>';
78
+	}
79
+	if (isset($weather['rain'])) {
80
+		print '<div><span>'._("Rain").'</span>'.$weather['rain'].' mm</div>';
81
+	}
82
+	if (isset($weather['precipitation'])) {
83
+		print '<div><span>'._("Precipitation 24H").'</span>'.$weather['precipitation'].' mm</div>';
84
+	}
85
+	if (isset($weather['precipitation24h'])) {
86
+		print '<div><span>'._("Precipitation Today").'</span>'.$weather['precipitation24h'].' mm</div>';
87
+	}
63 88
 	$spotter_item['description'] = $weather['comment'];
64 89
 } elseif ($spotter_item['type'] == 'fires') {
65 90
 	print_r(json_decode($spotter_item['description'],true));
Please login to merge, or discard this patch.
index.php 1 patch
Indentation   +93 added lines, -93 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
     <?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 } ?>
48 48
 </tr></table></div>
49 49
 <?php
50
-    if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
50
+	if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) {
51 51
 ?>
52 52
 <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script>
53 53
 <?php
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script>
72 72
 <?php
73 73
 	}
74
-    }
74
+	}
75 75
 ?>
76 76
 
77 77
 <div id="sidebar" class="sidebar collapsed">
@@ -82,34 +82,34 @@  discard block
 block discarded – undo
82 82
 	<li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li>
83 83
 	<li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li>
84 84
 <?php
85
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
85
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
86 86
 	if (isset($globalArchive) && $globalArchive == TRUE) {
87 87
 ?>
88 88
 	<li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li>
89 89
 <?php
90 90
 	}
91
-    }
91
+	}
92 92
 ?>
93 93
 	<li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li>
94 94
 	<li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li>
95 95
 	<li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li>
96 96
 <?php
97
-    if (isset($globalMap3D) && $globalMap3D) {
97
+	if (isset($globalMap3D) && $globalMap3D) {
98 98
 	if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
99 99
 ?>
100 100
 	<li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li>
101 101
 <?php
102
-	    if (isset($globalSatellite) && $globalSatellite) {
102
+		if (isset($globalSatellite) && $globalSatellite) {
103 103
 ?>
104 104
 	<li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li>
105 105
 <?php
106
-	    }
106
+		}
107 107
 	} else {
108 108
 ?>
109 109
 	<li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li>
110 110
 <?php
111 111
 	}
112
-    }
112
+	}
113 113
 ?>
114 114
     </ul>
115 115
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 ?>
185 185
         </div>
186 186
 <?php
187
-    if (isset($globalArchive) && $globalArchive == TRUE) {
187
+	if (isset($globalArchive) && $globalArchive == TRUE) {
188 188
 ?>
189 189
         <div class="sidebar-pane" id="archive">
190 190
 	    <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 @@  discard block
 block discarded – undo
243 243
 	    </form>
244 244
 	</div>
245 245
 <?php
246
-    }
246
+	}
247 247
 ?>
248 248
         <div class="sidebar-pane" id="settings">
249 249
 	    <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -254,56 +254,56 @@  discard block
 block discarded – undo
254 254
 			    <?php
255 255
 				if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider;
256 256
 				else $MapType = $_COOKIE['MapType'];
257
-			    ?>
257
+				?>
258 258
 			    <?php
259 259
 				if (isset($globalBingMapKey) && $globalBingMapKey != '') {
260
-			    ?>
260
+				?>
261 261
 			    <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option>
262 262
 			    <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option>
263 263
 			    <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option>
264 264
 			    <?php
265 265
 				}
266
-			    ?>
266
+				?>
267 267
 			    <?php
268
-			        if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
269
-			    ?>
268
+					if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) {
269
+				?>
270 270
 			    <?php
271
-				    if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
272
-			    ?>
271
+					if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') {
272
+				?>
273 273
 			    <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option>
274 274
 			    <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option>
275 275
 			    <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option>
276 276
 			    <?php
277
-				    }
278
-			    ?>
277
+					}
278
+				?>
279 279
 			    <?php
280
-				    if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
281
-			    ?>
280
+					if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') {
281
+				?>
282 282
 			    <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option>
283 283
 			    <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option>
284 284
 			    <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option>
285 285
 			    <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option>
286 286
 			    <?php
287
-				    }
288
-			    ?>
287
+					}
288
+				?>
289 289
 			    <?php
290
-				    if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
291
-			    ?>
290
+					if (isset($globalMapQuestKey) && $globalMapQuestKey != '') {
291
+				?>
292 292
 			    <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option>
293 293
 			    <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option>
294 294
 			    <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option>
295 295
 			    <?php
296
-				    }
297
-			    ?>
296
+					}
297
+				?>
298 298
 			    <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option>
299 299
 			    <?php
300 300
 				}
301
-			    ?>
301
+				?>
302 302
 			    <?php
303
-				    if (isset($globalMapboxToken) && $globalMapboxToken != '') {
303
+					if (isset($globalMapboxToken) && $globalMapboxToken != '') {
304 304
 					if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default';
305 305
 					else $MapBoxId = $_COOKIE['MapTypeId'];
306
-			    ?>
306
+				?>
307 307
 			    <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option>
308 308
 			    <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option>
309 309
 			    <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option>
@@ -317,13 +317,13 @@  discard block
 block discarded – undo
317 317
 			    <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option>
318 318
 			    <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option>
319 319
 			    <?php
320
-				    }
321
-			    ?>
320
+					}
321
+				?>
322 322
 			    <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option>
323 323
 			</select>
324 324
 		    </li>
325 325
 <?php
326
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
326
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
327 327
 ?>
328 328
 		    <li><?php echo _("Type of Terrain:"); ?>
329 329
 			<select  class="selectpicker" onchange="terrainType(this);">
@@ -334,10 +334,10 @@  discard block
 block discarded – undo
334 334
 			</select>
335 335
 		    </li>
336 336
 <?php
337
-    }
337
+	}
338 338
 ?>
339 339
 <?php
340
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
340
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
341 341
 ?>
342 342
 <?php
343 343
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
@@ -354,88 +354,88 @@  discard block
 block discarded – undo
354 354
 		    <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>
355 355
 <?php
356 356
 	}
357
-    }
357
+	}
358 358
 ?>
359 359
 		    <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>
360 360
 		    <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>
361 361
 		    <li><div class="checkbox"><label><input type="checkbox" name="displayweatherstation" value="1" onclick="clickDisplayWeatherStation(this)" <?php if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') || (!isset($_COOKIE['show_WeatherStation']) && (!isset($globalMapWeatherStation) || $globalMapWeatherStation === TRUE))) print 'checked'; ?> ><?php echo _("Display weather station on map"); ?></label></div></li>
362 362
 		    <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>
363 363
 <?php
364
-    if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
364
+	if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') {
365 365
 ?>
366 366
 		    <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>
367 367
 <?php
368
-    }
369
-    if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
368
+	}
369
+	if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) {
370 370
 ?>
371 371
 		    <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>
372 372
 <?php
373
-    }
373
+	}
374 374
 ?>
375 375
 		    <?php
376 376
 			if (function_exists('array_column')) {
377
-			    if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
378
-		    ?>
377
+				if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) {
378
+			?>
379 379
 		    <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>
380 380
 		    <?php
381
-			    }
381
+				}
382 382
 			} elseif (isset($globalSources)) {
383
-			    $dispolar = false;
384
-			    foreach ($globalSources as $testsource) {
385
-			        if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
386
-			    }
387
-			    if ($dispolar) {
388
-		    ?>
383
+				$dispolar = false;
384
+				foreach ($globalSources as $testsource) {
385
+					if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true;
386
+				}
387
+				if ($dispolar) {
388
+			?>
389 389
 		    <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>
390 390
 		    <?php
391
-			    }
392
-		        }
393
-		    ?>
391
+				}
392
+				}
393
+			?>
394 394
 <?php
395
-    if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
395
+	if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') {
396 396
 ?>
397 397
 
398 398
 		    <?php
399 399
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
400
-		    	    if (extension_loaded('gd') && function_exists('gd_info')) {
401
-		    ?>
400
+					if (extension_loaded('gd') && function_exists('gd_info')) {
401
+			?>
402 402
 		    <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>
403 403
 		    <?php 
404 404
 				if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') {
405
-		    ?>
405
+			?>
406 406
 		    <li><?php echo _("Aircraft icon color:"); ?>
407 407
 			<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'; ?>">
408 408
 		    </li>
409 409
 		    <?php
410 410
 				}
411
-			    }
412
-		        }
413
-		    ?>
411
+				}
412
+				}
413
+			?>
414 414
 		    <?php
415 415
 			if (isset($globalMarine) && $globalMarine === TRUE) {
416
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
417
-		    ?>
416
+				if (extension_loaded('gd') && function_exists('gd_info')) {
417
+			?>
418 418
 		    <li><?php echo _("Marine icon color:"); ?>
419 419
 			<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'; ?>">
420 420
 		    </li>
421 421
 		    <?php
422
-			    }
423
-		        }
424
-		    ?>
422
+				}
423
+				}
424
+			?>
425 425
 		    <?php
426 426
 			if (isset($globalTracker) && $globalTracker === TRUE) {
427
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
428
-		    ?>
427
+				if (extension_loaded('gd') && function_exists('gd_info')) {
428
+			?>
429 429
 		    <li><?php echo _("Tracker icon color:"); ?>
430 430
 			<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'; ?>">
431 431
 		    </li>
432 432
 		    <?php
433
-			    }
434
-		        }
435
-		    ?>
433
+				}
434
+				}
435
+			?>
436 436
 		    <?php
437 437
 			if (!isset($globalAircraft) || $globalAircraft === TRUE) {
438
-		    ?>
438
+			?>
439 439
 		    <li><?php echo _("Show airport icon at zoom level:"); ?>
440 440
 			<div class="range">
441 441
 			    <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'; ?>">
@@ -444,9 +444,9 @@  discard block
 block discarded – undo
444 444
 		    </li>
445 445
 		    <?php
446 446
 			}
447
-		    ?>
447
+			?>
448 448
 <?php
449
-    } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
449
+	} elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') {
450 450
 ?>
451 451
 <?php
452 452
 	if (!isset($globalAircraft) || $globalAircraft === TRUE) {
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
 		    </li>
478 478
 <?php
479 479
 	}
480
-    }
480
+	}
481 481
 ?>
482 482
 		    <li><?php echo _("Distance unit:"); ?>
483 483
 			<select class="selectpicker" onchange="unitdistance(this);">
@@ -510,19 +510,19 @@  discard block
 block discarded – undo
510 510
 		    <ul>
511 511
 		    <?php
512 512
 			if (!isset($globalAircraft) || $globalAircraft) {
513
-		    ?>
513
+			?>
514 514
 		    <?php
515 515
 			if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) {
516
-		    ?>
516
+			?>
517 517
 			<?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 } ?>
518 518
 			<?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 } ?>
519 519
 			<?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 } ?>
520 520
 		    <?php
521 521
 			}
522
-		    ?>
522
+			?>
523 523
 		    <?php
524 524
 			if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) {
525
-		    ?>
525
+			?>
526 526
 			<?php if (isset($globalSBS1) && $globalSBS1) { ?>
527 527
 			    <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>
528 528
 			<?php } ?>
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
 			<?php } ?>
532 532
 		    <?php
533 533
 			}
534
-		    ?>
534
+			?>
535 535
 		    <li><?php echo _("Display airlines:"); ?>
536 536
 		    <br/>
537 537
 			<select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines">
@@ -551,14 +551,14 @@  discard block
 block discarded – undo
551 551
 						echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>';
552 552
 					}
553 553
 				}
554
-			    ?>
554
+				?>
555 555
 			</select>
556 556
 		    </li>
557 557
 		    <?php
558 558
 			$Spotter = new Spotter();
559 559
 			$allalliancenames = $Spotter->getAllAllianceNames();
560 560
 			if (!empty($allalliancenames)) {
561
-		    ?>
561
+			?>
562 562
 		    <li><?php echo _("Display alliance:"); ?>
563 563
 		    <br/>
564 564
 			<select class="selectpicker" onchange="alliance(this);" id="display_alliance">
@@ -572,18 +572,18 @@  discard block
 block discarded – undo
572 572
 						echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>';
573 573
 					}
574 574
 				}
575
-			    ?>
575
+				?>
576 576
 			</select>
577 577
 		    </li>
578 578
 		    <?php
579 579
 			}
580
-		    ?>
580
+			?>
581 581
 		    <?php
582 582
 			}
583
-		    ?>
583
+			?>
584 584
 		    <?php
585 585
 			if (isset($globalAPRS) && $globalAPRS) {
586
-		    ?>
586
+			?>
587 587
 		    <li><?php echo _("Display APRS sources name:"); ?>
588 588
 			<select class="selectpicker" multiple onchange="sources(this);">
589 589
 			    <?php
@@ -607,18 +607,18 @@  discard block
 block discarded – undo
607 607
 						echo '<option value="'.$src['name'].'">'.$src['name'].'</option>';
608 608
 					}
609 609
 				}
610
-			    ?>
610
+				?>
611 611
 			</select>
612 612
 		    </li>
613 613
 		    <?php
614 614
 			}
615
-		    ?>
615
+			?>
616 616
 		    <?php
617 617
 			if (!isset($globalAircraft) && $globalAircraft) {
618
-		    ?>
618
+			?>
619 619
 		    <?php
620 620
 			if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) {
621
-		    ?>
621
+			?>
622 622
 		    <li><?php echo _("Display airlines of type:"); ?><br/>
623 623
 			<select class="selectpicker" onchange="airlinestype(this);">
624 624
 			    <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option>
@@ -629,14 +629,14 @@  discard block
 block discarded – undo
629 629
 		    </li>
630 630
 		    <?php
631 631
 			}
632
-		    ?>
632
+			?>
633 633
 		    <li>
634 634
 			<?php echo _("Display flight with ident:"); ?>
635 635
 			<input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" />
636 636
 		    </li>
637 637
 		    <?php
638 638
 			}
639
-		    ?>
639
+			?>
640 640
 		</ul>
641 641
 	    </form>
642 642
 	    <form method="post">
@@ -645,7 +645,7 @@  discard block
 block discarded – undo
645 645
 	    </form>
646 646
     	</div>
647 647
 <?php
648
-    if (isset($globalSatellite) && $globalSatellite) {
648
+	if (isset($globalSatellite) && $globalSatellite) {
649 649
 ?>
650 650
         <div class="sidebar-pane" id="satellites">
651 651
 	    <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1>
@@ -685,14 +685,14 @@  discard block
 block discarded – undo
685 685
 						print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>';
686 686
 					}
687 687
 				}
688
-			    ?>
688
+				?>
689 689
 			</select>
690 690
 		    </li>
691 691
 		</ul>
692 692
 	    </form>
693 693
 	</div>
694 694
 <?php
695
-    }
695
+	}
696 696
 ?>
697 697
     </div>
698 698
 </div>
Please login to merge, or discard this patch.