@@ -5,8 +5,11 @@ |
||
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | 6 | $registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING); |
| 7 | 7 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
| 8 | -if (isset($_GET['sort'])) $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort); |
|
| 9 | -else $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1"); |
|
| 8 | +if (isset($_GET['sort'])) { |
|
| 9 | + $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort); |
|
| 10 | +} else { |
|
| 11 | + $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1"); |
|
| 12 | +} |
|
| 10 | 13 | $aircraft_array = $Spotter->getAircraftInfoByRegistration($registration); |
| 11 | 14 | |
| 12 | 15 | |
@@ -23,7 +23,9 @@ discard block |
||
| 23 | 23 | print '<fieldset class="form-group">'; |
| 24 | 24 | print '<label for="metar_message">'._("METAR Message").'</label>'; |
| 25 | 25 | print '<textarea class="form-control" name="metar_message" id="metar_message" rows="5">'; |
| 26 | -if ($message != '') print $message; |
|
| 26 | +if ($message != '') { |
|
| 27 | + print $message; |
|
| 28 | +} |
|
| 27 | 29 | print '</textarea>'; |
| 28 | 30 | print '</fieldset>'; |
| 29 | 31 | print '<button type="submit" class="btn btn-primary">Submit</button>'; |
@@ -59,7 +61,9 @@ discard block |
||
| 59 | 61 | if (isset($metar_parse['cloud'])) { |
| 60 | 62 | print '<b>'._("Cloud:").'</b> '; |
| 61 | 63 | foreach ($metar_parse['cloud'] as $key => $cloud) { |
| 62 | - if ($key > 0) print ' / '; |
|
| 64 | + if ($key > 0) { |
|
| 65 | + print ' / '; |
|
| 66 | + } |
|
| 63 | 67 | print $cloud['type'].' at '.$cloud['level'].' m'; |
| 64 | 68 | } |
| 65 | 69 | print " "; |
@@ -15,8 +15,12 @@ discard block |
||
| 15 | 15 | } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
| 16 | 16 | $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00"; |
| 17 | 17 | $sql_date = $end_date; |
| 18 | - } else $sql_date = ''; |
|
| 19 | -} else $sql_date = ''; |
|
| 18 | + } else { |
|
| 19 | + $sql_date = ''; |
|
| 20 | + } |
|
| 21 | + } else { |
|
| 22 | + $sql_date = ''; |
|
| 23 | +} |
|
| 20 | 24 | |
| 21 | 25 | if (isset($_GET['highest_altitude'])) { |
| 22 | 26 | //for altitude manipulation |
@@ -30,8 +34,12 @@ discard block |
||
| 30 | 34 | } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
| 31 | 35 | $start_altitude = $_GET['lowest_altitude'].",60000"; |
| 32 | 36 | $sql_altitude = $start_altitude; |
| 33 | - } else $sql_altitude = ''; |
|
| 34 | -} else $sql_altitude = ''; |
|
| 37 | + } else { |
|
| 38 | + $sql_altitude = ''; |
|
| 39 | + } |
|
| 40 | + } else { |
|
| 41 | + $sql_altitude = ''; |
|
| 42 | +} |
|
| 35 | 43 | |
| 36 | 44 | //calculuation for the pagination |
| 37 | 45 | if(!isset($_GET['limit'])) |
@@ -49,7 +57,7 @@ discard block |
||
| 49 | 57 | $limit_end = $_GET['number_results']; |
| 50 | 58 | $absolute_difference = $_GET['number_results']; |
| 51 | 59 | } |
| 52 | -} else { |
|
| 60 | +} else { |
|
| 53 | 61 | $limit_explode = explode(",", $_GET['limit']); |
| 54 | 62 | $limit_start = $limit_explode[0]; |
| 55 | 63 | $limit_end = $limit_explode[1]; |
@@ -70,8 +78,11 @@ discard block |
||
| 70 | 78 | |
| 71 | 79 | $date = date("c", time()); |
| 72 | 80 | |
| 73 | -if (isset($_GET['sort'])) $sort = $_GET['sort']; |
|
| 74 | -else $sort = ''; |
|
| 81 | +if (isset($_GET['sort'])) { |
|
| 82 | + $sort = $_GET['sort']; |
|
| 83 | +} else { |
|
| 84 | + $sort = ''; |
|
| 85 | +} |
|
| 75 | 86 | $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING); |
| 76 | 87 | $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING); |
| 77 | 88 | $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING); |
@@ -15,8 +15,12 @@ discard block |
||
| 15 | 15 | } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
| 16 | 16 | $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00"; |
| 17 | 17 | $sql_date = $end_date; |
| 18 | - } else $sql_date = ''; |
|
| 19 | -} else $sql_date = ''; |
|
| 18 | + } else { |
|
| 19 | + $sql_date = ''; |
|
| 20 | + } |
|
| 21 | + } else { |
|
| 22 | + $sql_date = ''; |
|
| 23 | +} |
|
| 20 | 24 | |
| 21 | 25 | if (isset($_GET['highest_altitude'])) { |
| 22 | 26 | //for altitude manipulation |
@@ -30,8 +34,12 @@ discard block |
||
| 30 | 34 | } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
| 31 | 35 | $start_altitude = $_GET['lowest_altitude'].",60000"; |
| 32 | 36 | $sql_altitude = $start_altitude; |
| 33 | - } else $sql_altitude = ''; |
|
| 34 | -} else $sql_altitude = ''; |
|
| 37 | + } else { |
|
| 38 | + $sql_altitude = ''; |
|
| 39 | + } |
|
| 40 | + } else { |
|
| 41 | + $sql_altitude = ''; |
|
| 42 | +} |
|
| 35 | 43 | |
| 36 | 44 | //calculuation for the pagination |
| 37 | 45 | if(!isset($_GET['limit'])) |
@@ -49,7 +57,7 @@ discard block |
||
| 49 | 57 | $limit_end = $_GET['number_results']; |
| 50 | 58 | $absolute_difference = $_GET['number_results']; |
| 51 | 59 | } |
| 52 | -} else { |
|
| 60 | +} else { |
|
| 53 | 61 | $limit_explode = explode(",", $_GET['limit']); |
| 54 | 62 | $limit_start = $limit_explode[0]; |
| 55 | 63 | $limit_end = $limit_explode[1]; |
@@ -67,8 +75,11 @@ discard block |
||
| 67 | 75 | |
| 68 | 76 | header("Content-type: text/plain"); |
| 69 | 77 | |
| 70 | -if (isset($_GET['sort'])) $sort = $_GET['sort']; |
|
| 71 | -else $sort = ''; |
|
| 78 | +if (isset($_GET['sort'])) { |
|
| 79 | + $sort = $_GET['sort']; |
|
| 80 | +} else { |
|
| 81 | + $sort = ''; |
|
| 82 | +} |
|
| 72 | 83 | $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING); |
| 73 | 84 | $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING); |
| 74 | 85 | $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING); |
@@ -15,8 +15,12 @@ discard block |
||
| 15 | 15 | } else if($_GET['start_date'] == "" && $_GET['end_date'] != ""){ |
| 16 | 16 | $end_date = date("Y-m-d H:i:s", strtotime("2014-04-12")).",".$_GET['end_date'].":00"; |
| 17 | 17 | $sql_date = $end_date; |
| 18 | - } else $sql_date = ''; |
|
| 19 | -} else $sql_date = ''; |
|
| 18 | + } else { |
|
| 19 | + $sql_date = ''; |
|
| 20 | + } |
|
| 21 | + } else { |
|
| 22 | + $sql_date = ''; |
|
| 23 | +} |
|
| 20 | 24 | |
| 21 | 25 | if (isset($_GET['highest_altitude'])) { |
| 22 | 26 | //for altitude manipulation |
@@ -30,8 +34,12 @@ discard block |
||
| 30 | 34 | } else if($_GET['highest_altitude'] == "" && $_GET['lowest_altitude'] != ""){ |
| 31 | 35 | $start_altitude = $_GET['lowest_altitude'].",60000"; |
| 32 | 36 | $sql_altitude = $start_altitude; |
| 33 | - } else $sql_altitude = ''; |
|
| 34 | -} else $sql_altitude = ''; |
|
| 37 | + } else { |
|
| 38 | + $sql_altitude = ''; |
|
| 39 | + } |
|
| 40 | + } else { |
|
| 41 | + $sql_altitude = ''; |
|
| 42 | +} |
|
| 35 | 43 | |
| 36 | 44 | //calculuation for the pagination |
| 37 | 45 | if(!isset($_GET['limit'])) |
@@ -49,7 +57,7 @@ discard block |
||
| 49 | 57 | $limit_end = $_GET['number_results']; |
| 50 | 58 | $absolute_difference = $_GET['number_results']; |
| 51 | 59 | } |
| 52 | -} else { |
|
| 60 | +} else { |
|
| 53 | 61 | $limit_explode = explode(",", $_GET['limit']); |
| 54 | 62 | $limit_start = $limit_explode[0]; |
| 55 | 63 | $limit_end = $limit_explode[1]; |
@@ -67,8 +75,11 @@ discard block |
||
| 67 | 75 | |
| 68 | 76 | header("Content-type: text/yaml"); |
| 69 | 77 | |
| 70 | -if (isset($_GET['sort'])) $sort = $_GET['sort']; |
|
| 71 | -else $sort = ''; |
|
| 78 | +if (isset($_GET['sort'])) { |
|
| 79 | + $sort = $_GET['sort']; |
|
| 80 | +} else { |
|
| 81 | + $sort = ''; |
|
| 82 | +} |
|
| 72 | 83 | $q = filter_input(INPUT_GET,'q',FILTER_SANITIZE_STRING); |
| 73 | 84 | $registration = filter_input(INPUT_GET,'registratrion',FILTER_SANITIZE_STRING); |
| 74 | 85 | $aircraft = filter_input(INPUT_GET,'aircraft',FILTER_SANITIZE_STRING); |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | $limit_start = 0; |
| 19 | 19 | $limit_end = 25; |
| 20 | 20 | $absolute_difference = 25; |
| 21 | -} else { |
|
| 21 | +} else { |
|
| 22 | 22 | $limit_explode = explode(",", $_GET['limit']); |
| 23 | 23 | $limit_start = $limit_explode[0]; |
| 24 | 24 | $limit_end = $limit_explode[1]; |
@@ -8,7 +8,9 @@ |
||
| 8 | 8 | if ($registration != '') { |
| 9 | 9 | $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort); |
| 10 | 10 | $aircraft_array = $Spotter->getAircraftInfoByRegistration($registration); |
| 11 | -} else $spotter_array=array(); |
|
| 11 | +} else { |
|
| 12 | + $spotter_array=array(); |
|
| 13 | +} |
|
| 12 | 14 | |
| 13 | 15 | if (!empty($spotter_array)) |
| 14 | 16 | { |
@@ -35,7 +35,9 @@ |
||
| 35 | 35 | $first = ''; |
| 36 | 36 | foreach($data as $value => $key) { |
| 37 | 37 | $final_coord = $Common->getCoordfromDistanceBearing($initial_latitude,$initial_longitude,$value*22.5,$key); |
| 38 | - if ($first == '') $first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']'; |
|
| 38 | + if ($first == '') { |
|
| 39 | + $first = '['.round($final_coord['longitude'],5).','.round($final_coord['latitude'],5).']'; |
|
| 40 | + } |
|
| 39 | 41 | $output .= '['.$final_coord['longitude'].','.$final_coord['latitude'].'],'; |
| 40 | 42 | } |
| 41 | 43 | $output .= $first; |
@@ -16,21 +16,40 @@ discard block |
||
| 16 | 16 | } |
| 17 | 17 | header('Content-Type: text/javascript'); |
| 18 | 18 | |
| 19 | -if (!isset($globalJsonCompress)) $compress = true; |
|
| 20 | -else $compress = $globalJsonCompress; |
|
| 19 | +if (!isset($globalJsonCompress)) { |
|
| 20 | + $compress = true; |
|
| 21 | +} else { |
|
| 22 | + $compress = $globalJsonCompress; |
|
| 23 | +} |
|
| 21 | 24 | |
| 22 | 25 | $from_archive = false; |
| 23 | 26 | $min = false; |
| 24 | 27 | $allhistory = false; |
| 25 | 28 | $filter['source'] = array(); |
| 26 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') $filter['source'] = array_merge($filter['source'],array('vatsimtxt')); |
|
| 27 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') $filter['source'] = array_merge($filter['source'],array('whazzup')); |
|
| 28 | -if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') $filter['source'] = array_merge($filter['source'],array('phpvmacars')); |
|
| 29 | -if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') $filter['source'] = array_merge($filter['source'],array('sbs')); |
|
| 30 | -if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') $filter['source'] = array_merge($filter['source'],array('aprs')); |
|
| 31 | -if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') $filter['airlines'] = explode(',',$_COOKIE['Airlines']); |
|
| 32 | -if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') $filter['source_aprs'] = explode(',',$_COOKIE['Sources']); |
|
| 33 | -if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') $filter['airlinestype'] = $_COOKIE['airlinestype']; |
|
| 29 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalVATSIM) && $globalVATSIM && isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') { |
|
| 30 | + $filter['source'] = array_merge($filter['source'],array('vatsimtxt')); |
|
| 31 | +} |
|
| 32 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalIVAO) && $globalIVAO && isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') { |
|
| 33 | + $filter['source'] = array_merge($filter['source'],array('whazzup')); |
|
| 34 | +} |
|
| 35 | +if ((!isset($globalMapVAchoose) || $globalMapVAchoose) && isset($globalphpVMS) && $globalphpVMS && isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') { |
|
| 36 | + $filter['source'] = array_merge($filter['source'],array('phpvmacars')); |
|
| 37 | +} |
|
| 38 | +if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalSBS1) && $globalSBS1 && isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') { |
|
| 39 | + $filter['source'] = array_merge($filter['source'],array('sbs')); |
|
| 40 | +} |
|
| 41 | +if ((!isset($globalMapchoose) || $globalMapchoose) && isset($globalAPRS) && $globalAPRS && isset($_COOKIE['ShowAPRS']) && $_COOKIE['ShowAPRS'] == 'true') { |
|
| 42 | + $filter['source'] = array_merge($filter['source'],array('aprs')); |
|
| 43 | +} |
|
| 44 | +if (isset($_COOKIE['Airlines']) && $_COOKIE['Airlines'] != '') { |
|
| 45 | + $filter['airlines'] = explode(',',$_COOKIE['Airlines']); |
|
| 46 | +} |
|
| 47 | +if (isset($_COOKIE['Sources']) && $_COOKIE['Sources'] != '') { |
|
| 48 | + $filter['source_aprs'] = explode(',',$_COOKIE['Sources']); |
|
| 49 | +} |
|
| 50 | +if (isset($_COOKIE['airlinestype']) && $_COOKIE['airlinestype'] != 'all') { |
|
| 51 | + $filter['airlinestype'] = $_COOKIE['airlinestype']; |
|
| 52 | +} |
|
| 34 | 53 | |
| 35 | 54 | if (isset($globalMapPopup) && !$globalMapPopup && !(isset($_COOKIE['flightpopup']) && $_COOKIE['flightpopup'] == 'true')) { |
| 36 | 55 | $min = true; |
@@ -60,8 +79,12 @@ discard block |
||
| 60 | 79 | |
| 61 | 80 | if (!empty($spotter_array)) { |
| 62 | 81 | $flightcnt = $SpotterArchive->getLiveSpotterCount($begindate,$enddate,$filter); |
| 63 | - if ($flightcnt == '') $flightcnt = 0; |
|
| 64 | -} else $flightcnt = 0; |
|
| 82 | + if ($flightcnt == '') { |
|
| 83 | + $flightcnt = 0; |
|
| 84 | + } |
|
| 85 | + } else { |
|
| 86 | + $flightcnt = 0; |
|
| 87 | +} |
|
| 65 | 88 | |
| 66 | 89 | $sqltime = round(microtime(true)-$begintime,2); |
| 67 | 90 | |
@@ -70,8 +93,11 @@ discard block |
||
| 70 | 93 | |
| 71 | 94 | $output = '{'; |
| 72 | 95 | $output .= '"type": "FeatureCollection",'; |
| 73 | - if ($min) $output .= '"minimal": "true",'; |
|
| 74 | - else $output .= '"minimal": "false",'; |
|
| 96 | + if ($min) { |
|
| 97 | + $output .= '"minimal": "true",'; |
|
| 98 | + } else { |
|
| 99 | + $output .= '"minimal": "false",'; |
|
| 100 | + } |
|
| 75 | 101 | $output .= '"fc": "'.$flightcnt.'",'; |
| 76 | 102 | $output .= '"sqt": "'.$sqltime.'",'; |
| 77 | 103 | |
@@ -140,11 +166,16 @@ discard block |
||
| 140 | 166 | //$output .= '"fc": "'.$flightcnt.'",'; |
| 141 | 167 | //$output .= '"sqt": "'.$sqltime.'",'; |
| 142 | 168 | $output .= '"properties": {'; |
| 143 | - if ($compress) $output .= '"fi": "'.$spotter_item['flightaware_id'].'",'; |
|
| 144 | - else $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",'; |
|
| 169 | + if ($compress) { |
|
| 170 | + $output .= '"fi": "'.$spotter_item['flightaware_id'].'",'; |
|
| 171 | + } else { |
|
| 172 | + $output .= '"flightaware_id": "'.$spotter_item['flightaware_id'].'",'; |
|
| 173 | + } |
|
| 145 | 174 | $output .= '"fc": "'.$flightcnt.'",'; |
| 146 | 175 | $output .= '"sqt": "'.$sqltime.'",'; |
| 147 | - if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",'; |
|
| 176 | + if (isset($begindate)) { |
|
| 177 | + $output .= '"archive_date": "'.$begindate.'",'; |
|
| 178 | + } |
|
| 148 | 179 | |
| 149 | 180 | /* |
| 150 | 181 | if ($min) $output .= '"minimal": "true",'; |
@@ -152,13 +183,21 @@ discard block |
||
| 152 | 183 | */ |
| 153 | 184 | //$output .= '"fc": "'.$spotter_item['nb'].'",'; |
| 154 | 185 | if (isset($spotter_item['ident']) && $spotter_item['ident'] != '') { |
| 155 | - if ($compress) $output .= '"c": "'.$spotter_item['ident'].'",'; |
|
| 156 | - else $output .= '"callsign": "'.$spotter_item['ident'].'",'; |
|
| 186 | + if ($compress) { |
|
| 187 | + $output .= '"c": "'.$spotter_item['ident'].'",'; |
|
| 188 | + } else { |
|
| 189 | + $output .= '"callsign": "'.$spotter_item['ident'].'",'; |
|
| 190 | + } |
|
| 157 | 191 | } else { |
| 158 | - if ($compress) $output .= '"c": "NA",'; |
|
| 159 | - else $output .= '"callsign": "NA",'; |
|
| 192 | + if ($compress) { |
|
| 193 | + $output .= '"c": "NA",'; |
|
| 194 | + } else { |
|
| 195 | + $output .= '"callsign": "NA",'; |
|
| 196 | + } |
|
| 197 | + } |
|
| 198 | + if (isset($spotter_item['registration'])) { |
|
| 199 | + $output .= '"registration": "'.$spotter_item['registration'].'",'; |
|
| 160 | 200 | } |
| 161 | - if (isset($spotter_item['registration'])) $output .= '"registration": "'.$spotter_item['registration'].'",'; |
|
| 162 | 201 | if (isset($spotter_item['aircraft_name']) && isset($spotter_item['aircraft_type'])) { |
| 163 | 202 | $output .= '"aircraft_name": "'.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')",'; |
| 164 | 203 | $output .= '"aircraft_wiki": "http://'.strtolower($globalLanguage).'.wikipedia.org/wiki/'.urlencode(str_replace(' ','_',$spotter_item['aircraft_name'])).'",'; |
@@ -171,19 +210,29 @@ discard block |
||
| 171 | 210 | $output .= '"aircraft_icao": "'.$spotter_item['aircraft_icao'].'",'; |
| 172 | 211 | } |
| 173 | 212 | if (!isset($spotter_item['aircraft_shadow'])) { |
| 174 | - if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') $spotter_item['aircraft_shadow'] = ''; |
|
| 175 | - else { |
|
| 213 | + if (!isset($spotter_item['aircraft_icao']) || $spotter_item['aircraft_icao'] == '') { |
|
| 214 | + $spotter_item['aircraft_shadow'] = ''; |
|
| 215 | + } else { |
|
| 176 | 216 | $aircraft_info = $Spotter->getAllAircraftInfo($spotter_item['aircraft_icao']); |
| 177 | - if (count($aircraft_info) > 0) $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow']; |
|
| 178 | - else $spotter_item['aircraft_shadow'] = ''; |
|
| 217 | + if (count($aircraft_info) > 0) { |
|
| 218 | + $spotter_item['aircraft_shadow'] = $aircraft_info[0]['aircraft_shadow']; |
|
| 219 | + } else { |
|
| 220 | + $spotter_item['aircraft_shadow'] = ''; |
|
| 221 | + } |
|
| 179 | 222 | } |
| 180 | 223 | } |
| 181 | 224 | if ($spotter_item['aircraft_shadow'] == '') { |
| 182 | - if ($compress) $output .= '"as": "default.png",'; |
|
| 183 | - else $output .= '"aircraft_shadow": "default.png",'; |
|
| 225 | + if ($compress) { |
|
| 226 | + $output .= '"as": "default.png",'; |
|
| 227 | + } else { |
|
| 228 | + $output .= '"aircraft_shadow": "default.png",'; |
|
| 229 | + } |
|
| 184 | 230 | } else { |
| 185 | - if ($compress) $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",'; |
|
| 186 | - else $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",'; |
|
| 231 | + if ($compress) { |
|
| 232 | + $output .= '"as": "'.$spotter_item['aircraft_shadow'].'",'; |
|
| 233 | + } else { |
|
| 234 | + $output .= '"aircraft_shadow": "'.$spotter_item['aircraft_shadow'].'",'; |
|
| 235 | + } |
|
| 187 | 236 | } |
| 188 | 237 | if (isset($spotter_item['airline_name'])) { |
| 189 | 238 | $output .= '"airline_name": "'.$spotter_item['airline_name'].'",'; |
@@ -191,8 +240,11 @@ discard block |
||
| 191 | 240 | $output .= '"airline_name": "NA",'; |
| 192 | 241 | } |
| 193 | 242 | if (isset($spotter_item['departure_airport'])) { |
| 194 | - if ($compress) $output .= '"dac": "'.$spotter_item['departure_airport'].'",'; |
|
| 195 | - else $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",'; |
|
| 243 | + if ($compress) { |
|
| 244 | + $output .= '"dac": "'.$spotter_item['departure_airport'].'",'; |
|
| 245 | + } else { |
|
| 246 | + $output .= '"departure_airport_code": "'.$spotter_item['departure_airport'].'",'; |
|
| 247 | + } |
|
| 196 | 248 | } |
| 197 | 249 | if (isset($spotter_item['departure_airport_city'])) { |
| 198 | 250 | $output .= '"departure_airport": "'.$spotter_item['departure_airport_city'].', '.$spotter_item['departure_airport_country'].'",'; |
@@ -204,8 +256,11 @@ discard block |
||
| 204 | 256 | $output .= '"arrival_airport_time": "'.$spotter_item['arrival_airport_time'].'",'; |
| 205 | 257 | } |
| 206 | 258 | if (isset($spotter_item['arrival_airport'])) { |
| 207 | - if ($compress) $output .= '"aac": "'.$spotter_item['arrival_airport'].'",'; |
|
| 208 | - else $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",'; |
|
| 259 | + if ($compress) { |
|
| 260 | + $output .= '"aac": "'.$spotter_item['arrival_airport'].'",'; |
|
| 261 | + } else { |
|
| 262 | + $output .= '"arrival_airport_code": "'.$spotter_item['arrival_airport'].'",'; |
|
| 263 | + } |
|
| 209 | 264 | } |
| 210 | 265 | if (isset($spotter_item['arrival_airport_city'])) { |
| 211 | 266 | $output .= '"arrival_airport": "'.$spotter_item['arrival_airport_city'].', '.$spotter_item['arrival_airport_country'].'",'; |
@@ -223,18 +278,29 @@ discard block |
||
| 223 | 278 | $output .= '"ground_speed": "'.$spotter_item['ground_speed'].'",'; |
| 224 | 279 | } |
| 225 | 280 | |
| 226 | - if ($compress) $output .= '"a": "'.$spotter_item['altitude'].'",'; |
|
| 227 | - else $output .= '"altitude": "'.$spotter_item['altitude'].'",'; |
|
| 228 | - if ($compress)$output .= '"h": "'.$spotter_item['heading'].'",'; |
|
| 229 | - else $output .= '"heading": "'.$spotter_item['heading'].'",'; |
|
| 281 | + if ($compress) { |
|
| 282 | + $output .= '"a": "'.$spotter_item['altitude'].'",'; |
|
| 283 | + } else { |
|
| 284 | + $output .= '"altitude": "'.$spotter_item['altitude'].'",'; |
|
| 285 | + } |
|
| 286 | + if ($compress) { |
|
| 287 | + $output .= '"h": "'.$spotter_item['heading'].'",'; |
|
| 288 | + } else { |
|
| 289 | + $output .= '"heading": "'.$spotter_item['heading'].'",'; |
|
| 290 | + } |
|
| 230 | 291 | |
| 231 | - if (isset($archivespeed)) $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed); |
|
| 232 | - else $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']); |
|
| 292 | + if (isset($archivespeed)) { |
|
| 293 | + $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading'],$archivespeed); |
|
| 294 | + } else { |
|
| 295 | + $nextcoord = $Common->nextcoord($spotter_item['latitude'],$spotter_item['longitude'],$spotter_item['ground_speed'],$spotter_item['heading']); |
|
| 296 | + } |
|
| 233 | 297 | //$output .= '"nextlatitude": "'.$nextcoord['latitude'].'",'; |
| 234 | 298 | //$output .= '"nextlongitude": "'.$nextcoord['longitude'].'",'; |
| 235 | 299 | $output .= '"nextlatlon": ['.$nextcoord['latitude'].','.$nextcoord['longitude'].'],'; |
| 236 | 300 | |
| 237 | - if (!$min) $output .= '"image": "'.$image.'",'; |
|
| 301 | + if (!$min) { |
|
| 302 | + $output .= '"image": "'.$image.'",'; |
|
| 303 | + } |
|
| 238 | 304 | if (isset($spotter_item['image_copyright']) && $spotter_item['image_copyright'] != '') { |
| 239 | 305 | $output .= '"image_copyright": "'.str_replace('"',"'",trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$spotter_item['image_copyright']))).'",'; |
| 240 | 306 | } |
@@ -242,8 +308,11 @@ discard block |
||
| 242 | 308 | $output .= '"image_source_website": "'.urlencode($spotter_item['image_source_website']).'",'; |
| 243 | 309 | } |
| 244 | 310 | if (isset($spotter_item['squawk'])) { |
| 245 | - if ($compress) $output .= '"sq": "'.$spotter_item['squawk'].'",'; |
|
| 246 | - else $output .= '"squawk": "'.$spotter_item['squawk'].'",'; |
|
| 311 | + if ($compress) { |
|
| 312 | + $output .= '"sq": "'.$spotter_item['squawk'].'",'; |
|
| 313 | + } else { |
|
| 314 | + $output .= '"squawk": "'.$spotter_item['squawk'].'",'; |
|
| 315 | + } |
|
| 247 | 316 | } |
| 248 | 317 | if (isset($spotter_item['squawk_usage'])) { |
| 249 | 318 | $output .= '"squawk_usage": "'.$spotter_item['squawk_usage'].'",'; |
@@ -277,8 +346,11 @@ discard block |
||
| 277 | 346 | |
| 278 | 347 | |
| 279 | 348 | // FIXME : type when not aircraft ? |
| 280 | - if ($compress) $output .= '"t": "aircraft"'; |
|
| 281 | - else $output .= '"type": "aircraft"'; |
|
| 349 | + if ($compress) { |
|
| 350 | + $output .= '"t": "aircraft"'; |
|
| 351 | + } else { |
|
| 352 | + $output .= '"type": "aircraft"'; |
|
| 353 | + } |
|
| 282 | 354 | $output .= '},'; |
| 283 | 355 | $output .= '"geometry": {'; |
| 284 | 356 | $output .= '"type": "MultiPoint",'; |
@@ -298,7 +370,9 @@ discard block |
||
| 298 | 370 | $output .= ']'; |
| 299 | 371 | $output .= ',"initial_sqltime": "'.$sqltime.'",'; |
| 300 | 372 | $output .= '"totaltime": "'.round(microtime(true)-$begintime,2).'",'; |
| 301 | - if (isset($begindate)) $output .= '"archive_date": "'.$begindate.'",'; |
|
| 373 | + if (isset($begindate)) { |
|
| 374 | + $output .= '"archive_date": "'.$begindate.'",'; |
|
| 375 | + } |
|
| 302 | 376 | $output .= '"fc": "'.$flightcnt.'"'; |
| 303 | 377 | } else { |
| 304 | 378 | $output .= '"features": '; |