Ysurac /
FlightAirMap
@@ -7,13 +7,13 @@ discard block |
||
| 7 | 7 | die(); |
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | -$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 11 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 12 | -$spotter_array = $Spotter->getSpotterDataByIdent($ident,"0,1", $sort); |
|
| 10 | +$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
| 11 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 12 | +$spotter_array = $Spotter->getSpotterDataByIdent($ident, "0,1", $sort); |
|
| 13 | 13 | |
| 14 | 14 | if (!empty($spotter_array)) |
| 15 | 15 | { |
| 16 | - $title = sprintf(_("Most Common Aircraft by Registration of %s"),$spotter_array[0]['ident']); |
|
| 16 | + $title = sprintf(_("Most Common Aircraft by Registration of %s"), $spotter_array[0]['ident']); |
|
| 17 | 17 | require_once('header.php'); |
| 18 | 18 | print '<div class="info column">'; |
| 19 | 19 | print '<h1>'.$spotter_array[0]['ident'].'</h1>'; |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | include('ident-sub-menu.php'); |
| 25 | 25 | print '<div class="column">'; |
| 26 | 26 | print '<h2>'._("Most Common Aircraft by Registration").'</h2>'; |
| 27 | - print '<p>'.sprintf(_("The statistic below shows the most common aircraft by Registration of flights using the ident/callsign <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>'; |
|
| 27 | + print '<p>'.sprintf(_("The statistic below shows the most common aircraft by Registration of flights using the ident/callsign <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>'; |
|
| 28 | 28 | |
| 29 | 29 | $aircraft_array = $Spotter->countAllAircraftRegistrationByIdent($ident); |
| 30 | 30 | |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | print '</thead>'; |
| 43 | 43 | print '<tbody>'; |
| 44 | 44 | $i = 1; |
| 45 | - foreach($aircraft_array as $aircraft_item) |
|
| 45 | + foreach ($aircraft_array as $aircraft_item) |
|
| 46 | 46 | { |
| 47 | 47 | print '<tr>'; |
| 48 | 48 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | header('Location: '.$globalURL.'/pilot/'.$_POST['pilot']); |
| 10 | 10 | //} else if (isset($_GET['airport'])){ |
| 11 | 11 | } else { |
| 12 | - $Spotter= new Spotter(); |
|
| 12 | + $Spotter = new Spotter(); |
|
| 13 | 13 | $Stats = new Stats(); |
| 14 | 14 | $title = _("Pilots"); |
| 15 | 15 | require_once('header.php'); |
@@ -22,11 +22,11 @@ discard block |
||
| 22 | 22 | //ksort($pilot_names); |
| 23 | 23 | $previous = null; |
| 24 | 24 | print '<div class="alphabet-legend">'; |
| 25 | - foreach($pilot_names as $value) { |
|
| 25 | + foreach ($pilot_names as $value) { |
|
| 26 | 26 | $firstLetter = mb_strtoupper(mb_substr($value['pilot_name'], 0, 1)); |
| 27 | - if($previous !== $firstLetter && $firstLetter != "'") |
|
| 27 | + if ($previous !== $firstLetter && $firstLetter != "'") |
|
| 28 | 28 | { |
| 29 | - if ($previous !== null){ |
|
| 29 | + if ($previous !== null) { |
|
| 30 | 30 | print ' | '; |
| 31 | 31 | } |
| 32 | 32 | print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>'; |
@@ -35,13 +35,13 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | print '</div>'; |
| 37 | 37 | $previous = null; |
| 38 | - foreach($pilot_names as $value) { |
|
| 38 | + foreach ($pilot_names as $value) { |
|
| 39 | 39 | $firstLetter = mb_strtoupper(mb_substr($value['pilot_name'], 0, 1)); |
| 40 | 40 | if ($firstLetter != "") |
| 41 | 41 | { |
| 42 | - if($previous !== $firstLetter && $firstLetter != "'") |
|
| 42 | + if ($previous !== $firstLetter && $firstLetter != "'") |
|
| 43 | 43 | { |
| 44 | - if ($previous !== null){ |
|
| 44 | + if ($previous !== null) { |
|
| 45 | 45 | print '</div>'; |
| 46 | 46 | } |
| 47 | 47 | print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">'; |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | header('Location: '.$globalURL.'/owner/'.$_POST['owner']); |
| 11 | 11 | //} else if (isset($_GET['airport'])){ |
| 12 | 12 | } else { |
| 13 | - $Spotter= new Spotter(); |
|
| 13 | + $Spotter = new Spotter(); |
|
| 14 | 14 | $Stats = new Stats(); |
| 15 | 15 | $Common = new Common(); |
| 16 | 16 | $title = _("Owners"); |
@@ -24,11 +24,11 @@ discard block |
||
| 24 | 24 | ksort($owner_names); |
| 25 | 25 | $previous = null; |
| 26 | 26 | print '<div class="alphabet-legend">'; |
| 27 | - foreach($owner_names as $value) { |
|
| 27 | + foreach ($owner_names as $value) { |
|
| 28 | 28 | $firstLetter = $Common->remove_accents(mb_strtoupper(mb_substr($value['owner_name'], 0, 1))); |
| 29 | - if($previous !== $firstLetter && $firstLetter != "'" && $firstLetter != '"') |
|
| 29 | + if ($previous !== $firstLetter && $firstLetter != "'" && $firstLetter != '"') |
|
| 30 | 30 | { |
| 31 | - if ($previous !== null){ |
|
| 31 | + if ($previous !== null) { |
|
| 32 | 32 | print ' | '; |
| 33 | 33 | } |
| 34 | 34 | print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>'; |
@@ -37,13 +37,13 @@ discard block |
||
| 37 | 37 | } |
| 38 | 38 | print '</div>'; |
| 39 | 39 | $previous = null; |
| 40 | - foreach($owner_names as $value) { |
|
| 40 | + foreach ($owner_names as $value) { |
|
| 41 | 41 | $firstLetter = $Common->remove_accents(mb_strtoupper(mb_substr($value['owner_name'], 0, 1))); |
| 42 | 42 | if ($firstLetter != "") |
| 43 | 43 | { |
| 44 | - if($previous !== $firstLetter && $firstLetter != "'" && $firstLetter != '"') |
|
| 44 | + if ($previous !== $firstLetter && $firstLetter != "'" && $firstLetter != '"') |
|
| 45 | 45 | { |
| 46 | - if ($previous !== null){ |
|
| 46 | + if ($previous !== null) { |
|
| 47 | 47 | print '</div>'; |
| 48 | 48 | } |
| 49 | 49 | print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">'; |
@@ -29,20 +29,20 @@ discard block |
||
| 29 | 29 | * @param String $date get data for a date |
| 30 | 30 | * @return Array Return Accidents data in array |
| 31 | 31 | */ |
| 32 | - public function getAccidentData($limit = '',$type = '',$date = '') { |
|
| 32 | + public function getAccidentData($limit = '', $type = '', $date = '') { |
|
| 33 | 33 | global $globalURL, $globalDBdriver; |
| 34 | 34 | $Image = new Image($this->db); |
| 35 | 35 | $Spotter = new Spotter($this->db); |
| 36 | 36 | $Translation = new Translation($this->db); |
| 37 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 37 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 38 | 38 | date_default_timezone_set('UTC'); |
| 39 | 39 | $result = array(); |
| 40 | 40 | $limit_query = ''; |
| 41 | 41 | if ($limit != "") |
| 42 | 42 | { |
| 43 | 43 | $limit_array = explode(",", $limit); |
| 44 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 45 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 44 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 45 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 46 | 46 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 47 | 47 | { |
| 48 | 48 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
@@ -51,29 +51,29 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | if ($type != '') { |
| 53 | 53 | if ($date != '') { |
| 54 | - if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) { |
|
| 54 | + if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) { |
|
| 55 | 55 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 56 | 56 | //$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 57 | - $query_values = array(':type' => $type,':date' => $date); |
|
| 58 | - } elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/",$date)) { |
|
| 57 | + $query_values = array(':type' => $type, ':date' => $date); |
|
| 58 | + } elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/", $date)) { |
|
| 59 | 59 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date BETWEEN :dated AND :datef GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 60 | - $query_values = array(':type' => $type,':dated' => $date.'-01', ':datef' => $date.'-31'); |
|
| 61 | - } elseif (preg_match("/^[0-9]{4}$/",$date)) { |
|
| 60 | + $query_values = array(':type' => $type, ':dated' => $date.'-01', ':datef' => $date.'-31'); |
|
| 61 | + } elseif (preg_match("/^[0-9]{4}$/", $date)) { |
|
| 62 | 62 | if ($globalDBdriver == 'mysql') { |
| 63 | 63 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND YEAR(date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 64 | 64 | } else { |
| 65 | 65 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND EXTRACT(YEAR FROM date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 66 | 66 | } |
| 67 | - $query_values = array(':type' => $type,':date' => $date); |
|
| 67 | + $query_values = array(':type' => $type, ':date' => $date); |
|
| 68 | 68 | } else { |
| 69 | 69 | $date = $date.'%'; |
| 70 | 70 | if ($globalDBdriver == 'mysql') { |
| 71 | 71 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND DATE_FORMAT(date,'%Y-%m-%d') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 72 | - $query_values = array(':type' => $type,':date' => $date); |
|
| 72 | + $query_values = array(':type' => $type, ':date' => $date); |
|
| 73 | 73 | } else { |
| 74 | 74 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 75 | 75 | //$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 76 | - $query_values = array(':type' => $type,':date' => $date); |
|
| 76 | + $query_values = array(':type' => $type, ':date' => $date); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | } else { |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | } else { |
| 85 | 85 | if ($date != '') { |
| 86 | - if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) { |
|
| 86 | + if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) { |
|
| 87 | 87 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 88 | 88 | //$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 89 | 89 | } else { |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | try { |
| 103 | 103 | $sth = $this->db->prepare($query); |
| 104 | 104 | $sth->execute($query_values); |
| 105 | - } catch(PDOException $e) { |
|
| 105 | + } catch (PDOException $e) { |
|
| 106 | 106 | echo "error : ".$e->getMessage(); |
| 107 | 107 | } |
| 108 | 108 | $i = 0; |
@@ -112,8 +112,8 @@ discard block |
||
| 112 | 112 | $data = array(); |
| 113 | 113 | if ($row['registration'] != '') { |
| 114 | 114 | $image_array = $Image->getSpotterImage($row['registration']); |
| 115 | - if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 116 | - else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 115 | + if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 116 | + else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 117 | 117 | $aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']); |
| 118 | 118 | $aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type); |
| 119 | 119 | if (!empty($aircraft_info)) { |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | $data['aircraft_name'] = $aircraft_info[0]['type']; |
| 122 | 122 | $data['aircraft_manufacturer'] = $aircraft_info[0]['manufacturer']; |
| 123 | 123 | } else { |
| 124 | - $data = array_merge($data,array('aircraft_type' => 'NA')); |
|
| 124 | + $data = array_merge($data, array('aircraft_type' => 'NA')); |
|
| 125 | 125 | } |
| 126 | 126 | $owner_data = $Spotter->getAircraftOwnerByRegistration($row['registration']); |
| 127 | 127 | if (!empty($owner_data)) { |
@@ -129,18 +129,18 @@ discard block |
||
| 129 | 129 | $data['aircraft_base'] = $owner_data['base']; |
| 130 | 130 | $data['aircraft_date_first_reg'] = $owner_data['date_first_reg']; |
| 131 | 131 | } |
| 132 | - } else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 132 | + } else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 133 | 133 | if ($row['registration'] == '') $row['registration'] = 'NA'; |
| 134 | 134 | if ($row['ident'] == '') $row['ident'] = 'NA'; |
| 135 | - $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3)); |
|
| 135 | + $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 3)); |
|
| 136 | 136 | if (isset($identicao[0])) { |
| 137 | - if (substr($row['ident'],0,2) == 'AF') { |
|
| 138 | - if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 139 | - else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0'); |
|
| 140 | - } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0'); |
|
| 141 | - $data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name'])); |
|
| 137 | + if (substr($row['ident'], 0, 2) == 'AF') { |
|
| 138 | + if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 139 | + else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0'); |
|
| 140 | + } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0'); |
|
| 141 | + $data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name'])); |
|
| 142 | 142 | } else $icao = $row['ident']; |
| 143 | - $icao = $Translation->checkTranslation($icao,false); |
|
| 143 | + $icao = $Translation->checkTranslation($icao, false); |
|
| 144 | 144 | //$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url'])); |
| 145 | 145 | if ($row['airline_name'] != '' && !isset($data['airline_name'])) { |
| 146 | 146 | //echo 'Check airline info... for '.$row['airline_name'].' '; |
@@ -149,11 +149,11 @@ discard block |
||
| 149 | 149 | if (!empty($airline_info)) { |
| 150 | 150 | //echo 'data found !'."\n"; |
| 151 | 151 | //print_r($airline_info); |
| 152 | - $data = array_merge($data,$airline_info); |
|
| 152 | + $data = array_merge($data, $airline_info); |
|
| 153 | 153 | } |
| 154 | 154 | //else echo 'No data...'."\n"; |
| 155 | 155 | } |
| 156 | - $data = array_merge($row,$data); |
|
| 156 | + $data = array_merge($row, $data); |
|
| 157 | 157 | if ($data['ident'] == null) $data['ident'] = $icao; |
| 158 | 158 | if ($data['title'] == null) { |
| 159 | 159 | $data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country']; |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | try { |
| 188 | 188 | $sth = $this->db->prepare($query); |
| 189 | 189 | $sth->execute(); |
| 190 | - } catch(PDOException $e) { |
|
| 190 | + } catch (PDOException $e) { |
|
| 191 | 191 | echo "Error : ".$e->getMessage(); |
| 192 | 192 | } |
| 193 | 193 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | try { |
| 208 | 208 | $sth = $this->db->prepare($query); |
| 209 | 209 | $sth->execute(); |
| 210 | - } catch(PDOException $e) { |
|
| 210 | + } catch (PDOException $e) { |
|
| 211 | 211 | echo "Error : ".$e->getMessage(); |
| 212 | 212 | } |
| 213 | 213 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -222,15 +222,15 @@ discard block |
||
| 222 | 222 | if ($globalDebug) echo 'Import '.$file."\n"; |
| 223 | 223 | $result = array(); |
| 224 | 224 | if (file_exists($file)) { |
| 225 | - if (($handle = fopen($file,'r')) !== FALSE) { |
|
| 226 | - while (($data = fgetcsv($handle,2000,",")) !== FALSE) { |
|
| 225 | + if (($handle = fopen($file, 'r')) !== FALSE) { |
|
| 226 | + while (($data = fgetcsv($handle, 2000, ",")) !== FALSE) { |
|
| 227 | 227 | if (isset($data[1]) && $data[1] != '0000-00-00 00:00:00') { |
| 228 | - $result[] = array('registration' => $data[0],'date' => strtotime($data[1]),'url' => $data[2],'country' => $data[3],'place' => $data[4],'title' => $data[5],'fatalities' => $data[6],'latitude' => $data[7],'longitude' => $data[8],'type' => $data[9],'ident' => $data[10],'aircraft_manufacturer' => $data[11],'aircraft_name' => $data[12],'operator' => $data[13],'source' => 'website_fam'); |
|
| 228 | + $result[] = array('registration' => $data[0], 'date' => strtotime($data[1]), 'url' => $data[2], 'country' => $data[3], 'place' => $data[4], 'title' => $data[5], 'fatalities' => $data[6], 'latitude' => $data[7], 'longitude' => $data[8], 'type' => $data[9], 'ident' => $data[10], 'aircraft_manufacturer' => $data[11], 'aircraft_name' => $data[12], 'operator' => $data[13], 'source' => 'website_fam'); |
|
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | fclose($handle); |
| 232 | 232 | } |
| 233 | - if (!empty($result)) $this->add($result,true); |
|
| 233 | + if (!empty($result)) $this->add($result, true); |
|
| 234 | 234 | elseif ($globalDebug) echo 'Nothing to import'; |
| 235 | 235 | } |
| 236 | 236 | } |
@@ -246,8 +246,8 @@ discard block |
||
| 246 | 246 | $all_md5_new = array(); |
| 247 | 247 | if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) { |
| 248 | 248 | if ($this->check_accidents_nb() > 0) { |
| 249 | - if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) { |
|
| 250 | - while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) { |
|
| 249 | + if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) { |
|
| 250 | + while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) { |
|
| 251 | 251 | if (isset($data[1])) { |
| 252 | 252 | $year = $data[0]; |
| 253 | 253 | $all_md5[$year] = $data[1]; |
@@ -257,10 +257,10 @@ discard block |
||
| 257 | 257 | } |
| 258 | 258 | } |
| 259 | 259 | } |
| 260 | - $Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5',dirname(__FILE__).'/../install/tmp/cr-all.md5'); |
|
| 260 | + $Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5', dirname(__FILE__).'/../install/tmp/cr-all.md5'); |
|
| 261 | 261 | if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) { |
| 262 | - if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) { |
|
| 263 | - while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) { |
|
| 262 | + if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) { |
|
| 263 | + while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) { |
|
| 264 | 264 | if (isset($data[1])) { |
| 265 | 265 | $year = $data[0]; |
| 266 | 266 | $all_md5_new[$year] = $data[1]; |
@@ -269,10 +269,10 @@ discard block |
||
| 269 | 269 | fclose($handle); |
| 270 | 270 | } elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5'; |
| 271 | 271 | } elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.'; |
| 272 | - $result = $Common->arr_diff($all_md5_new,$all_md5); |
|
| 272 | + $result = $Common->arr_diff($all_md5_new, $all_md5); |
|
| 273 | 273 | if (empty($result) && $globalDebug) echo 'Nothing to update'; |
| 274 | 274 | foreach ($result as $file => $md5) { |
| 275 | - $Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file); |
|
| 275 | + $Common->download('http://data.flightairmap.fr/data/cr/'.$file, dirname(__FILE__).'/../install/tmp/'.$file); |
|
| 276 | 276 | if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file); |
| 277 | 277 | elseif ($globalDebug) echo 'Download '.$file.' failed'; |
| 278 | 278 | } |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | * Add data to DB |
| 283 | 283 | * @param Array $crash An array with accidents/incidents data |
| 284 | 284 | */ |
| 285 | - public function add($crash,$new = false) { |
|
| 285 | + public function add($crash, $new = false) { |
|
| 286 | 286 | global $globalTransaction, $globalDebug; |
| 287 | 287 | require_once('class.Connection.php'); |
| 288 | 288 | require_once('class.Image.php'); |
@@ -298,7 +298,7 @@ discard block |
||
| 298 | 298 | $sthd->execute(array(':source' => $crash[0]['source'])); |
| 299 | 299 | } |
| 300 | 300 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 301 | - $initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null); |
|
| 301 | + $initial_array = array('ident' => null, 'type' => 'accident', 'url' => null, 'registration' => null, 'date' => null, 'place' => null, 'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '', 'source' => '', 'aircraft_manufacturer' => null, 'aircraft_name' => null, 'operator' => null); |
|
| 302 | 302 | $query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source'; |
| 303 | 303 | $sth_check = $Connection->db->prepare($query_check); |
| 304 | 304 | $query = 'INSERT INTO accidents (aircraft_manufacturer,aircraft_name,ident,registration,date,url,country,place,title,fatalities,latitude,longitude,type,airline_name,source) VALUES (:aircraft_manufacturer,:aircraft_name,:ident,:registration,:date,:url,:country,:place,:title,:fatalities,:latitude,:longitude,:type,:airline_name,:source)'; |
@@ -311,31 +311,31 @@ discard block |
||
| 311 | 311 | $cr = array_map(function($value) { |
| 312 | 312 | return $value === "" ? NULL : $value; |
| 313 | 313 | }, $cr); |
| 314 | - if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) { |
|
| 315 | - if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']); |
|
| 316 | - $query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']); |
|
| 314 | + if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/', $cr['registration'])) { |
|
| 315 | + if (strpos($cr['registration'], '-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']); |
|
| 316 | + $query_check_values = array(':registration' => $cr['registration'], ':date' => date('Y-m-d', $cr['date']), ':type' => $cr['type'], ':source' => $cr['source']); |
|
| 317 | 317 | $sth_check->execute($query_check_values); |
| 318 | 318 | $result_check = $sth_check->fetch(PDO::FETCH_ASSOC); |
| 319 | 319 | if ($result_check['nb'] == 0) { |
| 320 | - $query_values = array(':registration' => trim($cr['registration']),':date' => date('Y-m-d',$cr['date']),':url' => $cr['url'],':country' => $cr['country'],':place' => $cr['place'],':title' => $cr['title'],':fatalities' => $cr['fatalities'],':latitude' => $cr['latitude'],':longitude' => $cr['longitude'],':type' => $cr['type'],':source' => $cr['source'],':ident' => $cr['ident'],':aircraft_manufacturer' => $cr['aircraft_manufacturer'],':aircraft_name' => $cr['aircraft_name'],':airline_name' => $cr['operator']); |
|
| 320 | + $query_values = array(':registration' => trim($cr['registration']), ':date' => date('Y-m-d', $cr['date']), ':url' => $cr['url'], ':country' => $cr['country'], ':place' => $cr['place'], ':title' => $cr['title'], ':fatalities' => $cr['fatalities'], ':latitude' => $cr['latitude'], ':longitude' => $cr['longitude'], ':type' => $cr['type'], ':source' => $cr['source'], ':ident' => $cr['ident'], ':aircraft_manufacturer' => $cr['aircraft_manufacturer'], ':aircraft_name' => $cr['aircraft_name'], ':airline_name' => $cr['operator']); |
|
| 321 | 321 | $sth->execute($query_values); |
| 322 | - if ($cr['date'] > time()-(30*86400)) { |
|
| 322 | + if ($cr['date'] > time() - (30*86400)) { |
|
| 323 | 323 | if (empty($Image->getSpotterImage($cr['registration']))) { |
| 324 | 324 | //if ($globalDebug) echo 'Get image...'."\n"; |
| 325 | 325 | $Image->addSpotterImage($cr['registration']); |
| 326 | 326 | } |
| 327 | 327 | // elseif ($globalDebug) echo 'Image already in DB'."\n"; |
| 328 | 328 | } |
| 329 | - $Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date'])); |
|
| 329 | + $Spotter->setHighlightFlightByRegistration($cr['registration'], $cr['title'], date('Y-m-d', $cr['date'])); |
|
| 330 | 330 | } |
| 331 | 331 | } |
| 332 | - if ($globalTransaction && $j % 1000 == 0) { |
|
| 332 | + if ($globalTransaction && $j%1000 == 0) { |
|
| 333 | 333 | $Connection->db->commit(); |
| 334 | 334 | $Connection->db->beginTransaction(); |
| 335 | 335 | } |
| 336 | 336 | } |
| 337 | 337 | if ($globalTransaction) $Connection->db->commit(); |
| 338 | - } catch(PDOException $e) { |
|
| 338 | + } catch (PDOException $e) { |
|
| 339 | 339 | if ($globalTransaction) $Connection->db->rollBack(); |
| 340 | 340 | echo $e->getMessage(); |
| 341 | 341 | } |
@@ -353,7 +353,7 @@ discard block |
||
| 353 | 353 | $Connection = new Connection(); |
| 354 | 354 | $sth = $Connection->db->prepare($query); |
| 355 | 355 | $sth->execute(); |
| 356 | - } catch(PDOException $e) { |
|
| 356 | + } catch (PDOException $e) { |
|
| 357 | 357 | return "error : ".$e->getMessage(); |
| 358 | 358 | } |
| 359 | 359 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | $Connection = new Connection(); |
| 372 | 372 | $sth = $Connection->db->prepare($query); |
| 373 | 373 | $sth->execute(); |
| 374 | - } catch(PDOException $e) { |
|
| 374 | + } catch (PDOException $e) { |
|
| 375 | 375 | return "error : ".$e->getMessage(); |
| 376 | 376 | } |
| 377 | 377 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | $Connection = new Connection(); |
| 387 | 387 | $sth = $Connection->db->prepare($query); |
| 388 | 388 | $sth->execute(); |
| 389 | - } catch(PDOException $e) { |
|
| 389 | + } catch (PDOException $e) { |
|
| 390 | 390 | return "error : ".$e->getMessage(); |
| 391 | 391 | } |
| 392 | 392 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | } else { |
| 21 | 21 | print '<option value="all">All</option>'; |
| 22 | 22 | } |
| 23 | - foreach($airlines as $airline) { |
|
| 23 | + foreach ($airlines as $airline) { |
|
| 24 | 24 | if (isset($airline_icao) && $airline_icao == $airline['airline_icao']) { |
| 25 | 25 | print '<option value="'.$airline['airline_icao'].'" selected>'.$airline['airline_name'].'</option>'; |
| 26 | 26 | } else { |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | <div class="sub-menu sub-menu-container"> |
| 38 | 38 | <ul class="nav"> |
| 39 | 39 | <li class="dropdown"> |
| 40 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" > |
|
| 40 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" > |
|
| 41 | 41 | <?php echo _("Aircraft"); ?> <span class="caret"></span> |
| 42 | 42 | </a> |
| 43 | 43 | <ul class="dropdown-menu"> |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | </ul> |
| 49 | 49 | </li> |
| 50 | 50 | <li class="dropdown"> |
| 51 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 51 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 52 | 52 | <?php echo _("Airline"); ?> <span class="caret"></span> |
| 53 | 53 | </a> |
| 54 | 54 | <ul class="dropdown-menu" role="menu"> |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | </ul> |
| 59 | 59 | </li> |
| 60 | 60 | <li class="dropdown"> |
| 61 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 61 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 62 | 62 | <?php echo _("Airport"); ?> <span class="caret"></span> |
| 63 | 63 | </a> |
| 64 | 64 | <ul class="dropdown-menu" role="menu"> |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | </ul> |
| 70 | 70 | </li> |
| 71 | 71 | <li class="dropdown"> |
| 72 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 72 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 73 | 73 | <?php echo _("Route"); ?> <span class="caret"></span> |
| 74 | 74 | </a> |
| 75 | 75 | <ul class="dropdown-menu" role="menu"> |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | </ul> |
| 79 | 79 | </li> |
| 80 | 80 | <li class="dropdown"> |
| 81 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 81 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 82 | 82 | <?php echo _("Date & Time"); ?> <span class="caret"></span> |
| 83 | 83 | </a> |
| 84 | 84 | <ul class="dropdown-menu" role="menu"> |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) { |
| 91 | 91 | ?> |
| 92 | 92 | <li class="dropdown"> |
| 93 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 93 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 94 | 94 | <?php echo _("Fatalities"); ?> <span class="caret"></span> |
| 95 | 95 | </a> |
| 96 | 96 | <ul class="dropdown-menu" role="menu"> |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | <div class="sub-menu sub-menu-container"> |
| 110 | 110 | <ul class="nav"> |
| 111 | 111 | <li class="dropdown"> |
| 112 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" > |
|
| 112 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" > |
|
| 113 | 113 | <?php echo _("Aircraft"); ?> <span class="caret"></span> |
| 114 | 114 | </a> |
| 115 | 115 | <ul class="dropdown-menu"> |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | </ul> |
| 121 | 121 | </li> |
| 122 | 122 | <li class="dropdown"> |
| 123 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 123 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 124 | 124 | <?php echo _("Airline"); ?> <span class="caret"></span> |
| 125 | 125 | </a> |
| 126 | 126 | <ul class="dropdown-menu" role="menu"> |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | </ul> |
| 131 | 131 | </li> |
| 132 | 132 | <li class="dropdown"> |
| 133 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 133 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 134 | 134 | <?php echo _("Airport"); ?> <span class="caret"></span> |
| 135 | 135 | </a> |
| 136 | 136 | <ul class="dropdown-menu" role="menu"> |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | </li> |
| 143 | 143 | <!-- |
| 144 | 144 | <li class="dropdown"> |
| 145 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 145 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 146 | 146 | <?php echo _("Route"); ?> <span class="caret"></span> |
| 147 | 147 | </a> |
| 148 | 148 | <ul class="dropdown-menu" role="menu"> |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | --> |
| 154 | 154 | <!-- |
| 155 | 155 | <li class="dropdown"> |
| 156 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 156 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 157 | 157 | <?php echo _("Date & Time"); ?> <span class="caret"></span> |
| 158 | 158 | </a> |
| 159 | 159 | <ul class="dropdown-menu" role="menu"> |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | ?> |
| 168 | 168 | <!-- |
| 169 | 169 | <li class="dropdown"> |
| 170 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 170 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 171 | 171 | <?php echo _("Fatalities"); ?> <span class="caret"></span> |
| 172 | 172 | </a> |
| 173 | 173 | <ul class="dropdown-menu" role="menu"> |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | $Connection = new Connection(); |
| 55 | 55 | $sth = $Connection->db->prepare($query); |
| 56 | 56 | $sth->execute(); |
| 57 | - } catch(PDOException $e) { |
|
| 57 | + } catch (PDOException $e) { |
|
| 58 | 58 | return "error : ".$e->getMessage(); |
| 59 | 59 | } |
| 60 | 60 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $Connection = new Connection(); |
| 71 | 71 | $sth = $Connection->db->prepare($query); |
| 72 | 72 | $sth->execute(); |
| 73 | - } catch(PDOException $e) { |
|
| 73 | + } catch (PDOException $e) { |
|
| 74 | 74 | return "error : ".$e->getMessage(); |
| 75 | 75 | } |
| 76 | 76 | } |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | public function parse($data) { |
| 81 | 81 | //$data = str_replace(array('\n','\r','\r','\n'),'',$data); |
| 82 | 82 | $codes = implode('|', array_keys($this->texts)); |
| 83 | - $regWeather = '#^(\+|\-|VC)?(' . $codes . ')(' . $codes . ')?$#'; |
|
| 83 | + $regWeather = '#^(\+|\-|VC)?('.$codes.')('.$codes.')?$#'; |
|
| 84 | 84 | //$pieces = explode(' ',$data); |
| 85 | - $pieces = preg_split('/\s/',$data); |
|
| 85 | + $pieces = preg_split('/\s/', $data); |
|
| 86 | 86 | $pos = 0; |
| 87 | 87 | if ($pieces[0] == 'METAR') $pos++; |
| 88 | 88 | elseif ($pieces[0] == 'SPECI') $pos++; |
@@ -90,25 +90,25 @@ discard block |
||
| 90 | 90 | $result = array(); |
| 91 | 91 | $result['location'] = $pieces[$pos]; |
| 92 | 92 | $pos++; |
| 93 | - $result['dayofmonth'] = substr($pieces[$pos],0,2); |
|
| 94 | - $result['time'] = substr($pieces[$pos],2,4); |
|
| 93 | + $result['dayofmonth'] = substr($pieces[$pos], 0, 2); |
|
| 94 | + $result['time'] = substr($pieces[$pos], 2, 4); |
|
| 95 | 95 | $c = count($pieces); |
| 96 | - for($pos++; $pos < $c; $pos++) { |
|
| 96 | + for ($pos++; $pos < $c; $pos++) { |
|
| 97 | 97 | $piece = $pieces[$pos]; |
| 98 | 98 | if ($piece == 'RMK') break; |
| 99 | 99 | if ($piece == 'AUTO') $result['auto'] = true; |
| 100 | 100 | if ($piece == 'COR') $result['correction'] = true; |
| 101 | 101 | // Wind Speed |
| 102 | 102 | if (preg_match('#(VRB|\d\d\d)(\d\d)(?:G(\d\d))?(KT|MPS|KPH)(?: (\d{1,3})V(\d{1,3}))?$#', $piece, $matches)) { |
| 103 | - $result['wind']['direction'] = (float)$matches[1]; |
|
| 103 | + $result['wind']['direction'] = (float) $matches[1]; |
|
| 104 | 104 | $result['wind']['unit'] = $matches[4]; |
| 105 | - if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float)$matches[2])*0.51444444444,2); |
|
| 106 | - elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float)$matches[2])*1000,2); |
|
| 107 | - elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float)$matches[2]),2); |
|
| 108 | - $result['wind']['gust'] = (float)$matches[3]; |
|
| 105 | + if ($result['wind']['unit'] == 'KT') $result['wind']['speed'] = round(((float) $matches[2])*0.51444444444, 2); |
|
| 106 | + elseif ($result['wind']['unit'] == 'KPH') $result['wind']['speed'] = round(((float) $matches[2])*1000, 2); |
|
| 107 | + elseif ($result['wind']['unit'] == 'MPS') $result['wind']['speed'] = round(((float) $matches[2]), 2); |
|
| 108 | + $result['wind']['gust'] = (float) $matches[3]; |
|
| 109 | 109 | $result['wind']['unit'] = $matches[4]; |
| 110 | - $result['wind']['min_variation'] = array_key_exists(5,$matches) ? $matches[5] : 0; |
|
| 111 | - $result['wind']['max_variation'] = array_key_exists(6,$matches) ? $matches[6] : 0; |
|
| 110 | + $result['wind']['min_variation'] = array_key_exists(5, $matches) ? $matches[5] : 0; |
|
| 111 | + $result['wind']['max_variation'] = array_key_exists(6, $matches) ? $matches[6] : 0; |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /* if (preg_match('#^([0-9]{3})([0-9]{2})(G([0-9]{2}))?(KT|MPS)$#', $piece, $matches)) { |
@@ -128,14 +128,14 @@ discard block |
||
| 128 | 128 | */ |
| 129 | 129 | // Temperature |
| 130 | 130 | if (preg_match('#^(M?[0-9]{2,})/(M?[0-9]{2,})$#', $piece, $matches)) { |
| 131 | - $temp = (float)$matches[1]; |
|
| 131 | + $temp = (float) $matches[1]; |
|
| 132 | 132 | if ($matches[1]{0} == 'M') { |
| 133 | - $temp = ((float)substr($matches[1], 1)) * -1; |
|
| 133 | + $temp = ((float) substr($matches[1], 1))*-1; |
|
| 134 | 134 | } |
| 135 | 135 | $result['temperature'] = $temp; |
| 136 | - $dew = (float)$matches[2]; |
|
| 136 | + $dew = (float) $matches[2]; |
|
| 137 | 137 | if ($matches[2]{0} == 'M') { |
| 138 | - $dew = ((float)substr($matches[2], 1)) * -1; |
|
| 138 | + $dew = ((float) substr($matches[2], 1))*-1; |
|
| 139 | 139 | } |
| 140 | 140 | $result['dew'] = $dew; |
| 141 | 141 | } |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | $result['QNH'] = $matches[2]; |
| 148 | 148 | } else { |
| 149 | 149 | // inHg |
| 150 | - $result['QNH'] = round(($matches[2] / 100)*33.86389,2); |
|
| 150 | + $result['QNH'] = round(($matches[2]/100)*33.86389, 2); |
|
| 151 | 151 | } |
| 152 | 152 | /* |
| 153 | 153 | $result['QNH'] = $matches[1] == 'Q' ? $matches[2] : ($matches[2] / 100); |
@@ -168,12 +168,12 @@ discard block |
||
| 168 | 168 | // Visibility |
| 169 | 169 | if (preg_match('#^([0-9]{4})|(([0-9]{1,4})SM)$#', $piece, $matches)) { |
| 170 | 170 | if (isset($matches[3]) && strlen($matches[3]) > 0) { |
| 171 | - $result['visibility'] = (float)$matches[3] * 1609.34; |
|
| 171 | + $result['visibility'] = (float) $matches[3]*1609.34; |
|
| 172 | 172 | } else { |
| 173 | 173 | if ($matches[1] == '9999') { |
| 174 | 174 | $result['visibility'] = '> 10000'; |
| 175 | 175 | } else { |
| 176 | - $result['visibility'] = (float)$matches[1]; |
|
| 176 | + $result['visibility'] = (float) $matches[1]; |
|
| 177 | 177 | } |
| 178 | 178 | } |
| 179 | 179 | if (preg_match('#^CAVOK$#', $piece, $matches)) { |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | elseif ($type == 'OVC') $cloud['type'] = 'Overcast/Full cloud coverage'; |
| 196 | 196 | elseif ($type == 'VV') $cloud['type'] = 'Vertical visibility'; |
| 197 | 197 | $cloud['type_code'] = $type; |
| 198 | - $cloud['level'] = round(((float)$matches[2]) * 100 * 0.3048); |
|
| 198 | + $cloud['level'] = round(((float) $matches[2])*100*0.3048); |
|
| 199 | 199 | $cloud['significant'] = isset($matches[3]) ? $matches[3] : ''; |
| 200 | 200 | $result['cloud'][] = $cloud; |
| 201 | 201 | } |
@@ -205,8 +205,8 @@ discard block |
||
| 205 | 205 | $rvr['runway'] = $matches[1]; |
| 206 | 206 | $rvr['assessment'] = $matches[2]; |
| 207 | 207 | $rvr['rvr'] = $matches[3]; |
| 208 | - $rvr['rvr_max'] = array_key_exists(4,$matches) ? $matches[4] : 0; |
|
| 209 | - $rvr['unit'] = array_key_exists(5,$matches) ? $matches[5] : ''; |
|
| 208 | + $rvr['rvr_max'] = array_key_exists(4, $matches) ? $matches[4] : 0; |
|
| 209 | + $rvr['unit'] = array_key_exists(5, $matches) ? $matches[5] : ''; |
|
| 210 | 210 | $result['RVR'] = $rvr; |
| 211 | 211 | } |
| 212 | 212 | |
@@ -223,12 +223,12 @@ discard block |
||
| 223 | 223 | if (preg_match('#^(R[A-Z0-9]{2,3})/([0-9]{4})(V([0-9]{4}))?(FT)?$#', $piece, $matches)) { |
| 224 | 224 | //echo $piece; |
| 225 | 225 | //print_r($matches); |
| 226 | - if (isset($matches[5])) $range = array('exact' => (float)$matches[2], 'unit' => $matches[5] ? 'FT' : 'M'); |
|
| 227 | - else $range = array('exact' => (float)$matches[2], 'unit' => 'M'); |
|
| 226 | + if (isset($matches[5])) $range = array('exact' => (float) $matches[2], 'unit' => $matches[5] ? 'FT' : 'M'); |
|
| 227 | + else $range = array('exact' => (float) $matches[2], 'unit' => 'M'); |
|
| 228 | 228 | if (isset($matches[3])) { |
| 229 | 229 | $range = Array( |
| 230 | - 'from' => (float)$matches[2], |
|
| 231 | - 'to' => (float)$matches[4], |
|
| 230 | + 'from' => (float) $matches[2], |
|
| 231 | + 'to' => (float) $matches[4], |
|
| 232 | 232 | 'unit' => $matches[5] ? 'FT' : 'M' |
| 233 | 233 | ); |
| 234 | 234 | } |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | try { |
| 278 | 278 | $sth = $this->db->prepare($query); |
| 279 | 279 | $sth->execute($query_values); |
| 280 | - } catch(PDOException $e) { |
|
| 280 | + } catch (PDOException $e) { |
|
| 281 | 281 | return "error : ".$e->getMessage(); |
| 282 | 282 | } |
| 283 | 283 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -287,19 +287,19 @@ discard block |
||
| 287 | 287 | return $all; |
| 288 | 288 | } |
| 289 | 289 | |
| 290 | - public function addMETAR($location,$metar,$date) { |
|
| 290 | + public function addMETAR($location, $metar, $date) { |
|
| 291 | 291 | global $globalDBdriver; |
| 292 | - $date = date('Y-m-d H:i:s',strtotime($date)); |
|
| 292 | + $date = date('Y-m-d H:i:s', strtotime($date)); |
|
| 293 | 293 | if ($globalDBdriver == 'mysql') { |
| 294 | 294 | $query = "INSERT INTO metar (metar_location,metar_date,metar) VALUES (:location,:date,:metar) ON DUPLICATE KEY UPDATE metar_date = :date, metar = :metar"; |
| 295 | 295 | } else { |
| 296 | 296 | $query = "UPDATE metar SET metar_date = :date, metar = metar WHERE metar_location = :location;INSERT INTO metar (metar_location,metar_date,metar) SELECT :location,:date,:metar WHERE NOT EXISTS (SELECT 1 FROM metar WHERE metar_location = :location);"; |
| 297 | 297 | } |
| 298 | - $query_values = array(':location' => $location,':date' => $date,':metar' => utf8_encode($metar)); |
|
| 298 | + $query_values = array(':location' => $location, ':date' => $date, ':metar' => utf8_encode($metar)); |
|
| 299 | 299 | try { |
| 300 | 300 | $sth = $this->db->prepare($query); |
| 301 | 301 | $sth->execute($query_values); |
| 302 | - } catch(PDOException $e) { |
|
| 302 | + } catch (PDOException $e) { |
|
| 303 | 303 | return "error : ".$e->getMessage(); |
| 304 | 304 | } |
| 305 | 305 | } |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | try { |
| 311 | 311 | $sth = $this->db->prepare($query); |
| 312 | 312 | $sth->execute($query_values); |
| 313 | - } catch(PDOException $e) { |
|
| 313 | + } catch (PDOException $e) { |
|
| 314 | 314 | return "error : ".$e->getMessage(); |
| 315 | 315 | } |
| 316 | 316 | } |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | try { |
| 320 | 320 | $sth = $this->db->prepare($query); |
| 321 | 321 | $sth->execute(); |
| 322 | - } catch(PDOException $e) { |
|
| 322 | + } catch (PDOException $e) { |
|
| 323 | 323 | return "error : ".$e->getMessage(); |
| 324 | 324 | } |
| 325 | 325 | } |
@@ -331,30 +331,30 @@ discard block |
||
| 331 | 331 | $Common = new Common(); |
| 332 | 332 | if (isset($globalIVAO) && $globalIVAO) { |
| 333 | 333 | //$cycle = $Common->getData('http://wx.ivao.aero/metar.php'); |
| 334 | - $Common->download('http://wx.ivao.aero/metar.php',dirname(__FILE__).'/../install/tmp/ivaometar.txt'); |
|
| 335 | - $handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt',"r"); |
|
| 334 | + $Common->download('http://wx.ivao.aero/metar.php', dirname(__FILE__).'/../install/tmp/ivaometar.txt'); |
|
| 335 | + $handle = fopen(dirname(__FILE__).'/../install/tmp/ivaometar.txt', "r"); |
|
| 336 | 336 | } else { |
| 337 | 337 | //$cycle = $Common->getData('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT'); |
| 338 | - $Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT',dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT'); |
|
| 339 | - $handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT',"r"); |
|
| 338 | + $Common->download('http://tgftp.nws.noaa.gov/data/observations/metar/cycles/'.date('H').'Z.TXT', dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT'); |
|
| 339 | + $handle = fopen(dirname(__FILE__).'/../install/tmp/'.date('H').'Z.TXT', "r"); |
|
| 340 | 340 | } |
| 341 | 341 | if ($handle) { |
| 342 | 342 | if (isset($globalDebug) && $globalDebug) echo "Done - Updating DB..."; |
| 343 | 343 | $date = ''; |
| 344 | 344 | //foreach(explode("\n",$cycle) as $line) { |
| 345 | 345 | if ($globalTransaction) $this->db->beginTransaction(); |
| 346 | - while(($line = fgets($handle,4096)) !== false) { |
|
| 347 | - if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) { |
|
| 346 | + while (($line = fgets($handle, 4096)) !== false) { |
|
| 347 | + if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) { |
|
| 348 | 348 | $date = $line; |
| 349 | 349 | } elseif ($line != '') { |
| 350 | 350 | //$this->parse($line); |
| 351 | 351 | if ($date == '') $date = date('Y/m/d H:m'); |
| 352 | 352 | $pos = 0; |
| 353 | - $pieces = preg_split('/\s/',$line); |
|
| 353 | + $pieces = preg_split('/\s/', $line); |
|
| 354 | 354 | if ($pieces[0] == 'METAR') $pos++; |
| 355 | 355 | if (strlen($pieces[$pos]) != 4) $pos++; |
| 356 | 356 | $location = $pieces[$pos]; |
| 357 | - echo $this->addMETAR($location,$line,$date); |
|
| 357 | + echo $this->addMETAR($location, $line, $date); |
|
| 358 | 358 | } |
| 359 | 359 | } |
| 360 | 360 | fclose($handle); |
@@ -368,11 +368,11 @@ discard block |
||
| 368 | 368 | if ($globalMETARurl == '') return array(); |
| 369 | 369 | date_default_timezone_set("UTC"); |
| 370 | 370 | $Common = new Common(); |
| 371 | - $url = str_replace('{icao}',$icao,$globalMETARurl); |
|
| 371 | + $url = str_replace('{icao}', $icao, $globalMETARurl); |
|
| 372 | 372 | $cycle = $Common->getData($url); |
| 373 | 373 | $date = ''; |
| 374 | - foreach(explode("\n",$cycle) as $line) { |
|
| 375 | - if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#',$line)) { |
|
| 374 | + foreach (explode("\n", $cycle) as $line) { |
|
| 375 | + if (preg_match('#^([0-9]{4})/([0-9]{2})/([0-9]{2}) ([0-9]{2}):([0-9]{2})$#', $line)) { |
|
| 376 | 376 | //echo "date : ".$line."\n"; |
| 377 | 377 | $date = $line; |
| 378 | 378 | } |
@@ -381,12 +381,12 @@ discard block |
||
| 381 | 381 | //echo $line; |
| 382 | 382 | if ($date == '') $date = date('Y/m/d H:m'); |
| 383 | 383 | $pos = 0; |
| 384 | - $pieces = preg_split('/\s/',$line); |
|
| 384 | + $pieces = preg_split('/\s/', $line); |
|
| 385 | 385 | if ($pieces[0] == 'METAR') $pos++; |
| 386 | 386 | if (strlen($pieces[$pos]) != 4) $pos++; |
| 387 | 387 | $location = $pieces[$pos]; |
| 388 | 388 | if (strlen($location == 4)) { |
| 389 | - $this->addMETAR($location,$line,$date); |
|
| 389 | + $this->addMETAR($location, $line, $date); |
|
| 390 | 390 | return array('0' => array('metar_date' => $date, 'metar_location' => $location, 'metar' => $line)); |
| 391 | 391 | } else return array(); |
| 392 | 392 | } |
@@ -10,10 +10,10 @@ discard block |
||
| 10 | 10 | { |
| 11 | 11 | $date = date('Y-m-d'); |
| 12 | 12 | } else { |
| 13 | - $date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING); |
|
| 13 | + $date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING); |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | -if(!isset($_GET['limit'])) |
|
| 16 | +if (!isset($_GET['limit'])) |
|
| 17 | 17 | { |
| 18 | 18 | $limit_start = 0; |
| 19 | 19 | $limit_end = 25; |
@@ -48,25 +48,25 @@ discard block |
||
| 48 | 48 | print '<br />'; |
| 49 | 49 | |
| 50 | 50 | print '<div class="info column">'; |
| 51 | -if (preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/',$date)) { |
|
| 52 | - print '<h1>'.sprintf(_("Accidents from %s"),date("l F j, Y",strtotime($date))).'</h1>'; |
|
| 53 | -} elseif (preg_match('/^[0-9]{4}-[0-9]{2}$/',$date)) { |
|
| 54 | - print '<h1>'.sprintf(_("Accidents from %s"),date("F, Y",strtotime($date))).'</h1>'; |
|
| 55 | -} elseif (preg_match('/^[0-9]{4}$/',$date)) { |
|
| 56 | - print '<h1>'.sprintf(_("Accidents from %s"),$date).'</h1>'; |
|
| 51 | +if (preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $date)) { |
|
| 52 | + print '<h1>'.sprintf(_("Accidents from %s"), date("l F j, Y", strtotime($date))).'</h1>'; |
|
| 53 | +} elseif (preg_match('/^[0-9]{4}-[0-9]{2}$/', $date)) { |
|
| 54 | + print '<h1>'.sprintf(_("Accidents from %s"), date("F, Y", strtotime($date))).'</h1>'; |
|
| 55 | +} elseif (preg_match('/^[0-9]{4}$/', $date)) { |
|
| 56 | + print '<h1>'.sprintf(_("Accidents from %s"), $date).'</h1>'; |
|
| 57 | 57 | } |
| 58 | 58 | print '</div>'; |
| 59 | 59 | |
| 60 | 60 | print '<div class="table column">'; |
| 61 | 61 | |
| 62 | -if (preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/',$date)) { |
|
| 63 | - print '<p>'.sprintf(_("The table below shows the Accidents on <strong>%s</strong>."),date("l M j, Y",strtotime($date))).'</p>'; |
|
| 64 | -} elseif (preg_match('/^[0-9]{4}-[0-9]{2}$/',$date)) { |
|
| 65 | - print '<p>'.sprintf(_("The table below shows the Accidents on <strong>%s</strong>."),date("M, Y",strtotime($date))).'</p>'; |
|
| 66 | -} elseif (preg_match('/^[0-9]{4}$/',$date)) { |
|
| 67 | - print '<p>'.sprintf(_("The table below shows the Accidents on <strong>%s</strong>."),$date).'</p>'; |
|
| 62 | +if (preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $date)) { |
|
| 63 | + print '<p>'.sprintf(_("The table below shows the Accidents on <strong>%s</strong>."), date("l M j, Y", strtotime($date))).'</p>'; |
|
| 64 | +} elseif (preg_match('/^[0-9]{4}-[0-9]{2}$/', $date)) { |
|
| 65 | + print '<p>'.sprintf(_("The table below shows the Accidents on <strong>%s</strong>."), date("M, Y", strtotime($date))).'</p>'; |
|
| 66 | +} elseif (preg_match('/^[0-9]{4}$/', $date)) { |
|
| 67 | + print '<p>'.sprintf(_("The table below shows the Accidents on <strong>%s</strong>."), $date).'</p>'; |
|
| 68 | 68 | } |
| 69 | -$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference,'accident',$date); |
|
| 69 | +$spotter_array = $Accident->getAccidentData($limit_start.",".$absolute_difference, 'accident', $date); |
|
| 70 | 70 | //print_r($spotter_array); |
| 71 | 71 | if (!empty($spotter_array) && isset($spotter_array[0]['query_number_rows']) && $spotter_array[0]['query_number_rows'] != 0) { |
| 72 | 72 | include('table-output.php'); |
@@ -4,8 +4,8 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | require_once(dirname(__FILE__).'/require/class.Common.php'); |
| 6 | 6 | $Common = new Common(); |
| 7 | -$showRouteStop = $Common->multiKeyExists($spotter_array,'route_stop'); |
|
| 8 | -$showDuration = $Common->multiKeyExists($spotter_array,'duration'); |
|
| 7 | +$showRouteStop = $Common->multiKeyExists($spotter_array, 'route_stop'); |
|
| 8 | +$showDuration = $Common->multiKeyExists($spotter_array, 'duration'); |
|
| 9 | 9 | |
| 10 | 10 | if (!isset($_GET['sort'])) |
| 11 | 11 | { |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | print '<th class="more"></th>'; |
| 101 | 101 | print '</thead>'; |
| 102 | -} else if (strtolower($current_page) == "upcoming"){ |
|
| 102 | +} else if (strtolower($current_page) == "upcoming") { |
|
| 103 | 103 | print '<thead>'; |
| 104 | 104 | if ($_GET['sort'] == "airline_name_asc") |
| 105 | 105 | { |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | */ |
| 151 | 151 | print '</thead>'; |
| 152 | -} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive"){ |
|
| 152 | +} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") { |
|
| 153 | 153 | print '<thead>'; |
| 154 | 154 | print '<th class="aircraft_thumbnail"></th>'; |
| 155 | 155 | print '<th class="logo">'._("Airline").'</th>'; |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | print '</thead>'; |
| 187 | 187 | } else { |
| 188 | 188 | |
| 189 | - if ($hide_th_links === true){ |
|
| 189 | + if ($hide_th_links === true) { |
|
| 190 | 190 | print '<thead>'; |
| 191 | 191 | print '<th class="aircraft_thumbnail"></th>'; |
| 192 | 192 | if ($_GET['sort'] == "airline_name_asc") |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | } |
| 378 | 378 | |
| 379 | 379 | print '<tbody>'."\n"; |
| 380 | -foreach($spotter_array as $spotter_item) |
|
| 380 | +foreach ($spotter_array as $spotter_item) |
|
| 381 | 381 | { |
| 382 | 382 | if (isset($globalTimezone)) |
| 383 | 383 | { |
@@ -408,13 +408,13 @@ discard block |
||
| 408 | 408 | $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id; |
| 409 | 409 | } |
| 410 | 410 | if (isset($spotter_item['airline_name'])) { |
| 411 | - print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 411 | + print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 412 | 412 | } else { |
| 413 | - print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 413 | + print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 414 | 414 | } |
| 415 | 415 | } else { |
| 416 | 416 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
| 417 | - $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 417 | + $image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 418 | 418 | } else $image_thumbnail = $spotter_item['image_thumbnail']; |
| 419 | 419 | if (isset($spotter_item['airline_name'])) { |
| 420 | 420 | print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '.$spotter_item['airline_name'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | print '<img src="'.$globalURL.'/images/placeholder_thumb.png" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Airline:").' '._("Not available").'" data-html="true" width="100px" />'."\n"; |
| 429 | 429 | print '</td>'."\n"; |
| 430 | 430 | } |
| 431 | - } elseif(strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed"){ |
|
| 431 | + } elseif (strtolower($current_page) != "currently" && strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive" && strtolower($current_page) != "accident-latest" && strtolower($current_page) != "incident-latest" && strtolower($current_page) != "accident-detailed" && strtolower($current_page) != "incident-detailed") { |
|
| 432 | 432 | if (!isset($spotter_item['squawk']) || $spotter_item['squawk'] == 0) { |
| 433 | 433 | $spotter_item['squawk'] = '-'; |
| 434 | 434 | } |
@@ -444,17 +444,17 @@ discard block |
||
| 444 | 444 | $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id; |
| 445 | 445 | } |
| 446 | 446 | if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) { |
| 447 | - print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 447 | + print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 448 | 448 | } elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) { |
| 449 | - print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 449 | + print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 450 | 450 | } elseif (!isset($spotter_item['aircraft_name']) && !isset($spotter_item['airline_name'])) { |
| 451 | - print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 451 | + print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 452 | 452 | } else { |
| 453 | - print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 453 | + print '<a href="'.$image_src.'"><img src="'.preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']).'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '.$spotter_item['airline_name'].'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '.$spotter_item['airline_name'].'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
|
| 454 | 454 | } |
| 455 | 455 | } else { |
| 456 | 456 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
| 457 | - $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 457 | + $image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 458 | 458 | } else $image_thumbnail = $spotter_item['image_thumbnail']; |
| 459 | 459 | if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) { |
| 460 | 460 | print '<a href="'.$globalURL.'/flightid/'.$spotter_item['spotter_id'].'"><img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" alt="'.$spotter_item['registration'].' - '.$spotter_item['aircraft_type'].' - '._("Not available").'" data-content="'._("Registration:").' '.$spotter_item['registration'].'<br />'._("Aircraft:").' '.$spotter_item['aircraft_name'].' ('.$spotter_item['aircraft_type'].')<br />'._("Airline:").' '._("Not available").'<br />'._("Squawk:").' '.$spotter_item['squawk'].'" data-html="true" width="100px" /></a>'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | } |
| 518 | 518 | print '</td>'."\n"; |
| 519 | 519 | // Aircraft type |
| 520 | - if(strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive"){ |
|
| 520 | + if (strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive") { |
|
| 521 | 521 | print '<td class="type">'."\n"; |
| 522 | 522 | if (!isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_name'])) { |
| 523 | 523 | print '<span class="nomobile">'.$spotter_item['aircraft_manufacturer'].' '.$spotter_item['aircraft_name'].'</span>'."\n"; |
@@ -541,22 +541,22 @@ discard block |
||
| 541 | 541 | } |
| 542 | 542 | if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) { |
| 543 | 543 | if ($spotter_item['departure_airport_time'] > 2460) { |
| 544 | - $departure_airport_time = date('H:m',$spotter_item['departure_airport_time']); |
|
| 545 | - } else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2); |
|
| 544 | + $departure_airport_time = date('H:m', $spotter_item['departure_airport_time']); |
|
| 545 | + } else $departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2); |
|
| 546 | 546 | if ($spotter_item['real_departure_airport_time'] > 2460) { |
| 547 | - $real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']); |
|
| 547 | + $real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']); |
|
| 548 | 548 | } else $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
| 549 | 549 | print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n"; |
| 550 | 550 | } elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') { |
| 551 | 551 | if ($spotter_item['real_departure_airport_time'] > 2460) { |
| 552 | - $real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']); |
|
| 552 | + $real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']); |
|
| 553 | 553 | } else $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
| 554 | 554 | print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n"; |
| 555 | 555 | } elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') { |
| 556 | 556 | if ($spotter_item['departure_airport_time'] > 2460) { |
| 557 | - $departure_airport_time = date('H:m',$spotter_item['departure_airport_time']); |
|
| 557 | + $departure_airport_time = date('H:m', $spotter_item['departure_airport_time']); |
|
| 558 | 558 | } else { |
| 559 | - $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2); |
|
| 559 | + $departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2); |
|
| 560 | 560 | } |
| 561 | 561 | print '<br /><span class="airport_time">'.$departure_airport_time.'</span>'."\n"; |
| 562 | 562 | } |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | $latitude = $spotter_item['latitude']; |
| 572 | 572 | $longitude = $spotter_item['longitude']; |
| 573 | 573 | } |
| 574 | - $distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude); |
|
| 574 | + $distance = $Spotter->getAirportDistance($spotter_item['departure_airport'], $latitude, $longitude); |
|
| 575 | 575 | } else $distance = ''; |
| 576 | 576 | if ($distance != '') { |
| 577 | 577 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
@@ -612,20 +612,20 @@ discard block |
||
| 612 | 612 | } |
| 613 | 613 | if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) { |
| 614 | 614 | if ($spotter_item['arrival_airport_time'] > 2460) { |
| 615 | - $arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']); |
|
| 615 | + $arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']); |
|
| 616 | 616 | } else $arrival_airport_time = $spotter_item['arrival_airport_time']; |
| 617 | 617 | if ($spotter_item['real_arrival_airport_time'] > 2460) { |
| 618 | - $real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']); |
|
| 618 | + $real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']); |
|
| 619 | 619 | } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
| 620 | 620 | print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n"; |
| 621 | 621 | } elseif (isset($spotter_item['real_arrival_airport_time'])) { |
| 622 | 622 | if ($spotter_item['real_arrival_airport_time'] > 2460) { |
| 623 | - $real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']); |
|
| 623 | + $real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']); |
|
| 624 | 624 | } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
| 625 | 625 | print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n"; |
| 626 | 626 | } elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') { |
| 627 | 627 | if ($spotter_item['arrival_airport_time'] > 2460) { |
| 628 | - $arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']); |
|
| 628 | + $arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']); |
|
| 629 | 629 | } else $arrival_airport_time = $spotter_item['arrival_airport_time']; |
| 630 | 630 | print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n"; |
| 631 | 631 | } |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | $latitude = $spotter_item['latitude']; |
| 639 | 639 | $longitude = $spotter_item['longitude']; |
| 640 | 640 | } |
| 641 | - $distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude); |
|
| 641 | + $distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'], $latitude, $longitude); |
|
| 642 | 642 | } else $distance = ''; |
| 643 | 643 | if ($distance != '') { |
| 644 | 644 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
@@ -659,21 +659,21 @@ discard block |
||
| 659 | 659 | } else { |
| 660 | 660 | //if (!isset($globalUnitDistance) || $globalUnitDistance == 'km') { |
| 661 | 661 | if ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) { |
| 662 | - print '<span class="nomobile">'.round($spotter_item['distance'],2).' km</span>'."\n"; |
|
| 663 | - print '<span class="mobile">'.round($spotter_item['distance'],2).' km</span><br />'."\n"; |
|
| 662 | + print '<span class="nomobile">'.round($spotter_item['distance'], 2).' km</span>'."\n"; |
|
| 663 | + print '<span class="mobile">'.round($spotter_item['distance'], 2).' km</span><br />'."\n"; |
|
| 664 | 664 | //} elseif ($globalUnitDistance == 'mi') { |
| 665 | 665 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
| 666 | - print '<span class="nomobile">'.round($spotter_item['distance']*0.621371,2).' mi</span>'."\n"; |
|
| 667 | - print '<span class="mobile">'.round($spotter_item['distance']*0.621371,2).' mi</span><br />'."\n"; |
|
| 666 | + print '<span class="nomobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span>'."\n"; |
|
| 667 | + print '<span class="mobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span><br />'."\n"; |
|
| 668 | 668 | //} elseif ($globalUnitDistance == 'nm') { |
| 669 | 669 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 670 | - print '<span class="nomobile">'.round($spotter_item['distance']*0.539957,2).' nm</span>'."\n"; |
|
| 671 | - print '<span class="mobile">'.round($spotter_item['distance']*0.539957,2).' nm</span><br />'."\n"; |
|
| 670 | + print '<span class="nomobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span>'."\n"; |
|
| 671 | + print '<span class="mobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span><br />'."\n"; |
|
| 672 | 672 | } |
| 673 | 673 | } |
| 674 | 674 | print '</td>'."\n"; |
| 675 | 675 | } |
| 676 | - if(strtolower($current_page) != "upcoming"){ |
|
| 676 | + if (strtolower($current_page) != "upcoming") { |
|
| 677 | 677 | if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
| 678 | 678 | print '<td class="pilot">'."\n"; |
| 679 | 679 | if ((!isset($spotter_item['pilot_id']) || $spotter_item['pilot_id'] == '') && (!isset($spotter_item['pilot_name']) || $spotter_item['pilot_name'] == '')) { |
@@ -708,7 +708,7 @@ discard block |
||
| 708 | 708 | //if ((isset($globalIvAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalVAM) && $globalVAM) || (isset($globalphpVMS) && $globalphpVMS)) { |
| 709 | 709 | if ($showRouteStop) { |
| 710 | 710 | // Route stop |
| 711 | - if(strtolower($current_page) != "upcoming"){ |
|
| 711 | + if (strtolower($current_page) != "upcoming") { |
|
| 712 | 712 | print '<td class="route_stop">'."\n"; |
| 713 | 713 | if (!isset($spotter_item['route_stop']) || $spotter_item['route_stop'] == '' || $spotter_item['route_stop'] == 'NULL') { |
| 714 | 714 | print '<span class="nomobile">-</span>'."\n"; |
@@ -727,11 +727,11 @@ discard block |
||
| 727 | 727 | } |
| 728 | 728 | if ($showDuration) { |
| 729 | 729 | // Duration |
| 730 | - if(strtolower($current_page) != "upcoming"){ |
|
| 730 | + if (strtolower($current_page) != "upcoming") { |
|
| 731 | 731 | print '<td class="duration">'."\n"; |
| 732 | 732 | if (isset($spotter_item['duration'])) { |
| 733 | - print '<span class="nomobile">'.gmdate('H:i:s',$spotter_item['duration']).'</span>'."\n"; |
|
| 734 | - print '<span class="mobile">'.gmdate('H:i:s',$spotter_item['duration']).'</span>'."\n"; |
|
| 733 | + print '<span class="nomobile">'.gmdate('H:i:s', $spotter_item['duration']).'</span>'."\n"; |
|
| 734 | + print '<span class="mobile">'.gmdate('H:i:s', $spotter_item['duration']).'</span>'."\n"; |
|
| 735 | 735 | } else { |
| 736 | 736 | print '<span class="nomobile">-</span>'."\n"; |
| 737 | 737 | print '<span class="mobile">-</span>'."\n"; |
@@ -744,7 +744,7 @@ discard block |
||
| 744 | 744 | if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") { |
| 745 | 745 | if (isset($spotter_item['decode']) && $spotter_item['decode'] != '') { |
| 746 | 746 | print '<td class="message"><p>'."\n"; |
| 747 | - print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']); |
|
| 747 | + print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']); |
|
| 748 | 748 | print '</p><p class="decode">'; |
| 749 | 749 | $decode_array = json_decode($spotter_item['decode']); |
| 750 | 750 | foreach ($decode_array as $key => $value) { |
@@ -754,7 +754,7 @@ discard block |
||
| 754 | 754 | print '</td>'."\n"; |
| 755 | 755 | } else { |
| 756 | 756 | print '<td class="message">'."\n"; |
| 757 | - print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']); |
|
| 757 | + print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']); |
|
| 758 | 758 | print '</td>'."\n"; |
| 759 | 759 | } |
| 760 | 760 | } |
@@ -779,7 +779,7 @@ discard block |
||
| 779 | 779 | } |
| 780 | 780 | print '</td>'."\n"; |
| 781 | 781 | print '<td class="message">'."\n"; |
| 782 | - print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']); |
|
| 782 | + print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']); |
|
| 783 | 783 | print '</td>'."\n"; |
| 784 | 784 | } |
| 785 | 785 | if (strtolower($current_page) == "incident-latest" || strtolower($current_page) == "incident-detailed") { |
@@ -805,7 +805,7 @@ discard block |
||
| 805 | 805 | print '</td>'."\n"; |
| 806 | 806 | */ |
| 807 | 807 | print '<td class="message">'."\n"; |
| 808 | - print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']); |
|
| 808 | + print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']); |
|
| 809 | 809 | print '</td>'."\n"; |
| 810 | 810 | } |
| 811 | 811 | |
@@ -7,12 +7,12 @@ discard block |
||
| 7 | 7 | require_once('header.php'); |
| 8 | 8 | |
| 9 | 9 | //calculuation for the pagination |
| 10 | -if(!isset($_GET['limit'])) |
|
| 10 | +if (!isset($_GET['limit'])) |
|
| 11 | 11 | { |
| 12 | 12 | $limit_start = 0; |
| 13 | 13 | $limit_end = 25; |
| 14 | 14 | $absolute_difference = 25; |
| 15 | -} else { |
|
| 15 | +} else { |
|
| 16 | 16 | $limit_explode = explode(",", $_GET['limit']); |
| 17 | 17 | $limit_start = $limit_explode[0]; |
| 18 | 18 | $limit_end = $limit_explode[1]; |
@@ -34,10 +34,10 @@ discard block |
||
| 34 | 34 | print '<div class="table column">'; |
| 35 | 35 | print '<p>'._("The table below shows the detailed information of all recent flights.").'</p>'; |
| 36 | 36 | |
| 37 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 37 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 38 | 38 | $sql_begin = microtime(true); |
| 39 | 39 | $spotter_array = $Spotter->getLatestSpotterData($limit_start.",".$absolute_difference, $sort); |
| 40 | -$sql_time = microtime(true)-$sql_begin; |
|
| 40 | +$sql_time = microtime(true) - $sql_begin; |
|
| 41 | 41 | $page_begin = microtime(true); |
| 42 | 42 | if (!empty($spotter_array)) |
| 43 | 43 | { |
@@ -54,6 +54,6 @@ discard block |
||
| 54 | 54 | print '</div>'; |
| 55 | 55 | print '</div>'; |
| 56 | 56 | } |
| 57 | -$page_time = microtime(true)-$page_begin; |
|
| 57 | +$page_time = microtime(true) - $page_begin; |
|
| 58 | 58 | require_once('footer.php'); |
| 59 | 59 | ?> |
| 60 | 60 | \ No newline at end of file |
