Ysurac /
FlightAirMap
@@ -15,22 +15,22 @@ discard block |
||
| 15 | 15 | * @param Array $filter the filter |
| 16 | 16 | * @return Array the SQL part |
| 17 | 17 | */ |
| 18 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 18 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 19 | 19 | global $globalFilter, $globalStatsFilters, $globalFilterName; |
| 20 | 20 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 21 | 21 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 22 | - foreach($globalStatsFilters[$globalFilterName] as $source) { |
|
| 22 | + foreach ($globalStatsFilters[$globalFilterName] as $source) { |
|
| 23 | 23 | if (isset($source['source'])) $filter['source'][] = $source['source']; |
| 24 | 24 | } |
| 25 | 25 | } else { |
| 26 | 26 | $filter = $globalStatsFilters[$globalFilterName]; |
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 29 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 30 | 30 | $filter_query_join = ''; |
| 31 | 31 | $filter_query_where = ''; |
| 32 | 32 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 33 | - $filter_query_where = " WHERE format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 33 | + $filter_query_where = " WHERE format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 34 | 34 | } |
| 35 | 35 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 36 | 36 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | try { |
| 46 | 46 | $sth = $this->db->prepare($query); |
| 47 | 47 | $sth->execute($query_values); |
| 48 | - } catch(PDOException $e) { |
|
| 48 | + } catch (PDOException $e) { |
|
| 49 | 49 | return "error : ".$e->getMessage(); |
| 50 | 50 | } |
| 51 | 51 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -53,66 +53,66 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | public function getById($id) { |
| 56 | - $filter_query = $this->getFilter(array(),true); |
|
| 56 | + $filter_query = $this->getFilter(array(), true); |
|
| 57 | 57 | $query = "SELECT * FROM atc".$filter_query." atc_id = :id"; |
| 58 | 58 | $query_values = array(':id' => $id); |
| 59 | 59 | try { |
| 60 | 60 | $sth = $this->db->prepare($query); |
| 61 | 61 | $sth->execute($query_values); |
| 62 | - } catch(PDOException $e) { |
|
| 62 | + } catch (PDOException $e) { |
|
| 63 | 63 | return "error : ".$e->getMessage(); |
| 64 | 64 | } |
| 65 | 65 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 66 | 66 | return $all; |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - public function getByIdent($ident,$format_source = '') { |
|
| 70 | - $filter_query = $this->getFilter(array(),true); |
|
| 69 | + public function getByIdent($ident, $format_source = '') { |
|
| 70 | + $filter_query = $this->getFilter(array(), true); |
|
| 71 | 71 | if ($format_source == '') { |
| 72 | 72 | $query = "SELECT * FROM atc".$filter_query." ident = :ident"; |
| 73 | 73 | $query_values = array(':ident' => $ident); |
| 74 | 74 | } else { |
| 75 | 75 | $query = "SELECT * FROM atc".$filter_query." ident = :ident AND format_source = :format_source"; |
| 76 | - $query_values = array(':ident' => $ident,':format_source' => $format_source); |
|
| 76 | + $query_values = array(':ident' => $ident, ':format_source' => $format_source); |
|
| 77 | 77 | } |
| 78 | 78 | try { |
| 79 | 79 | $sth = $this->db->prepare($query); |
| 80 | 80 | $sth->execute($query_values); |
| 81 | - } catch(PDOException $e) { |
|
| 81 | + } catch (PDOException $e) { |
|
| 82 | 82 | return "error : ".$e->getMessage(); |
| 83 | 83 | } |
| 84 | 84 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 85 | 85 | return $all; |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') { |
|
| 89 | - $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 90 | - $info = str_replace('^','<br />',$info); |
|
| 91 | - $info = str_replace('&sect;','',$info); |
|
| 92 | - $info = str_replace('"','',$info); |
|
| 88 | + public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') { |
|
| 89 | + $info = preg_replace('/[^(\x20-\x7F)]*/', '', $info); |
|
| 90 | + $info = str_replace('^', '<br />', $info); |
|
| 91 | + $info = str_replace('&sect;', '', $info); |
|
| 92 | + $info = str_replace('"', '', $info); |
|
| 93 | 93 | if ($type == '') $type = NULL; |
| 94 | 94 | $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)"; |
| 95 | - $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
|
| 95 | + $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name); |
|
| 96 | 96 | try { |
| 97 | 97 | $sth = $this->db->prepare($query); |
| 98 | 98 | $sth->execute($query_values); |
| 99 | - } catch(PDOException $e) { |
|
| 99 | + } catch (PDOException $e) { |
|
| 100 | 100 | return "error : ".$e->getMessage(); |
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | |
| 104 | - public function update($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') { |
|
| 105 | - $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 106 | - $info = str_replace('^','<br />',$info); |
|
| 107 | - $info = str_replace('&sect;','',$info); |
|
| 108 | - $info = str_replace('"','',$info); |
|
| 104 | + public function update($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') { |
|
| 105 | + $info = preg_replace('/[^(\x20-\x7F)]*/', '', $info); |
|
| 106 | + $info = str_replace('^', '<br />', $info); |
|
| 107 | + $info = str_replace('&sect;', '', $info); |
|
| 108 | + $info = str_replace('"', '', $info); |
|
| 109 | 109 | if ($type == '') $type = NULL; |
| 110 | 110 | $query = "UPDATE atc SET frequency = :frequency,latitude = :latitude,longitude = :longitude,atc_range = :range,info = :info,atc_lastseen = :date,type = :type,ivao_id = :ivao_id,ivao_name = :ivao_name WHERE ident = :ident AND format_source = :format_source AND source_name = :source_name"; |
| 111 | - $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
|
| 111 | + $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name); |
|
| 112 | 112 | try { |
| 113 | 113 | $sth = $this->db->prepare($query); |
| 114 | 114 | $sth->execute($query_values); |
| 115 | - } catch(PDOException $e) { |
|
| 115 | + } catch (PDOException $e) { |
|
| 116 | 116 | return "error : ".$e->getMessage(); |
| 117 | 117 | } |
| 118 | 118 | } |
@@ -123,18 +123,18 @@ discard block |
||
| 123 | 123 | try { |
| 124 | 124 | $sth = $this->db->prepare($query); |
| 125 | 125 | $sth->execute($query_values); |
| 126 | - } catch(PDOException $e) { |
|
| 126 | + } catch (PDOException $e) { |
|
| 127 | 127 | return "error : ".$e->getMessage(); |
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | - public function deleteByIdent($ident,$format_source) { |
|
| 131 | + public function deleteByIdent($ident, $format_source) { |
|
| 132 | 132 | $query = "DELETE FROM atc WHERE ident = :ident AND format_source = :format_source"; |
| 133 | - $query_values = array(':ident' => $ident,':format_source' => $format_source); |
|
| 133 | + $query_values = array(':ident' => $ident, ':format_source' => $format_source); |
|
| 134 | 134 | try { |
| 135 | 135 | $sth = $this->db->prepare($query); |
| 136 | 136 | $sth->execute($query_values); |
| 137 | - } catch(PDOException $e) { |
|
| 137 | + } catch (PDOException $e) { |
|
| 138 | 138 | return "error : ".$e->getMessage(); |
| 139 | 139 | } |
| 140 | 140 | } |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | try { |
| 146 | 146 | $sth = $this->db->prepare($query); |
| 147 | 147 | $sth->execute($query_values); |
| 148 | - } catch(PDOException $e) { |
|
| 148 | + } catch (PDOException $e) { |
|
| 149 | 149 | return "error : ".$e->getMessage(); |
| 150 | 150 | } |
| 151 | 151 | } |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | try { |
| 161 | 161 | $sth = $this->db->prepare($query); |
| 162 | 162 | $sth->execute(); |
| 163 | - } catch(PDOException $e) { |
|
| 163 | + } catch (PDOException $e) { |
|
| 164 | 164 | return "error"; |
| 165 | 165 | } |
| 166 | 166 | return "success"; |
@@ -5,8 +5,8 @@ discard block |
||
| 5 | 5 | $ATC = new ATC(); |
| 6 | 6 | |
| 7 | 7 | if (isset($_GET['atcid'])) { |
| 8 | - $atcid = filter_input(INPUT_GET,'atcid',FILTER_SANITIZE_NUMBER_INT); |
|
| 9 | - $atcident = filter_input(INPUT_GET,'atcident',FILTER_SANITIZE_STRING); |
|
| 8 | + $atcid = filter_input(INPUT_GET, 'atcid', FILTER_SANITIZE_NUMBER_INT); |
|
| 9 | + $atcident = filter_input(INPUT_GET, 'atcident', FILTER_SANITIZE_STRING); |
|
| 10 | 10 | $atc_data = $ATC->getById($atcid); |
| 11 | 11 | if (!isset($atc_data[0])) $atc_data = $ATC->getByIdent($atcident); |
| 12 | 12 | ?> |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | print '</div>'; |
| 39 | 39 | |
| 40 | 40 | //print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
| 41 | -print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>'; |
|
| 41 | +print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 3).', '.round($spotter_item['longitude'], 3).'</div>'; |
|
| 42 | 42 | if ($spotter_item['atc_range'] > 0) { |
| 43 | 43 | print '<div><span>'._("Range").'</span>'; |
| 44 | 44 | print $spotter_item['atc_range']; |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | if (!isset($filter_name)) $filter_name = ''; |
| 22 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 22 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 23 | 23 | if ($type == 'aircraft' && $airline_icao == '' && isset($globalFilter)) { |
| 24 | 24 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
| 25 | 25 | } |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | $title = _("Statistics"); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | -$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
|
| 38 | -$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
|
| 37 | +$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT); |
|
| 38 | +$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT); |
|
| 39 | 39 | |
| 40 | 40 | require_once('header.php'); |
| 41 | 41 | |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | date_default_timezone_set('UTC'); |
| 63 | 63 | $lastupdate = strtotime($last_update[0]['value']); |
| 64 | 64 | if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone); |
| 65 | - print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>'; |
|
| 65 | + print '<i>Last update: '.date('Y-m-d G:i:s', $lastupdate).'</i>'; |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | ?> |
@@ -74,31 +74,31 @@ discard block |
||
| 74 | 74 | <?php |
| 75 | 75 | if ($type == 'aircraft') { |
| 76 | 76 | ?> |
| 77 | - <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Flights"); ?></span> |
|
| 78 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 79 | - <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
|
| 80 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 77 | + <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Flights"); ?></span> |
|
| 78 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 79 | + <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
|
| 80 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 81 | 81 | <?php |
| 82 | 82 | if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) { |
| 83 | 83 | ?> |
| 84 | - <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span> |
|
| 85 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 84 | + <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Pilots"); ?></span> |
|
| 85 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 86 | 86 | <?php |
| 87 | 87 | } |
| 88 | 88 | if ((isset($globalUseOwner) && $globalUseOwner) || (!isset($globalUseOwner) && (!isset($globalVA) || !$globalVA) && (!isset($globalIVAO) || !$globalIVAO) && (!isset($globalVATSIM) || !$globalVATSIM) && (!isset($globalphpVMS) || !$globalphpVMS) && (!isset($globalVAM) || !$globalVAM))) { |
| 89 | 89 | ?> |
| 90 | - <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span> |
|
| 91 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 90 | + <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Owners"); ?></span> |
|
| 91 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 92 | 92 | <?php |
| 93 | 93 | } |
| 94 | 94 | ?> |
| 95 | - <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
| 96 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 95 | + <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
| 96 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 97 | 97 | <?php |
| 98 | 98 | if ($airline_icao == '') { |
| 99 | 99 | ?> |
| 100 | - <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
| 101 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 100 | + <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name, $year, $month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
| 101 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 102 | 102 | <?php |
| 103 | 103 | } |
| 104 | 104 | ?> |
@@ -106,8 +106,8 @@ discard block |
||
| 106 | 106 | if (!(isset($globalVA) && $globalVA) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS) && !(isset($globalVAM) && $globalVAM)) { |
| 107 | 107 | if ($airline_icao == '' || $airline_icao == 'all') { |
| 108 | 108 | ?> |
| 109 | - <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name,$year,$month)); ?></span> <?php echo _("Military"); ?></span> |
|
| 110 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 109 | + <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name, $year, $month)); ?></span> <?php echo _("Military"); ?></span> |
|
| 110 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 111 | 111 | <?php |
| 112 | 112 | } |
| 113 | 113 | } |
@@ -115,22 +115,22 @@ discard block |
||
| 115 | 115 | <?php |
| 116 | 116 | } elseif ($type == 'marine') { |
| 117 | 117 | ?> |
| 118 | - <span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(),$year,$month)); ?></span> <?php echo _("Vessels"); ?></span> |
|
| 119 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 120 | - <span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 121 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 118 | + <span><span class="badge"><?php print number_format($Marine->countOverallMarine(array(), $year, $month)); ?></span> <?php echo _("Vessels"); ?></span> |
|
| 119 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 120 | + <span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 121 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 122 | 122 | <?php |
| 123 | 123 | } elseif ($type == 'tracker') { |
| 124 | 124 | ?> |
| 125 | - <span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(),$year,$month)); ?></span> <?php echo _("Trackers"); ?></span> |
|
| 126 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 127 | - <span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(),$year,$month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 128 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 125 | + <span><span class="badge"><?php print number_format($Tracker->countOverallTracker(array(), $year, $month)); ?></span> <?php echo _("Trackers"); ?></span> |
|
| 126 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 127 | + <span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes(array(), $year, $month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 128 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 129 | 129 | <?php |
| 130 | 130 | } |
| 131 | 131 | ?> |
| 132 | 132 | </p> |
| 133 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 133 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 134 | 134 | <div class="specific-stats"> |
| 135 | 135 | <?php |
| 136 | 136 | if ($type == 'aircraft') { |
@@ -139,12 +139,12 @@ discard block |
||
| 139 | 139 | <div class="col-md-6"> |
| 140 | 140 | <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
| 141 | 141 | <?php |
| 142 | - $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
| 142 | + $aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month); |
|
| 143 | 143 | if (count($aircraft_array) == 0) print _("No data available"); |
| 144 | 144 | else { |
| 145 | 145 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 146 | 146 | $aircraft_data = ''; |
| 147 | - foreach($aircraft_array as $aircraft_item) |
|
| 147 | + foreach ($aircraft_array as $aircraft_item) |
|
| 148 | 148 | { |
| 149 | 149 | if ($aircraft_item['aircraft_manufacturer'] == 'Not Available') $aircraft_data .= '[" ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
| 150 | 150 | else $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
@@ -174,17 +174,17 @@ discard block |
||
| 174 | 174 | ?> |
| 175 | 175 | </div> |
| 176 | 176 | </div> |
| 177 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 177 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 178 | 178 | <?php |
| 179 | 179 | // echo $airline_icao; |
| 180 | 180 | if ($airline_icao == '' || $airline_icao == 'all') { |
| 181 | - $airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month); |
|
| 181 | + $airline_array = $Stats->countAllAirlines(true, $filter_name, $year, $month); |
|
| 182 | 182 | if (count($airline_array) > 0) { |
| 183 | 183 | print '<div class="col-md-6">'; |
| 184 | 184 | print '<h2>'._("Top 10 Most Common Airline").'</h2>'; |
| 185 | 185 | print '<div id="chart2" class="chart" width="100%"></div><script>'; |
| 186 | 186 | $airline_data = ''; |
| 187 | - foreach($airline_array as $airline_item) |
|
| 187 | + foreach ($airline_array as $airline_item) |
|
| 188 | 188 | { |
| 189 | 189 | $airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],'; |
| 190 | 190 | } |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | } |
| 211 | 211 | ?> |
| 212 | 212 | </div> |
| 213 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 213 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 214 | 214 | <?php |
| 215 | 215 | } |
| 216 | 216 | ?> |
@@ -224,12 +224,12 @@ discard block |
||
| 224 | 224 | <div class="col-md-6"> |
| 225 | 225 | <h2><?php echo _("Top 10 Most Common Vessel Type"); ?></h2> |
| 226 | 226 | <?php |
| 227 | - $marine_array = $Marine->countAllMarineTypes(true,0,'',array(),$year,$month); |
|
| 227 | + $marine_array = $Marine->countAllMarineTypes(true, 0, '', array(), $year, $month); |
|
| 228 | 228 | if (count($marine_array) == 0) print _("No data available"); |
| 229 | 229 | else { |
| 230 | 230 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 231 | 231 | $marine_data = ''; |
| 232 | - foreach($marine_array as $marine_item) |
|
| 232 | + foreach ($marine_array as $marine_item) |
|
| 233 | 233 | { |
| 234 | 234 | $marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],'; |
| 235 | 235 | } |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | ?> |
| 261 | 261 | </div> |
| 262 | 262 | </div> |
| 263 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 263 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 264 | 264 | <!-- </div>--> |
| 265 | 265 | <?php |
| 266 | 266 | } |
@@ -272,12 +272,12 @@ discard block |
||
| 272 | 272 | <div class="col-md-6"> |
| 273 | 273 | <h2><?php echo _("Top 10 Most Common Tracker Type"); ?></h2> |
| 274 | 274 | <?php |
| 275 | - $tracker_array = $Tracker->countAllTrackerTypes(true,0,'',array(),$year,$month); |
|
| 275 | + $tracker_array = $Tracker->countAllTrackerTypes(true, 0, '', array(), $year, $month); |
|
| 276 | 276 | if (count($tracker_array) == 0) print _("No data available"); |
| 277 | 277 | else { |
| 278 | 278 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 279 | 279 | $tracker_data = ''; |
| 280 | - foreach($tracker_array as $tracker_item) |
|
| 280 | + foreach ($tracker_array as $tracker_item) |
|
| 281 | 281 | { |
| 282 | 282 | $tracker_data .= '["'.$tracker_item['tracker_type'].'",'.$tracker_item['tracker_type_count'].'],'; |
| 283 | 283 | } |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | ?> |
| 309 | 309 | </div> |
| 310 | 310 | </div> |
| 311 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 311 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 312 | 312 | <!-- </div>--> |
| 313 | 313 | <?php |
| 314 | 314 | } |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | ?> |
| 319 | 319 | <div class="row column"> |
| 320 | 320 | <?php |
| 321 | - $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month); |
|
| 321 | + $flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name, $year, $month); |
|
| 322 | 322 | //if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
| 323 | 323 | if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) { |
| 324 | 324 | if (empty($flightover_array)) { |
@@ -329,12 +329,12 @@ discard block |
||
| 329 | 329 | ?> |
| 330 | 330 | <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2> |
| 331 | 331 | <?php |
| 332 | - $pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month); |
|
| 332 | + $pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month); |
|
| 333 | 333 | if (count($pilot_array) == 0) print _("No data available"); |
| 334 | 334 | else { |
| 335 | 335 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 336 | 336 | $pilot_data = ''; |
| 337 | - foreach($pilot_array as $pilot_item) |
|
| 337 | + foreach ($pilot_array as $pilot_item) |
|
| 338 | 338 | { |
| 339 | 339 | $pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],'; |
| 340 | 340 | } |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | ?> |
| 357 | 357 | </div> |
| 358 | 358 | |
| 359 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 359 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 360 | 360 | <?php |
| 361 | 361 | } |
| 362 | 362 | // else { |
@@ -365,12 +365,12 @@ discard block |
||
| 365 | 365 | <div class="col-md-6"> |
| 366 | 366 | <h2><?php echo _("Top 10 Most Common Owners"); ?></h2> |
| 367 | 367 | <?php |
| 368 | - $owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month); |
|
| 368 | + $owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name, $year, $month); |
|
| 369 | 369 | if (count($owner_array) == 0) print _("No data available"); |
| 370 | 370 | else { |
| 371 | 371 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 372 | 372 | $owner_data = ''; |
| 373 | - foreach($owner_array as $owner_item) |
|
| 373 | + foreach ($owner_array as $owner_item) |
|
| 374 | 374 | { |
| 375 | 375 | $owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],'; |
| 376 | 376 | } |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | </div> |
| 391 | 391 | </div> |
| 392 | 392 | |
| 393 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 393 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 394 | 394 | <?php |
| 395 | 395 | } |
| 396 | 396 | if (!empty($flightover_array)) { |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 405 | 405 | print 'var series = ['; |
| 406 | 406 | $flightover_data = ''; |
| 407 | - foreach($flightover_array as $flightover_item) |
|
| 407 | + foreach ($flightover_array as $flightover_item) |
|
| 408 | 408 | { |
| 409 | 409 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
| 410 | 410 | } |
@@ -450,7 +450,7 @@ discard block |
||
| 450 | 450 | } |
| 451 | 451 | ?> |
| 452 | 452 | </div> |
| 453 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 453 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 454 | 454 | |
| 455 | 455 | |
| 456 | 456 | </div> |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 471 | 471 | print 'var series = ['; |
| 472 | 472 | $flightover_data = ''; |
| 473 | - foreach($flightover_array as $flightover_item) |
|
| 473 | + foreach ($flightover_array as $flightover_item) |
|
| 474 | 474 | { |
| 475 | 475 | $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],'; |
| 476 | 476 | } |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 531 | 531 | print 'var series = ['; |
| 532 | 532 | $flightover_data = ''; |
| 533 | - foreach($flightover_array as $flightover_item) |
|
| 533 | + foreach ($flightover_array as $flightover_item) |
|
| 534 | 534 | { |
| 535 | 535 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
| 536 | 536 | } |
@@ -583,14 +583,14 @@ discard block |
||
| 583 | 583 | <div class="row column"> |
| 584 | 584 | <div class="col-md-6"> |
| 585 | 585 | <?php |
| 586 | - $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 586 | + $airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name, $year, $month); |
|
| 587 | 587 | if (count($airport_airport_array) > 0) { |
| 588 | 588 | print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>'; |
| 589 | 589 | print '<div id="chart3" class="chart" width="100%"></div><script>'; |
| 590 | 590 | print "\n"; |
| 591 | 591 | print 'var series = ['; |
| 592 | 592 | $airport_data = ''; |
| 593 | - foreach($airport_airport_array as $airport_item) |
|
| 593 | + foreach ($airport_airport_array as $airport_item) |
|
| 594 | 594 | { |
| 595 | 595 | $airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],'; |
| 596 | 596 | } |
@@ -641,18 +641,18 @@ discard block |
||
| 641 | 641 | } |
| 642 | 642 | ?> |
| 643 | 643 | </div> |
| 644 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 644 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 645 | 645 | |
| 646 | 646 | <div class="col-md-6"> |
| 647 | 647 | <?php |
| 648 | - $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 648 | + $airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name, $year, $month); |
|
| 649 | 649 | if (count($airport_airport_array2) > 0) { |
| 650 | 650 | print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>'; |
| 651 | 651 | print '<div id="chart4" class="chart" width="100%"></div><script>'; |
| 652 | 652 | print "\n"; |
| 653 | 653 | print 'var series = ['; |
| 654 | 654 | $airport_data = ''; |
| 655 | - foreach($airport_airport_array2 as $airport_item) |
|
| 655 | + foreach ($airport_airport_array2 as $airport_item) |
|
| 656 | 656 | { |
| 657 | 657 | $airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],'; |
| 658 | 658 | } |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | ?> |
| 705 | 705 | </div> |
| 706 | 706 | </div> |
| 707 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 707 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 708 | 708 | <?php |
| 709 | 709 | } |
| 710 | 710 | ?> |
@@ -718,19 +718,19 @@ discard block |
||
| 718 | 718 | <div class="col-md-6"> |
| 719 | 719 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 720 | 720 | <?php |
| 721 | - $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 721 | + $year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name); |
|
| 722 | 722 | if (count($year_array) == 0) print _("No data available"); |
| 723 | 723 | else { |
| 724 | 724 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 725 | 725 | $year_data = ''; |
| 726 | 726 | $year_cnt = ''; |
| 727 | - foreach($year_array as $year_item) |
|
| 727 | + foreach ($year_array as $year_item) |
|
| 728 | 728 | { |
| 729 | 729 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 730 | 730 | $year_cnt .= $year_item['date_count'].','; |
| 731 | 731 | } |
| 732 | 732 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 733 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 733 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 734 | 734 | print 'c3.generate({ |
| 735 | 735 | bindto: "#chart8", |
| 736 | 736 | data: { x: "x", |
@@ -743,23 +743,23 @@ discard block |
||
| 743 | 743 | <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 744 | 744 | </div> |
| 745 | 745 | </div> |
| 746 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 746 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 747 | 747 | <div class="col-md-6"> |
| 748 | 748 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 749 | 749 | <?php |
| 750 | - $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 750 | + $month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name); |
|
| 751 | 751 | if (count($month_array) == 0) print _("No data available"); |
| 752 | 752 | else { |
| 753 | 753 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 754 | 754 | $month_data = ''; |
| 755 | 755 | $month_cnt = ''; |
| 756 | - foreach($month_array as $month_item) |
|
| 756 | + foreach ($month_array as $month_item) |
|
| 757 | 757 | { |
| 758 | 758 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 759 | 759 | $month_cnt .= $month_item['date_count'].','; |
| 760 | 760 | } |
| 761 | 761 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 762 | - $month_cnt = "['flights',".substr($month_cnt,0,-1)."]"; |
|
| 762 | + $month_cnt = "['flights',".substr($month_cnt, 0, -1)."]"; |
|
| 763 | 763 | print 'c3.generate({ |
| 764 | 764 | bindto: "#chart9", |
| 765 | 765 | data: { x: "x", |
@@ -772,24 +772,24 @@ discard block |
||
| 772 | 772 | <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 773 | 773 | </div> |
| 774 | 774 | </div> |
| 775 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 775 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 776 | 776 | |
| 777 | 777 | <div class="col-md-6"> |
| 778 | 778 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
| 779 | 779 | <?php |
| 780 | - $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 780 | + $date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name); |
|
| 781 | 781 | if (empty($date_array)) print _("No data available"); |
| 782 | 782 | else { |
| 783 | 783 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 784 | 784 | $date_data = ''; |
| 785 | 785 | $date_cnt = ''; |
| 786 | - foreach($date_array as $date_item) |
|
| 786 | + foreach ($date_array as $date_item) |
|
| 787 | 787 | { |
| 788 | 788 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 789 | 789 | $date_cnt .= $date_item['date_count'].','; |
| 790 | 790 | } |
| 791 | 791 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 792 | - $date_cnt = "['flights',".substr($date_cnt,0,-1)."]"; |
|
| 792 | + $date_cnt = "['flights',".substr($date_cnt, 0, -1)."]"; |
|
| 793 | 793 | print 'c3.generate({ |
| 794 | 794 | bindto: "#chart5", |
| 795 | 795 | data: { x: "x", |
@@ -802,23 +802,23 @@ discard block |
||
| 802 | 802 | <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 803 | 803 | </div> |
| 804 | 804 | </div> |
| 805 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 805 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 806 | 806 | <div class="col-md-6"> |
| 807 | 807 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 808 | 808 | <?php |
| 809 | - $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 809 | + $hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name); |
|
| 810 | 810 | if (empty($hour_array)) print _("No data available"); |
| 811 | 811 | else { |
| 812 | 812 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 813 | 813 | $hour_data = ''; |
| 814 | 814 | $hour_cnt = ''; |
| 815 | - foreach($hour_array as $hour_item) |
|
| 815 | + foreach ($hour_array as $hour_item) |
|
| 816 | 816 | { |
| 817 | 817 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 818 | 818 | $hour_cnt .= $hour_item['hour_count'].','; |
| 819 | 819 | } |
| 820 | 820 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 821 | - $hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
|
| 821 | + $hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]"; |
|
| 822 | 822 | print 'c3.generate({ |
| 823 | 823 | bindto: "#chart6", |
| 824 | 824 | data: { |
@@ -831,7 +831,7 @@ discard block |
||
| 831 | 831 | <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 832 | 832 | </div> |
| 833 | 833 | </div> |
| 834 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 834 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 835 | 835 | </div> |
| 836 | 836 | <?php |
| 837 | 837 | } |
@@ -849,19 +849,19 @@ discard block |
||
| 849 | 849 | <div class="col-md-6"> |
| 850 | 850 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 851 | 851 | <?php |
| 852 | - $year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 852 | + $year_array = $Marine->countAllMonthsLastYear(true, $airline_icao, $filter_name); |
|
| 853 | 853 | if (count($year_array) == 0) print _("No data available"); |
| 854 | 854 | else { |
| 855 | 855 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 856 | 856 | $year_data = ''; |
| 857 | 857 | $year_cnt = ''; |
| 858 | - foreach($year_array as $year_item) |
|
| 858 | + foreach ($year_array as $year_item) |
|
| 859 | 859 | { |
| 860 | 860 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 861 | 861 | $year_cnt .= $year_item['date_count'].','; |
| 862 | 862 | } |
| 863 | 863 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 864 | - $year_cnt = "['vessels',".substr($year_cnt,0,-1)."]"; |
|
| 864 | + $year_cnt = "['vessels',".substr($year_cnt, 0, -1)."]"; |
|
| 865 | 865 | print 'c3.generate({ |
| 866 | 866 | bindto: "#chart8", |
| 867 | 867 | data: { x: "x", |
@@ -875,23 +875,23 @@ discard block |
||
| 875 | 875 | </div> |
| 876 | 876 | </div> |
| 877 | 877 | |
| 878 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 878 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 879 | 879 | <div class="col-md-6"> |
| 880 | 880 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 881 | 881 | <?php |
| 882 | - $month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 882 | + $month_array = $Marine->countAllDatesLastMonth($airline_icao, $filter_name); |
|
| 883 | 883 | if (count($month_array) == 0) print _("No data available"); |
| 884 | 884 | else { |
| 885 | 885 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 886 | 886 | $month_data = ''; |
| 887 | 887 | $month_cnt = ''; |
| 888 | - foreach($month_array as $month_item) |
|
| 888 | + foreach ($month_array as $month_item) |
|
| 889 | 889 | { |
| 890 | 890 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 891 | 891 | $month_cnt .= $month_item['date_count'].','; |
| 892 | 892 | } |
| 893 | 893 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 894 | - $month_cnt = "['vessels',".substr($month_cnt,0,-1)."]"; |
|
| 894 | + $month_cnt = "['vessels',".substr($month_cnt, 0, -1)."]"; |
|
| 895 | 895 | print 'c3.generate({ |
| 896 | 896 | bindto: "#chart9", |
| 897 | 897 | data: { x: "x", |
@@ -904,24 +904,24 @@ discard block |
||
| 904 | 904 | <a href="<?php print $globalURL; ?>/marine/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 905 | 905 | </div> |
| 906 | 906 | </div> |
| 907 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 907 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 908 | 908 | |
| 909 | 909 | <div class="col-md-6"> |
| 910 | 910 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
| 911 | 911 | <?php |
| 912 | - $date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 912 | + $date_array = $Marine->countAllDatesLast7Days($airline_icao, $filter_name); |
|
| 913 | 913 | if (empty($date_array)) print _("No data available"); |
| 914 | 914 | else { |
| 915 | 915 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 916 | 916 | $date_data = ''; |
| 917 | 917 | $date_cnt = ''; |
| 918 | - foreach($date_array as $date_item) |
|
| 918 | + foreach ($date_array as $date_item) |
|
| 919 | 919 | { |
| 920 | 920 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 921 | 921 | $date_cnt .= $date_item['date_count'].','; |
| 922 | 922 | } |
| 923 | 923 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 924 | - $date_cnt = "['vessels',".substr($date_cnt,0,-1)."]"; |
|
| 924 | + $date_cnt = "['vessels',".substr($date_cnt, 0, -1)."]"; |
|
| 925 | 925 | print 'c3.generate({ |
| 926 | 926 | bindto: "#chart5", |
| 927 | 927 | data: { x: "x", |
@@ -934,23 +934,23 @@ discard block |
||
| 934 | 934 | <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 935 | 935 | </div> |
| 936 | 936 | </div> |
| 937 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 937 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 938 | 938 | <div class="col-md-6"> |
| 939 | 939 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 940 | 940 | <?php |
| 941 | - $hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 941 | + $hour_array = $Marine->countAllHours('hour', true, $airline_icao, $filter_name); |
|
| 942 | 942 | if (empty($hour_array)) print _("No data available"); |
| 943 | 943 | else { |
| 944 | 944 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 945 | 945 | $hour_data = ''; |
| 946 | 946 | $hour_cnt = ''; |
| 947 | - foreach($hour_array as $hour_item) |
|
| 947 | + foreach ($hour_array as $hour_item) |
|
| 948 | 948 | { |
| 949 | 949 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 950 | 950 | $hour_cnt .= $hour_item['hour_count'].','; |
| 951 | 951 | } |
| 952 | 952 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 953 | - $hour_cnt = "['vessels',".substr($hour_cnt,0,-1)."]"; |
|
| 953 | + $hour_cnt = "['vessels',".substr($hour_cnt, 0, -1)."]"; |
|
| 954 | 954 | print 'c3.generate({ |
| 955 | 955 | bindto: "#chart6", |
| 956 | 956 | data: { |
@@ -963,7 +963,7 @@ discard block |
||
| 963 | 963 | <a href="<?php print $globalURL; ?>/marine/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 964 | 964 | </div> |
| 965 | 965 | </div> |
| 966 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 966 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 967 | 967 | </div> |
| 968 | 968 | <?php |
| 969 | 969 | } |
@@ -987,13 +987,13 @@ discard block |
||
| 987 | 987 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 988 | 988 | $year_data = ''; |
| 989 | 989 | $year_cnt = ''; |
| 990 | - foreach($year_array as $year_item) |
|
| 990 | + foreach ($year_array as $year_item) |
|
| 991 | 991 | { |
| 992 | 992 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 993 | 993 | $year_cnt .= $year_item['date_count'].','; |
| 994 | 994 | } |
| 995 | 995 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 996 | - $year_cnt = "['trackers',".substr($year_cnt,0,-1)."]"; |
|
| 996 | + $year_cnt = "['trackers',".substr($year_cnt, 0, -1)."]"; |
|
| 997 | 997 | print 'c3.generate({ |
| 998 | 998 | bindto: "#chart8", |
| 999 | 999 | data: { x: "x", |
@@ -1007,7 +1007,7 @@ discard block |
||
| 1007 | 1007 | </div> |
| 1008 | 1008 | </div> |
| 1009 | 1009 | |
| 1010 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1010 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1011 | 1011 | <div class="col-md-6"> |
| 1012 | 1012 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 1013 | 1013 | <?php |
@@ -1017,13 +1017,13 @@ discard block |
||
| 1017 | 1017 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 1018 | 1018 | $month_data = ''; |
| 1019 | 1019 | $month_cnt = ''; |
| 1020 | - foreach($month_array as $month_item) |
|
| 1020 | + foreach ($month_array as $month_item) |
|
| 1021 | 1021 | { |
| 1022 | 1022 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 1023 | 1023 | $month_cnt .= $month_item['date_count'].','; |
| 1024 | 1024 | } |
| 1025 | 1025 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 1026 | - $month_cnt = "['trackers',".substr($month_cnt,0,-1)."]"; |
|
| 1026 | + $month_cnt = "['trackers',".substr($month_cnt, 0, -1)."]"; |
|
| 1027 | 1027 | print 'c3.generate({ |
| 1028 | 1028 | bindto: "#chart9", |
| 1029 | 1029 | data: { x: "x", |
@@ -1036,7 +1036,7 @@ discard block |
||
| 1036 | 1036 | <a href="<?php print $globalURL; ?>/tracker/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1037 | 1037 | </div> |
| 1038 | 1038 | </div> |
| 1039 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1039 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1040 | 1040 | |
| 1041 | 1041 | <div class="col-md-6"> |
| 1042 | 1042 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
@@ -1047,13 +1047,13 @@ discard block |
||
| 1047 | 1047 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 1048 | 1048 | $date_data = ''; |
| 1049 | 1049 | $date_cnt = ''; |
| 1050 | - foreach($date_array as $date_item) |
|
| 1050 | + foreach ($date_array as $date_item) |
|
| 1051 | 1051 | { |
| 1052 | 1052 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 1053 | 1053 | $date_cnt .= $date_item['date_count'].','; |
| 1054 | 1054 | } |
| 1055 | 1055 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 1056 | - $date_cnt = "['trackers',".substr($date_cnt,0,-1)."]"; |
|
| 1056 | + $date_cnt = "['trackers',".substr($date_cnt, 0, -1)."]"; |
|
| 1057 | 1057 | print 'c3.generate({ |
| 1058 | 1058 | bindto: "#chart5", |
| 1059 | 1059 | data: { x: "x", |
@@ -1066,23 +1066,23 @@ discard block |
||
| 1066 | 1066 | <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1067 | 1067 | </div> |
| 1068 | 1068 | </div> |
| 1069 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1069 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1070 | 1070 | <div class="col-md-6"> |
| 1071 | 1071 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 1072 | 1072 | <?php |
| 1073 | - $hour_array = $Tracker->countAllHours('hour',true); |
|
| 1073 | + $hour_array = $Tracker->countAllHours('hour', true); |
|
| 1074 | 1074 | if (empty($hour_array)) print _("No data available"); |
| 1075 | 1075 | else { |
| 1076 | 1076 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 1077 | 1077 | $hour_data = ''; |
| 1078 | 1078 | $hour_cnt = ''; |
| 1079 | - foreach($hour_array as $hour_item) |
|
| 1079 | + foreach ($hour_array as $hour_item) |
|
| 1080 | 1080 | { |
| 1081 | 1081 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 1082 | 1082 | $hour_cnt .= $hour_item['hour_count'].','; |
| 1083 | 1083 | } |
| 1084 | 1084 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 1085 | - $hour_cnt = "['trackers',".substr($hour_cnt,0,-1)."]"; |
|
| 1085 | + $hour_cnt = "['trackers',".substr($hour_cnt, 0, -1)."]"; |
|
| 1086 | 1086 | print 'c3.generate({ |
| 1087 | 1087 | bindto: "#chart6", |
| 1088 | 1088 | data: { |
@@ -1095,7 +1095,7 @@ discard block |
||
| 1095 | 1095 | <a href="<?php print $globalURL; ?>/tracker/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1096 | 1096 | </div> |
| 1097 | 1097 | </div> |
| 1098 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1098 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1099 | 1099 | </div> |
| 1100 | 1100 | <?php |
| 1101 | 1101 | } |
@@ -1119,13 +1119,13 @@ discard block |
||
| 1119 | 1119 | print '<div id="chart32" class="chart" width="100%"></div><script>'; |
| 1120 | 1120 | $year_data = ''; |
| 1121 | 1121 | $year_cnt = ''; |
| 1122 | - foreach($year_array as $year_item) |
|
| 1122 | + foreach ($year_array as $year_item) |
|
| 1123 | 1123 | { |
| 1124 | 1124 | $year_data .= '"'.$year_item['year'].'-01-01",'; |
| 1125 | 1125 | $year_cnt .= $year_item['count'].','; |
| 1126 | 1126 | } |
| 1127 | 1127 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 1128 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 1128 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 1129 | 1129 | print 'c3.generate({ |
| 1130 | 1130 | bindto: "#chart32", |
| 1131 | 1131 | data: { x: "x", |
@@ -1138,7 +1138,7 @@ discard block |
||
| 1138 | 1138 | <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1139 | 1139 | </div> |
| 1140 | 1140 | </div> |
| 1141 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1141 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1142 | 1142 | |
| 1143 | 1143 | <div class="row column"> |
| 1144 | 1144 | <div class="col-md-6"> |
@@ -1150,13 +1150,13 @@ discard block |
||
| 1150 | 1150 | print '<div id="chart33" class="chart" width="100%"></div><script>'; |
| 1151 | 1151 | $year_data = ''; |
| 1152 | 1152 | $year_cnt = ''; |
| 1153 | - foreach($year_array as $year_item) |
|
| 1153 | + foreach ($year_array as $year_item) |
|
| 1154 | 1154 | { |
| 1155 | 1155 | $year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",'; |
| 1156 | 1156 | $year_cnt .= $year_item['count'].','; |
| 1157 | 1157 | } |
| 1158 | 1158 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 1159 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 1159 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 1160 | 1160 | print 'c3.generate({ |
| 1161 | 1161 | bindto: "#chart33", |
| 1162 | 1162 | data: { x: "x", |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1170 | 1170 | </div> |
| 1171 | 1171 | </div> |
| 1172 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1172 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1173 | 1173 | <br/> |
| 1174 | 1174 | <?php |
| 1175 | 1175 | } |
@@ -1185,19 +1185,19 @@ discard block |
||
| 1185 | 1185 | //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
| 1186 | 1186 | if ($year == '' && $month == '') { |
| 1187 | 1187 | if ($type == 'aircraft') { |
| 1188 | - $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d')); |
|
| 1188 | + $polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d')); |
|
| 1189 | 1189 | } elseif ($type == 'marine') { |
| 1190 | - $polar = $Stats->getStatsSource('polar_marine',date('Y'),date('m'),date('d')); |
|
| 1190 | + $polar = $Stats->getStatsSource('polar_marine', date('Y'), date('m'), date('d')); |
|
| 1191 | 1191 | } elseif ($type == 'tracker') { |
| 1192 | - $polar = $Stats->getStatsSource('polar_tracker',date('Y'),date('m'),date('d')); |
|
| 1192 | + $polar = $Stats->getStatsSource('polar_tracker', date('Y'), date('m'), date('d')); |
|
| 1193 | 1193 | } |
| 1194 | 1194 | } else { |
| 1195 | 1195 | if ($type == 'aircraft') { |
| 1196 | - $polar = $Stats->getStatsSource('polar',$year,$month); |
|
| 1196 | + $polar = $Stats->getStatsSource('polar', $year, $month); |
|
| 1197 | 1197 | } elseif ($type == 'marine') { |
| 1198 | - $polar = $Stats->getStatsSource('polar_marine',$year,$month); |
|
| 1198 | + $polar = $Stats->getStatsSource('polar_marine', $year, $month); |
|
| 1199 | 1199 | } elseif ($type == 'tracker') { |
| 1200 | - $polar = $Stats->getStatsSource('polar_tracker',$year,$month); |
|
| 1200 | + $polar = $Stats->getStatsSource('polar_tracker', $year, $month); |
|
| 1201 | 1201 | } |
| 1202 | 1202 | } |
| 1203 | 1203 | if (!empty($polar)) { |
@@ -1206,7 +1206,7 @@ discard block |
||
| 1206 | 1206 | unset($polar_data); |
| 1207 | 1207 | $Spotter = new Spotter(); |
| 1208 | 1208 | $data = json_decode($eachpolar['source_data']); |
| 1209 | - foreach($data as $value => $key) { |
|
| 1209 | + foreach ($data as $value => $key) { |
|
| 1210 | 1210 | $direction = $Spotter->parseDirection(($value*22.5)); |
| 1211 | 1211 | $distance = $key; |
| 1212 | 1212 | $unit = 'km'; |
@@ -1226,7 +1226,7 @@ discard block |
||
| 1226 | 1226 | ?> |
| 1227 | 1227 | <div class="col-md-6"> |
| 1228 | 1228 | <h4><?php print $eachpolar['source_name']; ?></h4> |
| 1229 | - <div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
|
| 1229 | + <div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
|
| 1230 | 1230 | <script> |
| 1231 | 1231 | (function() { |
| 1232 | 1232 | var margin = {top: 100, right: 100, bottom: 100, left: 100}, |
@@ -1250,7 +1250,7 @@ discard block |
||
| 1250 | 1250 | color: color, |
| 1251 | 1251 | unit: '<?php echo $unit; ?>' |
| 1252 | 1252 | }; |
| 1253 | - RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions); |
|
| 1253 | + RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions); |
|
| 1254 | 1254 | })(); |
| 1255 | 1255 | </script> |
| 1256 | 1256 | </div> |
@@ -1265,19 +1265,19 @@ discard block |
||
| 1265 | 1265 | //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg'); |
| 1266 | 1266 | if ($year == '' && $month == '') { |
| 1267 | 1267 | if ($type == 'aircraft') { |
| 1268 | - $msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d')); |
|
| 1268 | + $msg = $Stats->getStatsSource('msg', date('Y'), date('m'), date('d')); |
|
| 1269 | 1269 | } elseif ($type == 'marine') { |
| 1270 | - $msg = $Stats->getStatsSource('msg_marine',date('Y'),date('m'),date('d')); |
|
| 1270 | + $msg = $Stats->getStatsSource('msg_marine', date('Y'), date('m'), date('d')); |
|
| 1271 | 1271 | } elseif ($type == 'tracker') { |
| 1272 | - $msg = $Stats->getStatsSource('msg_tracker',date('Y'),date('m'),date('d')); |
|
| 1272 | + $msg = $Stats->getStatsSource('msg_tracker', date('Y'), date('m'), date('d')); |
|
| 1273 | 1273 | } |
| 1274 | 1274 | } else { |
| 1275 | 1275 | if ($type == 'aircraft') { |
| 1276 | - $msg = $Stats->getStatsSource('msg',$year,$month); |
|
| 1276 | + $msg = $Stats->getStatsSource('msg', $year, $month); |
|
| 1277 | 1277 | } elseif ($type == 'marine') { |
| 1278 | - $msg = $Stats->getStatsSource('msg_marine',$year,$month); |
|
| 1278 | + $msg = $Stats->getStatsSource('msg_marine', $year, $month); |
|
| 1279 | 1279 | } elseif ($type == 'tracker') { |
| 1280 | - $msg = $Stats->getStatsSource('msg_tracker',$year,$month); |
|
| 1280 | + $msg = $Stats->getStatsSource('msg_tracker', $year, $month); |
|
| 1281 | 1281 | } |
| 1282 | 1282 | } |
| 1283 | 1283 | if (!empty($msg)) { |
@@ -1285,13 +1285,13 @@ discard block |
||
| 1285 | 1285 | foreach ($msg as $eachmsg) { |
| 1286 | 1286 | //$eachmsg = $msg[0]; |
| 1287 | 1287 | $data = $eachmsg['source_data']; |
| 1288 | - if ($data > 500) $max = (round(($data+100)/100))*100; |
|
| 1288 | + if ($data > 500) $max = (round(($data + 100)/100))*100; |
|
| 1289 | 1289 | else $max = 500; |
| 1290 | 1290 | ?> |
| 1291 | - <div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
|
| 1291 | + <div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
|
| 1292 | 1292 | <script> |
| 1293 | 1293 | var g = new JustGage({ |
| 1294 | - id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>", |
|
| 1294 | + id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>", |
|
| 1295 | 1295 | value: <?php echo $data; ?>, |
| 1296 | 1296 | min: 0, |
| 1297 | 1297 | max: <?php print $max; ?>, |
@@ -1313,19 +1313,19 @@ discard block |
||
| 1313 | 1313 | //$hist = $Stats->getStatsSource(date('Y-m-d'),'hist'); |
| 1314 | 1314 | if ($year == '' && $month == '') { |
| 1315 | 1315 | if ($type == 'aircraft') { |
| 1316 | - $hist = $Stats->getStatsSource('hist',date('Y'),date('m'),date('d')); |
|
| 1316 | + $hist = $Stats->getStatsSource('hist', date('Y'), date('m'), date('d')); |
|
| 1317 | 1317 | } elseif ($type == 'marine') { |
| 1318 | - $hist = $Stats->getStatsSource('hist_marine',date('Y'),date('m'),date('d')); |
|
| 1318 | + $hist = $Stats->getStatsSource('hist_marine', date('Y'), date('m'), date('d')); |
|
| 1319 | 1319 | } elseif ($type == 'tracker') { |
| 1320 | - $hist = $Stats->getStatsSource('hist_tracker',date('Y'),date('m'),date('d')); |
|
| 1320 | + $hist = $Stats->getStatsSource('hist_tracker', date('Y'), date('m'), date('d')); |
|
| 1321 | 1321 | } |
| 1322 | 1322 | } else { |
| 1323 | 1323 | if ($type == 'aircraft') { |
| 1324 | - $hist = $Stats->getStatsSource('hist',$year,$month); |
|
| 1324 | + $hist = $Stats->getStatsSource('hist', $year, $month); |
|
| 1325 | 1325 | } elseif ($type == 'marine') { |
| 1326 | - $hist = $Stats->getStatsSource('hist_marine',$year,$month); |
|
| 1326 | + $hist = $Stats->getStatsSource('hist_marine', $year, $month); |
|
| 1327 | 1327 | } elseif ($type == 'tracker') { |
| 1328 | - $hist = $Stats->getStatsSource('hist_tracker',$year,$month); |
|
| 1328 | + $hist = $Stats->getStatsSource('hist_tracker', $year, $month); |
|
| 1329 | 1329 | } |
| 1330 | 1330 | } |
| 1331 | 1331 | foreach ($hist as $hists) { |
@@ -1335,7 +1335,7 @@ discard block |
||
| 1335 | 1335 | $source = $hists['source_name']; |
| 1336 | 1336 | $hist_array = json_decode($hists['source_data']); |
| 1337 | 1337 | $unit = 'km'; |
| 1338 | - foreach($hist_array as $distance => $nb) |
|
| 1338 | + foreach ($hist_array as $distance => $nb) |
|
| 1339 | 1339 | { |
| 1340 | 1340 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 1341 | 1341 | $distance = round($distance*0.539957); |
@@ -1356,18 +1356,18 @@ discard block |
||
| 1356 | 1356 | $nb_data = "['flights',".substr($nb_data, 0, -1)."]"; |
| 1357 | 1357 | ?> |
| 1358 | 1358 | <div class="col-md-6"> |
| 1359 | - <h2><?php echo sprintf(_("Distance for %s"),$source); ?></h2> |
|
| 1359 | + <h2><?php echo sprintf(_("Distance for %s"), $source); ?></h2> |
|
| 1360 | 1360 | <?php |
| 1361 | - print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 1361 | + print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 1362 | 1362 | print 'c3.generate({ |
| 1363 | - bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'", |
|
| 1363 | + bindto: "#charthist-'.str_replace(' ', '_', strtolower($source)).'", |
|
| 1364 | 1364 | data: { x: "x", |
| 1365 | 1365 | columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 1366 | 1366 | axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 1367 | 1367 | print '</script>'; |
| 1368 | 1368 | ?> |
| 1369 | 1369 | </div> |
| 1370 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1370 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1371 | 1371 | <?php |
| 1372 | 1372 | } |
| 1373 | 1373 | ?> |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | $Source = new Source(); |
| 6 | 6 | |
| 7 | 7 | if (isset($_GET['sourceid'])) { |
| 8 | - $sourceid = filter_input(INPUT_GET,'sourceid',FILTER_SANITIZE_NUMBER_INT); |
|
| 8 | + $sourceid = filter_input(INPUT_GET, 'sourceid', FILTER_SANITIZE_NUMBER_INT); |
|
| 9 | 9 | $source_data = $Source->getLocationInfoById($sourceid); |
| 10 | 10 | if (isset($source_data[0])) { |
| 11 | 11 | ?> |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | print '</div>'; |
| 35 | 35 | |
| 36 | 36 | if ($spotter_item['city'] != '') print '<div><span>'._("City").'</span>'.$spotter_item['city'].'</div>'; |
| 37 | -if ($spotter_item['country'] !='') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 38 | -print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'],3).', '.round($spotter_item['longitude'],3).'</div>'; |
|
| 37 | +if ($spotter_item['country'] != '') print '<div><span>'._("Country").'</span>'.$spotter_item['country'].'</div>'; |
|
| 38 | +print '<div><span>'._("Coordinates").'</span>'.round($spotter_item['latitude'], 3).', '.round($spotter_item['longitude'], 3).'</div>'; |
|
| 39 | 39 | /* |
| 40 | 40 | if ($spotter_item['atc_range'] > 0) { |
| 41 | 41 | print '<div><span>'._("Range").'</span>'; |
@@ -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($type)) $type = 'aircraft'; |
| 11 | 11 | |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | } |
| 107 | 107 | print '<th class="more"></th>'; |
| 108 | 108 | print '</thead>'; |
| 109 | -} else if (strtolower($current_page) == "upcoming"){ |
|
| 109 | +} else if (strtolower($current_page) == "upcoming") { |
|
| 110 | 110 | print '<thead>'; |
| 111 | 111 | if (!isset($globalNoAirlines) || $globalNoAirlines === FALSE) { |
| 112 | 112 | if ($_GET['sort'] == "airline_name_asc") |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | } |
| 161 | 161 | */ |
| 162 | 162 | print '</thead>'; |
| 163 | -} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive"){ |
|
| 163 | +} else if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") { |
|
| 164 | 164 | print '<thead>'; |
| 165 | 165 | print '<th class="aircraft_thumbnail"></th>'; |
| 166 | 166 | print '<th class="logo">'._("Airline").'</th>'; |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | print '</thead>'; |
| 198 | 198 | } else { |
| 199 | 199 | |
| 200 | - if ($hide_th_links === true){ |
|
| 200 | + if ($hide_th_links === true) { |
|
| 201 | 201 | print '<thead>'; |
| 202 | 202 | print '<th class="aircraft_thumbnail"></th>'; |
| 203 | 203 | if ($type == 'aircraft') { |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | } |
| 455 | 455 | |
| 456 | 456 | print '<tbody>'."\n"; |
| 457 | -foreach($spotter_array as $spotter_item) |
|
| 457 | +foreach ($spotter_array as $spotter_item) |
|
| 458 | 458 | { |
| 459 | 459 | if (isset($globalTimezone)) |
| 460 | 460 | { |
@@ -489,13 +489,13 @@ discard block |
||
| 489 | 489 | $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id; |
| 490 | 490 | } |
| 491 | 491 | if (isset($spotter_item['airline_name'])) { |
| 492 | - 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>'; |
|
| 492 | + 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>'; |
|
| 493 | 493 | } else { |
| 494 | - 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>'; |
|
| 494 | + 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>'; |
|
| 495 | 495 | } |
| 496 | 496 | } else { |
| 497 | 497 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
| 498 | - $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 498 | + $image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 499 | 499 | } else $image_thumbnail = $spotter_item['image_thumbnail']; |
| 500 | 500 | if (isset($spotter_item['airline_name'])) { |
| 501 | 501 | 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>'; |
@@ -514,7 +514,7 @@ discard block |
||
| 514 | 514 | { |
| 515 | 515 | print '<td class="aircraft_thumbnail">'."\n"; |
| 516 | 516 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
| 517 | - $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 517 | + $image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 518 | 518 | } else $image_thumbnail = $spotter_item['image_thumbnail']; |
| 519 | 519 | if (isset($spotter_item['airline_name'])) { |
| 520 | 520 | print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['mmsi'].'" alt="'.$spotter_item['mmsi'].'" data-content="'._("MMSI:").' '.$spotter_item['mmsi'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
@@ -532,7 +532,7 @@ discard block |
||
| 532 | 532 | { |
| 533 | 533 | print '<td class="aircraft_thumbnail">'."\n"; |
| 534 | 534 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
| 535 | - $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 535 | + $image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 536 | 536 | } else $image_thumbnail = $spotter_item['image_thumbnail']; |
| 537 | 537 | print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['type'].'" data-content="'._("Type:").' '.$spotter_item['type'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
| 538 | 538 | print '</td>'."\n"; |
@@ -576,7 +576,7 @@ discard block |
||
| 576 | 576 | print '</td>'."\n"; |
| 577 | 577 | } |
| 578 | 578 | } |
| 579 | - } 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"){ |
|
| 579 | + } 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") { |
|
| 580 | 580 | if ($type == 'aircraft') { |
| 581 | 581 | if (!isset($spotter_item['squawk']) || $spotter_item['squawk'] == 0) { |
| 582 | 582 | $spotter_item['squawk'] = '-'; |
@@ -593,17 +593,17 @@ discard block |
||
| 593 | 593 | $image_src = 'https://www.planespotters.net/Aviation_Photos/photo.show?id='.$planespotter_id; |
| 594 | 594 | } |
| 595 | 595 | if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) { |
| 596 | - 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>'; |
|
| 596 | + 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>'; |
|
| 597 | 597 | } elseif (!isset($spotter_item['aircraft_name']) && isset($spotter_item['airline_name'])) { |
| 598 | - 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>'; |
|
| 598 | + 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>'; |
|
| 599 | 599 | } elseif (!isset($spotter_item['aircraft_name']) && !isset($spotter_item['airline_name'])) { |
| 600 | - 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>'; |
|
| 600 | + 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>'; |
|
| 601 | 601 | } else { |
| 602 | - 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>'; |
|
| 602 | + 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>'; |
|
| 603 | 603 | } |
| 604 | 604 | } else { |
| 605 | 605 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
| 606 | - $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 606 | + $image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 607 | 607 | } else $image_thumbnail = $spotter_item['image_thumbnail']; |
| 608 | 608 | if (!isset($spotter_item['airline_name']) && isset($spotter_item['aircraft_name'])) { |
| 609 | 609 | 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>'; |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | { |
| 637 | 637 | print '<td class="aircraft_thumbnail">'."\n"; |
| 638 | 638 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
| 639 | - $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 639 | + $image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 640 | 640 | } else $image_thumbnail = $spotter_item['image_thumbnail']; |
| 641 | 641 | print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['mmsi'].'" alt="'.$spotter_item['mmsi'].'" data-content="'._("MMSI:").' '.$spotter_item['mmsi'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
| 642 | 642 | print '</td>'."\n"; |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | { |
| 651 | 651 | print '<td class="aircraft_thumbnail">'."\n"; |
| 652 | 652 | if ($spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart' || $spotter_item['image_source'] == 'flickr') { |
| 653 | - $image_thumbnail = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 653 | + $image_thumbnail = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 654 | 654 | } else $image_thumbnail = $spotter_item['image_thumbnail']; |
| 655 | 655 | print '<img src="'.$image_thumbnail.'" class="img-rounded" data-toggle="popover" title="'.$spotter_item['ident'].'" alt="'.$spotter_item['type'].'" data-content="'._("Type:").' '.$spotter_item['type'].'" data-html="true" width="100px" />'."\n".'<div class="thumbnail-copyright">© '.$spotter_item['image_copyright'].'</div>'; |
| 656 | 656 | print '</td>'."\n"; |
@@ -759,7 +759,7 @@ discard block |
||
| 759 | 759 | print '</td>'."\n"; |
| 760 | 760 | } |
| 761 | 761 | // Aircraft type |
| 762 | - if(strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive"){ |
|
| 762 | + if (strtolower($current_page) != "upcoming" && strtolower($current_page) != "acars-latest" && strtolower($current_page) != "acars-archive") { |
|
| 763 | 763 | print '<td class="type">'."\n"; |
| 764 | 764 | if ($type == 'aircraft') { |
| 765 | 765 | if (!isset($spotter_item['aircraft_type']) && isset($spotter_item['aircraft_name'])) { |
@@ -810,22 +810,22 @@ discard block |
||
| 810 | 810 | } |
| 811 | 811 | if (isset($spotter_item['departure_airport_time']) && isset($spotter_item['real_departure_airport_time'])) { |
| 812 | 812 | if ($spotter_item['departure_airport_time'] > 2460) { |
| 813 | - $departure_airport_time = date('H:m',$spotter_item['departure_airport_time']); |
|
| 814 | - } else $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2); |
|
| 813 | + $departure_airport_time = date('H:m', $spotter_item['departure_airport_time']); |
|
| 814 | + } else $departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2); |
|
| 815 | 815 | if ($spotter_item['real_departure_airport_time'] > 2460) { |
| 816 | - $real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']); |
|
| 816 | + $real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']); |
|
| 817 | 817 | } else $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
| 818 | 818 | print '<br /><span class="airport_time">'.$departure_airport_time.' ('.$real_departure_airport_time.')</span>'."\n"; |
| 819 | 819 | } elseif (isset($spotter_item['real_departure_airport_time']) && $spotter_item['real_departure_airport_time'] != 'NULL') { |
| 820 | 820 | if ($spotter_item['real_departure_airport_time'] > 2460) { |
| 821 | - $real_departure_airport_time = date('H:m',$spotter_item['real_departure_airport_time']); |
|
| 821 | + $real_departure_airport_time = date('H:m', $spotter_item['real_departure_airport_time']); |
|
| 822 | 822 | } else $real_departure_airport_time = $spotter_item['real_departure_airport_time']; |
| 823 | 823 | print '<br /><span class="airport_time">'.$real_departure_airport_time.'</span>'."\n"; |
| 824 | 824 | } elseif (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') { |
| 825 | 825 | if ($spotter_item['departure_airport_time'] > 2460) { |
| 826 | - $departure_airport_time = date('H:m',$spotter_item['departure_airport_time']); |
|
| 826 | + $departure_airport_time = date('H:m', $spotter_item['departure_airport_time']); |
|
| 827 | 827 | } else { |
| 828 | - $departure_airport_time = substr($spotter_item['departure_airport_time'],0,-2).':'.substr($spotter_item['departure_airport_time'],-2); |
|
| 828 | + $departure_airport_time = substr($spotter_item['departure_airport_time'], 0, -2).':'.substr($spotter_item['departure_airport_time'], -2); |
|
| 829 | 829 | } |
| 830 | 830 | print '<br /><span class="airport_time">'.$departure_airport_time.'</span>'."\n"; |
| 831 | 831 | } |
@@ -840,7 +840,7 @@ discard block |
||
| 840 | 840 | $latitude = $spotter_item['latitude']; |
| 841 | 841 | $longitude = $spotter_item['longitude']; |
| 842 | 842 | } |
| 843 | - $distance = $Spotter->getAirportDistance($spotter_item['departure_airport'],$latitude,$longitude); |
|
| 843 | + $distance = $Spotter->getAirportDistance($spotter_item['departure_airport'], $latitude, $longitude); |
|
| 844 | 844 | } else $distance = ''; |
| 845 | 845 | if ($distance != '') { |
| 846 | 846 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
@@ -883,20 +883,20 @@ discard block |
||
| 883 | 883 | } |
| 884 | 884 | if (isset($spotter_item['arrival_airport_time']) && isset($spotter_item['real_arrival_airport_time'])) { |
| 885 | 885 | if ($spotter_item['arrival_airport_time'] > 2460) { |
| 886 | - $arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']); |
|
| 886 | + $arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']); |
|
| 887 | 887 | } else $arrival_airport_time = $spotter_item['arrival_airport_time']; |
| 888 | 888 | if ($spotter_item['real_arrival_airport_time'] > 2460) { |
| 889 | - $real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']); |
|
| 889 | + $real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']); |
|
| 890 | 890 | } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
| 891 | 891 | print '<br /><span class="airport_time">'.$spotter_item['arrival_airport_time'].' ('.$spotter_item['real_arrival_airport_time'].')</span>'."\n"; |
| 892 | 892 | } elseif (isset($spotter_item['real_arrival_airport_time'])) { |
| 893 | 893 | if ($spotter_item['real_arrival_airport_time'] > 2460) { |
| 894 | - $real_arrival_airport_time = date('H:m',$spotter_item['real_arrival_airport_time']); |
|
| 894 | + $real_arrival_airport_time = date('H:m', $spotter_item['real_arrival_airport_time']); |
|
| 895 | 895 | } else $real_arrival_airport_time = $spotter_item['real_arrival_airport_time']; |
| 896 | 896 | print '<br /><span class="airport_time">'.$real_arrival_airport_time.'</span>'."\n"; |
| 897 | 897 | } elseif (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') { |
| 898 | 898 | if ($spotter_item['arrival_airport_time'] > 2460) { |
| 899 | - $arrival_airport_time = date('H:m',$spotter_item['arrival_airport_time']); |
|
| 899 | + $arrival_airport_time = date('H:m', $spotter_item['arrival_airport_time']); |
|
| 900 | 900 | } else $arrival_airport_time = $spotter_item['arrival_airport_time']; |
| 901 | 901 | print '<br /><span class="airport_time">'.$arrival_airport_time.'</span>'."\n"; |
| 902 | 902 | } |
@@ -909,7 +909,7 @@ discard block |
||
| 909 | 909 | $latitude = $spotter_item['latitude']; |
| 910 | 910 | $longitude = $spotter_item['longitude']; |
| 911 | 911 | } |
| 912 | - $distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'],$latitude,$longitude); |
|
| 912 | + $distance = $Spotter->getAirportDistance($spotter_item['arrival_airport'], $latitude, $longitude); |
|
| 913 | 913 | } else $distance = ''; |
| 914 | 914 | if ($distance != '') { |
| 915 | 915 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
@@ -952,19 +952,19 @@ discard block |
||
| 952 | 952 | print '<span class="mobile">-</span>'."\n"; |
| 953 | 953 | } else { |
| 954 | 954 | if ((!isset($_COOKIE['unitdistance']) && ((isset($globalUnitDistance) && $globalUnitDistance == 'km') || !isset($globalUnitDistance))) || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'km')) { |
| 955 | - print '<span class="nomobile">'.round($spotter_item['distance'],2).' km</span>'."\n"; |
|
| 956 | - print '<span class="mobile">'.round($spotter_item['distance'],2).' km</span><br />'."\n"; |
|
| 955 | + print '<span class="nomobile">'.round($spotter_item['distance'], 2).' km</span>'."\n"; |
|
| 956 | + print '<span class="mobile">'.round($spotter_item['distance'], 2).' km</span><br />'."\n"; |
|
| 957 | 957 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'mi') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'mi')) { |
| 958 | - print '<span class="nomobile">'.round($spotter_item['distance']*0.621371,2).' mi</span>'."\n"; |
|
| 959 | - print '<span class="mobile">'.round($spotter_item['distance']*0.621371,2).' mi</span><br />'."\n"; |
|
| 958 | + print '<span class="nomobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span>'."\n"; |
|
| 959 | + print '<span class="mobile">'.round($spotter_item['distance']*0.621371, 2).' mi</span><br />'."\n"; |
|
| 960 | 960 | } elseif ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 961 | - print '<span class="nomobile">'.round($spotter_item['distance']*0.539957,2).' nm</span>'."\n"; |
|
| 962 | - print '<span class="mobile">'.round($spotter_item['distance']*0.539957,2).' nm</span><br />'."\n"; |
|
| 961 | + print '<span class="nomobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span>'."\n"; |
|
| 962 | + print '<span class="mobile">'.round($spotter_item['distance']*0.539957, 2).' nm</span><br />'."\n"; |
|
| 963 | 963 | } |
| 964 | 964 | } |
| 965 | 965 | print '</td>'."\n"; |
| 966 | 966 | } |
| 967 | - if(strtolower($current_page) != "upcoming"){ |
|
| 967 | + if (strtolower($current_page) != "upcoming") { |
|
| 968 | 968 | if ($type == 'aircraft') { |
| 969 | 969 | //if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
| 970 | 970 | if ((isset($globalUsePilot) && $globalUsePilot) || !isset($globalUsePilot) && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM))) { |
@@ -1007,7 +1007,7 @@ discard block |
||
| 1007 | 1007 | |
| 1008 | 1008 | if ($showRouteStop) { |
| 1009 | 1009 | // Route stop |
| 1010 | - if(strtolower($current_page) != "upcoming"){ |
|
| 1010 | + if (strtolower($current_page) != "upcoming") { |
|
| 1011 | 1011 | print '<td class="route_stop">'."\n"; |
| 1012 | 1012 | if (!isset($spotter_item['route_stop']) || $spotter_item['route_stop'] == '' || $spotter_item['route_stop'] == 'NULL') { |
| 1013 | 1013 | print '<span class="nomobile">-</span>'."\n"; |
@@ -1026,11 +1026,11 @@ discard block |
||
| 1026 | 1026 | } |
| 1027 | 1027 | if ($showDuration) { |
| 1028 | 1028 | // Duration |
| 1029 | - if(strtolower($current_page) != "upcoming"){ |
|
| 1029 | + if (strtolower($current_page) != "upcoming") { |
|
| 1030 | 1030 | print '<td class="duration">'."\n"; |
| 1031 | 1031 | if (isset($spotter_item['duration'])) { |
| 1032 | - print '<span class="nomobile">'.gmdate('H:i:s',$spotter_item['duration']).'</span>'."\n"; |
|
| 1033 | - print '<span class="mobile">'.gmdate('H:i:s',$spotter_item['duration']).'</span>'."\n"; |
|
| 1032 | + print '<span class="nomobile">'.gmdate('H:i:s', $spotter_item['duration']).'</span>'."\n"; |
|
| 1033 | + print '<span class="mobile">'.gmdate('H:i:s', $spotter_item['duration']).'</span>'."\n"; |
|
| 1034 | 1034 | } else { |
| 1035 | 1035 | print '<span class="nomobile">-</span>'."\n"; |
| 1036 | 1036 | print '<span class="mobile">-</span>'."\n"; |
@@ -1043,7 +1043,7 @@ discard block |
||
| 1043 | 1043 | if (strtolower($current_page) == "acars-latest" || strtolower($current_page) == "acars-archive") { |
| 1044 | 1044 | if (isset($spotter_item['decode']) && $spotter_item['decode'] != '') { |
| 1045 | 1045 | print '<td class="message"><p>'."\n"; |
| 1046 | - print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']); |
|
| 1046 | + print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']); |
|
| 1047 | 1047 | print '</p><p class="decode">'; |
| 1048 | 1048 | $decode_array = json_decode($spotter_item['decode']); |
| 1049 | 1049 | foreach ($decode_array as $key => $value) { |
@@ -1053,7 +1053,7 @@ discard block |
||
| 1053 | 1053 | print '</td>'."\n"; |
| 1054 | 1054 | } else { |
| 1055 | 1055 | print '<td class="message">'."\n"; |
| 1056 | - print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']); |
|
| 1056 | + print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']); |
|
| 1057 | 1057 | print '</td>'."\n"; |
| 1058 | 1058 | } |
| 1059 | 1059 | } |
@@ -1078,7 +1078,7 @@ discard block |
||
| 1078 | 1078 | } |
| 1079 | 1079 | print '</td>'."\n"; |
| 1080 | 1080 | print '<td class="message">'."\n"; |
| 1081 | - print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']); |
|
| 1081 | + print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']); |
|
| 1082 | 1082 | print '</td>'."\n"; |
| 1083 | 1083 | } |
| 1084 | 1084 | if (strtolower($current_page) == "incident-latest" || strtolower($current_page) == "incident-detailed") { |
@@ -1104,7 +1104,7 @@ discard block |
||
| 1104 | 1104 | print '</td>'."\n"; |
| 1105 | 1105 | */ |
| 1106 | 1106 | print '<td class="message">'."\n"; |
| 1107 | - print str_replace(array("\r\n", "\n", "\r"),'<br />',$spotter_item['message']); |
|
| 1107 | + print str_replace(array("\r\n", "\n", "\r"), '<br />', $spotter_item['message']); |
|
| 1108 | 1108 | print '</td>'."\n"; |
| 1109 | 1109 | } |
| 1110 | 1110 | |
@@ -90,8 +90,7 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | |
| 92 | 92 | private function urshift($n, $s) { |
| 93 | - return ($n >= 0) ? ($n >> $s) : |
|
| 94 | - (($n & 0x7fffffff) >> $s) | |
|
| 93 | + return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| |
|
| 95 | 94 | (0x40000000 >> ($s - 1)); |
| 96 | 95 | } |
| 97 | 96 | |
@@ -103,7 +102,7 @@ discard block |
||
| 103 | 102 | //$split_input = str_split($input); |
| 104 | 103 | |
| 105 | 104 | /* Find the end of header checking for NULL bytes while doing it. */ |
| 106 | - $splitpos = strpos($input,':'); |
|
| 105 | + $splitpos = strpos($input, ':'); |
|
| 107 | 106 | |
| 108 | 107 | /* Check that end was found and body has at least one byte. */ |
| 109 | 108 | if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) { |
@@ -113,15 +112,15 @@ discard block |
||
| 113 | 112 | |
| 114 | 113 | if ($debug) echo 'input : '.$input."\n"; |
| 115 | 114 | /* Save header and body. */ |
| 116 | - $body = substr($input,$splitpos+1,$input_len); |
|
| 115 | + $body = substr($input, $splitpos + 1, $input_len); |
|
| 117 | 116 | $body_len = strlen($body); |
| 118 | - $header = substr($input,0,$splitpos); |
|
| 117 | + $header = substr($input, 0, $splitpos); |
|
| 119 | 118 | //$header_len = strlen($header); |
| 120 | 119 | if ($debug) echo 'header : '.$header."\n"; |
| 121 | 120 | |
| 122 | 121 | /* Parse source, target and path. */ |
| 123 | 122 | //FLRDF0A52>APRS,qAS,LSTB |
| 124 | - if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) { |
|
| 123 | + if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/', $header, $matches)) { |
|
| 125 | 124 | $ident = $matches[1]; |
| 126 | 125 | $all_elements = $matches[2]; |
| 127 | 126 | if ($ident == 'AIRCRAFT') { |
@@ -138,14 +137,14 @@ discard block |
||
| 138 | 137 | if ($debug) 'No ident'."\n"; |
| 139 | 138 | return false; |
| 140 | 139 | } |
| 141 | - $elements = explode(',',$all_elements); |
|
| 140 | + $elements = explode(',', $all_elements); |
|
| 142 | 141 | $source = end($elements); |
| 143 | 142 | $result['source'] = $source; |
| 144 | 143 | foreach ($elements as $element) { |
| 145 | - if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) { |
|
| 144 | + if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/', $element)) { |
|
| 146 | 145 | //echo "ok"; |
| 147 | 146 | //if ($element == 'TCPIP*') return false; |
| 148 | - } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
|
| 147 | + } elseif (!preg_match('/^([0-9A-F]{32})$/', $element)) { |
|
| 149 | 148 | if ($debug) echo 'element : '.$element."\n"; |
| 150 | 149 | return false; |
| 151 | 150 | } |
@@ -158,14 +157,14 @@ discard block |
||
| 158 | 157 | */ |
| 159 | 158 | } |
| 160 | 159 | |
| 161 | - $type = substr($body,0,1); |
|
| 160 | + $type = substr($body, 0, 1); |
|
| 162 | 161 | if ($debug) echo 'type : '.$type."\n"; |
| 163 | 162 | if ($type == ';') { |
| 164 | 163 | if (isset($result['source_type']) && $result['source_type'] == 'modes') { |
| 165 | - $result['address'] = trim(substr($body,1,9)); |
|
| 164 | + $result['address'] = trim(substr($body, 1, 9)); |
|
| 166 | 165 | } elseif (isset($result['source_type']) && $result['source_type'] == 'ais') { |
| 167 | - $result['mmsi'] = trim(substr($body,1,9)); |
|
| 168 | - } else $result['ident'] = trim(substr($body,1,9)); |
|
| 166 | + $result['mmsi'] = trim(substr($body, 1, 9)); |
|
| 167 | + } else $result['ident'] = trim(substr($body, 1, 9)); |
|
| 169 | 168 | } elseif ($type == ',') { |
| 170 | 169 | // Invalid data or test data |
| 171 | 170 | return false; |
@@ -173,24 +172,24 @@ discard block |
||
| 173 | 172 | |
| 174 | 173 | // Check for Timestamp |
| 175 | 174 | $find = false; |
| 176 | - $body_parse = substr($body,1); |
|
| 175 | + $body_parse = substr($body, 1); |
|
| 177 | 176 | //echo 'Body : '.$body."\n"; |
| 178 | - if (preg_match('/^;(.){9}\*/',$body,$matches)) { |
|
| 179 | - $body_parse = substr($body_parse,10); |
|
| 177 | + if (preg_match('/^;(.){9}\*/', $body, $matches)) { |
|
| 178 | + $body_parse = substr($body_parse, 10); |
|
| 180 | 179 | $find = true; |
| 181 | 180 | //echo $body_parse."\n"; |
| 182 | 181 | } |
| 183 | - if (preg_match('/^`(.*)\//',$body,$matches)) { |
|
| 184 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 182 | + if (preg_match('/^`(.*)\//', $body, $matches)) { |
|
| 183 | + $body_parse = substr($body_parse, strlen($matches[1]) - 1); |
|
| 185 | 184 | $find = true; |
| 186 | 185 | //echo $body_parse."\n"; |
| 187 | 186 | } |
| 188 | - if (preg_match("/^'(.*)\//",$body,$matches)) { |
|
| 189 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 187 | + if (preg_match("/^'(.*)\//", $body, $matches)) { |
|
| 188 | + $body_parse = substr($body_parse, strlen($matches[1]) - 1); |
|
| 190 | 189 | $find = true; |
| 191 | 190 | //echo $body_parse."\n"; |
| 192 | 191 | } |
| 193 | - if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) { |
|
| 192 | + if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) { |
|
| 194 | 193 | $find = true; |
| 195 | 194 | //print_r($matches); |
| 196 | 195 | $timestamp = $matches[0]; |
@@ -205,19 +204,19 @@ discard block |
||
| 205 | 204 | // This work or not ? |
| 206 | 205 | $timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]); |
| 207 | 206 | } |
| 208 | - $body_parse = substr($body_parse,7); |
|
| 207 | + $body_parse = substr($body_parse, 7); |
|
| 209 | 208 | $result['timestamp'] = $timestamp; |
| 210 | 209 | //echo date('Ymd H:i:s',$timestamp); |
| 211 | 210 | } |
| 212 | - if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) { |
|
| 211 | + if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $body_parse, $matches)) { |
|
| 213 | 212 | $find = true; |
| 214 | 213 | $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]); |
| 215 | - $body_parse = substr($body_parse,8); |
|
| 214 | + $body_parse = substr($body_parse, 8); |
|
| 216 | 215 | $result['timestamp'] = $timestamp; |
| 217 | 216 | //echo date('Ymd H:i:s',$timestamp); |
| 218 | 217 | } |
| 219 | 218 | //if (strlen($body_parse) > 19) { |
| 220 | - if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) { |
|
| 219 | + if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/', $body_parse, $matches)) { |
|
| 221 | 220 | $find = true; |
| 222 | 221 | // 4658.70N/00707.78Ez |
| 223 | 222 | //print_r(str_split($body_parse)); |
@@ -243,11 +242,11 @@ discard block |
||
| 243 | 242 | */ |
| 244 | 243 | $latitude = $lat + floatval($lat_min)/60; |
| 245 | 244 | $longitude = $lon + floatval($lon_min)/60; |
| 246 | - if ($sind == 'S') $latitude = 0-$latitude; |
|
| 247 | - if ($wind == 'W') $longitude = 0-$longitude; |
|
| 245 | + if ($sind == 'S') $latitude = 0 - $latitude; |
|
| 246 | + if ($wind == 'W') $longitude = 0 - $longitude; |
|
| 248 | 247 | $result['latitude'] = $latitude; |
| 249 | 248 | $result['longitude'] = $longitude; |
| 250 | - $body_parse = substr($body_parse,18); |
|
| 249 | + $body_parse = substr($body_parse, 18); |
|
| 251 | 250 | $body_parse_len = strlen($body_parse); |
| 252 | 251 | } |
| 253 | 252 | $body_parse_len = strlen($body_parse); |
@@ -275,7 +274,7 @@ discard block |
||
| 275 | 274 | //echo $body_parse; |
| 276 | 275 | //if ($type != ';' && $type != '>') { |
| 277 | 276 | if ($type != '') { |
| 278 | - $body_parse = substr($body_parse,1); |
|
| 277 | + $body_parse = substr($body_parse, 1); |
|
| 279 | 278 | $body_parse_len = strlen($body_parse); |
| 280 | 279 | $result['symbol_code'] = $symbol_code; |
| 281 | 280 | if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code]; |
@@ -286,16 +285,16 @@ discard block |
||
| 286 | 285 | //$body_parse_len = strlen($body_parse); |
| 287 | 286 | if ($body_parse_len >= 7) { |
| 288 | 287 | |
| 289 | - if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
|
| 290 | - $course = substr($body_parse,0,3); |
|
| 288 | + if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/', $body_parse)) { |
|
| 289 | + $course = substr($body_parse, 0, 3); |
|
| 291 | 290 | $tmp_s = intval($course); |
| 292 | 291 | if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
| 293 | - $speed = substr($body_parse,4,3); |
|
| 292 | + $speed = substr($body_parse, 4, 3); |
|
| 294 | 293 | if ($speed != '...') { |
| 295 | 294 | //$result['speed'] = round($speed*1.852); |
| 296 | 295 | $result['speed'] = intval($speed); |
| 297 | 296 | } |
| 298 | - $body_parse = substr($body_parse,7); |
|
| 297 | + $body_parse = substr($body_parse, 7); |
|
| 299 | 298 | } |
| 300 | 299 | // Check PHGR, PHG, RNG |
| 301 | 300 | } |
@@ -305,12 +304,12 @@ discard block |
||
| 305 | 304 | } |
| 306 | 305 | */ |
| 307 | 306 | if (strlen($body_parse) > 0) { |
| 308 | - if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) { |
|
| 307 | + if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/', $body_parse, $matches)) { |
|
| 309 | 308 | $altitude = intval($matches[1]); |
| 310 | 309 | //$result['altitude'] = round($altitude*0.3048); |
| 311 | 310 | $result['altitude'] = $altitude; |
| 312 | 311 | //$body_parse = trim(substr($body_parse,strlen($matches[0]))); |
| 313 | - $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse)); |
|
| 312 | + $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/', '', $body_parse)); |
|
| 314 | 313 | } |
| 315 | 314 | } |
| 316 | 315 | |
@@ -322,13 +321,13 @@ discard block |
||
| 322 | 321 | */ |
| 323 | 322 | // DAO |
| 324 | 323 | |
| 325 | - if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) { |
|
| 324 | + if (preg_match('/^!([0-9A-Z]{3})/', $body_parse, $matches)) { |
|
| 326 | 325 | |
| 327 | 326 | $dao = $matches[1]; |
| 328 | - if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) { |
|
| 327 | + if (preg_match('/^([A-Z])([0-9]{2})/', $dao)) { |
|
| 329 | 328 | $dao_split = str_split($dao); |
| 330 | - $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
|
| 331 | - $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
|
| 329 | + $lat_off = (($dao_split[1]) - 48.0)*0.001/60.0; |
|
| 330 | + $lon_off = (($dao_split[2]) - 48.0)*0.001/60.0; |
|
| 332 | 331 | |
| 333 | 332 | if ($result['latitude'] < 0) $result['latitude'] -= $lat_off; |
| 334 | 333 | else $result['latitude'] += $lat_off; |
@@ -336,50 +335,50 @@ discard block |
||
| 336 | 335 | else $result['longitude'] += $lon_off; |
| 337 | 336 | } |
| 338 | 337 | |
| 339 | - $body_parse = substr($body_parse,6); |
|
| 338 | + $body_parse = substr($body_parse, 6); |
|
| 340 | 339 | } |
| 341 | 340 | |
| 342 | - if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) { |
|
| 343 | - $result['ident'] = str_replace('_',' ',$matches[1]); |
|
| 341 | + if (preg_match('/CS=([0-9A-Z_]*)/', $body_parse, $matches)) { |
|
| 342 | + $result['ident'] = str_replace('_', ' ', $matches[1]); |
|
| 344 | 343 | } |
| 345 | - if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) { |
|
| 344 | + if (preg_match('/SQ=([0-9]{4})/', $body_parse, $matches)) { |
|
| 346 | 345 | $result['squawk'] = $matches[1]; |
| 347 | 346 | } |
| 348 | - if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) { |
|
| 347 | + if (preg_match('/AI=([0-9A-Z]{4})/', $body_parse, $matches)) { |
|
| 349 | 348 | $result['aircraft_icao'] = $matches[1]; |
| 350 | 349 | } |
| 351 | - if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) { |
|
| 350 | + if (preg_match('/VR=([0-9]*)/', $body_parse, $matches)) { |
|
| 352 | 351 | $result['verticalrate'] = $matches[1]; |
| 353 | 352 | } |
| 354 | - if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) { |
|
| 353 | + if (preg_match('/TI=([0-9]*)/', $body_parse, $matches)) { |
|
| 355 | 354 | $result['typeid'] = $matches[1]; |
| 356 | 355 | } |
| 357 | - if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) { |
|
| 356 | + if (preg_match('/SI=([0-9]*)/', $body_parse, $matches)) { |
|
| 358 | 357 | $result['statusid'] = $matches[1]; |
| 359 | 358 | } |
| 360 | - if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) { |
|
| 359 | + if (preg_match('/IMO=([0-9]{7})/', $body_parse, $matches)) { |
|
| 361 | 360 | $result['imo'] = $matches[1]; |
| 362 | 361 | } |
| 363 | - if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) { |
|
| 362 | + if (preg_match('/AD=([0-9]*)/', $body_parse, $matches)) { |
|
| 364 | 363 | $result['arrival_date'] = $matches[1]; |
| 365 | 364 | } |
| 366 | - if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) { |
|
| 367 | - $result['arrival_code'] = str_replace('_',' ',$matches[1]); |
|
| 365 | + if (preg_match('/AC=([0-9A-Z_]*)/', $body_parse, $matches)) { |
|
| 366 | + $result['arrival_code'] = str_replace('_', ' ', $matches[1]); |
|
| 368 | 367 | } |
| 369 | 368 | // OGN comment |
| 370 | 369 | // echo "Before OGN : ".$body_parse."\n"; |
| 371 | 370 | //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) { |
| 372 | - if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) { |
|
| 371 | + if (preg_match('/^id([0-9A-F]{8})/', $body_parse, $matches)) { |
|
| 373 | 372 | $id = $matches[1]; |
| 374 | 373 | //$mode = substr($id,0,2); |
| 375 | - $address = substr($id,2); |
|
| 374 | + $address = substr($id, 2); |
|
| 376 | 375 | //print_r($matches); |
| 377 | - $addressType = (intval(substr($id,0,2),16))&3; |
|
| 376 | + $addressType = (intval(substr($id, 0, 2), 16))&3; |
|
| 378 | 377 | if ($addressType == 0) $result['addresstype'] = "RANDOM"; |
| 379 | 378 | elseif ($addressType == 1) $result['addresstype'] = "ICAO"; |
| 380 | 379 | elseif ($addressType == 2) $result['addresstype'] = "FLARM"; |
| 381 | 380 | elseif ($addressType == 3) $result['addresstype'] = "OGN"; |
| 382 | - $aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2); |
|
| 381 | + $aircraftType = $this->urshift(((intval(substr($id, 0, 2), 16))&0b1111100), 2); |
|
| 383 | 382 | $result['aircrafttype_code'] = $aircraftType; |
| 384 | 383 | if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN"; |
| 385 | 384 | elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER"; |
@@ -396,7 +395,7 @@ discard block |
||
| 396 | 395 | elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP"; |
| 397 | 396 | elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV"; |
| 398 | 397 | elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT"; |
| 399 | - $stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0; |
|
| 398 | + $stealth = (intval(substr($id, 0, 2), 16)&0b10000000) != 0; |
|
| 400 | 399 | $result['stealth'] = $stealth; |
| 401 | 400 | $result['address'] = $address; |
| 402 | 401 | } |
@@ -408,73 +407,73 @@ discard block |
||
| 408 | 407 | //$body_parse = substr($body_parse,1); |
| 409 | 408 | //$body_parse_len = strlen($body_parse); |
| 410 | 409 | |
| 411 | - if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 410 | + if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 412 | 411 | $result['wind_dir'] = intval($matches[1]); |
| 413 | - $result['wind_speed'] = round(intval($matches[2])*1.60934,1); |
|
| 414 | - $result['wind_gust'] = round(intval($matches[3])*1.60934,1); |
|
| 415 | - $result['temp'] = round(5/9*((intval($matches[4]))-32),1); |
|
| 416 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 417 | - } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 412 | + $result['wind_speed'] = round(intval($matches[2])*1.60934, 1); |
|
| 413 | + $result['wind_gust'] = round(intval($matches[3])*1.60934, 1); |
|
| 414 | + $result['temp'] = round(5/9*((intval($matches[4])) - 32), 1); |
|
| 415 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 416 | + } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 418 | 417 | $result['wind_dir'] = intval($matches[1]); |
| 419 | - $result['wind_speed'] = round($matches[2]*1.60934,1); |
|
| 420 | - $result['wind_gust'] = round($matches[3]*1.60934,1); |
|
| 421 | - $result['temp'] = round(5/9*(($matches[4])-32),1); |
|
| 422 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 423 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 418 | + $result['wind_speed'] = round($matches[2]*1.60934, 1); |
|
| 419 | + $result['wind_gust'] = round($matches[3]*1.60934, 1); |
|
| 420 | + $result['temp'] = round(5/9*(($matches[4]) - 32), 1); |
|
| 421 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 422 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 424 | 423 | $result['wind_dir'] = intval($matches[1]); |
| 425 | - $result['wind_speed'] = round($matches[2]*1.60934,1); |
|
| 426 | - $result['wind_gust'] = round($matches[3]*1.60934,1); |
|
| 427 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 428 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 424 | + $result['wind_speed'] = round($matches[2]*1.60934, 1); |
|
| 425 | + $result['wind_gust'] = round($matches[3]*1.60934, 1); |
|
| 426 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 427 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 429 | 428 | $result['wind_dir'] = intval($matches[1]); |
| 430 | - $result['wind_speed'] = round($matches[2]*1.60934,1); |
|
| 431 | - $result['wind_gust'] = round($matches[3]*1.60934,1); |
|
| 432 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 429 | + $result['wind_speed'] = round($matches[2]*1.60934, 1); |
|
| 430 | + $result['wind_gust'] = round($matches[3]*1.60934, 1); |
|
| 431 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 433 | 432 | } |
| 434 | - if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) { |
|
| 435 | - $result['temp'] = round(5/9*(($matches[1])-32),1); |
|
| 433 | + if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/', $body_parse, $matches)) { |
|
| 434 | + $result['temp'] = round(5/9*(($matches[1]) - 32), 1); |
|
| 436 | 435 | } |
| 437 | 436 | } |
| 438 | 437 | } else $result['comment'] = trim($body_parse); |
| 439 | 438 | |
| 440 | 439 | } |
| 441 | 440 | //} |
| 442 | - if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4); |
|
| 443 | - if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4); |
|
| 441 | + if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'], 4); |
|
| 442 | + if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'], 4); |
|
| 444 | 443 | if ($debug) print_r($result); |
| 445 | 444 | return $result; |
| 446 | 445 | } |
| 447 | 446 | |
| 448 | 447 | public function connect() { |
| 449 | - global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport; |
|
| 448 | + global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass, $globalName, $globalServerAPRShost, $globalServerAPRSport; |
|
| 450 | 449 | $aprs_connect = 0; |
| 451 | 450 | $aprs_keep = 120; |
| 452 | 451 | $aprs_last_tx = time(); |
| 453 | 452 | if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
| 454 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 453 | + else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName); |
|
| 455 | 454 | if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid; |
| 456 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 455 | + else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8); |
|
| 457 | 456 | if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass; |
| 458 | 457 | else $aprs_pass = '-1'; |
| 459 | 458 | |
| 460 | - $aprs_filter = ''; |
|
| 459 | + $aprs_filter = ''; |
|
| 461 | 460 | $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
| 462 | 461 | $Common = new Common(); |
| 463 | - $s = $Common->create_socket($globalServerAPRShost,$globalServerAPRSport,$errno,$errstr); |
|
| 462 | + $s = $Common->create_socket($globalServerAPRShost, $globalServerAPRSport, $errno, $errstr); |
|
| 464 | 463 | if ($s !== false) { |
| 465 | 464 | echo 'Connected to APRS server! '."\n"; |
| 466 | 465 | $authstart = time(); |
| 467 | 466 | $this->socket = $s; |
| 468 | - $send = socket_send( $this->socket , $aprs_login , strlen($aprs_login) , 0 ); |
|
| 469 | - socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1); |
|
| 470 | - while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) { |
|
| 467 | + $send = socket_send($this->socket, $aprs_login, strlen($aprs_login), 0); |
|
| 468 | + socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE, 1); |
|
| 469 | + while ($msgin = socket_read($this->socket, 1000, PHP_NORMAL_READ)) { |
|
| 471 | 470 | if (strpos($msgin, "$aprs_ssid verified") !== FALSE) { |
| 472 | 471 | echo 'APRS user verified !'."\n"; |
| 473 | 472 | $this->connected = true; |
| 474 | 473 | return true; |
| 475 | 474 | break; |
| 476 | 475 | } |
| 477 | - if (time()-$authstart > 5) { |
|
| 476 | + if (time() - $authstart > 5) { |
|
| 478 | 477 | echo 'APRS timeout'."\n"; |
| 479 | 478 | break; |
| 480 | 479 | } |
@@ -489,7 +488,7 @@ discard block |
||
| 489 | 488 | public function send($data) { |
| 490 | 489 | global $globalDebug; |
| 491 | 490 | if ($this->connected === false) $this->connect(); |
| 492 | - $send = socket_send( $this->socket , $data , strlen($data),0); |
|
| 491 | + $send = socket_send($this->socket, $data, strlen($data), 0); |
|
| 493 | 492 | if ($send === FALSE) { |
| 494 | 493 | if ($globalDebug) echo 'Reconnect...'; |
| 495 | 494 | socket_close($this->socket); |
@@ -499,14 +498,14 @@ discard block |
||
| 499 | 498 | } |
| 500 | 499 | |
| 501 | 500 | class APRSSpotter extends APRS { |
| 502 | - public function addLiveSpotterData($id,$ident,$aircraft_icao,$departure_airport,$arrival_airport,$latitude,$longitude,$waypoints,$altitude,$altitude_real,$heading,$speed,$datetime,$departure_airport_time,$arrival_airport_time,$squawk,$route_stop,$hex,$putinarchive,$registration,$pilot_id,$pilot_name, $verticalrate, $noarchive, $ground,$format_source,$source_name,$over_country) { |
|
| 501 | + public function addLiveSpotterData($id, $ident, $aircraft_icao, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $speed, $datetime, $departure_airport_time, $arrival_airport_time, $squawk, $route_stop, $hex, $putinarchive, $registration, $pilot_id, $pilot_name, $verticalrate, $noarchive, $ground, $format_source, $source_name, $over_country) { |
|
| 503 | 502 | $Common = new Common(); |
| 504 | 503 | if ($latitude != '' && $longitude != '') { |
| 505 | - $latitude = $Common->convertDM($latitude,'latitude'); |
|
| 506 | - $longitude = $Common->convertDM($longitude,'longitude'); |
|
| 507 | - $coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW']; |
|
| 508 | - $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000)); |
|
| 509 | - $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000)); |
|
| 504 | + $latitude = $Common->convertDM($latitude, 'latitude'); |
|
| 505 | + $longitude = $Common->convertDM($longitude, 'longitude'); |
|
| 506 | + $coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW']; |
|
| 507 | + $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000)); |
|
| 508 | + $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000)); |
|
| 510 | 509 | $w = $w1.$w2; |
| 511 | 510 | //$w = '00'; |
| 512 | 511 | $custom = ''; |
@@ -527,25 +526,25 @@ discard block |
||
| 527 | 526 | $custom .= 'AI='.$aircraft_icao; |
| 528 | 527 | } |
| 529 | 528 | if ($custom != '') $custom = ' '.$custom; |
| 530 | - $this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.' *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 529 | + $this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.' *'.date('His', strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude_real, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 531 | 530 | } |
| 532 | 531 | } |
| 533 | 532 | } |
| 534 | 533 | class APRSMarine extends APRS { |
| 535 | - public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed,$datetime, $putinarchive,$mmsi,$type,$typeid,$imo,$callsign,$arrival_code,$arrival_date,$status,$statusid,$noarchive,$format_source,$source_name,$over_country) { |
|
| 534 | + public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed, $datetime, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $statusid, $noarchive, $format_source, $source_name, $over_country) { |
|
| 536 | 535 | $Common = new Common(); |
| 537 | 536 | if ($latitude != '' && $longitude != '') { |
| 538 | - $latitude = $Common->convertDM($latitude,'latitude'); |
|
| 539 | - $longitude = $Common->convertDM($longitude,'longitude'); |
|
| 540 | - $coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW']; |
|
| 541 | - $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000)); |
|
| 542 | - $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000)); |
|
| 537 | + $latitude = $Common->convertDM($latitude, 'latitude'); |
|
| 538 | + $longitude = $Common->convertDM($longitude, 'longitude'); |
|
| 539 | + $coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW']; |
|
| 540 | + $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000)); |
|
| 541 | + $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000)); |
|
| 543 | 542 | $w = $w1.$w2; |
| 544 | 543 | //$w = '00'; |
| 545 | 544 | $custom = ''; |
| 546 | 545 | if ($ident != '') { |
| 547 | 546 | if ($custom != '') $custom .= '/'; |
| 548 | - $custom .= 'CS='.str_replace(' ','_',$ident); |
|
| 547 | + $custom .= 'CS='.str_replace(' ', '_', $ident); |
|
| 549 | 548 | } |
| 550 | 549 | if ($typeid != '') { |
| 551 | 550 | if ($custom != '') $custom .= '/'; |
@@ -565,11 +564,11 @@ discard block |
||
| 565 | 564 | } |
| 566 | 565 | if ($arrival_code != '') { |
| 567 | 566 | if ($custom != '') $custom .= '/'; |
| 568 | - $custom .= 'AC='.str_replace(' ','_',$arrival_code); |
|
| 567 | + $custom .= 'AC='.str_replace(' ', '_', $arrival_code); |
|
| 569 | 568 | } |
| 570 | 569 | if ($custom != '') $custom = ' '.$custom; |
| 571 | 570 | $altitude = 0; |
| 572 | - $this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 571 | + $this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His', strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 573 | 572 | } |
| 574 | 573 | } |
| 575 | 574 | } |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | try { |
| 16 | 16 | $sth = $this->db->prepare($query); |
| 17 | 17 | $sth->execute($query_values); |
| 18 | - } catch(PDOException $e) { |
|
| 18 | + } catch (PDOException $e) { |
|
| 19 | 19 | return "error : ".$e->getMessage(); |
| 20 | 20 | } |
| 21 | 21 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | try { |
| 29 | 29 | $sth = $this->db->prepare($query); |
| 30 | 30 | $sth->execute($query_values); |
| 31 | - } catch(PDOException $e) { |
|
| 31 | + } catch (PDOException $e) { |
|
| 32 | 32 | return "error : ".$e->getMessage(); |
| 33 | 33 | } |
| 34 | 34 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | try { |
| 42 | 42 | $sth = $this->db->prepare($query); |
| 43 | 43 | $sth->execute($query_values); |
| 44 | - } catch(PDOException $e) { |
|
| 44 | + } catch (PDOException $e) { |
|
| 45 | 45 | return "error : ".$e->getMessage(); |
| 46 | 46 | } |
| 47 | 47 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | try { |
| 55 | 55 | $sth = $this->db->prepare($query); |
| 56 | 56 | $sth->execute($query_values); |
| 57 | - } catch(PDOException $e) { |
|
| 57 | + } catch (PDOException $e) { |
|
| 58 | 58 | return "error : ".$e->getMessage(); |
| 59 | 59 | } |
| 60 | 60 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | try { |
| 68 | 68 | $sth = $this->db->prepare($query); |
| 69 | 69 | $sth->execute($query_values); |
| 70 | - } catch(PDOException $e) { |
|
| 70 | + } catch (PDOException $e) { |
|
| 71 | 71 | return "error : ".$e->getMessage(); |
| 72 | 72 | } |
| 73 | 73 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -80,56 +80,56 @@ discard block |
||
| 80 | 80 | try { |
| 81 | 81 | $sth = $this->db->prepare($query); |
| 82 | 82 | $sth->execute($query_values); |
| 83 | - } catch(PDOException $e) { |
|
| 83 | + } catch (PDOException $e) { |
|
| 84 | 84 | return "error : ".$e->getMessage(); |
| 85 | 85 | } |
| 86 | 86 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 87 | 87 | return $all; |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | - public function addLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '', $description = '') { |
|
| 90 | + public function addLocation($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id = 0, $last_seen = '', $description = '') { |
|
| 91 | 91 | if ($last_seen == '') $last_seen = date('Y-m-d H:i:s'); |
| 92 | 92 | $query = "INSERT INTO source_location (name,latitude,longitude,altitude,country,city,logo,source,type,source_id,last_seen,location_id,description) VALUES (:name,:latitude,:longitude,:altitude,:country,:city,:logo,:source,:type,:source_id,:last_seen,:location_id,:description)"; |
| 93 | - $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description); |
|
| 93 | + $query_values = array(':name' => $name, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':source_id' => $source_id, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description); |
|
| 94 | 94 | try { |
| 95 | 95 | $sth = $this->db->prepare($query); |
| 96 | 96 | $sth->execute($query_values); |
| 97 | - } catch(PDOException $e) { |
|
| 97 | + } catch (PDOException $e) { |
|
| 98 | 98 | echo "error : ".$e->getMessage(); |
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - public function updateLocation($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0,$location_id = 0,$last_seen = '',$description = '') { |
|
| 102 | + public function updateLocation($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id = 0, $last_seen = '', $description = '') { |
|
| 103 | 103 | if ($last_seen == '') $last_seen = date('Y-m-d H:i:s'); |
| 104 | 104 | $query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, source_id = :source_id, last_seen = :last_seen,location_id = :location_id, description = :description WHERE name = :name AND source = :source"; |
| 105 | - $query_values = array(':name' => $name,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':source_id' => $source_id,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description); |
|
| 105 | + $query_values = array(':name' => $name, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':source_id' => $source_id, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description); |
|
| 106 | 106 | try { |
| 107 | 107 | $sth = $this->db->prepare($query); |
| 108 | 108 | $sth->execute($query_values); |
| 109 | - } catch(PDOException $e) { |
|
| 109 | + } catch (PDOException $e) { |
|
| 110 | 110 | return "error : ".$e->getMessage(); |
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - public function updateLocationDescByName($name,$source,$source_id = 0,$description = '') { |
|
| 114 | + public function updateLocationDescByName($name, $source, $source_id = 0, $description = '') { |
|
| 115 | 115 | $query = "UPDATE source_location SET description = :description WHERE source_id = :source_id AND name = :name AND source = :source"; |
| 116 | - $query_values = array(':name' => $name,':source' => $source,':source_id' => $source_id,':description' => $description); |
|
| 116 | + $query_values = array(':name' => $name, ':source' => $source, ':source_id' => $source_id, ':description' => $description); |
|
| 117 | 117 | try { |
| 118 | 118 | $sth = $this->db->prepare($query); |
| 119 | 119 | $sth->execute($query_values); |
| 120 | - } catch(PDOException $e) { |
|
| 120 | + } catch (PDOException $e) { |
|
| 121 | 121 | return "error : ".$e->getMessage(); |
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - public function updateLocationByLocationID($name,$latitude,$longitude,$altitude,$city,$country,$source,$logo = 'antenna.png',$type = '',$source_id = 0, $location_id,$last_seen = '',$description = '') { |
|
| 125 | + public function updateLocationByLocationID($name, $latitude, $longitude, $altitude, $city, $country, $source, $logo = 'antenna.png', $type = '', $source_id = 0, $location_id, $last_seen = '', $description = '') { |
|
| 126 | 126 | if ($last_seen == '') $last_seen = date('Y-m-d H:i:s'); |
| 127 | 127 | $query = "UPDATE source_location SET latitude = :latitude,longitude = :longitude,altitude = :altitude,country = :country,city = :city,logo = :logo,type = :type, last_seen = :last_seen, description = :description WHERE location_id = :location_id AND source = :source AND source_id = :source_id"; |
| 128 | - $query_values = array(':source_id' => $source_id,':latitude' => $latitude, ':longitude' => $longitude,':altitude' => $altitude,':city' => $city,':country' => $country,':logo' => $logo,':source' => $source,':type' => $type,':last_seen' => $last_seen,':location_id' => $location_id,':description' => $description); |
|
| 128 | + $query_values = array(':source_id' => $source_id, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':city' => $city, ':country' => $country, ':logo' => $logo, ':source' => $source, ':type' => $type, ':last_seen' => $last_seen, ':location_id' => $location_id, ':description' => $description); |
|
| 129 | 129 | try { |
| 130 | 130 | $sth = $this->db->prepare($query); |
| 131 | 131 | $sth->execute($query_values); |
| 132 | - } catch(PDOException $e) { |
|
| 132 | + } catch (PDOException $e) { |
|
| 133 | 133 | echo "error : ".$e->getMessage(); |
| 134 | 134 | } |
| 135 | 135 | } |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | try { |
| 141 | 141 | $sth = $this->db->prepare($query); |
| 142 | 142 | $sth->execute($query_values); |
| 143 | - } catch(PDOException $e) { |
|
| 143 | + } catch (PDOException $e) { |
|
| 144 | 144 | return "error : ".$e->getMessage(); |
| 145 | 145 | } |
| 146 | 146 | } |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | try { |
| 152 | 152 | $sth = $this->db->prepare($query); |
| 153 | 153 | $sth->execute($query_values); |
| 154 | - } catch(PDOException $e) { |
|
| 154 | + } catch (PDOException $e) { |
|
| 155 | 155 | return "error : ".$e->getMessage(); |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | try { |
| 162 | 162 | $sth = $this->db->prepare($query); |
| 163 | 163 | $sth->execute(); |
| 164 | - } catch(PDOException $e) { |
|
| 164 | + } catch (PDOException $e) { |
|
| 165 | 165 | return "error : ".$e->getMessage(); |
| 166 | 166 | } |
| 167 | 167 | } |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | try { |
| 177 | 177 | $sth = $this->db->prepare($query); |
| 178 | 178 | $sth->execute(array(':type' => $type)); |
| 179 | - } catch(PDOException $e) { |
|
| 179 | + } catch (PDOException $e) { |
|
| 180 | 180 | return "error"; |
| 181 | 181 | } |
| 182 | 182 | return "success"; |
@@ -13,62 +13,62 @@ discard block |
||
| 13 | 13 | * @param Array $filter the filter |
| 14 | 14 | * @return Array the SQL part |
| 15 | 15 | */ |
| 16 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 16 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 17 | 17 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 18 | 18 | $filters = array(); |
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 20 | 20 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 21 | 21 | $filters = $globalStatsFilters[$globalFilterName]; |
| 22 | 22 | } else { |
| 23 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 23 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | if (isset($filter[0]['source'])) { |
| 27 | - $filters = array_merge($filters,$filter); |
|
| 27 | + $filters = array_merge($filters, $filter); |
|
| 28 | 28 | } |
| 29 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 29 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 30 | 30 | $filter_query_join = ''; |
| 31 | 31 | $filter_query_where = ''; |
| 32 | - foreach($filters as $flt) { |
|
| 32 | + foreach ($filters as $flt) { |
|
| 33 | 33 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 34 | 34 | if ($flt['airlines'][0] != '') { |
| 35 | 35 | if (isset($flt['source'])) { |
| 36 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 36 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 37 | 37 | } else { |
| 38 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 38 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saff ON saff.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 43 | 43 | if (isset($flt['source'])) { |
| 44 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 44 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 45 | 45 | } else { |
| 46 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 46 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) sp ON sp.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 50 | 50 | if (isset($flt['source'])) { |
| 51 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 51 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 52 | 52 | } else { |
| 53 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 53 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 57 | 57 | if (isset($flt['source'])) { |
| 58 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 58 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_archive_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 59 | 59 | } else { |
| 60 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 60 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents']) && isset($flt['registrations']) && empty($flt['registrations'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 64 | 64 | if (isset($flt['source'])) { |
| 65 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 65 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saa ON saa.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 70 | 70 | if ($filter['airlines'][0] != '') { |
| 71 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 71 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) saf ON saf.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
@@ -76,16 +76,16 @@ discard block |
||
| 76 | 76 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive_output.flightaware_id "; |
| 77 | 77 | } |
| 78 | 78 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 79 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 79 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) spi ON spi.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 80 | 80 | } |
| 81 | 81 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 82 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 82 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 83 | 83 | } |
| 84 | 84 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 85 | 85 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
| 86 | 86 | } |
| 87 | 87 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 88 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 88 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 89 | 89 | } |
| 90 | 90 | if ((isset($filter['year']) && $filter['year'] != '') || (isset($filter['month']) && $filter['month'] != '') || (isset($filter['day']) && $filter['day'] != '')) { |
| 91 | 91 | $filter_query_date = ''; |
@@ -111,41 +111,41 @@ discard block |
||
| 111 | 111 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_archive_output.date) = '".$filter['day']."'"; |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 114 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_archive_output.flightaware_id"; |
|
| 115 | 115 | } |
| 116 | 116 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 117 | 117 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 118 | 118 | if ($filter_query_where != '') { |
| 119 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 119 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 120 | 120 | } |
| 121 | 121 | $filter_query = $filter_query_join.$filter_query_where; |
| 122 | 122 | return $filter_query; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | // Spotter_archive |
| 126 | - public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '',$arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city ='', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '',$latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '',$heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '',$verticalrate = '',$format_source = '', $source_name = '', $over_country = '') { |
|
| 126 | + public function addSpotterArchiveData($flightaware_id = '', $ident = '', $registration = '', $airline_name = '', $airline_icao = '', $airline_country = '', $airline_type = '', $aircraft_icao = '', $aircraft_shadow = '', $aircraft_name = '', $aircraft_manufacturer = '', $departure_airport_icao = '', $departure_airport_name = '', $departure_airport_city = '', $departure_airport_country = '', $departure_airport_time = '', $arrival_airport_icao = '', $arrival_airport_name = '', $arrival_airport_city = '', $arrival_airport_country = '', $arrival_airport_time = '', $route_stop = '', $date = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $real_altitude = '', $heading = '', $ground_speed = '', $squawk = '', $ModeS = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $format_source = '', $source_name = '', $over_country = '') { |
|
| 127 | 127 | require_once(dirname(__FILE__).'/class.Spotter.php'); |
| 128 | 128 | if ($over_country == '') { |
| 129 | 129 | $Spotter = new Spotter($this->db); |
| 130 | - $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude,$longitude); |
|
| 130 | + $data_country = $Spotter->getCountryFromLatitudeLongitude($latitude, $longitude); |
|
| 131 | 131 | if (!empty($data_country)) $country = $data_country['iso2']; |
| 132 | 132 | else $country = ''; |
| 133 | 133 | } else $country = $over_country; |
| 134 | - if ($airline_type === NULL) $airline_type =''; |
|
| 134 | + if ($airline_type === NULL) $airline_type = ''; |
|
| 135 | 135 | |
| 136 | 136 | //if ($country == '') echo "\n".'************ UNKNOW COUNTRY ****************'."\n"; |
| 137 | 137 | //else echo "\n".'*/*/*/*/*/*/*/ Country : '.$country.' */*/*/*/*/*/*/*/*/'."\n"; |
| 138 | 138 | |
| 139 | 139 | // Route is not added in spotter_archive |
| 140 | - $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 140 | + $query = "INSERT INTO spotter_archive (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, departure_airport_time,arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, arrival_airport_time, route_stop, date,latitude, longitude, waypoints, altitude, heading, ground_speed, squawk, ModeS, pilot_id, pilot_name, verticalrate,format_source,over_country,source_name,real_altitude) |
|
| 141 | 141 | VALUES (:flightaware_id, :ident, :registration, :airline_name, :airline_icao, :airline_country, :airline_type, :aircraft_icao, :aircraft_shadow, :aircraft_name, :aircraft_manufacturer, :departure_airport_icao, :departure_airport_name, :departure_airport_city, :departure_airport_country, :departure_airport_time,:arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :arrival_airport_time, :route_stop, :date,:latitude, :longitude, :waypoints, :altitude, :heading, :ground_speed, :squawk, :ModeS, :pilot_id, :pilot_name, :verticalrate, :format_source, :over_country, :source_name,:real_altitude)"; |
| 142 | 142 | |
| 143 | - $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time,':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date,':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name,':real_altitude' => $real_altitude); |
|
| 143 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_name' => $aircraft_name, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':arrival_airport_time' => $arrival_airport_time, ':route_stop' => $route_stop, ':date' => $date, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':ground_speed' => $ground_speed, ':squawk' => $squawk, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':over_country' => $country, ':source_name' => $source_name, ':real_altitude' => $real_altitude); |
|
| 144 | 144 | try { |
| 145 | 145 | $sth = $this->db->prepare($query); |
| 146 | 146 | $sth->execute($query_values); |
| 147 | 147 | $sth->closeCursor(); |
| 148 | - } catch(PDOException $e) { |
|
| 148 | + } catch (PDOException $e) { |
|
| 149 | 149 | return "error : ".$e->getMessage(); |
| 150 | 150 | } |
| 151 | 151 | return "success"; |
@@ -165,9 +165,9 @@ discard block |
||
| 165 | 165 | |
| 166 | 166 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 167 | 167 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 168 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 168 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 169 | 169 | |
| 170 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 170 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident)); |
|
| 171 | 171 | |
| 172 | 172 | return $spotter_array; |
| 173 | 173 | } |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 187 | 187 | //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
| 188 | 188 | //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
| 189 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 189 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 190 | 190 | |
| 191 | 191 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 192 | 192 | /* |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 201 | 201 | */ |
| 202 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id)); |
|
| 203 | 203 | |
| 204 | 204 | return $spotter_array; |
| 205 | 205 | } |
@@ -214,14 +214,14 @@ discard block |
||
| 214 | 214 | { |
| 215 | 215 | date_default_timezone_set('UTC'); |
| 216 | 216 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 217 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 217 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 218 | 218 | |
| 219 | 219 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 220 | 220 | |
| 221 | 221 | try { |
| 222 | 222 | $sth = $this->db->prepare($query); |
| 223 | 223 | $sth->execute(array(':id' => $id)); |
| 224 | - } catch(PDOException $e) { |
|
| 224 | + } catch (PDOException $e) { |
|
| 225 | 225 | echo $e->getMessage(); |
| 226 | 226 | die; |
| 227 | 227 | } |
@@ -240,14 +240,14 @@ discard block |
||
| 240 | 240 | { |
| 241 | 241 | date_default_timezone_set('UTC'); |
| 242 | 242 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 243 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 243 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 244 | 244 | |
| 245 | 245 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 246 | 246 | |
| 247 | 247 | try { |
| 248 | 248 | $sth = $this->db->prepare($query); |
| 249 | 249 | $sth->execute(array(':id' => $id)); |
| 250 | - } catch(PDOException $e) { |
|
| 250 | + } catch (PDOException $e) { |
|
| 251 | 251 | echo $e->getMessage(); |
| 252 | 252 | die; |
| 253 | 253 | } |
@@ -269,12 +269,12 @@ discard block |
||
| 269 | 269 | date_default_timezone_set('UTC'); |
| 270 | 270 | |
| 271 | 271 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 272 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 272 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 273 | 273 | |
| 274 | 274 | try { |
| 275 | 275 | $sth = $this->db->prepare($query); |
| 276 | 276 | $sth->execute(array(':ident' => $ident)); |
| 277 | - } catch(PDOException $e) { |
|
| 277 | + } catch (PDOException $e) { |
|
| 278 | 278 | echo $e->getMessage(); |
| 279 | 279 | die; |
| 280 | 280 | } |
@@ -295,12 +295,12 @@ discard block |
||
| 295 | 295 | date_default_timezone_set('UTC'); |
| 296 | 296 | |
| 297 | 297 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 298 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 298 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 299 | 299 | |
| 300 | 300 | try { |
| 301 | 301 | $sth = $this->db->prepare($query); |
| 302 | 302 | $sth->execute(array(':id' => $id)); |
| 303 | - } catch(PDOException $e) { |
|
| 303 | + } catch (PDOException $e) { |
|
| 304 | 304 | echo $e->getMessage(); |
| 305 | 305 | die; |
| 306 | 306 | } |
@@ -321,12 +321,12 @@ discard block |
||
| 321 | 321 | date_default_timezone_set('UTC'); |
| 322 | 322 | |
| 323 | 323 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 324 | - $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 324 | + $query = "SELECT spotter_archive.altitude, spotter_archive.ground_speed, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 325 | 325 | |
| 326 | 326 | try { |
| 327 | 327 | $sth = $this->db->prepare($query); |
| 328 | 328 | $sth->execute(array(':id' => $id)); |
| 329 | - } catch(PDOException $e) { |
|
| 329 | + } catch (PDOException $e) { |
|
| 330 | 330 | echo $e->getMessage(); |
| 331 | 331 | die; |
| 332 | 332 | } |
@@ -348,13 +348,13 @@ discard block |
||
| 348 | 348 | date_default_timezone_set('UTC'); |
| 349 | 349 | |
| 350 | 350 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 351 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 351 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 352 | 352 | // $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident"; |
| 353 | 353 | |
| 354 | 354 | try { |
| 355 | 355 | $sth = $this->db->prepare($query); |
| 356 | 356 | $sth->execute(array(':ident' => $ident)); |
| 357 | - } catch(PDOException $e) { |
|
| 357 | + } catch (PDOException $e) { |
|
| 358 | 358 | echo $e->getMessage(); |
| 359 | 359 | die; |
| 360 | 360 | } |
@@ -371,13 +371,13 @@ discard block |
||
| 371 | 371 | * @return Array the spotter information |
| 372 | 372 | * |
| 373 | 373 | */ |
| 374 | - public function getSpotterArchiveData($ident,$flightaware_id,$date) |
|
| 374 | + public function getSpotterArchiveData($ident, $flightaware_id, $date) |
|
| 375 | 375 | { |
| 376 | 376 | $Spotter = new Spotter($this->db); |
| 377 | 377 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 378 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 378 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.flightaware_id = :flightaware_id AND l.date LIKE :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
|
| 379 | 379 | |
| 380 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':flightaware_id' => $flightaware_id,':date' => $date.'%')); |
|
| 380 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':flightaware_id' => $flightaware_id, ':date' => $date.'%')); |
|
| 381 | 381 | |
| 382 | 382 | return $spotter_array; |
| 383 | 383 | } |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | try { |
| 391 | 391 | $sth = $this->db->prepare($query); |
| 392 | 392 | $sth->execute(); |
| 393 | - } catch(PDOException $e) { |
|
| 393 | + } catch (PDOException $e) { |
|
| 394 | 394 | echo $e->getMessage(); |
| 395 | 395 | die; |
| 396 | 396 | } |
@@ -402,24 +402,24 @@ discard block |
||
| 402 | 402 | * @return Array the spotter information |
| 403 | 403 | * |
| 404 | 404 | */ |
| 405 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 405 | + public function getMinLiveSpotterData($begindate, $enddate, $filter = array()) |
|
| 406 | 406 | { |
| 407 | 407 | global $globalDBdriver, $globalLiveInterval; |
| 408 | 408 | date_default_timezone_set('UTC'); |
| 409 | 409 | |
| 410 | 410 | $filter_query = ''; |
| 411 | 411 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 412 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 412 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 413 | 413 | } |
| 414 | 414 | // Use spotter_output also ? |
| 415 | 415 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 416 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 416 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 417 | 417 | } |
| 418 | 418 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 419 | 419 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 420 | 420 | } |
| 421 | 421 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 422 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 422 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 423 | 423 | } |
| 424 | 424 | |
| 425 | 425 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -438,14 +438,14 @@ discard block |
||
| 438 | 438 | GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id |
| 439 | 439 | AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 440 | 440 | */ |
| 441 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 441 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 442 | 442 | FROM spotter_archive |
| 443 | 443 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 444 | 444 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 445 | 445 | '.$filter_query.' ORDER BY flightaware_id'; |
| 446 | 446 | } else { |
| 447 | 447 | //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
| 448 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 448 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 449 | 449 | FROM spotter_archive |
| 450 | 450 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 451 | 451 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | try { |
| 456 | 456 | $sth = $this->db->prepare($query); |
| 457 | 457 | $sth->execute(); |
| 458 | - } catch(PDOException $e) { |
|
| 458 | + } catch (PDOException $e) { |
|
| 459 | 459 | echo $e->getMessage(); |
| 460 | 460 | die; |
| 461 | 461 | } |
@@ -470,24 +470,24 @@ discard block |
||
| 470 | 470 | * @return Array the spotter information |
| 471 | 471 | * |
| 472 | 472 | */ |
| 473 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 473 | + public function getMinLiveSpotterDataPlayback($begindate, $enddate, $filter = array()) |
|
| 474 | 474 | { |
| 475 | 475 | global $globalDBdriver, $globalLiveInterval; |
| 476 | 476 | date_default_timezone_set('UTC'); |
| 477 | 477 | |
| 478 | 478 | $filter_query = ''; |
| 479 | 479 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 480 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 480 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 481 | 481 | } |
| 482 | 482 | // Should use spotter_output also ? |
| 483 | 483 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 484 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 484 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 485 | 485 | } |
| 486 | 486 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 487 | 487 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 488 | 488 | } |
| 489 | 489 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 490 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 490 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 491 | 491 | } |
| 492 | 492 | |
| 493 | 493 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | FROM spotter_archive |
| 498 | 498 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
| 499 | 499 | */ |
| 500 | - $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 500 | + $query = 'SELECT a.aircraft_shadow, spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk |
|
| 501 | 501 | FROM spotter_archive_output |
| 502 | 502 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive_output.aircraft_icao = a.icao |
| 503 | 503 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 513 | 513 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 514 | 514 | */ |
| 515 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 515 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 516 | 516 | FROM spotter_archive_output |
| 517 | 517 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 518 | 518 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
@@ -524,7 +524,7 @@ discard block |
||
| 524 | 524 | try { |
| 525 | 525 | $sth = $this->db->prepare($query); |
| 526 | 526 | $sth->execute(); |
| 527 | - } catch(PDOException $e) { |
|
| 527 | + } catch (PDOException $e) { |
|
| 528 | 528 | echo $e->getMessage(); |
| 529 | 529 | die; |
| 530 | 530 | } |
@@ -539,23 +539,23 @@ discard block |
||
| 539 | 539 | * @return Array the spotter information |
| 540 | 540 | * |
| 541 | 541 | */ |
| 542 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 542 | + public function getLiveSpotterCount($begindate, $enddate, $filter = array()) |
|
| 543 | 543 | { |
| 544 | 544 | global $globalDBdriver, $globalLiveInterval; |
| 545 | 545 | date_default_timezone_set('UTC'); |
| 546 | 546 | |
| 547 | 547 | $filter_query = ''; |
| 548 | 548 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 549 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 549 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 550 | 550 | } |
| 551 | 551 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 552 | - $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 552 | + $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 553 | 553 | } |
| 554 | 554 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 555 | 555 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
| 556 | 556 | } |
| 557 | 557 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 558 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 558 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 559 | 559 | } |
| 560 | 560 | |
| 561 | 561 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -570,7 +570,7 @@ discard block |
||
| 570 | 570 | try { |
| 571 | 571 | $sth = $this->db->prepare($query); |
| 572 | 572 | $sth->execute(); |
| 573 | - } catch(PDOException $e) { |
|
| 573 | + } catch (PDOException $e) { |
|
| 574 | 574 | echo $e->getMessage(); |
| 575 | 575 | die; |
| 576 | 576 | } |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | * @return Array the spotter information |
| 591 | 591 | * |
| 592 | 592 | */ |
| 593 | - public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 593 | + public function searchSpotterData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) |
|
| 594 | 594 | { |
| 595 | 595 | global $globalTimezone, $globalDBdriver; |
| 596 | 596 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | |
| 613 | 613 | $q_array = explode(" ", $q); |
| 614 | 614 | |
| 615 | - foreach ($q_array as $q_item){ |
|
| 615 | + foreach ($q_array as $q_item) { |
|
| 616 | 616 | $additional_query .= " AND ("; |
| 617 | 617 | $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
| 618 | 618 | $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -644,7 +644,7 @@ discard block |
||
| 644 | 644 | |
| 645 | 645 | if ($registration != "") |
| 646 | 646 | { |
| 647 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 647 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 648 | 648 | if (!is_string($registration)) |
| 649 | 649 | { |
| 650 | 650 | return false; |
@@ -655,7 +655,7 @@ discard block |
||
| 655 | 655 | |
| 656 | 656 | if ($aircraft_icao != "") |
| 657 | 657 | { |
| 658 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 658 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 659 | 659 | if (!is_string($aircraft_icao)) |
| 660 | 660 | { |
| 661 | 661 | return false; |
@@ -666,7 +666,7 @@ discard block |
||
| 666 | 666 | |
| 667 | 667 | if ($aircraft_manufacturer != "") |
| 668 | 668 | { |
| 669 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 669 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 670 | 670 | if (!is_string($aircraft_manufacturer)) |
| 671 | 671 | { |
| 672 | 672 | return false; |
@@ -687,7 +687,7 @@ discard block |
||
| 687 | 687 | |
| 688 | 688 | if ($airline_icao != "") |
| 689 | 689 | { |
| 690 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 690 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 691 | 691 | if (!is_string($airline_icao)) |
| 692 | 692 | { |
| 693 | 693 | return false; |
@@ -698,7 +698,7 @@ discard block |
||
| 698 | 698 | |
| 699 | 699 | if ($airline_country != "") |
| 700 | 700 | { |
| 701 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 701 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 702 | 702 | if (!is_string($airline_country)) |
| 703 | 703 | { |
| 704 | 704 | return false; |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | |
| 710 | 710 | if ($airline_type != "") |
| 711 | 711 | { |
| 712 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 712 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 713 | 713 | if (!is_string($airline_type)) |
| 714 | 714 | { |
| 715 | 715 | return false; |
@@ -731,7 +731,7 @@ discard block |
||
| 731 | 731 | |
| 732 | 732 | if ($airport != "") |
| 733 | 733 | { |
| 734 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 734 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 735 | 735 | if (!is_string($airport)) |
| 736 | 736 | { |
| 737 | 737 | return false; |
@@ -742,7 +742,7 @@ discard block |
||
| 742 | 742 | |
| 743 | 743 | if ($airport_country != "") |
| 744 | 744 | { |
| 745 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 745 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 746 | 746 | if (!is_string($airport_country)) |
| 747 | 747 | { |
| 748 | 748 | return false; |
@@ -753,7 +753,7 @@ discard block |
||
| 753 | 753 | |
| 754 | 754 | if ($callsign != "") |
| 755 | 755 | { |
| 756 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 756 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 757 | 757 | if (!is_string($callsign)) |
| 758 | 758 | { |
| 759 | 759 | return false; |
@@ -761,7 +761,7 @@ discard block |
||
| 761 | 761 | $translate = $Translation->ident2icao($callsign); |
| 762 | 762 | if ($translate != $callsign) { |
| 763 | 763 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
| 764 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 764 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 765 | 765 | } else { |
| 766 | 766 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 767 | 767 | } |
@@ -770,7 +770,7 @@ discard block |
||
| 770 | 770 | |
| 771 | 771 | if ($owner != "") |
| 772 | 772 | { |
| 773 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 773 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 774 | 774 | if (!is_string($owner)) |
| 775 | 775 | { |
| 776 | 776 | return false; |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | |
| 782 | 782 | if ($pilot_name != "") |
| 783 | 783 | { |
| 784 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 784 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 785 | 785 | if (!is_string($pilot_name)) |
| 786 | 786 | { |
| 787 | 787 | return false; |
@@ -792,7 +792,7 @@ discard block |
||
| 792 | 792 | |
| 793 | 793 | if ($pilot_id != "") |
| 794 | 794 | { |
| 795 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 795 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 796 | 796 | if (!is_string($pilot_id)) |
| 797 | 797 | { |
| 798 | 798 | return false; |
@@ -803,7 +803,7 @@ discard block |
||
| 803 | 803 | |
| 804 | 804 | if ($departure_airport_route != "") |
| 805 | 805 | { |
| 806 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 806 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 807 | 807 | if (!is_string($departure_airport_route)) |
| 808 | 808 | { |
| 809 | 809 | return false; |
@@ -814,7 +814,7 @@ discard block |
||
| 814 | 814 | |
| 815 | 815 | if ($arrival_airport_route != "") |
| 816 | 816 | { |
| 817 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 817 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 818 | 818 | if (!is_string($arrival_airport_route)) |
| 819 | 819 | { |
| 820 | 820 | return false; |
@@ -827,8 +827,8 @@ discard block |
||
| 827 | 827 | { |
| 828 | 828 | $altitude_array = explode(",", $altitude); |
| 829 | 829 | |
| 830 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 831 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 830 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 831 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 832 | 832 | |
| 833 | 833 | |
| 834 | 834 | if ($altitude_array[1] != "") |
@@ -846,8 +846,8 @@ discard block |
||
| 846 | 846 | { |
| 847 | 847 | $date_array = explode(",", $date_posted); |
| 848 | 848 | |
| 849 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 850 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 849 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 850 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 851 | 851 | |
| 852 | 852 | if ($globalTimezone != '') { |
| 853 | 853 | date_default_timezone_set($globalTimezone); |
@@ -879,8 +879,8 @@ discard block |
||
| 879 | 879 | { |
| 880 | 880 | $limit_array = explode(",", $limit); |
| 881 | 881 | |
| 882 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 883 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 882 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 883 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 884 | 884 | |
| 885 | 885 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 886 | 886 | { |
@@ -891,8 +891,8 @@ discard block |
||
| 891 | 891 | |
| 892 | 892 | |
| 893 | 893 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 894 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 895 | - $query="SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 894 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
| 895 | + $query = "SELECT spotter_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 896 | 896 | FROM spotter_archive_output, spotter_archive WHERE spotter_output_archive.flightaware_id = spotter_archive.flightaware_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(spotter_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(spotter_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 897 | 897 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(spotter_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(spotter_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(spotter_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
| 898 | 898 | } else { |
@@ -909,12 +909,12 @@ discard block |
||
| 909 | 909 | $additional_query .= " AND (spotter_archive_output.waypoints <> '')"; |
| 910 | 910 | } |
| 911 | 911 | |
| 912 | - $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 912 | + $query = "SELECT spotter_archive_output.* FROM spotter_archive_output |
|
| 913 | 913 | WHERE spotter_archive_output.ident <> '' |
| 914 | 914 | ".$additional_query." |
| 915 | 915 | ".$filter_query.$orderby_query; |
| 916 | 916 | } |
| 917 | - $spotter_array = $Spotter->getDataFromDB($query, $query_values,$limit_query); |
|
| 917 | + $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
|
| 918 | 918 | |
| 919 | 919 | return $spotter_array; |
| 920 | 920 | } |
@@ -931,7 +931,7 @@ discard block |
||
| 931 | 931 | try { |
| 932 | 932 | $sth = $this->db->prepare($query); |
| 933 | 933 | $sth->execute(); |
| 934 | - } catch(PDOException $e) { |
|
| 934 | + } catch (PDOException $e) { |
|
| 935 | 935 | return "error"; |
| 936 | 936 | } |
| 937 | 937 | } |
@@ -968,8 +968,8 @@ discard block |
||
| 968 | 968 | { |
| 969 | 969 | $limit_array = explode(",", $limit); |
| 970 | 970 | |
| 971 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 972 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 971 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 972 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 973 | 973 | |
| 974 | 974 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 975 | 975 | { |
@@ -1010,7 +1010,7 @@ discard block |
||
| 1010 | 1010 | $query_values = array(); |
| 1011 | 1011 | $limit_query = ''; |
| 1012 | 1012 | $additional_query = ''; |
| 1013 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1013 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1014 | 1014 | |
| 1015 | 1015 | if ($owner != "") |
| 1016 | 1016 | { |
@@ -1027,8 +1027,8 @@ discard block |
||
| 1027 | 1027 | { |
| 1028 | 1028 | $limit_array = explode(",", $limit); |
| 1029 | 1029 | |
| 1030 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1031 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1030 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1031 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1032 | 1032 | |
| 1033 | 1033 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1034 | 1034 | { |
@@ -1068,7 +1068,7 @@ discard block |
||
| 1068 | 1068 | $query_values = array(); |
| 1069 | 1069 | $limit_query = ''; |
| 1070 | 1070 | $additional_query = ''; |
| 1071 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1071 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1072 | 1072 | |
| 1073 | 1073 | if ($pilot != "") |
| 1074 | 1074 | { |
@@ -1080,8 +1080,8 @@ discard block |
||
| 1080 | 1080 | { |
| 1081 | 1081 | $limit_array = explode(",", $limit); |
| 1082 | 1082 | |
| 1083 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1084 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1083 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1084 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1085 | 1085 | |
| 1086 | 1086 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1087 | 1087 | { |
@@ -1111,7 +1111,7 @@ discard block |
||
| 1111 | 1111 | * @return Array the airline country list |
| 1112 | 1112 | * |
| 1113 | 1113 | */ |
| 1114 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1114 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1115 | 1115 | { |
| 1116 | 1116 | global $globalDBdriver; |
| 1117 | 1117 | /* |
@@ -1140,7 +1140,7 @@ discard block |
||
| 1140 | 1140 | $flight_array = array(); |
| 1141 | 1141 | $temp_array = array(); |
| 1142 | 1142 | |
| 1143 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1143 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1144 | 1144 | { |
| 1145 | 1145 | $temp_array['flight_count'] = $row['nb']; |
| 1146 | 1146 | $temp_array['flight_country'] = $row['name']; |
@@ -1157,7 +1157,7 @@ discard block |
||
| 1157 | 1157 | * @return Array the airline country list |
| 1158 | 1158 | * |
| 1159 | 1159 | */ |
| 1160 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1160 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1161 | 1161 | { |
| 1162 | 1162 | global $globalDBdriver; |
| 1163 | 1163 | /* |
@@ -1186,7 +1186,7 @@ discard block |
||
| 1186 | 1186 | $flight_array = array(); |
| 1187 | 1187 | $temp_array = array(); |
| 1188 | 1188 | |
| 1189 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1189 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1190 | 1190 | { |
| 1191 | 1191 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 1192 | 1192 | $temp_array['flight_count'] = $row['nb']; |
@@ -1204,14 +1204,14 @@ discard block |
||
| 1204 | 1204 | * @return Array the spotter information |
| 1205 | 1205 | * |
| 1206 | 1206 | */ |
| 1207 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1207 | + public function getDateArchiveSpotterDataById($id, $date) |
|
| 1208 | 1208 | { |
| 1209 | 1209 | $Spotter = new Spotter($this->db); |
| 1210 | 1210 | date_default_timezone_set('UTC'); |
| 1211 | 1211 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 1212 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1213 | - $date = date('c',$date); |
|
| 1214 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1212 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1213 | + $date = date('c', $date); |
|
| 1214 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
| 1215 | 1215 | return $spotter_array; |
| 1216 | 1216 | } |
| 1217 | 1217 | |
@@ -1221,14 +1221,14 @@ discard block |
||
| 1221 | 1221 | * @return Array the spotter information |
| 1222 | 1222 | * |
| 1223 | 1223 | */ |
| 1224 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1224 | + public function getDateArchiveSpotterDataByIdent($ident, $date) |
|
| 1225 | 1225 | { |
| 1226 | 1226 | $Spotter = new Spotter($this->db); |
| 1227 | 1227 | date_default_timezone_set('UTC'); |
| 1228 | 1228 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 1229 | - $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1230 | - $date = date('c',$date); |
|
| 1231 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1229 | + $query = 'SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate ORDER BY spotter_archive.date DESC'; |
|
| 1230 | + $date = date('c', $date); |
|
| 1231 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 1232 | 1232 | return $spotter_array; |
| 1233 | 1233 | } |
| 1234 | 1234 | |
@@ -1238,7 +1238,7 @@ discard block |
||
| 1238 | 1238 | * @return Array the spotter information |
| 1239 | 1239 | * |
| 1240 | 1240 | */ |
| 1241 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1241 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
| 1242 | 1242 | { |
| 1243 | 1243 | global $global_query; |
| 1244 | 1244 | $Spotter = new Spotter(); |
@@ -1246,7 +1246,7 @@ discard block |
||
| 1246 | 1246 | $query_values = array(); |
| 1247 | 1247 | $limit_query = ''; |
| 1248 | 1248 | $additional_query = ''; |
| 1249 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1249 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1250 | 1250 | |
| 1251 | 1251 | if ($airport != "") |
| 1252 | 1252 | { |
@@ -1263,8 +1263,8 @@ discard block |
||
| 1263 | 1263 | { |
| 1264 | 1264 | $limit_array = explode(",", $limit); |
| 1265 | 1265 | |
| 1266 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1267 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1266 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1267 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1268 | 1268 | |
| 1269 | 1269 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1270 | 1270 | { |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | if (!isset($globalDemo)) { |
| 14 | 14 | if (isset($_GET['coord'])) |
| 15 | 15 | { |
| 16 | - $coords = explode(',',$_GET['coord']); |
|
| 16 | + $coords = explode(',', $_GET['coord']); |
|
| 17 | 17 | // $spotter_array = Source::getAllLocationInfobyCoord($coords); |
| 18 | 18 | if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
| 19 | 19 | || (!isset($_COOKIE['show_GroundStation']) && (!isset($globalMapGroundStation) || $globalMapGroundStation === TRUE))) { |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | $output = '{"type": "FeatureCollection","features": ['; |
| 35 | 35 | if (!empty($spotter_array) && count($spotter_array) > 0) |
| 36 | 36 | { |
| 37 | - foreach($spotter_array as $spotter_item) |
|
| 37 | + foreach ($spotter_array as $spotter_item) |
|
| 38 | 38 | { |
| 39 | 39 | date_default_timezone_set('UTC'); |
| 40 | 40 | //waypoint plotting |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $output .= '}'; |
| 63 | 63 | $output .= '},'; |
| 64 | 64 | } |
| 65 | - $output = substr($output, 0, -1); |
|
| 65 | + $output = substr($output, 0, -1); |
|
| 66 | 66 | } |
| 67 | 67 | $output .= ']}'; |
| 68 | 68 | |
