Ysurac /
FlightAirMap
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | } else { |
| 20 | 20 | $title = _("Statistics").' - '._("Most common Country a flight was over"); |
| 21 | 21 | } |
| 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 ($airline_icao == '' && isset($globalFilter)) { |
| 24 | 24 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
| 25 | 25 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | if ($type == 'aircraft') { |
| 51 | - $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name); |
|
| 51 | + $flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name); |
|
| 52 | 52 | } elseif ($type == 'marine') { |
| 53 | 53 | $flightover_array = $Marine->countAllMarineOverCountries(); |
| 54 | 54 | } elseif ($type == 'tracker') { |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | print '<div id="chart" class="chart" width="100%"></div><script>'; |
| 63 | 63 | print 'var series = ['; |
| 64 | 64 | $flightover_data = ''; |
| 65 | -foreach($flightover_array as $flightover_item) |
|
| 65 | +foreach ($flightover_array as $flightover_item) |
|
| 66 | 66 | { |
| 67 | 67 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
| 68 | 68 | } |
@@ -111,8 +111,8 @@ discard block |
||
| 111 | 111 | print '</thead>'; |
| 112 | 112 | print '<tbody>'; |
| 113 | 113 | $i = 1; |
| 114 | - array_splice($flightover_array,10); |
|
| 115 | - foreach($flightover_array as $flightover_item) |
|
| 114 | + array_splice($flightover_array, 10); |
|
| 115 | + foreach ($flightover_array as $flightover_item) |
|
| 116 | 116 | { |
| 117 | 117 | print '<tr>'; |
| 118 | 118 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -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,19 +33,19 @@ discard block |
||
| 33 | 33 | </div> |
| 34 | 34 | <p>'._("Below is a list of the most common <strong>time of day</strong>.").'</p>'; |
| 35 | 35 | |
| 36 | -if ($type == 'aircraft') $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 37 | -elseif ($type == 'marine') $hour_array = $Marine->countAllHours('hour',true); |
|
| 38 | -elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('hour',true); |
|
| 36 | +if ($type == 'aircraft') $hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name); |
|
| 37 | +elseif ($type == 'marine') $hour_array = $Marine->countAllHours('hour', true); |
|
| 38 | +elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('hour', true); |
|
| 39 | 39 | print '<div id="chartHour" class="chart" width="100%"></div><script>'; |
| 40 | 40 | $hour_data = ''; |
| 41 | 41 | $hour_cnt = ''; |
| 42 | -foreach($hour_array as $hour_item) |
|
| 42 | +foreach ($hour_array as $hour_item) |
|
| 43 | 43 | { |
| 44 | 44 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 45 | 45 | $hour_cnt .= $hour_item['hour_count'].','; |
| 46 | 46 | } |
| 47 | 47 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 48 | -$hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
|
| 48 | +$hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]"; |
|
| 49 | 49 | print 'c3.generate({ |
| 50 | 50 | bindto: "#chartHour", |
| 51 | 51 | data: { |
@@ -53,9 +53,9 @@ discard block |
||
| 53 | 53 | axis: { x: { type: "category", categories: '.$hour_data.'},y: { label: "# of Flights"}},legend: { show: false }});'; |
| 54 | 54 | print '</script>'; |
| 55 | 55 | |
| 56 | -if ($type == 'aircraft') $hour_array = $Stats->countAllHours('count',true,$airline_icao,$filter_name); |
|
| 57 | -elseif ($type == 'marine') $hour_array = $Marine->countAllHours('count',true); |
|
| 58 | -elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('count',true); |
|
| 56 | +if ($type == 'aircraft') $hour_array = $Stats->countAllHours('count', true, $airline_icao, $filter_name); |
|
| 57 | +elseif ($type == 'marine') $hour_array = $Marine->countAllHours('count', true); |
|
| 58 | +elseif ($type == 'tracker') $hour_array = $Tracker->countAllHours('count', true); |
|
| 59 | 59 | if (!empty($hour_array)) |
| 60 | 60 | { |
| 61 | 61 | print '<div class="table-responsive">'; |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | print '</thead>'; |
| 68 | 68 | print '<tbody>'; |
| 69 | 69 | $i = 1; |
| 70 | - foreach($hour_array as $hour_item) |
|
| 70 | + foreach ($hour_array as $hour_item) |
|
| 71 | 71 | { |
| 72 | 72 | print '<tr>'; |
| 73 | 73 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | |
| 20 | 20 | if (!isset($filter_name)) $filter_name = ''; |
| 21 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 21 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 22 | 22 | if ($airline_icao == '' && isset($globalFilter)) { |
| 23 | 23 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
| 24 | 24 | } |
@@ -33,19 +33,19 @@ discard block |
||
| 33 | 33 | </div> |
| 34 | 34 | <p>'._("Below is a chart that plots the busiest month during the <strong>last year</strong>.").'</p>'; |
| 35 | 35 | |
| 36 | -if ($type == 'aircraft') $date_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 36 | +if ($type == 'aircraft') $date_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name); |
|
| 37 | 37 | elseif ($type == 'marine') $date_array = $Marine->countAllMonthsLastYear(true); |
| 38 | 38 | elseif ($type == 'tracker') $date_array = $Tracker->countAllMonthsLastYear(true); |
| 39 | 39 | print '<div id="chart" class="chart" width="100%"></div><script>'; |
| 40 | 40 | $year_data = ''; |
| 41 | 41 | $year_cnt = ''; |
| 42 | -foreach($date_array as $year_item) |
|
| 42 | +foreach ($date_array as $year_item) |
|
| 43 | 43 | { |
| 44 | 44 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 45 | 45 | $year_cnt .= $year_item['date_count'].','; |
| 46 | 46 | } |
| 47 | 47 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 48 | -$year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 48 | +$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 49 | 49 | print 'c3.generate({ |
| 50 | 50 | bindto: "#chart", |
| 51 | 51 | data: { x: "x", |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | print '</thead>'; |
| 69 | 69 | print '<tbody>'; |
| 70 | 70 | $i = 1; |
| 71 | - foreach($date_array as $date_item) |
|
| 71 | + foreach ($date_array as $date_item) |
|
| 72 | 72 | { |
| 73 | 73 | print '<tr>'; |
| 74 | 74 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -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"> |
@@ -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 | |
@@ -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 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | if (isset($this->all_tracked[$key]['id'])) { |
| 59 | 59 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 60 | 60 | $Marine = new Marine($this->db); |
| 61 | - $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 61 | + $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']); |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 70 | 70 | foreach ($this->all_tracked as $key => $flight) { |
| 71 | 71 | if (isset($flight['lastupdate'])) { |
| 72 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 72 | + if ($flight['lastupdate'] < (time() - 3000)) { |
|
| 73 | 73 | if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 74 | 74 | if (isset($this->all_tracked[$key]['id'])) { |
| 75 | 75 | if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | //$real_arrival = $this->arrival($key); |
| 82 | 82 | $Marine = new Marine($this->db); |
| 83 | 83 | if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
| 84 | - $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 84 | + $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']); |
|
| 85 | 85 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 86 | 86 | } |
| 87 | 87 | // Put in archive |
@@ -95,14 +95,14 @@ discard block |
||
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | public function add($line) { |
| 98 | - global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine; |
|
| 98 | + global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS, $APRSMarine; |
|
| 99 | 99 | if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
| 100 | 100 | date_default_timezone_set('UTC'); |
| 101 | 101 | $dataFound = false; |
| 102 | 102 | $send = false; |
| 103 | 103 | |
| 104 | 104 | // SBS format is CSV format |
| 105 | - if(is_array($line) && isset($line['mmsi'])) { |
|
| 105 | + if (is_array($line) && isset($line['mmsi'])) { |
|
| 106 | 106 | //print_r($line); |
| 107 | 107 | if (isset($line['mmsi'])) { |
| 108 | 108 | |
@@ -126,18 +126,18 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | if (!isset($this->all_tracked[$id])) { |
| 128 | 128 | $this->all_tracked[$id] = array(); |
| 129 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0)); |
|
| 130 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => '')); |
|
| 131 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 129 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedMarine' => 0)); |
|
| 130 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'typeid' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => '', 'mmsi' => '', 'status' => '', 'status_id' => '', 'imo' => '', 'callsign' => '', 'arrival_code' => '', 'arrival_date' => '', 'mmsi_type' => '')); |
|
| 131 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time())); |
|
| 132 | 132 | if (!isset($line['id'])) { |
| 133 | 133 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 134 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 135 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 134 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 135 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id'])); |
|
| 136 | 136 | if ($globalAllTracked !== FALSE) $dataFound = true; |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) { |
| 140 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi'])); |
|
| 140 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi' => $line['mmsi'])); |
|
| 141 | 141 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 142 | 142 | $Marine = new Marine($this->db); |
| 143 | 143 | $identity = $Marine->getIdentity($line['mmsi']); |
@@ -151,64 +151,64 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | if (isset($line['type_id'])) { |
| 154 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id']))); |
|
| 154 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $AIS->getShipType($line['type_id']))); |
|
| 155 | 155 | } |
| 156 | 156 | if (isset($line['type']) && $line['type'] != '') { |
| 157 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 157 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type'])); |
|
| 158 | 158 | } |
| 159 | 159 | if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') { |
| 160 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type'])); |
|
| 160 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi_type' => $line['mmsi_type'])); |
|
| 161 | 161 | } |
| 162 | 162 | if (isset($line['imo']) && $line['imo'] != '') { |
| 163 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo'])); |
|
| 163 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('imo' => $line['imo'])); |
|
| 164 | 164 | } |
| 165 | 165 | if (isset($line['callsign']) && $line['callsign'] != '') { |
| 166 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign'])); |
|
| 166 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('callsign' => $line['callsign'])); |
|
| 167 | 167 | } |
| 168 | 168 | if (isset($line['arrival_code']) && $line['arrival_code'] != '') { |
| 169 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code'])); |
|
| 169 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_code' => $line['arrival_code'])); |
|
| 170 | 170 | } |
| 171 | 171 | if (isset($line['arrival_date']) && $line['arrival_date'] != '') { |
| 172 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date'])); |
|
| 172 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_date' => $line['arrival_date'])); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | |
| 176 | 176 | //if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) { |
| 177 | 177 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) { |
| 178 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 178 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident']))); |
|
| 179 | 179 | if ($this->all_tracked[$id]['addedMarine'] == 1) { |
| 180 | 180 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 181 | 181 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 182 | 182 | $timeelapsed = microtime(true); |
| 183 | 183 | $Marine = new Marine($this->db); |
| 184 | 184 | $fromsource = NULL; |
| 185 | - $result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 185 | + $result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource); |
|
| 186 | 186 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 187 | 187 | $Marine->db = null; |
| 188 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 188 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | } |
| 192 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 192 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'])); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 195 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 196 | 196 | if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) { |
| 197 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
|
| 197 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime'])); |
|
| 198 | 198 | } else { |
| 199 | 199 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n"; |
| 200 | 200 | elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 201 | 201 | return ''; |
| 202 | 202 | } |
| 203 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 203 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 204 | 204 | if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
| 205 | 205 | return ''; |
| 206 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 206 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 207 | 207 | if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
| 208 | 208 | return ''; |
| 209 | 209 | } elseif (!isset($line['datetime'])) { |
| 210 | 210 | date_default_timezone_set('UTC'); |
| 211 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 211 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 212 | 212 | } else { |
| 213 | 213 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
| 214 | 214 | return ''; |
@@ -216,24 +216,24 @@ discard block |
||
| 216 | 216 | |
| 217 | 217 | |
| 218 | 218 | if (isset($line['speed'])) { |
| 219 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 220 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 219 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed']))); |
|
| 220 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true)); |
|
| 221 | 221 | } else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 222 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 222 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm'); |
|
| 223 | 223 | if ($distance > 1000 && $distance < 10000) { |
| 224 | 224 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 225 | 225 | $speed = $speed*3.6; |
| 226 | - if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 226 | + if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed))); |
|
| 227 | 227 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 232 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 232 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']); |
|
| 233 | 233 | else unset($timediff); |
| 234 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 234 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')))) { |
|
| 235 | 235 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 236 | - if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 236 | + if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['livedb_latitude'], $this->all_tracked[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) { |
|
| 237 | 237 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 238 | 238 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 239 | 239 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -242,10 +242,10 @@ discard block |
||
| 242 | 242 | $timeelapsed = microtime(true); |
| 243 | 243 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 244 | 244 | $Marine = new Marine($this->db); |
| 245 | - $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 245 | + $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 246 | 246 | if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
| 247 | 247 | $Marine->db = null; |
| 248 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 248 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 249 | 249 | } |
| 250 | 250 | $this->tmd = 0; |
| 251 | 251 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
@@ -254,52 +254,52 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 256 | 256 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 257 | - if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 257 | + if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 258 | 258 | $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
| 259 | 259 | $dataFound = true; |
| 260 | 260 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 261 | 261 | } |
| 262 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
|
| 262 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude'])); |
|
| 263 | 263 | } |
| 264 | 264 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 265 | 265 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 266 | 266 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 267 | - if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 267 | + if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 268 | 268 | $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
| 269 | 269 | $dataFound = true; |
| 270 | 270 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 271 | 271 | } |
| 272 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
|
| 272 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude'])); |
|
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | } else if ($globalDebug && $timediff > 20) { |
| 276 | 276 | $this->tmd = $this->tmd + 1; |
| 277 | 277 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
| 278 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -"; |
|
| 279 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 278 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -"; |
|
| 279 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 280 | 280 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 281 | 281 | } |
| 282 | 282 | } |
| 283 | 283 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 284 | 284 | if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 285 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 285 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update'])); |
|
| 286 | 286 | } |
| 287 | 287 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 288 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 288 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source'])); |
|
| 289 | 289 | } |
| 290 | 290 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 291 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 291 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name'])); |
|
| 292 | 292 | } |
| 293 | 293 | if (isset($line['status']) && $line['status'] != '') { |
| 294 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status'])); |
|
| 294 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('status' => $line['status'])); |
|
| 295 | 295 | } |
| 296 | 296 | if (isset($line['status_id']) && (!isset($this->all_tracked[$id]['status_id']) || $this->all_tracked[$id]['status_id'] != $line['status_id'])) { |
| 297 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id'])); |
|
| 297 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('status_id' => $line['status_id'])); |
|
| 298 | 298 | if ($this->all_tracked[$id]['addedMarine'] == 1) { |
| 299 | 299 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 300 | 300 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 301 | 301 | $Marine = new Marine($this->db); |
| 302 | - $Marine->updateStatusMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['status']); |
|
| 302 | + $Marine->updateStatusMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['status']); |
|
| 303 | 303 | unset($Marine); |
| 304 | 304 | } |
| 305 | 305 | } |
@@ -307,18 +307,18 @@ discard block |
||
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 310 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 310 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true)); |
|
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | if (isset($line['heading']) && $line['heading'] != '') { |
| 314 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 315 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 316 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 314 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 315 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading']))); |
|
| 316 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true)); |
|
| 317 | 317 | //$dataFound = true; |
| 318 | 318 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 319 | - $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 320 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 321 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 319 | + $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 320 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading))); |
|
| 321 | + if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 322 | 322 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
| 323 | 323 | } |
| 324 | 324 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) { |
| 329 | 329 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 330 | 330 | if ($this->all_tracked[$id]['addedMarine'] == 0) { |
| 331 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 331 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 332 | 332 | if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
| 333 | 333 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 334 | 334 | if ($globalDebug) echo "Check if aircraft is already in DB..."; |
@@ -336,37 +336,37 @@ discard block |
||
| 336 | 336 | $MarineLive = new MarineLive($this->db); |
| 337 | 337 | if (isset($line['id'])) { |
| 338 | 338 | $recent_ident = $MarineLive->checkIdRecent($line['id']); |
| 339 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 339 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 340 | 340 | } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') { |
| 341 | 341 | $recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']); |
| 342 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 342 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 343 | 343 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 344 | 344 | $recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 345 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 345 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 346 | 346 | } else $recent_ident = ''; |
| 347 | - $MarineLive->db=null; |
|
| 347 | + $MarineLive->db = null; |
|
| 348 | 348 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 349 | 349 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 350 | 350 | } else $recent_ident = ''; |
| 351 | 351 | } else { |
| 352 | 352 | $recent_ident = ''; |
| 353 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
|
| 353 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0)); |
|
| 354 | 354 | } |
| 355 | 355 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 356 | - if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 356 | + if ($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 357 | 357 | { |
| 358 | 358 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : "; |
| 359 | 359 | //adds the spotter data for the archive |
| 360 | 360 | $highlight = ''; |
| 361 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 361 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 362 | 362 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 363 | 363 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 364 | 364 | $timeelapsed = microtime(true); |
| 365 | 365 | $Marine = new Marine($this->db); |
| 366 | - $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 366 | + $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']); |
|
| 367 | 367 | $Marine->db = null; |
| 368 | 368 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 369 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 369 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 370 | 370 | } |
| 371 | 371 | } |
| 372 | 372 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') { |
@@ -374,15 +374,15 @@ discard block |
||
| 374 | 374 | $Stats = new Stats($this->db); |
| 375 | 375 | if (!empty($this->stats)) { |
| 376 | 376 | if ($globalDebug) echo 'Add source stats : '; |
| 377 | - foreach($this->stats as $date => $data) { |
|
| 378 | - foreach($data as $source => $sourced) { |
|
| 377 | + foreach ($this->stats as $date => $data) { |
|
| 378 | + foreach ($data as $source => $sourced) { |
|
| 379 | 379 | //print_r($sourced); |
| 380 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_marine',$date); |
|
| 381 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_marine',$date); |
|
| 380 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar_marine', $date); |
|
| 381 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist_marine', $date); |
|
| 382 | 382 | if (isset($sourced['msg'])) { |
| 383 | 383 | if (time() - $sourced['msg']['date'] > 10) { |
| 384 | 384 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 385 | - echo $Stats->addStatSource($nbmsg,$source,'msg_marine',$date); |
|
| 385 | + echo $Stats->addStatSource($nbmsg, $source, 'msg_marine', $date); |
|
| 386 | 386 | unset($this->stats[$date][$source]['msg']); |
| 387 | 387 | } |
| 388 | 388 | } |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 407 | 407 | $MarineLive = new MarineLive($this->db); |
| 408 | 408 | $MarineLive->deleteLiveMarineData(); |
| 409 | - $MarineLive->db=null; |
|
| 409 | + $MarineLive->db = null; |
|
| 410 | 410 | if ($globalDebug) echo " Done\n"; |
| 411 | 411 | } |
| 412 | 412 | $this->last_delete = time(); |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 418 | 418 | if (isset($globalDaemon) && !$globalDaemon) { |
| 419 | 419 | $Marine = new Marine($this->db); |
| 420 | - $Marine->updateLatestMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']); |
|
| 420 | + $Marine->updateLatestMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime']); |
|
| 421 | 421 | $Marine->db = null; |
| 422 | 422 | } |
| 423 | 423 | } |
@@ -432,20 +432,20 @@ discard block |
||
| 432 | 432 | $ignoreImport = false; |
| 433 | 433 | |
| 434 | 434 | if (!$ignoreImport) { |
| 435 | - if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 435 | + if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 436 | 436 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 437 | 437 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 438 | 438 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 439 | 439 | $timeelapsed = microtime(true); |
| 440 | 440 | $MarineLive = new MarineLive($this->db); |
| 441 | - $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 441 | + $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']); |
|
| 442 | 442 | $MarineLive->db = null; |
| 443 | 443 | if ($globalDebug) echo $result."\n"; |
| 444 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 444 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 445 | 445 | } |
| 446 | 446 | } |
| 447 | 447 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) { |
| 448 | - $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 448 | + $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']); |
|
| 449 | 449 | } |
| 450 | 450 | $this->all_tracked[$id]['putinarchive'] = false; |
| 451 | 451 | |
@@ -464,19 +464,19 @@ discard block |
||
| 464 | 464 | $latitude = $globalCenterLatitude; |
| 465 | 465 | $longitude = $globalCenterLongitude; |
| 466 | 466 | } |
| 467 | - $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 467 | + $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 468 | 468 | } else { |
| 469 | 469 | $latitude = $this->source_location[$source]['latitude']; |
| 470 | 470 | $longitude = $this->source_location[$source]['longitude']; |
| 471 | 471 | } |
| 472 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 472 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 473 | 473 | //$stats_heading = $stats_heading%22.5; |
| 474 | 474 | $stats_heading = round($stats_heading/22.5); |
| 475 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 475 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 476 | 476 | $current_date = date('Y-m-d'); |
| 477 | 477 | if ($stats_heading == 16) $stats_heading = 0; |
| 478 | 478 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 479 | - for ($i=0;$i<=15;$i++) { |
|
| 479 | + for ($i = 0; $i <= 15; $i++) { |
|
| 480 | 480 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 481 | 481 | } |
| 482 | 482 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -491,9 +491,9 @@ discard block |
||
| 491 | 491 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 492 | 492 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 493 | 493 | end($this->stats[$current_date][$source]['hist']); |
| 494 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 494 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 495 | 495 | } else $mini = 0; |
| 496 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 496 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 497 | 497 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 498 | 498 | } |
| 499 | 499 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -505,7 +505,7 @@ discard block |
||
| 505 | 505 | |
| 506 | 506 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 507 | 507 | if ($this->all_tracked[$id]['putinarchive']) $send = true; |
| 508 | - } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 508 | + } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n"; |
|
| 509 | 509 | //$this->del(); |
| 510 | 510 | |
| 511 | 511 | |
@@ -25,20 +25,20 @@ discard block |
||
| 25 | 25 | fclose($fp); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - public static function gunzip($in_file,$out_file_name = '') { |
|
| 28 | + public static function gunzip($in_file, $out_file_name = '') { |
|
| 29 | 29 | //echo $in_file.' -> '.$out_file_name."\n"; |
| 30 | 30 | $buffer_size = 4096; // read 4kb at a time |
| 31 | 31 | if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); |
| 32 | 32 | if ($in_file != '' && file_exists($in_file)) { |
| 33 | 33 | // PHP version of Ubuntu use gzopen64 instead of gzopen |
| 34 | - if (function_exists('gzopen')) $file = gzopen($in_file,'rb'); |
|
| 35 | - elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb'); |
|
| 34 | + if (function_exists('gzopen')) $file = gzopen($in_file, 'rb'); |
|
| 35 | + elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb'); |
|
| 36 | 36 | else { |
| 37 | 37 | echo 'gzopen not available'; |
| 38 | 38 | die; |
| 39 | 39 | } |
| 40 | 40 | $out_file = fopen($out_file_name, 'wb'); |
| 41 | - while(!gzeof($file)) { |
|
| 41 | + while (!gzeof($file)) { |
|
| 42 | 42 | fwrite($out_file, gzread($file, $buffer_size)); |
| 43 | 43 | } |
| 44 | 44 | fclose($out_file); |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | try { |
| 63 | 63 | self::$db_sqlite = new PDO('sqlite:'.$database); |
| 64 | 64 | self::$db_sqlite->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 65 | - } catch(PDOException $e) { |
|
| 65 | + } catch (PDOException $e) { |
|
| 66 | 66 | return "error : ".$e->getMessage(); |
| 67 | 67 | } |
| 68 | 68 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | //$Connection = new Connection(); |
| 78 | 78 | $sth = $Connection->db->prepare($query); |
| 79 | 79 | $sth->execute(array(':source' => $database_file)); |
| 80 | - } catch(PDOException $e) { |
|
| 80 | + } catch (PDOException $e) { |
|
| 81 | 81 | return "error : ".$e->getMessage(); |
| 82 | 82 | } |
| 83 | 83 | |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | try { |
| 89 | 89 | $sth = update_db::$db_sqlite->prepare($query); |
| 90 | 90 | $sth->execute(); |
| 91 | - } catch(PDOException $e) { |
|
| 91 | + } catch (PDOException $e) { |
|
| 92 | 92 | return "error : ".$e->getMessage(); |
| 93 | 93 | } |
| 94 | 94 | //$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)'; |
@@ -99,11 +99,11 @@ discard block |
||
| 99 | 99 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 100 | 100 | while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 101 | 101 | //$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
| 102 | - $query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
|
| 102 | + $query_dest_values = array(':CallSign' => $values['Callsign'], ':Operator_ICAO' => $values['operator_icao'], ':FromAirport_ICAO' => $values['FromAirportIcao'], ':ToAirport_ICAO' => $values['ToAirportIcao'], ':routestop' => $values['AllStop'], ':source' => $database_file); |
|
| 103 | 103 | $sth_dest->execute($query_dest_values); |
| 104 | 104 | } |
| 105 | 105 | if ($globalTransaction) $Connection->db->commit(); |
| 106 | - } catch(PDOException $e) { |
|
| 106 | + } catch (PDOException $e) { |
|
| 107 | 107 | if ($globalTransaction) $Connection->db->rollBack(); |
| 108 | 108 | return "error : ".$e->getMessage(); |
| 109 | 109 | } |
@@ -119,26 +119,26 @@ discard block |
||
| 119 | 119 | //$Connection = new Connection(); |
| 120 | 120 | $sth = $Connection->db->prepare($query); |
| 121 | 121 | $sth->execute(array(':source' => 'oneworld')); |
| 122 | - } catch(PDOException $e) { |
|
| 122 | + } catch (PDOException $e) { |
|
| 123 | 123 | return "error : ".$e->getMessage(); |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | 126 | if ($globalDebug) echo " - Add routes to DB -"; |
| 127 | 127 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 128 | 128 | $Spotter = new Spotter(); |
| 129 | - if ($fh = fopen($database_file,"r")) { |
|
| 129 | + if ($fh = fopen($database_file, "r")) { |
|
| 130 | 130 | $query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)'; |
| 131 | 131 | $Connection = new Connection(); |
| 132 | 132 | $sth_dest = $Connection->db->prepare($query_dest); |
| 133 | 133 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 134 | 134 | while (!feof($fh)) { |
| 135 | - $line = fgetcsv($fh,9999,','); |
|
| 135 | + $line = fgetcsv($fh, 9999, ','); |
|
| 136 | 136 | if ($line[0] != '') { |
| 137 | 137 | if (($line[2] == '-' || ($line[2] != '-' && (strtotime($line[2]) > time()))) && ($line[3] == '-' || ($line[3] != '-' && (strtotime($line[3]) < time())))) { |
| 138 | 138 | try { |
| 139 | - $query_dest_values = array(':CallSign' => str_replace('*','',$line[7]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[5],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[6],':routestop' => '',':source' => 'oneworld'); |
|
| 139 | + $query_dest_values = array(':CallSign' => str_replace('*', '', $line[7]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[5], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[6], ':routestop' => '', ':source' => 'oneworld'); |
|
| 140 | 140 | $sth_dest->execute($query_dest_values); |
| 141 | - } catch(PDOException $e) { |
|
| 141 | + } catch (PDOException $e) { |
|
| 142 | 142 | if ($globalTransaction) $Connection->db->rollBack(); |
| 143 | 143 | return "error : ".$e->getMessage(); |
| 144 | 144 | } |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | //$Connection = new Connection(); |
| 161 | 161 | $sth = $Connection->db->prepare($query); |
| 162 | 162 | $sth->execute(array(':source' => 'skyteam')); |
| 163 | - } catch(PDOException $e) { |
|
| 163 | + } catch (PDOException $e) { |
|
| 164 | 164 | return "error : ".$e->getMessage(); |
| 165 | 165 | } |
| 166 | 166 | |
@@ -168,24 +168,24 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 170 | 170 | $Spotter = new Spotter(); |
| 171 | - if ($fh = fopen($database_file,"r")) { |
|
| 171 | + if ($fh = fopen($database_file, "r")) { |
|
| 172 | 172 | $query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO,:FromAirport_Time, :ToAirport_ICAO, :ToAirport_Time,:routestop, :source)'; |
| 173 | 173 | $Connection = new Connection(); |
| 174 | 174 | $sth_dest = $Connection->db->prepare($query_dest); |
| 175 | 175 | try { |
| 176 | 176 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 177 | 177 | while (!feof($fh)) { |
| 178 | - $line = fgetcsv($fh,9999,','); |
|
| 178 | + $line = fgetcsv($fh, 9999, ','); |
|
| 179 | 179 | if ($line[0] != '') { |
| 180 | - $datebe = explode(' - ',$line[2]); |
|
| 180 | + $datebe = explode(' - ', $line[2]); |
|
| 181 | 181 | if (strtotime($datebe[0]) > time() && strtotime($datebe[1]) < time()) { |
| 182 | - $query_dest_values = array(':CallSign' => str_replace('*','',$line[6]),':Operator_ICAO' => '',':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]),':FromAirport_Time' => $line[4],':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]),':ToAirport_Time' => $line[5],':routestop' => '',':source' => 'skyteam'); |
|
| 182 | + $query_dest_values = array(':CallSign' => str_replace('*', '', $line[6]), ':Operator_ICAO' => '', ':FromAirport_ICAO' => $Spotter->getAirportICAO($line[0]), ':FromAirport_Time' => $line[4], ':ToAirport_ICAO' => $Spotter->getAirportICAO($line[1]), ':ToAirport_Time' => $line[5], ':routestop' => '', ':source' => 'skyteam'); |
|
| 183 | 183 | $sth_dest->execute($query_dest_values); |
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | if ($globalTransaction) $Connection->db->commit(); |
| 188 | - } catch(PDOException $e) { |
|
| 188 | + } catch (PDOException $e) { |
|
| 189 | 189 | if ($globalTransaction) $Connection->db->rollBack(); |
| 190 | 190 | return "error : ".$e->getMessage(); |
| 191 | 191 | } |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | $Connection = new Connection(); |
| 201 | 201 | $sth = $Connection->db->prepare($query); |
| 202 | 202 | $sth->execute(array(':source' => $database_file)); |
| 203 | - } catch(PDOException $e) { |
|
| 203 | + } catch (PDOException $e) { |
|
| 204 | 204 | return "error : ".$e->getMessage(); |
| 205 | 205 | } |
| 206 | 206 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source"; |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | $Connection = new Connection(); |
| 209 | 209 | $sth = $Connection->db->prepare($query); |
| 210 | 210 | $sth->execute(array(':source' => $database_file)); |
| 211 | - } catch(PDOException $e) { |
|
| 211 | + } catch (PDOException $e) { |
|
| 212 | 212 | return "error : ".$e->getMessage(); |
| 213 | 213 | } |
| 214 | 214 | |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | try { |
| 218 | 218 | $sth = update_db::$db_sqlite->prepare($query); |
| 219 | 219 | $sth->execute(); |
| 220 | - } catch(PDOException $e) { |
|
| 220 | + } catch (PDOException $e) { |
|
| 221 | 221 | return "error : ".$e->getMessage(); |
| 222 | 222 | } |
| 223 | 223 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
@@ -234,15 +234,15 @@ discard block |
||
| 234 | 234 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 235 | 235 | if ($values['UserString4'] == 'M') $type = 'military'; |
| 236 | 236 | else $type = null; |
| 237 | - $query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type); |
|
| 237 | + $query_dest_values = array(':LastModified' => $values['LastModified'], ':ModeS' => $values['ModeS'], ':ModeSCountry' => $values['ModeSCountry'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':type' => $type); |
|
| 238 | 238 | $sth_dest->execute($query_dest_values); |
| 239 | 239 | if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') { |
| 240 | - $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']); |
|
| 240 | + $query_dest_owner_values = array(':registration' => $values['Registration'], ':source' => $database_file, ':owner' => $values['RegisteredOwners']); |
|
| 241 | 241 | $sth_dest_owner->execute($query_dest_owner_values); |
| 242 | 242 | } |
| 243 | 243 | } |
| 244 | 244 | if ($globalTransaction) $Connection->db->commit(); |
| 245 | - } catch(PDOException $e) { |
|
| 245 | + } catch (PDOException $e) { |
|
| 246 | 246 | return "error : ".$e->getMessage(); |
| 247 | 247 | } |
| 248 | 248 | |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | $Connection = new Connection(); |
| 253 | 253 | $sth = $Connection->db->prepare($query); |
| 254 | 254 | $sth->execute(array(':source' => $database_file)); |
| 255 | - } catch(PDOException $e) { |
|
| 255 | + } catch (PDOException $e) { |
|
| 256 | 256 | return "error : ".$e->getMessage(); |
| 257 | 257 | } |
| 258 | 258 | return ''; |
@@ -267,11 +267,11 @@ discard block |
||
| 267 | 267 | $Connection = new Connection(); |
| 268 | 268 | $sth = $Connection->db->prepare($query); |
| 269 | 269 | $sth->execute(array(':source' => $database_file)); |
| 270 | - } catch(PDOException $e) { |
|
| 270 | + } catch (PDOException $e) { |
|
| 271 | 271 | return "error : ".$e->getMessage(); |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | - if ($fh = fopen($database_file,"r")) { |
|
| 274 | + if ($fh = fopen($database_file, "r")) { |
|
| 275 | 275 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 276 | 276 | $query_dest = 'INSERT INTO aircraft_modes (ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)'; |
| 277 | 277 | |
@@ -281,13 +281,13 @@ discard block |
||
| 281 | 281 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 282 | 282 | while (!feof($fh)) { |
| 283 | 283 | $values = array(); |
| 284 | - $line = $Common->hex2str(fgets($fh,9999)); |
|
| 284 | + $line = $Common->hex2str(fgets($fh, 9999)); |
|
| 285 | 285 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 286 | - $values['ModeS'] = substr($line,0,6); |
|
| 287 | - $values['Registration'] = trim(substr($line,69,6)); |
|
| 288 | - $aircraft_name = trim(substr($line,48,6)); |
|
| 286 | + $values['ModeS'] = substr($line, 0, 6); |
|
| 287 | + $values['Registration'] = trim(substr($line, 69, 6)); |
|
| 288 | + $aircraft_name = trim(substr($line, 48, 6)); |
|
| 289 | 289 | // Check if we can find ICAO, else set it to GLID |
| 290 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 290 | + $aircraft_name_split = explode(' ', $aircraft_name); |
|
| 291 | 291 | $search_more = ''; |
| 292 | 292 | if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
| 293 | 293 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
@@ -299,20 +299,20 @@ discard block |
||
| 299 | 299 | if (isset($result['icao']) && $result['icao'] != '') { |
| 300 | 300 | $values['ICAOTypeCode'] = $result['icao']; |
| 301 | 301 | } |
| 302 | - } catch(PDOException $e) { |
|
| 302 | + } catch (PDOException $e) { |
|
| 303 | 303 | return "error : ".$e->getMessage(); |
| 304 | 304 | } |
| 305 | 305 | if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
| 306 | 306 | // Add data to db |
| 307 | 307 | if ($values['Registration'] != '' && $values['Registration'] != '0000') { |
| 308 | 308 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 309 | - $query_dest_values = array(':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm'); |
|
| 309 | + $query_dest_values = array(':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm'); |
|
| 310 | 310 | //print_r($query_dest_values); |
| 311 | 311 | $sth_dest->execute($query_dest_values); |
| 312 | 312 | } |
| 313 | 313 | } |
| 314 | 314 | if ($globalTransaction) $Connection->db->commit(); |
| 315 | - } catch(PDOException $e) { |
|
| 315 | + } catch (PDOException $e) { |
|
| 316 | 316 | return "error : ".$e->getMessage(); |
| 317 | 317 | } |
| 318 | 318 | } |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | $Connection = new Connection(); |
| 323 | 323 | $sth = $Connection->db->prepare($query); |
| 324 | 324 | $sth->execute(array(':source' => $database_file)); |
| 325 | - } catch(PDOException $e) { |
|
| 325 | + } catch (PDOException $e) { |
|
| 326 | 326 | return "error : ".$e->getMessage(); |
| 327 | 327 | } |
| 328 | 328 | return ''; |
@@ -336,11 +336,11 @@ discard block |
||
| 336 | 336 | $Connection = new Connection(); |
| 337 | 337 | $sth = $Connection->db->prepare($query); |
| 338 | 338 | $sth->execute(array(':source' => $database_file)); |
| 339 | - } catch(PDOException $e) { |
|
| 339 | + } catch (PDOException $e) { |
|
| 340 | 340 | return "error : ".$e->getMessage(); |
| 341 | 341 | } |
| 342 | 342 | |
| 343 | - if ($fh = fopen($database_file,"r")) { |
|
| 343 | + if ($fh = fopen($database_file, "r")) { |
|
| 344 | 344 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 345 | 345 | $query_dest = 'INSERT INTO aircraft_modes (LastModified,ModeS,Registration,ICAOTypeCode,Source,source_type) VALUES (:lastmodified,:ModeS,:Registration,:ICAOTypeCode,:source,:source_type)'; |
| 346 | 346 | |
@@ -348,9 +348,9 @@ discard block |
||
| 348 | 348 | $sth_dest = $Connection->db->prepare($query_dest); |
| 349 | 349 | try { |
| 350 | 350 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 351 | - $tmp = fgetcsv($fh,9999,',',"'"); |
|
| 351 | + $tmp = fgetcsv($fh, 9999, ',', "'"); |
|
| 352 | 352 | while (!feof($fh)) { |
| 353 | - $line = fgetcsv($fh,9999,',',"'"); |
|
| 353 | + $line = fgetcsv($fh, 9999, ',', "'"); |
|
| 354 | 354 | |
| 355 | 355 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 356 | 356 | //print_r($line); |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | $values['Registration'] = $line[3]; |
| 359 | 359 | $aircraft_name = $line[2]; |
| 360 | 360 | // Check if we can find ICAO, else set it to GLID |
| 361 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 361 | + $aircraft_name_split = explode(' ', $aircraft_name); |
|
| 362 | 362 | $search_more = ''; |
| 363 | 363 | if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
| 364 | 364 | $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
@@ -367,20 +367,20 @@ discard block |
||
| 367 | 367 | $sth_search->execute(); |
| 368 | 368 | $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
| 369 | 369 | if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
| 370 | - } catch(PDOException $e) { |
|
| 370 | + } catch (PDOException $e) { |
|
| 371 | 371 | return "error : ".$e->getMessage(); |
| 372 | 372 | } |
| 373 | 373 | //if (!isset($values['ICAOTypeCode'])) $values['ICAOTypeCode'] = 'GLID'; |
| 374 | 374 | // Add data to db |
| 375 | 375 | if ($values['Registration'] != '' && $values['Registration'] != '0000' && $values['ICAOTypeCode'] != '') { |
| 376 | 376 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 377 | - $query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'),':ModeS' => $values['ModeS'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':source_type' => 'flarm'); |
|
| 377 | + $query_dest_values = array(':lastmodified' => date('Y-m-d H:m:s'), ':ModeS' => $values['ModeS'], ':Registration' => $values['Registration'], ':ICAOTypeCode' => $values['ICAOTypeCode'], ':source' => $database_file, ':source_type' => 'flarm'); |
|
| 378 | 378 | //print_r($query_dest_values); |
| 379 | 379 | $sth_dest->execute($query_dest_values); |
| 380 | 380 | } |
| 381 | 381 | } |
| 382 | 382 | if ($globalTransaction) $Connection->db->commit(); |
| 383 | - } catch(PDOException $e) { |
|
| 383 | + } catch (PDOException $e) { |
|
| 384 | 384 | return "error : ".$e->getMessage(); |
| 385 | 385 | } |
| 386 | 386 | } |
@@ -390,13 +390,13 @@ discard block |
||
| 390 | 390 | $Connection = new Connection(); |
| 391 | 391 | $sth = $Connection->db->prepare($query); |
| 392 | 392 | $sth->execute(array(':source' => $database_file)); |
| 393 | - } catch(PDOException $e) { |
|
| 393 | + } catch (PDOException $e) { |
|
| 394 | 394 | return "error : ".$e->getMessage(); |
| 395 | 395 | } |
| 396 | 396 | return ''; |
| 397 | 397 | } |
| 398 | 398 | |
| 399 | - public static function retrieve_owner($database_file,$country = 'F') { |
|
| 399 | + public static function retrieve_owner($database_file, $country = 'F') { |
|
| 400 | 400 | global $globalTransaction, $globalMasterSource; |
| 401 | 401 | //$query = 'TRUNCATE TABLE aircraft_modes'; |
| 402 | 402 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source; DELETE FROM aircraft_modes WHERE Source = :source;"; |
@@ -404,12 +404,12 @@ discard block |
||
| 404 | 404 | $Connection = new Connection(); |
| 405 | 405 | $sth = $Connection->db->prepare($query); |
| 406 | 406 | $sth->execute(array(':source' => $database_file)); |
| 407 | - } catch(PDOException $e) { |
|
| 407 | + } catch (PDOException $e) { |
|
| 408 | 408 | return "error : ".$e->getMessage(); |
| 409 | 409 | } |
| 410 | 410 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 411 | 411 | $Spotter = new Spotter(); |
| 412 | - if ($fh = fopen($database_file,"r")) { |
|
| 412 | + if ($fh = fopen($database_file, "r")) { |
|
| 413 | 413 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 414 | 414 | $query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 415 | 415 | $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)'; |
@@ -419,9 +419,9 @@ discard block |
||
| 419 | 419 | $sth_modes = $Connection->db->prepare($query_modes); |
| 420 | 420 | try { |
| 421 | 421 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 422 | - $tmp = fgetcsv($fh,9999,',','"'); |
|
| 422 | + $tmp = fgetcsv($fh, 9999, ',', '"'); |
|
| 423 | 423 | while (!feof($fh)) { |
| 424 | - $line = fgetcsv($fh,9999,',','"'); |
|
| 424 | + $line = fgetcsv($fh, 9999, ',', '"'); |
|
| 425 | 425 | $values = array(); |
| 426 | 426 | //print_r($line); |
| 427 | 427 | if ($country == 'F') { |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | $values['base'] = $line[4]; |
| 430 | 430 | $values['owner'] = $line[5]; |
| 431 | 431 | if ($line[6] == '') $values['date_first_reg'] = null; |
| 432 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 432 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6])); |
|
| 433 | 433 | $values['cancel'] = $line[7]; |
| 434 | 434 | } elseif ($country == 'EI') { |
| 435 | 435 | // TODO : add modeS & reg to aircraft_modes |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | $values['base'] = $line[3]; |
| 438 | 438 | $values['owner'] = $line[2]; |
| 439 | 439 | if ($line[1] == '') $values['date_first_reg'] = null; |
| 440 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 440 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[1])); |
|
| 441 | 441 | $values['cancel'] = ''; |
| 442 | 442 | $values['modes'] = $line[7]; |
| 443 | 443 | $values['icao'] = $line[8]; |
@@ -457,7 +457,7 @@ discard block |
||
| 457 | 457 | $values['base'] = null; |
| 458 | 458 | $values['owner'] = $line[5]; |
| 459 | 459 | if ($line[18] == '') $values['date_first_reg'] = null; |
| 460 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 460 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[18])); |
|
| 461 | 461 | $values['cancel'] = ''; |
| 462 | 462 | } elseif ($country == 'VH') { |
| 463 | 463 | // TODO : add modeS & reg to aircraft_modes |
@@ -465,7 +465,7 @@ discard block |
||
| 465 | 465 | $values['base'] = null; |
| 466 | 466 | $values['owner'] = $line[12]; |
| 467 | 467 | if ($line[28] == '') $values['date_first_reg'] = null; |
| 468 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 468 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[28])); |
|
| 469 | 469 | |
| 470 | 470 | $values['cancel'] = $line[39]; |
| 471 | 471 | } elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') { |
@@ -485,28 +485,28 @@ discard block |
||
| 485 | 485 | $values['base'] = null; |
| 486 | 486 | $values['owner'] = $line[8]; |
| 487 | 487 | if ($line[7] == '') $values['date_first_reg'] = null; |
| 488 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 488 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7])); |
|
| 489 | 489 | $values['cancel'] = ''; |
| 490 | 490 | } elseif ($country == 'PP') { |
| 491 | 491 | $values['registration'] = $line[0]; |
| 492 | 492 | $values['base'] = null; |
| 493 | 493 | $values['owner'] = $line[4]; |
| 494 | 494 | if ($line[6] == '') $values['date_first_reg'] = null; |
| 495 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 495 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[6])); |
|
| 496 | 496 | $values['cancel'] = $line[7]; |
| 497 | 497 | } elseif ($country == 'E7') { |
| 498 | 498 | $values['registration'] = $line[0]; |
| 499 | 499 | $values['base'] = null; |
| 500 | 500 | $values['owner'] = $line[4]; |
| 501 | 501 | if ($line[5] == '') $values['date_first_reg'] = null; |
| 502 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 502 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[5])); |
|
| 503 | 503 | $values['cancel'] = ''; |
| 504 | 504 | } elseif ($country == '8Q') { |
| 505 | 505 | $values['registration'] = $line[0]; |
| 506 | 506 | $values['base'] = null; |
| 507 | 507 | $values['owner'] = $line[3]; |
| 508 | 508 | if ($line[7] == '') $values['date_first_reg'] = null; |
| 509 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 509 | + else $values['date_first_reg'] = date("Y-m-d", strtotime($line[7])); |
|
| 510 | 510 | $values['cancel'] = ''; |
| 511 | 511 | } elseif ($country == 'ZK') { |
| 512 | 512 | $values['registration'] = $line[0]; |
@@ -520,18 +520,18 @@ discard block |
||
| 520 | 520 | $values['registration'] = $line[0]; |
| 521 | 521 | $values['base'] = null; |
| 522 | 522 | $values['owner'] = $line[6]; |
| 523 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 524 | - $values['cancel'] = date("Y-m-d",strtotime($line[8])); |
|
| 523 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[5])); |
|
| 524 | + $values['cancel'] = date("Y-m-d", strtotime($line[8])); |
|
| 525 | 525 | $values['modes'] = $line[4]; |
| 526 | 526 | $values['icao'] = $line[10]; |
| 527 | 527 | } elseif ($country == 'OY') { |
| 528 | 528 | $values['registration'] = $line[0]; |
| 529 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[4])); |
|
| 529 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[4])); |
|
| 530 | 530 | $values['modes'] = $line[5]; |
| 531 | 531 | $values['icao'] = $line[6]; |
| 532 | 532 | } elseif ($country == 'PH') { |
| 533 | 533 | $values['registration'] = $line[0]; |
| 534 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[3])); |
|
| 534 | + $values['date_first_reg'] = date("Y-m-d", strtotime($line[3])); |
|
| 535 | 535 | $values['modes'] = $line[4]; |
| 536 | 536 | $values['icao'] = $line[5]; |
| 537 | 537 | } elseif ($country == 'OM' || $country == 'TF') { |
@@ -542,17 +542,17 @@ discard block |
||
| 542 | 542 | $values['cancel'] = ''; |
| 543 | 543 | } |
| 544 | 544 | if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) { |
| 545 | - $query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file); |
|
| 545 | + $query_dest_values = array(':registration' => $values['registration'], ':base' => $values['base'], ':date_first_reg' => $values['date_first_reg'], ':owner' => $values['owner'], ':source' => $database_file); |
|
| 546 | 546 | $sth_dest->execute($query_dest_values); |
| 547 | 547 | } |
| 548 | 548 | if ($globalMasterSource && $values['registration'] != null && isset($values['modes']) && $values['modes'] != '') { |
| 549 | 549 | $modescountry = $Spotter->countryFromAircraftRegistration($values['registration']); |
| 550 | - $query_modes_values = array(':registration' => $values['registration'],':modes' => $values['modes'],':modescountry' => $modescountry,':icaotypecode' => $values['icao'],':source' => $database_file); |
|
| 550 | + $query_modes_values = array(':registration' => $values['registration'], ':modes' => $values['modes'], ':modescountry' => $modescountry, ':icaotypecode' => $values['icao'], ':source' => $database_file); |
|
| 551 | 551 | $sth_modes->execute($query_modes_values); |
| 552 | 552 | } |
| 553 | 553 | } |
| 554 | 554 | if ($globalTransaction) $Connection->db->commit(); |
| 555 | - } catch(PDOException $e) { |
|
| 555 | + } catch (PDOException $e) { |
|
| 556 | 556 | return "error : ".$e->getMessage(); |
| 557 | 557 | } |
| 558 | 558 | } |
@@ -667,7 +667,7 @@ discard block |
||
| 667 | 667 | $Connection = new Connection(); |
| 668 | 668 | $sth = $Connection->db->prepare($query); |
| 669 | 669 | $sth->execute(); |
| 670 | - } catch(PDOException $e) { |
|
| 670 | + } catch (PDOException $e) { |
|
| 671 | 671 | return "error : ".$e->getMessage(); |
| 672 | 672 | } |
| 673 | 673 | |
@@ -677,7 +677,7 @@ discard block |
||
| 677 | 677 | $Connection = new Connection(); |
| 678 | 678 | $sth = $Connection->db->prepare($query); |
| 679 | 679 | $sth->execute(); |
| 680 | - } catch(PDOException $e) { |
|
| 680 | + } catch (PDOException $e) { |
|
| 681 | 681 | return "error : ".$e->getMessage(); |
| 682 | 682 | } |
| 683 | 683 | |
@@ -688,7 +688,7 @@ discard block |
||
| 688 | 688 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 689 | 689 | |
| 690 | 690 | $i = 0; |
| 691 | - while($row = sparql_fetch_array($result)) |
|
| 691 | + while ($row = sparql_fetch_array($result)) |
|
| 692 | 692 | { |
| 693 | 693 | if ($i >= 1) { |
| 694 | 694 | //print_r($row); |
@@ -708,31 +708,31 @@ discard block |
||
| 708 | 708 | $row['image'] = ''; |
| 709 | 709 | $row['image_thumb'] = ''; |
| 710 | 710 | } else { |
| 711 | - $image = str_replace(' ','_',$row['image']); |
|
| 711 | + $image = str_replace(' ', '_', $row['image']); |
|
| 712 | 712 | $digest = md5($image); |
| 713 | - $folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image . '/220px-' . $image; |
|
| 714 | - $row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/' . $folder; |
|
| 715 | - $folder = $digest[0] . '/' . $digest[0] . $digest[1] . '/' . $image; |
|
| 716 | - $row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/' . $folder; |
|
| 713 | + $folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image.'/220px-'.$image; |
|
| 714 | + $row['image_thumb'] = 'http://upload.wikimedia.org/wikipedia/commons/thumb/'.$folder; |
|
| 715 | + $folder = $digest[0].'/'.$digest[0].$digest[1].'/'.$image; |
|
| 716 | + $row['image'] = 'http://upload.wikimedia.org/wikipedia/commons/'.$folder; |
|
| 717 | 717 | } |
| 718 | 718 | |
| 719 | - $country = explode('-',$row['country']); |
|
| 719 | + $country = explode('-', $row['country']); |
|
| 720 | 720 | $row['country'] = $country[0]; |
| 721 | 721 | |
| 722 | 722 | $row['type'] = trim($row['type']); |
| 723 | - if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i',$row['name'])) { |
|
| 723 | + if ($row['type'] == 'Military: Naval Auxiliary Air Station' || $row['type'] == 'http://dbpedia.org/resource/Naval_air_station' || $row['type'] == 'Military: Naval Air Station' || $row['type'] == 'Military Northern Fleet' || $row['type'] == 'Military and industrial' || $row['type'] == 'Military: Royal Air Force station' || $row['type'] == 'http://dbpedia.org/resource/Military_airbase' || $row['type'] == 'Military: Naval air station' || preg_match('/air base/i', $row['name'])) { |
|
| 724 | 724 | $row['type'] = 'Military'; |
| 725 | 725 | } elseif ($row['type'] == 'http://dbpedia.org/resource/Airport' || $row['type'] == 'Civil' || $row['type'] == 'Public use' || $row['type'] == 'Public' || $row['type'] == 'http://dbpedia.org/resource/Civilian' || $row['type'] == 'Public, Civilian' || $row['type'] == 'Public / Military' || $row['type'] == 'Private & Civilian' || $row['type'] == 'Civilian and Military' || $row['type'] == 'Public/military' || $row['type'] == 'Active With Few Facilities' || $row['type'] == '?ivilian' || $row['type'] == 'Civil/Military' || $row['type'] == 'NA' || $row['type'] == 'Public/Military') { |
| 726 | 726 | $row['type'] = 'small_airport'; |
| 727 | 727 | } |
| 728 | 728 | |
| 729 | - $row['city'] = urldecode(str_replace('_',' ',str_replace('http://dbpedia.org/resource/','',$row['city']))); |
|
| 730 | - $query_dest_values = array(':airport_id' => $i, ':name' => $row['name'],':iata' => $row['iata'],':icao' => $row['icao'],':latitude' => $row['latitude'],':longitude' => $row['longitude'],':altitude' => $row['altitude'],':type' => $row['type'],':city' => $row['city'],':country' => $row['country'],':home_link' => $row['homepage'],':wikipedia_link' => $row['wikipedia_page'],':image' => $row['image'],':image_thumb' => $row['image_thumb']); |
|
| 729 | + $row['city'] = urldecode(str_replace('_', ' ', str_replace('http://dbpedia.org/resource/', '', $row['city']))); |
|
| 730 | + $query_dest_values = array(':airport_id' => $i, ':name' => $row['name'], ':iata' => $row['iata'], ':icao' => $row['icao'], ':latitude' => $row['latitude'], ':longitude' => $row['longitude'], ':altitude' => $row['altitude'], ':type' => $row['type'], ':city' => $row['city'], ':country' => $row['country'], ':home_link' => $row['homepage'], ':wikipedia_link' => $row['wikipedia_page'], ':image' => $row['image'], ':image_thumb' => $row['image_thumb']); |
|
| 731 | 731 | //print_r($query_dest_values); |
| 732 | 732 | |
| 733 | 733 | try { |
| 734 | 734 | $sth_dest->execute($query_dest_values); |
| 735 | - } catch(PDOException $e) { |
|
| 735 | + } catch (PDOException $e) { |
|
| 736 | 736 | return "error : ".$e->getMessage(); |
| 737 | 737 | } |
| 738 | 738 | } |
@@ -746,7 +746,7 @@ discard block |
||
| 746 | 746 | $Connection = new Connection(); |
| 747 | 747 | $sth = $Connection->db->prepare($query); |
| 748 | 748 | $sth->execute(); |
| 749 | - } catch(PDOException $e) { |
|
| 749 | + } catch (PDOException $e) { |
|
| 750 | 750 | return "error : ".$e->getMessage(); |
| 751 | 751 | } |
| 752 | 752 | |
@@ -754,12 +754,12 @@ discard block |
||
| 754 | 754 | if ($globalDebug) echo "Insert Not available Airport...\n"; |
| 755 | 755 | $query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`,`image`,`image_thumb`) |
| 756 | 756 | VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link, :image, :image_thumb)"; |
| 757 | - $query_values = array(':airport_id' => $i, ':name' => 'Not available',':iata' => 'NA',':icao' => 'NA',':latitude' => '0',':longitude' => '0',':altitude' => '0',':type' => 'NA',':city' => 'N/A',':country' => 'N/A',':home_link' => '',':wikipedia_link' => '',':image' => '',':image_thumb' => ''); |
|
| 757 | + $query_values = array(':airport_id' => $i, ':name' => 'Not available', ':iata' => 'NA', ':icao' => 'NA', ':latitude' => '0', ':longitude' => '0', ':altitude' => '0', ':type' => 'NA', ':city' => 'N/A', ':country' => 'N/A', ':home_link' => '', ':wikipedia_link' => '', ':image' => '', ':image_thumb' => ''); |
|
| 758 | 758 | try { |
| 759 | 759 | $Connection = new Connection(); |
| 760 | 760 | $sth = $Connection->db->prepare($query); |
| 761 | 761 | $sth->execute($query_values); |
| 762 | - } catch(PDOException $e) { |
|
| 762 | + } catch (PDOException $e) { |
|
| 763 | 763 | return "error : ".$e->getMessage(); |
| 764 | 764 | } |
| 765 | 765 | $i++; |
@@ -777,7 +777,7 @@ discard block |
||
| 777 | 777 | echo "Download data from ourairports.com...\n"; |
| 778 | 778 | $delimiter = ','; |
| 779 | 779 | $out_file = $tmp_dir.'airports.csv'; |
| 780 | - update_db::download('http://ourairports.com/data/airports.csv',$out_file); |
|
| 780 | + update_db::download('http://ourairports.com/data/airports.csv', $out_file); |
|
| 781 | 781 | if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
| 782 | 782 | echo "Add data from ourairports.com...\n"; |
| 783 | 783 | |
@@ -788,32 +788,32 @@ discard block |
||
| 788 | 788 | //$Connection->db->beginTransaction(); |
| 789 | 789 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 790 | 790 | { |
| 791 | - if(!$header) $header = $row; |
|
| 791 | + if (!$header) $header = $row; |
|
| 792 | 792 | else { |
| 793 | 793 | $data = array(); |
| 794 | 794 | $data = array_combine($header, $row); |
| 795 | 795 | try { |
| 796 | 796 | $sth = $Connection->db->prepare('SELECT COUNT(*) FROM airport WHERE `icao` = :icao'); |
| 797 | 797 | $sth->execute(array(':icao' => $data['gps_code'])); |
| 798 | - } catch(PDOException $e) { |
|
| 798 | + } catch (PDOException $e) { |
|
| 799 | 799 | return "error : ".$e->getMessage(); |
| 800 | 800 | } |
| 801 | 801 | if ($sth->fetchColumn() > 0) { |
| 802 | 802 | $query = 'UPDATE airport SET `type` = :type WHERE icao = :icao'; |
| 803 | 803 | try { |
| 804 | 804 | $sth = $Connection->db->prepare($query); |
| 805 | - $sth->execute(array(':icao' => $data['gps_code'],':type' => $data['type'])); |
|
| 806 | - } catch(PDOException $e) { |
|
| 805 | + $sth->execute(array(':icao' => $data['gps_code'], ':type' => $data['type'])); |
|
| 806 | + } catch (PDOException $e) { |
|
| 807 | 807 | return "error : ".$e->getMessage(); |
| 808 | 808 | } |
| 809 | 809 | } else { |
| 810 | 810 | $query = "INSERT INTO airport (`airport_id`,`name`,`city`,`country`,`iata`,`icao`,`latitude`,`longitude`,`altitude`,`type`,`home_link`,`wikipedia_link`) |
| 811 | 811 | VALUES (:airport_id, :name, :city, :country, :iata, :icao, :latitude, :longitude, :altitude, :type, :home_link, :wikipedia_link)"; |
| 812 | - $query_values = array(':airport_id' => $i, ':name' => $data['name'],':iata' => $data['iata_code'],':icao' => $data['gps_code'],':latitude' => $data['latitude_deg'],':longitude' => $data['longitude_deg'],':altitude' => $data['elevation_ft'],':type' => $data['type'],':city' => $data['municipality'],':country' => $data['iso_country'],':home_link' => $data['home_link'],':wikipedia_link' => $data['wikipedia_link']); |
|
| 812 | + $query_values = array(':airport_id' => $i, ':name' => $data['name'], ':iata' => $data['iata_code'], ':icao' => $data['gps_code'], ':latitude' => $data['latitude_deg'], ':longitude' => $data['longitude_deg'], ':altitude' => $data['elevation_ft'], ':type' => $data['type'], ':city' => $data['municipality'], ':country' => $data['iso_country'], ':home_link' => $data['home_link'], ':wikipedia_link' => $data['wikipedia_link']); |
|
| 813 | 813 | try { |
| 814 | 814 | $sth = $Connection->db->prepare($query); |
| 815 | 815 | $sth->execute($query_values); |
| 816 | - } catch(PDOException $e) { |
|
| 816 | + } catch (PDOException $e) { |
|
| 817 | 817 | return "error : ".$e->getMessage(); |
| 818 | 818 | } |
| 819 | 819 | $i++; |
@@ -826,7 +826,7 @@ discard block |
||
| 826 | 826 | |
| 827 | 827 | echo "Download data from another free database...\n"; |
| 828 | 828 | $out_file = $tmp_dir.'GlobalAirportDatabase.zip'; |
| 829 | - update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip',$out_file); |
|
| 829 | + update_db::download('http://www.partow.net/downloads/GlobalAirportDatabase.zip', $out_file); |
|
| 830 | 830 | if (!file_exists($out_file) || !is_readable($out_file)) return FALSE; |
| 831 | 831 | update_db::unzip($out_file); |
| 832 | 832 | $header = NULL; |
@@ -838,15 +838,15 @@ discard block |
||
| 838 | 838 | //$Connection->db->beginTransaction(); |
| 839 | 839 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 840 | 840 | { |
| 841 | - if(!$header) $header = $row; |
|
| 841 | + if (!$header) $header = $row; |
|
| 842 | 842 | else { |
| 843 | 843 | $data = $row; |
| 844 | 844 | |
| 845 | 845 | $query = 'UPDATE airport SET `city` = :city, `country` = :country WHERE icao = :icao'; |
| 846 | 846 | try { |
| 847 | 847 | $sth = $Connection->db->prepare($query); |
| 848 | - $sth->execute(array(':icao' => $data[0],':city' => ucwords(strtolower($data[3])),':country' => ucwords(strtolower($data[4])))); |
|
| 849 | - } catch(PDOException $e) { |
|
| 848 | + $sth->execute(array(':icao' => $data[0], ':city' => ucwords(strtolower($data[3])), ':country' => ucwords(strtolower($data[4])))); |
|
| 849 | + } catch (PDOException $e) { |
|
| 850 | 850 | return "error : ".$e->getMessage(); |
| 851 | 851 | } |
| 852 | 852 | } |
@@ -860,15 +860,15 @@ discard block |
||
| 860 | 860 | try { |
| 861 | 861 | $sth = $Connection->db->prepare("SELECT icao FROM airport WHERE `name` LIKE '%Air Base%'"); |
| 862 | 862 | $sth->execute(); |
| 863 | - } catch(PDOException $e) { |
|
| 863 | + } catch (PDOException $e) { |
|
| 864 | 864 | return "error : ".$e->getMessage(); |
| 865 | 865 | } |
| 866 | 866 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 867 | 867 | $query2 = 'UPDATE airport SET `type` = :type WHERE icao = :icao'; |
| 868 | 868 | try { |
| 869 | 869 | $sth2 = $Connection->db->prepare($query2); |
| 870 | - $sth2->execute(array(':icao' => $row['icao'],':type' => 'military')); |
|
| 871 | - } catch(PDOException $e) { |
|
| 870 | + $sth2->execute(array(':icao' => $row['icao'], ':type' => 'military')); |
|
| 871 | + } catch (PDOException $e) { |
|
| 872 | 872 | return "error : ".$e->getMessage(); |
| 873 | 873 | } |
| 874 | 874 | } |
@@ -892,7 +892,7 @@ discard block |
||
| 892 | 892 | $Connection = new Connection(); |
| 893 | 893 | $sth = $Connection->db->prepare($query); |
| 894 | 894 | $sth->execute(array(':source' => 'translation.csv')); |
| 895 | - } catch(PDOException $e) { |
|
| 895 | + } catch (PDOException $e) { |
|
| 896 | 896 | return "error : ".$e->getMessage(); |
| 897 | 897 | } |
| 898 | 898 | |
@@ -909,7 +909,7 @@ discard block |
||
| 909 | 909 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 910 | 910 | { |
| 911 | 911 | $i++; |
| 912 | - if($i > 12) { |
|
| 912 | + if ($i > 12) { |
|
| 913 | 913 | $data = $row; |
| 914 | 914 | $operator = $data[2]; |
| 915 | 915 | if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) { |
@@ -917,7 +917,7 @@ discard block |
||
| 917 | 917 | //echo substr($operator, 0, 2)."\n";; |
| 918 | 918 | if (count($airline_array) > 0) { |
| 919 | 919 | //print_r($airline_array); |
| 920 | - $operator = $airline_array[0]['icao'].substr($operator,2); |
|
| 920 | + $operator = $airline_array[0]['icao'].substr($operator, 2); |
|
| 921 | 921 | } |
| 922 | 922 | } |
| 923 | 923 | |
@@ -925,14 +925,14 @@ discard block |
||
| 925 | 925 | if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) { |
| 926 | 926 | $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2)); |
| 927 | 927 | if (count($airline_array) > 0) { |
| 928 | - $operator_correct = $airline_array[0]['icao'].substr($operator_correct,2); |
|
| 928 | + $operator_correct = $airline_array[0]['icao'].substr($operator_correct, 2); |
|
| 929 | 929 | } |
| 930 | 930 | } |
| 931 | 931 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
| 932 | 932 | try { |
| 933 | 933 | $sth = $Connection->db->prepare($query); |
| 934 | - $sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $operator,':Operator_correct' => $operator_correct, ':source' => 'translation.csv')); |
|
| 935 | - } catch(PDOException $e) { |
|
| 934 | + $sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $operator, ':Operator_correct' => $operator_correct, ':source' => 'translation.csv')); |
|
| 935 | + } catch (PDOException $e) { |
|
| 936 | 936 | return "error : ".$e->getMessage(); |
| 937 | 937 | } |
| 938 | 938 | } |
@@ -952,7 +952,7 @@ discard block |
||
| 952 | 952 | $Connection = new Connection(); |
| 953 | 953 | $sth = $Connection->db->prepare($query); |
| 954 | 954 | $sth->execute(array(':source' => 'website_fam')); |
| 955 | - } catch(PDOException $e) { |
|
| 955 | + } catch (PDOException $e) { |
|
| 956 | 956 | return "error : ".$e->getMessage(); |
| 957 | 957 | } |
| 958 | 958 | |
@@ -972,8 +972,8 @@ discard block |
||
| 972 | 972 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
| 973 | 973 | try { |
| 974 | 974 | $sth = $Connection->db->prepare($query); |
| 975 | - $sth->execute(array(':Reg' => $data[0],':Reg_correct' => $data[1],':Operator' => $data[2],':Operator_correct' => $data[3], ':source' => 'website_fam')); |
|
| 976 | - } catch(PDOException $e) { |
|
| 975 | + $sth->execute(array(':Reg' => $data[0], ':Reg_correct' => $data[1], ':Operator' => $data[2], ':Operator_correct' => $data[3], ':source' => 'website_fam')); |
|
| 976 | + } catch (PDOException $e) { |
|
| 977 | 977 | return "error : ".$e->getMessage(); |
| 978 | 978 | } |
| 979 | 979 | } |
@@ -996,7 +996,7 @@ discard block |
||
| 996 | 996 | $Connection = new Connection(); |
| 997 | 997 | $sth = $Connection->db->prepare($query); |
| 998 | 998 | $sth->execute(array(':source' => 'website_faa')); |
| 999 | - } catch(PDOException $e) { |
|
| 999 | + } catch (PDOException $e) { |
|
| 1000 | 1000 | return "error : ".$e->getMessage(); |
| 1001 | 1001 | } |
| 1002 | 1002 | |
@@ -1005,7 +1005,7 @@ discard block |
||
| 1005 | 1005 | $Connection = new Connection(); |
| 1006 | 1006 | $sth = $Connection->db->prepare($query); |
| 1007 | 1007 | $sth->execute(array(':source' => 'website_faa')); |
| 1008 | - } catch(PDOException $e) { |
|
| 1008 | + } catch (PDOException $e) { |
|
| 1009 | 1009 | return "error : ".$e->getMessage(); |
| 1010 | 1010 | } |
| 1011 | 1011 | |
@@ -1022,8 +1022,8 @@ discard block |
||
| 1022 | 1022 | $query_search = 'SELECT icaotypecode FROM aircraft_modes WHERE registration = :registration AND Source <> :source LIMIT 1'; |
| 1023 | 1023 | try { |
| 1024 | 1024 | $sths = $Connection->db->prepare($query_search); |
| 1025 | - $sths->execute(array(':registration' => 'N'.$data[0],':source' => 'website_faa')); |
|
| 1026 | - } catch(PDOException $e) { |
|
| 1025 | + $sths->execute(array(':registration' => 'N'.$data[0], ':source' => 'website_faa')); |
|
| 1026 | + } catch (PDOException $e) { |
|
| 1027 | 1027 | return "error s : ".$e->getMessage(); |
| 1028 | 1028 | } |
| 1029 | 1029 | $result_search = $sths->fetchAll(PDO::FETCH_ASSOC); |
@@ -1036,8 +1036,8 @@ discard block |
||
| 1036 | 1036 | //} |
| 1037 | 1037 | try { |
| 1038 | 1038 | $sthi = $Connection->db->prepare($queryi); |
| 1039 | - $sthi->execute(array(':mfr' => $data[2],':icao' => $result_search[0]['icaotypecode'])); |
|
| 1040 | - } catch(PDOException $e) { |
|
| 1039 | + $sthi->execute(array(':mfr' => $data[2], ':icao' => $result_search[0]['icaotypecode'])); |
|
| 1040 | + } catch (PDOException $e) { |
|
| 1041 | 1041 | return "error u : ".$e->getMessage(); |
| 1042 | 1042 | } |
| 1043 | 1043 | } else { |
@@ -1045,7 +1045,7 @@ discard block |
||
| 1045 | 1045 | try { |
| 1046 | 1046 | $sthsm = $Connection->db->prepare($query_search_mfr); |
| 1047 | 1047 | $sthsm->execute(array(':mfr' => $data[2])); |
| 1048 | - } catch(PDOException $e) { |
|
| 1048 | + } catch (PDOException $e) { |
|
| 1049 | 1049 | return "error mfr : ".$e->getMessage(); |
| 1050 | 1050 | } |
| 1051 | 1051 | $result_search_mfr = $sthsm->fetchAll(PDO::FETCH_ASSOC); |
@@ -1055,8 +1055,8 @@ discard block |
||
| 1055 | 1055 | $queryf = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:source)'; |
| 1056 | 1056 | try { |
| 1057 | 1057 | $sthf = $Connection->db->prepare($queryf); |
| 1058 | - $sthf->execute(array(':FirstCreated' => $data[16],':LastModified' => $data[15],':ModeS' => $data[33],':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0],':ICAOTypeCode' => $result_search_mfr[0]['icao'],':source' => 'website_faa')); |
|
| 1059 | - } catch(PDOException $e) { |
|
| 1058 | + $sthf->execute(array(':FirstCreated' => $data[16], ':LastModified' => $data[15], ':ModeS' => $data[33], ':ModeSCountry' => $data[14], ':Registration' => 'N'.$data[0], ':ICAOTypeCode' => $result_search_mfr[0]['icao'], ':source' => 'website_faa')); |
|
| 1059 | + } catch (PDOException $e) { |
|
| 1060 | 1060 | return "error f : ".$e->getMessage(); |
| 1061 | 1061 | } |
| 1062 | 1062 | } |
@@ -1066,13 +1066,13 @@ discard block |
||
| 1066 | 1066 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 1067 | 1067 | try { |
| 1068 | 1068 | $sth = $Connection->db->prepare($query); |
| 1069 | - $sth->execute(array(':registration' => 'N'.$data[0],':base' => $data[9],':owner' => ucwords(strtolower($data[6])),':date_first_reg' => date('Y-m-d',strtotime($data[23])), ':source' => 'website_faa')); |
|
| 1070 | - } catch(PDOException $e) { |
|
| 1069 | + $sth->execute(array(':registration' => 'N'.$data[0], ':base' => $data[9], ':owner' => ucwords(strtolower($data[6])), ':date_first_reg' => date('Y-m-d', strtotime($data[23])), ':source' => 'website_faa')); |
|
| 1070 | + } catch (PDOException $e) { |
|
| 1071 | 1071 | return "error i : ".$e->getMessage(); |
| 1072 | 1072 | } |
| 1073 | 1073 | } |
| 1074 | 1074 | } |
| 1075 | - if ($i % 90 == 0) { |
|
| 1075 | + if ($i%90 == 0) { |
|
| 1076 | 1076 | if ($globalTransaction) $Connection->db->commit(); |
| 1077 | 1077 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 1078 | 1078 | } |
@@ -1091,7 +1091,7 @@ discard block |
||
| 1091 | 1091 | $Connection = new Connection(); |
| 1092 | 1092 | $sth = $Connection->db->prepare($query); |
| 1093 | 1093 | $sth->execute(array(':source' => 'website_fam')); |
| 1094 | - } catch(PDOException $e) { |
|
| 1094 | + } catch (PDOException $e) { |
|
| 1095 | 1095 | return "error : ".$e->getMessage(); |
| 1096 | 1096 | } |
| 1097 | 1097 | |
@@ -1112,8 +1112,8 @@ discard block |
||
| 1112 | 1112 | $query = 'INSERT INTO aircraft_modes (FirstCreated,LastModified,ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type_flight,:source)'; |
| 1113 | 1113 | try { |
| 1114 | 1114 | $sth = $Connection->db->prepare($query); |
| 1115 | - $sth->execute(array(':FirstCreated' => $data[0],':LastModified' => $data[1],':ModeS' => $data[2],':ModeSCountry' => $data[3], ':Registration' => $data[4],':ICAOTypeCode' => $data[5],':type_flight' => $data[6],':source' => 'website_fam')); |
|
| 1116 | - } catch(PDOException $e) { |
|
| 1115 | + $sth->execute(array(':FirstCreated' => $data[0], ':LastModified' => $data[1], ':ModeS' => $data[2], ':ModeSCountry' => $data[3], ':Registration' => $data[4], ':ICAOTypeCode' => $data[5], ':type_flight' => $data[6], ':source' => 'website_fam')); |
|
| 1116 | + } catch (PDOException $e) { |
|
| 1117 | 1117 | return "error : ".$e->getMessage(); |
| 1118 | 1118 | } |
| 1119 | 1119 | } |
@@ -1132,7 +1132,7 @@ discard block |
||
| 1132 | 1132 | $Connection = new Connection(); |
| 1133 | 1133 | $sth = $Connection->db->prepare($query); |
| 1134 | 1134 | $sth->execute(array(':source' => 'website_fam')); |
| 1135 | - } catch(PDOException $e) { |
|
| 1135 | + } catch (PDOException $e) { |
|
| 1136 | 1136 | return "error : ".$e->getMessage(); |
| 1137 | 1137 | } |
| 1138 | 1138 | |
@@ -1148,8 +1148,8 @@ discard block |
||
| 1148 | 1148 | $query = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,NULL,:source)'; |
| 1149 | 1149 | try { |
| 1150 | 1150 | $sth = $Connection->db->prepare($query); |
| 1151 | - $sth->execute(array(':registration' => $data[0],':base' => $data[1],':owner' => $data[2], ':source' => 'website_fam')); |
|
| 1152 | - } catch(PDOException $e) { |
|
| 1151 | + $sth->execute(array(':registration' => $data[0], ':base' => $data[1], ':owner' => $data[2], ':source' => 'website_fam')); |
|
| 1152 | + } catch (PDOException $e) { |
|
| 1153 | 1153 | print_r($data); |
| 1154 | 1154 | return "error : ".$e->getMessage(); |
| 1155 | 1155 | } |
@@ -1169,7 +1169,7 @@ discard block |
||
| 1169 | 1169 | $Connection = new Connection(); |
| 1170 | 1170 | $sth = $Connection->db->prepare($query); |
| 1171 | 1171 | $sth->execute(array(':source' => 'website_fam')); |
| 1172 | - } catch(PDOException $e) { |
|
| 1172 | + } catch (PDOException $e) { |
|
| 1173 | 1173 | return "error : ".$e->getMessage(); |
| 1174 | 1174 | } |
| 1175 | 1175 | |
@@ -1189,8 +1189,8 @@ discard block |
||
| 1189 | 1189 | $query = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,FromAirport_Time,ToAirport_ICAO,ToAirport_Time,RouteStop,Source) VALUES (:CallSign,:Operator_ICAO,:FromAirport_ICAO,:FromAirport_Time,:ToAirport_ICAO,:ToAirport_Time,:RouteStop,:source)'; |
| 1190 | 1190 | try { |
| 1191 | 1191 | $sth = $Connection->db->prepare($query); |
| 1192 | - $sth->execute(array(':CallSign' => $data[0],':Operator_ICAO' => $data[1],':FromAirport_ICAO' => $data[2],':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4],':ToAirport_Time' => $data[5],':RouteStop' => $data[6],':source' => 'website_fam')); |
|
| 1193 | - } catch(PDOException $e) { |
|
| 1192 | + $sth->execute(array(':CallSign' => $data[0], ':Operator_ICAO' => $data[1], ':FromAirport_ICAO' => $data[2], ':FromAirport_Time' => $data[3], ':ToAirport_ICAO' => $data[4], ':ToAirport_Time' => $data[5], ':RouteStop' => $data[6], ':source' => 'website_fam')); |
|
| 1193 | + } catch (PDOException $e) { |
|
| 1194 | 1194 | return "error : ".$e->getMessage(); |
| 1195 | 1195 | } |
| 1196 | 1196 | } |
@@ -1209,7 +1209,7 @@ discard block |
||
| 1209 | 1209 | $Connection = new Connection(); |
| 1210 | 1210 | $sth = $Connection->db->prepare($query); |
| 1211 | 1211 | $sth->execute(); |
| 1212 | - } catch(PDOException $e) { |
|
| 1212 | + } catch (PDOException $e) { |
|
| 1213 | 1213 | return "error : ".$e->getMessage(); |
| 1214 | 1214 | } |
| 1215 | 1215 | |
@@ -1229,8 +1229,8 @@ discard block |
||
| 1229 | 1229 | $query = 'INSERT INTO marine_identity (mmsi,imo,call_sign,ship_name,length,gross_tonnage,dead_weight,width,country,engine_power,type) VALUES (:mmsi,:imo,:call_sign,:ship_name,:length,:gross_tonnage,:dead_weight,:width,:country,:engine_power,:type)'; |
| 1230 | 1230 | try { |
| 1231 | 1231 | $sth = $Connection->db->prepare($query); |
| 1232 | - $sth->execute(array(':mmsi' => $data[0],':imo' => $data[1],':call_sign' => $data[2],':ship_name' => $data[3], ':length' => $data[4],':gross_tonnage' => $data[5],':dead_weight' => $data[6],':width' => $data[7],':country' => $data[8],':engine_power' => $data[9],':type' => $data[10])); |
|
| 1233 | - } catch(PDOException $e) { |
|
| 1232 | + $sth->execute(array(':mmsi' => $data[0], ':imo' => $data[1], ':call_sign' => $data[2], ':ship_name' => $data[3], ':length' => $data[4], ':gross_tonnage' => $data[5], ':dead_weight' => $data[6], ':width' => $data[7], ':country' => $data[8], ':engine_power' => $data[9], ':type' => $data[10])); |
|
| 1233 | + } catch (PDOException $e) { |
|
| 1234 | 1234 | return "error : ".$e->getMessage(); |
| 1235 | 1235 | } |
| 1236 | 1236 | } |
@@ -1249,7 +1249,7 @@ discard block |
||
| 1249 | 1249 | $Connection = new Connection(); |
| 1250 | 1250 | $sth = $Connection->db->prepare($query); |
| 1251 | 1251 | $sth->execute(); |
| 1252 | - } catch(PDOException $e) { |
|
| 1252 | + } catch (PDOException $e) { |
|
| 1253 | 1253 | return "error : ".$e->getMessage(); |
| 1254 | 1254 | } |
| 1255 | 1255 | |
@@ -1265,7 +1265,7 @@ discard block |
||
| 1265 | 1265 | try { |
| 1266 | 1266 | $sth = $Connection->db->prepare($query); |
| 1267 | 1267 | $sth->execute(array(':icao' => $icao)); |
| 1268 | - } catch(PDOException $e) { |
|
| 1268 | + } catch (PDOException $e) { |
|
| 1269 | 1269 | return "error : ".$e->getMessage(); |
| 1270 | 1270 | } |
| 1271 | 1271 | } |
@@ -1276,7 +1276,7 @@ discard block |
||
| 1276 | 1276 | return ''; |
| 1277 | 1277 | } |
| 1278 | 1278 | |
| 1279 | - public static function tle($filename,$tletype) { |
|
| 1279 | + public static function tle($filename, $tletype) { |
|
| 1280 | 1280 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 1281 | 1281 | global $tmp_dir, $globalTransaction; |
| 1282 | 1282 | //$Spotter = new Spotter(); |
@@ -1286,7 +1286,7 @@ discard block |
||
| 1286 | 1286 | $Connection = new Connection(); |
| 1287 | 1287 | $sth = $Connection->db->prepare($query); |
| 1288 | 1288 | $sth->execute(array(':source' => $filename)); |
| 1289 | - } catch(PDOException $e) { |
|
| 1289 | + } catch (PDOException $e) { |
|
| 1290 | 1290 | return "error : ".$e->getMessage(); |
| 1291 | 1291 | } |
| 1292 | 1292 | |
@@ -1311,8 +1311,8 @@ discard block |
||
| 1311 | 1311 | $query = 'INSERT INTO tle (tle_name,tle_tle1,tle_tle2,tle_type,tle_source) VALUES (:name, :tle1, :tle2, :type, :source)'; |
| 1312 | 1312 | try { |
| 1313 | 1313 | $sth = $Connection->db->prepare($query); |
| 1314 | - $sth->execute(array(':name' => $dbdata['name'],':tle1' => $dbdata['tle1'],':tle2' => $dbdata['tle2'], ':type' => $tletype,':source' => $filename)); |
|
| 1315 | - } catch(PDOException $e) { |
|
| 1314 | + $sth->execute(array(':name' => $dbdata['name'], ':tle1' => $dbdata['tle1'], ':tle2' => $dbdata['tle2'], ':type' => $tletype, ':source' => $filename)); |
|
| 1315 | + } catch (PDOException $e) { |
|
| 1316 | 1316 | return "error : ".$e->getMessage(); |
| 1317 | 1317 | } |
| 1318 | 1318 | |
@@ -1332,28 +1332,28 @@ discard block |
||
| 1332 | 1332 | */ |
| 1333 | 1333 | private static function table2array($data) { |
| 1334 | 1334 | $html = str_get_html($data); |
| 1335 | - $tabledata=array(); |
|
| 1336 | - foreach($html->find('tr') as $element) |
|
| 1335 | + $tabledata = array(); |
|
| 1336 | + foreach ($html->find('tr') as $element) |
|
| 1337 | 1337 | { |
| 1338 | 1338 | $td = array(); |
| 1339 | - foreach( $element->find('th') as $row) |
|
| 1339 | + foreach ($element->find('th') as $row) |
|
| 1340 | 1340 | { |
| 1341 | 1341 | $td [] = trim($row->plaintext); |
| 1342 | 1342 | } |
| 1343 | - $td=array_filter($td); |
|
| 1343 | + $td = array_filter($td); |
|
| 1344 | 1344 | $tabledata[] = $td; |
| 1345 | 1345 | |
| 1346 | 1346 | $td = array(); |
| 1347 | 1347 | $tdi = array(); |
| 1348 | - foreach( $element->find('td') as $row) |
|
| 1348 | + foreach ($element->find('td') as $row) |
|
| 1349 | 1349 | { |
| 1350 | 1350 | $td [] = trim($row->plaintext); |
| 1351 | 1351 | $tdi [] = trim($row->innertext); |
| 1352 | 1352 | } |
| 1353 | - $td=array_filter($td); |
|
| 1354 | - $tdi=array_filter($tdi); |
|
| 1353 | + $td = array_filter($td); |
|
| 1354 | + $tdi = array_filter($tdi); |
|
| 1355 | 1355 | // $tabledata[]=array_merge($td,$tdi); |
| 1356 | - $tabledata[]=$td; |
|
| 1356 | + $tabledata[] = $td; |
|
| 1357 | 1357 | } |
| 1358 | 1358 | return(array_filter($tabledata)); |
| 1359 | 1359 | } |
@@ -1426,13 +1426,13 @@ discard block |
||
| 1426 | 1426 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1427 | 1427 | { |
| 1428 | 1428 | $i++; |
| 1429 | - if($i > 3 && count($row) > 2) { |
|
| 1429 | + if ($i > 3 && count($row) > 2) { |
|
| 1430 | 1430 | $data = array_values(array_filter($row)); |
| 1431 | 1431 | $cntdata = count($data); |
| 1432 | 1432 | if ($cntdata > 10) { |
| 1433 | 1433 | $value = $data[9]; |
| 1434 | 1434 | |
| 1435 | - for ($i =10;$i < $cntdata;$i++) { |
|
| 1435 | + for ($i = 10; $i < $cntdata; $i++) { |
|
| 1436 | 1436 | $value .= ' '.$data[$i]; |
| 1437 | 1437 | } |
| 1438 | 1438 | $data[9] = $value; |
@@ -1442,8 +1442,8 @@ discard block |
||
| 1442 | 1442 | $query = 'INSERT INTO waypoints (name_begin,latitude_begin,longitude_begin,name_end,latitude_end,longitude_end,high,base,top,segment_name) VALUES (:name_begin, :latitude_begin, :longitude_begin, :name_end, :latitude_end, :longitude_end, :high, :base, :top, :segment_name)'; |
| 1443 | 1443 | try { |
| 1444 | 1444 | $sth = $Connection->db->prepare($query); |
| 1445 | - $sth->execute(array(':name_begin' => $data[0],':latitude_begin' => $data[1],':longitude_begin' => $data[2],':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9])); |
|
| 1446 | - } catch(PDOException $e) { |
|
| 1445 | + $sth->execute(array(':name_begin' => $data[0], ':latitude_begin' => $data[1], ':longitude_begin' => $data[2], ':name_end' => $data[3], ':latitude_end' => $data[4], ':longitude_end' => $data[5], ':high' => $data[6], ':base' => $data[7], ':top' => $data[8], ':segment_name' => $data[9])); |
|
| 1446 | + } catch (PDOException $e) { |
|
| 1447 | 1447 | return "error : ".$e->getMessage(); |
| 1448 | 1448 | } |
| 1449 | 1449 | } |
@@ -1464,7 +1464,7 @@ discard block |
||
| 1464 | 1464 | $Connection = new Connection(); |
| 1465 | 1465 | $sth = $Connection->db->prepare($query); |
| 1466 | 1466 | $sth->execute(); |
| 1467 | - } catch(PDOException $e) { |
|
| 1467 | + } catch (PDOException $e) { |
|
| 1468 | 1468 | return "error : ".$e->getMessage(); |
| 1469 | 1469 | } |
| 1470 | 1470 | |
@@ -1476,12 +1476,12 @@ discard block |
||
| 1476 | 1476 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 1477 | 1477 | while (($row = fgetcsv($handle, 1000, $delimiter)) !== FALSE) |
| 1478 | 1478 | { |
| 1479 | - if(count($row) > 1) { |
|
| 1479 | + if (count($row) > 1) { |
|
| 1480 | 1480 | $query = "INSERT INTO airlines (name,icao,active,forsource) VALUES (:name, :icao, 'Y','ivao')"; |
| 1481 | 1481 | try { |
| 1482 | 1482 | $sth = $Connection->db->prepare($query); |
| 1483 | - $sth->execute(array(':name' => $row[1],':icao' => $row[0])); |
|
| 1484 | - } catch(PDOException $e) { |
|
| 1483 | + $sth->execute(array(':name' => $row[1], ':icao' => $row[0])); |
|
| 1484 | + } catch (PDOException $e) { |
|
| 1485 | 1485 | return "error : ".$e->getMessage(); |
| 1486 | 1486 | } |
| 1487 | 1487 | } |
@@ -1501,21 +1501,21 @@ discard block |
||
| 1501 | 1501 | try { |
| 1502 | 1502 | $sth = $Connection->db->prepare($query); |
| 1503 | 1503 | $sth->execute(); |
| 1504 | - } catch(PDOException $e) { |
|
| 1504 | + } catch (PDOException $e) { |
|
| 1505 | 1505 | return "error : ".$e->getMessage(); |
| 1506 | 1506 | } |
| 1507 | 1507 | } |
| 1508 | 1508 | |
| 1509 | 1509 | |
| 1510 | - if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1510 | + if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1511 | 1511 | else { |
| 1512 | - update_db::gunzip('../db/pgsql/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
|
| 1512 | + update_db::gunzip('../db/pgsql/airspace.sql.gz', $tmp_dir.'airspace.sql'); |
|
| 1513 | 1513 | $query = "CREATE EXTENSION postgis"; |
| 1514 | - $Connection = new Connection(null,null,$_SESSION['database_root'],$_SESSION['database_rootpass']); |
|
| 1514 | + $Connection = new Connection(null, null, $_SESSION['database_root'], $_SESSION['database_rootpass']); |
|
| 1515 | 1515 | try { |
| 1516 | 1516 | $sth = $Connection->db->prepare($query); |
| 1517 | 1517 | $sth->execute(); |
| 1518 | - } catch(PDOException $e) { |
|
| 1518 | + } catch (PDOException $e) { |
|
| 1519 | 1519 | return "error : ".$e->getMessage(); |
| 1520 | 1520 | } |
| 1521 | 1521 | } |
@@ -1528,7 +1528,7 @@ discard block |
||
| 1528 | 1528 | include_once('class.create_db.php'); |
| 1529 | 1529 | require_once(dirname(__FILE__).'/../require/class.NOTAM.php'); |
| 1530 | 1530 | if ($globalDebug) echo "NOTAM from FlightAirMap website : Download..."; |
| 1531 | - update_db::download('http://data.flightairmap.fr/data/notam.txt.gz',$tmp_dir.'notam.txt.gz'); |
|
| 1531 | + update_db::download('http://data.flightairmap.fr/data/notam.txt.gz', $tmp_dir.'notam.txt.gz'); |
|
| 1532 | 1532 | $error = ''; |
| 1533 | 1533 | if (file_exists($tmp_dir.'notam.txt.gz')) { |
| 1534 | 1534 | if ($globalDebug) echo "Gunzip..."; |
@@ -1560,14 +1560,14 @@ discard block |
||
| 1560 | 1560 | try { |
| 1561 | 1561 | $sth = $Connection->db->prepare($query); |
| 1562 | 1562 | $sth->execute(); |
| 1563 | - } catch(PDOException $e) { |
|
| 1563 | + } catch (PDOException $e) { |
|
| 1564 | 1564 | echo "error : ".$e->getMessage(); |
| 1565 | 1565 | } |
| 1566 | 1566 | } |
| 1567 | 1567 | if ($globalDBdriver == 'mysql') { |
| 1568 | - update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 1568 | + update_db::gunzip('../db/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 1569 | 1569 | } else { |
| 1570 | - update_db::gunzip('../db/pgsql/countries.sql.gz',$tmp_dir.'countries.sql'); |
|
| 1570 | + update_db::gunzip('../db/pgsql/countries.sql.gz', $tmp_dir.'countries.sql'); |
|
| 1571 | 1571 | } |
| 1572 | 1572 | $error = create_db::import_file($tmp_dir.'countries.sql'); |
| 1573 | 1573 | return $error; |
@@ -1580,7 +1580,7 @@ discard block |
||
| 1580 | 1580 | // update_db::unzip($tmp_dir.'AptNav.zip'); |
| 1581 | 1581 | // update_db::download('https://gitorious.org/fg/fgdata/raw/e81f8a15424a175a7b715f8f7eb8f4147b802a27:Navaids/awy.dat.gz',$tmp_dir.'awy.dat.gz'); |
| 1582 | 1582 | // update_db::download('http://sourceforge.net/p/flightgear/fgdata/ci/next/tree/Navaids/awy.dat.gz?format=raw',$tmp_dir.'awy.dat.gz','http://sourceforge.net'); |
| 1583 | - update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz',$tmp_dir.'awy.dat.gz','http://sourceforge.net'); |
|
| 1583 | + update_db::download('http://pkgs.fedoraproject.org/repo/extras/FlightGear-Atlas/awy.dat.gz/f530c9d1c4b31a288ba88dcc8224268b/awy.dat.gz', $tmp_dir.'awy.dat.gz', 'http://sourceforge.net'); |
|
| 1584 | 1584 | update_db::gunzip($tmp_dir.'awy.dat.gz'); |
| 1585 | 1585 | $error = update_db::waypoints($tmp_dir.'awy.dat'); |
| 1586 | 1586 | return $error; |
@@ -1600,7 +1600,7 @@ discard block |
||
| 1600 | 1600 | update_db::ivao_airlines($tmp_dir.'data/airlines.dat'); |
| 1601 | 1601 | if ($globalDebug) echo "Copy airlines logos to airlines images directory..."; |
| 1602 | 1602 | if (is_writable(dirname(__FILE__).'/../images/airlines')) { |
| 1603 | - if (!$Common->xcopy($tmp_dir.'logos/',dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 1603 | + if (!$Common->xcopy($tmp_dir.'logos/', dirname(__FILE__).'/../images/airlines/')) $error = "Failed to copy airlines logo."; |
|
| 1604 | 1604 | } else $error = "The directory ".dirname(__FILE__).'/../images/airlines'." must be writable"; |
| 1605 | 1605 | } else $error = "File ".$tmp_dir.'ivao.zip'." doesn't exist. Download failed."; |
| 1606 | 1606 | if ($error != '') { |
@@ -1613,7 +1613,7 @@ discard block |
||
| 1613 | 1613 | global $tmp_dir, $globalDebug; |
| 1614 | 1614 | $error = ''; |
| 1615 | 1615 | if ($globalDebug) echo "Routes : Download..."; |
| 1616 | - update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz',$tmp_dir.'StandingData.sqb.gz'); |
|
| 1616 | + update_db::download('http://www.virtualradarserver.co.uk/Files/StandingData.sqb.gz', $tmp_dir.'StandingData.sqb.gz'); |
|
| 1617 | 1617 | if (file_exists($tmp_dir.'StandingData.sqb.gz')) { |
| 1618 | 1618 | if ($globalDebug) echo "Gunzip..."; |
| 1619 | 1619 | update_db::gunzip($tmp_dir.'StandingData.sqb.gz'); |
@@ -1629,7 +1629,7 @@ discard block |
||
| 1629 | 1629 | global $tmp_dir, $globalDebug; |
| 1630 | 1630 | $error = ''; |
| 1631 | 1631 | if ($globalDebug) echo "Schedules Oneworld : Download..."; |
| 1632 | - update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz',$tmp_dir.'oneworld.csv.gz'); |
|
| 1632 | + update_db::download('http://data.flightairmap.fr/data/schedules/oneworld.csv.gz', $tmp_dir.'oneworld.csv.gz'); |
|
| 1633 | 1633 | if (file_exists($tmp_dir.'oneworld.csv.gz')) { |
| 1634 | 1634 | if ($globalDebug) echo "Gunzip..."; |
| 1635 | 1635 | update_db::gunzip($tmp_dir.'oneworld.csv.gz'); |
@@ -1645,7 +1645,7 @@ discard block |
||
| 1645 | 1645 | global $tmp_dir, $globalDebug; |
| 1646 | 1646 | $error = ''; |
| 1647 | 1647 | if ($globalDebug) echo "Schedules Skyteam : Download..."; |
| 1648 | - update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz',$tmp_dir.'skyteam.csv.gz'); |
|
| 1648 | + update_db::download('http://data.flightairmap.fr/data/schedules/skyteam.csv.gz', $tmp_dir.'skyteam.csv.gz'); |
|
| 1649 | 1649 | if (file_exists($tmp_dir.'skyteam.csv.gz')) { |
| 1650 | 1650 | if ($globalDebug) echo "Gunzip..."; |
| 1651 | 1651 | update_db::gunzip($tmp_dir.'skyteam.csv.gz'); |
@@ -1673,7 +1673,7 @@ discard block |
||
| 1673 | 1673 | */ |
| 1674 | 1674 | if ($globalDebug) echo "Modes : Download..."; |
| 1675 | 1675 | // update_db::download('http://planebase.biz/sqb.php?f=basestationall.zip',$tmp_dir.'basestation_latest.zip','http://planebase.biz/bstnsqb'); |
| 1676 | - update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz',$tmp_dir.'BaseStation.sqb.gz'); |
|
| 1676 | + update_db::download('http://data.flightairmap.fr/data/BaseStation.sqb.gz', $tmp_dir.'BaseStation.sqb.gz'); |
|
| 1677 | 1677 | |
| 1678 | 1678 | // if (file_exists($tmp_dir.'basestation_latest.zip')) { |
| 1679 | 1679 | if (file_exists($tmp_dir.'BaseStation.sqb.gz')) { |
@@ -1693,7 +1693,7 @@ discard block |
||
| 1693 | 1693 | public static function update_ModeS_faa() { |
| 1694 | 1694 | global $tmp_dir, $globalDebug; |
| 1695 | 1695 | if ($globalDebug) echo "Modes FAA: Download..."; |
| 1696 | - update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip',$tmp_dir.'ReleasableAircraft.zip'); |
|
| 1696 | + update_db::download('http://registry.faa.gov/database/ReleasableAircraft.zip', $tmp_dir.'ReleasableAircraft.zip'); |
|
| 1697 | 1697 | if (file_exists($tmp_dir.'ReleasableAircraft.zip')) { |
| 1698 | 1698 | if ($globalDebug) echo "Unzip..."; |
| 1699 | 1699 | update_db::unzip($tmp_dir.'ReleasableAircraft.zip'); |
@@ -1709,7 +1709,7 @@ discard block |
||
| 1709 | 1709 | public static function update_ModeS_flarm() { |
| 1710 | 1710 | global $tmp_dir, $globalDebug; |
| 1711 | 1711 | if ($globalDebug) echo "Modes Flarmnet: Download..."; |
| 1712 | - update_db::download('http://flarmnet.org/files/data.fln',$tmp_dir.'data.fln'); |
|
| 1712 | + update_db::download('http://flarmnet.org/files/data.fln', $tmp_dir.'data.fln'); |
|
| 1713 | 1713 | if (file_exists($tmp_dir.'data.fln')) { |
| 1714 | 1714 | if ($globalDebug) echo "Add to DB..."; |
| 1715 | 1715 | $error = update_db::retrieve_modes_flarmnet($tmp_dir.'data.fln'); |
@@ -1723,7 +1723,7 @@ discard block |
||
| 1723 | 1723 | public static function update_ModeS_ogn() { |
| 1724 | 1724 | global $tmp_dir, $globalDebug; |
| 1725 | 1725 | if ($globalDebug) echo "Modes OGN: Download..."; |
| 1726 | - update_db::download('http://ddb.glidernet.org/download/',$tmp_dir.'ogn.csv'); |
|
| 1726 | + update_db::download('http://ddb.glidernet.org/download/', $tmp_dir.'ogn.csv'); |
|
| 1727 | 1727 | if (file_exists($tmp_dir.'ogn.csv')) { |
| 1728 | 1728 | if ($globalDebug) echo "Add to DB..."; |
| 1729 | 1729 | $error = update_db::retrieve_modes_ogn($tmp_dir.'ogn.csv'); |
@@ -1738,201 +1738,201 @@ discard block |
||
| 1738 | 1738 | global $tmp_dir, $globalDebug, $globalMasterSource; |
| 1739 | 1739 | |
| 1740 | 1740 | if ($globalDebug) echo "Owner France: Download..."; |
| 1741 | - update_db::download('http://antonakis.co.uk/registers/France.txt',$tmp_dir.'owner_f.csv'); |
|
| 1741 | + update_db::download('http://antonakis.co.uk/registers/France.txt', $tmp_dir.'owner_f.csv'); |
|
| 1742 | 1742 | if (file_exists($tmp_dir.'owner_f.csv')) { |
| 1743 | 1743 | if ($globalDebug) echo "Add to DB..."; |
| 1744 | - $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv','F'); |
|
| 1744 | + $error = update_db::retrieve_owner($tmp_dir.'owner_f.csv', 'F'); |
|
| 1745 | 1745 | } else $error = "File ".$tmp_dir.'owner_f.csv'." doesn't exist. Download failed."; |
| 1746 | 1746 | if ($error != '') { |
| 1747 | 1747 | return $error; |
| 1748 | 1748 | } elseif ($globalDebug) echo "Done\n"; |
| 1749 | 1749 | |
| 1750 | 1750 | if ($globalDebug) echo "Owner Ireland: Download..."; |
| 1751 | - update_db::download('http://antonakis.co.uk/registers/Ireland.txt',$tmp_dir.'owner_ei.csv'); |
|
| 1751 | + update_db::download('http://antonakis.co.uk/registers/Ireland.txt', $tmp_dir.'owner_ei.csv'); |
|
| 1752 | 1752 | if (file_exists($tmp_dir.'owner_ei.csv')) { |
| 1753 | 1753 | if ($globalDebug) echo "Add to DB..."; |
| 1754 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv','EI'); |
|
| 1754 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ei.csv', 'EI'); |
|
| 1755 | 1755 | } else $error = "File ".$tmp_dir.'owner_ei.csv'." doesn't exist. Download failed."; |
| 1756 | 1756 | if ($error != '') { |
| 1757 | 1757 | return $error; |
| 1758 | 1758 | } elseif ($globalDebug) echo "Done\n"; |
| 1759 | 1759 | if ($globalDebug) echo "Owner Switzerland: Download..."; |
| 1760 | - update_db::download('http://antonakis.co.uk/registers/Switzerland.txt',$tmp_dir.'owner_hb.csv'); |
|
| 1760 | + update_db::download('http://antonakis.co.uk/registers/Switzerland.txt', $tmp_dir.'owner_hb.csv'); |
|
| 1761 | 1761 | if (file_exists($tmp_dir.'owner_hb.csv')) { |
| 1762 | 1762 | if ($globalDebug) echo "Add to DB..."; |
| 1763 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv','HB'); |
|
| 1763 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hb.csv', 'HB'); |
|
| 1764 | 1764 | } else $error = "File ".$tmp_dir.'owner_hb.csv'." doesn't exist. Download failed."; |
| 1765 | 1765 | if ($error != '') { |
| 1766 | 1766 | return $error; |
| 1767 | 1767 | } elseif ($globalDebug) echo "Done\n"; |
| 1768 | 1768 | if ($globalDebug) echo "Owner Czech Republic: Download..."; |
| 1769 | - update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt',$tmp_dir.'owner_ok.csv'); |
|
| 1769 | + update_db::download('http://antonakis.co.uk/registers/CzechRepublic.txt', $tmp_dir.'owner_ok.csv'); |
|
| 1770 | 1770 | if (file_exists($tmp_dir.'owner_ok.csv')) { |
| 1771 | 1771 | if ($globalDebug) echo "Add to DB..."; |
| 1772 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv','OK'); |
|
| 1772 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ok.csv', 'OK'); |
|
| 1773 | 1773 | } else $error = "File ".$tmp_dir.'owner_ok.csv'." doesn't exist. Download failed."; |
| 1774 | 1774 | if ($error != '') { |
| 1775 | 1775 | return $error; |
| 1776 | 1776 | } elseif ($globalDebug) echo "Done\n"; |
| 1777 | 1777 | if ($globalDebug) echo "Owner Australia: Download..."; |
| 1778 | - update_db::download('http://antonakis.co.uk/registers/Australia.txt',$tmp_dir.'owner_vh.csv'); |
|
| 1778 | + update_db::download('http://antonakis.co.uk/registers/Australia.txt', $tmp_dir.'owner_vh.csv'); |
|
| 1779 | 1779 | if (file_exists($tmp_dir.'owner_vh.csv')) { |
| 1780 | 1780 | if ($globalDebug) echo "Add to DB..."; |
| 1781 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv','VH'); |
|
| 1781 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vh.csv', 'VH'); |
|
| 1782 | 1782 | } else $error = "File ".$tmp_dir.'owner_vh.csv'." doesn't exist. Download failed."; |
| 1783 | 1783 | if ($error != '') { |
| 1784 | 1784 | return $error; |
| 1785 | 1785 | } elseif ($globalDebug) echo "Done\n"; |
| 1786 | 1786 | if ($globalDebug) echo "Owner Austria: Download..."; |
| 1787 | - update_db::download('http://antonakis.co.uk/registers/Austria.txt',$tmp_dir.'owner_oe.csv'); |
|
| 1787 | + update_db::download('http://antonakis.co.uk/registers/Austria.txt', $tmp_dir.'owner_oe.csv'); |
|
| 1788 | 1788 | if (file_exists($tmp_dir.'owner_oe.csv')) { |
| 1789 | 1789 | if ($globalDebug) echo "Add to DB..."; |
| 1790 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv','OE'); |
|
| 1790 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oe.csv', 'OE'); |
|
| 1791 | 1791 | } else $error = "File ".$tmp_dir.'owner_oe.csv'." doesn't exist. Download failed."; |
| 1792 | 1792 | if ($error != '') { |
| 1793 | 1793 | return $error; |
| 1794 | 1794 | } elseif ($globalDebug) echo "Done\n"; |
| 1795 | 1795 | if ($globalDebug) echo "Owner Chile: Download..."; |
| 1796 | - update_db::download('http://antonakis.co.uk/registers/Chile.txt',$tmp_dir.'owner_cc.csv'); |
|
| 1796 | + update_db::download('http://antonakis.co.uk/registers/Chile.txt', $tmp_dir.'owner_cc.csv'); |
|
| 1797 | 1797 | if (file_exists($tmp_dir.'owner_cc.csv')) { |
| 1798 | 1798 | if ($globalDebug) echo "Add to DB..."; |
| 1799 | - $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv','CC'); |
|
| 1799 | + $error = update_db::retrieve_owner($tmp_dir.'owner_cc.csv', 'CC'); |
|
| 1800 | 1800 | } else $error = "File ".$tmp_dir.'owner_cc.csv'." doesn't exist. Download failed."; |
| 1801 | 1801 | if ($error != '') { |
| 1802 | 1802 | return $error; |
| 1803 | 1803 | } elseif ($globalDebug) echo "Done\n"; |
| 1804 | 1804 | if ($globalDebug) echo "Owner Colombia: Download..."; |
| 1805 | - update_db::download('http://antonakis.co.uk/registers/Colombia.txt',$tmp_dir.'owner_hj.csv'); |
|
| 1805 | + update_db::download('http://antonakis.co.uk/registers/Colombia.txt', $tmp_dir.'owner_hj.csv'); |
|
| 1806 | 1806 | if (file_exists($tmp_dir.'owner_hj.csv')) { |
| 1807 | 1807 | if ($globalDebug) echo "Add to DB..."; |
| 1808 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv','HJ'); |
|
| 1808 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hj.csv', 'HJ'); |
|
| 1809 | 1809 | } else $error = "File ".$tmp_dir.'owner_hj.csv'." doesn't exist. Download failed."; |
| 1810 | 1810 | if ($error != '') { |
| 1811 | 1811 | return $error; |
| 1812 | 1812 | } elseif ($globalDebug) echo "Done\n"; |
| 1813 | 1813 | if ($globalDebug) echo "Owner Bosnia Herzegobina: Download..."; |
| 1814 | - update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt',$tmp_dir.'owner_e7.csv'); |
|
| 1814 | + update_db::download('http://antonakis.co.uk/registers/BosniaHerzegovina.txt', $tmp_dir.'owner_e7.csv'); |
|
| 1815 | 1815 | if (file_exists($tmp_dir.'owner_e7.csv')) { |
| 1816 | 1816 | if ($globalDebug) echo "Add to DB..."; |
| 1817 | - $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv','E7'); |
|
| 1817 | + $error = update_db::retrieve_owner($tmp_dir.'owner_e7.csv', 'E7'); |
|
| 1818 | 1818 | } else $error = "File ".$tmp_dir.'owner_e7.csv'." doesn't exist. Download failed."; |
| 1819 | 1819 | if ($error != '') { |
| 1820 | 1820 | return $error; |
| 1821 | 1821 | } elseif ($globalDebug) echo "Done\n"; |
| 1822 | 1822 | if ($globalDebug) echo "Owner Brazil: Download..."; |
| 1823 | - update_db::download('http://antonakis.co.uk/registers/Brazil.txt',$tmp_dir.'owner_pp.csv'); |
|
| 1823 | + update_db::download('http://antonakis.co.uk/registers/Brazil.txt', $tmp_dir.'owner_pp.csv'); |
|
| 1824 | 1824 | if (file_exists($tmp_dir.'owner_pp.csv')) { |
| 1825 | 1825 | if ($globalDebug) echo "Add to DB..."; |
| 1826 | - $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv','PP'); |
|
| 1826 | + $error = update_db::retrieve_owner($tmp_dir.'owner_pp.csv', 'PP'); |
|
| 1827 | 1827 | } else $error = "File ".$tmp_dir.'owner_pp.csv'." doesn't exist. Download failed."; |
| 1828 | 1828 | if ($error != '') { |
| 1829 | 1829 | return $error; |
| 1830 | 1830 | } elseif ($globalDebug) echo "Done\n"; |
| 1831 | 1831 | if ($globalDebug) echo "Owner Cayman Islands: Download..."; |
| 1832 | - update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt',$tmp_dir.'owner_vp.csv'); |
|
| 1832 | + update_db::download('http://antonakis.co.uk/registers/CaymanIslands.txt', $tmp_dir.'owner_vp.csv'); |
|
| 1833 | 1833 | if (file_exists($tmp_dir.'owner_vp.csv')) { |
| 1834 | 1834 | if ($globalDebug) echo "Add to DB..."; |
| 1835 | - $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv','VP'); |
|
| 1835 | + $error = update_db::retrieve_owner($tmp_dir.'owner_vp.csv', 'VP'); |
|
| 1836 | 1836 | } else $error = "File ".$tmp_dir.'owner_vp.csv'." doesn't exist. Download failed."; |
| 1837 | 1837 | if ($error != '') { |
| 1838 | 1838 | return $error; |
| 1839 | 1839 | } elseif ($globalDebug) echo "Done\n"; |
| 1840 | 1840 | if ($globalDebug) echo "Owner Croatia: Download..."; |
| 1841 | - update_db::download('http://antonakis.co.uk/registers/Croatia.txt',$tmp_dir.'owner_9a.csv'); |
|
| 1841 | + update_db::download('http://antonakis.co.uk/registers/Croatia.txt', $tmp_dir.'owner_9a.csv'); |
|
| 1842 | 1842 | if (file_exists($tmp_dir.'owner_9a.csv')) { |
| 1843 | 1843 | if ($globalDebug) echo "Add to DB..."; |
| 1844 | - $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv','9A'); |
|
| 1844 | + $error = update_db::retrieve_owner($tmp_dir.'owner_9a.csv', '9A'); |
|
| 1845 | 1845 | } else $error = "File ".$tmp_dir.'owner_9a.csv'." doesn't exist. Download failed."; |
| 1846 | 1846 | if ($error != '') { |
| 1847 | 1847 | return $error; |
| 1848 | 1848 | } elseif ($globalDebug) echo "Done\n"; |
| 1849 | 1849 | if ($globalDebug) echo "Owner Luxembourg: Download..."; |
| 1850 | - update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt',$tmp_dir.'owner_lx.csv'); |
|
| 1850 | + update_db::download('http://antonakis.co.uk/registers/Luxembourg.txt', $tmp_dir.'owner_lx.csv'); |
|
| 1851 | 1851 | if (file_exists($tmp_dir.'owner_lx.csv')) { |
| 1852 | 1852 | if ($globalDebug) echo "Add to DB..."; |
| 1853 | - $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv','LX'); |
|
| 1853 | + $error = update_db::retrieve_owner($tmp_dir.'owner_lx.csv', 'LX'); |
|
| 1854 | 1854 | } else $error = "File ".$tmp_dir.'owner_lx.csv'." doesn't exist. Download failed."; |
| 1855 | 1855 | if ($error != '') { |
| 1856 | 1856 | return $error; |
| 1857 | 1857 | } elseif ($globalDebug) echo "Done\n"; |
| 1858 | 1858 | if ($globalDebug) echo "Owner Maldives: Download..."; |
| 1859 | - update_db::download('http://antonakis.co.uk/registers/Maldives.txt',$tmp_dir.'owner_8q.csv'); |
|
| 1859 | + update_db::download('http://antonakis.co.uk/registers/Maldives.txt', $tmp_dir.'owner_8q.csv'); |
|
| 1860 | 1860 | if (file_exists($tmp_dir.'owner_8q.csv')) { |
| 1861 | 1861 | if ($globalDebug) echo "Add to DB..."; |
| 1862 | - $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv','8Q'); |
|
| 1862 | + $error = update_db::retrieve_owner($tmp_dir.'owner_8q.csv', '8Q'); |
|
| 1863 | 1863 | } else $error = "File ".$tmp_dir.'owner_8q.csv'." doesn't exist. Download failed."; |
| 1864 | 1864 | if ($error != '') { |
| 1865 | 1865 | return $error; |
| 1866 | 1866 | } elseif ($globalDebug) echo "Done\n"; |
| 1867 | 1867 | if ($globalDebug) echo "Owner New Zealand: Download..."; |
| 1868 | - update_db::download('http://antonakis.co.uk/registers/NewZealand.txt',$tmp_dir.'owner_zk.csv'); |
|
| 1868 | + update_db::download('http://antonakis.co.uk/registers/NewZealand.txt', $tmp_dir.'owner_zk.csv'); |
|
| 1869 | 1869 | if (file_exists($tmp_dir.'owner_zk.csv')) { |
| 1870 | 1870 | if ($globalDebug) echo "Add to DB..."; |
| 1871 | - $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv','ZK'); |
|
| 1871 | + $error = update_db::retrieve_owner($tmp_dir.'owner_zk.csv', 'ZK'); |
|
| 1872 | 1872 | } else $error = "File ".$tmp_dir.'owner_zk.csv'." doesn't exist. Download failed."; |
| 1873 | 1873 | if ($error != '') { |
| 1874 | 1874 | return $error; |
| 1875 | 1875 | } elseif ($globalDebug) echo "Done\n"; |
| 1876 | 1876 | if ($globalDebug) echo "Owner Papua New Guinea: Download..."; |
| 1877 | - update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt',$tmp_dir.'owner_p2.csv'); |
|
| 1877 | + update_db::download('http://antonakis.co.uk/registers/PapuaNewGuinea.txt', $tmp_dir.'owner_p2.csv'); |
|
| 1878 | 1878 | if (file_exists($tmp_dir.'owner_p2.csv')) { |
| 1879 | 1879 | if ($globalDebug) echo "Add to DB..."; |
| 1880 | - $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv','P2'); |
|
| 1880 | + $error = update_db::retrieve_owner($tmp_dir.'owner_p2.csv', 'P2'); |
|
| 1881 | 1881 | } else $error = "File ".$tmp_dir.'owner_p2.csv'." doesn't exist. Download failed."; |
| 1882 | 1882 | if ($error != '') { |
| 1883 | 1883 | return $error; |
| 1884 | 1884 | } elseif ($globalDebug) echo "Done\n"; |
| 1885 | 1885 | if ($globalDebug) echo "Owner Slovakia: Download..."; |
| 1886 | - update_db::download('http://antonakis.co.uk/registers/Slovakia.txt',$tmp_dir.'owner_om.csv'); |
|
| 1886 | + update_db::download('http://antonakis.co.uk/registers/Slovakia.txt', $tmp_dir.'owner_om.csv'); |
|
| 1887 | 1887 | if (file_exists($tmp_dir.'owner_om.csv')) { |
| 1888 | 1888 | if ($globalDebug) echo "Add to DB..."; |
| 1889 | - $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv','OM'); |
|
| 1889 | + $error = update_db::retrieve_owner($tmp_dir.'owner_om.csv', 'OM'); |
|
| 1890 | 1890 | } else $error = "File ".$tmp_dir.'owner_om.csv'." doesn't exist. Download failed."; |
| 1891 | 1891 | if ($error != '') { |
| 1892 | 1892 | return $error; |
| 1893 | 1893 | } elseif ($globalDebug) echo "Done\n"; |
| 1894 | 1894 | if ($globalDebug) echo "Owner Ecuador: Download..."; |
| 1895 | - update_db::download('http://antonakis.co.uk/registers/Ecuador.txt',$tmp_dir.'owner_hc.csv'); |
|
| 1895 | + update_db::download('http://antonakis.co.uk/registers/Ecuador.txt', $tmp_dir.'owner_hc.csv'); |
|
| 1896 | 1896 | if (file_exists($tmp_dir.'owner_hc.csv')) { |
| 1897 | 1897 | if ($globalDebug) echo "Add to DB..."; |
| 1898 | - $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv','HC'); |
|
| 1898 | + $error = update_db::retrieve_owner($tmp_dir.'owner_hc.csv', 'HC'); |
|
| 1899 | 1899 | } else $error = "File ".$tmp_dir.'owner_hc.csv'." doesn't exist. Download failed."; |
| 1900 | 1900 | if ($error != '') { |
| 1901 | 1901 | return $error; |
| 1902 | 1902 | } elseif ($globalDebug) echo "Done\n"; |
| 1903 | 1903 | if ($globalDebug) echo "Owner Iceland: Download..."; |
| 1904 | - update_db::download('http://antonakis.co.uk/registers/Iceland.txt',$tmp_dir.'owner_tf.csv'); |
|
| 1904 | + update_db::download('http://antonakis.co.uk/registers/Iceland.txt', $tmp_dir.'owner_tf.csv'); |
|
| 1905 | 1905 | if (file_exists($tmp_dir.'owner_tf.csv')) { |
| 1906 | 1906 | if ($globalDebug) echo "Add to DB..."; |
| 1907 | - $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv','TF'); |
|
| 1907 | + $error = update_db::retrieve_owner($tmp_dir.'owner_tf.csv', 'TF'); |
|
| 1908 | 1908 | } else $error = "File ".$tmp_dir.'owner_tf.csv'." doesn't exist. Download failed."; |
| 1909 | 1909 | if ($error != '') { |
| 1910 | 1910 | return $error; |
| 1911 | 1911 | } elseif ($globalDebug) echo "Done\n"; |
| 1912 | 1912 | if ($globalDebug) echo "Owner Isle of Man: Download..."; |
| 1913 | - update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt',$tmp_dir.'owner_m.csv'); |
|
| 1913 | + update_db::download('http://antonakis.co.uk/registers/IsleOfMan.txt', $tmp_dir.'owner_m.csv'); |
|
| 1914 | 1914 | if (file_exists($tmp_dir.'owner_m.csv')) { |
| 1915 | 1915 | if ($globalDebug) echo "Add to DB..."; |
| 1916 | - $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv','M'); |
|
| 1916 | + $error = update_db::retrieve_owner($tmp_dir.'owner_m.csv', 'M'); |
|
| 1917 | 1917 | } else $error = "File ".$tmp_dir.'owner_m.csv'." doesn't exist. Download failed."; |
| 1918 | 1918 | if ($error != '') { |
| 1919 | 1919 | return $error; |
| 1920 | 1920 | } elseif ($globalDebug) echo "Done\n"; |
| 1921 | 1921 | if ($globalMasterSource) { |
| 1922 | 1922 | if ($globalDebug) echo "ModeS Netherlands: Download..."; |
| 1923 | - update_db::download('http://antonakis.co.uk/registers/Netherlands.txt',$tmp_dir.'owner_ph.csv'); |
|
| 1923 | + update_db::download('http://antonakis.co.uk/registers/Netherlands.txt', $tmp_dir.'owner_ph.csv'); |
|
| 1924 | 1924 | if (file_exists($tmp_dir.'owner_ph.csv')) { |
| 1925 | 1925 | if ($globalDebug) echo "Add to DB..."; |
| 1926 | - $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv','PH'); |
|
| 1926 | + $error = update_db::retrieve_owner($tmp_dir.'owner_ph.csv', 'PH'); |
|
| 1927 | 1927 | } else $error = "File ".$tmp_dir.'owner_ph.csv'." doesn't exist. Download failed."; |
| 1928 | 1928 | if ($error != '') { |
| 1929 | 1929 | return $error; |
| 1930 | 1930 | } elseif ($globalDebug) echo "Done\n"; |
| 1931 | 1931 | if ($globalDebug) echo "ModeS Denmark: Download..."; |
| 1932 | - update_db::download('http://antonakis.co.uk/registers/Denmark.txt',$tmp_dir.'owner_oy.csv'); |
|
| 1932 | + update_db::download('http://antonakis.co.uk/registers/Denmark.txt', $tmp_dir.'owner_oy.csv'); |
|
| 1933 | 1933 | if (file_exists($tmp_dir.'owner_oy.csv')) { |
| 1934 | 1934 | if ($globalDebug) echo "Add to DB..."; |
| 1935 | - $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv','OY'); |
|
| 1935 | + $error = update_db::retrieve_owner($tmp_dir.'owner_oy.csv', 'OY'); |
|
| 1936 | 1936 | } else $error = "File ".$tmp_dir.'owner_oy.csv'." doesn't exist. Download failed."; |
| 1937 | 1937 | if ($error != '') { |
| 1938 | 1938 | return $error; |
@@ -1945,7 +1945,7 @@ discard block |
||
| 1945 | 1945 | global $tmp_dir, $globalDebug; |
| 1946 | 1946 | $error = ''; |
| 1947 | 1947 | if ($globalDebug) echo "Translation : Download..."; |
| 1948 | - update_db::download('http://www.acarsd.org/download/translation.php',$tmp_dir.'translation.zip'); |
|
| 1948 | + update_db::download('http://www.acarsd.org/download/translation.php', $tmp_dir.'translation.zip'); |
|
| 1949 | 1949 | if (file_exists($tmp_dir.'translation.zip')) { |
| 1950 | 1950 | if ($globalDebug) echo "Unzip..."; |
| 1951 | 1951 | update_db::unzip($tmp_dir.'translation.zip'); |
@@ -1961,7 +1961,7 @@ discard block |
||
| 1961 | 1961 | public static function update_translation_fam() { |
| 1962 | 1962 | global $tmp_dir, $globalDebug; |
| 1963 | 1963 | if ($globalDebug) echo "Translation from FlightAirMap website : Download..."; |
| 1964 | - update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz',$tmp_dir.'translation.tsv.gz'); |
|
| 1964 | + update_db::download('http://data.flightairmap.fr/data/translation.tsv.gz', $tmp_dir.'translation.tsv.gz'); |
|
| 1965 | 1965 | if (file_exists($tmp_dir.'translation.tsv.gz')) { |
| 1966 | 1966 | if ($globalDebug) echo "Gunzip..."; |
| 1967 | 1967 | update_db::gunzip($tmp_dir.'translation.tsv.gz'); |
@@ -1976,7 +1976,7 @@ discard block |
||
| 1976 | 1976 | public static function update_ModeS_fam() { |
| 1977 | 1977 | global $tmp_dir, $globalDebug; |
| 1978 | 1978 | if ($globalDebug) echo "ModeS from FlightAirMap website : Download..."; |
| 1979 | - update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz',$tmp_dir.'modes.tsv.gz'); |
|
| 1979 | + update_db::download('http://data.flightairmap.fr/data/modes.tsv.gz', $tmp_dir.'modes.tsv.gz'); |
|
| 1980 | 1980 | if (file_exists($tmp_dir.'modes.tsv.gz')) { |
| 1981 | 1981 | if ($globalDebug) echo "Gunzip..."; |
| 1982 | 1982 | update_db::gunzip($tmp_dir.'modes.tsv.gz'); |
@@ -1992,9 +1992,9 @@ discard block |
||
| 1992 | 1992 | global $tmp_dir, $globalDebug, $globalOwner; |
| 1993 | 1993 | if ($globalDebug) echo "owner from FlightAirMap website : Download..."; |
| 1994 | 1994 | if ($globalOwner === TRUE) { |
| 1995 | - update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 1995 | + update_db::download('http://data.flightairmap.fr/data/owners_all.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 1996 | 1996 | } else { |
| 1997 | - update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz',$tmp_dir.'owners.tsv.gz'); |
|
| 1997 | + update_db::download('http://data.flightairmap.fr/data/owners.tsv.gz', $tmp_dir.'owners.tsv.gz'); |
|
| 1998 | 1998 | } |
| 1999 | 1999 | if (file_exists($tmp_dir.'owners.tsv.gz')) { |
| 2000 | 2000 | if ($globalDebug) echo "Gunzip..."; |
@@ -2010,7 +2010,7 @@ discard block |
||
| 2010 | 2010 | public static function update_routes_fam() { |
| 2011 | 2011 | global $tmp_dir, $globalDebug; |
| 2012 | 2012 | if ($globalDebug) echo "Routes from FlightAirMap website : Download..."; |
| 2013 | - update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz',$tmp_dir.'routes.tsv.gz'); |
|
| 2013 | + update_db::download('http://data.flightairmap.fr/data/routes.tsv.gz', $tmp_dir.'routes.tsv.gz'); |
|
| 2014 | 2014 | if (file_exists($tmp_dir.'routes.tsv.gz')) { |
| 2015 | 2015 | if ($globalDebug) echo "Gunzip..."; |
| 2016 | 2016 | update_db::gunzip($tmp_dir.'routes.tsv.gz'); |
@@ -2024,13 +2024,13 @@ discard block |
||
| 2024 | 2024 | } |
| 2025 | 2025 | public static function update_marine_identity_fam() { |
| 2026 | 2026 | global $tmp_dir, $globalDebug; |
| 2027 | - update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz.md5',$tmp_dir.'marine_identity.tsv.gz.md5'); |
|
| 2027 | + update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz.md5', $tmp_dir.'marine_identity.tsv.gz.md5'); |
|
| 2028 | 2028 | if (file_exists($tmp_dir.'marine_identity.tsv.gz.md5')) { |
| 2029 | - $marine_identity_md5_file = explode(' ',file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
| 2029 | + $marine_identity_md5_file = explode(' ', file_get_contents($tmp_dir.'marine_identity.tsv.gz.md5')); |
|
| 2030 | 2030 | $marine_identity_md5 = $marine_identity_md5_file[0]; |
| 2031 | 2031 | if (!update_db::check_marine_identity_version($marine_identity_md5)) { |
| 2032 | 2032 | if ($globalDebug) echo "Marine identity from FlightAirMap website : Download..."; |
| 2033 | - update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz',$tmp_dir.'marine_identity.tsv.gz'); |
|
| 2033 | + update_db::download('http://data.flightairmap.fr/data/marine_identity.tsv.gz', $tmp_dir.'marine_identity.tsv.gz'); |
|
| 2034 | 2034 | if (file_exists($tmp_dir.'marine_identity.tsv.gz')) { |
| 2035 | 2035 | if ($globalDebug) echo "Gunzip..."; |
| 2036 | 2036 | update_db::gunzip($tmp_dir.'marine_identity.tsv.gz'); |
@@ -2050,7 +2050,7 @@ discard block |
||
| 2050 | 2050 | public static function update_banned_fam() { |
| 2051 | 2051 | global $tmp_dir, $globalDebug; |
| 2052 | 2052 | if ($globalDebug) echo "Banned airlines in Europe from FlightAirMap website : Download..."; |
| 2053 | - update_db::download('http://data.flightairmap.fr/data/ban-eu.csv',$tmp_dir.'ban_eu.csv'); |
|
| 2053 | + update_db::download('http://data.flightairmap.fr/data/ban-eu.csv', $tmp_dir.'ban_eu.csv'); |
|
| 2054 | 2054 | if (file_exists($tmp_dir.'ban_eu.csv')) { |
| 2055 | 2055 | //if ($globalDebug) echo "Gunzip..."; |
| 2056 | 2056 | //update_db::gunzip($tmp_dir.'ban_ue.csv'); |
@@ -2069,18 +2069,18 @@ discard block |
||
| 2069 | 2069 | $error = ''; |
| 2070 | 2070 | if ($globalDebug) echo "Airspace from FlightAirMap website : Download..."; |
| 2071 | 2071 | if ($globalDBdriver == 'mysql') { |
| 2072 | - update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2072 | + update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2073 | 2073 | } else { |
| 2074 | - update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5',$tmp_dir.'airspace.sql.gz.md5'); |
|
| 2074 | + update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz.md5', $tmp_dir.'airspace.sql.gz.md5'); |
|
| 2075 | 2075 | } |
| 2076 | 2076 | if (file_exists($tmp_dir.'airspace.sql.gz.md5')) { |
| 2077 | - $airspace_md5_file = explode(' ',file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2077 | + $airspace_md5_file = explode(' ', file_get_contents($tmp_dir.'airspace.sql.gz.md5')); |
|
| 2078 | 2078 | $airspace_md5 = $airspace_md5_file[0]; |
| 2079 | 2079 | if (!update_db::check_airspace_version($airspace_md5)) { |
| 2080 | 2080 | if ($globalDBdriver == 'mysql') { |
| 2081 | - update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2081 | + update_db::download('http://data.flightairmap.fr/data/airspace_mysql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2082 | 2082 | } else { |
| 2083 | - update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz',$tmp_dir.'airspace.sql.gz'); |
|
| 2083 | + update_db::download('http://data.flightairmap.fr/data/airspace_pgsql.sql.gz', $tmp_dir.'airspace.sql.gz'); |
|
| 2084 | 2084 | } |
| 2085 | 2085 | if (file_exists($tmp_dir.'airspace.sql.gz')) { |
| 2086 | 2086 | if ($globalDebug) echo "Gunzip..."; |
@@ -2092,7 +2092,7 @@ discard block |
||
| 2092 | 2092 | try { |
| 2093 | 2093 | $sth = $Connection->db->prepare($query); |
| 2094 | 2094 | $sth->execute(); |
| 2095 | - } catch(PDOException $e) { |
|
| 2095 | + } catch (PDOException $e) { |
|
| 2096 | 2096 | return "error : ".$e->getMessage(); |
| 2097 | 2097 | } |
| 2098 | 2098 | } |
@@ -2110,15 +2110,15 @@ discard block |
||
| 2110 | 2110 | public static function update_tle() { |
| 2111 | 2111 | global $tmp_dir, $globalDebug; |
| 2112 | 2112 | if ($globalDebug) echo "Download TLE : Download..."; |
| 2113 | - $alltle = array('stations.txt','gps-ops.txt','glo-ops.txt','galileo.txt','weather.txt','noaa.txt','goes.txt','resource.txt','dmc.txt','tdrss.txt','geo.txt','intelsat.txt','gorizont.txt', |
|
| 2114 | - 'raduga.txt','molniya.txt','iridium.txt','orbcomm.txt','globalstar.txt','amateur.txt','x-comm.txt','other-comm.txt','sbas.txt','nnss.txt','musson.txt','science.txt','geodetic.txt', |
|
| 2115 | - 'engineering.txt','education.txt','military.txt','radar.txt','cubesat.txt','other.txt','tle-new.txt'); |
|
| 2113 | + $alltle = array('stations.txt', 'gps-ops.txt', 'glo-ops.txt', 'galileo.txt', 'weather.txt', 'noaa.txt', 'goes.txt', 'resource.txt', 'dmc.txt', 'tdrss.txt', 'geo.txt', 'intelsat.txt', 'gorizont.txt', |
|
| 2114 | + 'raduga.txt', 'molniya.txt', 'iridium.txt', 'orbcomm.txt', 'globalstar.txt', 'amateur.txt', 'x-comm.txt', 'other-comm.txt', 'sbas.txt', 'nnss.txt', 'musson.txt', 'science.txt', 'geodetic.txt', |
|
| 2115 | + 'engineering.txt', 'education.txt', 'military.txt', 'radar.txt', 'cubesat.txt', 'other.txt', 'tle-new.txt'); |
|
| 2116 | 2116 | foreach ($alltle as $filename) { |
| 2117 | 2117 | if ($globalDebug) echo "downloading ".$filename.'...'; |
| 2118 | - update_db::download('http://celestrak.com/NORAD/elements/'.$filename,$tmp_dir.$filename); |
|
| 2118 | + update_db::download('http://celestrak.com/NORAD/elements/'.$filename, $tmp_dir.$filename); |
|
| 2119 | 2119 | if (file_exists($tmp_dir.$filename)) { |
| 2120 | 2120 | if ($globalDebug) echo "Add to DB ".$filename."..."; |
| 2121 | - $error = update_db::tle($tmp_dir.$filename,str_replace('.txt','',$filename)); |
|
| 2121 | + $error = update_db::tle($tmp_dir.$filename, str_replace('.txt', '', $filename)); |
|
| 2122 | 2122 | } else $error = "File ".$tmp_dir.$filename." doesn't exist. Download failed."; |
| 2123 | 2123 | if ($error != '') { |
| 2124 | 2124 | echo $error."\n"; |
@@ -2131,32 +2131,32 @@ discard block |
||
| 2131 | 2131 | global $tmp_dir, $globalDebug; |
| 2132 | 2132 | $error = ''; |
| 2133 | 2133 | if ($globalDebug) echo "Models from FlightAirMap website : Download..."; |
| 2134 | - update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',$tmp_dir.'models.md5sum'); |
|
| 2134 | + update_db::download('http://data.flightairmap.fr/data/models/models.md5sum', $tmp_dir.'models.md5sum'); |
|
| 2135 | 2135 | if (file_exists($tmp_dir.'models.md5sum')) { |
| 2136 | 2136 | if ($globalDebug) echo "Check files...\n"; |
| 2137 | 2137 | $newmodelsdb = array(); |
| 2138 | - if (($handle = fopen($tmp_dir.'models.md5sum','r')) !== FALSE) { |
|
| 2139 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2138 | + if (($handle = fopen($tmp_dir.'models.md5sum', 'r')) !== FALSE) { |
|
| 2139 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2140 | 2140 | $model = trim($row[2]); |
| 2141 | 2141 | $newmodelsdb[$model] = trim($row[0]); |
| 2142 | 2142 | } |
| 2143 | 2143 | } |
| 2144 | 2144 | $modelsdb = array(); |
| 2145 | 2145 | if (file_exists(dirname(__FILE__).'/../models/models.md5sum')) { |
| 2146 | - if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum','r')) !== FALSE) { |
|
| 2147 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2146 | + if (($handle = fopen(dirname(__FILE__).'/../models/models.md5sum', 'r')) !== FALSE) { |
|
| 2147 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2148 | 2148 | $model = trim($row[2]); |
| 2149 | 2149 | $modelsdb[$model] = trim($row[0]); |
| 2150 | 2150 | } |
| 2151 | 2151 | } |
| 2152 | 2152 | } |
| 2153 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2153 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2154 | 2154 | foreach ($diff as $key => $value) { |
| 2155 | 2155 | if ($globalDebug) echo 'Downloading model '.$key.' ...'."\n"; |
| 2156 | - update_db::download('http://data.flightairmap.fr/data/models/'.$key,dirname(__FILE__).'/../models/'.$key); |
|
| 2156 | + update_db::download('http://data.flightairmap.fr/data/models/'.$key, dirname(__FILE__).'/../models/'.$key); |
|
| 2157 | 2157 | |
| 2158 | 2158 | } |
| 2159 | - update_db::download('http://data.flightairmap.fr/data/models/models.md5sum',dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2159 | + update_db::download('http://data.flightairmap.fr/data/models/models.md5sum', dirname(__FILE__).'/../models/models.md5sum'); |
|
| 2160 | 2160 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2161 | 2161 | if ($error != '') { |
| 2162 | 2162 | return $error; |
@@ -2168,32 +2168,32 @@ discard block |
||
| 2168 | 2168 | global $tmp_dir, $globalDebug; |
| 2169 | 2169 | $error = ''; |
| 2170 | 2170 | if ($globalDebug) echo "Space models from FlightAirMap website : Download..."; |
| 2171 | - update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',$tmp_dir.'space_models.md5sum'); |
|
| 2171 | + update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum', $tmp_dir.'space_models.md5sum'); |
|
| 2172 | 2172 | if (file_exists($tmp_dir.'space_models.md5sum')) { |
| 2173 | 2173 | if ($globalDebug) echo "Check files...\n"; |
| 2174 | 2174 | $newmodelsdb = array(); |
| 2175 | - if (($handle = fopen($tmp_dir.'space_models.md5sum','r')) !== FALSE) { |
|
| 2176 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2175 | + if (($handle = fopen($tmp_dir.'space_models.md5sum', 'r')) !== FALSE) { |
|
| 2176 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2177 | 2177 | $model = trim($row[2]); |
| 2178 | 2178 | $newmodelsdb[$model] = trim($row[0]); |
| 2179 | 2179 | } |
| 2180 | 2180 | } |
| 2181 | 2181 | $modelsdb = array(); |
| 2182 | 2182 | if (file_exists(dirname(__FILE__).'/../models/space/space_models.md5sum')) { |
| 2183 | - if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum','r')) !== FALSE) { |
|
| 2184 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2183 | + if (($handle = fopen(dirname(__FILE__).'/../models/space/space_models.md5sum', 'r')) !== FALSE) { |
|
| 2184 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2185 | 2185 | $model = trim($row[2]); |
| 2186 | 2186 | $modelsdb[$model] = trim($row[0]); |
| 2187 | 2187 | } |
| 2188 | 2188 | } |
| 2189 | 2189 | } |
| 2190 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2190 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2191 | 2191 | foreach ($diff as $key => $value) { |
| 2192 | 2192 | if ($globalDebug) echo 'Downloading space model '.$key.' ...'."\n"; |
| 2193 | - update_db::download('http://data.flightairmap.fr/data/models/space/'.$key,dirname(__FILE__).'/../models/space/'.$key); |
|
| 2193 | + update_db::download('http://data.flightairmap.fr/data/models/space/'.$key, dirname(__FILE__).'/../models/space/'.$key); |
|
| 2194 | 2194 | |
| 2195 | 2195 | } |
| 2196 | - update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum',dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2196 | + update_db::download('http://data.flightairmap.fr/data/models/space/space_models.md5sum', dirname(__FILE__).'/../models/space/space_models.md5sum'); |
|
| 2197 | 2197 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2198 | 2198 | if ($error != '') { |
| 2199 | 2199 | return $error; |
@@ -2205,32 +2205,32 @@ discard block |
||
| 2205 | 2205 | global $tmp_dir, $globalDebug; |
| 2206 | 2206 | $error = ''; |
| 2207 | 2207 | if ($globalDebug) echo "Vehicules models from FlightAirMap website : Download..."; |
| 2208 | - update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum',$tmp_dir.'vehicules_models.md5sum'); |
|
| 2208 | + update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum', $tmp_dir.'vehicules_models.md5sum'); |
|
| 2209 | 2209 | if (file_exists($tmp_dir.'vehicules_models.md5sum')) { |
| 2210 | 2210 | if ($globalDebug) echo "Check files...\n"; |
| 2211 | 2211 | $newmodelsdb = array(); |
| 2212 | - if (($handle = fopen($tmp_dir.'vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2213 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2212 | + if (($handle = fopen($tmp_dir.'vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2213 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2214 | 2214 | $model = trim($row[2]); |
| 2215 | 2215 | $newmodelsdb[$model] = trim($row[0]); |
| 2216 | 2216 | } |
| 2217 | 2217 | } |
| 2218 | 2218 | $modelsdb = array(); |
| 2219 | 2219 | if (file_exists(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum')) { |
| 2220 | - if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum','r')) !== FALSE) { |
|
| 2221 | - while (($row = fgetcsv($handle,1000," ")) !== FALSE) { |
|
| 2220 | + if (($handle = fopen(dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum', 'r')) !== FALSE) { |
|
| 2221 | + while (($row = fgetcsv($handle, 1000, " ")) !== FALSE) { |
|
| 2222 | 2222 | $model = trim($row[2]); |
| 2223 | 2223 | $modelsdb[$model] = trim($row[0]); |
| 2224 | 2224 | } |
| 2225 | 2225 | } |
| 2226 | 2226 | } |
| 2227 | - $diff = array_diff($newmodelsdb,$modelsdb); |
|
| 2227 | + $diff = array_diff($newmodelsdb, $modelsdb); |
|
| 2228 | 2228 | foreach ($diff as $key => $value) { |
| 2229 | 2229 | if ($globalDebug) echo 'Downloading vehicules model '.$key.' ...'."\n"; |
| 2230 | - update_db::download('http://data.flightairmap.fr/data/models/vehicules/'.$key,dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2230 | + update_db::download('http://data.flightairmap.fr/data/models/vehicules/'.$key, dirname(__FILE__).'/../models/vehicules/'.$key); |
|
| 2231 | 2231 | |
| 2232 | 2232 | } |
| 2233 | - update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum',dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2233 | + update_db::download('http://data.flightairmap.fr/data/models/vehicules/vehicules_models.md5sum', dirname(__FILE__).'/../models/vehicules/vehicules_models.md5sum'); |
|
| 2234 | 2234 | } else $error = "File ".$tmp_dir.'models.md5sum'." doesn't exist. Download failed."; |
| 2235 | 2235 | if ($error != '') { |
| 2236 | 2236 | return $error; |
@@ -2253,8 +2253,8 @@ discard block |
||
| 2253 | 2253 | */ |
| 2254 | 2254 | if (file_exists($tmp_dir.'aircrafts.html')) { |
| 2255 | 2255 | //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
| 2256 | - $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2257 | - $result = fread($fh,100000000); |
|
| 2256 | + $fh = fopen($tmp_dir.'aircrafts.html', "r"); |
|
| 2257 | + $result = fread($fh, 100000000); |
|
| 2258 | 2258 | //echo $result; |
| 2259 | 2259 | //var_dump(str_get_html($result)); |
| 2260 | 2260 | //print_r(self::table2array($result)); |
@@ -2272,23 +2272,23 @@ discard block |
||
| 2272 | 2272 | $Connection = new Connection(); |
| 2273 | 2273 | $sth = $Connection->db->prepare($query); |
| 2274 | 2274 | $sth->execute(); |
| 2275 | - } catch(PDOException $e) { |
|
| 2275 | + } catch (PDOException $e) { |
|
| 2276 | 2276 | return "error : ".$e->getMessage(); |
| 2277 | 2277 | } |
| 2278 | 2278 | |
| 2279 | 2279 | $error = ''; |
| 2280 | 2280 | if ($globalDebug) echo "Notam : Download..."; |
| 2281 | - update_db::download($globalNOTAMSource,$tmp_dir.'notam.rss'); |
|
| 2281 | + update_db::download($globalNOTAMSource, $tmp_dir.'notam.rss'); |
|
| 2282 | 2282 | if (file_exists($tmp_dir.'notam.rss')) { |
| 2283 | - $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')),true); |
|
| 2283 | + $notams = json_decode(json_encode(simplexml_load_file($tmp_dir.'notam.rss')), true); |
|
| 2284 | 2284 | foreach ($notams['channel']['item'] as $notam) { |
| 2285 | - $title = explode(':',$notam['title']); |
|
| 2285 | + $title = explode(':', $notam['title']); |
|
| 2286 | 2286 | $data['ref'] = trim($title[0]); |
| 2287 | 2287 | unset($title[0]); |
| 2288 | - $data['title'] = trim(implode(':',$title)); |
|
| 2289 | - $description = strip_tags($notam['description'],'<pre>'); |
|
| 2290 | - preg_match(':^(.*?)<pre>:',$description,$match); |
|
| 2291 | - $q = explode('/',$match[1]); |
|
| 2288 | + $data['title'] = trim(implode(':', $title)); |
|
| 2289 | + $description = strip_tags($notam['description'], '<pre>'); |
|
| 2290 | + preg_match(':^(.*?)<pre>:', $description, $match); |
|
| 2291 | + $q = explode('/', $match[1]); |
|
| 2292 | 2292 | $data['fir'] = $q[0]; |
| 2293 | 2293 | $data['code'] = $q[1]; |
| 2294 | 2294 | $ifrvfr = $q[2]; |
@@ -2304,30 +2304,30 @@ discard block |
||
| 2304 | 2304 | $data['lower_limit'] = $q[5]; |
| 2305 | 2305 | $data['upper_limit'] = $q[6]; |
| 2306 | 2306 | $latlonrad = $q[7]; |
| 2307 | - sscanf($latlonrad,'%4c%c%5c%c%3d',$las,$lac,$lns,$lnc,$radius); |
|
| 2308 | - $latitude = $Common->convertDec($las,'latitude'); |
|
| 2309 | - $longitude = $Common->convertDec($lns,'longitude'); |
|
| 2307 | + sscanf($latlonrad, '%4c%c%5c%c%3d', $las, $lac, $lns, $lnc, $radius); |
|
| 2308 | + $latitude = $Common->convertDec($las, 'latitude'); |
|
| 2309 | + $longitude = $Common->convertDec($lns, 'longitude'); |
|
| 2310 | 2310 | if ($lac == 'S') $latitude = '-'.$latitude; |
| 2311 | 2311 | if ($lnc == 'W') $longitude = '-'.$longitude; |
| 2312 | 2312 | $data['center_latitude'] = $latitude; |
| 2313 | 2313 | $data['center_longitude'] = $longitude; |
| 2314 | 2314 | $data['radius'] = intval($radius); |
| 2315 | 2315 | |
| 2316 | - preg_match(':<pre>(.*?)</pre>:',$description,$match); |
|
| 2316 | + preg_match(':<pre>(.*?)</pre>:', $description, $match); |
|
| 2317 | 2317 | $data['text'] = $match[1]; |
| 2318 | - preg_match(':</pre>(.*?)$:',$description,$match); |
|
| 2318 | + preg_match(':</pre>(.*?)$:', $description, $match); |
|
| 2319 | 2319 | $fromto = $match[1]; |
| 2320 | - preg_match('#FROM:(.*?)TO:#',$fromto,$match); |
|
| 2320 | + preg_match('#FROM:(.*?)TO:#', $fromto, $match); |
|
| 2321 | 2321 | $fromall = trim($match[1]); |
| 2322 | - preg_match('#^(.*?) \((.*?)\)$#',$fromall,$match); |
|
| 2322 | + preg_match('#^(.*?) \((.*?)\)$#', $fromall, $match); |
|
| 2323 | 2323 | $from = trim($match[1]); |
| 2324 | - $data['date_begin'] = date("Y-m-d H:i:s",strtotime($from)); |
|
| 2325 | - preg_match('#TO:(.*?)$#',$fromto,$match); |
|
| 2324 | + $data['date_begin'] = date("Y-m-d H:i:s", strtotime($from)); |
|
| 2325 | + preg_match('#TO:(.*?)$#', $fromto, $match); |
|
| 2326 | 2326 | $toall = trim($match[1]); |
| 2327 | - if (!preg_match(':Permanent:',$toall)) { |
|
| 2328 | - preg_match('#^(.*?) \((.*?)\)#',$toall,$match); |
|
| 2327 | + if (!preg_match(':Permanent:', $toall)) { |
|
| 2328 | + preg_match('#^(.*?) \((.*?)\)#', $toall, $match); |
|
| 2329 | 2329 | $to = trim($match[1]); |
| 2330 | - $data['date_end'] = date("Y-m-d H:i:s",strtotime($to)); |
|
| 2330 | + $data['date_end'] = date("Y-m-d H:i:s", strtotime($to)); |
|
| 2331 | 2331 | $data['permanent'] = 0; |
| 2332 | 2332 | } else { |
| 2333 | 2333 | $data['date_end'] = NULL; |
@@ -2335,7 +2335,7 @@ discard block |
||
| 2335 | 2335 | } |
| 2336 | 2336 | $data['full_notam'] = $notam['title'].'<br>'.$notam['description']; |
| 2337 | 2337 | $NOTAM = new NOTAM(); |
| 2338 | - $NOTAM->addNOTAM($data['ref'],$data['title'],'',$data['fir'],$data['code'],'',$data['scope'],$data['lower_limit'],$data['upper_limit'],$data['center_latitude'],$data['center_longitude'],$data['radius'],$data['date_begin'],$data['date_end'],$data['permanent'],$data['text'],$data['full_notam']); |
|
| 2338 | + $NOTAM->addNOTAM($data['ref'], $data['title'], '', $data['fir'], $data['code'], '', $data['scope'], $data['lower_limit'], $data['upper_limit'], $data['center_latitude'], $data['center_longitude'], $data['radius'], $data['date_begin'], $data['date_end'], $data['permanent'], $data['text'], $data['full_notam']); |
|
| 2339 | 2339 | unset($data); |
| 2340 | 2340 | } |
| 2341 | 2341 | } else $error = "File ".$tmp_dir.'notam.rss'." doesn't exist. Download failed."; |
@@ -2358,16 +2358,16 @@ discard block |
||
| 2358 | 2358 | $Connection = new Connection(); |
| 2359 | 2359 | $sth = $Connection->db->prepare($query); |
| 2360 | 2360 | $sth->execute(); |
| 2361 | - } catch(PDOException $e) { |
|
| 2361 | + } catch (PDOException $e) { |
|
| 2362 | 2362 | return "error : ".$e->getMessage(); |
| 2363 | 2363 | } |
| 2364 | 2364 | } |
| 2365 | 2365 | $Common = new Common(); |
| 2366 | 2366 | $airspace_lst = $Common->getData('https://raw.githubusercontent.com/XCSoar/xcsoar-data-repository/master/data/airspace.json'); |
| 2367 | - $airspace_json = json_decode($airspace_lst,true); |
|
| 2367 | + $airspace_json = json_decode($airspace_lst, true); |
|
| 2368 | 2368 | foreach ($airspace_json['records'] as $airspace) { |
| 2369 | 2369 | if ($globalDebug) echo $airspace['name']."...\n"; |
| 2370 | - update_db::download($airspace['uri'],$tmp_dir.$airspace['name']); |
|
| 2370 | + update_db::download($airspace['uri'], $tmp_dir.$airspace['name']); |
|
| 2371 | 2371 | if (file_exists($tmp_dir.$airspace['name'])) { |
| 2372 | 2372 | file_put_contents($tmp_dir.$airspace['name'], utf8_encode(file_get_contents($tmp_dir.$airspace['name']))); |
| 2373 | 2373 | //system('recode l9..utf8 '.$tmp_dir.$airspace['name']); |
@@ -2389,7 +2389,7 @@ discard block |
||
| 2389 | 2389 | $Connection = new Connection(); |
| 2390 | 2390 | $sth = $Connection->db->prepare($query); |
| 2391 | 2391 | $sth->execute(array(':new' => $new, ':old' => $old)); |
| 2392 | - } catch(PDOException $e) { |
|
| 2392 | + } catch (PDOException $e) { |
|
| 2393 | 2393 | return "error : ".$e->getMessage(); |
| 2394 | 2394 | } |
| 2395 | 2395 | } |
@@ -2406,7 +2406,7 @@ discard block |
||
| 2406 | 2406 | $Connection = new Connection(); |
| 2407 | 2407 | $sth = $Connection->db->prepare($query); |
| 2408 | 2408 | $sth->execute(); |
| 2409 | - } catch(PDOException $e) { |
|
| 2409 | + } catch (PDOException $e) { |
|
| 2410 | 2410 | return "error : ".$e->getMessage(); |
| 2411 | 2411 | } |
| 2412 | 2412 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2421,7 +2421,7 @@ discard block |
||
| 2421 | 2421 | $Connection = new Connection(); |
| 2422 | 2422 | $sth = $Connection->db->prepare($query); |
| 2423 | 2423 | $sth->execute(); |
| 2424 | - } catch(PDOException $e) { |
|
| 2424 | + } catch (PDOException $e) { |
|
| 2425 | 2425 | return "error : ".$e->getMessage(); |
| 2426 | 2426 | } |
| 2427 | 2427 | } |
@@ -2432,7 +2432,7 @@ discard block |
||
| 2432 | 2432 | $Connection = new Connection(); |
| 2433 | 2433 | $sth = $Connection->db->prepare($query); |
| 2434 | 2434 | $sth->execute(array(':version' => $version)); |
| 2435 | - } catch(PDOException $e) { |
|
| 2435 | + } catch (PDOException $e) { |
|
| 2436 | 2436 | return "error : ".$e->getMessage(); |
| 2437 | 2437 | } |
| 2438 | 2438 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2446,7 +2446,7 @@ discard block |
||
| 2446 | 2446 | $Connection = new Connection(); |
| 2447 | 2447 | $sth = $Connection->db->prepare($query); |
| 2448 | 2448 | $sth->execute(array(':version' => $version)); |
| 2449 | - } catch(PDOException $e) { |
|
| 2449 | + } catch (PDOException $e) { |
|
| 2450 | 2450 | return "error : ".$e->getMessage(); |
| 2451 | 2451 | } |
| 2452 | 2452 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2462,7 +2462,7 @@ discard block |
||
| 2462 | 2462 | $Connection = new Connection(); |
| 2463 | 2463 | $sth = $Connection->db->prepare($query); |
| 2464 | 2464 | $sth->execute(array(':version' => $version)); |
| 2465 | - } catch(PDOException $e) { |
|
| 2465 | + } catch (PDOException $e) { |
|
| 2466 | 2466 | return "error : ".$e->getMessage(); |
| 2467 | 2467 | } |
| 2468 | 2468 | } |
@@ -2474,7 +2474,7 @@ discard block |
||
| 2474 | 2474 | $Connection = new Connection(); |
| 2475 | 2475 | $sth = $Connection->db->prepare($query); |
| 2476 | 2476 | $sth->execute(array(':version' => $version)); |
| 2477 | - } catch(PDOException $e) { |
|
| 2477 | + } catch (PDOException $e) { |
|
| 2478 | 2478 | return "error : ".$e->getMessage(); |
| 2479 | 2479 | } |
| 2480 | 2480 | } |
@@ -2490,7 +2490,7 @@ discard block |
||
| 2490 | 2490 | $Connection = new Connection(); |
| 2491 | 2491 | $sth = $Connection->db->prepare($query); |
| 2492 | 2492 | $sth->execute(); |
| 2493 | - } catch(PDOException $e) { |
|
| 2493 | + } catch (PDOException $e) { |
|
| 2494 | 2494 | return "error : ".$e->getMessage(); |
| 2495 | 2495 | } |
| 2496 | 2496 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2505,7 +2505,7 @@ discard block |
||
| 2505 | 2505 | $Connection = new Connection(); |
| 2506 | 2506 | $sth = $Connection->db->prepare($query); |
| 2507 | 2507 | $sth->execute(); |
| 2508 | - } catch(PDOException $e) { |
|
| 2508 | + } catch (PDOException $e) { |
|
| 2509 | 2509 | return "error : ".$e->getMessage(); |
| 2510 | 2510 | } |
| 2511 | 2511 | } |
@@ -2520,7 +2520,7 @@ discard block |
||
| 2520 | 2520 | $Connection = new Connection(); |
| 2521 | 2521 | $sth = $Connection->db->prepare($query); |
| 2522 | 2522 | $sth->execute(); |
| 2523 | - } catch(PDOException $e) { |
|
| 2523 | + } catch (PDOException $e) { |
|
| 2524 | 2524 | return "error : ".$e->getMessage(); |
| 2525 | 2525 | } |
| 2526 | 2526 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2535,7 +2535,7 @@ discard block |
||
| 2535 | 2535 | $Connection = new Connection(); |
| 2536 | 2536 | $sth = $Connection->db->prepare($query); |
| 2537 | 2537 | $sth->execute(); |
| 2538 | - } catch(PDOException $e) { |
|
| 2538 | + } catch (PDOException $e) { |
|
| 2539 | 2539 | return "error : ".$e->getMessage(); |
| 2540 | 2540 | } |
| 2541 | 2541 | } |
@@ -2551,7 +2551,7 @@ discard block |
||
| 2551 | 2551 | $Connection = new Connection(); |
| 2552 | 2552 | $sth = $Connection->db->prepare($query); |
| 2553 | 2553 | $sth->execute(); |
| 2554 | - } catch(PDOException $e) { |
|
| 2554 | + } catch (PDOException $e) { |
|
| 2555 | 2555 | return "error : ".$e->getMessage(); |
| 2556 | 2556 | } |
| 2557 | 2557 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2566,7 +2566,7 @@ discard block |
||
| 2566 | 2566 | $Connection = new Connection(); |
| 2567 | 2567 | $sth = $Connection->db->prepare($query); |
| 2568 | 2568 | $sth->execute(); |
| 2569 | - } catch(PDOException $e) { |
|
| 2569 | + } catch (PDOException $e) { |
|
| 2570 | 2570 | return "error : ".$e->getMessage(); |
| 2571 | 2571 | } |
| 2572 | 2572 | } |
@@ -2581,7 +2581,7 @@ discard block |
||
| 2581 | 2581 | $Connection = new Connection(); |
| 2582 | 2582 | $sth = $Connection->db->prepare($query); |
| 2583 | 2583 | $sth->execute(); |
| 2584 | - } catch(PDOException $e) { |
|
| 2584 | + } catch (PDOException $e) { |
|
| 2585 | 2585 | return "error : ".$e->getMessage(); |
| 2586 | 2586 | } |
| 2587 | 2587 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2596,7 +2596,7 @@ discard block |
||
| 2596 | 2596 | $Connection = new Connection(); |
| 2597 | 2597 | $sth = $Connection->db->prepare($query); |
| 2598 | 2598 | $sth->execute(); |
| 2599 | - } catch(PDOException $e) { |
|
| 2599 | + } catch (PDOException $e) { |
|
| 2600 | 2600 | return "error : ".$e->getMessage(); |
| 2601 | 2601 | } |
| 2602 | 2602 | } |
@@ -2611,7 +2611,7 @@ discard block |
||
| 2611 | 2611 | $Connection = new Connection(); |
| 2612 | 2612 | $sth = $Connection->db->prepare($query); |
| 2613 | 2613 | $sth->execute(); |
| 2614 | - } catch(PDOException $e) { |
|
| 2614 | + } catch (PDOException $e) { |
|
| 2615 | 2615 | return "error : ".$e->getMessage(); |
| 2616 | 2616 | } |
| 2617 | 2617 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2626,7 +2626,7 @@ discard block |
||
| 2626 | 2626 | $Connection = new Connection(); |
| 2627 | 2627 | $sth = $Connection->db->prepare($query); |
| 2628 | 2628 | $sth->execute(); |
| 2629 | - } catch(PDOException $e) { |
|
| 2629 | + } catch (PDOException $e) { |
|
| 2630 | 2630 | return "error : ".$e->getMessage(); |
| 2631 | 2631 | } |
| 2632 | 2632 | } |
@@ -2641,7 +2641,7 @@ discard block |
||
| 2641 | 2641 | $Connection = new Connection(); |
| 2642 | 2642 | $sth = $Connection->db->prepare($query); |
| 2643 | 2643 | $sth->execute(); |
| 2644 | - } catch(PDOException $e) { |
|
| 2644 | + } catch (PDOException $e) { |
|
| 2645 | 2645 | return "error : ".$e->getMessage(); |
| 2646 | 2646 | } |
| 2647 | 2647 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -2656,7 +2656,7 @@ discard block |
||
| 2656 | 2656 | $Connection = new Connection(); |
| 2657 | 2657 | $sth = $Connection->db->prepare($query); |
| 2658 | 2658 | $sth->execute(); |
| 2659 | - } catch(PDOException $e) { |
|
| 2659 | + } catch (PDOException $e) { |
|
| 2660 | 2660 | return "error : ".$e->getMessage(); |
| 2661 | 2661 | } |
| 2662 | 2662 | } |
@@ -2671,7 +2671,7 @@ discard block |
||
| 2671 | 2671 | $Connection = new Connection(); |
| 2672 | 2672 | $sth = $Connection->db->prepare($query); |
| 2673 | 2673 | $sth->execute(); |
| 2674 | - } catch(PDOException $e) { |
|
| 2674 | + } catch (PDOException $e) { |
|
| 2675 | 2675 | return "error : ".$e->getMessage(); |
| 2676 | 2676 | } |
| 2677 | 2677 | } |
@@ -2686,7 +2686,7 @@ discard block |
||
| 2686 | 2686 | $Connection = new Connection(); |
| 2687 | 2687 | $sth = $Connection->db->prepare($query); |
| 2688 | 2688 | $sth->execute(); |
| 2689 | - } catch(PDOException $e) { |
|
| 2689 | + } catch (PDOException $e) { |
|
| 2690 | 2690 | return "error : ".$e->getMessage(); |
| 2691 | 2691 | } |
| 2692 | 2692 | } |
