@@ -23,7 +23,9 @@ |
||
23 | 23 | print '<option></option>'; |
24 | 24 | $Stats = new Stats(); |
25 | 25 | $aircraft_types = $Stats->getAllAircraftTypes(); |
26 | - if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
26 | + if (empty($aircraft_types)) { |
|
27 | + $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
28 | + } |
|
27 | 29 | foreach($aircraft_types as $aircrafttype) |
28 | 30 | { |
29 | 31 | if($aircraft_type == $aircrafttype['aircraft_icao']) |
@@ -23,7 +23,9 @@ |
||
23 | 23 | print '<option></option>'; |
24 | 24 | $Stats = new Stats(); |
25 | 25 | $aircraft_types = $Stats->getAllAircraftTypes(); |
26 | - if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
26 | + if (empty($aircraft_types)) { |
|
27 | + $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
28 | + } |
|
27 | 29 | foreach($aircraft_types as $aircrafttype) |
28 | 30 | { |
29 | 31 | if($aircraft_type == $aircrafttype['aircraft_icao']) |
@@ -23,7 +23,9 @@ |
||
23 | 23 | print '<option></option>'; |
24 | 24 | $Stats = new Stats(); |
25 | 25 | $aircraft_types = $Stats->getAllAircraftTypes(); |
26 | - if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
26 | + if (empty($aircraft_types)) { |
|
27 | + $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
28 | + } |
|
27 | 29 | foreach($aircraft_types as $aircrafttype) |
28 | 30 | { |
29 | 31 | if($aircraft_type == $aircrafttype['aircraft_icao']) |
@@ -23,7 +23,9 @@ |
||
23 | 23 | print '<option></option>'; |
24 | 24 | $Stats = new Stats(); |
25 | 25 | $aircraft_types = $Stats->getAllAircraftTypes(); |
26 | - if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
26 | + if (empty($aircraft_types)) { |
|
27 | + $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
28 | + } |
|
27 | 29 | foreach($aircraft_types as $aircrafttype) |
28 | 30 | { |
29 | 31 | if($aircraft_type == $aircrafttype['aircraft_icao']) |
@@ -23,7 +23,9 @@ |
||
23 | 23 | print '<option></option>'; |
24 | 24 | $Stats = new Stats(); |
25 | 25 | $aircraft_types = $Stats->getAllAircraftTypes(); |
26 | - if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
26 | + if (empty($aircraft_types)) { |
|
27 | + $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
28 | + } |
|
27 | 29 | foreach($aircraft_types as $aircrafttype) |
28 | 30 | { |
29 | 31 | if($aircraft_type == $aircrafttype['aircraft_icao']) |
@@ -23,7 +23,9 @@ |
||
23 | 23 | print '<option></option>'; |
24 | 24 | $Stats = new Stats(); |
25 | 25 | $aircraft_types = $Stats->getAllAircraftTypes(); |
26 | - if (empty($aircraft_types)) $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
26 | + if (empty($aircraft_types)) { |
|
27 | + $aircraft_types = $Spotter->getAllAircraftTypes(); |
|
28 | + } |
|
27 | 29 | foreach($aircraft_types as $aircrafttype) |
28 | 30 | { |
29 | 31 | if($aircraft_type == $aircrafttype['aircraft_icao']) |
@@ -13,7 +13,7 @@ |
||
13 | 13 | $limit_start = 0; |
14 | 14 | $limit_end = 25; |
15 | 15 | $absolute_difference = 25; |
16 | - } else { |
|
16 | + } else { |
|
17 | 17 | $limit_explode = explode(",", $_GET['limit']); |
18 | 18 | $limit_start = $limit_explode[0]; |
19 | 19 | $limit_end = $limit_explode[1]; |
@@ -28,7 +28,9 @@ discard block |
||
28 | 28 | |
29 | 29 | // $output .= ',"clock": {"interval" : "'.date("c",time()-$globalLiveInterval).'/'.date("c").'","currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}'; |
30 | 30 | $output .= ',"clock": {"currentTime" : "'.date("c",time() - $globalLiveInterval).'","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"'; |
31 | -if (!isset($_GET['now'])) $output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"'; |
|
31 | +if (!isset($_GET['now'])) { |
|
32 | + $output .= ',"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z"'; |
|
33 | +} |
|
32 | 34 | $output .= '}'; |
33 | 35 | //$output .= ',"clock": {"currentTime" : "'.date("c",time()).'","multiplier" : 300,"range" : "UNBOUNDED","step": "TICK_DEPENDENT"}'; |
34 | 36 | //$output .= ',"clock": {"currentTime" : "%minitime%","multiplier" : 1,"range" : "UNBOUNDED","step": "SYSTEM_CLOCK_MULTIPLIER"}'; |
@@ -37,7 +39,9 @@ discard block |
||
37 | 39 | $output .= '},'; |
38 | 40 | $output .= '{'; |
39 | 41 | $output .= '"id": "santaclaus",'; |
40 | -if (!isset($_GET['now'])) $output .= '"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z",'; |
|
42 | +if (!isset($_GET['now'])) { |
|
43 | + $output .= '"interval": "'.date("Y").'-12-24T02:00:00Z/'.date("Y").'-12-25T02:00:00Z",'; |
|
44 | +} |
|
41 | 45 | $output .= '"properties": {'; |
42 | 46 | // Not yet supported in CZML with Cesium |
43 | 47 | $output .= '},'; |
@@ -36,8 +36,12 @@ |
||
36 | 36 | if (!empty($spotter_array)) { |
37 | 37 | include('table-output.php'); |
38 | 38 | print '<div class="pagination">'; |
39 | - if ($limit_previous_1 >= 0) print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">«'._("Previous Page").'</a>'; |
|
40 | - if ($spotter_array[0]['query_number_rows'] == $absolute_difference) print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'»</a>'; |
|
39 | + if ($limit_previous_1 >= 0) { |
|
40 | + print '<a href="'.$page_url.'/'.$limit_previous_1.','.$limit_previous_2.'">«'._("Previous Page").'</a>'; |
|
41 | + } |
|
42 | + if ($spotter_array[0]['query_number_rows'] == $absolute_difference) { |
|
43 | + print '<a href="'.$page_url.'/'.$limit_end.','.$limit_next.'">'._("Next Page").'»</a>'; |
|
44 | + } |
|
41 | 45 | print '</div>'; |
42 | 46 | } |
43 | 47 | print '</div>'; |