Ysurac /
FlightAirMap
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | if (!isset($filter_name)) $filter_name = ''; |
| 20 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 20 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 21 | 21 | if ($airline_icao == '' && isset($globalFilter)) { |
| 22 | 22 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
| 23 | 23 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | </div> |
| 34 | 34 | <p>'._("Below is a chart that plots the busiest day during the <strong>last 7 days</strong>.").'</p>'; |
| 35 | 35 | |
| 36 | -if ($type == 'aircraft') $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 36 | +if ($type == 'aircraft') $date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name); |
|
| 37 | 37 | elseif ($type == 'marine') $date_array = $Marine->countAllDatesLast7Days(); |
| 38 | 38 | elseif ($type == 'tracker') $date_array = $Tracker->countAllDatesLast7Days(); |
| 39 | 39 | if (count($date_array) == 0) { |
@@ -42,13 +42,13 @@ discard block |
||
| 42 | 42 | print '<div id="chart" class="chart" width="100%"></div><script>'; |
| 43 | 43 | $date_data = ''; |
| 44 | 44 | $date_cnt = ''; |
| 45 | -foreach($date_array as $date_item) |
|
| 45 | +foreach ($date_array as $date_item) |
|
| 46 | 46 | { |
| 47 | 47 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 48 | 48 | $date_cnt .= $date_item['date_count'].','; |
| 49 | 49 | } |
| 50 | 50 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 51 | -$date_cnt = "['flights',".substr($date_cnt,0,-1)."]"; |
|
| 51 | +$date_cnt = "['flights',".substr($date_cnt, 0, -1)."]"; |
|
| 52 | 52 | print 'c3.generate({ |
| 53 | 53 | bindto: "#chart", |
| 54 | 54 | data: { x: "x", |
@@ -57,11 +57,11 @@ discard block |
||
| 57 | 57 | print '</script>'; |
| 58 | 58 | } |
| 59 | 59 | if (isset($globalDBArchiveMonths) && $globalDBArchiveMonths > 0) { |
| 60 | - print '<p>'.sprintf(_("Below are the <strong>Top 10</strong> most busiest dates of last %d month(s)."),$globalDBArchiveMonths).'</p>'; |
|
| 60 | + print '<p>'.sprintf(_("Below are the <strong>Top 10</strong> most busiest dates of last %d month(s)."), $globalDBArchiveMonths).'</p>'; |
|
| 61 | 61 | } else { |
| 62 | 62 | print '<p>'._("Below are the <strong>Top 10</strong> most busiest dates.").'</p>'; |
| 63 | 63 | } |
| 64 | -if ($type == 'aircraft') $date_array = $Stats->countAllDates($airline_icao,$filter_name); |
|
| 64 | +if ($type == 'aircraft') $date_array = $Stats->countAllDates($airline_icao, $filter_name); |
|
| 65 | 65 | elseif ($type == 'marine') $date_array = $Marine->countAllDates(); |
| 66 | 66 | elseif ($type == 'tracker') $date_array = $Tracker->countAllDates(); |
| 67 | 67 | if (!empty($date_array)) |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | print '</thead>'; |
| 76 | 76 | print '<tbody>'; |
| 77 | 77 | $i = 1; |
| 78 | - foreach($date_array as $date_item) |
|
| 78 | + foreach ($date_array as $date_item) |
|
| 79 | 79 | { |
| 80 | 80 | print '<tr>'; |
| 81 | 81 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | } else { |
| 23 | 23 | print '<option value="all">All</option>'; |
| 24 | 24 | } |
| 25 | - foreach($airlines as $airline) { |
|
| 25 | + foreach ($airlines as $airline) { |
|
| 26 | 26 | if (isset($airline_icao) && $airline_icao == $airline['airline_icao']) { |
| 27 | 27 | print '<option value="'.$airline['airline_icao'].'" selected>'.$airline['airline_name'].'</option>'; |
| 28 | 28 | } else { |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | if (!isset($type) || $type == 'aircraft') { |
| 46 | 46 | ?> |
| 47 | 47 | <li class="dropdown"> |
| 48 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" > |
|
| 48 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" > |
|
| 49 | 49 | <?php echo _("Aircraft"); ?> <span class="caret"></span> |
| 50 | 50 | </a> |
| 51 | 51 | <ul class="dropdown-menu"> |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | </ul> |
| 57 | 57 | </li> |
| 58 | 58 | <li class="dropdown"> |
| 59 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 59 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 60 | 60 | <?php echo _("Airline"); ?> <span class="caret"></span> |
| 61 | 61 | </a> |
| 62 | 62 | <ul class="dropdown-menu" role="menu"> |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | </ul> |
| 67 | 67 | </li> |
| 68 | 68 | <li class="dropdown"> |
| 69 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 69 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 70 | 70 | <?php echo _("Airport"); ?> <span class="caret"></span> |
| 71 | 71 | </a> |
| 72 | 72 | <ul class="dropdown-menu" role="menu"> |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | </ul> |
| 78 | 78 | </li> |
| 79 | 79 | <li class="dropdown"> |
| 80 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 80 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 81 | 81 | <?php echo _("Route"); ?> <span class="caret"></span> |
| 82 | 82 | </a> |
| 83 | 83 | <ul class="dropdown-menu" role="menu"> |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | </ul> |
| 87 | 87 | </li> |
| 88 | 88 | <li class="dropdown"> |
| 89 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 89 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 90 | 90 | <?php echo _("Date & Time"); ?> <span class="caret"></span> |
| 91 | 91 | </a> |
| 92 | 92 | <ul class="dropdown-menu" role="menu"> |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | if (isset($globalAccidents) && $globalAccidents && (!isset($airline_icao) || $airline_icao == '' || $airline_icao == 'all')) { |
| 99 | 99 | ?> |
| 100 | 100 | <li class="dropdown"> |
| 101 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 101 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 102 | 102 | <?php echo _("Fatalities"); ?> <span class="caret"></span> |
| 103 | 103 | </a> |
| 104 | 104 | <ul class="dropdown-menu" role="menu"> |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | } elseif ($type == 'marine' || $type == 'tracker') { |
| 114 | 114 | ?> |
| 115 | 115 | <li class="dropdown"> |
| 116 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 116 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 117 | 117 | <?php echo _("Date & Time"); ?> <span class="caret"></span> |
| 118 | 118 | </a> |
| 119 | 119 | <ul class="dropdown-menu" role="menu"> |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | if (!isset($type) || $type == 'aircraft') { |
| 136 | 136 | ?> |
| 137 | 137 | <li class="dropdown"> |
| 138 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#" > |
|
| 138 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-aircraft" || strtolower($current_page) == "statistics-registration" || strtolower($current_page) == "statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#" > |
|
| 139 | 139 | <?php echo _("Aircraft"); ?> <span class="caret"></span> |
| 140 | 140 | </a> |
| 141 | 141 | <ul class="dropdown-menu"> |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | </ul> |
| 147 | 147 | </li> |
| 148 | 148 | <li class="dropdown"> |
| 149 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 149 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airline" || strtolower($current_page) == "statistics-airline-country" || strtolower($current_page) == "statistics-callsign") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 150 | 150 | <?php echo _("Airline"); ?> <span class="caret"></span> |
| 151 | 151 | </a> |
| 152 | 152 | <ul class="dropdown-menu" role="menu"> |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | </ul> |
| 157 | 157 | </li> |
| 158 | 158 | <li class="dropdown"> |
| 159 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 159 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-airport-departure" || strtolower($current_page) == "statistics-airport-departure-country" || strtolower($current_page) == "statistics-airport-arrival" || strtolower($current_page) == "statistics-airport-arrival-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 160 | 160 | <?php echo _("Airport"); ?> <span class="caret"></span> |
| 161 | 161 | </a> |
| 162 | 162 | <ul class="dropdown-menu" role="menu"> |
@@ -168,7 +168,7 @@ discard block |
||
| 168 | 168 | </li> |
| 169 | 169 | <!-- |
| 170 | 170 | <li class="dropdown"> |
| 171 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 171 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-route-airport" || strtolower($current_page) == "statistics-route-waypoint") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 172 | 172 | <?php echo _("Route"); ?> <span class="caret"></span> |
| 173 | 173 | </a> |
| 174 | 174 | <ul class="dropdown-menu" role="menu"> |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | --> |
| 180 | 180 | <!-- |
| 181 | 181 | <li class="dropdown"> |
| 182 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 182 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 183 | 183 | <?php echo _("Date & Time"); ?> <span class="caret"></span> |
| 184 | 184 | </a> |
| 185 | 185 | <ul class="dropdown-menu" role="menu"> |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | ?> |
| 194 | 194 | <!-- |
| 195 | 195 | <li class="dropdown"> |
| 196 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 196 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-fatalities-year" || strtolower($current_page) == "statistics-fatalities-month") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 197 | 197 | <?php echo _("Fatalities"); ?> <span class="caret"></span> |
| 198 | 198 | </a> |
| 199 | 199 | <ul class="dropdown-menu" role="menu"> |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | } elseif ($type == 'marine' || $type == 'tracker') { |
| 210 | 210 | ?> |
| 211 | 211 | <li class="dropdown"> |
| 212 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 212 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "statistics-date" || strtolower($current_page) == "statistics-time") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
| 213 | 213 | <?php echo _("Date & Time"); ?> <span class="caret"></span> |
| 214 | 214 | </a> |
| 215 | 215 | <ul class="dropdown-menu" role="menu"> |
@@ -18,14 +18,14 @@ discard block |
||
| 18 | 18 | $this->db = $Connection->db(); |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public function addLastStatsUpdate($type,$stats_date) { |
|
| 21 | + public function addLastStatsUpdate($type, $stats_date) { |
|
| 22 | 22 | $query = "DELETE FROM config WHERE name = :type; |
| 23 | 23 | INSERT INTO config (name,value) VALUES (:type,:stats_date);"; |
| 24 | - $query_values = array('type' => $type,':stats_date' => $stats_date); |
|
| 24 | + $query_values = array('type' => $type, ':stats_date' => $stats_date); |
|
| 25 | 25 | try { |
| 26 | 26 | $sth = $this->db->prepare($query); |
| 27 | 27 | $sth->execute($query_values); |
| 28 | - } catch(PDOException $e) { |
|
| 28 | + } catch (PDOException $e) { |
|
| 29 | 29 | return "error : ".$e->getMessage(); |
| 30 | 30 | } |
| 31 | 31 | } |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | try { |
| 36 | 36 | $sth = $this->db->prepare($query); |
| 37 | 37 | $sth->execute(array(':type' => $type)); |
| 38 | - } catch(PDOException $e) { |
|
| 38 | + } catch (PDOException $e) { |
|
| 39 | 39 | echo "error : ".$e->getMessage(); |
| 40 | 40 | } |
| 41 | 41 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | try { |
| 56 | 56 | $sth = $this->db->prepare($query); |
| 57 | 57 | $sth->execute(array(':filter_name' => $filter_name)); |
| 58 | - } catch(PDOException $e) { |
|
| 58 | + } catch (PDOException $e) { |
|
| 59 | 59 | return "error : ".$e->getMessage(); |
| 60 | 60 | } |
| 61 | 61 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | try { |
| 69 | 69 | $sth = $this->db->prepare($query); |
| 70 | 70 | $sth->execute(); |
| 71 | - } catch(PDOException $e) { |
|
| 71 | + } catch (PDOException $e) { |
|
| 72 | 72 | return "error : ".$e->getMessage(); |
| 73 | 73 | } |
| 74 | 74 | |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | try { |
| 77 | 77 | $sth = $this->db->prepare($query); |
| 78 | 78 | $sth->execute(array(':filter_name' => $filter_name)); |
| 79 | - } catch(PDOException $e) { |
|
| 79 | + } catch (PDOException $e) { |
|
| 80 | 80 | return "error : ".$e->getMessage(); |
| 81 | 81 | } |
| 82 | 82 | } |
@@ -86,69 +86,69 @@ discard block |
||
| 86 | 86 | try { |
| 87 | 87 | $sth = $this->db->prepare($query); |
| 88 | 88 | $sth->execute(array(':filter_name' => $filter_name)); |
| 89 | - } catch(PDOException $e) { |
|
| 89 | + } catch (PDOException $e) { |
|
| 90 | 90 | echo "error : ".$e->getMessage(); |
| 91 | 91 | } |
| 92 | 92 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 93 | 93 | return $all; |
| 94 | 94 | } |
| 95 | - public function getAllAircraftTypes($stats_airline = '',$filter_name = '') { |
|
| 95 | + public function getAllAircraftTypes($stats_airline = '', $filter_name = '') { |
|
| 96 | 96 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 97 | 97 | $query = "SELECT * FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_manufacturer ASC"; |
| 98 | 98 | try { |
| 99 | 99 | $sth = $this->db->prepare($query); |
| 100 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 101 | - } catch(PDOException $e) { |
|
| 100 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 101 | + } catch (PDOException $e) { |
|
| 102 | 102 | echo "error : ".$e->getMessage(); |
| 103 | 103 | } |
| 104 | 104 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 105 | 105 | return $all; |
| 106 | 106 | } |
| 107 | - public function getAllManufacturers($stats_airline = '',$filter_name = '') { |
|
| 107 | + public function getAllManufacturers($stats_airline = '', $filter_name = '') { |
|
| 108 | 108 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 109 | 109 | $query = "SELECT DISTINCT(aircraft_manufacturer) FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND aircraft_manufacturer <> '' ORDER BY aircraft_manufacturer ASC"; |
| 110 | 110 | try { |
| 111 | 111 | $sth = $this->db->prepare($query); |
| 112 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 113 | - } catch(PDOException $e) { |
|
| 112 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 113 | + } catch (PDOException $e) { |
|
| 114 | 114 | echo "error : ".$e->getMessage(); |
| 115 | 115 | } |
| 116 | 116 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 117 | 117 | return $all; |
| 118 | 118 | } |
| 119 | - public function getAllAirportNames($stats_airline = '',$filter_name = '') { |
|
| 119 | + public function getAllAirportNames($stats_airline = '', $filter_name = '') { |
|
| 120 | 120 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 121 | 121 | $query = "SELECT airport_icao, airport_name,airport_city,airport_country FROM stats_airport WHERE stats_airline = :stats_airline AND filter_name = :filter_name AND stats_type = 'daily' GROUP BY airport_icao,airport_name,airport_city,airport_country ORDER BY airport_city ASC"; |
| 122 | 122 | try { |
| 123 | 123 | $sth = $this->db->prepare($query); |
| 124 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 125 | - } catch(PDOException $e) { |
|
| 124 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 125 | + } catch (PDOException $e) { |
|
| 126 | 126 | echo "error : ".$e->getMessage(); |
| 127 | 127 | } |
| 128 | 128 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 129 | 129 | return $all; |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | - public function getAllOwnerNames($stats_airline = '',$filter_name = '') { |
|
| 132 | + public function getAllOwnerNames($stats_airline = '', $filter_name = '') { |
|
| 133 | 133 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 134 | 134 | $query = "SELECT owner_name FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_name ASC"; |
| 135 | 135 | try { |
| 136 | 136 | $sth = $this->db->prepare($query); |
| 137 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 138 | - } catch(PDOException $e) { |
|
| 137 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 138 | + } catch (PDOException $e) { |
|
| 139 | 139 | echo "error : ".$e->getMessage(); |
| 140 | 140 | } |
| 141 | 141 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 142 | 142 | return $all; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - public function getAllPilotNames($stats_airline = '',$filter_name = '') { |
|
| 145 | + public function getAllPilotNames($stats_airline = '', $filter_name = '') { |
|
| 146 | 146 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 147 | 147 | $query = "SELECT pilot_id,pilot_name FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_name ASC"; |
| 148 | 148 | try { |
| 149 | 149 | $sth = $this->db->prepare($query); |
| 150 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 151 | - } catch(PDOException $e) { |
|
| 150 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 151 | + } catch (PDOException $e) { |
|
| 152 | 152 | echo "error : ".$e->getMessage(); |
| 153 | 153 | } |
| 154 | 154 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | |
| 159 | - public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 159 | + public function countAllAircraftTypes($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 160 | 160 | global $globalStatsFilters; |
| 161 | 161 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 162 | 162 | if ($year == '' && $month == '') { |
@@ -164,24 +164,24 @@ discard block |
||
| 164 | 164 | else $query = "SELECT aircraft_icao, cnt AS aircraft_icao_count, aircraft_name, aircraft_manufacturer FROM stats_aircraft WHERE aircraft_name <> '' AND aircraft_icao <> '' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_icao_count DESC"; |
| 165 | 165 | try { |
| 166 | 166 | $sth = $this->db->prepare($query); |
| 167 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 168 | - } catch(PDOException $e) { |
|
| 167 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 168 | + } catch (PDOException $e) { |
|
| 169 | 169 | echo "error : ".$e->getMessage(); |
| 170 | 170 | } |
| 171 | 171 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 172 | 172 | } else $all = array(); |
| 173 | 173 | if (empty($all)) { |
| 174 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 174 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 175 | 175 | if ($filter_name != '') { |
| 176 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 176 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 177 | 177 | } |
| 178 | 178 | $Spotter = new Spotter($this->db); |
| 179 | 179 | //$all = $Spotter->countAllAircraftTypes($limit,0,'',$filters,$year,$month); |
| 180 | - $all = $Spotter->countAllAircraftTypes($limit,0,'',$filters); |
|
| 180 | + $all = $Spotter->countAllAircraftTypes($limit, 0, '', $filters); |
|
| 181 | 181 | } |
| 182 | 182 | return $all; |
| 183 | 183 | } |
| 184 | - public function countAllAirlineCountries($limit = true,$filter_name = '',$year = '',$month = '') { |
|
| 184 | + public function countAllAirlineCountries($limit = true, $filter_name = '', $year = '', $month = '') { |
|
| 185 | 185 | global $globalStatsFilters; |
| 186 | 186 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 187 | 187 | if ($year == '' && $month == '') { |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | try { |
| 191 | 191 | $sth = $this->db->prepare($query); |
| 192 | 192 | $sth->execute(array(':filter_name' => $filter_name)); |
| 193 | - } catch(PDOException $e) { |
|
| 193 | + } catch (PDOException $e) { |
|
| 194 | 194 | echo "error : ".$e->getMessage(); |
| 195 | 195 | } |
| 196 | 196 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -198,16 +198,16 @@ discard block |
||
| 198 | 198 | if (empty($all)) { |
| 199 | 199 | $Spotter = new Spotter($this->db); |
| 200 | 200 | $filters = array(); |
| 201 | - $filters = array('year' => $year,'month' => $month); |
|
| 201 | + $filters = array('year' => $year, 'month' => $month); |
|
| 202 | 202 | if ($filter_name != '') { |
| 203 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 203 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 204 | 204 | } |
| 205 | 205 | //$all = $Spotter->countAllAirlineCountries($limit,$filters,$year,$month); |
| 206 | - $all = $Spotter->countAllAirlineCountries($limit,$filters); |
|
| 206 | + $all = $Spotter->countAllAirlineCountries($limit, $filters); |
|
| 207 | 207 | } |
| 208 | 208 | return $all; |
| 209 | 209 | } |
| 210 | - public function countAllAircraftManufacturers($limit = true,$stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 210 | + public function countAllAircraftManufacturers($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 211 | 211 | global $globalStatsFilters; |
| 212 | 212 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 213 | 213 | if ($year == '' && $month == '') { |
@@ -215,16 +215,16 @@ discard block |
||
| 215 | 215 | else $query = "SELECT aircraft_manufacturer, SUM(stats_aircraft.cnt) as aircraft_manufacturer_count FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY aircraft_manufacturer ORDER BY aircraft_manufacturer_count DESC"; |
| 216 | 216 | try { |
| 217 | 217 | $sth = $this->db->prepare($query); |
| 218 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 219 | - } catch(PDOException $e) { |
|
| 218 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 219 | + } catch (PDOException $e) { |
|
| 220 | 220 | echo "error : ".$e->getMessage(); |
| 221 | 221 | } |
| 222 | 222 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 223 | 223 | } else $all = array(); |
| 224 | 224 | if (empty($all)) { |
| 225 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 225 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 226 | 226 | if ($filter_name != '') { |
| 227 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 227 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 228 | 228 | } |
| 229 | 229 | $Spotter = new Spotter($this->db); |
| 230 | 230 | //$all = $Spotter->countAllAircraftManufacturers($filters,$year,$month); |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | return $all; |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | - public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '',$year = '', $month = '') { |
|
| 236 | + public function countAllArrivalCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 237 | 237 | global $globalStatsFilters; |
| 238 | 238 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 239 | 239 | if ($year == '' && $month == '') { |
@@ -241,20 +241,20 @@ discard block |
||
| 241 | 241 | else $query = "SELECT airport_country AS airport_arrival_country, SUM(arrival) as airport_arrival_country_count, countries.iso3 AS airport_arrival_country_iso3 FROM stats_airport, countries WHERE countries.name = stats_aiport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_arrival_country, countries.iso3 ORDER BY airport_arrival_country_count DESC"; |
| 242 | 242 | try { |
| 243 | 243 | $sth = $this->db->prepare($query); |
| 244 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 245 | - } catch(PDOException $e) { |
|
| 244 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 245 | + } catch (PDOException $e) { |
|
| 246 | 246 | echo "error : ".$e->getMessage(); |
| 247 | 247 | } |
| 248 | 248 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 249 | 249 | } else $all = array(); |
| 250 | 250 | if (empty($all)) { |
| 251 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 251 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 252 | 252 | if ($filter_name != '') { |
| 253 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 253 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 254 | 254 | } |
| 255 | 255 | $Spotter = new Spotter($this->db); |
| 256 | 256 | //$all = $Spotter->countAllArrivalCountries($limit,$filters,$year,$month); |
| 257 | - $all = $Spotter->countAllArrivalCountries($limit,$filters); |
|
| 257 | + $all = $Spotter->countAllArrivalCountries($limit, $filters); |
|
| 258 | 258 | } |
| 259 | 259 | return $all; |
| 260 | 260 | } |
@@ -265,15 +265,15 @@ discard block |
||
| 265 | 265 | else $query = "SELECT airport_country AS airport_departure_country, SUM(departure) as airport_departure_country_count, countries.iso3 as airport_departure_country_iso3 FROM stats_airport, countries WHERE countries.iso3 = stats_airport.airport_country AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name GROUP BY airport_departure_country, countries.iso3 ORDER BY airport_departure_country_count DESC"; |
| 266 | 266 | try { |
| 267 | 267 | $sth = $this->db->prepare($query); |
| 268 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 269 | - } catch(PDOException $e) { |
|
| 268 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 269 | + } catch (PDOException $e) { |
|
| 270 | 270 | echo "error : ".$e->getMessage(); |
| 271 | 271 | } |
| 272 | 272 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 273 | 273 | if (empty($all)) { |
| 274 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 274 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 275 | 275 | if ($filter_name != '') { |
| 276 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 276 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 277 | 277 | } |
| 278 | 278 | $Spotter = new Spotter($this->db); |
| 279 | 279 | //$all = $Spotter->countAllDepartureCountries($filters,$year,$month); |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | return $all; |
| 283 | 283 | } |
| 284 | 284 | |
| 285 | - public function countAllAirlines($limit = true,$filter_name = '',$year = '',$month = '') { |
|
| 285 | + public function countAllAirlines($limit = true, $filter_name = '', $year = '', $month = '') { |
|
| 286 | 286 | global $globalStatsFilters, $globalVATSIM, $globalIVAO; |
| 287 | 287 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 288 | 288 | if ($year == '' && $month == '') { |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | if (isset($forsource)) { |
| 292 | 292 | if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
| 293 | 293 | else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource = :forsource ORDER BY airline_count DESC"; |
| 294 | - $query_values = array(':filter_name' => $filter_name,':forsource' => $forsource); |
|
| 294 | + $query_values = array(':filter_name' => $filter_name, ':forsource' => $forsource); |
|
| 295 | 295 | } else { |
| 296 | 296 | if ($limit) $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC LIMIT 10 OFFSET 0"; |
| 297 | 297 | else $query = "SELECT DISTINCT stats_airline.airline_icao, stats_airline.cnt AS airline_count, stats_airline.airline_name, airlines.country as airline_country FROM stats_airline, airlines WHERE stats_airline.airline_name <> '' AND stats_airline.airline_icao <> '' AND airlines.icao = stats_airline.airline_icao AND filter_name = :filter_name AND airlines.forsource IS NULL ORDER BY airline_count DESC"; |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | try { |
| 301 | 301 | $sth = $this->db->prepare($query); |
| 302 | 302 | $sth->execute($query_values); |
| 303 | - } catch(PDOException $e) { |
|
| 303 | + } catch (PDOException $e) { |
|
| 304 | 304 | echo "error : ".$e->getMessage(); |
| 305 | 305 | } |
| 306 | 306 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -308,16 +308,16 @@ discard block |
||
| 308 | 308 | if (empty($all)) { |
| 309 | 309 | $Spotter = new Spotter($this->db); |
| 310 | 310 | $filters = array(); |
| 311 | - $filters = array('year' => $year,'month' => $month); |
|
| 311 | + $filters = array('year' => $year, 'month' => $month); |
|
| 312 | 312 | if ($filter_name != '') { |
| 313 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 313 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 314 | 314 | } |
| 315 | 315 | //$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
| 316 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
| 316 | + $all = $Spotter->countAllAirlines($limit, 0, '', $filters); |
|
| 317 | 317 | } |
| 318 | 318 | return $all; |
| 319 | 319 | } |
| 320 | - public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 320 | + public function countAllAircraftRegistrations($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 321 | 321 | global $globalStatsFilters; |
| 322 | 322 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 323 | 323 | if ($year == '' && $month == '') { |
@@ -325,24 +325,24 @@ discard block |
||
| 325 | 325 | else $query = "SELECT s.aircraft_icao, s.cnt AS aircraft_registration_count, a.type AS aircraft_name FROM stats_registration s, aircraft a WHERE s.registration <> '' AND a.icao = s.aircraft_icao AND s.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY aircraft_registration_count DESC"; |
| 326 | 326 | try { |
| 327 | 327 | $sth = $this->db->prepare($query); |
| 328 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 329 | - } catch(PDOException $e) { |
|
| 328 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 329 | + } catch (PDOException $e) { |
|
| 330 | 330 | echo "error : ".$e->getMessage(); |
| 331 | 331 | } |
| 332 | 332 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 333 | 333 | } else $all = array(); |
| 334 | 334 | if (empty($all)) { |
| 335 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 335 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 336 | 336 | if ($filter_name != '') { |
| 337 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 337 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 338 | 338 | } |
| 339 | 339 | $Spotter = new Spotter($this->db); |
| 340 | 340 | //$all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters,$year,$month); |
| 341 | - $all = $Spotter->countAllAircraftRegistrations($limit,0,'',$filters); |
|
| 341 | + $all = $Spotter->countAllAircraftRegistrations($limit, 0, '', $filters); |
|
| 342 | 342 | } |
| 343 | 343 | return $all; |
| 344 | 344 | } |
| 345 | - public function countAllCallsigns($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 345 | + public function countAllCallsigns($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 346 | 346 | global $globalStatsFilters; |
| 347 | 347 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 348 | 348 | if ($year == '' && $month == '') { |
@@ -350,24 +350,24 @@ discard block |
||
| 350 | 350 | else $query = "SELECT s.callsign_icao, s.cnt AS callsign_icao_count, a.name AS airline_name, a.icao as airline_icao FROM stats_callsign s, airlines a WHERE s.callsign_icao <> '' AND a.icao = s.airline_icao AND s.airline_icao = :stats_airline AND filter_name = :filter_name ORDER BY callsign_icao_count DESC"; |
| 351 | 351 | try { |
| 352 | 352 | $sth = $this->db->prepare($query); |
| 353 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 354 | - } catch(PDOException $e) { |
|
| 353 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 354 | + } catch (PDOException $e) { |
|
| 355 | 355 | echo "error : ".$e->getMessage(); |
| 356 | 356 | } |
| 357 | 357 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 358 | 358 | } else $all = array(); |
| 359 | 359 | if (empty($all)) { |
| 360 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 360 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 361 | 361 | if ($filter_name != '') { |
| 362 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 362 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 363 | 363 | } |
| 364 | 364 | $Spotter = new Spotter($this->db); |
| 365 | 365 | //$all = $Spotter->countAllCallsigns($limit,0,'',$filters,$year,$month); |
| 366 | - $all = $Spotter->countAllCallsigns($limit,0,'',$filters); |
|
| 366 | + $all = $Spotter->countAllCallsigns($limit, 0, '', $filters); |
|
| 367 | 367 | } |
| 368 | 368 | return $all; |
| 369 | 369 | } |
| 370 | - public function countAllFlightOverCountries($limit = true, $stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 370 | + public function countAllFlightOverCountries($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 371 | 371 | $Connection = new Connection(); |
| 372 | 372 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 373 | 373 | if ($Connection->tableExists('countries')) { |
@@ -376,8 +376,8 @@ discard block |
||
| 376 | 376 | else $query = "SELECT countries.iso3 as flight_country_iso3, countries.iso2 as flight_country_iso2, countries.name as flight_country, cnt as flight_count, lat as flight_country_latitude, lon as flight_country_longitude FROM stats_country, countries WHERE stats_country.iso2 = countries.iso2 AND stats_country.stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY flight_count DESC"; |
| 377 | 377 | try { |
| 378 | 378 | $sth = $this->db->prepare($query); |
| 379 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 380 | - } catch(PDOException $e) { |
|
| 379 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 380 | + } catch (PDOException $e) { |
|
| 381 | 381 | echo "error : ".$e->getMessage(); |
| 382 | 382 | } |
| 383 | 383 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | return array(); |
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | - public function countAllPilots($limit = true,$stats_airline = '',$filter_name = '', $year = '',$month = '') { |
|
| 396 | + public function countAllPilots($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 397 | 397 | global $globalStatsFilters; |
| 398 | 398 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 399 | 399 | if ($year == '' && $month == '') { |
@@ -401,25 +401,25 @@ discard block |
||
| 401 | 401 | else $query = "SELECT pilot_id, cnt AS pilot_count, pilot_name, format_source FROM stats_pilot WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY pilot_count DESC"; |
| 402 | 402 | try { |
| 403 | 403 | $sth = $this->db->prepare($query); |
| 404 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 405 | - } catch(PDOException $e) { |
|
| 404 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 405 | + } catch (PDOException $e) { |
|
| 406 | 406 | echo "error : ".$e->getMessage(); |
| 407 | 407 | } |
| 408 | 408 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 409 | 409 | } else $all = array(); |
| 410 | 410 | if (empty($all)) { |
| 411 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 411 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 412 | 412 | if ($filter_name != '') { |
| 413 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 413 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 414 | 414 | } |
| 415 | 415 | $Spotter = new Spotter($this->db); |
| 416 | 416 | //$all = $Spotter->countAllPilots($limit,0,'',$filters,$year,$month); |
| 417 | - $all = $Spotter->countAllPilots($limit,0,'',$filters); |
|
| 417 | + $all = $Spotter->countAllPilots($limit, 0, '', $filters); |
|
| 418 | 418 | } |
| 419 | 419 | return $all; |
| 420 | 420 | } |
| 421 | 421 | |
| 422 | - public function countAllOwners($limit = true,$stats_airline = '', $filter_name = '',$year = '',$month = '') { |
|
| 422 | + public function countAllOwners($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 423 | 423 | global $globalStatsFilters; |
| 424 | 424 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 425 | 425 | if ($year == '' && $month == '') { |
@@ -427,24 +427,24 @@ discard block |
||
| 427 | 427 | else $query = "SELECT owner_name, cnt AS owner_count FROM stats_owner WHERE stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY owner_count DESC"; |
| 428 | 428 | try { |
| 429 | 429 | $sth = $this->db->prepare($query); |
| 430 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 431 | - } catch(PDOException $e) { |
|
| 430 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 431 | + } catch (PDOException $e) { |
|
| 432 | 432 | echo "error : ".$e->getMessage(); |
| 433 | 433 | } |
| 434 | 434 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 435 | 435 | } else $all = array(); |
| 436 | 436 | if (empty($all)) { |
| 437 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 437 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 438 | 438 | if ($filter_name != '') { |
| 439 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 439 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 440 | 440 | } |
| 441 | 441 | $Spotter = new Spotter($this->db); |
| 442 | 442 | //$all = $Spotter->countAllOwners($limit,0,'',$filters,$year,$month); |
| 443 | - $all = $Spotter->countAllOwners($limit,0,'',$filters); |
|
| 443 | + $all = $Spotter->countAllOwners($limit, 0, '', $filters); |
|
| 444 | 444 | } |
| 445 | 445 | return $all; |
| 446 | 446 | } |
| 447 | - public function countAllDepartureAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 447 | + public function countAllDepartureAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 448 | 448 | global $globalStatsFilters; |
| 449 | 449 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 450 | 450 | if ($year == '' && $month == '') { |
@@ -452,22 +452,22 @@ discard block |
||
| 452 | 452 | else $query = "SELECT DISTINCT airport_icao AS airport_departure_icao,airport_city AS airport_departure_city,airport_country AS airport_departure_country,departure AS airport_departure_icao_count, airport.latitude AS airport_departure_latitude, airport.longitude AS airport_departure_longitude FROM stats_airport,airport WHERE airport.icao = stats_airport.airport_icao AND departure > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_departure_icao_count DESC"; |
| 453 | 453 | try { |
| 454 | 454 | $sth = $this->db->prepare($query); |
| 455 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 456 | - } catch(PDOException $e) { |
|
| 455 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 456 | + } catch (PDOException $e) { |
|
| 457 | 457 | echo "error : ".$e->getMessage(); |
| 458 | 458 | } |
| 459 | 459 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 460 | 460 | } else $all = array(); |
| 461 | 461 | if (empty($all)) { |
| 462 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 462 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 463 | 463 | if ($filter_name != '') { |
| 464 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 464 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 465 | 465 | } |
| 466 | 466 | $Spotter = new Spotter($this->db); |
| 467 | 467 | // $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters,$year,$month); |
| 468 | 468 | // $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters,$year,$month); |
| 469 | - $pall = $Spotter->countAllDepartureAirports($limit,0,'',$filters); |
|
| 470 | - $dall = $Spotter->countAllDetectedDepartureAirports($limit,0,'',$filters); |
|
| 469 | + $pall = $Spotter->countAllDepartureAirports($limit, 0, '', $filters); |
|
| 470 | + $dall = $Spotter->countAllDetectedDepartureAirports($limit, 0, '', $filters); |
|
| 471 | 471 | $all = array(); |
| 472 | 472 | foreach ($pall as $value) { |
| 473 | 473 | $icao = $value['airport_departure_icao']; |
@@ -484,11 +484,11 @@ discard block |
||
| 484 | 484 | foreach ($all as $key => $row) { |
| 485 | 485 | $count[$key] = $row['airport_departure_icao_count']; |
| 486 | 486 | } |
| 487 | - array_multisort($count,SORT_DESC,$all); |
|
| 487 | + array_multisort($count, SORT_DESC, $all); |
|
| 488 | 488 | } |
| 489 | 489 | return $all; |
| 490 | 490 | } |
| 491 | - public function countAllArrivalAirports($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 491 | + public function countAllArrivalAirports($limit = true, $stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 492 | 492 | global $globalStatsFilters; |
| 493 | 493 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 494 | 494 | if ($year == '' && $month == '') { |
@@ -496,22 +496,22 @@ discard block |
||
| 496 | 496 | else $query = "SELECT DISTINCT airport_icao AS airport_arrival_icao,airport_city AS airport_arrival_city,airport_country AS airport_arrival_country,arrival AS airport_arrival_icao_count, airport.latitude AS airport_arrival_latitude, airport.longitude AS airport_arrival_longitude FROM stats_airport, airport WHERE airport.icao = stats_airport.airport_icao AND arrival > 0 AND stats_type = 'yearly' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY airport_arrival_icao_count DESC"; |
| 497 | 497 | try { |
| 498 | 498 | $sth = $this->db->prepare($query); |
| 499 | - $sth->execute(array(':stats_airline' => $stats_airline,':filter_name' => $filter_name)); |
|
| 500 | - } catch(PDOException $e) { |
|
| 499 | + $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
|
| 500 | + } catch (PDOException $e) { |
|
| 501 | 501 | echo "error : ".$e->getMessage(); |
| 502 | 502 | } |
| 503 | 503 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 504 | 504 | } else $all = array(); |
| 505 | 505 | if (empty($all)) { |
| 506 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 506 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 507 | 507 | if ($filter_name != '') { |
| 508 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 508 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 509 | 509 | } |
| 510 | 510 | $Spotter = new Spotter($this->db); |
| 511 | 511 | // $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 512 | 512 | // $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters,$year,$month); |
| 513 | - $pall = $Spotter->countAllArrivalAirports($limit,0,'',false,$filters); |
|
| 514 | - $dall = $Spotter->countAllDetectedArrivalAirports($limit,0,'',false,$filters); |
|
| 513 | + $pall = $Spotter->countAllArrivalAirports($limit, 0, '', false, $filters); |
|
| 514 | + $dall = $Spotter->countAllDetectedArrivalAirports($limit, 0, '', false, $filters); |
|
| 515 | 515 | $all = array(); |
| 516 | 516 | foreach ($pall as $value) { |
| 517 | 517 | $icao = $value['airport_arrival_icao']; |
@@ -528,12 +528,12 @@ discard block |
||
| 528 | 528 | foreach ($all as $key => $row) { |
| 529 | 529 | $count[$key] = $row['airport_arrival_icao_count']; |
| 530 | 530 | } |
| 531 | - array_multisort($count,SORT_DESC,$all); |
|
| 531 | + array_multisort($count, SORT_DESC, $all); |
|
| 532 | 532 | } |
| 533 | 533 | |
| 534 | 534 | return $all; |
| 535 | 535 | } |
| 536 | - public function countAllMonthsLastYear($limit = true,$stats_airline = '',$filter_name = '') { |
|
| 536 | + public function countAllMonthsLastYear($limit = true, $stats_airline = '', $filter_name = '') { |
|
| 537 | 537 | global $globalDBdriver, $globalStatsFilters; |
| 538 | 538 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 539 | 539 | if ($globalDBdriver == 'mysql') { |
@@ -543,18 +543,18 @@ discard block |
||
| 543 | 543 | if ($limit) $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '12 MONTHS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 544 | 544 | else $query = "SELECT EXTRACT(MONTH FROM stats_date) as month_name, EXTRACT(YEAR FROM stats_date) as year_name, cnt as date_count FROM stats WHERE stats_type = 'flights_bymonth' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 545 | 545 | } |
| 546 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 546 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 547 | 547 | try { |
| 548 | 548 | $sth = $this->db->prepare($query); |
| 549 | 549 | $sth->execute($query_data); |
| 550 | - } catch(PDOException $e) { |
|
| 550 | + } catch (PDOException $e) { |
|
| 551 | 551 | echo "error : ".$e->getMessage(); |
| 552 | 552 | } |
| 553 | 553 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 554 | 554 | if (empty($all)) { |
| 555 | 555 | $filters = array('airlines' => array($stats_airline)); |
| 556 | 556 | if ($filter_name != '') { |
| 557 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 557 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 558 | 558 | } |
| 559 | 559 | $Spotter = new Spotter($this->db); |
| 560 | 560 | $all = $Spotter->countAllMonthsLastYear($filters); |
@@ -563,29 +563,29 @@ discard block |
||
| 563 | 563 | return $all; |
| 564 | 564 | } |
| 565 | 565 | |
| 566 | - public function countAllDatesLastMonth($stats_airline = '',$filter_name = '') { |
|
| 566 | + public function countAllDatesLastMonth($stats_airline = '', $filter_name = '') { |
|
| 567 | 567 | global $globalStatsFilters; |
| 568 | 568 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 569 | 569 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 570 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 570 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 571 | 571 | try { |
| 572 | 572 | $sth = $this->db->prepare($query); |
| 573 | 573 | $sth->execute($query_data); |
| 574 | - } catch(PDOException $e) { |
|
| 574 | + } catch (PDOException $e) { |
|
| 575 | 575 | echo "error : ".$e->getMessage(); |
| 576 | 576 | } |
| 577 | 577 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 578 | 578 | if (empty($all)) { |
| 579 | 579 | $filters = array('airlines' => array($stats_airline)); |
| 580 | 580 | if ($filter_name != '') { |
| 581 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 581 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 582 | 582 | } |
| 583 | 583 | $Spotter = new Spotter($this->db); |
| 584 | 584 | $all = $Spotter->countAllDatesLastMonth($filters); |
| 585 | 585 | } |
| 586 | 586 | return $all; |
| 587 | 587 | } |
| 588 | - public function countAllDatesLast7Days($stats_airline = '',$filter_name = '') { |
|
| 588 | + public function countAllDatesLast7Days($stats_airline = '', $filter_name = '') { |
|
| 589 | 589 | global $globalDBdriver, $globalStatsFilters; |
| 590 | 590 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 591 | 591 | if ($globalDBdriver == 'mysql') { |
@@ -593,40 +593,40 @@ discard block |
||
| 593 | 593 | } else { |
| 594 | 594 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'month' AND flight_date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '7 DAYS' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 595 | 595 | } |
| 596 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 596 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 597 | 597 | try { |
| 598 | 598 | $sth = $this->db->prepare($query); |
| 599 | 599 | $sth->execute($query_data); |
| 600 | - } catch(PDOException $e) { |
|
| 600 | + } catch (PDOException $e) { |
|
| 601 | 601 | echo "error : ".$e->getMessage(); |
| 602 | 602 | } |
| 603 | 603 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 604 | 604 | if (empty($all)) { |
| 605 | 605 | $filters = array('airlines' => array($stats_airline)); |
| 606 | 606 | if ($filter_name != '') { |
| 607 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 607 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 608 | 608 | } |
| 609 | 609 | $Spotter = new Spotter($this->db); |
| 610 | 610 | $all = $Spotter->countAllDatesLast7Days($filters); |
| 611 | 611 | } |
| 612 | 612 | return $all; |
| 613 | 613 | } |
| 614 | - public function countAllDates($stats_airline = '',$filter_name = '') { |
|
| 614 | + public function countAllDates($stats_airline = '', $filter_name = '') { |
|
| 615 | 615 | global $globalStatsFilters; |
| 616 | 616 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 617 | 617 | $query = "SELECT flight_date as date_name, cnt as date_count FROM stats_flight WHERE stats_type = 'date' AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date_count DESC"; |
| 618 | - $query_data = array(':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 618 | + $query_data = array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 619 | 619 | try { |
| 620 | 620 | $sth = $this->db->prepare($query); |
| 621 | 621 | $sth->execute($query_data); |
| 622 | - } catch(PDOException $e) { |
|
| 622 | + } catch (PDOException $e) { |
|
| 623 | 623 | echo "error : ".$e->getMessage(); |
| 624 | 624 | } |
| 625 | 625 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 626 | 626 | if (empty($all)) { |
| 627 | 627 | $filters = array('airlines' => array($stats_airline)); |
| 628 | 628 | if ($filter_name != '') { |
| 629 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 629 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 630 | 630 | } |
| 631 | 631 | $Spotter = new Spotter($this->db); |
| 632 | 632 | $all = $Spotter->countAllDates($filters); |
@@ -641,21 +641,21 @@ discard block |
||
| 641 | 641 | try { |
| 642 | 642 | $sth = $this->db->prepare($query); |
| 643 | 643 | $sth->execute($query_data); |
| 644 | - } catch(PDOException $e) { |
|
| 644 | + } catch (PDOException $e) { |
|
| 645 | 645 | echo "error : ".$e->getMessage(); |
| 646 | 646 | } |
| 647 | 647 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 648 | 648 | if (empty($all)) { |
| 649 | 649 | $filters = array(); |
| 650 | 650 | if ($filter_name != '') { |
| 651 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 651 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 652 | 652 | } |
| 653 | 653 | $Spotter = new Spotter($this->db); |
| 654 | 654 | $all = $Spotter->countAllDatesByAirlines($filters); |
| 655 | 655 | } |
| 656 | 656 | return $all; |
| 657 | 657 | } |
| 658 | - public function countAllMonths($stats_airline = '',$filter_name = '') { |
|
| 658 | + public function countAllMonths($stats_airline = '', $filter_name = '') { |
|
| 659 | 659 | global $globalStatsFilters, $globalDBdriver; |
| 660 | 660 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 661 | 661 | if ($globalDBdriver == 'mysql') { |
@@ -666,7 +666,7 @@ discard block |
||
| 666 | 666 | try { |
| 667 | 667 | $sth = $this->db->prepare($query); |
| 668 | 668 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 669 | - } catch(PDOException $e) { |
|
| 669 | + } catch (PDOException $e) { |
|
| 670 | 670 | echo "error : ".$e->getMessage(); |
| 671 | 671 | } |
| 672 | 672 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -674,7 +674,7 @@ discard block |
||
| 674 | 674 | if (empty($all)) { |
| 675 | 675 | $filters = array('airlines' => array($stats_airline)); |
| 676 | 676 | if ($filter_name != '') { |
| 677 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 677 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 678 | 678 | } |
| 679 | 679 | $Spotter = new Spotter($this->db); |
| 680 | 680 | $all = $Spotter->countAllMonths($filters); |
@@ -692,7 +692,7 @@ discard block |
||
| 692 | 692 | try { |
| 693 | 693 | $sth = $this->db->prepare($query); |
| 694 | 694 | $sth->execute(); |
| 695 | - } catch(PDOException $e) { |
|
| 695 | + } catch (PDOException $e) { |
|
| 696 | 696 | echo "error : ".$e->getMessage(); |
| 697 | 697 | } |
| 698 | 698 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | try { |
| 714 | 714 | $sth = $this->db->prepare($query); |
| 715 | 715 | $sth->execute(); |
| 716 | - } catch(PDOException $e) { |
|
| 716 | + } catch (PDOException $e) { |
|
| 717 | 717 | echo "error : ".$e->getMessage(); |
| 718 | 718 | } |
| 719 | 719 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -731,21 +731,21 @@ discard block |
||
| 731 | 731 | try { |
| 732 | 732 | $sth = $this->db->prepare($query); |
| 733 | 733 | $sth->execute(array(':filter_name' => $filter_name)); |
| 734 | - } catch(PDOException $e) { |
|
| 734 | + } catch (PDOException $e) { |
|
| 735 | 735 | echo "error : ".$e->getMessage(); |
| 736 | 736 | } |
| 737 | 737 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 738 | 738 | if (empty($all)) { |
| 739 | 739 | $filters = array(); |
| 740 | 740 | if ($filter_name != '') { |
| 741 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 741 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 742 | 742 | } |
| 743 | 743 | $Spotter = new Spotter($this->db); |
| 744 | 744 | $all = $Spotter->countAllMilitaryMonths($filters); |
| 745 | 745 | } |
| 746 | 746 | return $all; |
| 747 | 747 | } |
| 748 | - public function countAllHours($orderby = 'hour',$limit = true,$stats_airline = '',$filter_name = '') { |
|
| 748 | + public function countAllHours($orderby = 'hour', $limit = true, $stats_airline = '', $filter_name = '') { |
|
| 749 | 749 | global $globalTimezone, $globalDBdriver, $globalStatsFilters; |
| 750 | 750 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 751 | 751 | if ($limit) $query = "SELECT flight_date as hour_name, cnt as hour_count FROM stats_flight WHERE stats_type = 'hour' AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
@@ -762,30 +762,30 @@ discard block |
||
| 762 | 762 | try { |
| 763 | 763 | $sth = $this->db->prepare($query); |
| 764 | 764 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 765 | - } catch(PDOException $e) { |
|
| 765 | + } catch (PDOException $e) { |
|
| 766 | 766 | echo "error : ".$e->getMessage(); |
| 767 | 767 | } |
| 768 | 768 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 769 | 769 | if (empty($all)) { |
| 770 | 770 | $filters = array('airlines' => array($stats_airline)); |
| 771 | 771 | if ($filter_name != '') { |
| 772 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 772 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 773 | 773 | } |
| 774 | 774 | $Spotter = new Spotter($this->db); |
| 775 | - $all = $Spotter->countAllHours($orderby,$filters); |
|
| 775 | + $all = $Spotter->countAllHours($orderby, $filters); |
|
| 776 | 776 | } |
| 777 | 777 | return $all; |
| 778 | 778 | } |
| 779 | 779 | |
| 780 | - public function countOverallFlights($stats_airline = '', $filter_name = '',$year = '',$month = '') { |
|
| 780 | + public function countOverallFlights($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 781 | 781 | global $globalStatsFilters; |
| 782 | 782 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 783 | 783 | if ($year == '') $year = date('Y'); |
| 784 | - $all = $this->getSumStats('flights_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 784 | + $all = $this->getSumStats('flights_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 785 | 785 | if (empty($all)) { |
| 786 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 786 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 787 | 787 | if ($filter_name != '') { |
| 788 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 788 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 789 | 789 | } |
| 790 | 790 | $Spotter = new Spotter($this->db); |
| 791 | 791 | //$all = $Spotter->countOverallFlights($filters,$year,$month); |
@@ -793,16 +793,16 @@ discard block |
||
| 793 | 793 | } |
| 794 | 794 | return $all; |
| 795 | 795 | } |
| 796 | - public function countOverallMilitaryFlights($filter_name = '',$year = '', $month = '') { |
|
| 796 | + public function countOverallMilitaryFlights($filter_name = '', $year = '', $month = '') { |
|
| 797 | 797 | global $globalStatsFilters; |
| 798 | 798 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 799 | 799 | if ($year == '') $year = date('Y'); |
| 800 | - $all = $this->getSumStats('military_flights_bymonth',$year,'',$filter_name,$month); |
|
| 800 | + $all = $this->getSumStats('military_flights_bymonth', $year, '', $filter_name, $month); |
|
| 801 | 801 | if (empty($all)) { |
| 802 | 802 | $filters = array(); |
| 803 | - $filters = array('year' => $year,'month' => $month); |
|
| 803 | + $filters = array('year' => $year, 'month' => $month); |
|
| 804 | 804 | if ($filter_name != '') { |
| 805 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 805 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 806 | 806 | } |
| 807 | 807 | $Spotter = new Spotter($this->db); |
| 808 | 808 | //$all = $Spotter->countOverallMilitaryFlights($filters,$year,$month); |
@@ -810,15 +810,15 @@ discard block |
||
| 810 | 810 | } |
| 811 | 811 | return $all; |
| 812 | 812 | } |
| 813 | - public function countOverallArrival($stats_airline = '',$filter_name = '', $year = '', $month = '') { |
|
| 813 | + public function countOverallArrival($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 814 | 814 | global $globalStatsFilters; |
| 815 | 815 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 816 | 816 | if ($year == '') $year = date('Y'); |
| 817 | - $all = $this->getSumStats('realarrivals_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 817 | + $all = $this->getSumStats('realarrivals_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 818 | 818 | if (empty($all)) { |
| 819 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 819 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 820 | 820 | if ($filter_name != '') { |
| 821 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 821 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 822 | 822 | } |
| 823 | 823 | $Spotter = new Spotter($this->db); |
| 824 | 824 | //$all = $Spotter->countOverallArrival($filters,$year,$month); |
@@ -826,24 +826,24 @@ discard block |
||
| 826 | 826 | } |
| 827 | 827 | return $all; |
| 828 | 828 | } |
| 829 | - public function countOverallAircrafts($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
|
| 829 | + public function countOverallAircrafts($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 830 | 830 | global $globalStatsFilters; |
| 831 | 831 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 832 | 832 | if ($year == '' && $month == '') { |
| 833 | 833 | $query = "SELECT COUNT(*) AS nb FROM stats_aircraft WHERE stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 834 | 834 | try { |
| 835 | 835 | $sth = $this->db->prepare($query); |
| 836 | - $sth->execute(array(':filter_name' => $filter_name,':stats_airline' => $stats_airline)); |
|
| 837 | - } catch(PDOException $e) { |
|
| 836 | + $sth->execute(array(':filter_name' => $filter_name, ':stats_airline' => $stats_airline)); |
|
| 837 | + } catch (PDOException $e) { |
|
| 838 | 838 | echo "error : ".$e->getMessage(); |
| 839 | 839 | } |
| 840 | 840 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 841 | 841 | $all = $result[0]['nb']; |
| 842 | - } else $all = $this->getSumStats('aircrafts_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 842 | + } else $all = $this->getSumStats('aircrafts_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 843 | 843 | if (empty($all)) { |
| 844 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 844 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 845 | 845 | if ($filter_name != '') { |
| 846 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 846 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 847 | 847 | } |
| 848 | 848 | $Spotter = new Spotter($this->db); |
| 849 | 849 | //$all = $Spotter->countOverallAircrafts($filters,$year,$month); |
@@ -851,7 +851,7 @@ discard block |
||
| 851 | 851 | } |
| 852 | 852 | return $all; |
| 853 | 853 | } |
| 854 | - public function countOverallAirlines($filter_name = '',$year = '',$month = '') { |
|
| 854 | + public function countOverallAirlines($filter_name = '', $year = '', $month = '') { |
|
| 855 | 855 | global $globalStatsFilters; |
| 856 | 856 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 857 | 857 | if ($year == '' && $month == '') { |
@@ -859,17 +859,17 @@ discard block |
||
| 859 | 859 | try { |
| 860 | 860 | $sth = $this->db->prepare($query); |
| 861 | 861 | $sth->execute(array(':filter_name' => $filter_name)); |
| 862 | - } catch(PDOException $e) { |
|
| 862 | + } catch (PDOException $e) { |
|
| 863 | 863 | echo "error : ".$e->getMessage(); |
| 864 | 864 | } |
| 865 | 865 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 866 | 866 | $all = $result[0]['nb_airline']; |
| 867 | - } else $all = $this->getSumStats('airlines_bymonth',$year,'',$filter_name,$month); |
|
| 867 | + } else $all = $this->getSumStats('airlines_bymonth', $year, '', $filter_name, $month); |
|
| 868 | 868 | if (empty($all)) { |
| 869 | 869 | $filters = array(); |
| 870 | - $filters = array('year' => $year,'month' => $month); |
|
| 870 | + $filters = array('year' => $year, 'month' => $month); |
|
| 871 | 871 | if ($filter_name != '') { |
| 872 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 872 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 873 | 873 | } |
| 874 | 874 | $Spotter = new Spotter($this->db); |
| 875 | 875 | //$all = $Spotter->countOverallAirlines($filters,$year,$month); |
@@ -877,7 +877,7 @@ discard block |
||
| 877 | 877 | } |
| 878 | 878 | return $all; |
| 879 | 879 | } |
| 880 | - public function countOverallOwners($stats_airline = '',$filter_name = '',$year = '', $month = '') { |
|
| 880 | + public function countOverallOwners($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 881 | 881 | global $globalStatsFilters; |
| 882 | 882 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 883 | 883 | if ($year == '' && $month == '') { |
@@ -886,18 +886,18 @@ discard block |
||
| 886 | 886 | try { |
| 887 | 887 | $sth = $this->db->prepare($query); |
| 888 | 888 | $sth->execute($query_values); |
| 889 | - } catch(PDOException $e) { |
|
| 889 | + } catch (PDOException $e) { |
|
| 890 | 890 | echo "error : ".$e->getMessage(); |
| 891 | 891 | } |
| 892 | 892 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 893 | 893 | $all = $result[0]['nb']; |
| 894 | 894 | } else { |
| 895 | - $all = $this->getSumStats('owners_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 895 | + $all = $this->getSumStats('owners_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 896 | 896 | } |
| 897 | 897 | if (empty($all)) { |
| 898 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 898 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 899 | 899 | if ($filter_name != '') { |
| 900 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 900 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 901 | 901 | } |
| 902 | 902 | $Spotter = new Spotter($this->db); |
| 903 | 903 | //$all = $Spotter->countOverallOwners($filters,$year,$month); |
@@ -905,7 +905,7 @@ discard block |
||
| 905 | 905 | } |
| 906 | 906 | return $all; |
| 907 | 907 | } |
| 908 | - public function countOverallPilots($stats_airline = '',$filter_name = '',$year = '',$month = '') { |
|
| 908 | + public function countOverallPilots($stats_airline = '', $filter_name = '', $year = '', $month = '') { |
|
| 909 | 909 | global $globalStatsFilters; |
| 910 | 910 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 911 | 911 | //if ($year == '') $year = date('Y'); |
@@ -915,18 +915,18 @@ discard block |
||
| 915 | 915 | try { |
| 916 | 916 | $sth = $this->db->prepare($query); |
| 917 | 917 | $sth->execute($query_values); |
| 918 | - } catch(PDOException $e) { |
|
| 918 | + } catch (PDOException $e) { |
|
| 919 | 919 | echo "error : ".$e->getMessage(); |
| 920 | 920 | } |
| 921 | 921 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 922 | 922 | $all = $result[0]['nb']; |
| 923 | 923 | } else { |
| 924 | - $all = $this->getSumStats('pilots_bymonth',$year,$stats_airline,$filter_name,$month); |
|
| 924 | + $all = $this->getSumStats('pilots_bymonth', $year, $stats_airline, $filter_name, $month); |
|
| 925 | 925 | } |
| 926 | 926 | if (empty($all)) { |
| 927 | - $filters = array('airlines' => array($stats_airline),'year' => $year,'month' => $month); |
|
| 927 | + $filters = array('airlines' => array($stats_airline), 'year' => $year, 'month' => $month); |
|
| 928 | 928 | if ($filter_name != '') { |
| 929 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
| 929 | + $filters = array_merge($filters, $globalStatsFilters[$filter_name]); |
|
| 930 | 930 | } |
| 931 | 931 | $Spotter = new Spotter($this->db); |
| 932 | 932 | //$all = $Spotter->countOverallPilots($filters,$year,$month); |
@@ -935,67 +935,67 @@ discard block |
||
| 935 | 935 | return $all; |
| 936 | 936 | } |
| 937 | 937 | |
| 938 | - public function getLast7DaysAirports($airport_icao = '', $stats_airline = '',$filter_name = '') { |
|
| 938 | + public function getLast7DaysAirports($airport_icao = '', $stats_airline = '', $filter_name = '') { |
|
| 939 | 939 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 940 | 940 | $query = "SELECT * FROM stats_airport WHERE stats_type = 'daily' AND airport_icao = :airport_icao AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY date"; |
| 941 | - $query_values = array(':airport_icao' => $airport_icao,':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 941 | + $query_values = array(':airport_icao' => $airport_icao, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 942 | 942 | try { |
| 943 | 943 | $sth = $this->db->prepare($query); |
| 944 | 944 | $sth->execute($query_values); |
| 945 | - } catch(PDOException $e) { |
|
| 945 | + } catch (PDOException $e) { |
|
| 946 | 946 | echo "error : ".$e->getMessage(); |
| 947 | 947 | } |
| 948 | 948 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 949 | 949 | return $all; |
| 950 | 950 | } |
| 951 | - public function getStats($type,$stats_airline = '', $filter_name = '') { |
|
| 951 | + public function getStats($type, $stats_airline = '', $filter_name = '') { |
|
| 952 | 952 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 953 | 953 | $query = "SELECT * FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name ORDER BY stats_date"; |
| 954 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 954 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 955 | 955 | try { |
| 956 | 956 | $sth = $this->db->prepare($query); |
| 957 | 957 | $sth->execute($query_values); |
| 958 | - } catch(PDOException $e) { |
|
| 958 | + } catch (PDOException $e) { |
|
| 959 | 959 | echo "error : ".$e->getMessage(); |
| 960 | 960 | } |
| 961 | 961 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 962 | 962 | return $all; |
| 963 | 963 | } |
| 964 | - public function deleteStatsByType($type,$stats_airline = '', $filter_name = '') { |
|
| 964 | + public function deleteStatsByType($type, $stats_airline = '', $filter_name = '') { |
|
| 965 | 965 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 966 | 966 | $query = "DELETE FROM stats WHERE stats_type = :type AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 967 | - $query_values = array(':type' => $type,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 967 | + $query_values = array(':type' => $type, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 968 | 968 | try { |
| 969 | 969 | $sth = $this->db->prepare($query); |
| 970 | 970 | $sth->execute($query_values); |
| 971 | - } catch(PDOException $e) { |
|
| 971 | + } catch (PDOException $e) { |
|
| 972 | 972 | echo "error : ".$e->getMessage(); |
| 973 | 973 | } |
| 974 | 974 | } |
| 975 | - public function getSumStats($type,$year,$stats_airline = '',$filter_name = '',$month = '') { |
|
| 975 | + public function getSumStats($type, $year, $stats_airline = '', $filter_name = '', $month = '') { |
|
| 976 | 976 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 977 | 977 | global $globalArchiveMonths, $globalDBdriver; |
| 978 | 978 | if ($globalDBdriver == 'mysql') { |
| 979 | 979 | if ($month == '') { |
| 980 | 980 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 981 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 981 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 982 | 982 | } else { |
| 983 | 983 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND YEAR(stats_date) = :year AND MONTH(stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 984 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
|
| 984 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month); |
|
| 985 | 985 | } |
| 986 | 986 | } else { |
| 987 | 987 | if ($month == '') { |
| 988 | 988 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 989 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 989 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 990 | 990 | } else { |
| 991 | 991 | $query = "SELECT SUM(cnt) as total FROM stats WHERE stats_type = :type AND EXTRACT(YEAR FROM stats_date) = :year AND EXTRACT(MONTH FROM stats_date) = :month AND stats_airline = :stats_airline AND filter_name = :filter_name"; |
| 992 | - $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline,':filter_name' => $filter_name,':month' => $month); |
|
| 992 | + $query_values = array(':type' => $type, ':year' => $year, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':month' => $month); |
|
| 993 | 993 | } |
| 994 | 994 | } |
| 995 | 995 | try { |
| 996 | 996 | $sth = $this->db->prepare($query); |
| 997 | 997 | $sth->execute($query_values); |
| 998 | - } catch(PDOException $e) { |
|
| 998 | + } catch (PDOException $e) { |
|
| 999 | 999 | echo "error : ".$e->getMessage(); |
| 1000 | 1000 | } |
| 1001 | 1001 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1013,7 +1013,7 @@ discard block |
||
| 1013 | 1013 | try { |
| 1014 | 1014 | $sth = $this->db->prepare($query); |
| 1015 | 1015 | $sth->execute($query_values); |
| 1016 | - } catch(PDOException $e) { |
|
| 1016 | + } catch (PDOException $e) { |
|
| 1017 | 1017 | echo "error : ".$e->getMessage(); |
| 1018 | 1018 | } |
| 1019 | 1019 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1030,7 +1030,7 @@ discard block |
||
| 1030 | 1030 | try { |
| 1031 | 1031 | $sth = $this->db->prepare($query); |
| 1032 | 1032 | $sth->execute(array(':stats_airline' => $stats_airline, ':filter_name' => $filter_name)); |
| 1033 | - } catch(PDOException $e) { |
|
| 1033 | + } catch (PDOException $e) { |
|
| 1034 | 1034 | echo "error : ".$e->getMessage(); |
| 1035 | 1035 | } |
| 1036 | 1036 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1047,7 +1047,7 @@ discard block |
||
| 1047 | 1047 | try { |
| 1048 | 1048 | $sth = $this->db->prepare($query); |
| 1049 | 1049 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1050 | - } catch(PDOException $e) { |
|
| 1050 | + } catch (PDOException $e) { |
|
| 1051 | 1051 | echo "error : ".$e->getMessage(); |
| 1052 | 1052 | } |
| 1053 | 1053 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1064,20 +1064,20 @@ discard block |
||
| 1064 | 1064 | try { |
| 1065 | 1065 | $sth = $this->db->prepare($query); |
| 1066 | 1066 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1067 | - } catch(PDOException $e) { |
|
| 1067 | + } catch (PDOException $e) { |
|
| 1068 | 1068 | echo "error : ".$e->getMessage(); |
| 1069 | 1069 | } |
| 1070 | 1070 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1071 | 1071 | return $all[0]['total']; |
| 1072 | 1072 | } |
| 1073 | - public function getStatsOwner($owner_name,$filter_name = '') { |
|
| 1073 | + public function getStatsOwner($owner_name, $filter_name = '') { |
|
| 1074 | 1074 | global $globalArchiveMonths, $globalDBdriver; |
| 1075 | 1075 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1076 | 1076 | $query = "SELECT cnt FROM stats_owner WHERE filter_name = :filter_name AND owner_name = :owner_name"; |
| 1077 | 1077 | try { |
| 1078 | 1078 | $sth = $this->db->prepare($query); |
| 1079 | - $sth->execute(array(':filter_name' => $filter_name,':owner_name' => $owner_name)); |
|
| 1080 | - } catch(PDOException $e) { |
|
| 1079 | + $sth->execute(array(':filter_name' => $filter_name, ':owner_name' => $owner_name)); |
|
| 1080 | + } catch (PDOException $e) { |
|
| 1081 | 1081 | echo "error : ".$e->getMessage(); |
| 1082 | 1082 | } |
| 1083 | 1083 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1095,20 +1095,20 @@ discard block |
||
| 1095 | 1095 | try { |
| 1096 | 1096 | $sth = $this->db->prepare($query); |
| 1097 | 1097 | $sth->execute(array(':filter_name' => $filter_name)); |
| 1098 | - } catch(PDOException $e) { |
|
| 1098 | + } catch (PDOException $e) { |
|
| 1099 | 1099 | echo "error : ".$e->getMessage(); |
| 1100 | 1100 | } |
| 1101 | 1101 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1102 | 1102 | return $all[0]['total']; |
| 1103 | 1103 | } |
| 1104 | - public function getStatsPilot($pilot,$filter_name = '') { |
|
| 1104 | + public function getStatsPilot($pilot, $filter_name = '') { |
|
| 1105 | 1105 | global $globalArchiveMonths, $globalDBdriver; |
| 1106 | 1106 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1107 | 1107 | $query = "SELECT cnt FROM stats_pilot WHERE filter_name = :filter_name AND (pilot_name = :pilot OR pilot_id = :pilot)"; |
| 1108 | 1108 | try { |
| 1109 | 1109 | $sth = $this->db->prepare($query); |
| 1110 | - $sth->execute(array(':filter_name' => $filter_name,':pilot' => $pilot)); |
|
| 1111 | - } catch(PDOException $e) { |
|
| 1110 | + $sth->execute(array(':filter_name' => $filter_name, ':pilot' => $pilot)); |
|
| 1111 | + } catch (PDOException $e) { |
|
| 1112 | 1112 | echo "error : ".$e->getMessage(); |
| 1113 | 1113 | } |
| 1114 | 1114 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -1116,7 +1116,7 @@ discard block |
||
| 1116 | 1116 | else return 0; |
| 1117 | 1117 | } |
| 1118 | 1118 | |
| 1119 | - public function addStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 1119 | + public function addStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 1120 | 1120 | global $globalDBdriver; |
| 1121 | 1121 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1122 | 1122 | if ($globalDBdriver == 'mysql') { |
@@ -1124,15 +1124,15 @@ discard block |
||
| 1124 | 1124 | } else { |
| 1125 | 1125 | $query = "UPDATE stats SET cnt = :cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1126 | 1126 | } |
| 1127 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1127 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1128 | 1128 | try { |
| 1129 | 1129 | $sth = $this->db->prepare($query); |
| 1130 | 1130 | $sth->execute($query_values); |
| 1131 | - } catch(PDOException $e) { |
|
| 1131 | + } catch (PDOException $e) { |
|
| 1132 | 1132 | return "error : ".$e->getMessage(); |
| 1133 | 1133 | } |
| 1134 | 1134 | } |
| 1135 | - public function updateStat($type,$cnt,$stats_date,$stats_airline = '',$filter_name = '') { |
|
| 1135 | + public function updateStat($type, $cnt, $stats_date, $stats_airline = '', $filter_name = '') { |
|
| 1136 | 1136 | global $globalDBdriver; |
| 1137 | 1137 | if ($filter_name == '') $filter_name = $this->filter_name; |
| 1138 | 1138 | if ($globalDBdriver == 'mysql') { |
@@ -1141,11 +1141,11 @@ discard block |
||
| 1141 | 1141 | //$query = "INSERT INTO stats (stats_type,cnt,stats_date) VALUES (:type,:cnt,:stats_date) ON DUPLICATE KEY UPDATE cnt = cnt+:cnt, stats_date = :date"; |
| 1142 | 1142 | $query = "UPDATE stats SET cnt = cnt+:cnt WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats (stats_type,cnt,stats_date,stats_airline,filter_name) SELECT :type,:cnt,:stats_date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats WHERE stats_type = :type AND stats_date = :stats_date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1143 | 1143 | } |
| 1144 | - $query_values = array(':type' => $type,':cnt' => $cnt,':stats_date' => $stats_date,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1144 | + $query_values = array(':type' => $type, ':cnt' => $cnt, ':stats_date' => $stats_date, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1145 | 1145 | try { |
| 1146 | 1146 | $sth = $this->db->prepare($query); |
| 1147 | 1147 | $sth->execute($query_values); |
| 1148 | - } catch(PDOException $e) { |
|
| 1148 | + } catch (PDOException $e) { |
|
| 1149 | 1149 | return "error : ".$e->getMessage(); |
| 1150 | 1150 | } |
| 1151 | 1151 | } |
@@ -1169,75 +1169,75 @@ discard block |
||
| 1169 | 1169 | } |
| 1170 | 1170 | */ |
| 1171 | 1171 | |
| 1172 | - public function getStatsSource($stats_type,$year = '',$month = '',$day = '') { |
|
| 1172 | + public function getStatsSource($stats_type, $year = '', $month = '', $day = '') { |
|
| 1173 | 1173 | global $globalDBdriver; |
| 1174 | 1174 | $query = "SELECT * FROM stats_source WHERE stats_type = :stats_type"; |
| 1175 | 1175 | $query_values = array(); |
| 1176 | 1176 | if ($globalDBdriver == 'mysql') { |
| 1177 | 1177 | if ($year != '') { |
| 1178 | 1178 | $query .= ' AND YEAR(stats_date) = :year'; |
| 1179 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1179 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1180 | 1180 | } |
| 1181 | 1181 | if ($month != '') { |
| 1182 | 1182 | $query .= ' AND MONTH(stats_date) = :month'; |
| 1183 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1183 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1184 | 1184 | } |
| 1185 | 1185 | if ($day != '') { |
| 1186 | 1186 | $query .= ' AND DAY(stats_date) = :day'; |
| 1187 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1187 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1188 | 1188 | } |
| 1189 | 1189 | } else { |
| 1190 | 1190 | if ($year != '') { |
| 1191 | 1191 | $query .= ' AND EXTRACT(YEAR FROM stats_date) = :year'; |
| 1192 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1192 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1193 | 1193 | } |
| 1194 | 1194 | if ($month != '') { |
| 1195 | 1195 | $query .= ' AND EXTRACT(MONTH FROM stats_date) = :month'; |
| 1196 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1196 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1197 | 1197 | } |
| 1198 | 1198 | if ($day != '') { |
| 1199 | 1199 | $query .= ' AND EXTRACT(DAY FROM stats_date) = :day'; |
| 1200 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1200 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1201 | 1201 | } |
| 1202 | 1202 | } |
| 1203 | 1203 | $query .= " ORDER BY source_name"; |
| 1204 | - $query_values = array_merge($query_values,array(':stats_type' => $stats_type)); |
|
| 1204 | + $query_values = array_merge($query_values, array(':stats_type' => $stats_type)); |
|
| 1205 | 1205 | try { |
| 1206 | 1206 | $sth = $this->db->prepare($query); |
| 1207 | 1207 | $sth->execute($query_values); |
| 1208 | - } catch(PDOException $e) { |
|
| 1208 | + } catch (PDOException $e) { |
|
| 1209 | 1209 | echo "error : ".$e->getMessage(); |
| 1210 | 1210 | } |
| 1211 | 1211 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 1212 | 1212 | return $all; |
| 1213 | 1213 | } |
| 1214 | 1214 | |
| 1215 | - public function addStatSource($data,$source_name,$stats_type,$date) { |
|
| 1215 | + public function addStatSource($data, $source_name, $stats_type, $date) { |
|
| 1216 | 1216 | global $globalDBdriver; |
| 1217 | 1217 | if ($globalDBdriver == 'mysql') { |
| 1218 | 1218 | $query = "INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) VALUES (:data,:source_name,:stats_type,:stats_date) ON DUPLICATE KEY UPDATE source_data = :data"; |
| 1219 | 1219 | } else { |
| 1220 | 1220 | $query = "UPDATE stats_source SET source_data = :data WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type; INSERT INTO stats_source (source_data,source_name,stats_type,stats_date) SELECT :data,:source_name,:stats_type,:stats_date WHERE NOT EXISTS (SELECT 1 FROM stats_source WHERE stats_date = :stats_date AND source_name = :source_name AND stats_type = :stats_type);"; |
| 1221 | 1221 | } |
| 1222 | - $query_values = array(':data' => $data,':stats_date' => $date,':source_name' => $source_name,':stats_type' => $stats_type); |
|
| 1222 | + $query_values = array(':data' => $data, ':stats_date' => $date, ':source_name' => $source_name, ':stats_type' => $stats_type); |
|
| 1223 | 1223 | try { |
| 1224 | 1224 | $sth = $this->db->prepare($query); |
| 1225 | 1225 | $sth->execute($query_values); |
| 1226 | - } catch(PDOException $e) { |
|
| 1226 | + } catch (PDOException $e) { |
|
| 1227 | 1227 | return "error : ".$e->getMessage(); |
| 1228 | 1228 | } |
| 1229 | 1229 | } |
| 1230 | - public function addStatFlight($type,$date_name,$cnt,$stats_airline = '',$filter_name = '') { |
|
| 1230 | + public function addStatFlight($type, $date_name, $cnt, $stats_airline = '', $filter_name = '') { |
|
| 1231 | 1231 | $query = "INSERT INTO stats_flight (stats_type,flight_date,cnt,stats_airline,filter_name) VALUES (:type,:flight_date,:cnt,:stats_airline,:filter_name)"; |
| 1232 | - $query_values = array(':type' => $type,':flight_date' => $date_name,':cnt' => $cnt, ':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1232 | + $query_values = array(':type' => $type, ':flight_date' => $date_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1233 | 1233 | try { |
| 1234 | 1234 | $sth = $this->db->prepare($query); |
| 1235 | 1235 | $sth->execute($query_values); |
| 1236 | - } catch(PDOException $e) { |
|
| 1236 | + } catch (PDOException $e) { |
|
| 1237 | 1237 | return "error : ".$e->getMessage(); |
| 1238 | 1238 | } |
| 1239 | 1239 | } |
| 1240 | - public function addStatAircraftRegistration($registration,$cnt,$aircraft_icao = '',$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1240 | + public function addStatAircraftRegistration($registration, $cnt, $aircraft_icao = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1241 | 1241 | global $globalDBdriver; |
| 1242 | 1242 | if ($globalDBdriver == 'mysql') { |
| 1243 | 1243 | if ($reset) { |
@@ -1252,15 +1252,15 @@ discard block |
||
| 1252 | 1252 | $query = "UPDATE stats_registration SET cnt = cnt+:cnt WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_registration (aircraft_icao,registration,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:registration,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_registration WHERE registration = :registration AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1253 | 1253 | } |
| 1254 | 1254 | } |
| 1255 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':registration' => $registration,':cnt' => $cnt,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1255 | + $query_values = array(':aircraft_icao' => $aircraft_icao, ':registration' => $registration, ':cnt' => $cnt, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1256 | 1256 | try { |
| 1257 | 1257 | $sth = $this->db->prepare($query); |
| 1258 | 1258 | $sth->execute($query_values); |
| 1259 | - } catch(PDOException $e) { |
|
| 1259 | + } catch (PDOException $e) { |
|
| 1260 | 1260 | return "error : ".$e->getMessage(); |
| 1261 | 1261 | } |
| 1262 | 1262 | } |
| 1263 | - public function addStatCallsign($callsign_icao,$cnt,$airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1263 | + public function addStatCallsign($callsign_icao, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1264 | 1264 | global $globalDBdriver; |
| 1265 | 1265 | if ($globalDBdriver == 'mysql') { |
| 1266 | 1266 | if ($reset) { |
@@ -1275,15 +1275,15 @@ discard block |
||
| 1275 | 1275 | $query = "UPDATE stats_callsign SET cnt = cnt+:cnt WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name; INSERT INTO stats_callsign (callsign_icao,airline_icao,cnt,filter_name) SELECT :callsign_icao,:airline_icao,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_callsign WHERE callsign_icao = :callsign_icao AND filter_name = :filter_name);"; |
| 1276 | 1276 | } |
| 1277 | 1277 | } |
| 1278 | - $query_values = array(':callsign_icao' => $callsign_icao,':airline_icao' => $airline_icao,':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1278 | + $query_values = array(':callsign_icao' => $callsign_icao, ':airline_icao' => $airline_icao, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1279 | 1279 | try { |
| 1280 | 1280 | $sth = $this->db->prepare($query); |
| 1281 | 1281 | $sth->execute($query_values); |
| 1282 | - } catch(PDOException $e) { |
|
| 1282 | + } catch (PDOException $e) { |
|
| 1283 | 1283 | return "error : ".$e->getMessage(); |
| 1284 | 1284 | } |
| 1285 | 1285 | } |
| 1286 | - public function addStatCountry($iso2,$iso3,$name,$cnt,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1286 | + public function addStatCountry($iso2, $iso3, $name, $cnt, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1287 | 1287 | global $globalDBdriver; |
| 1288 | 1288 | if ($globalDBdriver == 'mysql') { |
| 1289 | 1289 | if ($reset) { |
@@ -1298,15 +1298,15 @@ discard block |
||
| 1298 | 1298 | $query = "UPDATE stats_country SET cnt = cnt+:cnt WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline; INSERT INTO stats_country (iso2,iso3,name,cnt,stats_airline,filter_name) SELECT :iso2,:iso3,:name,:cnt,:airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_country WHERE iso2 = :iso2 AND filter_name = :filter_name AND stats_airline = :airline);"; |
| 1299 | 1299 | } |
| 1300 | 1300 | } |
| 1301 | - $query_values = array(':iso2' => $iso2,':iso3' => $iso3,':name' => $name,':cnt' => $cnt,':filter_name' => $filter_name,':airline' => $airline_icao); |
|
| 1301 | + $query_values = array(':iso2' => $iso2, ':iso3' => $iso3, ':name' => $name, ':cnt' => $cnt, ':filter_name' => $filter_name, ':airline' => $airline_icao); |
|
| 1302 | 1302 | try { |
| 1303 | 1303 | $sth = $this->db->prepare($query); |
| 1304 | 1304 | $sth->execute($query_values); |
| 1305 | - } catch(PDOException $e) { |
|
| 1305 | + } catch (PDOException $e) { |
|
| 1306 | 1306 | return "error : ".$e->getMessage(); |
| 1307 | 1307 | } |
| 1308 | 1308 | } |
| 1309 | - public function addStatAircraft($aircraft_icao,$cnt,$aircraft_name = '',$aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1309 | + public function addStatAircraft($aircraft_icao, $cnt, $aircraft_name = '', $aircraft_manufacturer = '', $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1310 | 1310 | global $globalDBdriver; |
| 1311 | 1311 | if ($globalDBdriver == 'mysql') { |
| 1312 | 1312 | if ($reset) { |
@@ -1321,15 +1321,15 @@ discard block |
||
| 1321 | 1321 | $query = "UPDATE stats_aircraft SET cnt = cnt+:cnt, aircraft_name = :aircraft_name, aircraft_manufacturer = :aircraft_manufacturer, filter_name = :filter_name WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_aircraft (aircraft_icao,aircraft_name,aircraft_manufacturer,cnt,stats_airline,filter_name) SELECT :aircraft_icao,:aircraft_name,:aircraft_manufacturer,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_aircraft WHERE aircraft_icao = :aircraft_icao AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1322 | 1322 | } |
| 1323 | 1323 | } |
| 1324 | - $query_values = array(':aircraft_icao' => $aircraft_icao,':aircraft_name' => $aircraft_name,':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer,':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1324 | + $query_values = array(':aircraft_icao' => $aircraft_icao, ':aircraft_name' => $aircraft_name, ':cnt' => $cnt, ':aircraft_manufacturer' => $aircraft_manufacturer, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1325 | 1325 | try { |
| 1326 | 1326 | $sth = $this->db->prepare($query); |
| 1327 | 1327 | $sth->execute($query_values); |
| 1328 | - } catch(PDOException $e) { |
|
| 1328 | + } catch (PDOException $e) { |
|
| 1329 | 1329 | return "error : ".$e->getMessage(); |
| 1330 | 1330 | } |
| 1331 | 1331 | } |
| 1332 | - public function addStatAirline($airline_icao,$cnt,$airline_name = '',$filter_name = '', $reset = false) { |
|
| 1332 | + public function addStatAirline($airline_icao, $cnt, $airline_name = '', $filter_name = '', $reset = false) { |
|
| 1333 | 1333 | global $globalDBdriver; |
| 1334 | 1334 | if ($globalDBdriver == 'mysql') { |
| 1335 | 1335 | if ($reset) { |
@@ -1344,15 +1344,15 @@ discard block |
||
| 1344 | 1344 | $query = "UPDATE stats_airline SET cnt = cnt+:cnt WHERE airline_icao = :airline_icao AND filter_name = :filter_name; INSERT INTO stats_airline (airline_icao,airline_name,cnt,filter_name) SELECT :airline_icao,:airline_name,:cnt,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airline WHERE airline_icao = :airline_icao AND filter_name = :filter_name);"; |
| 1345 | 1345 | } |
| 1346 | 1346 | } |
| 1347 | - $query_values = array(':airline_icao' => $airline_icao,':airline_name' => $airline_name,':cnt' => $cnt,':filter_name' => $filter_name); |
|
| 1347 | + $query_values = array(':airline_icao' => $airline_icao, ':airline_name' => $airline_name, ':cnt' => $cnt, ':filter_name' => $filter_name); |
|
| 1348 | 1348 | try { |
| 1349 | 1349 | $sth = $this->db->prepare($query); |
| 1350 | 1350 | $sth->execute($query_values); |
| 1351 | - } catch(PDOException $e) { |
|
| 1351 | + } catch (PDOException $e) { |
|
| 1352 | 1352 | return "error : ".$e->getMessage(); |
| 1353 | 1353 | } |
| 1354 | 1354 | } |
| 1355 | - public function addStatOwner($owner_name,$cnt,$stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1355 | + public function addStatOwner($owner_name, $cnt, $stats_airline = '', $filter_name = '', $reset = false) { |
|
| 1356 | 1356 | global $globalDBdriver; |
| 1357 | 1357 | if ($globalDBdriver == 'mysql') { |
| 1358 | 1358 | if ($reset) { |
@@ -1367,15 +1367,15 @@ discard block |
||
| 1367 | 1367 | $query = "UPDATE stats_owner SET cnt = cnt+:cnt WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_owner (owner_name,cnt,stats_airline,filter_name) SELECT :owner_name,:cnt,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_owner WHERE owner_name = :owner_name AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1368 | 1368 | } |
| 1369 | 1369 | } |
| 1370 | - $query_values = array(':owner_name' => $owner_name,':cnt' => $cnt,':stats_airline' => $stats_airline,':filter_name' => $filter_name); |
|
| 1370 | + $query_values = array(':owner_name' => $owner_name, ':cnt' => $cnt, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name); |
|
| 1371 | 1371 | try { |
| 1372 | 1372 | $sth = $this->db->prepare($query); |
| 1373 | 1373 | $sth->execute($query_values); |
| 1374 | - } catch(PDOException $e) { |
|
| 1374 | + } catch (PDOException $e) { |
|
| 1375 | 1375 | return "error : ".$e->getMessage(); |
| 1376 | 1376 | } |
| 1377 | 1377 | } |
| 1378 | - public function addStatPilot($pilot_id,$cnt,$pilot_name,$stats_airline = '',$filter_name = '',$format_source = '',$reset = false) { |
|
| 1378 | + public function addStatPilot($pilot_id, $cnt, $pilot_name, $stats_airline = '', $filter_name = '', $format_source = '', $reset = false) { |
|
| 1379 | 1379 | global $globalDBdriver; |
| 1380 | 1380 | if ($globalDBdriver == 'mysql') { |
| 1381 | 1381 | if ($reset) { |
@@ -1390,15 +1390,15 @@ discard block |
||
| 1390 | 1390 | $query = "UPDATE stats_pilot SET cnt = cnt+:cnt, pilot_name = :pilot_name WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source; INSERT INTO stats_pilot (pilot_id,cnt,pilot_name,stats_airline,filter_name,format_source) SELECT :pilot_id,:cnt,:pilot_name,:stats_airline,:filter_name,:format_source WHERE NOT EXISTS (SELECT 1 FROM stats_pilot WHERE pilot_id = :pilot_id AND stats_airline = :stats_airline AND filter_name = :filter_name AND format_source = :format_source);"; |
| 1391 | 1391 | } |
| 1392 | 1392 | } |
| 1393 | - $query_values = array(':pilot_id' => $pilot_id,':cnt' => $cnt,':pilot_name' => $pilot_name,':stats_airline' => $stats_airline,':filter_name' => $filter_name,':format_source' => $format_source); |
|
| 1393 | + $query_values = array(':pilot_id' => $pilot_id, ':cnt' => $cnt, ':pilot_name' => $pilot_name, ':stats_airline' => $stats_airline, ':filter_name' => $filter_name, ':format_source' => $format_source); |
|
| 1394 | 1394 | try { |
| 1395 | 1395 | $sth = $this->db->prepare($query); |
| 1396 | 1396 | $sth->execute($query_values); |
| 1397 | - } catch(PDOException $e) { |
|
| 1397 | + } catch (PDOException $e) { |
|
| 1398 | 1398 | return "error : ".$e->getMessage(); |
| 1399 | 1399 | } |
| 1400 | 1400 | } |
| 1401 | - public function addStatDepartureAirports($airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1401 | + public function addStatDepartureAirports($airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1402 | 1402 | global $globalDBdriver; |
| 1403 | 1403 | if ($airport_icao != '') { |
| 1404 | 1404 | if ($globalDBdriver == 'mysql') { |
@@ -1414,16 +1414,16 @@ discard block |
||
| 1414 | 1414 | $query = "UPDATE stats_airport SET departure = departure+:departure WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; |
| 1415 | 1415 | } |
| 1416 | 1416 | } |
| 1417 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 1417 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1418 | 1418 | try { |
| 1419 | 1419 | $sth = $this->db->prepare($query); |
| 1420 | 1420 | $sth->execute($query_values); |
| 1421 | - } catch(PDOException $e) { |
|
| 1421 | + } catch (PDOException $e) { |
|
| 1422 | 1422 | return "error : ".$e->getMessage(); |
| 1423 | 1423 | } |
| 1424 | 1424 | } |
| 1425 | 1425 | } |
| 1426 | - public function addStatDepartureAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$departure,$airline_icao = '',$filter_name = '') { |
|
| 1426 | + public function addStatDepartureAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $departure, $airline_icao = '', $filter_name = '') { |
|
| 1427 | 1427 | global $globalDBdriver; |
| 1428 | 1428 | if ($airport_icao != '') { |
| 1429 | 1429 | if ($globalDBdriver == 'mysql') { |
@@ -1431,16 +1431,16 @@ discard block |
||
| 1431 | 1431 | } else { |
| 1432 | 1432 | $query = "UPDATE stats_airport SET departure = :departure WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,departure,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:departure,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1433 | 1433 | } |
| 1434 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':departure' => $departure,':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 1434 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':departure' => $departure, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1435 | 1435 | try { |
| 1436 | 1436 | $sth = $this->db->prepare($query); |
| 1437 | 1437 | $sth->execute($query_values); |
| 1438 | - } catch(PDOException $e) { |
|
| 1438 | + } catch (PDOException $e) { |
|
| 1439 | 1439 | return "error : ".$e->getMessage(); |
| 1440 | 1440 | } |
| 1441 | 1441 | } |
| 1442 | 1442 | } |
| 1443 | - public function addStatArrivalAirports($airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '',$reset = false) { |
|
| 1443 | + public function addStatArrivalAirports($airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '', $reset = false) { |
|
| 1444 | 1444 | global $globalDBdriver; |
| 1445 | 1445 | if ($airport_icao != '') { |
| 1446 | 1446 | if ($globalDBdriver == 'mysql') { |
@@ -1456,16 +1456,16 @@ discard block |
||
| 1456 | 1456 | $query = "UPDATE stats_airport SET arrival = arrival+:arrival WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'yearly',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'yearly' AND stats_airline = :stats_airline AND date = :date AND filter_name = :filter_name);"; |
| 1457 | 1457 | } |
| 1458 | 1458 | } |
| 1459 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival,':date' => date('Y').'-01-01 00:00:00',':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 1459 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => date('Y').'-01-01 00:00:00', ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1460 | 1460 | try { |
| 1461 | 1461 | $sth = $this->db->prepare($query); |
| 1462 | 1462 | $sth->execute($query_values); |
| 1463 | - } catch(PDOException $e) { |
|
| 1463 | + } catch (PDOException $e) { |
|
| 1464 | 1464 | return "error : ".$e->getMessage(); |
| 1465 | 1465 | } |
| 1466 | 1466 | } |
| 1467 | 1467 | } |
| 1468 | - public function addStatArrivalAirportsDaily($date,$airport_icao,$airport_name,$airport_city,$airport_country,$arrival,$airline_icao = '',$filter_name = '') { |
|
| 1468 | + public function addStatArrivalAirportsDaily($date, $airport_icao, $airport_name, $airport_city, $airport_country, $arrival, $airline_icao = '', $filter_name = '') { |
|
| 1469 | 1469 | global $globalDBdriver; |
| 1470 | 1470 | if ($airport_icao != '') { |
| 1471 | 1471 | if ($globalDBdriver == 'mysql') { |
@@ -1473,11 +1473,11 @@ discard block |
||
| 1473 | 1473 | } else { |
| 1474 | 1474 | $query = "UPDATE stats_airport SET arrival = :arrival WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name; INSERT INTO stats_airport (airport_icao,airport_name,airport_city,airport_country,arrival,stats_type,date,stats_airline,filter_name) SELECT :airport_icao,:airport_name,:airport_city,:airport_country,:arrival,'daily',:date,:stats_airline,:filter_name WHERE NOT EXISTS (SELECT 1 FROM stats_airport WHERE airport_icao = :airport_icao AND stats_type = 'daily' AND date = :date AND stats_airline = :stats_airline AND filter_name = :filter_name);"; |
| 1475 | 1475 | } |
| 1476 | - $query_values = array(':airport_icao' => $airport_icao,':airport_name' => $airport_name,':airport_city' => $airport_city,':airport_country' => $airport_country,':arrival' => $arrival, ':date' => $date,':stats_airline' => $airline_icao,':filter_name' => $filter_name); |
|
| 1476 | + $query_values = array(':airport_icao' => $airport_icao, ':airport_name' => $airport_name, ':airport_city' => $airport_city, ':airport_country' => $airport_country, ':arrival' => $arrival, ':date' => $date, ':stats_airline' => $airline_icao, ':filter_name' => $filter_name); |
|
| 1477 | 1477 | try { |
| 1478 | 1478 | $sth = $this->db->prepare($query); |
| 1479 | 1479 | $sth->execute($query_values); |
| 1480 | - } catch(PDOException $e) { |
|
| 1480 | + } catch (PDOException $e) { |
|
| 1481 | 1481 | return "error : ".$e->getMessage(); |
| 1482 | 1482 | } |
| 1483 | 1483 | } |
@@ -1489,7 +1489,7 @@ discard block |
||
| 1489 | 1489 | try { |
| 1490 | 1490 | $sth = $this->db->prepare($query); |
| 1491 | 1491 | $sth->execute($query_values); |
| 1492 | - } catch(PDOException $e) { |
|
| 1492 | + } catch (PDOException $e) { |
|
| 1493 | 1493 | return "error : ".$e->getMessage(); |
| 1494 | 1494 | } |
| 1495 | 1495 | } |
@@ -1499,7 +1499,7 @@ discard block |
||
| 1499 | 1499 | try { |
| 1500 | 1500 | $sth = $this->db->prepare($query); |
| 1501 | 1501 | $sth->execute($query_values); |
| 1502 | - } catch(PDOException $e) { |
|
| 1502 | + } catch (PDOException $e) { |
|
| 1503 | 1503 | return "error : ".$e->getMessage(); |
| 1504 | 1504 | } |
| 1505 | 1505 | } |
@@ -1509,13 +1509,13 @@ discard block |
||
| 1509 | 1509 | try { |
| 1510 | 1510 | $sth = $this->db->prepare($query); |
| 1511 | 1511 | $sth->execute($query_values); |
| 1512 | - } catch(PDOException $e) { |
|
| 1512 | + } catch (PDOException $e) { |
|
| 1513 | 1513 | return "error : ".$e->getMessage(); |
| 1514 | 1514 | } |
| 1515 | 1515 | } |
| 1516 | 1516 | |
| 1517 | 1517 | public function addOldStats() { |
| 1518 | - global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters,$globalDeleteLastYearStats,$globalStatsReset,$globalStatsResetYear; |
|
| 1518 | + global $globalDebug, $globalArchiveMonths, $globalArchive, $globalArchiveYear, $globalDBdriver, $globalStatsFilters, $globalDeleteLastYearStats, $globalStatsReset, $globalStatsResetYear; |
|
| 1519 | 1519 | $Common = new Common(); |
| 1520 | 1520 | $Connection = new Connection(); |
| 1521 | 1521 | date_default_timezone_set('UTC'); |
@@ -1533,40 +1533,40 @@ discard block |
||
| 1533 | 1533 | $Spotter = new Spotter($this->db); |
| 1534 | 1534 | |
| 1535 | 1535 | if ($globalDebug) echo 'Count all aircraft types...'."\n"; |
| 1536 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day); |
|
| 1536 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day); |
|
| 1537 | 1537 | foreach ($alldata as $number) { |
| 1538 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'','',$reset); |
|
| 1538 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', '', $reset); |
|
| 1539 | 1539 | } |
| 1540 | 1540 | if ($globalDebug) echo 'Count all airlines...'."\n"; |
| 1541 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day); |
|
| 1541 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day); |
|
| 1542 | 1542 | foreach ($alldata as $number) { |
| 1543 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],'',$reset); |
|
| 1543 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], '', $reset); |
|
| 1544 | 1544 | } |
| 1545 | 1545 | if ($globalDebug) echo 'Count all registrations...'."\n"; |
| 1546 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day); |
|
| 1546 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day); |
|
| 1547 | 1547 | foreach ($alldata as $number) { |
| 1548 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'','',$reset); |
|
| 1548 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', '', $reset); |
|
| 1549 | 1549 | } |
| 1550 | 1550 | if ($globalDebug) echo 'Count all callsigns...'."\n"; |
| 1551 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day); |
|
| 1551 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day); |
|
| 1552 | 1552 | foreach ($alldata as $number) { |
| 1553 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 1553 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 1554 | 1554 | } |
| 1555 | 1555 | if ($globalDebug) echo 'Count all owners...'."\n"; |
| 1556 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day); |
|
| 1556 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day); |
|
| 1557 | 1557 | foreach ($alldata as $number) { |
| 1558 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'','',$reset); |
|
| 1558 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', '', $reset); |
|
| 1559 | 1559 | } |
| 1560 | 1560 | if ($globalDebug) echo 'Count all pilots...'."\n"; |
| 1561 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day); |
|
| 1561 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day); |
|
| 1562 | 1562 | foreach ($alldata as $number) { |
| 1563 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'','',$number['format_source'],$reset); |
|
| 1563 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', '', $number['format_source'], $reset); |
|
| 1564 | 1564 | } |
| 1565 | 1565 | |
| 1566 | 1566 | if ($globalDebug) echo 'Count all departure airports...'."\n"; |
| 1567 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day); |
|
| 1567 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day); |
|
| 1568 | 1568 | if ($globalDebug) echo 'Count all detected departure airports...'."\n"; |
| 1569 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day); |
|
| 1569 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day); |
|
| 1570 | 1570 | if ($globalDebug) echo 'Order departure airports...'."\n"; |
| 1571 | 1571 | $alldata = array(); |
| 1572 | 1572 | |
@@ -1584,14 +1584,14 @@ discard block |
||
| 1584 | 1584 | foreach ($alldata as $key => $row) { |
| 1585 | 1585 | $count[$key] = $row['airport_departure_icao_count']; |
| 1586 | 1586 | } |
| 1587 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1587 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 1588 | 1588 | foreach ($alldata as $number) { |
| 1589 | - echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'','',$reset); |
|
| 1589 | + echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', '', $reset); |
|
| 1590 | 1590 | } |
| 1591 | 1591 | if ($globalDebug) echo 'Count all arrival airports...'."\n"; |
| 1592 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day); |
|
| 1592 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day); |
|
| 1593 | 1593 | if ($globalDebug) echo 'Count all detected arrival airports...'."\n"; |
| 1594 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day); |
|
| 1594 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day); |
|
| 1595 | 1595 | if ($globalDebug) echo 'Order arrival airports...'."\n"; |
| 1596 | 1596 | $alldata = array(); |
| 1597 | 1597 | foreach ($pall as $value) { |
@@ -1608,18 +1608,18 @@ discard block |
||
| 1608 | 1608 | foreach ($alldata as $key => $row) { |
| 1609 | 1609 | $count[$key] = $row['airport_arrival_icao_count']; |
| 1610 | 1610 | } |
| 1611 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 1611 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 1612 | 1612 | foreach ($alldata as $number) { |
| 1613 | - echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'','',$reset); |
|
| 1613 | + echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', '', $reset); |
|
| 1614 | 1614 | } |
| 1615 | 1615 | if ($Connection->tableExists('countries')) { |
| 1616 | 1616 | if ($globalDebug) echo 'Count all flights by countries...'."\n"; |
| 1617 | 1617 | //$SpotterArchive = new SpotterArchive(); |
| 1618 | 1618 | //$alldata = $SpotterArchive->countAllFlightOverCountries(false,0,$last_update_day); |
| 1619 | 1619 | $Spotter = new Spotter($this->db); |
| 1620 | - $alldata = $Spotter->countAllFlightOverCountries(false,0,$last_update_day); |
|
| 1620 | + $alldata = $Spotter->countAllFlightOverCountries(false, 0, $last_update_day); |
|
| 1621 | 1621 | foreach ($alldata as $number) { |
| 1622 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],'','',$reset); |
|
| 1622 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], '', '', $reset); |
|
| 1623 | 1623 | } |
| 1624 | 1624 | } |
| 1625 | 1625 | |
@@ -1628,12 +1628,12 @@ discard block |
||
| 1628 | 1628 | $this->deleteStatsByType('fatalities_byyear'); |
| 1629 | 1629 | $alldata = $Accident->countFatalitiesByYear(); |
| 1630 | 1630 | foreach ($alldata as $number) { |
| 1631 | - $this->addStat('fatalities_byyear',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,1,1,$number['year']))); |
|
| 1631 | + $this->addStat('fatalities_byyear', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, 1, 1, $number['year']))); |
|
| 1632 | 1632 | } |
| 1633 | 1633 | $this->deleteStatsByType('fatalities_bymonth'); |
| 1634 | 1634 | $alldata = $Accident->countFatalitiesLast12Months(); |
| 1635 | 1635 | foreach ($alldata as $number) { |
| 1636 | - $this->addStat('fatalities_bymonth',$number['count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month'],1,$number['year']))); |
|
| 1636 | + $this->addStat('fatalities_bymonth', $number['count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month'], 1, $number['year']))); |
|
| 1637 | 1637 | } |
| 1638 | 1638 | |
| 1639 | 1639 | |
@@ -1646,37 +1646,37 @@ discard block |
||
| 1646 | 1646 | $lastyear = false; |
| 1647 | 1647 | foreach ($alldata as $number) { |
| 1648 | 1648 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 1649 | - $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 1649 | + $this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 1650 | 1650 | } |
| 1651 | 1651 | if ($globalDebug) echo 'Count all military flights by months...'."\n"; |
| 1652 | 1652 | $alldata = $Spotter->countAllMilitaryMonths(); |
| 1653 | 1653 | foreach ($alldata as $number) { |
| 1654 | - $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 1654 | + $this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 1655 | 1655 | } |
| 1656 | 1656 | if ($globalDebug) echo 'Count all owners by months...'."\n"; |
| 1657 | 1657 | $alldata = $Spotter->countAllMonthsOwners(); |
| 1658 | 1658 | foreach ($alldata as $number) { |
| 1659 | - $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 1659 | + $this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 1660 | 1660 | } |
| 1661 | 1661 | if ($globalDebug) echo 'Count all pilots by months...'."\n"; |
| 1662 | 1662 | $alldata = $Spotter->countAllMonthsPilots(); |
| 1663 | 1663 | foreach ($alldata as $number) { |
| 1664 | - $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 1664 | + $this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 1665 | 1665 | } |
| 1666 | 1666 | if ($globalDebug) echo 'Count all airlines by months...'."\n"; |
| 1667 | 1667 | $alldata = $Spotter->countAllMonthsAirlines(); |
| 1668 | 1668 | foreach ($alldata as $number) { |
| 1669 | - $this->addStat('airlines_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 1669 | + $this->addStat('airlines_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 1670 | 1670 | } |
| 1671 | 1671 | if ($globalDebug) echo 'Count all aircrafts by months...'."\n"; |
| 1672 | 1672 | $alldata = $Spotter->countAllMonthsAircrafts(); |
| 1673 | 1673 | foreach ($alldata as $number) { |
| 1674 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 1674 | + $this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 1675 | 1675 | } |
| 1676 | 1676 | if ($globalDebug) echo 'Count all real arrivals by months...'."\n"; |
| 1677 | 1677 | $alldata = $Spotter->countAllMonthsRealArrivals(); |
| 1678 | 1678 | foreach ($alldata as $number) { |
| 1679 | - $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name']))); |
|
| 1679 | + $this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name']))); |
|
| 1680 | 1680 | } |
| 1681 | 1681 | if ($globalDebug) echo 'Airports data...'."\n"; |
| 1682 | 1682 | if ($globalDebug) echo '...Departure'."\n"; |
@@ -1721,7 +1721,7 @@ discard block |
||
| 1721 | 1721 | } |
| 1722 | 1722 | $alldata = $pall; |
| 1723 | 1723 | foreach ($alldata as $number) { |
| 1724 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count']); |
|
| 1724 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count']); |
|
| 1725 | 1725 | } |
| 1726 | 1726 | echo '...Arrival'."\n"; |
| 1727 | 1727 | $pall = $Spotter->getLast7DaysAirportsArrival(); |
@@ -1763,7 +1763,7 @@ discard block |
||
| 1763 | 1763 | } |
| 1764 | 1764 | $alldata = $pall; |
| 1765 | 1765 | foreach ($alldata as $number) { |
| 1766 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count']); |
|
| 1766 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count']); |
|
| 1767 | 1767 | } |
| 1768 | 1768 | |
| 1769 | 1769 | echo 'Flights data...'."\n"; |
@@ -1771,28 +1771,28 @@ discard block |
||
| 1771 | 1771 | echo '-> countAllDatesLastMonth...'."\n"; |
| 1772 | 1772 | $alldata = $Spotter->countAllDatesLastMonth(); |
| 1773 | 1773 | foreach ($alldata as $number) { |
| 1774 | - $this->addStatFlight('month',$number['date_name'],$number['date_count']); |
|
| 1774 | + $this->addStatFlight('month', $number['date_name'], $number['date_count']); |
|
| 1775 | 1775 | } |
| 1776 | 1776 | echo '-> countAllDates...'."\n"; |
| 1777 | 1777 | $previousdata = $this->countAllDates(); |
| 1778 | 1778 | $previousdatabyairlines = $this->countAllDatesByAirlines(); |
| 1779 | 1779 | $this->deleteStatFlight('date'); |
| 1780 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates()); |
|
| 1780 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates()); |
|
| 1781 | 1781 | $values = array(); |
| 1782 | 1782 | foreach ($alldata as $cnt) { |
| 1783 | 1783 | $values[] = $cnt['date_count']; |
| 1784 | 1784 | } |
| 1785 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 1786 | - array_splice($alldata,11); |
|
| 1785 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 1786 | + array_splice($alldata, 11); |
|
| 1787 | 1787 | foreach ($alldata as $number) { |
| 1788 | - $this->addStatFlight('date',$number['date_name'],$number['date_count']); |
|
| 1788 | + $this->addStatFlight('date', $number['date_name'], $number['date_count']); |
|
| 1789 | 1789 | } |
| 1790 | 1790 | |
| 1791 | 1791 | $this->deleteStatFlight('hour'); |
| 1792 | 1792 | echo '-> countAllHours...'."\n"; |
| 1793 | 1793 | $alldata = $Spotter->countAllHours('hour'); |
| 1794 | 1794 | foreach ($alldata as $number) { |
| 1795 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count']); |
|
| 1795 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count']); |
|
| 1796 | 1796 | } |
| 1797 | 1797 | |
| 1798 | 1798 | |
@@ -1804,41 +1804,41 @@ discard block |
||
| 1804 | 1804 | //$SpotterArchive = new SpotterArchive(); |
| 1805 | 1805 | $Spotter = new Spotter($this->db); |
| 1806 | 1806 | //$alldata = $SpotterArchive->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
| 1807 | - $alldata = $Spotter->countAllFlightOverCountriesByAirlines(false,0,$last_update_day); |
|
| 1807 | + $alldata = $Spotter->countAllFlightOverCountriesByAirlines(false, 0, $last_update_day); |
|
| 1808 | 1808 | foreach ($alldata as $number) { |
| 1809 | - $this->addStatCountry($number['flight_country_iso2'],$number['flight_country_iso3'],$number['flight_country'],$number['flight_count'],$number['airline_icao'],'',$reset); |
|
| 1809 | + $this->addStatCountry($number['flight_country_iso2'], $number['flight_country_iso3'], $number['flight_country'], $number['flight_count'], $number['airline_icao'], '', $reset); |
|
| 1810 | 1810 | } |
| 1811 | 1811 | } |
| 1812 | 1812 | if ($globalDebug) echo 'Count all aircraft types by airlines...'."\n"; |
| 1813 | 1813 | $Spotter = new Spotter($this->db); |
| 1814 | - $alldata = $Spotter->countAllAircraftTypesByAirlines(false,0,$last_update_day); |
|
| 1814 | + $alldata = $Spotter->countAllAircraftTypesByAirlines(false, 0, $last_update_day); |
|
| 1815 | 1815 | foreach ($alldata as $number) { |
| 1816 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],$number['airline_icao'],'',$reset); |
|
| 1816 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], $number['airline_icao'], '', $reset); |
|
| 1817 | 1817 | } |
| 1818 | 1818 | if ($globalDebug) echo 'Count all aircraft registrations by airlines...'."\n"; |
| 1819 | - $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false,0,$last_update_day); |
|
| 1819 | + $alldata = $Spotter->countAllAircraftRegistrationsByAirlines(false, 0, $last_update_day); |
|
| 1820 | 1820 | foreach ($alldata as $number) { |
| 1821 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],$number['airline_icao'],'',$reset); |
|
| 1821 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], $number['airline_icao'], '', $reset); |
|
| 1822 | 1822 | } |
| 1823 | 1823 | if ($globalDebug) echo 'Count all callsigns by airlines...'."\n"; |
| 1824 | - $alldata = $Spotter->countAllCallsignsByAirlines(false,0,$last_update_day); |
|
| 1824 | + $alldata = $Spotter->countAllCallsignsByAirlines(false, 0, $last_update_day); |
|
| 1825 | 1825 | foreach ($alldata as $number) { |
| 1826 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],$number['airline_icao'],'',$reset); |
|
| 1826 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], $number['airline_icao'], '', $reset); |
|
| 1827 | 1827 | } |
| 1828 | 1828 | if ($globalDebug) echo 'Count all owners by airlines...'."\n"; |
| 1829 | - $alldata = $Spotter->countAllOwnersByAirlines(false,0,$last_update_day); |
|
| 1829 | + $alldata = $Spotter->countAllOwnersByAirlines(false, 0, $last_update_day); |
|
| 1830 | 1830 | foreach ($alldata as $number) { |
| 1831 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],$number['airline_icao'],'',$reset); |
|
| 1831 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], $number['airline_icao'], '', $reset); |
|
| 1832 | 1832 | } |
| 1833 | 1833 | if ($globalDebug) echo 'Count all pilots by airlines...'."\n"; |
| 1834 | - $alldata = $Spotter->countAllPilotsByAirlines(false,0,$last_update_day); |
|
| 1834 | + $alldata = $Spotter->countAllPilotsByAirlines(false, 0, $last_update_day); |
|
| 1835 | 1835 | foreach ($alldata as $number) { |
| 1836 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],$number['airline_icao'],'',$number['format_source'],$reset); |
|
| 1836 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], $number['airline_icao'], '', $number['format_source'], $reset); |
|
| 1837 | 1837 | } |
| 1838 | 1838 | if ($globalDebug) echo 'Count all departure airports by airlines...'."\n"; |
| 1839 | - $pall = $Spotter->countAllDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1839 | + $pall = $Spotter->countAllDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 1840 | 1840 | if ($globalDebug) echo 'Count all detected departure airports by airlines...'."\n"; |
| 1841 | - $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false,0,$last_update_day); |
|
| 1841 | + $dall = $Spotter->countAllDetectedDepartureAirportsByAirlines(false, 0, $last_update_day); |
|
| 1842 | 1842 | if ($globalDebug) echo 'Order detected departure airports by airlines...'."\n"; |
| 1843 | 1843 | //$alldata = array(); |
| 1844 | 1844 | foreach ($dall as $value) { |
@@ -1858,12 +1858,12 @@ discard block |
||
| 1858 | 1858 | } |
| 1859 | 1859 | $alldata = $pall; |
| 1860 | 1860 | foreach ($alldata as $number) { |
| 1861 | - echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],$number['airline_icao'],'',$reset); |
|
| 1861 | + echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], $number['airline_icao'], '', $reset); |
|
| 1862 | 1862 | } |
| 1863 | 1863 | if ($globalDebug) echo 'Count all arrival airports by airlines...'."\n"; |
| 1864 | - $pall = $Spotter->countAllArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1864 | + $pall = $Spotter->countAllArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 1865 | 1865 | if ($globalDebug) echo 'Count all detected arrival airports by airlines...'."\n"; |
| 1866 | - $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false,0,$last_update_day); |
|
| 1866 | + $dall = $Spotter->countAllDetectedArrivalAirportsByAirlines(false, 0, $last_update_day); |
|
| 1867 | 1867 | if ($globalDebug) echo 'Order arrival airports by airlines...'."\n"; |
| 1868 | 1868 | //$alldata = array(); |
| 1869 | 1869 | foreach ($dall as $value) { |
@@ -1883,7 +1883,7 @@ discard block |
||
| 1883 | 1883 | } |
| 1884 | 1884 | $alldata = $pall; |
| 1885 | 1885 | foreach ($alldata as $number) { |
| 1886 | - if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],$number['airline_icao'],'',$reset); |
|
| 1886 | + if ($number['airline_icao'] != '') echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], $number['airline_icao'], '', $reset); |
|
| 1887 | 1887 | } |
| 1888 | 1888 | if ($globalDebug) echo 'Count all flights by months by airlines...'."\n"; |
| 1889 | 1889 | $Spotter = new Spotter($this->db); |
@@ -1891,27 +1891,27 @@ discard block |
||
| 1891 | 1891 | $lastyear = false; |
| 1892 | 1892 | foreach ($alldata as $number) { |
| 1893 | 1893 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 1894 | - $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 1894 | + $this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 1895 | 1895 | } |
| 1896 | 1896 | if ($globalDebug) echo 'Count all owners by months by airlines...'."\n"; |
| 1897 | 1897 | $alldata = $Spotter->countAllMonthsOwnersByAirlines(); |
| 1898 | 1898 | foreach ($alldata as $number) { |
| 1899 | - $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 1899 | + $this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 1900 | 1900 | } |
| 1901 | 1901 | if ($globalDebug) echo 'Count all pilots by months by airlines...'."\n"; |
| 1902 | 1902 | $alldata = $Spotter->countAllMonthsPilotsByAirlines(); |
| 1903 | 1903 | foreach ($alldata as $number) { |
| 1904 | - $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 1904 | + $this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 1905 | 1905 | } |
| 1906 | 1906 | if ($globalDebug) echo 'Count all aircrafts by months by airlines...'."\n"; |
| 1907 | 1907 | $alldata = $Spotter->countAllMonthsAircraftsByAirlines(); |
| 1908 | 1908 | foreach ($alldata as $number) { |
| 1909 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 1909 | + $this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 1910 | 1910 | } |
| 1911 | 1911 | if ($globalDebug) echo 'Count all real arrivals by months by airlines...'."\n"; |
| 1912 | 1912 | $alldata = $Spotter->countAllMonthsRealArrivalsByAirlines(); |
| 1913 | 1913 | foreach ($alldata as $number) { |
| 1914 | - $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),$number['airline_icao']); |
|
| 1914 | + $this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), $number['airline_icao']); |
|
| 1915 | 1915 | } |
| 1916 | 1916 | if ($globalDebug) echo '...Departure'."\n"; |
| 1917 | 1917 | $pall = $Spotter->getLast7DaysAirportsDepartureByAirlines(); |
@@ -1934,7 +1934,7 @@ discard block |
||
| 1934 | 1934 | } |
| 1935 | 1935 | $alldata = $pall; |
| 1936 | 1936 | foreach ($alldata as $number) { |
| 1937 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],$number['airline_icao']); |
|
| 1937 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], $number['airline_icao']); |
|
| 1938 | 1938 | } |
| 1939 | 1939 | if ($globalDebug) echo '...Arrival'."\n"; |
| 1940 | 1940 | $pall = $Spotter->getLast7DaysAirportsArrivalByAirlines(); |
@@ -1957,32 +1957,32 @@ discard block |
||
| 1957 | 1957 | } |
| 1958 | 1958 | $alldata = $pall; |
| 1959 | 1959 | foreach ($alldata as $number) { |
| 1960 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],$number['airline_icao']); |
|
| 1960 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], $number['airline_icao']); |
|
| 1961 | 1961 | } |
| 1962 | 1962 | |
| 1963 | 1963 | if ($globalDebug) echo 'Flights data...'."\n"; |
| 1964 | 1964 | if ($globalDebug) echo '-> countAllDatesLastMonth...'."\n"; |
| 1965 | 1965 | $alldata = $Spotter->countAllDatesLastMonthByAirlines(); |
| 1966 | 1966 | foreach ($alldata as $number) { |
| 1967 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], $number['airline_icao']); |
|
| 1967 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 1968 | 1968 | } |
| 1969 | 1969 | if ($globalDebug) echo '-> countAllDates...'."\n"; |
| 1970 | 1970 | //$previousdata = $this->countAllDatesByAirlines(); |
| 1971 | - $alldata = $Common->array_merge_noappend($previousdatabyairlines,$Spotter->countAllDatesByAirlines()); |
|
| 1971 | + $alldata = $Common->array_merge_noappend($previousdatabyairlines, $Spotter->countAllDatesByAirlines()); |
|
| 1972 | 1972 | $values = array(); |
| 1973 | 1973 | foreach ($alldata as $cnt) { |
| 1974 | 1974 | $values[] = $cnt['date_count']; |
| 1975 | 1975 | } |
| 1976 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 1977 | - array_splice($alldata,11); |
|
| 1976 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 1977 | + array_splice($alldata, 11); |
|
| 1978 | 1978 | foreach ($alldata as $number) { |
| 1979 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],$number['airline_icao']); |
|
| 1979 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], $number['airline_icao']); |
|
| 1980 | 1980 | } |
| 1981 | 1981 | |
| 1982 | 1982 | if ($globalDebug) echo '-> countAllHours...'."\n"; |
| 1983 | 1983 | $alldata = $Spotter->countAllHoursByAirlines('hour'); |
| 1984 | 1984 | foreach ($alldata as $number) { |
| 1985 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],$number['airline_icao']); |
|
| 1985 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], $number['airline_icao']); |
|
| 1986 | 1986 | } |
| 1987 | 1987 | |
| 1988 | 1988 | |
@@ -2006,7 +2006,7 @@ discard block |
||
| 2006 | 2006 | $last_update_day = date('Y').'-01-01 00:00:00'; |
| 2007 | 2007 | } |
| 2008 | 2008 | } |
| 2009 | - if (isset($filter['DeleteLastYearStats']) && date('Y',strtotime($last_update_day)) != date('Y')) { |
|
| 2009 | + if (isset($filter['DeleteLastYearStats']) && date('Y', strtotime($last_update_day)) != date('Y')) { |
|
| 2010 | 2010 | $last_update_day = date('Y').'-01-01 00:00:00'; |
| 2011 | 2011 | $reset = true; |
| 2012 | 2012 | } |
@@ -2015,32 +2015,32 @@ discard block |
||
| 2015 | 2015 | // Count by filter |
| 2016 | 2016 | if ($globalDebug) echo '--- Stats for filter '.$filter_name.' ---'."\n"; |
| 2017 | 2017 | $Spotter = new Spotter($this->db); |
| 2018 | - $alldata = $Spotter->countAllAircraftTypes(false,0,$last_update_day,$filter); |
|
| 2018 | + $alldata = $Spotter->countAllAircraftTypes(false, 0, $last_update_day, $filter); |
|
| 2019 | 2019 | foreach ($alldata as $number) { |
| 2020 | - $this->addStatAircraft($number['aircraft_icao'],$number['aircraft_icao_count'],$number['aircraft_name'],$number['aircraft_manufacturer'],'',$filter_name,$reset); |
|
| 2020 | + $this->addStatAircraft($number['aircraft_icao'], $number['aircraft_icao_count'], $number['aircraft_name'], $number['aircraft_manufacturer'], '', $filter_name, $reset); |
|
| 2021 | 2021 | } |
| 2022 | - $alldata = $Spotter->countAllAirlines(false,0,$last_update_day,$filter); |
|
| 2022 | + $alldata = $Spotter->countAllAirlines(false, 0, $last_update_day, $filter); |
|
| 2023 | 2023 | foreach ($alldata as $number) { |
| 2024 | - $this->addStatAirline($number['airline_icao'],$number['airline_count'],$number['airline_name'],$filter_name,$reset); |
|
| 2024 | + $this->addStatAirline($number['airline_icao'], $number['airline_count'], $number['airline_name'], $filter_name, $reset); |
|
| 2025 | 2025 | } |
| 2026 | - $alldata = $Spotter->countAllAircraftRegistrations(false,0,$last_update_day,$filter); |
|
| 2026 | + $alldata = $Spotter->countAllAircraftRegistrations(false, 0, $last_update_day, $filter); |
|
| 2027 | 2027 | foreach ($alldata as $number) { |
| 2028 | - $this->addStatAircraftRegistration($number['registration'],$number['aircraft_registration_count'],$number['aircraft_icao'],'',$filter_name,$reset); |
|
| 2028 | + $this->addStatAircraftRegistration($number['registration'], $number['aircraft_registration_count'], $number['aircraft_icao'], '', $filter_name, $reset); |
|
| 2029 | 2029 | } |
| 2030 | - $alldata = $Spotter->countAllCallsigns(false,0,$last_update_day,$filter); |
|
| 2030 | + $alldata = $Spotter->countAllCallsigns(false, 0, $last_update_day, $filter); |
|
| 2031 | 2031 | foreach ($alldata as $number) { |
| 2032 | - $this->addStatCallsign($number['callsign_icao'],$number['callsign_icao_count'],'',$filter_name,$reset); |
|
| 2032 | + $this->addStatCallsign($number['callsign_icao'], $number['callsign_icao_count'], '', $filter_name, $reset); |
|
| 2033 | 2033 | } |
| 2034 | - $alldata = $Spotter->countAllOwners(false,0,$last_update_day,$filter); |
|
| 2034 | + $alldata = $Spotter->countAllOwners(false, 0, $last_update_day, $filter); |
|
| 2035 | 2035 | foreach ($alldata as $number) { |
| 2036 | - $this->addStatOwner($number['owner_name'],$number['owner_count'],'',$filter_name,$reset); |
|
| 2036 | + $this->addStatOwner($number['owner_name'], $number['owner_count'], '', $filter_name, $reset); |
|
| 2037 | 2037 | } |
| 2038 | - $alldata = $Spotter->countAllPilots(false,0,$last_update_day,$filter); |
|
| 2038 | + $alldata = $Spotter->countAllPilots(false, 0, $last_update_day, $filter); |
|
| 2039 | 2039 | foreach ($alldata as $number) { |
| 2040 | - $this->addStatPilot($number['pilot_id'],$number['pilot_count'],$number['pilot_name'],'',$filter_name,$number['format_source'],$reset); |
|
| 2040 | + $this->addStatPilot($number['pilot_id'], $number['pilot_count'], $number['pilot_name'], '', $filter_name, $number['format_source'], $reset); |
|
| 2041 | 2041 | } |
| 2042 | - $pall = $Spotter->countAllDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2043 | - $dall = $Spotter->countAllDetectedDepartureAirports(false,0,$last_update_day,$filter); |
|
| 2042 | + $pall = $Spotter->countAllDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 2043 | + $dall = $Spotter->countAllDetectedDepartureAirports(false, 0, $last_update_day, $filter); |
|
| 2044 | 2044 | $alldata = array(); |
| 2045 | 2045 | foreach ($pall as $value) { |
| 2046 | 2046 | $icao = $value['airport_departure_icao']; |
@@ -2056,12 +2056,12 @@ discard block |
||
| 2056 | 2056 | foreach ($alldata as $key => $row) { |
| 2057 | 2057 | $count[$key] = $row['airport_departure_icao_count']; |
| 2058 | 2058 | } |
| 2059 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2059 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2060 | 2060 | foreach ($alldata as $number) { |
| 2061 | - echo $this->addStatDepartureAirports($number['airport_departure_icao'],$number['airport_departure_name'],$number['airport_departure_city'],$number['airport_departure_country'],$number['airport_departure_icao_count'],'',$filter_name,$reset); |
|
| 2061 | + echo $this->addStatDepartureAirports($number['airport_departure_icao'], $number['airport_departure_name'], $number['airport_departure_city'], $number['airport_departure_country'], $number['airport_departure_icao_count'], '', $filter_name, $reset); |
|
| 2062 | 2062 | } |
| 2063 | - $pall = $Spotter->countAllArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2064 | - $dall = $Spotter->countAllDetectedArrivalAirports(false,0,$last_update_day,false,$filter); |
|
| 2063 | + $pall = $Spotter->countAllArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 2064 | + $dall = $Spotter->countAllDetectedArrivalAirports(false, 0, $last_update_day, false, $filter); |
|
| 2065 | 2065 | $alldata = array(); |
| 2066 | 2066 | foreach ($pall as $value) { |
| 2067 | 2067 | $icao = $value['airport_arrival_icao']; |
@@ -2077,40 +2077,40 @@ discard block |
||
| 2077 | 2077 | foreach ($alldata as $key => $row) { |
| 2078 | 2078 | $count[$key] = $row['airport_arrival_icao_count']; |
| 2079 | 2079 | } |
| 2080 | - array_multisort($count,SORT_DESC,$alldata); |
|
| 2080 | + array_multisort($count, SORT_DESC, $alldata); |
|
| 2081 | 2081 | foreach ($alldata as $number) { |
| 2082 | - echo $this->addStatArrivalAirports($number['airport_arrival_icao'],$number['airport_arrival_name'],$number['airport_arrival_city'],$number['airport_arrival_country'],$number['airport_arrival_icao_count'],'',$filter_name,$reset); |
|
| 2082 | + echo $this->addStatArrivalAirports($number['airport_arrival_icao'], $number['airport_arrival_name'], $number['airport_arrival_city'], $number['airport_arrival_country'], $number['airport_arrival_icao_count'], '', $filter_name, $reset); |
|
| 2083 | 2083 | } |
| 2084 | 2084 | $Spotter = new Spotter($this->db); |
| 2085 | 2085 | $alldata = $Spotter->countAllMonths($filter); |
| 2086 | 2086 | $lastyear = false; |
| 2087 | 2087 | foreach ($alldata as $number) { |
| 2088 | 2088 | if ($number['year_name'] != date('Y')) $lastyear = true; |
| 2089 | - $this->addStat('flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2089 | + $this->addStat('flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2090 | 2090 | } |
| 2091 | 2091 | $alldata = $Spotter->countAllMonthsOwners($filter); |
| 2092 | 2092 | foreach ($alldata as $number) { |
| 2093 | - $this->addStat('owners_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2093 | + $this->addStat('owners_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2094 | 2094 | } |
| 2095 | 2095 | $alldata = $Spotter->countAllMonthsPilots($filter); |
| 2096 | 2096 | foreach ($alldata as $number) { |
| 2097 | - $this->addStat('pilots_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2097 | + $this->addStat('pilots_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2098 | 2098 | } |
| 2099 | 2099 | $alldata = $Spotter->countAllMilitaryMonths($filter); |
| 2100 | 2100 | foreach ($alldata as $number) { |
| 2101 | - $this->addStat('military_flights_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2101 | + $this->addStat('military_flights_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2102 | 2102 | } |
| 2103 | 2103 | $alldata = $Spotter->countAllMonthsAircrafts($filter); |
| 2104 | 2104 | foreach ($alldata as $number) { |
| 2105 | - $this->addStat('aircrafts_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2105 | + $this->addStat('aircrafts_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2106 | 2106 | } |
| 2107 | 2107 | $alldata = $Spotter->countAllMonthsRealArrivals($filter); |
| 2108 | 2108 | foreach ($alldata as $number) { |
| 2109 | - $this->addStat('realarrivals_bymonth',$number['date_count'],date('Y-m-d H:i:s',mktime(0,0,0,$number['month_name'],1,$number['year_name'])),'',$filter_name); |
|
| 2109 | + $this->addStat('realarrivals_bymonth', $number['date_count'], date('Y-m-d H:i:s', mktime(0, 0, 0, $number['month_name'], 1, $number['year_name'])), '', $filter_name); |
|
| 2110 | 2110 | } |
| 2111 | 2111 | echo '...Departure'."\n"; |
| 2112 | - $pall = $Spotter->getLast7DaysAirportsDeparture('',$filter); |
|
| 2113 | - $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('',$filter); |
|
| 2112 | + $pall = $Spotter->getLast7DaysAirportsDeparture('', $filter); |
|
| 2113 | + $dall = $Spotter->getLast7DaysDetectedAirportsDeparture('', $filter); |
|
| 2114 | 2114 | foreach ($dall as $value) { |
| 2115 | 2115 | $icao = $value['departure_airport_icao']; |
| 2116 | 2116 | $ddate = $value['date']; |
@@ -2128,11 +2128,11 @@ discard block |
||
| 2128 | 2128 | } |
| 2129 | 2129 | $alldata = $pall; |
| 2130 | 2130 | foreach ($alldata as $number) { |
| 2131 | - $this->addStatDepartureAirportsDaily($number['date'],$number['departure_airport_icao'],$number['departure_airport_name'],$number['departure_airport_city'],$number['departure_airport_country'],$number['departure_airport_count'],'',$filter_name); |
|
| 2131 | + $this->addStatDepartureAirportsDaily($number['date'], $number['departure_airport_icao'], $number['departure_airport_name'], $number['departure_airport_city'], $number['departure_airport_country'], $number['departure_airport_count'], '', $filter_name); |
|
| 2132 | 2132 | } |
| 2133 | 2133 | echo '...Arrival'."\n"; |
| 2134 | - $pall = $Spotter->getLast7DaysAirportsArrival('',$filter); |
|
| 2135 | - $dall = $Spotter->getLast7DaysDetectedAirportsArrival('',$filter); |
|
| 2134 | + $pall = $Spotter->getLast7DaysAirportsArrival('', $filter); |
|
| 2135 | + $dall = $Spotter->getLast7DaysDetectedAirportsArrival('', $filter); |
|
| 2136 | 2136 | foreach ($dall as $value) { |
| 2137 | 2137 | $icao = $value['arrival_airport_icao']; |
| 2138 | 2138 | $ddate = $value['date']; |
@@ -2150,40 +2150,40 @@ discard block |
||
| 2150 | 2150 | } |
| 2151 | 2151 | $alldata = $pall; |
| 2152 | 2152 | foreach ($alldata as $number) { |
| 2153 | - $this->addStatArrivalAirportsDaily($number['date'],$number['arrival_airport_icao'],$number['arrival_airport_name'],$number['arrival_airport_city'],$number['arrival_airport_country'],$number['arrival_airport_count'],'',$filter_name); |
|
| 2153 | + $this->addStatArrivalAirportsDaily($number['date'], $number['arrival_airport_icao'], $number['arrival_airport_name'], $number['arrival_airport_city'], $number['arrival_airport_country'], $number['arrival_airport_count'], '', $filter_name); |
|
| 2154 | 2154 | } |
| 2155 | 2155 | |
| 2156 | 2156 | echo 'Flights data...'."\n"; |
| 2157 | 2157 | echo '-> countAllDatesLastMonth...'."\n"; |
| 2158 | 2158 | $alldata = $Spotter->countAllDatesLastMonth($filter); |
| 2159 | 2159 | foreach ($alldata as $number) { |
| 2160 | - $this->addStatFlight('month',$number['date_name'],$number['date_count'], '',$filter_name); |
|
| 2160 | + $this->addStatFlight('month', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 2161 | 2161 | } |
| 2162 | 2162 | echo '-> countAllDates...'."\n"; |
| 2163 | - $previousdata = $this->countAllDates('',$filter_name); |
|
| 2164 | - $alldata = $Common->array_merge_noappend($previousdata,$Spotter->countAllDates($filter)); |
|
| 2163 | + $previousdata = $this->countAllDates('', $filter_name); |
|
| 2164 | + $alldata = $Common->array_merge_noappend($previousdata, $Spotter->countAllDates($filter)); |
|
| 2165 | 2165 | $values = array(); |
| 2166 | 2166 | foreach ($alldata as $cnt) { |
| 2167 | 2167 | $values[] = $cnt['date_count']; |
| 2168 | 2168 | } |
| 2169 | - array_multisort($values,SORT_DESC,$alldata); |
|
| 2170 | - array_splice($alldata,11); |
|
| 2169 | + array_multisort($values, SORT_DESC, $alldata); |
|
| 2170 | + array_splice($alldata, 11); |
|
| 2171 | 2171 | foreach ($alldata as $number) { |
| 2172 | - $this->addStatFlight('date',$number['date_name'],$number['date_count'],'',$filter_name); |
|
| 2172 | + $this->addStatFlight('date', $number['date_name'], $number['date_count'], '', $filter_name); |
|
| 2173 | 2173 | } |
| 2174 | 2174 | |
| 2175 | 2175 | echo '-> countAllHours...'."\n"; |
| 2176 | - $alldata = $Spotter->countAllHours('hour',$filter); |
|
| 2176 | + $alldata = $Spotter->countAllHours('hour', $filter); |
|
| 2177 | 2177 | foreach ($alldata as $number) { |
| 2178 | - $this->addStatFlight('hour',$number['hour_name'],$number['hour_count'],'',$filter_name); |
|
| 2178 | + $this->addStatFlight('hour', $number['hour_name'], $number['hour_count'], '', $filter_name); |
|
| 2179 | 2179 | } |
| 2180 | 2180 | echo 'Insert last stats update date...'."\n"; |
| 2181 | 2181 | date_default_timezone_set('UTC'); |
| 2182 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y-m-d G:i:s')); |
|
| 2182 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y-m-d G:i:s')); |
|
| 2183 | 2183 | if (isset($filter['DeleteLastYearStats']) && $filter['DeleteLastYearStats'] == true) { |
| 2184 | - if (date('Y',strtotime($last_update_day)) != date('Y')) { |
|
| 2184 | + if (date('Y', strtotime($last_update_day)) != date('Y')) { |
|
| 2185 | 2185 | $this->deleteOldStats($filter_name); |
| 2186 | - $this->addLastStatsUpdate('last_update_stats_'.$filter_name,date('Y').'-01-01 00:00:00'); |
|
| 2186 | + $this->addLastStatsUpdate('last_update_stats_'.$filter_name, date('Y').'-01-01 00:00:00'); |
|
| 2187 | 2187 | } |
| 2188 | 2188 | } |
| 2189 | 2189 | |
@@ -2196,16 +2196,16 @@ discard block |
||
| 2196 | 2196 | // SUM all previous month to put as year |
| 2197 | 2197 | $previous_year = date('Y'); |
| 2198 | 2198 | $previous_year--; |
| 2199 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2200 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2201 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2202 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year),$previous_year.'-01-01 00:00:00'); |
|
| 2199 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2200 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2201 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2202 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year), $previous_year.'-01-01 00:00:00'); |
|
| 2203 | 2203 | $allairlines = $this->getAllAirlineNames(); |
| 2204 | 2204 | foreach ($allairlines as $data) { |
| 2205 | - $this->addStat('aircrafts_byyear',$this->getSumStats('aircrafts_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2206 | - $this->addStat('airlines_byyear',$this->getSumStats('airlines_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2207 | - $this->addStat('owner_byyear',$this->getSumStats('owner_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2208 | - $this->addStat('pilot_byyear',$this->getSumStats('pilot_bymonth',$previous_year,$data['airline_icao']),$previous_year.'-01-01 00:00:00',$data['airline_icao']); |
|
| 2205 | + $this->addStat('aircrafts_byyear', $this->getSumStats('aircrafts_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2206 | + $this->addStat('airlines_byyear', $this->getSumStats('airlines_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2207 | + $this->addStat('owner_byyear', $this->getSumStats('owner_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2208 | + $this->addStat('pilot_byyear', $this->getSumStats('pilot_bymonth', $previous_year, $data['airline_icao']), $previous_year.'-01-01 00:00:00', $data['airline_icao']); |
|
| 2209 | 2209 | } |
| 2210 | 2210 | |
| 2211 | 2211 | if (isset($globalArchiveYear) && $globalArchiveYear) { |
@@ -2214,7 +2214,7 @@ discard block |
||
| 2214 | 2214 | try { |
| 2215 | 2215 | $sth = $this->db->prepare($query); |
| 2216 | 2216 | $sth->execute(); |
| 2217 | - } catch(PDOException $e) { |
|
| 2217 | + } catch (PDOException $e) { |
|
| 2218 | 2218 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2219 | 2219 | } |
| 2220 | 2220 | } |
@@ -2223,15 +2223,15 @@ discard block |
||
| 2223 | 2223 | try { |
| 2224 | 2224 | $sth = $this->db->prepare($query); |
| 2225 | 2225 | $sth->execute(); |
| 2226 | - } catch(PDOException $e) { |
|
| 2226 | + } catch (PDOException $e) { |
|
| 2227 | 2227 | return "error : ".$e->getMessage().' - query : '.$query."\n"; |
| 2228 | 2228 | } |
| 2229 | 2229 | } |
| 2230 | 2230 | if (isset($globalDeleteLastYearStats) && $globalDeleteLastYearStats) { |
| 2231 | 2231 | $last_update = $this->getLastStatsUpdate('last_update_stats'); |
| 2232 | - if (date('Y',strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 2232 | + if (date('Y', strtotime($last_update[0]['value'])) != date('Y')) { |
|
| 2233 | 2233 | $this->deleteOldStats(); |
| 2234 | - $this->addLastStatsUpdate('last_update_stats',date('Y').'-01-01 00:00:00'); |
|
| 2234 | + $this->addLastStatsUpdate('last_update_stats', date('Y').'-01-01 00:00:00'); |
|
| 2235 | 2235 | $lastyearupdate = true; |
| 2236 | 2236 | } |
| 2237 | 2237 | } |
@@ -2253,7 +2253,7 @@ discard block |
||
| 2253 | 2253 | try { |
| 2254 | 2254 | $sth = $this->db->prepare($query); |
| 2255 | 2255 | $sth->execute(); |
| 2256 | - } catch(PDOException $e) { |
|
| 2256 | + } catch (PDOException $e) { |
|
| 2257 | 2257 | return "error : ".$e->getMessage(); |
| 2258 | 2258 | } |
| 2259 | 2259 | } |
@@ -2267,14 +2267,14 @@ discard block |
||
| 2267 | 2267 | try { |
| 2268 | 2268 | $sth = $this->db->prepare($query); |
| 2269 | 2269 | $sth->execute(); |
| 2270 | - } catch(PDOException $e) { |
|
| 2270 | + } catch (PDOException $e) { |
|
| 2271 | 2271 | return "error : ".$e->getMessage(); |
| 2272 | 2272 | } |
| 2273 | 2273 | } |
| 2274 | 2274 | if (!isset($lastyearupdate)) { |
| 2275 | 2275 | echo 'Insert last stats update date...'."\n"; |
| 2276 | 2276 | date_default_timezone_set('UTC'); |
| 2277 | - $this->addLastStatsUpdate('last_update_stats',date('Y-m-d G:i:s')); |
|
| 2277 | + $this->addLastStatsUpdate('last_update_stats', date('Y-m-d G:i:s')); |
|
| 2278 | 2278 | } |
| 2279 | 2279 | if ($globalStatsResetYear) { |
| 2280 | 2280 | require_once(dirname(__FILE__).'/../install/class.settings.php'); |
@@ -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,30 +74,30 @@ 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 | - if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 82 | + if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 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 | } else { |
| 88 | 88 | ?> |
| 89 | - <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span> |
|
| 90 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 89 | + <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Owners"); ?></span> |
|
| 90 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 91 | 91 | <?php |
| 92 | 92 | } |
| 93 | 93 | ?> |
| 94 | - <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
| 95 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 94 | + <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
| 95 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 96 | 96 | <?php |
| 97 | 97 | if ($airline_icao == '') { |
| 98 | 98 | ?> |
| 99 | - <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
| 100 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 99 | + <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name, $year, $month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
| 100 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 101 | 101 | <?php |
| 102 | 102 | } |
| 103 | 103 | ?> |
@@ -105,8 +105,8 @@ discard block |
||
| 105 | 105 | if (!(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS)) { |
| 106 | 106 | if ($airline_icao == '' || $airline_icao == 'all') { |
| 107 | 107 | ?> |
| 108 | - <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name,$year,$month)); ?></span> <?php echo _("Military"); ?></span> |
|
| 109 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 108 | + <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name, $year, $month)); ?></span> <?php echo _("Military"); ?></span> |
|
| 109 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 110 | 110 | <?php |
| 111 | 111 | } |
| 112 | 112 | } |
@@ -114,22 +114,22 @@ discard block |
||
| 114 | 114 | <?php |
| 115 | 115 | } elseif ($type == 'marine') { |
| 116 | 116 | ?> |
| 117 | - <span><span class="badge"><?php print number_format($Marine->countOverallMarine($filter_name,$year,$month)); ?></span> <?php echo _("Vessels"); ?></span> |
|
| 118 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 119 | - <span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes($filter_name,$year,$month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 120 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 117 | + <span><span class="badge"><?php print number_format($Marine->countOverallMarine($filter_name, $year, $month)); ?></span> <?php echo _("Vessels"); ?></span> |
|
| 118 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 119 | + <span><span class="badge"><?php print number_format($Marine->countOverallMarineTypes($filter_name, $year, $month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 120 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 121 | 121 | <?php |
| 122 | 122 | } elseif ($type == 'tracker') { |
| 123 | 123 | ?> |
| 124 | - <span><span class="badge"><?php print number_format($Tracker->countOverallTracker($filter_name,$year,$month)); ?></span> <?php echo _("Trackers"); ?></span> |
|
| 125 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 126 | - <span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes($filter_name,$year,$month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 127 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 124 | + <span><span class="badge"><?php print number_format($Tracker->countOverallTracker($filter_name, $year, $month)); ?></span> <?php echo _("Trackers"); ?></span> |
|
| 125 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 126 | + <span><span class="badge"><?php print number_format($Tracker->countOverallTrackerTypes($filter_name, $year, $month)); ?></span> <?php echo _("Types"); ?></span> |
|
| 127 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 128 | 128 | <?php |
| 129 | 129 | } |
| 130 | 130 | ?> |
| 131 | 131 | </p> |
| 132 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 132 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 133 | 133 | <div class="specific-stats"> |
| 134 | 134 | <?php |
| 135 | 135 | if ($type == 'aircraft') { |
@@ -138,12 +138,12 @@ discard block |
||
| 138 | 138 | <div class="col-md-6"> |
| 139 | 139 | <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
| 140 | 140 | <?php |
| 141 | - $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
| 141 | + $aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month); |
|
| 142 | 142 | if (count($aircraft_array) == 0) print _("No data available"); |
| 143 | 143 | else { |
| 144 | 144 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 145 | 145 | $aircraft_data = ''; |
| 146 | - foreach($aircraft_array as $aircraft_item) |
|
| 146 | + foreach ($aircraft_array as $aircraft_item) |
|
| 147 | 147 | { |
| 148 | 148 | $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
| 149 | 149 | } |
@@ -172,17 +172,17 @@ discard block |
||
| 172 | 172 | ?> |
| 173 | 173 | </div> |
| 174 | 174 | </div> |
| 175 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 175 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 176 | 176 | <?php |
| 177 | 177 | // echo $airline_icao; |
| 178 | 178 | if ($airline_icao == '' || $airline_icao == 'all') { |
| 179 | - $airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month); |
|
| 179 | + $airline_array = $Stats->countAllAirlines(true, $filter_name, $year, $month); |
|
| 180 | 180 | if (count($airline_array) > 0) { |
| 181 | 181 | print '<div class="col-md-6">'; |
| 182 | 182 | print '<h2>'._("Top 10 Most Common Airline").'</h2>'; |
| 183 | 183 | print '<div id="chart2" class="chart" width="100%"></div><script>'; |
| 184 | 184 | $airline_data = ''; |
| 185 | - foreach($airline_array as $airline_item) |
|
| 185 | + foreach ($airline_array as $airline_item) |
|
| 186 | 186 | { |
| 187 | 187 | $airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],'; |
| 188 | 188 | } |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | } |
| 209 | 209 | ?> |
| 210 | 210 | </div> |
| 211 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 211 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 212 | 212 | <?php |
| 213 | 213 | } |
| 214 | 214 | ?> |
@@ -227,7 +227,7 @@ discard block |
||
| 227 | 227 | else { |
| 228 | 228 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 229 | 229 | $marine_data = ''; |
| 230 | - foreach($marine_array as $marine_item) |
|
| 230 | + foreach ($marine_array as $marine_item) |
|
| 231 | 231 | { |
| 232 | 232 | $marine_data .= '["'.$marine_item['marine_type'].'",'.$marine_item['marine_type_count'].'],'; |
| 233 | 233 | } |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | ?> |
| 259 | 259 | </div> |
| 260 | 260 | </div> |
| 261 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 261 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 262 | 262 | <!-- </div>--> |
| 263 | 263 | <?php |
| 264 | 264 | } |
@@ -275,7 +275,7 @@ discard block |
||
| 275 | 275 | else { |
| 276 | 276 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 277 | 277 | $tracker_data = ''; |
| 278 | - foreach($tracker_array as $tracker_item) |
|
| 278 | + foreach ($tracker_array as $tracker_item) |
|
| 279 | 279 | { |
| 280 | 280 | $tracker_data .= '["'.$tracker_item['tracker_type'].'",'.$tracker_item['tracker_type_count'].'],'; |
| 281 | 281 | } |
@@ -306,7 +306,7 @@ discard block |
||
| 306 | 306 | ?> |
| 307 | 307 | </div> |
| 308 | 308 | </div> |
| 309 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 309 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 310 | 310 | <!-- </div>--> |
| 311 | 311 | <?php |
| 312 | 312 | } |
@@ -316,8 +316,8 @@ discard block |
||
| 316 | 316 | ?> |
| 317 | 317 | <div class="row column"> |
| 318 | 318 | <?php |
| 319 | - $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month); |
|
| 320 | - if ((isset($globalVA) && $globalVA) ||(isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 319 | + $flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name, $year, $month); |
|
| 320 | + if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 321 | 321 | if (empty($flightover_array)) { |
| 322 | 322 | print '<div class="col-md-12">'; |
| 323 | 323 | } else { |
@@ -326,12 +326,12 @@ discard block |
||
| 326 | 326 | ?> |
| 327 | 327 | <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2> |
| 328 | 328 | <?php |
| 329 | - $pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month); |
|
| 329 | + $pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month); |
|
| 330 | 330 | if (count($pilot_array) == 0) print _("No data available"); |
| 331 | 331 | else { |
| 332 | 332 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 333 | 333 | $pilot_data = ''; |
| 334 | - foreach($pilot_array as $pilot_item) |
|
| 334 | + foreach ($pilot_array as $pilot_item) |
|
| 335 | 335 | { |
| 336 | 336 | $pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],'; |
| 337 | 337 | } |
@@ -353,19 +353,19 @@ discard block |
||
| 353 | 353 | ?> |
| 354 | 354 | </div> |
| 355 | 355 | |
| 356 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 356 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 357 | 357 | <?php |
| 358 | 358 | } else { |
| 359 | 359 | ?> |
| 360 | 360 | <div class="col-md-6"> |
| 361 | 361 | <h2><?php echo _("Top 10 Most Common Owners"); ?></h2> |
| 362 | 362 | <?php |
| 363 | - $owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month); |
|
| 363 | + $owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name, $year, $month); |
|
| 364 | 364 | if (count($owner_array) == 0) print _("No data available"); |
| 365 | 365 | else { |
| 366 | 366 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 367 | 367 | $owner_data = ''; |
| 368 | - foreach($owner_array as $owner_item) |
|
| 368 | + foreach ($owner_array as $owner_item) |
|
| 369 | 369 | { |
| 370 | 370 | $owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],'; |
| 371 | 371 | } |
@@ -385,7 +385,7 @@ discard block |
||
| 385 | 385 | </div> |
| 386 | 386 | </div> |
| 387 | 387 | |
| 388 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 388 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 389 | 389 | <?php |
| 390 | 390 | } |
| 391 | 391 | if (!empty($flightover_array)) { |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 400 | 400 | print 'var series = ['; |
| 401 | 401 | $flightover_data = ''; |
| 402 | - foreach($flightover_array as $flightover_item) |
|
| 402 | + foreach ($flightover_array as $flightover_item) |
|
| 403 | 403 | { |
| 404 | 404 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
| 405 | 405 | } |
@@ -445,7 +445,7 @@ discard block |
||
| 445 | 445 | } |
| 446 | 446 | ?> |
| 447 | 447 | </div> |
| 448 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 448 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 449 | 449 | |
| 450 | 450 | |
| 451 | 451 | </div> |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 466 | 466 | print 'var series = ['; |
| 467 | 467 | $flightover_data = ''; |
| 468 | - foreach($flightover_array as $flightover_item) |
|
| 468 | + foreach ($flightover_array as $flightover_item) |
|
| 469 | 469 | { |
| 470 | 470 | $flightover_data .= '[ "'.$flightover_item['marine_country_iso3'].'",'.$flightover_item['marine_count'].'],'; |
| 471 | 471 | } |
@@ -525,7 +525,7 @@ discard block |
||
| 525 | 525 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 526 | 526 | print 'var series = ['; |
| 527 | 527 | $flightover_data = ''; |
| 528 | - foreach($flightover_array as $flightover_item) |
|
| 528 | + foreach ($flightover_array as $flightover_item) |
|
| 529 | 529 | { |
| 530 | 530 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
| 531 | 531 | } |
@@ -578,14 +578,14 @@ discard block |
||
| 578 | 578 | <div class="row column"> |
| 579 | 579 | <div class="col-md-6"> |
| 580 | 580 | <?php |
| 581 | - $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 581 | + $airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name, $year, $month); |
|
| 582 | 582 | if (count($airport_airport_array) > 0) { |
| 583 | 583 | print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>'; |
| 584 | 584 | print '<div id="chart3" class="chart" width="100%"></div><script>'; |
| 585 | 585 | print "\n"; |
| 586 | 586 | print 'var series = ['; |
| 587 | 587 | $airport_data = ''; |
| 588 | - foreach($airport_airport_array as $airport_item) |
|
| 588 | + foreach ($airport_airport_array as $airport_item) |
|
| 589 | 589 | { |
| 590 | 590 | $airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],'; |
| 591 | 591 | } |
@@ -636,18 +636,18 @@ discard block |
||
| 636 | 636 | } |
| 637 | 637 | ?> |
| 638 | 638 | </div> |
| 639 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 639 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 640 | 640 | |
| 641 | 641 | <div class="col-md-6"> |
| 642 | 642 | <?php |
| 643 | - $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 643 | + $airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name, $year, $month); |
|
| 644 | 644 | if (count($airport_airport_array2) > 0) { |
| 645 | 645 | print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>'; |
| 646 | 646 | print '<div id="chart4" class="chart" width="100%"></div><script>'; |
| 647 | 647 | print "\n"; |
| 648 | 648 | print 'var series = ['; |
| 649 | 649 | $airport_data = ''; |
| 650 | - foreach($airport_airport_array2 as $airport_item) |
|
| 650 | + foreach ($airport_airport_array2 as $airport_item) |
|
| 651 | 651 | { |
| 652 | 652 | $airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],'; |
| 653 | 653 | } |
@@ -699,7 +699,7 @@ discard block |
||
| 699 | 699 | ?> |
| 700 | 700 | </div> |
| 701 | 701 | </div> |
| 702 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 702 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 703 | 703 | <?php |
| 704 | 704 | } |
| 705 | 705 | ?> |
@@ -713,19 +713,19 @@ discard block |
||
| 713 | 713 | <div class="col-md-6"> |
| 714 | 714 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 715 | 715 | <?php |
| 716 | - $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 716 | + $year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name); |
|
| 717 | 717 | if (count($year_array) == 0) print _("No data available"); |
| 718 | 718 | else { |
| 719 | 719 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 720 | 720 | $year_data = ''; |
| 721 | 721 | $year_cnt = ''; |
| 722 | - foreach($year_array as $year_item) |
|
| 722 | + foreach ($year_array as $year_item) |
|
| 723 | 723 | { |
| 724 | 724 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 725 | 725 | $year_cnt .= $year_item['date_count'].','; |
| 726 | 726 | } |
| 727 | 727 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 728 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 728 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 729 | 729 | print 'c3.generate({ |
| 730 | 730 | bindto: "#chart8", |
| 731 | 731 | data: { x: "x", |
@@ -738,23 +738,23 @@ discard block |
||
| 738 | 738 | <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> |
| 739 | 739 | </div> |
| 740 | 740 | </div> |
| 741 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 741 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 742 | 742 | <div class="col-md-6"> |
| 743 | 743 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 744 | 744 | <?php |
| 745 | - $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 745 | + $month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name); |
|
| 746 | 746 | if (count($month_array) == 0) print _("No data available"); |
| 747 | 747 | else { |
| 748 | 748 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 749 | 749 | $month_data = ''; |
| 750 | 750 | $month_cnt = ''; |
| 751 | - foreach($month_array as $month_item) |
|
| 751 | + foreach ($month_array as $month_item) |
|
| 752 | 752 | { |
| 753 | 753 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 754 | 754 | $month_cnt .= $month_item['date_count'].','; |
| 755 | 755 | } |
| 756 | 756 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 757 | - $month_cnt = "['flights',".substr($month_cnt,0,-1)."]"; |
|
| 757 | + $month_cnt = "['flights',".substr($month_cnt, 0, -1)."]"; |
|
| 758 | 758 | print 'c3.generate({ |
| 759 | 759 | bindto: "#chart9", |
| 760 | 760 | data: { x: "x", |
@@ -767,24 +767,24 @@ discard block |
||
| 767 | 767 | <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> |
| 768 | 768 | </div> |
| 769 | 769 | </div> |
| 770 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 770 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 771 | 771 | |
| 772 | 772 | <div class="col-md-6"> |
| 773 | 773 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
| 774 | 774 | <?php |
| 775 | - $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 775 | + $date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name); |
|
| 776 | 776 | if (empty($date_array)) print _("No data available"); |
| 777 | 777 | else { |
| 778 | 778 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 779 | 779 | $date_data = ''; |
| 780 | 780 | $date_cnt = ''; |
| 781 | - foreach($date_array as $date_item) |
|
| 781 | + foreach ($date_array as $date_item) |
|
| 782 | 782 | { |
| 783 | 783 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 784 | 784 | $date_cnt .= $date_item['date_count'].','; |
| 785 | 785 | } |
| 786 | 786 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 787 | - $date_cnt = "['flights',".substr($date_cnt,0,-1)."]"; |
|
| 787 | + $date_cnt = "['flights',".substr($date_cnt, 0, -1)."]"; |
|
| 788 | 788 | print 'c3.generate({ |
| 789 | 789 | bindto: "#chart5", |
| 790 | 790 | data: { x: "x", |
@@ -797,23 +797,23 @@ discard block |
||
| 797 | 797 | <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> |
| 798 | 798 | </div> |
| 799 | 799 | </div> |
| 800 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 800 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 801 | 801 | <div class="col-md-6"> |
| 802 | 802 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 803 | 803 | <?php |
| 804 | - $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 804 | + $hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name); |
|
| 805 | 805 | if (empty($hour_array)) print _("No data available"); |
| 806 | 806 | else { |
| 807 | 807 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 808 | 808 | $hour_data = ''; |
| 809 | 809 | $hour_cnt = ''; |
| 810 | - foreach($hour_array as $hour_item) |
|
| 810 | + foreach ($hour_array as $hour_item) |
|
| 811 | 811 | { |
| 812 | 812 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 813 | 813 | $hour_cnt .= $hour_item['hour_count'].','; |
| 814 | 814 | } |
| 815 | 815 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 816 | - $hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
|
| 816 | + $hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]"; |
|
| 817 | 817 | print 'c3.generate({ |
| 818 | 818 | bindto: "#chart6", |
| 819 | 819 | data: { |
@@ -826,7 +826,7 @@ discard block |
||
| 826 | 826 | <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> |
| 827 | 827 | </div> |
| 828 | 828 | </div> |
| 829 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 829 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 830 | 830 | </div> |
| 831 | 831 | <?php |
| 832 | 832 | } |
@@ -844,19 +844,19 @@ discard block |
||
| 844 | 844 | <div class="col-md-6"> |
| 845 | 845 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 846 | 846 | <?php |
| 847 | - $year_array = $Marine->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 847 | + $year_array = $Marine->countAllMonthsLastYear(true, $airline_icao, $filter_name); |
|
| 848 | 848 | if (count($year_array) == 0) print _("No data available"); |
| 849 | 849 | else { |
| 850 | 850 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 851 | 851 | $year_data = ''; |
| 852 | 852 | $year_cnt = ''; |
| 853 | - foreach($year_array as $year_item) |
|
| 853 | + foreach ($year_array as $year_item) |
|
| 854 | 854 | { |
| 855 | 855 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 856 | 856 | $year_cnt .= $year_item['date_count'].','; |
| 857 | 857 | } |
| 858 | 858 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 859 | - $year_cnt = "['vessels',".substr($year_cnt,0,-1)."]"; |
|
| 859 | + $year_cnt = "['vessels',".substr($year_cnt, 0, -1)."]"; |
|
| 860 | 860 | print 'c3.generate({ |
| 861 | 861 | bindto: "#chart8", |
| 862 | 862 | data: { x: "x", |
@@ -870,23 +870,23 @@ discard block |
||
| 870 | 870 | </div> |
| 871 | 871 | </div> |
| 872 | 872 | |
| 873 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 873 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 874 | 874 | <div class="col-md-6"> |
| 875 | 875 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 876 | 876 | <?php |
| 877 | - $month_array = $Marine->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 877 | + $month_array = $Marine->countAllDatesLastMonth($airline_icao, $filter_name); |
|
| 878 | 878 | if (count($month_array) == 0) print _("No data available"); |
| 879 | 879 | else { |
| 880 | 880 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 881 | 881 | $month_data = ''; |
| 882 | 882 | $month_cnt = ''; |
| 883 | - foreach($month_array as $month_item) |
|
| 883 | + foreach ($month_array as $month_item) |
|
| 884 | 884 | { |
| 885 | 885 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 886 | 886 | $month_cnt .= $month_item['date_count'].','; |
| 887 | 887 | } |
| 888 | 888 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 889 | - $month_cnt = "['vessels',".substr($month_cnt,0,-1)."]"; |
|
| 889 | + $month_cnt = "['vessels',".substr($month_cnt, 0, -1)."]"; |
|
| 890 | 890 | print 'c3.generate({ |
| 891 | 891 | bindto: "#chart9", |
| 892 | 892 | data: { x: "x", |
@@ -899,24 +899,24 @@ discard block |
||
| 899 | 899 | <a href="<?php print $globalURL; ?>/marine/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 900 | 900 | </div> |
| 901 | 901 | </div> |
| 902 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 902 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 903 | 903 | |
| 904 | 904 | <div class="col-md-6"> |
| 905 | 905 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
| 906 | 906 | <?php |
| 907 | - $date_array = $Marine->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 907 | + $date_array = $Marine->countAllDatesLast7Days($airline_icao, $filter_name); |
|
| 908 | 908 | if (empty($date_array)) print _("No data available"); |
| 909 | 909 | else { |
| 910 | 910 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 911 | 911 | $date_data = ''; |
| 912 | 912 | $date_cnt = ''; |
| 913 | - foreach($date_array as $date_item) |
|
| 913 | + foreach ($date_array as $date_item) |
|
| 914 | 914 | { |
| 915 | 915 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 916 | 916 | $date_cnt .= $date_item['date_count'].','; |
| 917 | 917 | } |
| 918 | 918 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 919 | - $date_cnt = "['vessels',".substr($date_cnt,0,-1)."]"; |
|
| 919 | + $date_cnt = "['vessels',".substr($date_cnt, 0, -1)."]"; |
|
| 920 | 920 | print 'c3.generate({ |
| 921 | 921 | bindto: "#chart5", |
| 922 | 922 | data: { x: "x", |
@@ -929,23 +929,23 @@ discard block |
||
| 929 | 929 | <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 930 | 930 | </div> |
| 931 | 931 | </div> |
| 932 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 932 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 933 | 933 | <div class="col-md-6"> |
| 934 | 934 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 935 | 935 | <?php |
| 936 | - $hour_array = $Marine->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 936 | + $hour_array = $Marine->countAllHours('hour', true, $airline_icao, $filter_name); |
|
| 937 | 937 | if (empty($hour_array)) print _("No data available"); |
| 938 | 938 | else { |
| 939 | 939 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 940 | 940 | $hour_data = ''; |
| 941 | 941 | $hour_cnt = ''; |
| 942 | - foreach($hour_array as $hour_item) |
|
| 942 | + foreach ($hour_array as $hour_item) |
|
| 943 | 943 | { |
| 944 | 944 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 945 | 945 | $hour_cnt .= $hour_item['hour_count'].','; |
| 946 | 946 | } |
| 947 | 947 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 948 | - $hour_cnt = "['vessels',".substr($hour_cnt,0,-1)."]"; |
|
| 948 | + $hour_cnt = "['vessels',".substr($hour_cnt, 0, -1)."]"; |
|
| 949 | 949 | print 'c3.generate({ |
| 950 | 950 | bindto: "#chart6", |
| 951 | 951 | data: { |
@@ -958,7 +958,7 @@ discard block |
||
| 958 | 958 | <a href="<?php print $globalURL; ?>/marine/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 959 | 959 | </div> |
| 960 | 960 | </div> |
| 961 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 961 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 962 | 962 | </div> |
| 963 | 963 | <?php |
| 964 | 964 | } |
@@ -982,13 +982,13 @@ discard block |
||
| 982 | 982 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 983 | 983 | $year_data = ''; |
| 984 | 984 | $year_cnt = ''; |
| 985 | - foreach($year_array as $year_item) |
|
| 985 | + foreach ($year_array as $year_item) |
|
| 986 | 986 | { |
| 987 | 987 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 988 | 988 | $year_cnt .= $year_item['date_count'].','; |
| 989 | 989 | } |
| 990 | 990 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 991 | - $year_cnt = "['trackers',".substr($year_cnt,0,-1)."]"; |
|
| 991 | + $year_cnt = "['trackers',".substr($year_cnt, 0, -1)."]"; |
|
| 992 | 992 | print 'c3.generate({ |
| 993 | 993 | bindto: "#chart8", |
| 994 | 994 | data: { x: "x", |
@@ -1002,7 +1002,7 @@ discard block |
||
| 1002 | 1002 | </div> |
| 1003 | 1003 | </div> |
| 1004 | 1004 | |
| 1005 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1005 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1006 | 1006 | <div class="col-md-6"> |
| 1007 | 1007 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 1008 | 1008 | <?php |
@@ -1012,13 +1012,13 @@ discard block |
||
| 1012 | 1012 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 1013 | 1013 | $month_data = ''; |
| 1014 | 1014 | $month_cnt = ''; |
| 1015 | - foreach($month_array as $month_item) |
|
| 1015 | + foreach ($month_array as $month_item) |
|
| 1016 | 1016 | { |
| 1017 | 1017 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 1018 | 1018 | $month_cnt .= $month_item['date_count'].','; |
| 1019 | 1019 | } |
| 1020 | 1020 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 1021 | - $month_cnt = "['trackers',".substr($month_cnt,0,-1)."]"; |
|
| 1021 | + $month_cnt = "['trackers',".substr($month_cnt, 0, -1)."]"; |
|
| 1022 | 1022 | print 'c3.generate({ |
| 1023 | 1023 | bindto: "#chart9", |
| 1024 | 1024 | data: { x: "x", |
@@ -1031,7 +1031,7 @@ discard block |
||
| 1031 | 1031 | <a href="<?php print $globalURL; ?>/tracker/statistics/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1032 | 1032 | </div> |
| 1033 | 1033 | </div> |
| 1034 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1034 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1035 | 1035 | |
| 1036 | 1036 | <div class="col-md-6"> |
| 1037 | 1037 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
@@ -1042,13 +1042,13 @@ discard block |
||
| 1042 | 1042 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 1043 | 1043 | $date_data = ''; |
| 1044 | 1044 | $date_cnt = ''; |
| 1045 | - foreach($date_array as $date_item) |
|
| 1045 | + foreach ($date_array as $date_item) |
|
| 1046 | 1046 | { |
| 1047 | 1047 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 1048 | 1048 | $date_cnt .= $date_item['date_count'].','; |
| 1049 | 1049 | } |
| 1050 | 1050 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 1051 | - $date_cnt = "['trackers',".substr($date_cnt,0,-1)."]"; |
|
| 1051 | + $date_cnt = "['trackers',".substr($date_cnt, 0, -1)."]"; |
|
| 1052 | 1052 | print 'c3.generate({ |
| 1053 | 1053 | bindto: "#chart5", |
| 1054 | 1054 | data: { x: "x", |
@@ -1061,23 +1061,23 @@ discard block |
||
| 1061 | 1061 | <a href="<?php print $globalURL; ?>/marine/statistics/date" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1062 | 1062 | </div> |
| 1063 | 1063 | </div> |
| 1064 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1064 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1065 | 1065 | <div class="col-md-6"> |
| 1066 | 1066 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 1067 | 1067 | <?php |
| 1068 | - $hour_array = $Tracker->countAllHours('hour',true); |
|
| 1068 | + $hour_array = $Tracker->countAllHours('hour', true); |
|
| 1069 | 1069 | if (empty($hour_array)) print _("No data available"); |
| 1070 | 1070 | else { |
| 1071 | 1071 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 1072 | 1072 | $hour_data = ''; |
| 1073 | 1073 | $hour_cnt = ''; |
| 1074 | - foreach($hour_array as $hour_item) |
|
| 1074 | + foreach ($hour_array as $hour_item) |
|
| 1075 | 1075 | { |
| 1076 | 1076 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 1077 | 1077 | $hour_cnt .= $hour_item['hour_count'].','; |
| 1078 | 1078 | } |
| 1079 | 1079 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 1080 | - $hour_cnt = "['trackers',".substr($hour_cnt,0,-1)."]"; |
|
| 1080 | + $hour_cnt = "['trackers',".substr($hour_cnt, 0, -1)."]"; |
|
| 1081 | 1081 | print 'c3.generate({ |
| 1082 | 1082 | bindto: "#chart6", |
| 1083 | 1083 | data: { |
@@ -1090,7 +1090,7 @@ discard block |
||
| 1090 | 1090 | <a href="<?php print $globalURL; ?>/tracker/statistics/time" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1091 | 1091 | </div> |
| 1092 | 1092 | </div> |
| 1093 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1093 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1094 | 1094 | </div> |
| 1095 | 1095 | <?php |
| 1096 | 1096 | } |
@@ -1114,13 +1114,13 @@ discard block |
||
| 1114 | 1114 | print '<div id="chart32" class="chart" width="100%"></div><script>'; |
| 1115 | 1115 | $year_data = ''; |
| 1116 | 1116 | $year_cnt = ''; |
| 1117 | - foreach($year_array as $year_item) |
|
| 1117 | + foreach ($year_array as $year_item) |
|
| 1118 | 1118 | { |
| 1119 | 1119 | $year_data .= '"'.$year_item['year'].'-01-01",'; |
| 1120 | 1120 | $year_cnt .= $year_item['count'].','; |
| 1121 | 1121 | } |
| 1122 | 1122 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 1123 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 1123 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 1124 | 1124 | print 'c3.generate({ |
| 1125 | 1125 | bindto: "#chart32", |
| 1126 | 1126 | data: { x: "x", |
@@ -1133,7 +1133,7 @@ discard block |
||
| 1133 | 1133 | <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1134 | 1134 | </div> |
| 1135 | 1135 | </div> |
| 1136 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1136 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1137 | 1137 | |
| 1138 | 1138 | <div class="row column"> |
| 1139 | 1139 | <div class="col-md-6"> |
@@ -1145,13 +1145,13 @@ discard block |
||
| 1145 | 1145 | print '<div id="chart33" class="chart" width="100%"></div><script>'; |
| 1146 | 1146 | $year_data = ''; |
| 1147 | 1147 | $year_cnt = ''; |
| 1148 | - foreach($year_array as $year_item) |
|
| 1148 | + foreach ($year_array as $year_item) |
|
| 1149 | 1149 | { |
| 1150 | 1150 | $year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",'; |
| 1151 | 1151 | $year_cnt .= $year_item['count'].','; |
| 1152 | 1152 | } |
| 1153 | 1153 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 1154 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 1154 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 1155 | 1155 | print 'c3.generate({ |
| 1156 | 1156 | bindto: "#chart33", |
| 1157 | 1157 | data: { x: "x", |
@@ -1164,7 +1164,7 @@ discard block |
||
| 1164 | 1164 | <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 1165 | 1165 | </div> |
| 1166 | 1166 | </div> |
| 1167 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1167 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1168 | 1168 | <br/> |
| 1169 | 1169 | <?php |
| 1170 | 1170 | } |
@@ -1182,9 +1182,9 @@ discard block |
||
| 1182 | 1182 | <?php |
| 1183 | 1183 | //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
| 1184 | 1184 | if ($year == '' && $month == '') { |
| 1185 | - $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d')); |
|
| 1185 | + $polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d')); |
|
| 1186 | 1186 | } else { |
| 1187 | - $polar = $Stats->getStatsSource('polar',$year,$month); |
|
| 1187 | + $polar = $Stats->getStatsSource('polar', $year, $month); |
|
| 1188 | 1188 | } |
| 1189 | 1189 | if (!empty($polar)) { |
| 1190 | 1190 | print '<h2>'._("Coverage pattern").'</h2>'; |
@@ -1192,7 +1192,7 @@ discard block |
||
| 1192 | 1192 | unset($polar_data); |
| 1193 | 1193 | $Spotter = new Spotter(); |
| 1194 | 1194 | $data = json_decode($eachpolar['source_data']); |
| 1195 | - foreach($data as $value => $key) { |
|
| 1195 | + foreach ($data as $value => $key) { |
|
| 1196 | 1196 | $direction = $Spotter->parseDirection(($value*22.5)); |
| 1197 | 1197 | $distance = $key; |
| 1198 | 1198 | $unit = 'km'; |
@@ -1212,7 +1212,7 @@ discard block |
||
| 1212 | 1212 | ?> |
| 1213 | 1213 | <div class="col-md-6"> |
| 1214 | 1214 | <h4><?php print $eachpolar['source_name']; ?></h4> |
| 1215 | - <div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
|
| 1215 | + <div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
|
| 1216 | 1216 | <script> |
| 1217 | 1217 | (function() { |
| 1218 | 1218 | var margin = {top: 100, right: 100, bottom: 100, left: 100}, |
@@ -1236,7 +1236,7 @@ discard block |
||
| 1236 | 1236 | color: color, |
| 1237 | 1237 | unit: '<?php echo $unit; ?>' |
| 1238 | 1238 | }; |
| 1239 | - RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions); |
|
| 1239 | + RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions); |
|
| 1240 | 1240 | })(); |
| 1241 | 1241 | </script> |
| 1242 | 1242 | </div> |
@@ -1250,22 +1250,22 @@ discard block |
||
| 1250 | 1250 | <?php |
| 1251 | 1251 | //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg'); |
| 1252 | 1252 | if ($year == '' && $month == '') { |
| 1253 | - $msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d')); |
|
| 1253 | + $msg = $Stats->getStatsSource('msg', date('Y'), date('m'), date('d')); |
|
| 1254 | 1254 | } else { |
| 1255 | - $msg = $Stats->getStatsSource('msg',$year,$month); |
|
| 1255 | + $msg = $Stats->getStatsSource('msg', $year, $month); |
|
| 1256 | 1256 | } |
| 1257 | 1257 | if (!empty($msg)) { |
| 1258 | 1258 | print '<h2>'._("Messages received").'</h2>'; |
| 1259 | 1259 | foreach ($msg as $eachmsg) { |
| 1260 | 1260 | //$eachmsg = $msg[0]; |
| 1261 | 1261 | $data = $eachmsg['source_data']; |
| 1262 | - if ($data > 500) $max = (round(($data+100)/100))*100; |
|
| 1262 | + if ($data > 500) $max = (round(($data + 100)/100))*100; |
|
| 1263 | 1263 | else $max = 500; |
| 1264 | 1264 | ?> |
| 1265 | - <div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
|
| 1265 | + <div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
|
| 1266 | 1266 | <script> |
| 1267 | 1267 | var g = new JustGage({ |
| 1268 | - id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>", |
|
| 1268 | + id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>", |
|
| 1269 | 1269 | value: <?php echo $data; ?>, |
| 1270 | 1270 | min: 0, |
| 1271 | 1271 | max: <?php print $max; ?>, |
@@ -1286,9 +1286,9 @@ discard block |
||
| 1286 | 1286 | <?php |
| 1287 | 1287 | //$hist = $Stats->getStatsSource(date('Y-m-d'),'hist'); |
| 1288 | 1288 | if ($year == '' && $month == '') { |
| 1289 | - $hist = $Stats->getStatsSource('hist',date('Y'),date('m'),date('d')); |
|
| 1289 | + $hist = $Stats->getStatsSource('hist', date('Y'), date('m'), date('d')); |
|
| 1290 | 1290 | } else { |
| 1291 | - $hist = $Stats->getStatsSource('hist',$year,$month); |
|
| 1291 | + $hist = $Stats->getStatsSource('hist', $year, $month); |
|
| 1292 | 1292 | } |
| 1293 | 1293 | foreach ($hist as $hists) { |
| 1294 | 1294 | //$hist_data = ''; |
@@ -1297,7 +1297,7 @@ discard block |
||
| 1297 | 1297 | $source = $hists['source_name']; |
| 1298 | 1298 | $hist_array = json_decode($hists['source_data']); |
| 1299 | 1299 | $unit = 'km'; |
| 1300 | - foreach($hist_array as $distance => $nb) |
|
| 1300 | + foreach ($hist_array as $distance => $nb) |
|
| 1301 | 1301 | { |
| 1302 | 1302 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 1303 | 1303 | $distance = round($distance*0.539957); |
@@ -1318,18 +1318,18 @@ discard block |
||
| 1318 | 1318 | $nb_data = "['flights',".substr($nb_data, 0, -1)."]"; |
| 1319 | 1319 | ?> |
| 1320 | 1320 | <div class="col-md-6"> |
| 1321 | - <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2> |
|
| 1321 | + <h2><?php echo sprintf(_("Flights Distance for %s"), $source); ?></h2> |
|
| 1322 | 1322 | <?php |
| 1323 | - print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 1323 | + print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 1324 | 1324 | print 'c3.generate({ |
| 1325 | - bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'", |
|
| 1325 | + bindto: "#charthist-'.str_replace(' ', '_', strtolower($source)).'", |
|
| 1326 | 1326 | data: { x: "x", |
| 1327 | 1327 | columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 1328 | 1328 | axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 1329 | 1329 | print '</script>'; |
| 1330 | 1330 | ?> |
| 1331 | 1331 | </div> |
| 1332 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 1332 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 1333 | 1333 | <?php |
| 1334 | 1334 | } |
| 1335 | 1335 | ?> |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | require_once(dirname(__FILE__).'/class.Image.php'); |
| 5 | 5 | $global_query = "SELECT tracker_output.* FROM tracker_output"; |
| 6 | 6 | |
| 7 | -class Tracker{ |
|
| 7 | +class Tracker { |
|
| 8 | 8 | public $db; |
| 9 | 9 | |
| 10 | 10 | public function __construct($dbc = null) { |
@@ -18,33 +18,33 @@ discard block |
||
| 18 | 18 | * @return Array the SQL part |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 21 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 22 | 22 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 23 | 23 | $filters = array(); |
| 24 | 24 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 25 | 25 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 26 | 26 | $filters = $globalStatsFilters[$globalFilterName]; |
| 27 | 27 | } else { |
| 28 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 28 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | if (isset($filter[0]['source'])) { |
| 32 | - $filters = array_merge($filters,$filter); |
|
| 32 | + $filters = array_merge($filters, $filter); |
|
| 33 | 33 | } |
| 34 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 34 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 35 | 35 | $filter_query_join = ''; |
| 36 | 36 | $filter_query_where = ''; |
| 37 | - foreach($filters as $flt) { |
|
| 37 | + foreach ($filters as $flt) { |
|
| 38 | 38 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 39 | 39 | if (isset($flt['source'])) { |
| 40 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 40 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 41 | 41 | } else { |
| 42 | - $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 42 | + $filter_query_join .= " INNER JOIN (SELECT famtrackid FROM tracker_output WHERE tracker_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.famtrackid = tracker_output.famtrackid"; |
|
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 47 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 47 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 48 | 48 | } |
| 49 | 49 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 50 | 50 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 74 | 74 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 75 | 75 | if ($filter_query_where != '') { |
| 76 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 76 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 77 | 77 | } |
| 78 | 78 | $filter_query = $filter_query_join.$filter_query_where; |
| 79 | 79 | return $filter_query; |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | * @return Array the spotter information |
| 89 | 89 | * |
| 90 | 90 | */ |
| 91 | - public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
|
| 91 | + public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false) |
|
| 92 | 92 | { |
| 93 | 93 | date_default_timezone_set('UTC'); |
| 94 | 94 | if (!is_string($query)) |
@@ -108,13 +108,13 @@ discard block |
||
| 108 | 108 | $sth = $this->db->prepare($query.$limitQuery); |
| 109 | 109 | $sth->execute($params); |
| 110 | 110 | } catch (PDOException $e) { |
| 111 | - printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery); |
|
| 111 | + printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery); |
|
| 112 | 112 | exit(); |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | $num_rows = 0; |
| 116 | 116 | $spotter_array = array(); |
| 117 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 117 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 118 | 118 | { |
| 119 | 119 | $num_rows++; |
| 120 | 120 | $temp_array = array(); |
@@ -170,17 +170,17 @@ discard block |
||
| 170 | 170 | { |
| 171 | 171 | $temp_array['date'] = "about ".$dateArray['hours']." hours ago"; |
| 172 | 172 | } else { |
| 173 | - $temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC")); |
|
| 173 | + $temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC")); |
|
| 174 | 174 | } |
| 175 | 175 | $temp_array['date_minutes_past'] = $dateArray['minutes']; |
| 176 | - $temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC")); |
|
| 177 | - $temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC")); |
|
| 176 | + $temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC")); |
|
| 177 | + $temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC")); |
|
| 178 | 178 | $temp_array['date_unix'] = strtotime($row['date']." UTC"); |
| 179 | 179 | if (isset($row['last_seen']) && $row['last_seen'] != '') { |
| 180 | 180 | if (strtotime($row['last_seen']) > strtotime($row['date'])) { |
| 181 | 181 | $temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']); |
| 182 | - $temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC")); |
|
| 183 | - $temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC")); |
|
| 182 | + $temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC")); |
|
| 183 | + $temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC")); |
|
| 184 | 184 | $temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC"); |
| 185 | 185 | } |
| 186 | 186 | } |
@@ -217,8 +217,8 @@ discard block |
||
| 217 | 217 | { |
| 218 | 218 | $limit_array = explode(",", $limit); |
| 219 | 219 | |
| 220 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 221 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 220 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 221 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 222 | 222 | |
| 223 | 223 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 224 | 224 | { |
@@ -235,9 +235,9 @@ discard block |
||
| 235 | 235 | $orderby_query = " ORDER BY tracker_output.date DESC"; |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | - $query = $global_query.$filter_query." ".$orderby_query; |
|
| 238 | + $query = $global_query.$filter_query." ".$orderby_query; |
|
| 239 | 239 | |
| 240 | - $spotter_array = $this->getDataFromDB($query, array(),$limit_query,true); |
|
| 240 | + $spotter_array = $this->getDataFromDB($query, array(), $limit_query, true); |
|
| 241 | 241 | |
| 242 | 242 | return $spotter_array; |
| 243 | 243 | } |
@@ -256,8 +256,8 @@ discard block |
||
| 256 | 256 | if ($id == '') return array(); |
| 257 | 257 | $additional_query = "tracker_output.famtrackid = :id"; |
| 258 | 258 | $query_values = array(':id' => $id); |
| 259 | - $query = $global_query." WHERE ".$additional_query." "; |
|
| 260 | - $spotter_array = $this->getDataFromDB($query,$query_values); |
|
| 259 | + $query = $global_query." WHERE ".$additional_query." "; |
|
| 260 | + $spotter_array = $this->getDataFromDB($query, $query_values); |
|
| 261 | 261 | return $spotter_array; |
| 262 | 262 | } |
| 263 | 263 | |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | $query_values = array(); |
| 277 | 277 | $limit_query = ''; |
| 278 | 278 | $additional_query = ''; |
| 279 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 279 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 280 | 280 | if ($ident != "") |
| 281 | 281 | { |
| 282 | 282 | if (!is_string($ident)) |
@@ -292,8 +292,8 @@ discard block |
||
| 292 | 292 | { |
| 293 | 293 | $limit_array = explode(",", $limit); |
| 294 | 294 | |
| 295 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 296 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 295 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 296 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 297 | 297 | |
| 298 | 298 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 299 | 299 | { |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | return $spotter_array; |
| 318 | 318 | } |
| 319 | 319 | |
| 320 | - public function getTrackerDataByDate($date = '', $limit = '', $sort = '',$filter = array()) |
|
| 320 | + public function getTrackerDataByDate($date = '', $limit = '', $sort = '', $filter = array()) |
|
| 321 | 321 | { |
| 322 | 322 | global $global_query, $globalTimezone, $globalDBdriver; |
| 323 | 323 | |
@@ -325,7 +325,7 @@ discard block |
||
| 325 | 325 | $limit_query = ''; |
| 326 | 326 | $additional_query = ''; |
| 327 | 327 | |
| 328 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 328 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 329 | 329 | |
| 330 | 330 | if ($date != "") |
| 331 | 331 | { |
@@ -351,8 +351,8 @@ discard block |
||
| 351 | 351 | { |
| 352 | 352 | $limit_array = explode(",", $limit); |
| 353 | 353 | |
| 354 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 355 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 354 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 355 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 356 | 356 | |
| 357 | 357 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 358 | 358 | { |
@@ -383,11 +383,11 @@ discard block |
||
| 383 | 383 | * @return Array list of source name |
| 384 | 384 | * |
| 385 | 385 | */ |
| 386 | - public function getAllSourceName($type = '',$filters = array()) |
|
| 386 | + public function getAllSourceName($type = '', $filters = array()) |
|
| 387 | 387 | { |
| 388 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 388 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 389 | 389 | $query_values = array(); |
| 390 | - $query = "SELECT DISTINCT tracker_output.source_name |
|
| 390 | + $query = "SELECT DISTINCT tracker_output.source_name |
|
| 391 | 391 | FROM tracker_output".$filter_query." tracker_output.source_name <> ''"; |
| 392 | 392 | if ($type != '') { |
| 393 | 393 | $query_values = array(':type' => $type); |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | $source_array = array(); |
| 403 | 403 | $temp_array = array(); |
| 404 | 404 | |
| 405 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 405 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 406 | 406 | { |
| 407 | 407 | $temp_array['source_name'] = $row['source_name']; |
| 408 | 408 | $source_array[] = $temp_array; |
@@ -419,8 +419,8 @@ discard block |
||
| 419 | 419 | */ |
| 420 | 420 | public function getAllIdents($filters = array()) |
| 421 | 421 | { |
| 422 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 423 | - $query = "SELECT DISTINCT tracker_output.ident |
|
| 422 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 423 | + $query = "SELECT DISTINCT tracker_output.ident |
|
| 424 | 424 | FROM tracker_output".$filter_query." tracker_output.ident <> '' |
| 425 | 425 | ORDER BY tracker_output.date ASC LIMIT 700 OFFSET 0"; |
| 426 | 426 | |
@@ -430,7 +430,7 @@ discard block |
||
| 430 | 430 | $ident_array = array(); |
| 431 | 431 | $temp_array = array(); |
| 432 | 432 | |
| 433 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 433 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 434 | 434 | { |
| 435 | 435 | $temp_array['ident'] = $row['ident']; |
| 436 | 436 | $ident_array[] = $temp_array; |
@@ -455,12 +455,12 @@ discard block |
||
| 455 | 455 | } else $offset = '+00:00'; |
| 456 | 456 | |
| 457 | 457 | if ($globalDBdriver == 'mysql') { |
| 458 | - $query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date |
|
| 458 | + $query = "SELECT DISTINCT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) as date |
|
| 459 | 459 | FROM tracker_output |
| 460 | 460 | WHERE tracker_output.date <> '' |
| 461 | 461 | ORDER BY tracker_output.date ASC LIMIT 0,200"; |
| 462 | 462 | } else { |
| 463 | - $query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 463 | + $query = "SELECT DISTINCT to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 464 | 464 | FROM tracker_output |
| 465 | 465 | WHERE tracker_output.date <> '' |
| 466 | 466 | ORDER BY tracker_output.date ASC LIMIT 0,200"; |
@@ -472,7 +472,7 @@ discard block |
||
| 472 | 472 | $date_array = array(); |
| 473 | 473 | $temp_array = array(); |
| 474 | 474 | |
| 475 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 475 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 476 | 476 | { |
| 477 | 477 | $temp_array['date'] = $row['date']; |
| 478 | 478 | |
@@ -491,11 +491,11 @@ discard block |
||
| 491 | 491 | * @return String success or false |
| 492 | 492 | * |
| 493 | 493 | */ |
| 494 | - public function updateIdentTrackerData($famtrackid = '', $ident = '',$fromsource = NULL) |
|
| 494 | + public function updateIdentTrackerData($famtrackid = '', $ident = '', $fromsource = NULL) |
|
| 495 | 495 | { |
| 496 | 496 | |
| 497 | 497 | $query = 'UPDATE tracker_output SET ident = :ident WHERE famtrackid = :famtrackid'; |
| 498 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident); |
|
| 498 | + $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident); |
|
| 499 | 499 | |
| 500 | 500 | try { |
| 501 | 501 | $sth = $this->db->prepare($query); |
@@ -519,7 +519,7 @@ discard block |
||
| 519 | 519 | public function updateLatestTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $groundspeed = NULL, $date = '') |
| 520 | 520 | { |
| 521 | 521 | $query = 'UPDATE tracker_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_altitude = :last_altitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE famtrackid = :famtrackid'; |
| 522 | - $query_values = array(':famtrackid' => $famtrackid,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_altitude' => $altitude,':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 522 | + $query_values = array(':famtrackid' => $famtrackid, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_altitude' => $altitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident); |
|
| 523 | 523 | |
| 524 | 524 | try { |
| 525 | 525 | $sth = $this->db->prepare($query); |
@@ -559,7 +559,7 @@ discard block |
||
| 559 | 559 | * @param String $verticalrate vertival rate of flight |
| 560 | 560 | * @return String success or false |
| 561 | 561 | */ |
| 562 | - public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '',$format_source = '', $source_name = '') |
|
| 562 | + public function addTrackerData($famtrackid = '', $ident = '', $latitude = '', $longitude = '', $altitude = '', $heading = '', $groundspeed = '', $date = '', $comment = '', $type = '', $format_source = '', $source_name = '') |
|
| 563 | 563 | { |
| 564 | 564 | global $globalURL; |
| 565 | 565 | |
@@ -627,21 +627,21 @@ discard block |
||
| 627 | 627 | } |
| 628 | 628 | |
| 629 | 629 | |
| 630 | - if ($date == "" || strtotime($date) < time()-20*60) |
|
| 630 | + if ($date == "" || strtotime($date) < time() - 20*60) |
|
| 631 | 631 | { |
| 632 | 632 | $date = date("Y-m-d H:i:s", time()); |
| 633 | 633 | } |
| 634 | 634 | |
| 635 | - $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
|
| 636 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 637 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 638 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 639 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 640 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 641 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 642 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 643 | - $comment = filter_var($comment,FILTER_SANITIZE_STRING); |
|
| 644 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 635 | + $famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING); |
|
| 636 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 637 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 638 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 639 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 640 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 641 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 642 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 643 | + $comment = filter_var($comment, FILTER_SANITIZE_STRING); |
|
| 644 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 645 | 645 | |
| 646 | 646 | if ($latitude == '' && $longitude == '') { |
| 647 | 647 | $latitude = 0; |
@@ -649,10 +649,10 @@ discard block |
||
| 649 | 649 | } |
| 650 | 650 | if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
| 651 | 651 | if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
| 652 | - $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 652 | + $query = "INSERT INTO tracker_output (famtrackid, ident, latitude, longitude, altitude, heading, ground_speed, date, format_source, source_name, comment, type) |
|
| 653 | 653 | VALUES (:famtrackid,:ident,:latitude,:longitude,:altitude,:heading,:speed,:date,:format_source, :source_name,:comment,:type)"; |
| 654 | 654 | |
| 655 | - $query_values = array(':famtrackid' => $famtrackid,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':altitude' => $altitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':comment' => $comment,':type' => $type); |
|
| 655 | + $query_values = array(':famtrackid' => $famtrackid, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':altitude' => $altitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':comment' => $comment, ':type' => $type); |
|
| 656 | 656 | |
| 657 | 657 | try { |
| 658 | 658 | |
@@ -678,13 +678,13 @@ discard block |
||
| 678 | 678 | { |
| 679 | 679 | global $globalDBdriver, $globalTimezone; |
| 680 | 680 | if ($globalDBdriver == 'mysql') { |
| 681 | - $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 681 | + $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 682 | 682 | WHERE tracker_output.ident = :ident |
| 683 | 683 | AND tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 684 | 684 | AND tracker_output.date < UTC_TIMESTAMP()"; |
| 685 | 685 | $query_data = array(':ident' => $ident); |
| 686 | 686 | } else { |
| 687 | - $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 687 | + $query = "SELECT tracker_output.ident FROM tracker_output |
|
| 688 | 688 | WHERE tracker_output.ident = :ident |
| 689 | 689 | AND tracker_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 690 | 690 | AND tracker_output.date < now() AT TIME ZONE 'UTC'"; |
@@ -693,8 +693,8 @@ discard block |
||
| 693 | 693 | |
| 694 | 694 | $sth = $this->db->prepare($query); |
| 695 | 695 | $sth->execute($query_data); |
| 696 | - $ident_result=''; |
|
| 697 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 696 | + $ident_result = ''; |
|
| 697 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 698 | 698 | { |
| 699 | 699 | $ident_result = $row['ident']; |
| 700 | 700 | } |
@@ -720,8 +720,8 @@ discard block |
||
| 720 | 720 | return false; |
| 721 | 721 | } else { |
| 722 | 722 | $q_array = explode(" ", $q); |
| 723 | - foreach ($q_array as $q_item){ |
|
| 724 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 723 | + foreach ($q_array as $q_item) { |
|
| 724 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 725 | 725 | $additional_query .= " AND ("; |
| 726 | 726 | $additional_query .= "(tracker_output.ident like '%".$q_item."%')"; |
| 727 | 727 | $additional_query .= ")"; |
@@ -729,11 +729,11 @@ discard block |
||
| 729 | 729 | } |
| 730 | 730 | } |
| 731 | 731 | if ($globalDBdriver == 'mysql') { |
| 732 | - $query = "SELECT tracker_output.* FROM tracker_output |
|
| 732 | + $query = "SELECT tracker_output.* FROM tracker_output |
|
| 733 | 733 | WHERE tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." |
| 734 | 734 | AND tracker_output.date < UTC_TIMESTAMP()"; |
| 735 | 735 | } else { |
| 736 | - $query = "SELECT tracker_output.* FROM tracker_output |
|
| 736 | + $query = "SELECT tracker_output.* FROM tracker_output |
|
| 737 | 737 | WHERE tracker_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." |
| 738 | 738 | AND tracker_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
| 739 | 739 | } |
@@ -752,16 +752,16 @@ discard block |
||
| 752 | 752 | * |
| 753 | 753 | */ |
| 754 | 754 | |
| 755 | - public function countAllTrackerOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
|
| 755 | + public function countAllTrackerOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 756 | 756 | { |
| 757 | 757 | global $globalDBdriver, $globalArchive; |
| 758 | 758 | //$filter_query = $this->getFilter($filters,true,true); |
| 759 | - $Connection= new Connection($this->db); |
|
| 759 | + $Connection = new Connection($this->db); |
|
| 760 | 760 | if (!$Connection->tableExists('countries')) return array(); |
| 761 | 761 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
| 762 | 762 | require_once('class.TrackerLive.php'); |
| 763 | 763 | $TrackerLive = new TrackerLive(); |
| 764 | - $filter_query = $TrackerLive->getFilter($filters,true,true); |
|
| 764 | + $filter_query = $TrackerLive->getFilter($filters, true, true); |
|
| 765 | 765 | $filter_query .= " over_country IS NOT NULL AND over_country <> ''"; |
| 766 | 766 | if ($olderthanmonths > 0) { |
| 767 | 767 | if ($globalDBdriver == 'mysql') { |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | } else { |
| 782 | 782 | require_once('class.TrackerArchive.php'); |
| 783 | 783 | $TrackerArchive = new TrackerArchive(); |
| 784 | - $filter_query = $TrackerArchive->getFilter($filters,true,true); |
|
| 784 | + $filter_query = $TrackerArchive->getFilter($filters, true, true); |
|
| 785 | 785 | $filter_query .= " over_country IS NOT NULL AND over_country <> ''"; |
| 786 | 786 | if ($olderthanmonths > 0) { |
| 787 | 787 | if ($globalDBdriver == 'mysql') { |
@@ -809,7 +809,7 @@ discard block |
||
| 809 | 809 | $flight_array = array(); |
| 810 | 810 | $temp_array = array(); |
| 811 | 811 | |
| 812 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 812 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 813 | 813 | { |
| 814 | 814 | $temp_array['flight_count'] = $row['nb']; |
| 815 | 815 | $temp_array['flight_country'] = $row['name']; |
@@ -826,11 +826,11 @@ discard block |
||
| 826 | 826 | * @return Array the callsign list |
| 827 | 827 | * |
| 828 | 828 | */ |
| 829 | - public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
|
| 829 | + public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 830 | 830 | { |
| 831 | 831 | global $globalDBdriver; |
| 832 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 833 | - $query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count |
|
| 832 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 833 | + $query = "SELECT DISTINCT tracker_output.ident, COUNT(tracker_output.ident) AS callsign_icao_count |
|
| 834 | 834 | FROM tracker_output".$filter_query." tracker_output.ident <> ''"; |
| 835 | 835 | if ($olderthanmonths > 0) { |
| 836 | 836 | if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
@@ -844,28 +844,28 @@ discard block |
||
| 844 | 844 | if ($year != '') { |
| 845 | 845 | if ($globalDBdriver == 'mysql') { |
| 846 | 846 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 847 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 847 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 848 | 848 | } else { |
| 849 | 849 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 850 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 850 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 851 | 851 | } |
| 852 | 852 | } |
| 853 | 853 | if ($month != '') { |
| 854 | 854 | if ($globalDBdriver == 'mysql') { |
| 855 | 855 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 856 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 856 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 857 | 857 | } else { |
| 858 | 858 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 859 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 859 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 860 | 860 | } |
| 861 | 861 | } |
| 862 | 862 | if ($day != '') { |
| 863 | 863 | if ($globalDBdriver == 'mysql') { |
| 864 | 864 | $query .= " AND DAY(tracker_output.date) = :day"; |
| 865 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 865 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 866 | 866 | } else { |
| 867 | 867 | $query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day"; |
| 868 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 868 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 869 | 869 | } |
| 870 | 870 | } |
| 871 | 871 | $query .= " GROUP BY tracker_output.ident ORDER BY callsign_icao_count DESC"; |
@@ -877,7 +877,7 @@ discard block |
||
| 877 | 877 | $callsign_array = array(); |
| 878 | 878 | $temp_array = array(); |
| 879 | 879 | |
| 880 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 880 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 881 | 881 | { |
| 882 | 882 | $temp_array['callsign_icao'] = $row['ident']; |
| 883 | 883 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -929,7 +929,7 @@ discard block |
||
| 929 | 929 | $date_array = array(); |
| 930 | 930 | $temp_array = array(); |
| 931 | 931 | |
| 932 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 932 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 933 | 933 | { |
| 934 | 934 | $temp_array['date_name'] = $row['date_name']; |
| 935 | 935 | $temp_array['date_count'] = $row['date_count']; |
@@ -955,7 +955,7 @@ discard block |
||
| 955 | 955 | $datetime = new DateTime(); |
| 956 | 956 | $offset = $datetime->format('P'); |
| 957 | 957 | } else $offset = '+00:00'; |
| 958 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 958 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 959 | 959 | if ($globalDBdriver == 'mysql') { |
| 960 | 960 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 961 | 961 | FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)"; |
@@ -976,7 +976,7 @@ discard block |
||
| 976 | 976 | $date_array = array(); |
| 977 | 977 | $temp_array = array(); |
| 978 | 978 | |
| 979 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 979 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 980 | 980 | { |
| 981 | 981 | $temp_array['date_name'] = $row['date_name']; |
| 982 | 982 | $temp_array['date_count'] = $row['date_count']; |
@@ -1001,7 +1001,7 @@ discard block |
||
| 1001 | 1001 | $datetime = new DateTime(); |
| 1002 | 1002 | $offset = $datetime->format('P'); |
| 1003 | 1003 | } else $offset = '+00:00'; |
| 1004 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1004 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1005 | 1005 | if ($globalDBdriver == 'mysql') { |
| 1006 | 1006 | $query = "SELECT DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 1007 | 1007 | FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)"; |
@@ -1022,7 +1022,7 @@ discard block |
||
| 1022 | 1022 | $date_array = array(); |
| 1023 | 1023 | $temp_array = array(); |
| 1024 | 1024 | |
| 1025 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1025 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1026 | 1026 | { |
| 1027 | 1027 | $temp_array['date_name'] = $row['date_name']; |
| 1028 | 1028 | $temp_array['date_count'] = $row['date_count']; |
@@ -1069,7 +1069,7 @@ discard block |
||
| 1069 | 1069 | $date_array = array(); |
| 1070 | 1070 | $temp_array = array(); |
| 1071 | 1071 | |
| 1072 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1072 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1073 | 1073 | { |
| 1074 | 1074 | $temp_array['month_name'] = $row['month_name']; |
| 1075 | 1075 | $temp_array['year_name'] = $row['year_name']; |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | $datetime = new DateTime(); |
| 1099 | 1099 | $offset = $datetime->format('P'); |
| 1100 | 1100 | } else $offset = '+00:00'; |
| 1101 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1101 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1102 | 1102 | if ($globalDBdriver == 'mysql') { |
| 1103 | 1103 | $query = "SELECT MONTH(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
| 1104 | 1104 | FROM tracker_output".$filter_query." tracker_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)"; |
@@ -1119,7 +1119,7 @@ discard block |
||
| 1119 | 1119 | $date_array = array(); |
| 1120 | 1120 | $temp_array = array(); |
| 1121 | 1121 | |
| 1122 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1122 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1123 | 1123 | { |
| 1124 | 1124 | $temp_array['year_name'] = $row['year_name']; |
| 1125 | 1125 | $temp_array['month_name'] = $row['month_name']; |
@@ -1139,7 +1139,7 @@ discard block |
||
| 1139 | 1139 | * @return Array the hour list |
| 1140 | 1140 | * |
| 1141 | 1141 | */ |
| 1142 | - public function countAllHours($orderby,$filters = array()) |
|
| 1142 | + public function countAllHours($orderby, $filters = array()) |
|
| 1143 | 1143 | { |
| 1144 | 1144 | global $globalTimezone, $globalDBdriver; |
| 1145 | 1145 | if ($globalTimezone != '') { |
@@ -1187,7 +1187,7 @@ discard block |
||
| 1187 | 1187 | $hour_array = array(); |
| 1188 | 1188 | $temp_array = array(); |
| 1189 | 1189 | |
| 1190 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1190 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1191 | 1191 | { |
| 1192 | 1192 | $temp_array['hour_name'] = $row['hour_name']; |
| 1193 | 1193 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1209,8 +1209,8 @@ discard block |
||
| 1209 | 1209 | public function countAllHoursByDate($date, $filters = array()) |
| 1210 | 1210 | { |
| 1211 | 1211 | global $globalTimezone, $globalDBdriver; |
| 1212 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1213 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 1212 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1213 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 1214 | 1214 | if ($globalTimezone != '') { |
| 1215 | 1215 | date_default_timezone_set($globalTimezone); |
| 1216 | 1216 | $datetime = new DateTime($date); |
@@ -1218,12 +1218,12 @@ discard block |
||
| 1218 | 1218 | } else $offset = '+00:00'; |
| 1219 | 1219 | |
| 1220 | 1220 | if ($globalDBdriver == 'mysql') { |
| 1221 | - $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1221 | + $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1222 | 1222 | FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = :date |
| 1223 | 1223 | GROUP BY hour_name |
| 1224 | 1224 | ORDER BY hour_name ASC"; |
| 1225 | 1225 | } else { |
| 1226 | - $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1226 | + $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1227 | 1227 | FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date |
| 1228 | 1228 | GROUP BY hour_name |
| 1229 | 1229 | ORDER BY hour_name ASC"; |
@@ -1235,7 +1235,7 @@ discard block |
||
| 1235 | 1235 | $hour_array = array(); |
| 1236 | 1236 | $temp_array = array(); |
| 1237 | 1237 | |
| 1238 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1238 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1239 | 1239 | { |
| 1240 | 1240 | $temp_array['hour_name'] = $row['hour_name']; |
| 1241 | 1241 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1257,8 +1257,8 @@ discard block |
||
| 1257 | 1257 | public function countAllHoursByIdent($ident, $filters = array()) |
| 1258 | 1258 | { |
| 1259 | 1259 | global $globalTimezone, $globalDBdriver; |
| 1260 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1261 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1260 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1261 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1262 | 1262 | if ($globalTimezone != '') { |
| 1263 | 1263 | date_default_timezone_set($globalTimezone); |
| 1264 | 1264 | $datetime = new DateTime(); |
@@ -1266,12 +1266,12 @@ discard block |
||
| 1266 | 1266 | } else $offset = '+00:00'; |
| 1267 | 1267 | |
| 1268 | 1268 | if ($globalDBdriver == 'mysql') { |
| 1269 | - $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1269 | + $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1270 | 1270 | FROM tracker_output".$filter_query." tracker_output.ident = :ident |
| 1271 | 1271 | GROUP BY hour_name |
| 1272 | 1272 | ORDER BY hour_name ASC"; |
| 1273 | 1273 | } else { |
| 1274 | - $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1274 | + $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1275 | 1275 | FROM tracker_output".$filter_query." tracker_output.ident = :ident |
| 1276 | 1276 | GROUP BY hour_name |
| 1277 | 1277 | ORDER BY hour_name ASC"; |
@@ -1279,12 +1279,12 @@ discard block |
||
| 1279 | 1279 | |
| 1280 | 1280 | |
| 1281 | 1281 | $sth = $this->db->prepare($query); |
| 1282 | - $sth->execute(array(':ident' => $ident,':offset' => $offset)); |
|
| 1282 | + $sth->execute(array(':ident' => $ident, ':offset' => $offset)); |
|
| 1283 | 1283 | |
| 1284 | 1284 | $hour_array = array(); |
| 1285 | 1285 | $temp_array = array(); |
| 1286 | 1286 | |
| 1287 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1287 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1288 | 1288 | { |
| 1289 | 1289 | $temp_array['hour_name'] = $row['hour_name']; |
| 1290 | 1290 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1303,33 +1303,33 @@ discard block |
||
| 1303 | 1303 | * @return Integer the number of trackers |
| 1304 | 1304 | * |
| 1305 | 1305 | */ |
| 1306 | - public function countOverallTracker($filters = array(),$year = '',$month = '') |
|
| 1306 | + public function countOverallTracker($filters = array(), $year = '', $month = '') |
|
| 1307 | 1307 | { |
| 1308 | 1308 | global $globalDBdriver; |
| 1309 | 1309 | //$queryi = "SELECT COUNT(tracker_output.tracker_id) AS flight_count FROM tracker_output"; |
| 1310 | - $queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output"; |
|
| 1310 | + $queryi = "SELECT COUNT(DISTINCT tracker_output.ident) AS tracker_count FROM tracker_output"; |
|
| 1311 | 1311 | $query_values = array(); |
| 1312 | 1312 | $query = ''; |
| 1313 | 1313 | if ($year != '') { |
| 1314 | 1314 | if ($globalDBdriver == 'mysql') { |
| 1315 | 1315 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 1316 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1316 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1317 | 1317 | } else { |
| 1318 | 1318 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 1319 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1319 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1320 | 1320 | } |
| 1321 | 1321 | } |
| 1322 | 1322 | if ($month != '') { |
| 1323 | 1323 | if ($globalDBdriver == 'mysql') { |
| 1324 | 1324 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 1325 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1325 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1326 | 1326 | } else { |
| 1327 | 1327 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 1328 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1328 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1329 | 1329 | } |
| 1330 | 1330 | } |
| 1331 | 1331 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 1332 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1332 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 1333 | 1333 | |
| 1334 | 1334 | $sth = $this->db->prepare($queryi); |
| 1335 | 1335 | $sth->execute($query_values); |
@@ -1342,32 +1342,32 @@ discard block |
||
| 1342 | 1342 | * @return Integer the number of flights |
| 1343 | 1343 | * |
| 1344 | 1344 | */ |
| 1345 | - public function countOverallTrackerTypes($filters = array(),$year = '',$month = '') |
|
| 1345 | + public function countOverallTrackerTypes($filters = array(), $year = '', $month = '') |
|
| 1346 | 1346 | { |
| 1347 | 1347 | global $globalDBdriver; |
| 1348 | - $queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output"; |
|
| 1348 | + $queryi = "SELECT COUNT(DISTINCT tracker_output.type) AS tracker_count FROM tracker_output"; |
|
| 1349 | 1349 | $query_values = array(); |
| 1350 | 1350 | $query = ''; |
| 1351 | 1351 | if ($year != '') { |
| 1352 | 1352 | if ($globalDBdriver == 'mysql') { |
| 1353 | 1353 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 1354 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1354 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1355 | 1355 | } else { |
| 1356 | 1356 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 1357 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1357 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1358 | 1358 | } |
| 1359 | 1359 | } |
| 1360 | 1360 | if ($month != '') { |
| 1361 | 1361 | if ($globalDBdriver == 'mysql') { |
| 1362 | 1362 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 1363 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1363 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1364 | 1364 | } else { |
| 1365 | 1365 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 1366 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1366 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1367 | 1367 | } |
| 1368 | 1368 | } |
| 1369 | 1369 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 1370 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1370 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 1371 | 1371 | |
| 1372 | 1372 | $sth = $this->db->prepare($queryi); |
| 1373 | 1373 | $sth->execute($query_values); |
@@ -1384,7 +1384,7 @@ discard block |
||
| 1384 | 1384 | public function countAllHoursFromToday($filters = array()) |
| 1385 | 1385 | { |
| 1386 | 1386 | global $globalTimezone, $globalDBdriver; |
| 1387 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1387 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1388 | 1388 | if ($globalTimezone != '') { |
| 1389 | 1389 | date_default_timezone_set($globalTimezone); |
| 1390 | 1390 | $datetime = new DateTime(); |
@@ -1392,12 +1392,12 @@ discard block |
||
| 1392 | 1392 | } else $offset = '+00:00'; |
| 1393 | 1393 | |
| 1394 | 1394 | if ($globalDBdriver == 'mysql') { |
| 1395 | - $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1395 | + $query = "SELECT HOUR(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1396 | 1396 | FROM tracker_output".$filter_query." DATE(CONVERT_TZ(tracker_output.date,'+00:00', :offset)) = CURDATE() |
| 1397 | 1397 | GROUP BY hour_name |
| 1398 | 1398 | ORDER BY hour_name ASC"; |
| 1399 | 1399 | } else { |
| 1400 | - $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1400 | + $query = "SELECT EXTRACT(HOUR FROM tracker_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1401 | 1401 | FROM tracker_output".$filter_query." to_char(tracker_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date) |
| 1402 | 1402 | GROUP BY hour_name |
| 1403 | 1403 | ORDER BY hour_name ASC"; |
@@ -1409,7 +1409,7 @@ discard block |
||
| 1409 | 1409 | $hour_array = array(); |
| 1410 | 1410 | $temp_array = array(); |
| 1411 | 1411 | |
| 1412 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1412 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1413 | 1413 | { |
| 1414 | 1414 | $temp_array['hour_name'] = $row['hour_name']; |
| 1415 | 1415 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1428,9 +1428,9 @@ discard block |
||
| 1428 | 1428 | */ |
| 1429 | 1429 | public function getTrackerIDBasedOnFamTrackID($famtrackid) |
| 1430 | 1430 | { |
| 1431 | - $famtrackid = filter_var($famtrackid,FILTER_SANITIZE_STRING); |
|
| 1431 | + $famtrackid = filter_var($famtrackid, FILTER_SANITIZE_STRING); |
|
| 1432 | 1432 | |
| 1433 | - $query = "SELECT tracker_output.tracker_id |
|
| 1433 | + $query = "SELECT tracker_output.tracker_id |
|
| 1434 | 1434 | FROM tracker_output |
| 1435 | 1435 | WHERE tracker_output.famtrackid = '".$famtrackid."'"; |
| 1436 | 1436 | |
@@ -1438,7 +1438,7 @@ discard block |
||
| 1438 | 1438 | $sth = $this->db->prepare($query); |
| 1439 | 1439 | $sth->execute(); |
| 1440 | 1440 | |
| 1441 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1441 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1442 | 1442 | { |
| 1443 | 1443 | return $row['tracker_id']; |
| 1444 | 1444 | } |
@@ -1463,23 +1463,23 @@ discard block |
||
| 1463 | 1463 | } |
| 1464 | 1464 | |
| 1465 | 1465 | $current_date = date("Y-m-d H:i:s"); |
| 1466 | - $date = date("Y-m-d H:i:s",strtotime($dateString." UTC")); |
|
| 1466 | + $date = date("Y-m-d H:i:s", strtotime($dateString." UTC")); |
|
| 1467 | 1467 | |
| 1468 | 1468 | $diff = abs(strtotime($current_date) - strtotime($date)); |
| 1469 | 1469 | |
| 1470 | - $time_array['years'] = floor($diff / (365*60*60*24)); |
|
| 1470 | + $time_array['years'] = floor($diff/(365*60*60*24)); |
|
| 1471 | 1471 | $years = $time_array['years']; |
| 1472 | 1472 | |
| 1473 | - $time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24)); |
|
| 1473 | + $time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24)); |
|
| 1474 | 1474 | $months = $time_array['months']; |
| 1475 | 1475 | |
| 1476 | - $time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24)); |
|
| 1476 | + $time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24)); |
|
| 1477 | 1477 | $days = $time_array['days']; |
| 1478 | - $time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60)); |
|
| 1478 | + $time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60)); |
|
| 1479 | 1479 | $hours = $time_array['hours']; |
| 1480 | - $time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60); |
|
| 1480 | + $time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60); |
|
| 1481 | 1481 | $minutes = $time_array['minutes']; |
| 1482 | - $time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1482 | + $time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1483 | 1483 | |
| 1484 | 1484 | return $time_array; |
| 1485 | 1485 | } |
@@ -1502,63 +1502,63 @@ discard block |
||
| 1502 | 1502 | $temp_array['direction_degree'] = $direction; |
| 1503 | 1503 | $temp_array['direction_shortname'] = "N"; |
| 1504 | 1504 | $temp_array['direction_fullname'] = "North"; |
| 1505 | - } elseif ($direction >= 22.5 && $direction < 45){ |
|
| 1505 | + } elseif ($direction >= 22.5 && $direction < 45) { |
|
| 1506 | 1506 | $temp_array['direction_degree'] = $direction; |
| 1507 | 1507 | $temp_array['direction_shortname'] = "NNE"; |
| 1508 | 1508 | $temp_array['direction_fullname'] = "North-Northeast"; |
| 1509 | - } elseif ($direction >= 45 && $direction < 67.5){ |
|
| 1509 | + } elseif ($direction >= 45 && $direction < 67.5) { |
|
| 1510 | 1510 | $temp_array['direction_degree'] = $direction; |
| 1511 | 1511 | $temp_array['direction_shortname'] = "NE"; |
| 1512 | 1512 | $temp_array['direction_fullname'] = "Northeast"; |
| 1513 | - } elseif ($direction >= 67.5 && $direction < 90){ |
|
| 1513 | + } elseif ($direction >= 67.5 && $direction < 90) { |
|
| 1514 | 1514 | $temp_array['direction_degree'] = $direction; |
| 1515 | 1515 | $temp_array['direction_shortname'] = "ENE"; |
| 1516 | 1516 | $temp_array['direction_fullname'] = "East-Northeast"; |
| 1517 | - } elseif ($direction >= 90 && $direction < 112.5){ |
|
| 1517 | + } elseif ($direction >= 90 && $direction < 112.5) { |
|
| 1518 | 1518 | $temp_array['direction_degree'] = $direction; |
| 1519 | 1519 | $temp_array['direction_shortname'] = "E"; |
| 1520 | 1520 | $temp_array['direction_fullname'] = "East"; |
| 1521 | - } elseif ($direction >= 112.5 && $direction < 135){ |
|
| 1521 | + } elseif ($direction >= 112.5 && $direction < 135) { |
|
| 1522 | 1522 | $temp_array['direction_degree'] = $direction; |
| 1523 | 1523 | $temp_array['direction_shortname'] = "ESE"; |
| 1524 | 1524 | $temp_array['direction_fullname'] = "East-Southeast"; |
| 1525 | - } elseif ($direction >= 135 && $direction < 157.5){ |
|
| 1525 | + } elseif ($direction >= 135 && $direction < 157.5) { |
|
| 1526 | 1526 | $temp_array['direction_degree'] = $direction; |
| 1527 | 1527 | $temp_array['direction_shortname'] = "SE"; |
| 1528 | 1528 | $temp_array['direction_fullname'] = "Southeast"; |
| 1529 | - } elseif ($direction >= 157.5 && $direction < 180){ |
|
| 1529 | + } elseif ($direction >= 157.5 && $direction < 180) { |
|
| 1530 | 1530 | $temp_array['direction_degree'] = $direction; |
| 1531 | 1531 | $temp_array['direction_shortname'] = "SSE"; |
| 1532 | 1532 | $temp_array['direction_fullname'] = "South-Southeast"; |
| 1533 | - } elseif ($direction >= 180 && $direction < 202.5){ |
|
| 1533 | + } elseif ($direction >= 180 && $direction < 202.5) { |
|
| 1534 | 1534 | $temp_array['direction_degree'] = $direction; |
| 1535 | 1535 | $temp_array['direction_shortname'] = "S"; |
| 1536 | 1536 | $temp_array['direction_fullname'] = "South"; |
| 1537 | - } elseif ($direction >= 202.5 && $direction < 225){ |
|
| 1537 | + } elseif ($direction >= 202.5 && $direction < 225) { |
|
| 1538 | 1538 | $temp_array['direction_degree'] = $direction; |
| 1539 | 1539 | $temp_array['direction_shortname'] = "SSW"; |
| 1540 | 1540 | $temp_array['direction_fullname'] = "South-Southwest"; |
| 1541 | - } elseif ($direction >= 225 && $direction < 247.5){ |
|
| 1541 | + } elseif ($direction >= 225 && $direction < 247.5) { |
|
| 1542 | 1542 | $temp_array['direction_degree'] = $direction; |
| 1543 | 1543 | $temp_array['direction_shortname'] = "SW"; |
| 1544 | 1544 | $temp_array['direction_fullname'] = "Southwest"; |
| 1545 | - } elseif ($direction >= 247.5 && $direction < 270){ |
|
| 1545 | + } elseif ($direction >= 247.5 && $direction < 270) { |
|
| 1546 | 1546 | $temp_array['direction_degree'] = $direction; |
| 1547 | 1547 | $temp_array['direction_shortname'] = "WSW"; |
| 1548 | 1548 | $temp_array['direction_fullname'] = "West-Southwest"; |
| 1549 | - } elseif ($direction >= 270 && $direction < 292.5){ |
|
| 1549 | + } elseif ($direction >= 270 && $direction < 292.5) { |
|
| 1550 | 1550 | $temp_array['direction_degree'] = $direction; |
| 1551 | 1551 | $temp_array['direction_shortname'] = "W"; |
| 1552 | 1552 | $temp_array['direction_fullname'] = "West"; |
| 1553 | - } elseif ($direction >= 292.5 && $direction < 315){ |
|
| 1553 | + } elseif ($direction >= 292.5 && $direction < 315) { |
|
| 1554 | 1554 | $temp_array['direction_degree'] = $direction; |
| 1555 | 1555 | $temp_array['direction_shortname'] = "WNW"; |
| 1556 | 1556 | $temp_array['direction_fullname'] = "West-Northwest"; |
| 1557 | - } elseif ($direction >= 315 && $direction < 337.5){ |
|
| 1557 | + } elseif ($direction >= 315 && $direction < 337.5) { |
|
| 1558 | 1558 | $temp_array['direction_degree'] = $direction; |
| 1559 | 1559 | $temp_array['direction_shortname'] = "NW"; |
| 1560 | 1560 | $temp_array['direction_fullname'] = "Northwest"; |
| 1561 | - } elseif ($direction >= 337.5 && $direction < 360){ |
|
| 1561 | + } elseif ($direction >= 337.5 && $direction < 360) { |
|
| 1562 | 1562 | $temp_array['direction_degree'] = $direction; |
| 1563 | 1563 | $temp_array['direction_shortname'] = "NNW"; |
| 1564 | 1564 | $temp_array['direction_fullname'] = "North-Northwest"; |
@@ -1575,11 +1575,11 @@ discard block |
||
| 1575 | 1575 | * @param Float $longitude longitute of the flight |
| 1576 | 1576 | * @return String the countrie |
| 1577 | 1577 | */ |
| 1578 | - public function getCountryFromLatitudeLongitude($latitude,$longitude) |
|
| 1578 | + public function getCountryFromLatitudeLongitude($latitude, $longitude) |
|
| 1579 | 1579 | { |
| 1580 | 1580 | global $globalDBdriver, $globalDebug; |
| 1581 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1582 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1581 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1582 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1583 | 1583 | |
| 1584 | 1584 | $Connection = new Connection($this->db); |
| 1585 | 1585 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1619,7 +1619,7 @@ discard block |
||
| 1619 | 1619 | public function getCountryFromISO2($iso2) |
| 1620 | 1620 | { |
| 1621 | 1621 | global $globalDBdriver, $globalDebug; |
| 1622 | - $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
|
| 1622 | + $iso2 = filter_var($iso2, FILTER_SANITIZE_STRING); |
|
| 1623 | 1623 | |
| 1624 | 1624 | $Connection = new Connection($this->db); |
| 1625 | 1625 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1648,11 +1648,11 @@ discard block |
||
| 1648 | 1648 | * @return Array the vessel type list |
| 1649 | 1649 | * |
| 1650 | 1650 | */ |
| 1651 | - public function countAllTrackerTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
|
| 1651 | + public function countAllTrackerTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 1652 | 1652 | { |
| 1653 | 1653 | global $globalDBdriver; |
| 1654 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1655 | - $query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count |
|
| 1654 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1655 | + $query = "SELECT tracker_output.type AS tracker_type, COUNT(tracker_output.type) AS tracker_type_count |
|
| 1656 | 1656 | FROM tracker_output ".$filter_query." tracker_output.type <> ''"; |
| 1657 | 1657 | if ($olderthanmonths > 0) { |
| 1658 | 1658 | if ($globalDBdriver == 'mysql') { |
@@ -1672,28 +1672,28 @@ discard block |
||
| 1672 | 1672 | if ($year != '') { |
| 1673 | 1673 | if ($globalDBdriver == 'mysql') { |
| 1674 | 1674 | $query .= " AND YEAR(tracker_output.date) = :year"; |
| 1675 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1675 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1676 | 1676 | } else { |
| 1677 | 1677 | $query .= " AND EXTRACT(YEAR FROM tracker_output.date) = :year"; |
| 1678 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1678 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1679 | 1679 | } |
| 1680 | 1680 | } |
| 1681 | 1681 | if ($month != '') { |
| 1682 | 1682 | if ($globalDBdriver == 'mysql') { |
| 1683 | 1683 | $query .= " AND MONTH(tracker_output.date) = :month"; |
| 1684 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1684 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1685 | 1685 | } else { |
| 1686 | 1686 | $query .= " AND EXTRACT(MONTH FROM tracker_output.date) = :month"; |
| 1687 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1687 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1688 | 1688 | } |
| 1689 | 1689 | } |
| 1690 | 1690 | if ($day != '') { |
| 1691 | 1691 | if ($globalDBdriver == 'mysql') { |
| 1692 | 1692 | $query .= " AND DAY(tracker_output.date) = :day"; |
| 1693 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1693 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1694 | 1694 | } else { |
| 1695 | 1695 | $query .= " AND EXTRACT(DAY FROM tracker_output.date) = :day"; |
| 1696 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1696 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1697 | 1697 | } |
| 1698 | 1698 | } |
| 1699 | 1699 | $query .= " GROUP BY tracker_output.type ORDER BY tracker_type_count DESC"; |
@@ -1702,7 +1702,7 @@ discard block |
||
| 1702 | 1702 | $sth->execute($query_values); |
| 1703 | 1703 | $tracker_array = array(); |
| 1704 | 1704 | $temp_array = array(); |
| 1705 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1705 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1706 | 1706 | { |
| 1707 | 1707 | $temp_array['tracker_type'] = $row['tracker_type']; |
| 1708 | 1708 | $temp_array['tracker_type_count'] = $row['tracker_type_count']; |
@@ -1737,7 +1737,7 @@ discard block |
||
| 1737 | 1737 | |
| 1738 | 1738 | $bitly_data = json_decode($bitly_data); |
| 1739 | 1739 | $bitly_url = ''; |
| 1740 | - if ($bitly_data->status_txt = "OK"){ |
|
| 1740 | + if ($bitly_data->status_txt = "OK") { |
|
| 1741 | 1741 | $bitly_url = $bitly_data->data->url; |
| 1742 | 1742 | } |
| 1743 | 1743 | |
@@ -1747,7 +1747,7 @@ discard block |
||
| 1747 | 1747 | |
| 1748 | 1748 | public function getOrderBy() |
| 1749 | 1749 | { |
| 1750 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC")); |
|
| 1750 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY tracker_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY tracker_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY tracker_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY tracker_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY tracker_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY tracker_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY tracker_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY tracker_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY tracker_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY tracker_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY tracker_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY tracker_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY tracker_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC")); |
|
| 1751 | 1751 | |
| 1752 | 1752 | return $orderby; |
| 1753 | 1753 | |
@@ -33,12 +33,12 @@ discard block |
||
| 33 | 33 | $currentdate = date('Y-m-d'); |
| 34 | 34 | $sourcestat = $Stats->getStatsSource($currentdate); |
| 35 | 35 | if (!empty($sourcestat)) { |
| 36 | - foreach($sourcestat as $srcst) { |
|
| 36 | + foreach ($sourcestat as $srcst) { |
|
| 37 | 37 | $type = $srcst['stats_type']; |
| 38 | 38 | if ($type == 'polar' || $type == 'hist') { |
| 39 | 39 | $source = $srcst['source_name']; |
| 40 | 40 | $data = $srcst['source_data']; |
| 41 | - $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 41 | + $this->stats[$currentdate][$source][$type] = json_decode($data, true); |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - public function get_Schedule($id,$ident) { |
|
| 53 | + public function get_Schedule($id, $ident) { |
|
| 54 | 54 | global $globalDebug, $globalFork, $globalSchedulesFetch; |
| 55 | 55 | // Get schedule here, so it's done only one time |
| 56 | 56 | |
@@ -75,8 +75,8 @@ discard block |
||
| 75 | 75 | $schedule = $Schedule->fetchSchedule($operator); |
| 76 | 76 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 77 | 77 | if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
| 78 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 78 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 80 | 80 | // Should also check if route schedule = route from DB |
| 81 | 81 | if ($schedule['DepartureAirportIATA'] != '') { |
| 82 | 82 | if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) { |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | - $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
|
| 99 | + $Schedule->addSchedule($operator, $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time'], $schedule['Source']); |
|
| 100 | 100 | } |
| 101 | 101 | } else $scheduleexist = true; |
| 102 | 102 | } else $scheduleexist = true; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | if ($scheduleexist) { |
| 105 | 105 | if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
| 106 | 106 | $sch = $Schedule->getSchedule($operator); |
| 107 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time'])); |
|
| 107 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport' => $sch['arrival_airport_icao'], 'departure_airport' => $sch['departure_airport_icao'], 'departure_airport_time' => $sch['departure_airport_time'], 'arrival_airport_time' => $sch['arrival_airport_time'])); |
|
| 108 | 108 | } |
| 109 | 109 | $Spotter->db = null; |
| 110 | 110 | $Schedule->db = null; |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
| 132 | 132 | $Spotter = new Spotter($this->db); |
| 133 | 133 | $real_arrival = $this->arrival($key); |
| 134 | - if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 134 | + if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']); |
|
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | } |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | $airport_time = ''; |
| 146 | 146 | if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
| 147 | 147 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 148 | - $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 148 | + $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist); |
|
| 149 | 149 | if (isset($closestAirports[0])) { |
| 150 | 150 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
| 151 | 151 | $airport_icao = $closestAirports[0]['icao']; |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | break; |
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | - } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 163 | + } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) { |
|
| 164 | 164 | $airport_icao = $closestAirports[0]['icao']; |
| 165 | 165 | $airport_time = $this->all_flights[$key]['datetime']; |
| 166 | 166 | } else { |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | } else { |
| 174 | 174 | if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
| 175 | 175 | } |
| 176 | - return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 176 | + return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 185 | 185 | foreach ($this->all_flights as $key => $flight) { |
| 186 | 186 | if (isset($flight['lastupdate'])) { |
| 187 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 187 | + if ($flight['lastupdate'] < (time() - 3000)) { |
|
| 188 | 188 | if (isset($this->all_flights[$key]['id'])) { |
| 189 | 189 | if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
| 190 | 190 | /* |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | $real_arrival = $this->arrival($key); |
| 197 | 197 | $Spotter = new Spotter($this->db); |
| 198 | 198 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 199 | - $result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 199 | + $result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']); |
|
| 200 | 200 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 201 | 201 | } |
| 202 | 202 | // Put in archive |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | $send = false; |
| 234 | 234 | |
| 235 | 235 | // SBS format is CSV format |
| 236 | - if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
| 236 | + if (is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
| 237 | 237 | //print_r($line); |
| 238 | 238 | if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
| 239 | 239 | |
@@ -266,25 +266,25 @@ discard block |
||
| 266 | 266 | |
| 267 | 267 | if (!isset($this->all_flights[$id])) { |
| 268 | 268 | $this->all_flights[$id] = array(); |
| 269 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 270 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 271 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 269 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 270 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'heading' => '', 'departure_airport_time' => '', 'arrival_airport_time' => '', 'squawk' => '', 'route_stop' => '', 'registration' => '', 'pilot_id' => '', 'pilot_name' => '', 'waypoints' => '', 'ground' => '0', 'format_source' => '', 'source_name' => '', 'over_country' => '', 'verticalrate' => '', 'noarchive' => false, 'putinarchive' => true, 'source_type' => '')); |
|
| 271 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time())); |
|
| 272 | 272 | if (!isset($line['id'])) { |
| 273 | 273 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 274 | 274 | // if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
| 275 | 275 | // if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 276 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 276 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 277 | 277 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 278 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 278 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 279 | 279 | if ($globalAllFlights !== FALSE) $dataFound = true; |
| 280 | 280 | } |
| 281 | 281 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 282 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 282 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type'])); |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | //print_r($this->all_flights); |
| 286 | 286 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 287 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 287 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex']))); |
|
| 288 | 288 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 289 | 289 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 290 | 290 | //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
@@ -293,13 +293,13 @@ discard block |
||
| 293 | 293 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 294 | 294 | $Spotter = new Spotter($this->db); |
| 295 | 295 | if (isset($this->all_flights[$id]['source_type'])) { |
| 296 | - $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
|
| 296 | + $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']); |
|
| 297 | 297 | } else { |
| 298 | 298 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 299 | 299 | } |
| 300 | 300 | $Spotter->db = null; |
| 301 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 302 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 301 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 302 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 303 | 303 | } |
| 304 | 304 | } |
| 305 | 305 | if ($globalAllFlights !== FALSE) $dataFound = true; |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | $Spotter = new Spotter($this->db); |
| 311 | 311 | if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
| 312 | 312 | $Spotter->db = null; |
| 313 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
|
| 313 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao)); |
|
| 314 | 314 | } |
| 315 | 315 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) { |
| 316 | 316 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | $Spotter = new Spotter($this->db); |
| 319 | 319 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 320 | 320 | $Spotter->db = null; |
| 321 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 321 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
@@ -326,15 +326,15 @@ discard block |
||
| 326 | 326 | elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
| 327 | 327 | elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
| 328 | 328 | elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
| 329 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 329 | + if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 330 | 330 | } |
| 331 | 331 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
| 332 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
|
| 332 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA')); |
|
| 333 | 333 | } |
| 334 | 334 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 335 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 335 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 336 | 336 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 337 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
|
| 337 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime'])); |
|
| 338 | 338 | } else { |
| 339 | 339 | if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 340 | 340 | elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
@@ -345,35 +345,35 @@ discard block |
||
| 345 | 345 | */ |
| 346 | 346 | return ''; |
| 347 | 347 | } |
| 348 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 348 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 349 | 349 | if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 350 | 350 | return ''; |
| 351 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 351 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 352 | 352 | if ($globalDebug) echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 353 | 353 | return ''; |
| 354 | 354 | } elseif (!isset($line['datetime'])) { |
| 355 | 355 | date_default_timezone_set('UTC'); |
| 356 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 356 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 357 | 357 | } else { |
| 358 | 358 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 359 | 359 | return ''; |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 363 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 363 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration'])); |
|
| 364 | 364 | } |
| 365 | 365 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 366 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 366 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints'])); |
|
| 367 | 367 | } |
| 368 | 368 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 369 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 369 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => trim($line['pilot_id']))); |
|
| 370 | 370 | } |
| 371 | 371 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 372 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 372 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => trim($line['pilot_name']))); |
|
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) { |
| 376 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 376 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
| 377 | 377 | if ($this->all_flights[$id]['addedSpotter'] == 1) { |
| 378 | 378 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 379 | 379 | $timeelapsed = microtime(true); |
@@ -384,10 +384,10 @@ discard block |
||
| 384 | 384 | elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
| 385 | 385 | elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
| 386 | 386 | elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
| 387 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 387 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource); |
|
| 388 | 388 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 389 | 389 | $Spotter->db = null; |
| 390 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 390 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 391 | 391 | } |
| 392 | 392 | } |
| 393 | 393 | |
@@ -399,25 +399,25 @@ discard block |
||
| 399 | 399 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 400 | 400 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 401 | 401 | */ |
| 402 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 402 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 403 | 403 | |
| 404 | 404 | //$putinarchive = true; |
| 405 | 405 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
| 406 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 406 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 407 | 407 | } |
| 408 | 408 | if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
| 409 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 409 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 410 | 410 | } |
| 411 | 411 | if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
| 412 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 412 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => '')); |
|
| 413 | 413 | } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
| 414 | 414 | $timeelapsed = microtime(true); |
| 415 | 415 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 416 | 416 | $Spotter = new Spotter($this->db); |
| 417 | 417 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 418 | 418 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 419 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 420 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 419 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => '')); |
|
| 420 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 421 | 421 | } |
| 422 | 422 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 423 | 423 | $timeelapsed = microtime(true); |
@@ -431,34 +431,34 @@ discard block |
||
| 431 | 431 | $Translation->db = null; |
| 432 | 432 | } |
| 433 | 433 | $Spotter->db = null; |
| 434 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 434 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 435 | 435 | } |
| 436 | 436 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 437 | 437 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
| 438 | 438 | if ($route['fromairport_icao'] != $route['toairport_icao']) { |
| 439 | 439 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop'])); |
| 440 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
|
| 440 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $route['fromairport_icao'], 'arrival_airport' => $route['toairport_icao'], 'route_stop' => $route['routestop'])); |
|
| 441 | 441 | } |
| 442 | 442 | } |
| 443 | 443 | if (!isset($globalFork)) $globalFork = TRUE; |
| 444 | 444 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 445 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 445 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident'])); |
|
| 446 | 446 | } |
| 447 | 447 | } |
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | if (isset($line['speed']) && $line['speed'] != '') { |
| 451 | 451 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 452 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 453 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 452 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed']))); |
|
| 453 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true)); |
|
| 454 | 454 | //$dataFound = true; |
| 455 | 455 | } else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 456 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 456 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'); |
|
| 457 | 457 | if ($distance > 1000 && $distance < 10000) { |
| 458 | 458 | // use datetime |
| 459 | 459 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 460 | 460 | $speed = $speed*3.6; |
| 461 | - if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 461 | + if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed))); |
|
| 462 | 462 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 463 | 463 | } |
| 464 | 464 | } |
@@ -466,11 +466,11 @@ discard block |
||
| 466 | 466 | |
| 467 | 467 | |
| 468 | 468 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) { |
| 469 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 469 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']); |
|
| 470 | 470 | else unset($timediff); |
| 471 | - if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
|
| 471 | + if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')))) { |
|
| 472 | 472 | if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) { |
| 473 | - if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 473 | + if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) { |
|
| 474 | 474 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 475 | 475 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 476 | 476 | $this->all_flights[$id]['putinarchive'] = true; |
@@ -480,10 +480,10 @@ discard block |
||
| 480 | 480 | $timeelapsed = microtime(true); |
| 481 | 481 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 482 | 482 | $Spotter = new Spotter($this->db); |
| 483 | - $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 483 | + $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 484 | 484 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
| 485 | 485 | $Spotter->db = null; |
| 486 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 486 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 487 | 487 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 488 | 488 | } |
| 489 | 489 | } |
@@ -493,13 +493,13 @@ discard block |
||
| 493 | 493 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 494 | 494 | //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
| 495 | 495 | if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 496 | - if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
|
| 496 | + if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
|
| 497 | 497 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 498 | 498 | $dataFound = true; |
| 499 | 499 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 500 | 500 | } |
| 501 | 501 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 502 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
|
| 502 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude'])); |
|
| 503 | 503 | /* |
| 504 | 504 | if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) { |
| 505 | 505 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
@@ -517,13 +517,13 @@ discard block |
||
| 517 | 517 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 518 | 518 | //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == '' || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
| 519 | 519 | if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 520 | - if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
|
| 520 | + if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
|
| 521 | 521 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 522 | 522 | $dataFound = true; |
| 523 | 523 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 524 | 524 | } |
| 525 | 525 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 526 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
|
| 526 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude'])); |
|
| 527 | 527 | /* |
| 528 | 528 | if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) { |
| 529 | 529 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
@@ -541,46 +541,46 @@ discard block |
||
| 541 | 541 | } else if ($globalDebug && $timediff > 30) { |
| 542 | 542 | $this->tmd = $this->tmd + 1; |
| 543 | 543 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 544 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
|
| 545 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 544 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -"; |
|
| 545 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 546 | 546 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 547 | 547 | } |
| 548 | 548 | } |
| 549 | 549 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 550 | 550 | if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 551 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 551 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update'])); |
|
| 552 | 552 | } |
| 553 | 553 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 554 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 554 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate'])); |
|
| 555 | 555 | //$dataFound = true; |
| 556 | 556 | } |
| 557 | 557 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 558 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 558 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source'])); |
|
| 559 | 559 | } |
| 560 | 560 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 561 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 561 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name'])); |
|
| 562 | 562 | } |
| 563 | 563 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 564 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 564 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency'])); |
|
| 565 | 565 | //$dataFound = true; |
| 566 | 566 | } |
| 567 | 567 | if (isset($line['ground']) && $line['ground'] != '') { |
| 568 | 568 | if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
| 569 | 569 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 570 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 571 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 572 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi'))); |
|
| 573 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 574 | - elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 570 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 571 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 572 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi'))); |
|
| 573 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 574 | + elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 575 | 575 | } |
| 576 | 576 | if ($line['ground'] != 1) $line['ground'] = 0; |
| 577 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 577 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground'])); |
|
| 578 | 578 | //$dataFound = true; |
| 579 | 579 | } |
| 580 | 580 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 581 | 581 | if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
| 582 | 582 | if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
| 583 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 583 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 584 | 584 | $highlight = ''; |
| 585 | 585 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
| 586 | 586 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
@@ -589,47 +589,47 @@ discard block |
||
| 589 | 589 | $timeelapsed = microtime(true); |
| 590 | 590 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 591 | 591 | $Spotter = new Spotter($this->db); |
| 592 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 592 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight); |
|
| 593 | 593 | $Spotter->db = null; |
| 594 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 594 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 595 | 595 | } |
| 596 | 596 | //$putinarchive = true; |
| 597 | 597 | //$highlight = ''; |
| 598 | 598 | } |
| 599 | 599 | |
| 600 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 600 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 601 | 601 | //$dataFound = true; |
| 602 | 602 | } |
| 603 | 603 | |
| 604 | 604 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 605 | 605 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 606 | - if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
| 607 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
|
| 608 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
|
| 606 | + if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
| 607 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100))); |
|
| 608 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude'])); |
|
| 609 | 609 | //$dataFound = true; |
| 610 | 610 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 614 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 614 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true)); |
|
| 615 | 615 | } |
| 616 | 616 | |
| 617 | 617 | if (isset($line['heading']) && $line['heading'] != '') { |
| 618 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 619 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 620 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 618 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 619 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading']))); |
|
| 620 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true)); |
|
| 621 | 621 | //$dataFound = true; |
| 622 | 622 | } elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) { |
| 623 | - $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 624 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 625 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 623 | + $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 624 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading))); |
|
| 625 | + if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 626 | 626 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
| 627 | 627 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 628 | 628 | // If not enough messages and ACARS set heading to 0 |
| 629 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 629 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0)); |
|
| 630 | 630 | } |
| 631 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 632 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 631 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 632 | + elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 633 | 633 | |
| 634 | 634 | // print_r($this->all_flights[$id]); |
| 635 | 635 | //gets the callsign from the last hour |
@@ -639,7 +639,7 @@ discard block |
||
| 639 | 639 | if ($dataFound === true && isset($this->all_flights[$id]['hex'])) { |
| 640 | 640 | $this->all_flights[$id]['lastupdate'] = time(); |
| 641 | 641 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
| 642 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 642 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 643 | 643 | //print_r($this->all_flights); |
| 644 | 644 | //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
| 645 | 645 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
@@ -650,61 +650,61 @@ discard block |
||
| 650 | 650 | $SpotterLive = new SpotterLive($this->db); |
| 651 | 651 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
| 652 | 652 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 653 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 653 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 654 | 654 | } elseif (isset($line['id'])) { |
| 655 | 655 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 656 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 656 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 657 | 657 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 658 | 658 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 659 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 659 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 660 | 660 | } else $recent_ident = ''; |
| 661 | - $SpotterLive->db=null; |
|
| 661 | + $SpotterLive->db = null; |
|
| 662 | 662 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 663 | 663 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 664 | 664 | } else $recent_ident = ''; |
| 665 | 665 | } else { |
| 666 | 666 | $recent_ident = ''; |
| 667 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
|
| 667 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0)); |
|
| 668 | 668 | } |
| 669 | 669 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 670 | - if($recent_ident == "") |
|
| 670 | + if ($recent_ident == "") |
|
| 671 | 671 | { |
| 672 | 672 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 673 | 673 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 674 | 674 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 675 | 675 | //adds the spotter data for the archive |
| 676 | 676 | $ignoreImport = false; |
| 677 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 677 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 678 | 678 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 679 | 679 | $ignoreImport = true; |
| 680 | 680 | } |
| 681 | 681 | } |
| 682 | 682 | if (count($globalAirportAccept) > 0) { |
| 683 | 683 | $ignoreImport = true; |
| 684 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 684 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 685 | 685 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 686 | 686 | $ignoreImport = false; |
| 687 | 687 | } |
| 688 | 688 | } |
| 689 | 689 | } |
| 690 | 690 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 691 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 692 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 691 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 692 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) { |
|
| 693 | 693 | $ignoreImport = true; |
| 694 | 694 | } |
| 695 | 695 | } |
| 696 | 696 | } |
| 697 | 697 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 698 | 698 | $ignoreImport = true; |
| 699 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 700 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 699 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 700 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) { |
|
| 701 | 701 | $ignoreImport = false; |
| 702 | 702 | } |
| 703 | 703 | } |
| 704 | 704 | } |
| 705 | 705 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 706 | 706 | $ignoreImport = true; |
| 707 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 707 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 708 | 708 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 709 | 709 | $ignoreImport = false; |
| 710 | 710 | } |
@@ -716,32 +716,32 @@ discard block |
||
| 716 | 716 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
| 717 | 717 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
| 718 | 718 | if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
| 719 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 719 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 720 | 720 | $timeelapsed = microtime(true); |
| 721 | 721 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 722 | 722 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 723 | 723 | $Spotter = new Spotter($this->db); |
| 724 | - $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
| 724 | + $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $highlight, $this->all_flights[$id]['hex'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['source_type']); |
|
| 725 | 725 | $Spotter->db = null; |
| 726 | 726 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 727 | 727 | } |
| 728 | 728 | } |
| 729 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 729 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 730 | 730 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 731 | 731 | |
| 732 | 732 | // Add source stat in DB |
| 733 | 733 | $Stats = new Stats($this->db); |
| 734 | 734 | if (!empty($this->stats)) { |
| 735 | 735 | if ($globalDebug) echo 'Add source stats : '; |
| 736 | - foreach($this->stats as $date => $data) { |
|
| 737 | - foreach($data as $source => $sourced) { |
|
| 736 | + foreach ($this->stats as $date => $data) { |
|
| 737 | + foreach ($data as $source => $sourced) { |
|
| 738 | 738 | //print_r($sourced); |
| 739 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 740 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 739 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date); |
|
| 740 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date); |
|
| 741 | 741 | if (isset($sourced['msg'])) { |
| 742 | 742 | if (time() - $sourced['msg']['date'] > 10) { |
| 743 | 743 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 744 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 744 | + echo $Stats->addStatSource($nbmsg, $source, 'msg', $date); |
|
| 745 | 745 | unset($this->stats[$date][$source]['msg']); |
| 746 | 746 | } |
| 747 | 747 | } |
@@ -779,14 +779,14 @@ discard block |
||
| 779 | 779 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 780 | 780 | $SpotterLive = new SpotterLive($this->db); |
| 781 | 781 | $SpotterLive->deleteLiveSpotterData(); |
| 782 | - $SpotterLive->db=null; |
|
| 782 | + $SpotterLive->db = null; |
|
| 783 | 783 | } |
| 784 | 784 | } |
| 785 | 785 | if ($globalDebug) echo " Done\n"; |
| 786 | 786 | $this->last_delete = time(); |
| 787 | 787 | } |
| 788 | 788 | } else { |
| 789 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs')) { |
|
| 789 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs')) { |
|
| 790 | 790 | $this->all_flights[$id]['id'] = $recent_ident; |
| 791 | 791 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 792 | 792 | } |
@@ -794,7 +794,7 @@ discard block |
||
| 794 | 794 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 795 | 795 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 796 | 796 | $Spotter = new Spotter($this->db); |
| 797 | - $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 797 | + $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time']); |
|
| 798 | 798 | $Spotter->db = null; |
| 799 | 799 | } |
| 800 | 800 | } |
@@ -820,37 +820,37 @@ discard block |
||
| 820 | 820 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 821 | 821 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 822 | 822 | |
| 823 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 823 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 824 | 824 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 825 | 825 | $ignoreImport = true; |
| 826 | 826 | } |
| 827 | 827 | } |
| 828 | 828 | if (count($globalAirportAccept) > 0) { |
| 829 | 829 | $ignoreImport = true; |
| 830 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 830 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 831 | 831 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 832 | 832 | $ignoreImport = false; |
| 833 | 833 | } |
| 834 | 834 | } |
| 835 | 835 | } |
| 836 | 836 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 837 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 838 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 837 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 838 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) { |
|
| 839 | 839 | $ignoreImport = true; |
| 840 | 840 | } |
| 841 | 841 | } |
| 842 | 842 | } |
| 843 | 843 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 844 | 844 | $ignoreImport = true; |
| 845 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 846 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 845 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 846 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) { |
|
| 847 | 847 | $ignoreImport = false; |
| 848 | 848 | } |
| 849 | 849 | } |
| 850 | 850 | } |
| 851 | 851 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 852 | 852 | $ignoreImport = true; |
| 853 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 853 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 854 | 854 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 855 | 855 | $ignoreImport = false; |
| 856 | 856 | } |
@@ -858,23 +858,23 @@ discard block |
||
| 858 | 858 | } |
| 859 | 859 | |
| 860 | 860 | if (!$ignoreImport) { |
| 861 | - if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 862 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 861 | + if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 862 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 863 | 863 | $timeelapsed = microtime(true); |
| 864 | 864 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 865 | 865 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 866 | 866 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 867 | 867 | $SpotterLive = new SpotterLive($this->db); |
| 868 | - $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
|
| 868 | + $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']); |
|
| 869 | 869 | $SpotterLive->db = null; |
| 870 | 870 | if ($globalDebug) echo $result."\n"; |
| 871 | 871 | } |
| 872 | 872 | } |
| 873 | 873 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 874 | - $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
|
| 874 | + $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']); |
|
| 875 | 875 | } |
| 876 | 876 | $this->all_flights[$id]['putinarchive'] = false; |
| 877 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 877 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 878 | 878 | |
| 879 | 879 | // Put statistics in $this->stats variable |
| 880 | 880 | //if ($line['format_source'] != 'aprs') { |
@@ -893,19 +893,19 @@ discard block |
||
| 893 | 893 | $latitude = $globalCenterLatitude; |
| 894 | 894 | $longitude = $globalCenterLongitude; |
| 895 | 895 | } |
| 896 | - $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 896 | + $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 897 | 897 | } else { |
| 898 | 898 | $latitude = $this->source_location[$source]['latitude']; |
| 899 | 899 | $longitude = $this->source_location[$source]['longitude']; |
| 900 | 900 | } |
| 901 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 901 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 902 | 902 | //$stats_heading = $stats_heading%22.5; |
| 903 | 903 | $stats_heading = round($stats_heading/22.5); |
| 904 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 904 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 905 | 905 | $current_date = date('Y-m-d'); |
| 906 | 906 | if ($stats_heading == 16) $stats_heading = 0; |
| 907 | 907 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 908 | - for ($i=0;$i<=15;$i++) { |
|
| 908 | + for ($i = 0; $i <= 15; $i++) { |
|
| 909 | 909 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 910 | 910 | } |
| 911 | 911 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -920,9 +920,9 @@ discard block |
||
| 920 | 920 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 921 | 921 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 922 | 922 | end($this->stats[$current_date][$source]['hist']); |
| 923 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 923 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 924 | 924 | } else $mini = 0; |
| 925 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 925 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 926 | 926 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 927 | 927 | } |
| 928 | 928 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -935,7 +935,7 @@ discard block |
||
| 935 | 935 | $this->all_flights[$id]['lastupdate'] = time(); |
| 936 | 936 | if ($this->all_flights[$id]['putinarchive']) $send = true; |
| 937 | 937 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 938 | - } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 938 | + } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n"; |
|
| 939 | 939 | //$this->del(); |
| 940 | 940 | |
| 941 | 941 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | require_once(dirname(__FILE__).'/class.Image.php'); |
| 3 | 3 | $global_query = "SELECT marine_output.* FROM marine_output"; |
| 4 | 4 | |
| 5 | -class Marine{ |
|
| 5 | +class Marine { |
|
| 6 | 6 | public $db; |
| 7 | 7 | |
| 8 | 8 | public function __construct($dbc = null) { |
@@ -16,33 +16,33 @@ discard block |
||
| 16 | 16 | * @return Array the SQL part |
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 19 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 21 | 21 | $filters = array(); |
| 22 | 22 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 23 | 23 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 24 | 24 | $filters = $globalStatsFilters[$globalFilterName]; |
| 25 | 25 | } else { |
| 26 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 26 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | if (isset($filter[0]['source'])) { |
| 30 | - $filters = array_merge($filters,$filter); |
|
| 30 | + $filters = array_merge($filters, $filter); |
|
| 31 | 31 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 33 | 33 | $filter_query_join = ''; |
| 34 | 34 | $filter_query_where = ''; |
| 35 | - foreach($filters as $flt) { |
|
| 35 | + foreach ($filters as $flt) { |
|
| 36 | 36 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 37 | 37 | if (isset($flt['source'])) { |
| 38 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 38 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 39 | 39 | } else { |
| 40 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 40 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 45 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 45 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 46 | 46 | } |
| 47 | 47 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 48 | 48 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 72 | 72 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 73 | 73 | if ($filter_query_where != '') { |
| 74 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 74 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 75 | 75 | } |
| 76 | 76 | $filter_query = $filter_query_join.$filter_query_where; |
| 77 | 77 | return $filter_query; |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | * @return Array the spotter information |
| 87 | 87 | * |
| 88 | 88 | */ |
| 89 | - public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
|
| 89 | + public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false) |
|
| 90 | 90 | { |
| 91 | 91 | date_default_timezone_set('UTC'); |
| 92 | 92 | if (!is_string($query)) |
@@ -106,13 +106,13 @@ discard block |
||
| 106 | 106 | $sth = $this->db->prepare($query.$limitQuery); |
| 107 | 107 | $sth->execute($params); |
| 108 | 108 | } catch (PDOException $e) { |
| 109 | - printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery); |
|
| 109 | + printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery); |
|
| 110 | 110 | exit(); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | $num_rows = 0; |
| 114 | 114 | $spotter_array = array(); |
| 115 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 115 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 116 | 116 | { |
| 117 | 117 | $num_rows++; |
| 118 | 118 | $temp_array = array(); |
@@ -144,10 +144,10 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed']; |
| 146 | 146 | |
| 147 | - if($temp_array['mmsi'] != "") |
|
| 147 | + if ($temp_array['mmsi'] != "") |
|
| 148 | 148 | { |
| 149 | 149 | $Image = new Image($this->db); |
| 150 | - if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']); |
|
| 150 | + if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'], '', $temp_array['ident']); |
|
| 151 | 151 | else $image_array = $Image->getMarineImage($temp_array['mmsi']); |
| 152 | 152 | unset($Image); |
| 153 | 153 | if (count($image_array) > 0) { |
@@ -183,17 +183,17 @@ discard block |
||
| 183 | 183 | { |
| 184 | 184 | $temp_array['date'] = "about ".$dateArray['hours']." hours ago"; |
| 185 | 185 | } else { |
| 186 | - $temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC")); |
|
| 186 | + $temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC")); |
|
| 187 | 187 | } |
| 188 | 188 | $temp_array['date_minutes_past'] = $dateArray['minutes']; |
| 189 | - $temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC")); |
|
| 190 | - $temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC")); |
|
| 189 | + $temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC")); |
|
| 190 | + $temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC")); |
|
| 191 | 191 | $temp_array['date_unix'] = strtotime($row['date']." UTC"); |
| 192 | 192 | if (isset($row['last_seen']) && $row['last_seen'] != '') { |
| 193 | 193 | if (strtotime($row['last_seen']) > strtotime($row['date'])) { |
| 194 | 194 | $temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']); |
| 195 | - $temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC")); |
|
| 196 | - $temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC")); |
|
| 195 | + $temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC")); |
|
| 196 | + $temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC")); |
|
| 197 | 197 | $temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC"); |
| 198 | 198 | } |
| 199 | 199 | } |
@@ -226,8 +226,8 @@ discard block |
||
| 226 | 226 | if ($limit != "") |
| 227 | 227 | { |
| 228 | 228 | $limit_array = explode(",", $limit); |
| 229 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 230 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 229 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 230 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 231 | 231 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 232 | 232 | { |
| 233 | 233 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -241,8 +241,8 @@ discard block |
||
| 241 | 241 | } else { |
| 242 | 242 | $orderby_query = " ORDER BY marine_output.date DESC"; |
| 243 | 243 | } |
| 244 | - $query = $global_query.$filter_query." ".$orderby_query; |
|
| 245 | - $spotter_array = $this->getDataFromDB($query, array(),$limit_query,true); |
|
| 244 | + $query = $global_query.$filter_query." ".$orderby_query; |
|
| 245 | + $spotter_array = $this->getDataFromDB($query, array(), $limit_query, true); |
|
| 246 | 246 | return $spotter_array; |
| 247 | 247 | } |
| 248 | 248 | |
@@ -260,8 +260,8 @@ discard block |
||
| 260 | 260 | if ($id == '') return array(); |
| 261 | 261 | $additional_query = "marine_output.fammarine_id = :id"; |
| 262 | 262 | $query_values = array(':id' => $id); |
| 263 | - $query = $global_query." WHERE ".$additional_query." "; |
|
| 264 | - $spotter_array = $this->getDataFromDB($query,$query_values); |
|
| 263 | + $query = $global_query." WHERE ".$additional_query." "; |
|
| 264 | + $spotter_array = $this->getDataFromDB($query, $query_values); |
|
| 265 | 265 | return $spotter_array; |
| 266 | 266 | } |
| 267 | 267 | |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | $query_values = array(); |
| 281 | 281 | $limit_query = ''; |
| 282 | 282 | $additional_query = ''; |
| 283 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 283 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 284 | 284 | if ($ident != "") |
| 285 | 285 | { |
| 286 | 286 | if (!is_string($ident)) |
@@ -296,8 +296,8 @@ discard block |
||
| 296 | 296 | { |
| 297 | 297 | $limit_array = explode(",", $limit); |
| 298 | 298 | |
| 299 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 300 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 299 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 300 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 301 | 301 | |
| 302 | 302 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 303 | 303 | { |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | return $spotter_array; |
| 322 | 322 | } |
| 323 | 323 | |
| 324 | - public function getMarineDataByDate($date = '', $limit = '', $sort = '',$filter = array()) |
|
| 324 | + public function getMarineDataByDate($date = '', $limit = '', $sort = '', $filter = array()) |
|
| 325 | 325 | { |
| 326 | 326 | global $global_query, $globalTimezone, $globalDBdriver; |
| 327 | 327 | |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | $limit_query = ''; |
| 330 | 330 | $additional_query = ''; |
| 331 | 331 | |
| 332 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 332 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 333 | 333 | |
| 334 | 334 | if ($date != "") |
| 335 | 335 | { |
@@ -355,8 +355,8 @@ discard block |
||
| 355 | 355 | { |
| 356 | 356 | $limit_array = explode(",", $limit); |
| 357 | 357 | |
| 358 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 359 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 358 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 359 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 360 | 360 | |
| 361 | 361 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 362 | 362 | { |
@@ -387,11 +387,11 @@ discard block |
||
| 387 | 387 | * @return Array list of source name |
| 388 | 388 | * |
| 389 | 389 | */ |
| 390 | - public function getAllSourceName($type = '',$filters = array()) |
|
| 390 | + public function getAllSourceName($type = '', $filters = array()) |
|
| 391 | 391 | { |
| 392 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 392 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 393 | 393 | $query_values = array(); |
| 394 | - $query = "SELECT DISTINCT marine_output.source_name |
|
| 394 | + $query = "SELECT DISTINCT marine_output.source_name |
|
| 395 | 395 | FROM marine_output".$filter_query." marine_output.source_name <> ''"; |
| 396 | 396 | if ($type != '') { |
| 397 | 397 | $query_values = array(':type' => $type); |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | $source_array = array(); |
| 407 | 407 | $temp_array = array(); |
| 408 | 408 | |
| 409 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 409 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 410 | 410 | { |
| 411 | 411 | $temp_array['source_name'] = $row['source_name']; |
| 412 | 412 | $source_array[] = $temp_array; |
@@ -423,8 +423,8 @@ discard block |
||
| 423 | 423 | */ |
| 424 | 424 | public function getAllIdents($filters = array()) |
| 425 | 425 | { |
| 426 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 427 | - $query = "SELECT DISTINCT marine_output.ident |
|
| 426 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 427 | + $query = "SELECT DISTINCT marine_output.ident |
|
| 428 | 428 | FROM marine_output".$filter_query." marine_output.ident <> '' |
| 429 | 429 | ORDER BY marine_output.date ASC LIMIT 700 OFFSET 0"; |
| 430 | 430 | |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | $ident_array = array(); |
| 435 | 435 | $temp_array = array(); |
| 436 | 436 | |
| 437 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 437 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 438 | 438 | { |
| 439 | 439 | $temp_array['ident'] = $row['ident']; |
| 440 | 440 | $ident_array[] = $temp_array; |
@@ -451,7 +451,7 @@ discard block |
||
| 451 | 451 | */ |
| 452 | 452 | public function getIdentity($mmsi) |
| 453 | 453 | { |
| 454 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
|
| 454 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT); |
|
| 455 | 455 | $query = "SELECT * FROM marine_identity WHERE mmsi = :mmsi LIMIT 1"; |
| 456 | 456 | $sth = $this->db->prepare($query); |
| 457 | 457 | $sth->execute(array(':mmsi' => $mmsi)); |
@@ -476,12 +476,12 @@ discard block |
||
| 476 | 476 | } else $offset = '+00:00'; |
| 477 | 477 | |
| 478 | 478 | if ($globalDBdriver == 'mysql') { |
| 479 | - $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
|
| 479 | + $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
|
| 480 | 480 | FROM marine_output |
| 481 | 481 | WHERE marine_output.date <> '' |
| 482 | 482 | ORDER BY marine_output.date ASC LIMIT 0,200"; |
| 483 | 483 | } else { |
| 484 | - $query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 484 | + $query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 485 | 485 | FROM marine_output |
| 486 | 486 | WHERE marine_output.date <> '' |
| 487 | 487 | ORDER BY marine_output.date ASC LIMIT 0,200"; |
@@ -493,7 +493,7 @@ discard block |
||
| 493 | 493 | $date_array = array(); |
| 494 | 494 | $temp_array = array(); |
| 495 | 495 | |
| 496 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 496 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 497 | 497 | { |
| 498 | 498 | $temp_array['date'] = $row['date']; |
| 499 | 499 | |
@@ -512,11 +512,11 @@ discard block |
||
| 512 | 512 | * @return String success or false |
| 513 | 513 | * |
| 514 | 514 | */ |
| 515 | - public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL) |
|
| 515 | + public function updateIdentMarineData($fammarine_id = '', $ident = '', $fromsource = NULL) |
|
| 516 | 516 | { |
| 517 | 517 | |
| 518 | 518 | $query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id'; |
| 519 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident); |
|
| 519 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident); |
|
| 520 | 520 | |
| 521 | 521 | try { |
| 522 | 522 | $sth = $this->db->prepare($query); |
@@ -538,11 +538,11 @@ discard block |
||
| 538 | 538 | * @return String success or false |
| 539 | 539 | * |
| 540 | 540 | */ |
| 541 | - public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '') |
|
| 541 | + public function updateStatusMarineData($fammarine_id = '', $status_id = '', $status = '') |
|
| 542 | 542 | { |
| 543 | 543 | |
| 544 | 544 | $query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id'; |
| 545 | - $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id); |
|
| 545 | + $query_values = array(':fammarine_id' => $fammarine_id, ':status' => $status, ':status_id' => $status_id); |
|
| 546 | 546 | |
| 547 | 547 | try { |
| 548 | 548 | $sth = $this->db->prepare($query); |
@@ -565,7 +565,7 @@ discard block |
||
| 565 | 565 | public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '') |
| 566 | 566 | { |
| 567 | 567 | $query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE fammarine_id = :fammarine_id'; |
| 568 | - $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 568 | + $query_values = array(':fammarine_id' => $fammarine_id, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident); |
|
| 569 | 569 | |
| 570 | 570 | try { |
| 571 | 571 | $sth = $this->db->prepare($query); |
@@ -603,7 +603,7 @@ discard block |
||
| 603 | 603 | * @param String $verticalrate vertival rate of flight |
| 604 | 604 | * @return String success or false |
| 605 | 605 | */ |
| 606 | - public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '') |
|
| 606 | + public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $format_source = '', $source_name = '') |
|
| 607 | 607 | { |
| 608 | 608 | global $globalURL, $globalMarineImageFetch; |
| 609 | 609 | |
@@ -670,31 +670,31 @@ discard block |
||
| 670 | 670 | } |
| 671 | 671 | |
| 672 | 672 | |
| 673 | - if ($date == "" || strtotime($date) < time()-20*60) |
|
| 673 | + if ($date == "" || strtotime($date) < time() - 20*60) |
|
| 674 | 674 | { |
| 675 | 675 | $date = date("Y-m-d H:i:s", time()); |
| 676 | 676 | } |
| 677 | 677 | |
| 678 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
| 679 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 680 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 681 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 682 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 683 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 684 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 685 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
| 686 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 687 | - $status = filter_var($status,FILTER_SANITIZE_STRING); |
|
| 688 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
| 689 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 690 | - $arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING); |
|
| 691 | - $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
|
| 678 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
| 679 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 680 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 681 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 682 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 683 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 684 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 685 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
| 686 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 687 | + $status = filter_var($status, FILTER_SANITIZE_STRING); |
|
| 688 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
| 689 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 690 | + $arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING); |
|
| 691 | + $arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING); |
|
| 692 | 692 | |
| 693 | 693 | if (isset($globalMarineImageFetch) && $globalMarineImageFetch === TRUE) { |
| 694 | 694 | $Image = new Image($this->db); |
| 695 | - $image_array = $Image->getMarineImage($mmsi,$imo,$ident); |
|
| 695 | + $image_array = $Image->getMarineImage($mmsi, $imo, $ident); |
|
| 696 | 696 | if (!isset($image_array[0]['mmsi'])) { |
| 697 | - $Image->addMarineImage($mmsi,$imo,$ident); |
|
| 697 | + $Image->addMarineImage($mmsi, $imo, $ident); |
|
| 698 | 698 | } |
| 699 | 699 | unset($Image); |
| 700 | 700 | } |
@@ -706,10 +706,10 @@ discard block |
||
| 706 | 706 | if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
| 707 | 707 | if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
| 708 | 708 | if ($arrival_date == '') $arrival_date = NULL; |
| 709 | - $query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date) |
|
| 709 | + $query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date) |
|
| 710 | 710 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)"; |
| 711 | 711 | |
| 712 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date); |
|
| 712 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date); |
|
| 713 | 713 | try { |
| 714 | 714 | |
| 715 | 715 | $sth = $this->db->prepare($query); |
@@ -734,13 +734,13 @@ discard block |
||
| 734 | 734 | { |
| 735 | 735 | global $globalDBdriver, $globalTimezone; |
| 736 | 736 | if ($globalDBdriver == 'mysql') { |
| 737 | - $query = "SELECT marine_output.ident FROM marine_output |
|
| 737 | + $query = "SELECT marine_output.ident FROM marine_output |
|
| 738 | 738 | WHERE marine_output.ident = :ident |
| 739 | 739 | AND marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 740 | 740 | AND marine_output.date < UTC_TIMESTAMP()"; |
| 741 | 741 | $query_data = array(':ident' => $ident); |
| 742 | 742 | } else { |
| 743 | - $query = "SELECT marine_output.ident FROM marine_output |
|
| 743 | + $query = "SELECT marine_output.ident FROM marine_output |
|
| 744 | 744 | WHERE marine_output.ident = :ident |
| 745 | 745 | AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 746 | 746 | AND marine_output.date < now() AT TIME ZONE 'UTC'"; |
@@ -749,8 +749,8 @@ discard block |
||
| 749 | 749 | |
| 750 | 750 | $sth = $this->db->prepare($query); |
| 751 | 751 | $sth->execute($query_data); |
| 752 | - $ident_result=''; |
|
| 753 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 752 | + $ident_result = ''; |
|
| 753 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 754 | 754 | { |
| 755 | 755 | $ident_result = $row['ident']; |
| 756 | 756 | } |
@@ -776,8 +776,8 @@ discard block |
||
| 776 | 776 | return false; |
| 777 | 777 | } else { |
| 778 | 778 | $q_array = explode(" ", $q); |
| 779 | - foreach ($q_array as $q_item){ |
|
| 780 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 779 | + foreach ($q_array as $q_item) { |
|
| 780 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 781 | 781 | $additional_query .= " AND ("; |
| 782 | 782 | $additional_query .= "(marine_output.ident like '%".$q_item."%')"; |
| 783 | 783 | $additional_query .= ")"; |
@@ -785,11 +785,11 @@ discard block |
||
| 785 | 785 | } |
| 786 | 786 | } |
| 787 | 787 | if ($globalDBdriver == 'mysql') { |
| 788 | - $query = "SELECT marine_output.* FROM marine_output |
|
| 788 | + $query = "SELECT marine_output.* FROM marine_output |
|
| 789 | 789 | WHERE marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." |
| 790 | 790 | AND marine_output.date < UTC_TIMESTAMP()"; |
| 791 | 791 | } else { |
| 792 | - $query = "SELECT marine_output.* FROM marine_output |
|
| 792 | + $query = "SELECT marine_output.* FROM marine_output |
|
| 793 | 793 | WHERE marine_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." |
| 794 | 794 | AND marine_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
| 795 | 795 | } |
@@ -808,16 +808,16 @@ discard block |
||
| 808 | 808 | * |
| 809 | 809 | */ |
| 810 | 810 | |
| 811 | - public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
|
| 811 | + public function countAllMarineOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
| 812 | 812 | { |
| 813 | 813 | global $globalDBdriver, $globalArchive; |
| 814 | 814 | //$filter_query = $this->getFilter($filters,true,true); |
| 815 | - $Connection= new Connection($this->db); |
|
| 815 | + $Connection = new Connection($this->db); |
|
| 816 | 816 | if (!$Connection->tableExists('countries')) return array(); |
| 817 | 817 | require_once('class.SpotterLive.php'); |
| 818 | 818 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
| 819 | 819 | $MarineLive = new MarineLive(); |
| 820 | - $filter_query = $MarineLive->getFilter($filters,true,true); |
|
| 820 | + $filter_query = $MarineLive->getFilter($filters, true, true); |
|
| 821 | 821 | $filter_query .= " over_country IS NOT NULL AND over_country <> ''"; |
| 822 | 822 | if ($olderthanmonths > 0) { |
| 823 | 823 | if ($globalDBdriver == 'mysql') { |
@@ -837,7 +837,7 @@ discard block |
||
| 837 | 837 | } else { |
| 838 | 838 | require_once(dirname(__FILE__)."/class.MarineArchive.php"); |
| 839 | 839 | $MarineArchive = new MarineArchive(); |
| 840 | - $filter_query = $MarineArchive->getFilter($filters,true,true); |
|
| 840 | + $filter_query = $MarineArchive->getFilter($filters, true, true); |
|
| 841 | 841 | $filter_query .= " over_country <> ''"; |
| 842 | 842 | if ($olderthanmonths > 0) { |
| 843 | 843 | if ($globalDBdriver == 'mysql') { |
@@ -865,7 +865,7 @@ discard block |
||
| 865 | 865 | $flight_array = array(); |
| 866 | 866 | $temp_array = array(); |
| 867 | 867 | |
| 868 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 868 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 869 | 869 | { |
| 870 | 870 | $temp_array['marine_count'] = $row['nb']; |
| 871 | 871 | $temp_array['marine_country'] = $row['name']; |
@@ -884,11 +884,11 @@ discard block |
||
| 884 | 884 | * @return Array the callsign list |
| 885 | 885 | * |
| 886 | 886 | */ |
| 887 | - public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
|
| 887 | + public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 888 | 888 | { |
| 889 | 889 | global $globalDBdriver; |
| 890 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 891 | - $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
|
| 890 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 891 | + $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
|
| 892 | 892 | FROM marine_output".$filter_query." marine_output.ident <> ''"; |
| 893 | 893 | if ($olderthanmonths > 0) { |
| 894 | 894 | if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
@@ -902,28 +902,28 @@ discard block |
||
| 902 | 902 | if ($year != '') { |
| 903 | 903 | if ($globalDBdriver == 'mysql') { |
| 904 | 904 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 905 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 905 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 906 | 906 | } else { |
| 907 | 907 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 908 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 908 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 909 | 909 | } |
| 910 | 910 | } |
| 911 | 911 | if ($month != '') { |
| 912 | 912 | if ($globalDBdriver == 'mysql') { |
| 913 | 913 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 914 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 914 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 915 | 915 | } else { |
| 916 | 916 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 917 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 917 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 918 | 918 | } |
| 919 | 919 | } |
| 920 | 920 | if ($day != '') { |
| 921 | 921 | if ($globalDBdriver == 'mysql') { |
| 922 | 922 | $query .= " AND DAY(marine_output.date) = :day"; |
| 923 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 923 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 924 | 924 | } else { |
| 925 | 925 | $query .= " AND EXTRACT(DAY FROM marine_output.date) = :day"; |
| 926 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 926 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 927 | 927 | } |
| 928 | 928 | } |
| 929 | 929 | $query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC"; |
@@ -935,7 +935,7 @@ discard block |
||
| 935 | 935 | $callsign_array = array(); |
| 936 | 936 | $temp_array = array(); |
| 937 | 937 | |
| 938 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 938 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 939 | 939 | { |
| 940 | 940 | $temp_array['callsign_icao'] = $row['ident']; |
| 941 | 941 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -987,7 +987,7 @@ discard block |
||
| 987 | 987 | $date_array = array(); |
| 988 | 988 | $temp_array = array(); |
| 989 | 989 | |
| 990 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 990 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 991 | 991 | { |
| 992 | 992 | $temp_array['date_name'] = $row['date_name']; |
| 993 | 993 | $temp_array['date_count'] = $row['date_count']; |
@@ -1013,7 +1013,7 @@ discard block |
||
| 1013 | 1013 | $datetime = new DateTime(); |
| 1014 | 1014 | $offset = $datetime->format('P'); |
| 1015 | 1015 | } else $offset = '+00:00'; |
| 1016 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1016 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1017 | 1017 | if ($globalDBdriver == 'mysql') { |
| 1018 | 1018 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 1019 | 1019 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)"; |
@@ -1034,7 +1034,7 @@ discard block |
||
| 1034 | 1034 | $date_array = array(); |
| 1035 | 1035 | $temp_array = array(); |
| 1036 | 1036 | |
| 1037 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1037 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1038 | 1038 | { |
| 1039 | 1039 | $temp_array['date_name'] = $row['date_name']; |
| 1040 | 1040 | $temp_array['date_count'] = $row['date_count']; |
@@ -1059,7 +1059,7 @@ discard block |
||
| 1059 | 1059 | $datetime = new DateTime(); |
| 1060 | 1060 | $offset = $datetime->format('P'); |
| 1061 | 1061 | } else $offset = '+00:00'; |
| 1062 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1062 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1063 | 1063 | if ($globalDBdriver == 'mysql') { |
| 1064 | 1064 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 1065 | 1065 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)"; |
@@ -1080,7 +1080,7 @@ discard block |
||
| 1080 | 1080 | $date_array = array(); |
| 1081 | 1081 | $temp_array = array(); |
| 1082 | 1082 | |
| 1083 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1083 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1084 | 1084 | { |
| 1085 | 1085 | $temp_array['date_name'] = $row['date_name']; |
| 1086 | 1086 | $temp_array['date_count'] = $row['date_count']; |
@@ -1127,7 +1127,7 @@ discard block |
||
| 1127 | 1127 | $date_array = array(); |
| 1128 | 1128 | $temp_array = array(); |
| 1129 | 1129 | |
| 1130 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1130 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1131 | 1131 | { |
| 1132 | 1132 | $temp_array['month_name'] = $row['month_name']; |
| 1133 | 1133 | $temp_array['year_name'] = $row['year_name']; |
@@ -1156,7 +1156,7 @@ discard block |
||
| 1156 | 1156 | $datetime = new DateTime(); |
| 1157 | 1157 | $offset = $datetime->format('P'); |
| 1158 | 1158 | } else $offset = '+00:00'; |
| 1159 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1159 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1160 | 1160 | if ($globalDBdriver == 'mysql') { |
| 1161 | 1161 | $query = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
| 1162 | 1162 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)"; |
@@ -1177,7 +1177,7 @@ discard block |
||
| 1177 | 1177 | $date_array = array(); |
| 1178 | 1178 | $temp_array = array(); |
| 1179 | 1179 | |
| 1180 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1180 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1181 | 1181 | { |
| 1182 | 1182 | $temp_array['year_name'] = $row['year_name']; |
| 1183 | 1183 | $temp_array['month_name'] = $row['month_name']; |
@@ -1197,7 +1197,7 @@ discard block |
||
| 1197 | 1197 | * @return Array the hour list |
| 1198 | 1198 | * |
| 1199 | 1199 | */ |
| 1200 | - public function countAllHours($orderby,$filters = array()) |
|
| 1200 | + public function countAllHours($orderby, $filters = array()) |
|
| 1201 | 1201 | { |
| 1202 | 1202 | global $globalTimezone, $globalDBdriver; |
| 1203 | 1203 | if ($globalTimezone != '') { |
@@ -1245,7 +1245,7 @@ discard block |
||
| 1245 | 1245 | $hour_array = array(); |
| 1246 | 1246 | $temp_array = array(); |
| 1247 | 1247 | |
| 1248 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1248 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1249 | 1249 | { |
| 1250 | 1250 | $temp_array['hour_name'] = $row['hour_name']; |
| 1251 | 1251 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1267,8 +1267,8 @@ discard block |
||
| 1267 | 1267 | public function countAllHoursByDate($date, $filters = array()) |
| 1268 | 1268 | { |
| 1269 | 1269 | global $globalTimezone, $globalDBdriver; |
| 1270 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1271 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 1270 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1271 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 1272 | 1272 | if ($globalTimezone != '') { |
| 1273 | 1273 | date_default_timezone_set($globalTimezone); |
| 1274 | 1274 | $datetime = new DateTime($date); |
@@ -1276,12 +1276,12 @@ discard block |
||
| 1276 | 1276 | } else $offset = '+00:00'; |
| 1277 | 1277 | |
| 1278 | 1278 | if ($globalDBdriver == 'mysql') { |
| 1279 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1279 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1280 | 1280 | FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = :date |
| 1281 | 1281 | GROUP BY hour_name |
| 1282 | 1282 | ORDER BY hour_name ASC"; |
| 1283 | 1283 | } else { |
| 1284 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1284 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1285 | 1285 | FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date |
| 1286 | 1286 | GROUP BY hour_name |
| 1287 | 1287 | ORDER BY hour_name ASC"; |
@@ -1293,7 +1293,7 @@ discard block |
||
| 1293 | 1293 | $hour_array = array(); |
| 1294 | 1294 | $temp_array = array(); |
| 1295 | 1295 | |
| 1296 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1296 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1297 | 1297 | { |
| 1298 | 1298 | $temp_array['hour_name'] = $row['hour_name']; |
| 1299 | 1299 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1315,8 +1315,8 @@ discard block |
||
| 1315 | 1315 | public function countAllHoursByIdent($ident, $filters = array()) |
| 1316 | 1316 | { |
| 1317 | 1317 | global $globalTimezone, $globalDBdriver; |
| 1318 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1319 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1318 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1319 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1320 | 1320 | if ($globalTimezone != '') { |
| 1321 | 1321 | date_default_timezone_set($globalTimezone); |
| 1322 | 1322 | $datetime = new DateTime(); |
@@ -1324,12 +1324,12 @@ discard block |
||
| 1324 | 1324 | } else $offset = '+00:00'; |
| 1325 | 1325 | |
| 1326 | 1326 | if ($globalDBdriver == 'mysql') { |
| 1327 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1327 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1328 | 1328 | FROM marine_output".$filter_query." marine_output.ident = :ident |
| 1329 | 1329 | GROUP BY hour_name |
| 1330 | 1330 | ORDER BY hour_name ASC"; |
| 1331 | 1331 | } else { |
| 1332 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1332 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1333 | 1333 | FROM marine_output".$filter_query." marine_output.ident = :ident |
| 1334 | 1334 | GROUP BY hour_name |
| 1335 | 1335 | ORDER BY hour_name ASC"; |
@@ -1337,12 +1337,12 @@ discard block |
||
| 1337 | 1337 | |
| 1338 | 1338 | |
| 1339 | 1339 | $sth = $this->db->prepare($query); |
| 1340 | - $sth->execute(array(':ident' => $ident,':offset' => $offset)); |
|
| 1340 | + $sth->execute(array(':ident' => $ident, ':offset' => $offset)); |
|
| 1341 | 1341 | |
| 1342 | 1342 | $hour_array = array(); |
| 1343 | 1343 | $temp_array = array(); |
| 1344 | 1344 | |
| 1345 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1345 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1346 | 1346 | { |
| 1347 | 1347 | $temp_array['hour_name'] = $row['hour_name']; |
| 1348 | 1348 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1361,33 +1361,33 @@ discard block |
||
| 1361 | 1361 | * @return Integer the number of vessels |
| 1362 | 1362 | * |
| 1363 | 1363 | */ |
| 1364 | - public function countOverallMarine($filters = array(),$year = '',$month = '') |
|
| 1364 | + public function countOverallMarine($filters = array(), $year = '', $month = '') |
|
| 1365 | 1365 | { |
| 1366 | 1366 | global $globalDBdriver; |
| 1367 | 1367 | //$queryi = "SELECT COUNT(marine_output.marine_id) AS flight_count FROM marine_output"; |
| 1368 | - $queryi = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output"; |
|
| 1368 | + $queryi = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output"; |
|
| 1369 | 1369 | $query_values = array(); |
| 1370 | 1370 | $query = ''; |
| 1371 | 1371 | if ($year != '') { |
| 1372 | 1372 | if ($globalDBdriver == 'mysql') { |
| 1373 | 1373 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 1374 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1374 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1375 | 1375 | } else { |
| 1376 | 1376 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 1377 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1377 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1378 | 1378 | } |
| 1379 | 1379 | } |
| 1380 | 1380 | if ($month != '') { |
| 1381 | 1381 | if ($globalDBdriver == 'mysql') { |
| 1382 | 1382 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 1383 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1383 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1384 | 1384 | } else { |
| 1385 | 1385 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 1386 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1386 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1387 | 1387 | } |
| 1388 | 1388 | } |
| 1389 | 1389 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 1390 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1390 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 1391 | 1391 | |
| 1392 | 1392 | $sth = $this->db->prepare($queryi); |
| 1393 | 1393 | $sth->execute($query_values); |
@@ -1400,32 +1400,32 @@ discard block |
||
| 1400 | 1400 | * @return Integer the number of vessels |
| 1401 | 1401 | * |
| 1402 | 1402 | */ |
| 1403 | - public function countOverallMarineTypes($filters = array(),$year = '',$month = '') |
|
| 1403 | + public function countOverallMarineTypes($filters = array(), $year = '', $month = '') |
|
| 1404 | 1404 | { |
| 1405 | 1405 | global $globalDBdriver; |
| 1406 | - $queryi = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output"; |
|
| 1406 | + $queryi = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output"; |
|
| 1407 | 1407 | $query_values = array(); |
| 1408 | 1408 | $query = ''; |
| 1409 | 1409 | if ($year != '') { |
| 1410 | 1410 | if ($globalDBdriver == 'mysql') { |
| 1411 | 1411 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 1412 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1412 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1413 | 1413 | } else { |
| 1414 | 1414 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 1415 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1415 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1416 | 1416 | } |
| 1417 | 1417 | } |
| 1418 | 1418 | if ($month != '') { |
| 1419 | 1419 | if ($globalDBdriver == 'mysql') { |
| 1420 | 1420 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 1421 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1421 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1422 | 1422 | } else { |
| 1423 | 1423 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 1424 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1424 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1425 | 1425 | } |
| 1426 | 1426 | } |
| 1427 | 1427 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 1428 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1428 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 1429 | 1429 | |
| 1430 | 1430 | $sth = $this->db->prepare($queryi); |
| 1431 | 1431 | $sth->execute($query_values); |
@@ -1442,7 +1442,7 @@ discard block |
||
| 1442 | 1442 | public function countAllHoursFromToday($filters = array()) |
| 1443 | 1443 | { |
| 1444 | 1444 | global $globalTimezone, $globalDBdriver; |
| 1445 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1445 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1446 | 1446 | if ($globalTimezone != '') { |
| 1447 | 1447 | date_default_timezone_set($globalTimezone); |
| 1448 | 1448 | $datetime = new DateTime(); |
@@ -1450,12 +1450,12 @@ discard block |
||
| 1450 | 1450 | } else $offset = '+00:00'; |
| 1451 | 1451 | |
| 1452 | 1452 | if ($globalDBdriver == 'mysql') { |
| 1453 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1453 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1454 | 1454 | FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = CURDATE() |
| 1455 | 1455 | GROUP BY hour_name |
| 1456 | 1456 | ORDER BY hour_name ASC"; |
| 1457 | 1457 | } else { |
| 1458 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1458 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1459 | 1459 | FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date) |
| 1460 | 1460 | GROUP BY hour_name |
| 1461 | 1461 | ORDER BY hour_name ASC"; |
@@ -1467,7 +1467,7 @@ discard block |
||
| 1467 | 1467 | $hour_array = array(); |
| 1468 | 1468 | $temp_array = array(); |
| 1469 | 1469 | |
| 1470 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1470 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1471 | 1471 | { |
| 1472 | 1472 | $temp_array['hour_name'] = $row['hour_name']; |
| 1473 | 1473 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1486,9 +1486,9 @@ discard block |
||
| 1486 | 1486 | */ |
| 1487 | 1487 | public function getMarineIDBasedOnFamMarineID($fammarine_id) |
| 1488 | 1488 | { |
| 1489 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
| 1489 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
| 1490 | 1490 | |
| 1491 | - $query = "SELECT marine_output.marine_id |
|
| 1491 | + $query = "SELECT marine_output.marine_id |
|
| 1492 | 1492 | FROM marine_output |
| 1493 | 1493 | WHERE marine_output.fammarine_id = '".$fammarine_id."'"; |
| 1494 | 1494 | |
@@ -1496,7 +1496,7 @@ discard block |
||
| 1496 | 1496 | $sth = $this->db->prepare($query); |
| 1497 | 1497 | $sth->execute(); |
| 1498 | 1498 | |
| 1499 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1499 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1500 | 1500 | { |
| 1501 | 1501 | return $row['marine_id']; |
| 1502 | 1502 | } |
@@ -1521,23 +1521,23 @@ discard block |
||
| 1521 | 1521 | } |
| 1522 | 1522 | |
| 1523 | 1523 | $current_date = date("Y-m-d H:i:s"); |
| 1524 | - $date = date("Y-m-d H:i:s",strtotime($dateString." UTC")); |
|
| 1524 | + $date = date("Y-m-d H:i:s", strtotime($dateString." UTC")); |
|
| 1525 | 1525 | |
| 1526 | 1526 | $diff = abs(strtotime($current_date) - strtotime($date)); |
| 1527 | 1527 | |
| 1528 | - $time_array['years'] = floor($diff / (365*60*60*24)); |
|
| 1528 | + $time_array['years'] = floor($diff/(365*60*60*24)); |
|
| 1529 | 1529 | $years = $time_array['years']; |
| 1530 | 1530 | |
| 1531 | - $time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24)); |
|
| 1531 | + $time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24)); |
|
| 1532 | 1532 | $months = $time_array['months']; |
| 1533 | 1533 | |
| 1534 | - $time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24)); |
|
| 1534 | + $time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24)); |
|
| 1535 | 1535 | $days = $time_array['days']; |
| 1536 | - $time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60)); |
|
| 1536 | + $time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60)); |
|
| 1537 | 1537 | $hours = $time_array['hours']; |
| 1538 | - $time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60); |
|
| 1538 | + $time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60); |
|
| 1539 | 1539 | $minutes = $time_array['minutes']; |
| 1540 | - $time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1540 | + $time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1541 | 1541 | |
| 1542 | 1542 | return $time_array; |
| 1543 | 1543 | } |
@@ -1560,63 +1560,63 @@ discard block |
||
| 1560 | 1560 | $temp_array['direction_degree'] = $direction; |
| 1561 | 1561 | $temp_array['direction_shortname'] = "N"; |
| 1562 | 1562 | $temp_array['direction_fullname'] = "North"; |
| 1563 | - } elseif ($direction >= 22.5 && $direction < 45){ |
|
| 1563 | + } elseif ($direction >= 22.5 && $direction < 45) { |
|
| 1564 | 1564 | $temp_array['direction_degree'] = $direction; |
| 1565 | 1565 | $temp_array['direction_shortname'] = "NNE"; |
| 1566 | 1566 | $temp_array['direction_fullname'] = "North-Northeast"; |
| 1567 | - } elseif ($direction >= 45 && $direction < 67.5){ |
|
| 1567 | + } elseif ($direction >= 45 && $direction < 67.5) { |
|
| 1568 | 1568 | $temp_array['direction_degree'] = $direction; |
| 1569 | 1569 | $temp_array['direction_shortname'] = "NE"; |
| 1570 | 1570 | $temp_array['direction_fullname'] = "Northeast"; |
| 1571 | - } elseif ($direction >= 67.5 && $direction < 90){ |
|
| 1571 | + } elseif ($direction >= 67.5 && $direction < 90) { |
|
| 1572 | 1572 | $temp_array['direction_degree'] = $direction; |
| 1573 | 1573 | $temp_array['direction_shortname'] = "ENE"; |
| 1574 | 1574 | $temp_array['direction_fullname'] = "East-Northeast"; |
| 1575 | - } elseif ($direction >= 90 && $direction < 112.5){ |
|
| 1575 | + } elseif ($direction >= 90 && $direction < 112.5) { |
|
| 1576 | 1576 | $temp_array['direction_degree'] = $direction; |
| 1577 | 1577 | $temp_array['direction_shortname'] = "E"; |
| 1578 | 1578 | $temp_array['direction_fullname'] = "East"; |
| 1579 | - } elseif ($direction >= 112.5 && $direction < 135){ |
|
| 1579 | + } elseif ($direction >= 112.5 && $direction < 135) { |
|
| 1580 | 1580 | $temp_array['direction_degree'] = $direction; |
| 1581 | 1581 | $temp_array['direction_shortname'] = "ESE"; |
| 1582 | 1582 | $temp_array['direction_fullname'] = "East-Southeast"; |
| 1583 | - } elseif ($direction >= 135 && $direction < 157.5){ |
|
| 1583 | + } elseif ($direction >= 135 && $direction < 157.5) { |
|
| 1584 | 1584 | $temp_array['direction_degree'] = $direction; |
| 1585 | 1585 | $temp_array['direction_shortname'] = "SE"; |
| 1586 | 1586 | $temp_array['direction_fullname'] = "Southeast"; |
| 1587 | - } elseif ($direction >= 157.5 && $direction < 180){ |
|
| 1587 | + } elseif ($direction >= 157.5 && $direction < 180) { |
|
| 1588 | 1588 | $temp_array['direction_degree'] = $direction; |
| 1589 | 1589 | $temp_array['direction_shortname'] = "SSE"; |
| 1590 | 1590 | $temp_array['direction_fullname'] = "South-Southeast"; |
| 1591 | - } elseif ($direction >= 180 && $direction < 202.5){ |
|
| 1591 | + } elseif ($direction >= 180 && $direction < 202.5) { |
|
| 1592 | 1592 | $temp_array['direction_degree'] = $direction; |
| 1593 | 1593 | $temp_array['direction_shortname'] = "S"; |
| 1594 | 1594 | $temp_array['direction_fullname'] = "South"; |
| 1595 | - } elseif ($direction >= 202.5 && $direction < 225){ |
|
| 1595 | + } elseif ($direction >= 202.5 && $direction < 225) { |
|
| 1596 | 1596 | $temp_array['direction_degree'] = $direction; |
| 1597 | 1597 | $temp_array['direction_shortname'] = "SSW"; |
| 1598 | 1598 | $temp_array['direction_fullname'] = "South-Southwest"; |
| 1599 | - } elseif ($direction >= 225 && $direction < 247.5){ |
|
| 1599 | + } elseif ($direction >= 225 && $direction < 247.5) { |
|
| 1600 | 1600 | $temp_array['direction_degree'] = $direction; |
| 1601 | 1601 | $temp_array['direction_shortname'] = "SW"; |
| 1602 | 1602 | $temp_array['direction_fullname'] = "Southwest"; |
| 1603 | - } elseif ($direction >= 247.5 && $direction < 270){ |
|
| 1603 | + } elseif ($direction >= 247.5 && $direction < 270) { |
|
| 1604 | 1604 | $temp_array['direction_degree'] = $direction; |
| 1605 | 1605 | $temp_array['direction_shortname'] = "WSW"; |
| 1606 | 1606 | $temp_array['direction_fullname'] = "West-Southwest"; |
| 1607 | - } elseif ($direction >= 270 && $direction < 292.5){ |
|
| 1607 | + } elseif ($direction >= 270 && $direction < 292.5) { |
|
| 1608 | 1608 | $temp_array['direction_degree'] = $direction; |
| 1609 | 1609 | $temp_array['direction_shortname'] = "W"; |
| 1610 | 1610 | $temp_array['direction_fullname'] = "West"; |
| 1611 | - } elseif ($direction >= 292.5 && $direction < 315){ |
|
| 1611 | + } elseif ($direction >= 292.5 && $direction < 315) { |
|
| 1612 | 1612 | $temp_array['direction_degree'] = $direction; |
| 1613 | 1613 | $temp_array['direction_shortname'] = "WNW"; |
| 1614 | 1614 | $temp_array['direction_fullname'] = "West-Northwest"; |
| 1615 | - } elseif ($direction >= 315 && $direction < 337.5){ |
|
| 1615 | + } elseif ($direction >= 315 && $direction < 337.5) { |
|
| 1616 | 1616 | $temp_array['direction_degree'] = $direction; |
| 1617 | 1617 | $temp_array['direction_shortname'] = "NW"; |
| 1618 | 1618 | $temp_array['direction_fullname'] = "Northwest"; |
| 1619 | - } elseif ($direction >= 337.5 && $direction < 360){ |
|
| 1619 | + } elseif ($direction >= 337.5 && $direction < 360) { |
|
| 1620 | 1620 | $temp_array['direction_degree'] = $direction; |
| 1621 | 1621 | $temp_array['direction_shortname'] = "NNW"; |
| 1622 | 1622 | $temp_array['direction_fullname'] = "North-Northwest"; |
@@ -1633,11 +1633,11 @@ discard block |
||
| 1633 | 1633 | * @param Float $longitude longitute of the flight |
| 1634 | 1634 | * @return String the countrie |
| 1635 | 1635 | */ |
| 1636 | - public function getCountryFromLatitudeLongitude($latitude,$longitude) |
|
| 1636 | + public function getCountryFromLatitudeLongitude($latitude, $longitude) |
|
| 1637 | 1637 | { |
| 1638 | 1638 | global $globalDBdriver, $globalDebug; |
| 1639 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1640 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1639 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1640 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1641 | 1641 | |
| 1642 | 1642 | $Connection = new Connection($this->db); |
| 1643 | 1643 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1677,7 +1677,7 @@ discard block |
||
| 1677 | 1677 | public function getCountryFromISO2($iso2) |
| 1678 | 1678 | { |
| 1679 | 1679 | global $globalDBdriver, $globalDebug; |
| 1680 | - $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
|
| 1680 | + $iso2 = filter_var($iso2, FILTER_SANITIZE_STRING); |
|
| 1681 | 1681 | |
| 1682 | 1682 | $Connection = new Connection($this->db); |
| 1683 | 1683 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1725,7 +1725,7 @@ discard block |
||
| 1725 | 1725 | |
| 1726 | 1726 | $bitly_data = json_decode($bitly_data); |
| 1727 | 1727 | $bitly_url = ''; |
| 1728 | - if ($bitly_data->status_txt = "OK"){ |
|
| 1728 | + if ($bitly_data->status_txt = "OK") { |
|
| 1729 | 1729 | $bitly_url = $bitly_data->data->url; |
| 1730 | 1730 | } |
| 1731 | 1731 | |
@@ -1739,11 +1739,11 @@ discard block |
||
| 1739 | 1739 | * @return Array the vessel type list |
| 1740 | 1740 | * |
| 1741 | 1741 | */ |
| 1742 | - public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
|
| 1742 | + public function countAllMarineTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 1743 | 1743 | { |
| 1744 | 1744 | global $globalDBdriver; |
| 1745 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1746 | - $query = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count |
|
| 1745 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1746 | + $query = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count |
|
| 1747 | 1747 | FROM marine_output ".$filter_query." marine_output.type <> ''"; |
| 1748 | 1748 | if ($olderthanmonths > 0) { |
| 1749 | 1749 | if ($globalDBdriver == 'mysql') { |
@@ -1763,28 +1763,28 @@ discard block |
||
| 1763 | 1763 | if ($year != '') { |
| 1764 | 1764 | if ($globalDBdriver == 'mysql') { |
| 1765 | 1765 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 1766 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1766 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1767 | 1767 | } else { |
| 1768 | 1768 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 1769 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1769 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1770 | 1770 | } |
| 1771 | 1771 | } |
| 1772 | 1772 | if ($month != '') { |
| 1773 | 1773 | if ($globalDBdriver == 'mysql') { |
| 1774 | 1774 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 1775 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1775 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1776 | 1776 | } else { |
| 1777 | 1777 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 1778 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1778 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1779 | 1779 | } |
| 1780 | 1780 | } |
| 1781 | 1781 | if ($day != '') { |
| 1782 | 1782 | if ($globalDBdriver == 'mysql') { |
| 1783 | 1783 | $query .= " AND DAY(marine_output.date) = :day"; |
| 1784 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1784 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1785 | 1785 | } else { |
| 1786 | 1786 | $query .= " AND EXTRACT(DAY FROM marine_output.date) = :day"; |
| 1787 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 1787 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 1788 | 1788 | } |
| 1789 | 1789 | } |
| 1790 | 1790 | $query .= " GROUP BY marine_output.type ORDER BY marine_type_count DESC"; |
@@ -1793,7 +1793,7 @@ discard block |
||
| 1793 | 1793 | $sth->execute($query_values); |
| 1794 | 1794 | $marine_array = array(); |
| 1795 | 1795 | $temp_array = array(); |
| 1796 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1796 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1797 | 1797 | { |
| 1798 | 1798 | $temp_array['marine_type'] = $row['marine_type']; |
| 1799 | 1799 | $temp_array['marine_type_count'] = $row['marine_type_count']; |
@@ -1804,7 +1804,7 @@ discard block |
||
| 1804 | 1804 | |
| 1805 | 1805 | public function getOrderBy() |
| 1806 | 1806 | { |
| 1807 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC")); |
|
| 1807 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC")); |
|
| 1808 | 1808 | |
| 1809 | 1809 | return $orderby; |
| 1810 | 1810 | |
