@@ -4,8 +4,8 @@ discard block |
||
4 | 4 | require_once('require/class.Stats.php'); |
5 | 5 | require_once('require/class.Language.php'); |
6 | 6 | if (!isset($_GET['airline'])) { |
7 | - header('Location: '.$globalURL.'/airline'); |
|
8 | - die(); |
|
7 | + header('Location: '.$globalURL.'/airline'); |
|
8 | + die(); |
|
9 | 9 | } |
10 | 10 | $airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
11 | 11 | $Spotter = new Spotter(); |
@@ -76,11 +76,11 @@ discard block |
||
76 | 76 | } |
77 | 77 | $country_data = substr($country_data, 0, -1); |
78 | 78 | print $country_data; |
79 | - print '];'; |
|
80 | - print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
81 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
82 | - print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});'; |
|
83 | - print 'new Datamap({ |
|
79 | + print '];'; |
|
80 | + print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
81 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
82 | + print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});'; |
|
83 | + print 'new Datamap({ |
|
84 | 84 | element: document.getElementById("chartCountry"), |
85 | 85 | projection: "mercator", // big world map |
86 | 86 | fills: { defaultFill: "#F5F5F5" }, |
@@ -42,7 +42,9 @@ discard block |
||
42 | 42 | } |
43 | 43 | $Stats = new Stats(); |
44 | 44 | $airline_names = $Stats->getAllAirlineNames(); |
45 | - if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames(); |
|
45 | + if (empty($airline_names)) { |
|
46 | + $airline_names = $Spotter->getAllAirlineNames(); |
|
47 | + } |
|
46 | 48 | foreach($airline_names as $airline_name) |
47 | 49 | { |
48 | 50 | if($airline == $airline_name['airline_icao']) |
@@ -65,8 +67,7 @@ discard block |
||
65 | 67 | if ($globalIVAO && @getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif')) |
66 | 68 | { |
67 | 69 | print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.gif" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />'; |
68 | - } |
|
69 | - elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png')) |
|
70 | + } elseif (@getimagesize($globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png')) |
|
70 | 71 | { |
71 | 72 | print '<img src="'.$globalURL.'/images/airlines/'.$spotter_array[0]['airline_icao'].'.png" alt="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" title="'.$spotter_array[0]['airline_name'].' ('.$spotter_array[0]['airline_icao'].')" class="logo" />'; |
72 | 73 | } |
@@ -7,21 +7,21 @@ discard block |
||
7 | 7 | header('Location: '.$globalURL.'/airline'); |
8 | 8 | die(); |
9 | 9 | } |
10 | -$airline = filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
10 | +$airline = filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
11 | 11 | $Spotter = new Spotter(); |
12 | 12 | $alliance = false; |
13 | -if (strpos($airline,'alliance_') !== FALSE) { |
|
13 | +if (strpos($airline, 'alliance_') !== FALSE) { |
|
14 | 14 | $alliance = true; |
15 | 15 | } else { |
16 | - $spotter_array = $Spotter->getSpotterDataByAirline($airline,"0,1",""); |
|
16 | + $spotter_array = $Spotter->getSpotterDataByAirline($airline, "0,1", ""); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | if (!empty($spotter_array) || $alliance === true) |
20 | 20 | { |
21 | 21 | if ($alliance) { |
22 | - $title = sprintf(_("Most Common Departure Airports by Country from %s"),str_replace('_',' ',str_replace('alliance_','',$airline))); |
|
22 | + $title = sprintf(_("Most Common Departure Airports by Country from %s"), str_replace('_', ' ', str_replace('alliance_', '', $airline))); |
|
23 | 23 | } else { |
24 | - $title = sprintf(_("Most Common Departure Airports by Country from %s (%s)"),$spotter_array[0]['airline_name'],$spotter_array[0]['airline_icao']); |
|
24 | + $title = sprintf(_("Most Common Departure Airports by Country from %s (%s)"), $spotter_array[0]['airline_name'], $spotter_array[0]['airline_icao']); |
|
25 | 25 | } |
26 | 26 | require_once('header.php'); |
27 | 27 | print '<div class="select-item">'; |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | $alliances = $Spotter->getAllAllianceNames(); |
32 | 32 | if (!empty($alliances)) { |
33 | 33 | foreach ($alliances as $al) { |
34 | - if ($alliance && str_replace('_',' ',str_replace('alliance_','',$airline)) == $al['alliance']) { |
|
35 | - print '<option value="'.str_replace(' ','_',$al['alliance']).'" selected>'.$al['alliance'].'</option>'; |
|
34 | + if ($alliance && str_replace('_', ' ', str_replace('alliance_', '', $airline)) == $al['alliance']) { |
|
35 | + print '<option value="'.str_replace(' ', '_', $al['alliance']).'" selected>'.$al['alliance'].'</option>'; |
|
36 | 36 | } else { |
37 | - print '<option value="'.str_replace(' ','_',$al['alliance']).'">'.$al['alliance'].'</option>'; |
|
37 | + print '<option value="'.str_replace(' ', '_', $al['alliance']).'">'.$al['alliance'].'</option>'; |
|
38 | 38 | } |
39 | 39 | } |
40 | 40 | print '<option disabled>──────────────────</option>'; |
@@ -42,9 +42,9 @@ discard block |
||
42 | 42 | $Stats = new Stats(); |
43 | 43 | $airline_names = $Stats->getAllAirlineNames(); |
44 | 44 | if (empty($airline_names)) $airline_names = $Spotter->getAllAirlineNames(); |
45 | - foreach($airline_names as $airline_name) |
|
45 | + foreach ($airline_names as $airline_name) |
|
46 | 46 | { |
47 | - if($airline == $airline_name['airline_icao']) |
|
47 | + if ($airline == $airline_name['airline_icao']) |
|
48 | 48 | { |
49 | 49 | print '<option value="'.$airline_name['airline_icao'].'" selected="selected">'.$airline_name['airline_name'].' ('.$airline_name['airline_icao'].')</option>'; |
50 | 50 | } else { |
@@ -78,12 +78,12 @@ discard block |
||
78 | 78 | print '</div>'; |
79 | 79 | } else { |
80 | 80 | print '<div class="info column">'; |
81 | - print '<h1>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</h1>'; |
|
82 | - if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_','',$airline).'.png')) |
|
81 | + print '<h1>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</h1>'; |
|
82 | + if (@getimagesize($globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png') || @getimagesize('images/airlines/'.str_replace('alliance_', '', $airline).'.png')) |
|
83 | 83 | { |
84 | - print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_','',$airline).'.png" alt="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" title="'.str_replace('_',' ',str_replace('alliance_','',$airline)).'" class="logo" />'; |
|
84 | + print '<img src="'.$globalURL.'/images/airlines/'.str_replace('alliance_', '', $airline).'.png" alt="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" title="'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'" class="logo" />'; |
|
85 | 85 | } |
86 | - print '<div><span class="label">'._("Name").'</span>'.str_replace('_',' ',str_replace('alliance_','',$airline)).'</div>'; |
|
86 | + print '<div><span class="label">'._("Name").'</span>'.str_replace('_', ' ', str_replace('alliance_', '', $airline)).'</div>'; |
|
87 | 87 | print '</div>'; |
88 | 88 | } |
89 | 89 | } else { |
@@ -94,9 +94,9 @@ discard block |
||
94 | 94 | print '<div class="column">'; |
95 | 95 | print '<h2>'._("Most Common Departure Airports by Country").'</h2>'; |
96 | 96 | if ($alliance) { |
97 | - print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s</strong>."),str_replace('_',' ',str_replace('alliance_','',$airline))).'</p>'; |
|
97 | + print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s</strong>."), str_replace('_', ' ', str_replace('alliance_', '', $airline))).'</p>'; |
|
98 | 98 | } else { |
99 | - print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s</strong>."),$spotter_array[0]['airline_name']).'</p>'; |
|
99 | + print '<p>'.sprintf(_("The statistic below shows all departure airports by Country of origin of flights from <strong>%s</strong>."), $spotter_array[0]['airline_name']).'</p>'; |
|
100 | 100 | } |
101 | 101 | /* |
102 | 102 | if ($alliance) { |
@@ -105,14 +105,14 @@ discard block |
||
105 | 105 | $airport_country_array = $Spotter->countAllDepartureAirportCountriesByAirline($airline); |
106 | 106 | } |
107 | 107 | */ |
108 | - $airport_country_array = $Stats->countAllDepartureCountries(true,$airline); |
|
108 | + $airport_country_array = $Stats->countAllDepartureCountries(true, $airline); |
|
109 | 109 | print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>'; |
110 | 110 | print '<script type="text/javascript" src="'.$globalURL.'/js/topojson.v2.min.js"></script>'; |
111 | 111 | print '<script type="text/javascript" src="'.$globalURL.'/js/datamaps.world.min.js"></script>'; |
112 | 112 | print '<div id="chartCountry" class="chart" width="100%"></div><script>'; |
113 | 113 | print 'var series = ['; |
114 | 114 | $country_data = ''; |
115 | - foreach($airport_country_array as $airport_item) |
|
115 | + foreach ($airport_country_array as $airport_item) |
|
116 | 116 | { |
117 | 117 | $country_data .= '[ "'.$airport_item['departure_airport_country_iso3'].'",'.$airport_item['airport_departure_country_count'].'],'; |
118 | 118 | } |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | print '</thead>'; |
160 | 160 | print '<tbody>'; |
161 | 161 | $i = 1; |
162 | - foreach($airport_country_array as $airport_item) |
|
162 | + foreach ($airport_country_array as $airport_item) |
|
163 | 163 | { |
164 | 164 | print '<tr>'; |
165 | 165 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -254,6 +254,7 @@ discard block |
||
254 | 254 | * |
255 | 255 | * @param String $aircraft_registration the registration of the aircraft |
256 | 256 | * @param String $aircraft_name type of the aircraft |
257 | + * @param string $type |
|
257 | 258 | * @return Array the aircraft thumbnail, orignal url and copyright |
258 | 259 | * |
259 | 260 | */ |
@@ -287,6 +288,7 @@ discard block |
||
287 | 288 | * |
288 | 289 | * @param String $registration the registration of the aircraft |
289 | 290 | * @param String $name type of the aircraft |
291 | + * @param string $type |
|
290 | 292 | * @return Array the aircraft thumbnail, orignal url and copyright |
291 | 293 | * |
292 | 294 | */ |
@@ -325,6 +327,7 @@ discard block |
||
325 | 327 | * |
326 | 328 | * @param String $aircraft_registration the registration of the aircraft |
327 | 329 | * @param String $aircraft_name type of the aircraft |
330 | + * @param string $type |
|
328 | 331 | * @return Array the aircraft thumbnail, orignal url and copyright |
329 | 332 | * |
330 | 333 | */ |
@@ -367,6 +370,7 @@ discard block |
||
367 | 370 | * |
368 | 371 | * @param String $aircraft_registration the registration of the aircraft |
369 | 372 | * @param String $aircraft_name type of the aircraft |
373 | + * @param string $type |
|
370 | 374 | * @return Array the aircraft thumbnail, orignal url and copyright |
371 | 375 | * |
372 | 376 | */ |
@@ -401,6 +405,7 @@ discard block |
||
401 | 405 | * |
402 | 406 | * @param String $registration the registration of the aircraft |
403 | 407 | * @param String $name type of the aircraft |
408 | + * @param string $type |
|
404 | 409 | * @return Array the aircraft thumbnail, orignal url and copyright |
405 | 410 | * |
406 | 411 | */ |
@@ -429,6 +434,10 @@ discard block |
||
429 | 434 | return false; |
430 | 435 | } |
431 | 436 | |
437 | + /** |
|
438 | + * @param string $type |
|
439 | + * @param string $aircraft_icao |
|
440 | + */ |
|
432 | 441 | public function fromIvaoMtl($type,$aircraft_icao,$airline_icao) { |
433 | 442 | $Common = new Common(); |
434 | 443 | //echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg'; |
@@ -450,6 +459,7 @@ discard block |
||
450 | 459 | * |
451 | 460 | * @param String $aircraft_registration the registration of the aircraft |
452 | 461 | * @param String $aircraft_name type of the aircraft |
462 | + * @param string $type |
|
453 | 463 | * @return Array the aircraft thumbnail, orignal url and copyright |
454 | 464 | * |
455 | 465 | */ |
@@ -482,6 +492,7 @@ discard block |
||
482 | 492 | * |
483 | 493 | * @param String $aircraft_registration the registration of the aircraft |
484 | 494 | * @param String $aircraft_name type of the aircraft |
495 | + * @param string $type |
|
485 | 496 | * @return Array the aircraft thumbnail, orignal url and copyright |
486 | 497 | * |
487 | 498 | */ |
@@ -507,6 +518,7 @@ discard block |
||
507 | 518 | * |
508 | 519 | * @param String $registration the registration of the aircraft/mmsi |
509 | 520 | * @param String $name name |
521 | + * @param string $type |
|
510 | 522 | * @return Array the aircraft thumbnail, orignal url and copyright |
511 | 523 | * |
512 | 524 | */ |
@@ -568,6 +580,7 @@ discard block |
||
568 | 580 | * |
569 | 581 | * @param String $registration the registration of the aircraft |
570 | 582 | * @param String $name type of the aircraft |
583 | + * @param string $type |
|
571 | 584 | * @return Array the aircraft thumbnail, orignal url and copyright |
572 | 585 | * |
573 | 586 | */ |
@@ -12,11 +12,11 @@ discard block |
||
12 | 12 | } |
13 | 13 | |
14 | 14 | /** |
15 | - * Gets the images based on the aircraft registration |
|
16 | - * |
|
17 | - * @return Array the images list |
|
18 | - * |
|
19 | - */ |
|
15 | + * Gets the images based on the aircraft registration |
|
16 | + * |
|
17 | + * @return Array the images list |
|
18 | + * |
|
19 | + */ |
|
20 | 20 | public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
21 | 21 | { |
22 | 22 | $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
@@ -37,11 +37,11 @@ discard block |
||
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
40 | - * Gets the images based on the ship name |
|
41 | - * |
|
42 | - * @return Array the images list |
|
43 | - * |
|
44 | - */ |
|
40 | + * Gets the images based on the ship name |
|
41 | + * |
|
42 | + * @return Array the images list |
|
43 | + * |
|
44 | + */ |
|
45 | 45 | public function getMarineImage($mmsi,$imo = '',$name = '') |
46 | 46 | { |
47 | 47 | $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
@@ -68,11 +68,11 @@ discard block |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
71 | - * Gets the image copyright based on the Exif data |
|
72 | - * |
|
73 | - * @return String image copyright |
|
74 | - * |
|
75 | - */ |
|
71 | + * Gets the image copyright based on the Exif data |
|
72 | + * |
|
73 | + * @return String image copyright |
|
74 | + * |
|
75 | + */ |
|
76 | 76 | public function getExifCopyright($url) { |
77 | 77 | $exif = exif_read_data($url); |
78 | 78 | $copyright = ''; |
@@ -87,11 +87,11 @@ discard block |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | /** |
90 | - * Adds the images based on the aircraft registration |
|
91 | - * |
|
92 | - * @return String either success or error |
|
93 | - * |
|
94 | - */ |
|
90 | + * Adds the images based on the aircraft registration |
|
91 | + * |
|
92 | + * @return String either success or error |
|
93 | + * |
|
94 | + */ |
|
95 | 95 | public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
96 | 96 | { |
97 | 97 | global $globalDebug,$globalAircraftImageFetch; |
@@ -119,11 +119,11 @@ discard block |
||
119 | 119 | } |
120 | 120 | |
121 | 121 | /** |
122 | - * Adds the images based on the marine name |
|
123 | - * |
|
124 | - * @return String either success or error |
|
125 | - * |
|
126 | - */ |
|
122 | + * Adds the images based on the marine name |
|
123 | + * |
|
124 | + * @return String either success or error |
|
125 | + * |
|
126 | + */ |
|
127 | 127 | public function addMarineImage($mmsi,$imo = '',$name = '') |
128 | 128 | { |
129 | 129 | global $globalDebug,$globalMarineImageFetch; |
@@ -160,12 +160,12 @@ discard block |
||
160 | 160 | } |
161 | 161 | |
162 | 162 | /** |
163 | - * Gets the aircraft image |
|
164 | - * |
|
165 | - * @param String $aircraft_registration the registration of the aircraft |
|
166 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
167 | - * |
|
168 | - */ |
|
163 | + * Gets the aircraft image |
|
164 | + * |
|
165 | + * @param String $aircraft_registration the registration of the aircraft |
|
166 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
167 | + * |
|
168 | + */ |
|
169 | 169 | public function findAircraftImage($aircraft_registration, $aircraft_icao = '', $airline_icao = '') |
170 | 170 | { |
171 | 171 | global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA; |
@@ -209,14 +209,14 @@ discard block |
||
209 | 209 | } |
210 | 210 | |
211 | 211 | /** |
212 | - * Gets the vessel image |
|
213 | - * |
|
214 | - * @param String $mmsi the vessel mmsi |
|
215 | - * @param String $imo the vessel imo |
|
216 | - * @param String $name the vessel name |
|
217 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
218 | - * |
|
219 | - */ |
|
212 | + * Gets the vessel image |
|
213 | + * |
|
214 | + * @param String $mmsi the vessel mmsi |
|
215 | + * @param String $imo the vessel imo |
|
216 | + * @param String $name the vessel name |
|
217 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
218 | + * |
|
219 | + */ |
|
220 | 220 | public function findMarineImage($mmsi,$imo = '',$name = '') |
221 | 221 | { |
222 | 222 | global $globalMarineImageSources; |
@@ -250,13 +250,13 @@ discard block |
||
250 | 250 | } |
251 | 251 | |
252 | 252 | /** |
253 | - * Gets the aircraft image from Planespotters |
|
254 | - * |
|
255 | - * @param String $aircraft_registration the registration of the aircraft |
|
256 | - * @param String $aircraft_name type of the aircraft |
|
257 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
258 | - * |
|
259 | - */ |
|
253 | + * Gets the aircraft image from Planespotters |
|
254 | + * |
|
255 | + * @param String $aircraft_registration the registration of the aircraft |
|
256 | + * @param String $aircraft_name type of the aircraft |
|
257 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
258 | + * |
|
259 | + */ |
|
260 | 260 | public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') { |
261 | 261 | $Common = new Common(); |
262 | 262 | // If aircraft registration is only number, also check with aircraft model |
@@ -283,13 +283,13 @@ discard block |
||
283 | 283 | } |
284 | 284 | |
285 | 285 | /** |
286 | - * Gets the aircraft image from Deviantart |
|
287 | - * |
|
288 | - * @param String $registration the registration of the aircraft |
|
289 | - * @param String $name type of the aircraft |
|
290 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
291 | - * |
|
292 | - */ |
|
286 | + * Gets the aircraft image from Deviantart |
|
287 | + * |
|
288 | + * @param String $registration the registration of the aircraft |
|
289 | + * @param String $name type of the aircraft |
|
290 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
291 | + * |
|
292 | + */ |
|
293 | 293 | public function fromDeviantart($type,$registration, $name='') { |
294 | 294 | $Common = new Common(); |
295 | 295 | if ($type == 'aircraft') { |
@@ -321,13 +321,13 @@ discard block |
||
321 | 321 | } |
322 | 322 | |
323 | 323 | /** |
324 | - * Gets the aircraft image from JetPhotos |
|
325 | - * |
|
326 | - * @param String $aircraft_registration the registration of the aircraft |
|
327 | - * @param String $aircraft_name type of the aircraft |
|
328 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
329 | - * |
|
330 | - */ |
|
324 | + * Gets the aircraft image from JetPhotos |
|
325 | + * |
|
326 | + * @param String $aircraft_registration the registration of the aircraft |
|
327 | + * @param String $aircraft_name type of the aircraft |
|
328 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
329 | + * |
|
330 | + */ |
|
331 | 331 | public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') { |
332 | 332 | $Common = new Common(); |
333 | 333 | $url= 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
@@ -363,13 +363,13 @@ discard block |
||
363 | 363 | } |
364 | 364 | |
365 | 365 | /** |
366 | - * Gets the aircraft image from PlanePictures |
|
367 | - * |
|
368 | - * @param String $aircraft_registration the registration of the aircraft |
|
369 | - * @param String $aircraft_name type of the aircraft |
|
370 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
371 | - * |
|
372 | - */ |
|
366 | + * Gets the aircraft image from PlanePictures |
|
367 | + * |
|
368 | + * @param String $aircraft_registration the registration of the aircraft |
|
369 | + * @param String $aircraft_name type of the aircraft |
|
370 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
371 | + * |
|
372 | + */ |
|
373 | 373 | public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') { |
374 | 374 | $Common = new Common(); |
375 | 375 | $url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
@@ -397,13 +397,13 @@ discard block |
||
397 | 397 | } |
398 | 398 | |
399 | 399 | /** |
400 | - * Gets the aircraft image from Flickr |
|
401 | - * |
|
402 | - * @param String $registration the registration of the aircraft |
|
403 | - * @param String $name type of the aircraft |
|
404 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
405 | - * |
|
406 | - */ |
|
400 | + * Gets the aircraft image from Flickr |
|
401 | + * |
|
402 | + * @param String $registration the registration of the aircraft |
|
403 | + * @param String $name type of the aircraft |
|
404 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
405 | + * |
|
406 | + */ |
|
407 | 407 | public function fromFlickr($type,$registration,$name='') { |
408 | 408 | $Common = new Common(); |
409 | 409 | if ($type == 'aircraft') { |
@@ -446,13 +446,13 @@ discard block |
||
446 | 446 | } |
447 | 447 | |
448 | 448 | /** |
449 | - * Gets the aircraft image from Bing |
|
450 | - * |
|
451 | - * @param String $aircraft_registration the registration of the aircraft |
|
452 | - * @param String $aircraft_name type of the aircraft |
|
453 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
454 | - * |
|
455 | - */ |
|
449 | + * Gets the aircraft image from Bing |
|
450 | + * |
|
451 | + * @param String $aircraft_registration the registration of the aircraft |
|
452 | + * @param String $aircraft_name type of the aircraft |
|
453 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
454 | + * |
|
455 | + */ |
|
456 | 456 | public function fromBing($type,$aircraft_registration,$aircraft_name='') { |
457 | 457 | global $globalImageBingKey; |
458 | 458 | $Common = new Common(); |
@@ -478,13 +478,13 @@ discard block |
||
478 | 478 | } |
479 | 479 | |
480 | 480 | /** |
481 | - * Gets the aircraft image from airport-data |
|
482 | - * |
|
483 | - * @param String $aircraft_registration the registration of the aircraft |
|
484 | - * @param String $aircraft_name type of the aircraft |
|
485 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
486 | - * |
|
487 | - */ |
|
481 | + * Gets the aircraft image from airport-data |
|
482 | + * |
|
483 | + * @param String $aircraft_registration the registration of the aircraft |
|
484 | + * @param String $aircraft_name type of the aircraft |
|
485 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
486 | + * |
|
487 | + */ |
|
488 | 488 | public function fromAirportData($type,$aircraft_registration,$aircraft_name='') { |
489 | 489 | $Common = new Common(); |
490 | 490 | $url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration; |
@@ -503,13 +503,13 @@ discard block |
||
503 | 503 | } |
504 | 504 | |
505 | 505 | /** |
506 | - * Gets image from WikiMedia |
|
507 | - * |
|
508 | - * @param String $registration the registration of the aircraft/mmsi |
|
509 | - * @param String $name name |
|
510 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
511 | - * |
|
512 | - */ |
|
506 | + * Gets image from WikiMedia |
|
507 | + * |
|
508 | + * @param String $registration the registration of the aircraft/mmsi |
|
509 | + * @param String $name name |
|
510 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
511 | + * |
|
512 | + */ |
|
513 | 513 | public function fromWikimedia($type,$registration,$name='') { |
514 | 514 | $Common = new Common(); |
515 | 515 | if ($type == 'aircraft') { |
@@ -564,13 +564,13 @@ discard block |
||
564 | 564 | } |
565 | 565 | |
566 | 566 | /** |
567 | - * Gets the aircraft image from custom url |
|
568 | - * |
|
569 | - * @param String $registration the registration of the aircraft |
|
570 | - * @param String $name type of the aircraft |
|
571 | - * @return Array the aircraft thumbnail, orignal url and copyright |
|
572 | - * |
|
573 | - */ |
|
567 | + * Gets the aircraft image from custom url |
|
568 | + * |
|
569 | + * @param String $registration the registration of the aircraft |
|
570 | + * @param String $name type of the aircraft |
|
571 | + * @return Array the aircraft thumbnail, orignal url and copyright |
|
572 | + * |
|
573 | + */ |
|
574 | 574 | public function fromCustomSource($type,$registration,$name='') { |
575 | 575 | global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug; |
576 | 576 | //$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true); |
@@ -18,22 +18,22 @@ discard block |
||
18 | 18 | * @return Array the images list |
19 | 19 | * |
20 | 20 | */ |
21 | - public function getSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
|
21 | + public function getSpotterImage($registration, $aircraft_icao = '', $airline_icao = '') |
|
22 | 22 | { |
23 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
24 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
25 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
23 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
24 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
25 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
26 | 26 | $reg = $registration; |
27 | 27 | if ($reg == '' && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao; |
28 | 28 | $reg = trim($reg); |
29 | - $query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration |
|
29 | + $query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration |
|
30 | 30 | FROM spotter_image |
31 | 31 | WHERE spotter_image.registration = :registration LIMIT 1"; |
32 | 32 | $sth = $this->db->prepare($query); |
33 | 33 | $sth->execute(array(':registration' => $reg)); |
34 | 34 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
35 | 35 | if (!empty($result)) return $result; |
36 | - elseif ($registration != '') return $this->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
36 | + elseif ($registration != '') return $this->getSpotterImage('', $aircraft_icao, $airline_icao); |
|
37 | 37 | else return array(); |
38 | 38 | } |
39 | 39 | |
@@ -43,23 +43,23 @@ discard block |
||
43 | 43 | * @return Array the images list |
44 | 44 | * |
45 | 45 | */ |
46 | - public function getMarineImage($mmsi,$imo = '',$name = '') |
|
46 | + public function getMarineImage($mmsi, $imo = '', $name = '') |
|
47 | 47 | { |
48 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
49 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
50 | - $name = filter_var($name,FILTER_SANITIZE_STRING); |
|
48 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
49 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
50 | + $name = filter_var($name, FILTER_SANITIZE_STRING); |
|
51 | 51 | $name = trim($name); |
52 | - $query = "SELECT marine_image.image, marine_image.image_thumbnail, marine_image.image_source, marine_image.image_source_website,marine_image.image_copyright, marine_image.mmsi, marine_image.imo, marine_image.name |
|
52 | + $query = "SELECT marine_image.image, marine_image.image_thumbnail, marine_image.image_source, marine_image.image_source_website,marine_image.image_copyright, marine_image.mmsi, marine_image.imo, marine_image.name |
|
53 | 53 | FROM marine_image |
54 | 54 | WHERE marine_image.mmsi = :mmsi"; |
55 | 55 | $query_data = array(':mmsi' => $mmsi); |
56 | 56 | if ($imo != '') { |
57 | 57 | $query .= " AND marine_image.imo = :imo"; |
58 | - $query_data = array_merge($query_data,array(':imo' => $imo)); |
|
58 | + $query_data = array_merge($query_data, array(':imo' => $imo)); |
|
59 | 59 | } |
60 | 60 | if ($name != '') { |
61 | 61 | $query .= " AND marine_image.name = :name"; |
62 | - $query_data = array_merge($query_data,array(':name' => $name)); |
|
62 | + $query_data = array_merge($query_data, array(':name' => $name)); |
|
63 | 63 | } |
64 | 64 | $query .= " LIMIT 1"; |
65 | 65 | $sth = $this->db->prepare($query); |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright']; |
81 | 81 | elseif (isset($exif['copyright'])) $copyright = $exif['copyright']; |
82 | 82 | if ($copyright != '') { |
83 | - $copyright = str_replace('Copyright ','',$copyright); |
|
84 | - $copyright = str_replace('© ','',$copyright); |
|
85 | - $copyright = str_replace('(c) ','',$copyright); |
|
83 | + $copyright = str_replace('Copyright ', '', $copyright); |
|
84 | + $copyright = str_replace('© ', '', $copyright); |
|
85 | + $copyright = str_replace('(c) ', '', $copyright); |
|
86 | 86 | } |
87 | 87 | return $copyright; |
88 | 88 | } |
@@ -93,25 +93,25 @@ discard block |
||
93 | 93 | * @return String either success or error |
94 | 94 | * |
95 | 95 | */ |
96 | - public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
|
96 | + public function addSpotterImage($registration, $aircraft_icao = '', $airline_icao = '') |
|
97 | 97 | { |
98 | - global $globalDebug,$globalAircraftImageFetch; |
|
98 | + global $globalDebug, $globalAircraftImageFetch; |
|
99 | 99 | if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return ''; |
100 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
100 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
101 | 101 | $registration = trim($registration); |
102 | 102 | //getting the aircraft image |
103 | 103 | if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...'; |
104 | 104 | elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...'; |
105 | 105 | elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...'; |
106 | - $image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao); |
|
106 | + $image_url = $this->findAircraftImage($registration, $aircraft_icao, $airline_icao); |
|
107 | 107 | if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao; |
108 | 108 | if ($image_url['original'] != '') { |
109 | 109 | if ($globalDebug) echo 'Found !'."\n"; |
110 | - $query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
110 | + $query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
111 | 111 | try { |
112 | 112 | $sth = $this->db->prepare($query); |
113 | - $sth->execute(array(':registration' => $registration,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website'])); |
|
114 | - } catch(PDOException $e) { |
|
113 | + $sth->execute(array(':registration' => $registration, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website'])); |
|
114 | + } catch (PDOException $e) { |
|
115 | 115 | echo $e->getMessage()."\n"; |
116 | 116 | return "error"; |
117 | 117 | } |
@@ -125,13 +125,13 @@ discard block |
||
125 | 125 | * @return String either success or error |
126 | 126 | * |
127 | 127 | */ |
128 | - public function addMarineImage($mmsi,$imo = '',$name = '') |
|
128 | + public function addMarineImage($mmsi, $imo = '', $name = '') |
|
129 | 129 | { |
130 | - global $globalDebug,$globalMarineImageFetch; |
|
130 | + global $globalDebug, $globalMarineImageFetch; |
|
131 | 131 | if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) return ''; |
132 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
133 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
134 | - $name = filter_var($name,FILTER_SANITIZE_STRING); |
|
132 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
133 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
134 | + $name = filter_var($name, FILTER_SANITIZE_STRING); |
|
135 | 135 | $name = trim($name); |
136 | 136 | $Marine = new Marine($this->db); |
137 | 137 | if ($imo == '' || $name == '') { |
@@ -145,14 +145,14 @@ discard block |
||
145 | 145 | |
146 | 146 | //getting the aircraft image |
147 | 147 | if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...'; |
148 | - $image_url = $this->findMarineImage($mmsi,$imo,$name); |
|
148 | + $image_url = $this->findMarineImage($mmsi, $imo, $name); |
|
149 | 149 | if ($image_url['original'] != '') { |
150 | 150 | if ($globalDebug) echo 'Found !'."\n"; |
151 | - $query = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
151 | + $query = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
|
152 | 152 | try { |
153 | 153 | $sth = $this->db->prepare($query); |
154 | - $sth->execute(array(':mmsi' => $mmsi,':imo' => $imo,':name' => $name,':image' => $image_url['original'],':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'],':source' => $image_url['source'],':source_website' => $image_url['source_website'])); |
|
155 | - } catch(PDOException $e) { |
|
154 | + $sth->execute(array(':mmsi' => $mmsi, ':imo' => $imo, ':name' => $name, ':image' => $image_url['original'], ':image_thumbnail' => $image_url['thumbnail'], ':copyright' => $image_url['copyright'], ':source' => $image_url['source'], ':source_website' => $image_url['source_website'])); |
|
155 | + } catch (PDOException $e) { |
|
156 | 156 | echo $e->getMessage()."\n"; |
157 | 157 | return "error"; |
158 | 158 | } |
@@ -172,9 +172,9 @@ discard block |
||
172 | 172 | global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA; |
173 | 173 | $Spotter = new Spotter($this->db); |
174 | 174 | if (!isset($globalIVAO)) $globalIVAO = FALSE; |
175 | - $aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING); |
|
175 | + $aircraft_registration = filter_var($aircraft_registration, FILTER_SANITIZE_STRING); |
|
176 | 176 | if ($aircraft_registration != '' && (!isset($globalVA) || $globalVA !== TRUE)) { |
177 | - if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
177 | + if (strpos($aircraft_registration, '/') !== false) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
178 | 178 | $aircraft_registration = urlencode(trim($aircraft_registration)); |
179 | 179 | $aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration); |
180 | 180 | if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name']; |
@@ -188,25 +188,25 @@ discard block |
||
188 | 188 | if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type']; |
189 | 189 | else $aircraft_name = ''; |
190 | 190 | $aircraft_registration = $aircraft_icao; |
191 | - } else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
191 | + } else return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
192 | 192 | unset($Spotter); |
193 | - if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
193 | + if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl', 'wikimedia', 'airportdata', 'deviantart', 'flickr', 'bing', 'jetphotos', 'planepictures', 'planespotters'); |
|
194 | 194 | foreach ($globalAircraftImageSources as $source) { |
195 | 195 | $source = strtolower($source); |
196 | - if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao); |
|
197 | - if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name); |
|
198 | - if ($source == 'flickr' && extension_loaded('simplexml')) $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name); |
|
199 | - if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name); |
|
200 | - if ($source == 'deviantart' && extension_loaded('simplexml')) $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name); |
|
201 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name); |
|
202 | - if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name); |
|
203 | - if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name); |
|
204 | - if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name); |
|
205 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name); |
|
196 | + if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft', $aircraft_icao, $airline_icao); |
|
197 | + if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) $images_array = $this->fromPlanespotters('aircraft', $aircraft_registration, $aircraft_name); |
|
198 | + if ($source == 'flickr' && extension_loaded('simplexml')) $images_array = $this->fromFlickr('aircraft', $aircraft_registration, $aircraft_name); |
|
199 | + if ($source == 'bing') $images_array = $this->fromBing('aircraft', $aircraft_registration, $aircraft_name); |
|
200 | + if ($source == 'deviantart' && extension_loaded('simplexml')) $images_array = $this->fromDeviantart('aircraft', $aircraft_registration, $aircraft_name); |
|
201 | + if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft', $aircraft_registration, $aircraft_name); |
|
202 | + if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromJetPhotos('aircraft', $aircraft_registration, $aircraft_name); |
|
203 | + if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromPlanePictures('aircraft', $aircraft_registration, $aircraft_name); |
|
204 | + if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft', $aircraft_registration, $aircraft_name); |
|
205 | + if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft', $aircraft_registration, $aircraft_name); |
|
206 | 206 | if (isset($images_array) && $images_array['original'] != '') return $images_array; |
207 | 207 | } |
208 | 208 | if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao); |
209 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
209 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
210 | 210 | } |
211 | 211 | |
212 | 212 | /** |
@@ -218,14 +218,14 @@ discard block |
||
218 | 218 | * @return Array the aircraft thumbnail, orignal url and copyright |
219 | 219 | * |
220 | 220 | */ |
221 | - public function findMarineImage($mmsi,$imo = '',$name = '') |
|
221 | + public function findMarineImage($mmsi, $imo = '', $name = '') |
|
222 | 222 | { |
223 | 223 | global $globalMarineImageSources; |
224 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
224 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
225 | 225 | //$imo = filter_var($imo,FILTER_SANITIZE_STRING); |
226 | - $name = filter_var($name,FILTER_SANITIZE_STRING); |
|
226 | + $name = filter_var($name, FILTER_SANITIZE_STRING); |
|
227 | 227 | $name = trim($name); |
228 | - if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
228 | + if (strlen($name) < 4) return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
229 | 229 | /* |
230 | 230 | $Marine = new Marine($this->db); |
231 | 231 | if ($imo == '' || $name == '') { |
@@ -237,17 +237,17 @@ discard block |
||
237 | 237 | } |
238 | 238 | unset($Marine); |
239 | 239 | */ |
240 | - if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing'); |
|
240 | + if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia', 'deviantart', 'flickr', 'bing'); |
|
241 | 241 | foreach ($globalMarineImageSources as $source) { |
242 | 242 | $source = strtolower($source); |
243 | - if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name); |
|
244 | - if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name); |
|
245 | - if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name); |
|
246 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name); |
|
247 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name); |
|
243 | + if ($source == 'flickr') $images_array = $this->fromFlickr('marine', $mmsi, $name); |
|
244 | + if ($source == 'bing') $images_array = $this->fromBing('marine', $mmsi, $name); |
|
245 | + if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine', $mmsi, $name); |
|
246 | + if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine', $mmsi, $name); |
|
247 | + if ($source == 'customsources') $images_array = $this->fromCustomSource('marine', $mmsi, $name); |
|
248 | 248 | if (isset($images_array) && $images_array['original'] != '') return $images_array; |
249 | 249 | } |
250 | - return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
250 | + return array('thumbnail' => '', 'original' => '', 'copyright' => '', 'source' => '', 'source_website' => ''); |
|
251 | 251 | } |
252 | 252 | |
253 | 253 | /** |
@@ -258,25 +258,25 @@ discard block |
||
258 | 258 | * @return Array the aircraft thumbnail, orignal url and copyright |
259 | 259 | * |
260 | 260 | */ |
261 | - public function fromPlanespotters($type,$aircraft_registration, $aircraft_name='') { |
|
261 | + public function fromPlanespotters($type, $aircraft_registration, $aircraft_name = '') { |
|
262 | 262 | $Common = new Common(); |
263 | 263 | // If aircraft registration is only number, also check with aircraft model |
264 | - if (preg_match('/^[[:digit]]+$/',$aircraft_registration) && $aircraft_name != '') { |
|
265 | - $url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss'; |
|
264 | + if (preg_match('/^[[:digit]]+$/', $aircraft_registration) && $aircraft_name != '') { |
|
265 | + $url = 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$aircraft_registration.'&actype=s_'.urlencode($aircraft_name).'&output=rss'; |
|
266 | 266 | } else { |
267 | 267 | //$url= 'http://www.planespotters.net/Aviation_Photos/search.php?tag='.$airline_aircraft_type.'&output=rss'; |
268 | - $url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss'; |
|
268 | + $url = 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss'; |
|
269 | 269 | } |
270 | 270 | $data = $Common->getData($url); |
271 | 271 | if (substr($data, 0, 5) != "<?xml") return false; |
272 | 272 | if ($xml = simplexml_load_string($data)) { |
273 | 273 | if (isset($xml->channel->item)) { |
274 | 274 | $image_url = array(); |
275 | - $thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
275 | + $thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
276 | 276 | $image_url['thumbnail'] = $thumbnail_url; |
277 | - $image_url['original'] = str_replace('thumbnail','original',$thumbnail_url); |
|
278 | - $image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright); |
|
279 | - $image_url['source_website'] = trim((string)$xml->channel->item->link); |
|
277 | + $image_url['original'] = str_replace('thumbnail', 'original', $thumbnail_url); |
|
278 | + $image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright); |
|
279 | + $image_url['source_website'] = trim((string) $xml->channel->item->link); |
|
280 | 280 | $image_url['source'] = 'planespotters'; |
281 | 281 | return $image_url; |
282 | 282 | } |
@@ -292,31 +292,31 @@ discard block |
||
292 | 292 | * @return Array the aircraft thumbnail, orignal url and copyright |
293 | 293 | * |
294 | 294 | */ |
295 | - public function fromDeviantart($type,$registration, $name='') { |
|
295 | + public function fromDeviantart($type, $registration, $name = '') { |
|
296 | 296 | $Common = new Common(); |
297 | 297 | if ($type == 'aircraft') { |
298 | 298 | // If aircraft registration is only number, also check with aircraft model |
299 | - if (preg_match('/^[[:digit]]+$/',$registration) && $name != '') { |
|
300 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$registration.'%20'.urlencode($name); |
|
299 | + if (preg_match('/^[[:digit]]+$/', $registration) && $name != '') { |
|
300 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q='.$registration.'%20'.urlencode($name); |
|
301 | 301 | } else { |
302 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$registration; |
|
302 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q=aircraft%20'.$registration; |
|
303 | 303 | } |
304 | 304 | } elseif ($type == 'marine') { |
305 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q=ship%20"'.urlencode($name).'"'; |
|
305 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q=ship%20"'.urlencode($name).'"'; |
|
306 | 306 | } else { |
307 | - $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"'; |
|
307 | + $url = 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"'; |
|
308 | 308 | } |
309 | 309 | $data = $Common->getData($url); |
310 | 310 | if (substr($data, 0, 5) != "<?xml") return false; |
311 | 311 | if ($xml = simplexml_load_string($data)) { |
312 | 312 | if (isset($xml->channel->item->link)) { |
313 | 313 | $image_url = array(); |
314 | - $thumbnail_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
314 | + $thumbnail_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->thumbnail->attributes()->url); |
|
315 | 315 | $image_url['thumbnail'] = $thumbnail_url; |
316 | - $original_url = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url); |
|
316 | + $original_url = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->content->attributes()->url); |
|
317 | 317 | $image_url['original'] = $original_url; |
318 | - $image_url['copyright'] = str_replace('Copyright ','',trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright)); |
|
319 | - $image_url['source_website'] = trim((string)$xml->channel->item->link); |
|
318 | + $image_url['copyright'] = str_replace('Copyright ', '', trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->copyright)); |
|
319 | + $image_url['source_website'] = trim((string) $xml->channel->item->link); |
|
320 | 320 | $image_url['source'] = 'deviantart'; |
321 | 321 | return $image_url; |
322 | 322 | } |
@@ -332,32 +332,32 @@ discard block |
||
332 | 332 | * @return Array the aircraft thumbnail, orignal url and copyright |
333 | 333 | * |
334 | 334 | */ |
335 | - public function fromJetPhotos($type,$aircraft_registration, $aircraft_name='') { |
|
335 | + public function fromJetPhotos($type, $aircraft_registration, $aircraft_name = '') { |
|
336 | 336 | $Common = new Common(); |
337 | - $url= 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
|
337 | + $url = 'http://jetphotos.net/showphotos.php?displaymode=2®search='.$aircraft_registration; |
|
338 | 338 | $data = $Common->getData($url); |
339 | 339 | $dom = new DOMDocument(); |
340 | 340 | @$dom->loadHTML($data); |
341 | 341 | $all_pics = array(); |
342 | - foreach($dom->getElementsByTagName('img') as $image) { |
|
342 | + foreach ($dom->getElementsByTagName('img') as $image) { |
|
343 | 343 | if ($image->getAttribute('itemprop') == "http://schema.org/image") { |
344 | 344 | $all_pics[] = $image->getAttribute('src'); |
345 | 345 | } |
346 | 346 | } |
347 | 347 | $all_authors = array(); |
348 | - foreach($dom->getElementsByTagName('meta') as $author) { |
|
348 | + foreach ($dom->getElementsByTagName('meta') as $author) { |
|
349 | 349 | if ($author->getAttribute('itemprop') == "http://schema.org/author") { |
350 | 350 | $all_authors[] = $author->getAttribute('content'); |
351 | 351 | } |
352 | 352 | } |
353 | 353 | $all_ref = array(); |
354 | - foreach($dom->getElementsByTagName('a') as $link) { |
|
354 | + foreach ($dom->getElementsByTagName('a') as $link) { |
|
355 | 355 | $all_ref[] = $link->getAttribute('href'); |
356 | 356 | } |
357 | 357 | if (isset($all_pics[0])) { |
358 | 358 | $image_url = array(); |
359 | 359 | $image_url['thumbnail'] = $all_pics[0]; |
360 | - $image_url['original'] = str_replace('_tb','',$all_pics[0]); |
|
360 | + $image_url['original'] = str_replace('_tb', '', $all_pics[0]); |
|
361 | 361 | $image_url['copyright'] = $all_authors[0]; |
362 | 362 | $image_url['source_website'] = 'http://jetphotos.net'.$all_ref[8]; |
363 | 363 | $image_url['source'] = 'JetPhotos'; |
@@ -374,24 +374,24 @@ discard block |
||
374 | 374 | * @return Array the aircraft thumbnail, orignal url and copyright |
375 | 375 | * |
376 | 376 | */ |
377 | - public function fromPlanePictures($type,$aircraft_registration, $aircraft_name='') { |
|
377 | + public function fromPlanePictures($type, $aircraft_registration, $aircraft_name = '') { |
|
378 | 378 | $Common = new Common(); |
379 | - $url= 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
|
379 | + $url = 'http://www.planepictures.net/netsearch4.cgi?srch='.$aircraft_registration.'&stype=reg&srng=2'; |
|
380 | 380 | $data = $Common->getData($url); |
381 | 381 | $dom = new DOMDocument(); |
382 | 382 | @$dom->loadHTML($data); |
383 | 383 | $all_pics = array(); |
384 | - foreach($dom->getElementsByTagName('img') as $image) { |
|
384 | + foreach ($dom->getElementsByTagName('img') as $image) { |
|
385 | 385 | $all_pics[] = $image->getAttribute('src'); |
386 | 386 | } |
387 | 387 | $all_links = array(); |
388 | - foreach($dom->getElementsByTagName('a') as $link) { |
|
389 | - $all_links[] = array('text' => $link->textContent,'href' => $link->getAttribute('href')); |
|
388 | + foreach ($dom->getElementsByTagName('a') as $link) { |
|
389 | + $all_links[] = array('text' => $link->textContent, 'href' => $link->getAttribute('href')); |
|
390 | 390 | } |
391 | - if (isset($all_pics[1]) && !preg_match('/bit.ly/',$all_pics[1]) && !preg_match('/flagge/',$all_pics[1])) { |
|
391 | + if (isset($all_pics[1]) && !preg_match('/bit.ly/', $all_pics[1]) && !preg_match('/flagge/', $all_pics[1])) { |
|
392 | 392 | $image_url = array(); |
393 | 393 | $image_url['thumbnail'] = 'http://www.planepictures.net/'.$all_pics[1]; |
394 | - $image_url['original'] = 'http://www.planepictures.net/'.str_replace('_TN','',$all_pics[1]); |
|
394 | + $image_url['original'] = 'http://www.planepictures.net/'.str_replace('_TN', '', $all_pics[1]); |
|
395 | 395 | $image_url['copyright'] = $all_links[6]['text']; |
396 | 396 | $image_url['source_website'] = 'http://www.planepictures.net/'.$all_links[2]['href']; |
397 | 397 | $image_url['source'] = 'PlanePictures'; |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | * @return Array the aircraft thumbnail, orignal url and copyright |
409 | 409 | * |
410 | 410 | */ |
411 | - public function fromFlickr($type,$registration,$name='') { |
|
411 | + public function fromFlickr($type, $registration, $name = '') { |
|
412 | 412 | $Common = new Common(); |
413 | 413 | if ($type == 'aircraft') { |
414 | 414 | if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name); |
@@ -421,12 +421,12 @@ discard block |
||
421 | 421 | if (substr($data, 0, 5) != "<?xml") return false; |
422 | 422 | if ($xml = simplexml_load_string($data)) { |
423 | 423 | if (isset($xml->channel->item)) { |
424 | - $original_url = trim((string)$xml->channel->item->enclosure->attributes()->url); |
|
424 | + $original_url = trim((string) $xml->channel->item->enclosure->attributes()->url); |
|
425 | 425 | $image_url = array(); |
426 | 426 | $image_url['thumbnail'] = $original_url; |
427 | 427 | $image_url['original'] = $original_url; |
428 | - $image_url['copyright'] = trim((string)$xml->channel->item->children('http://search.yahoo.com/mrss/')->credit); |
|
429 | - $image_url['source_website'] = trim((string)$xml->channel->item->link); |
|
428 | + $image_url['copyright'] = trim((string) $xml->channel->item->children('http://search.yahoo.com/mrss/')->credit); |
|
429 | + $image_url['source_website'] = trim((string) $xml->channel->item->link); |
|
430 | 430 | $image_url['source'] = 'flickr'; |
431 | 431 | return $image_url; |
432 | 432 | } |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | return false; |
435 | 435 | } |
436 | 436 | |
437 | - public function fromIvaoMtl($type,$aircraft_icao,$airline_icao) { |
|
437 | + public function fromIvaoMtl($type, $aircraft_icao, $airline_icao) { |
|
438 | 438 | $Common = new Common(); |
439 | 439 | //echo "\n".'SEARCH IMAGE : http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg'; |
440 | 440 | if ($Common->urlexist('http://mtlcatalog.ivao.aero/images/aircraft/'.$aircraft_icao.$airline_icao.'.jpg')) { |
@@ -458,7 +458,7 @@ discard block |
||
458 | 458 | * @return Array the aircraft thumbnail, orignal url and copyright |
459 | 459 | * |
460 | 460 | */ |
461 | - public function fromBing($type,$aircraft_registration,$aircraft_name='') { |
|
461 | + public function fromBing($type, $aircraft_registration, $aircraft_name = '') { |
|
462 | 462 | global $globalImageBingKey; |
463 | 463 | $Common = new Common(); |
464 | 464 | if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false; |
@@ -469,8 +469,8 @@ discard block |
||
469 | 469 | if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27'; |
470 | 470 | else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27'; |
471 | 471 | } |
472 | - $headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey)); |
|
473 | - $data = $Common->getData($url,'get','',$headers); |
|
472 | + $headers = array("Authorization: Basic ".base64_encode("ignored:".$globalImageBingKey)); |
|
473 | + $data = $Common->getData($url, 'get', '', $headers); |
|
474 | 474 | $result = json_decode($data); |
475 | 475 | if (isset($result->d->results[0]->MediaUrl)) { |
476 | 476 | $image_url = array(); |
@@ -495,14 +495,14 @@ discard block |
||
495 | 495 | * @return Array the aircraft thumbnail, orignal url and copyright |
496 | 496 | * |
497 | 497 | */ |
498 | - public function fromAirportData($type,$aircraft_registration,$aircraft_name='') { |
|
498 | + public function fromAirportData($type, $aircraft_registration, $aircraft_name = '') { |
|
499 | 499 | $Common = new Common(); |
500 | 500 | $url = 'http://www.airport-data.com/api/ac_thumb.json?&n=1&r='.$aircraft_registration; |
501 | 501 | $data = $Common->getData($url); |
502 | 502 | $result = json_decode($data); |
503 | 503 | if (isset($result->count) && $result->count > 0) { |
504 | 504 | $image_url = array(); |
505 | - $image_url['original'] = str_replace('thumbnails','large',$result->data[0]->image); |
|
505 | + $image_url['original'] = str_replace('thumbnails', 'large', $result->data[0]->image); |
|
506 | 506 | $image_url['source_website'] = $result->data[0]->link; |
507 | 507 | $image_url['thumbnail'] = $result->data[0]->image; |
508 | 508 | $image_url['copyright'] = $result->data[0]->photographer; |
@@ -520,7 +520,7 @@ discard block |
||
520 | 520 | * @return Array the aircraft thumbnail, orignal url and copyright |
521 | 521 | * |
522 | 522 | */ |
523 | - public function fromWikimedia($type,$registration,$name='') { |
|
523 | + public function fromWikimedia($type, $registration, $name = '') { |
|
524 | 524 | $Common = new Common(); |
525 | 525 | if ($type == 'aircraft') { |
526 | 526 | if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name); |
@@ -533,7 +533,7 @@ discard block |
||
533 | 533 | $result = json_decode($data); |
534 | 534 | if (isset($result->query->search[0]->title)) { |
535 | 535 | $fileo = $result->query->search[0]->title; |
536 | - if (substr($fileo,-3) == 'pdf') return false; |
|
536 | + if (substr($fileo, -3) == 'pdf') return false; |
|
537 | 537 | $file = urlencode($fileo); |
538 | 538 | $url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file; |
539 | 539 | $data2 = $Common->getData($url2); |
@@ -558,11 +558,11 @@ discard block |
||
558 | 558 | if (isset($result2->query->pages)) { |
559 | 559 | foreach ($result2->query->pages as $page) { |
560 | 560 | if (isset($page->imageinfo[0]->extmetadata->Artist)) { |
561 | - $image_url['copyright'] = preg_replace('/ from(.*)/','',strip_tags($page->imageinfo[0]->extmetadata->Artist->value)); |
|
561 | + $image_url['copyright'] = preg_replace('/ from(.*)/', '', strip_tags($page->imageinfo[0]->extmetadata->Artist->value)); |
|
562 | 562 | if (isset($page->imageinfo[0]->extmetadata->License->value)) { |
563 | 563 | $image_url['copyright'] = $image_url['copyright'].' (under '.$page->imageinfo[0]->extmetadata->License->value.')'; |
564 | 564 | } |
565 | - $image_url['copyright'] = trim(str_replace('\n','',$image_url['copyright'])); |
|
565 | + $image_url['copyright'] = trim(str_replace('\n', '', $image_url['copyright'])); |
|
566 | 566 | return $image_url; |
567 | 567 | } |
568 | 568 | } |
@@ -581,7 +581,7 @@ discard block |
||
581 | 581 | * @return Array the aircraft thumbnail, orignal url and copyright |
582 | 582 | * |
583 | 583 | */ |
584 | - public function fromCustomSource($type,$registration,$name='') { |
|
584 | + public function fromCustomSource($type, $registration, $name = '') { |
|
585 | 585 | global $globalAircraftImageCustomSources, $globalMarineImageCustomSources, $globalDebug; |
586 | 586 | //$globalAircraftImageCustomSource[] = array('thumbnail' => '','original' => '', 'copyright' => '', 'source_website' => '', 'source' => '','exif' => true); |
587 | 587 | if (!empty($globalAircraftImageCustomSources) && $type == 'aircraft') { |
@@ -598,15 +598,15 @@ discard block |
||
598 | 598 | print_r($source); |
599 | 599 | print_r($customsources); |
600 | 600 | } |
601 | - $url = str_replace('{registration}',$registration,$source['original']); |
|
602 | - $url_thumbnail = str_replace('{registration}',$registration,$source['thumbnail']); |
|
601 | + $url = str_replace('{registration}', $registration, $source['original']); |
|
602 | + $url_thumbnail = str_replace('{registration}', $registration, $source['thumbnail']); |
|
603 | 603 | if ($Common->urlexist($url)) { |
604 | 604 | $image_url = array(); |
605 | 605 | $image_url['thumbnail'] = $url_thumbnail; |
606 | 606 | $image_url['original'] = $url; |
607 | 607 | if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
608 | 608 | else $exifCopyright = ''; |
609 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
609 | + if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
610 | 610 | elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
611 | 611 | else $image_url['copyright'] = $source['source_website']; |
612 | 612 | $image_url['source_website'] = $source['source_website']; |
@@ -630,19 +630,19 @@ discard block |
||
630 | 630 | print_r($source); |
631 | 631 | print_r($customsources); |
632 | 632 | } |
633 | - $url = str_replace('{registration}',$registration,$source['original']); |
|
634 | - $url = str_replace('{mmsi}',$registration,$url); |
|
635 | - $url = str_replace('{name}',$name,$url); |
|
636 | - $url_thumbnail = str_replace('{registration}',$registration,$source['thumbnail']); |
|
637 | - $url_thumbnail = str_replace('{mmsi}',$registration,$url_thumbnail); |
|
638 | - $url_thumbnail = str_replace('{name}',$name,$url_thumbnail); |
|
633 | + $url = str_replace('{registration}', $registration, $source['original']); |
|
634 | + $url = str_replace('{mmsi}', $registration, $url); |
|
635 | + $url = str_replace('{name}', $name, $url); |
|
636 | + $url_thumbnail = str_replace('{registration}', $registration, $source['thumbnail']); |
|
637 | + $url_thumbnail = str_replace('{mmsi}', $registration, $url_thumbnail); |
|
638 | + $url_thumbnail = str_replace('{name}', $name, $url_thumbnail); |
|
639 | 639 | if ($Common->urlexist($url)) { |
640 | 640 | $image_url = array(); |
641 | 641 | $image_url['thumbnail'] = $url_thumbnail; |
642 | 642 | $image_url['original'] = $url; |
643 | 643 | if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
644 | 644 | else $exifCopyright = ''; |
645 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
645 | + if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
646 | 646 | elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
647 | 647 | else $image_url['copyright'] = $source['source_website']; |
648 | 648 | $image_url['source_website'] = $source['source_website']; |
@@ -9,7 +9,9 @@ discard block |
||
9 | 9 | public function __construct($dbc = null) { |
10 | 10 | $Connection = new Connection($dbc); |
11 | 11 | $this->db = $Connection->db(); |
12 | - if ($this->db === null) die('Error: No DB connection.'); |
|
12 | + if ($this->db === null) { |
|
13 | + die('Error: No DB connection.'); |
|
14 | + } |
|
13 | 15 | } |
14 | 16 | |
15 | 17 | /** |
@@ -24,7 +26,9 @@ discard block |
||
24 | 26 | $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
25 | 27 | $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
26 | 28 | $reg = $registration; |
27 | - if ($reg == '' && $aircraft_icao != '') $reg = $aircraft_icao.$airline_icao; |
|
29 | + if ($reg == '' && $aircraft_icao != '') { |
|
30 | + $reg = $aircraft_icao.$airline_icao; |
|
31 | + } |
|
28 | 32 | $reg = trim($reg); |
29 | 33 | $query = "SELECT spotter_image.image, spotter_image.image_thumbnail, spotter_image.image_source, spotter_image.image_source_website,spotter_image.image_copyright, spotter_image.registration |
30 | 34 | FROM spotter_image |
@@ -32,9 +36,13 @@ discard block |
||
32 | 36 | $sth = $this->db->prepare($query); |
33 | 37 | $sth->execute(array(':registration' => $reg)); |
34 | 38 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
35 | - if (!empty($result)) return $result; |
|
36 | - elseif ($registration != '') return $this->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
37 | - else return array(); |
|
39 | + if (!empty($result)) { |
|
40 | + return $result; |
|
41 | + } elseif ($registration != '') { |
|
42 | + return $this->getSpotterImage('',$aircraft_icao,$airline_icao); |
|
43 | + } else { |
|
44 | + return array(); |
|
45 | + } |
|
38 | 46 | } |
39 | 47 | |
40 | 48 | /** |
@@ -77,8 +85,11 @@ discard block |
||
77 | 85 | public function getExifCopyright($url) { |
78 | 86 | $exif = exif_read_data($url); |
79 | 87 | $copyright = ''; |
80 | - if (isset($exif['COMPUTED']['copyright'])) $copyright = $exif['COMPUTED']['copyright']; |
|
81 | - elseif (isset($exif['copyright'])) $copyright = $exif['copyright']; |
|
88 | + if (isset($exif['COMPUTED']['copyright'])) { |
|
89 | + $copyright = $exif['COMPUTED']['copyright']; |
|
90 | + } elseif (isset($exif['copyright'])) { |
|
91 | + $copyright = $exif['copyright']; |
|
92 | + } |
|
82 | 93 | if ($copyright != '') { |
83 | 94 | $copyright = str_replace('Copyright ','',$copyright); |
84 | 95 | $copyright = str_replace('© ','',$copyright); |
@@ -96,17 +107,27 @@ discard block |
||
96 | 107 | public function addSpotterImage($registration,$aircraft_icao = '', $airline_icao = '') |
97 | 108 | { |
98 | 109 | global $globalDebug,$globalAircraftImageFetch; |
99 | - if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) return ''; |
|
110 | + if (isset($globalAircraftImageFetch) && !$globalAircraftImageFetch) { |
|
111 | + return ''; |
|
112 | + } |
|
100 | 113 | $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
101 | 114 | $registration = trim($registration); |
102 | 115 | //getting the aircraft image |
103 | - if ($globalDebug && $registration != '') echo 'Try to find an aircraft image for '.$registration.'...'; |
|
104 | - elseif ($globalDebug && $aircraft_icao != '') echo 'Try to find an aircraft image for '.$aircraft_icao.'...'; |
|
105 | - elseif ($globalDebug && $airline_icao != '') echo 'Try to find an aircraft image for '.$airline_icao.'...'; |
|
116 | + if ($globalDebug && $registration != '') { |
|
117 | + echo 'Try to find an aircraft image for '.$registration.'...'; |
|
118 | + } elseif ($globalDebug && $aircraft_icao != '') { |
|
119 | + echo 'Try to find an aircraft image for '.$aircraft_icao.'...'; |
|
120 | + } elseif ($globalDebug && $airline_icao != '') { |
|
121 | + echo 'Try to find an aircraft image for '.$airline_icao.'...'; |
|
122 | + } |
|
106 | 123 | $image_url = $this->findAircraftImage($registration,$aircraft_icao,$airline_icao); |
107 | - if ($registration == '' && $aircraft_icao != '') $registration = $aircraft_icao.$airline_icao; |
|
124 | + if ($registration == '' && $aircraft_icao != '') { |
|
125 | + $registration = $aircraft_icao.$airline_icao; |
|
126 | + } |
|
108 | 127 | if ($image_url['original'] != '') { |
109 | - if ($globalDebug) echo 'Found !'."\n"; |
|
128 | + if ($globalDebug) { |
|
129 | + echo 'Found !'."\n"; |
|
130 | + } |
|
110 | 131 | $query = "INSERT INTO spotter_image (registration, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:registration,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
111 | 132 | try { |
112 | 133 | $sth = $this->db->prepare($query); |
@@ -115,7 +136,9 @@ discard block |
||
115 | 136 | echo $e->getMessage()."\n"; |
116 | 137 | return "error"; |
117 | 138 | } |
118 | - } elseif ($globalDebug) echo "Not found :'(\n"; |
|
139 | + } elseif ($globalDebug) { |
|
140 | + echo "Not found :'(\n"; |
|
141 | + } |
|
119 | 142 | return "success"; |
120 | 143 | } |
121 | 144 | |
@@ -128,7 +151,9 @@ discard block |
||
128 | 151 | public function addMarineImage($mmsi,$imo = '',$name = '') |
129 | 152 | { |
130 | 153 | global $globalDebug,$globalMarineImageFetch; |
131 | - if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) return ''; |
|
154 | + if (isset($globalMarineImageFetch) && !$globalMarineImageFetch) { |
|
155 | + return ''; |
|
156 | + } |
|
132 | 157 | $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
133 | 158 | $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
134 | 159 | $name = filter_var($name,FILTER_SANITIZE_STRING); |
@@ -138,16 +163,22 @@ discard block |
||
138 | 163 | $identity = $Marine->getIdentity($mmsi); |
139 | 164 | if (isset($identity[0]['mmsi'])) { |
140 | 165 | $imo = $identity[0]['imo']; |
141 | - if ($identity[0]['ship_name'] != '') $name = $identity[0]['ship_name']; |
|
166 | + if ($identity[0]['ship_name'] != '') { |
|
167 | + $name = $identity[0]['ship_name']; |
|
168 | + } |
|
142 | 169 | } |
143 | 170 | } |
144 | 171 | unset($Marine); |
145 | 172 | |
146 | 173 | //getting the aircraft image |
147 | - if ($globalDebug && $name != '') echo 'Try to find an vessel image for '.$name.'...'; |
|
174 | + if ($globalDebug && $name != '') { |
|
175 | + echo 'Try to find an vessel image for '.$name.'...'; |
|
176 | + } |
|
148 | 177 | $image_url = $this->findMarineImage($mmsi,$imo,$name); |
149 | 178 | if ($image_url['original'] != '') { |
150 | - if ($globalDebug) echo 'Found !'."\n"; |
|
179 | + if ($globalDebug) { |
|
180 | + echo 'Found !'."\n"; |
|
181 | + } |
|
151 | 182 | $query = "INSERT INTO marine_image (mmsi,imo,name, image, image_thumbnail, image_copyright, image_source,image_source_website) VALUES (:mmsi,:imo,:name,:image,:image_thumbnail,:copyright,:source,:source_website)"; |
152 | 183 | try { |
153 | 184 | $sth = $this->db->prepare($query); |
@@ -156,7 +187,9 @@ discard block |
||
156 | 187 | echo $e->getMessage()."\n"; |
157 | 188 | return "error"; |
158 | 189 | } |
159 | - } elseif ($globalDebug) echo "Not found :'(\n"; |
|
190 | + } elseif ($globalDebug) { |
|
191 | + echo "Not found :'(\n"; |
|
192 | + } |
|
160 | 193 | return "success"; |
161 | 194 | } |
162 | 195 | |
@@ -171,41 +204,85 @@ discard block |
||
171 | 204 | { |
172 | 205 | global $globalAircraftImageSources, $globalIVAO, $globalAircraftImageCheckICAO, $globalVA; |
173 | 206 | $Spotter = new Spotter($this->db); |
174 | - if (!isset($globalIVAO)) $globalIVAO = FALSE; |
|
207 | + if (!isset($globalIVAO)) { |
|
208 | + $globalIVAO = FALSE; |
|
209 | + } |
|
175 | 210 | $aircraft_registration = filter_var($aircraft_registration,FILTER_SANITIZE_STRING); |
176 | 211 | if ($aircraft_registration != '' && (!isset($globalVA) || $globalVA !== TRUE)) { |
177 | - if (strpos($aircraft_registration,'/') !== false) return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
212 | + if (strpos($aircraft_registration,'/') !== false) { |
|
213 | + return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
|
214 | + } |
|
178 | 215 | $aircraft_registration = urlencode(trim($aircraft_registration)); |
179 | 216 | $aircraft_info = $Spotter->getAircraftInfoByRegistration($aircraft_registration); |
180 | - if (isset($aircraft_info[0]['aircraft_name'])) $aircraft_name = $aircraft_info[0]['aircraft_name']; |
|
181 | - else $aircraft_name = ''; |
|
182 | - if (isset($aircraft_info[0]['aircraft_icao'])) $aircraft_name = $aircraft_info[0]['aircraft_icao']; |
|
183 | - else $aircraft_icao = ''; |
|
184 | - if (isset($aircraft_info[0]['airline_icao'])) $airline_icao = $aircraft_info[0]['airline_icao']; |
|
185 | - else $airline_icao = ''; |
|
217 | + if (isset($aircraft_info[0]['aircraft_name'])) { |
|
218 | + $aircraft_name = $aircraft_info[0]['aircraft_name']; |
|
219 | + } else { |
|
220 | + $aircraft_name = ''; |
|
221 | + } |
|
222 | + if (isset($aircraft_info[0]['aircraft_icao'])) { |
|
223 | + $aircraft_name = $aircraft_info[0]['aircraft_icao']; |
|
224 | + } else { |
|
225 | + $aircraft_icao = ''; |
|
226 | + } |
|
227 | + if (isset($aircraft_info[0]['airline_icao'])) { |
|
228 | + $airline_icao = $aircraft_info[0]['airline_icao']; |
|
229 | + } else { |
|
230 | + $airline_icao = ''; |
|
231 | + } |
|
186 | 232 | } elseif ($aircraft_icao != '') { |
187 | 233 | $aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao); |
188 | - if (isset($aircraft_info[0]['type'])) $aircraft_name = $aircraft_info[0]['type']; |
|
189 | - else $aircraft_name = ''; |
|
234 | + if (isset($aircraft_info[0]['type'])) { |
|
235 | + $aircraft_name = $aircraft_info[0]['type']; |
|
236 | + } else { |
|
237 | + $aircraft_name = ''; |
|
238 | + } |
|
190 | 239 | $aircraft_registration = $aircraft_icao; |
191 | - } else return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
240 | + } else { |
|
241 | + return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
242 | + } |
|
192 | 243 | unset($Spotter); |
193 | - if (!isset($globalAircraftImageSources)) $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
244 | + if (!isset($globalAircraftImageSources)) { |
|
245 | + $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters'); |
|
246 | + } |
|
194 | 247 | foreach ($globalAircraftImageSources as $source) { |
195 | 248 | $source = strtolower($source); |
196 | - if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao); |
|
197 | - if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name); |
|
198 | - if ($source == 'flickr' && extension_loaded('simplexml')) $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name); |
|
199 | - if ($source == 'bing') $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name); |
|
200 | - if ($source == 'deviantart' && extension_loaded('simplexml')) $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name); |
|
201 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name); |
|
202 | - if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name); |
|
203 | - if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name); |
|
204 | - if ($source == 'airportdata' && !$globalIVAO) $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name); |
|
205 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name); |
|
206 | - if (isset($images_array) && $images_array['original'] != '') return $images_array; |
|
207 | - } |
|
208 | - if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) return $this->findAircraftImage($aircraft_icao); |
|
249 | + if ($source == 'ivaomtl' && $globalIVAO && $aircraft_icao != '' && $airline_icao != '') { |
|
250 | + $images_array = $this->fromIvaoMtl('aircraft',$aircraft_icao,$airline_icao); |
|
251 | + } |
|
252 | + if ($source == 'planespotters' && !$globalIVAO && extension_loaded('simplexml')) { |
|
253 | + $images_array = $this->fromPlanespotters('aircraft',$aircraft_registration,$aircraft_name); |
|
254 | + } |
|
255 | + if ($source == 'flickr' && extension_loaded('simplexml')) { |
|
256 | + $images_array = $this->fromFlickr('aircraft',$aircraft_registration,$aircraft_name); |
|
257 | + } |
|
258 | + if ($source == 'bing') { |
|
259 | + $images_array = $this->fromBing('aircraft',$aircraft_registration,$aircraft_name); |
|
260 | + } |
|
261 | + if ($source == 'deviantart' && extension_loaded('simplexml')) { |
|
262 | + $images_array = $this->fromDeviantart('aircraft',$aircraft_registration,$aircraft_name); |
|
263 | + } |
|
264 | + if ($source == 'wikimedia') { |
|
265 | + $images_array = $this->fromWikimedia('aircraft',$aircraft_registration,$aircraft_name); |
|
266 | + } |
|
267 | + if ($source == 'jetphotos' && !$globalIVAO && class_exists("DomDocument")) { |
|
268 | + $images_array = $this->fromJetPhotos('aircraft',$aircraft_registration,$aircraft_name); |
|
269 | + } |
|
270 | + if ($source == 'planepictures' && !$globalIVAO && class_exists("DomDocument")) { |
|
271 | + $images_array = $this->fromPlanePictures('aircraft',$aircraft_registration,$aircraft_name); |
|
272 | + } |
|
273 | + if ($source == 'airportdata' && !$globalIVAO) { |
|
274 | + $images_array = $this->fromAirportData('aircraft',$aircraft_registration,$aircraft_name); |
|
275 | + } |
|
276 | + if ($source == 'customsources') { |
|
277 | + $images_array = $this->fromCustomSource('aircraft',$aircraft_registration,$aircraft_name); |
|
278 | + } |
|
279 | + if (isset($images_array) && $images_array['original'] != '') { |
|
280 | + return $images_array; |
|
281 | + } |
|
282 | + } |
|
283 | + if ((!isset($globalAircraftImageCheckICAO) || $globalAircraftImageCheckICAO === TRUE) && isset($aircraft_icao)) { |
|
284 | + return $this->findAircraftImage($aircraft_icao); |
|
285 | + } |
|
209 | 286 | return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
210 | 287 | } |
211 | 288 | |
@@ -225,7 +302,9 @@ discard block |
||
225 | 302 | //$imo = filter_var($imo,FILTER_SANITIZE_STRING); |
226 | 303 | $name = filter_var($name,FILTER_SANITIZE_STRING); |
227 | 304 | $name = trim($name); |
228 | - if (strlen($name) < 4) return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
305 | + if (strlen($name) < 4) { |
|
306 | + return array('thumbnail' => '','original' => '', 'copyright' => '', 'source' => '','source_website' => ''); |
|
307 | + } |
|
229 | 308 | /* |
230 | 309 | $Marine = new Marine($this->db); |
231 | 310 | if ($imo == '' || $name == '') { |
@@ -237,15 +316,29 @@ discard block |
||
237 | 316 | } |
238 | 317 | unset($Marine); |
239 | 318 | */ |
240 | - if (!isset($globalMarineImageSources)) $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing'); |
|
319 | + if (!isset($globalMarineImageSources)) { |
|
320 | + $globalMarineImageSources = array('wikimedia','deviantart','flickr','bing'); |
|
321 | + } |
|
241 | 322 | foreach ($globalMarineImageSources as $source) { |
242 | 323 | $source = strtolower($source); |
243 | - if ($source == 'flickr') $images_array = $this->fromFlickr('marine',$mmsi,$name); |
|
244 | - if ($source == 'bing') $images_array = $this->fromBing('marine',$mmsi,$name); |
|
245 | - if ($source == 'deviantart') $images_array = $this->fromDeviantart('marine',$mmsi,$name); |
|
246 | - if ($source == 'wikimedia') $images_array = $this->fromWikimedia('marine',$mmsi,$name); |
|
247 | - if ($source == 'customsources') $images_array = $this->fromCustomSource('marine',$mmsi,$name); |
|
248 | - if (isset($images_array) && $images_array['original'] != '') return $images_array; |
|
324 | + if ($source == 'flickr') { |
|
325 | + $images_array = $this->fromFlickr('marine',$mmsi,$name); |
|
326 | + } |
|
327 | + if ($source == 'bing') { |
|
328 | + $images_array = $this->fromBing('marine',$mmsi,$name); |
|
329 | + } |
|
330 | + if ($source == 'deviantart') { |
|
331 | + $images_array = $this->fromDeviantart('marine',$mmsi,$name); |
|
332 | + } |
|
333 | + if ($source == 'wikimedia') { |
|
334 | + $images_array = $this->fromWikimedia('marine',$mmsi,$name); |
|
335 | + } |
|
336 | + if ($source == 'customsources') { |
|
337 | + $images_array = $this->fromCustomSource('marine',$mmsi,$name); |
|
338 | + } |
|
339 | + if (isset($images_array) && $images_array['original'] != '') { |
|
340 | + return $images_array; |
|
341 | + } |
|
249 | 342 | } |
250 | 343 | return array('thumbnail' => '','original' => '', 'copyright' => '','source' => '','source_website' => ''); |
251 | 344 | } |
@@ -268,7 +361,9 @@ discard block |
||
268 | 361 | $url= 'http://www.planespotters.net/Aviation_Photos/search.php?reg='.$aircraft_registration.'&output=rss'; |
269 | 362 | } |
270 | 363 | $data = $Common->getData($url); |
271 | - if (substr($data, 0, 5) != "<?xml") return false; |
|
364 | + if (substr($data, 0, 5) != "<?xml") { |
|
365 | + return false; |
|
366 | + } |
|
272 | 367 | if ($xml = simplexml_load_string($data)) { |
273 | 368 | if (isset($xml->channel->item)) { |
274 | 369 | $image_url = array(); |
@@ -307,7 +402,9 @@ discard block |
||
307 | 402 | $url= 'http://backend.deviantart.com/rss.xml?type=deviation&q="'.urlencode($name).'"'; |
308 | 403 | } |
309 | 404 | $data = $Common->getData($url); |
310 | - if (substr($data, 0, 5) != "<?xml") return false; |
|
405 | + if (substr($data, 0, 5) != "<?xml") { |
|
406 | + return false; |
|
407 | + } |
|
311 | 408 | if ($xml = simplexml_load_string($data)) { |
312 | 409 | if (isset($xml->channel->item->link)) { |
313 | 410 | $image_url = array(); |
@@ -411,14 +508,22 @@ discard block |
||
411 | 508 | public function fromFlickr($type,$registration,$name='') { |
412 | 509 | $Common = new Common(); |
413 | 510 | if ($type == 'aircraft') { |
414 | - if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name); |
|
415 | - else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft'; |
|
511 | + if ($name != '') { |
|
512 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.','.urlencode($name); |
|
513 | + } else { |
|
514 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',aircraft'; |
|
515 | + } |
|
416 | 516 | } elseif ($type == 'marine') { |
417 | - if ($name != '') $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags=ship,'.urlencode($name); |
|
418 | - else $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',ship'; |
|
517 | + if ($name != '') { |
|
518 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags=ship,'.urlencode($name); |
|
519 | + } else { |
|
520 | + $url = 'https://api.flickr.com/services/feeds/photos_public.gne?format=rss2&license=1,2,3,4,5,6,7&per_page=1&tags='.$registration.',ship'; |
|
521 | + } |
|
419 | 522 | } |
420 | 523 | $data = $Common->getData($url); |
421 | - if (substr($data, 0, 5) != "<?xml") return false; |
|
524 | + if (substr($data, 0, 5) != "<?xml") { |
|
525 | + return false; |
|
526 | + } |
|
422 | 527 | if ($xml = simplexml_load_string($data)) { |
423 | 528 | if (isset($xml->channel->item)) { |
424 | 529 | $original_url = trim((string)$xml->channel->item->enclosure->attributes()->url); |
@@ -461,13 +566,21 @@ discard block |
||
461 | 566 | public function fromBing($type,$aircraft_registration,$aircraft_name='') { |
462 | 567 | global $globalImageBingKey; |
463 | 568 | $Common = new Common(); |
464 | - if (!isset($globalImageBingKey) || $globalImageBingKey == '') return false; |
|
569 | + if (!isset($globalImageBingKey) || $globalImageBingKey == '') { |
|
570 | + return false; |
|
571 | + } |
|
465 | 572 | if ($type == 'aircraft') { |
466 | - if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27'; |
|
467 | - else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27'; |
|
573 | + if ($aircraft_name != '') { |
|
574 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.$aircraft_registration.'%20'.urlencode($aircraft_name).'%20-site:planespotters.com%20-site:flickr.com%27'; |
|
575 | + } else { |
|
576 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Baircraft%20-site:planespotters.com%20-site:flickr.com%27'; |
|
577 | + } |
|
468 | 578 | } elseif ($type == 'marine') { |
469 | - if ($aircraft_name != '') $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27'; |
|
470 | - else $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27'; |
|
579 | + if ($aircraft_name != '') { |
|
580 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27'.urlencode($aircraft_name).'%20%2Bship%20-site:flickr.com%27'; |
|
581 | + } else { |
|
582 | + $url = 'https://api.datamarket.azure.com/Bing/Search/v1/Image?$format=json&$top=1&Query=%27%2B'.$aircraft_registration.'%20%2Bship%20-site:flickr.com%27'; |
|
583 | + } |
|
471 | 584 | } |
472 | 585 | $headers = array("Authorization: Basic " . base64_encode("ignored:".$globalImageBingKey)); |
473 | 586 | $data = $Common->getData($url,'get','',$headers); |
@@ -523,17 +636,25 @@ discard block |
||
523 | 636 | public function fromWikimedia($type,$registration,$name='') { |
524 | 637 | $Common = new Common(); |
525 | 638 | if ($type == 'aircraft') { |
526 | - if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name); |
|
527 | - else $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft'; |
|
639 | + if ($name != '') { |
|
640 | + $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20'.urlencode($name); |
|
641 | + } else { |
|
642 | + $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.$registration.'"%20aircraft'; |
|
643 | + } |
|
528 | 644 | } elseif ($type == 'marine') { |
529 | - if ($name != '') $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'%20ship"'; |
|
530 | - else return false; |
|
645 | + if ($name != '') { |
|
646 | + $url = 'https://commons.wikimedia.org/w/api.php?action=query&list=search&format=json&srlimit=1&srnamespace=6&continue&srsearch="'.urlencode($name).'%20ship"'; |
|
647 | + } else { |
|
648 | + return false; |
|
649 | + } |
|
531 | 650 | } |
532 | 651 | $data = $Common->getData($url); |
533 | 652 | $result = json_decode($data); |
534 | 653 | if (isset($result->query->search[0]->title)) { |
535 | 654 | $fileo = $result->query->search[0]->title; |
536 | - if (substr($fileo,-3) == 'pdf') return false; |
|
655 | + if (substr($fileo,-3) == 'pdf') { |
|
656 | + return false; |
|
657 | + } |
|
537 | 658 | $file = urlencode($fileo); |
538 | 659 | $url2 = 'https://commons.wikimedia.org/w/api.php?action=query&format=json&continue&iilimit=500&prop=imageinfo&iiprop=user|url|size|mime|sha1|timestamp&iiurlwidth=200%27&titles='.$file; |
539 | 660 | $data2 = $Common->getData($url2); |
@@ -604,18 +725,27 @@ discard block |
||
604 | 725 | $image_url = array(); |
605 | 726 | $image_url['thumbnail'] = $url_thumbnail; |
606 | 727 | $image_url['original'] = $url; |
607 | - if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
|
608 | - else $exifCopyright = ''; |
|
609 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
610 | - elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
|
611 | - else $image_url['copyright'] = $source['source_website']; |
|
728 | + if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) { |
|
729 | + $exifCopyright = $this->getExifCopyright($url); |
|
730 | + } else { |
|
731 | + $exifCopyright = ''; |
|
732 | + } |
|
733 | + if ($exifCopyright != '') { |
|
734 | + $image_url['copyright'] = $exifCopyright; |
|
735 | + } elseif (isset($source['copyright'])) { |
|
736 | + $image_url['copyright'] = $source['copyright']; |
|
737 | + } else { |
|
738 | + $image_url['copyright'] = $source['source_website']; |
|
739 | + } |
|
612 | 740 | $image_url['source_website'] = $source['source_website']; |
613 | 741 | $image_url['source'] = $source['source']; |
614 | 742 | return $image_url; |
615 | 743 | } |
616 | 744 | } |
617 | 745 | return false; |
618 | - } else return false; |
|
746 | + } else { |
|
747 | + return false; |
|
748 | + } |
|
619 | 749 | if (!empty($globalMarineImageCustomSources) && $type == 'marine') { |
620 | 750 | $customsources = array(); |
621 | 751 | if (!isset($globalMarineImageCustomSources[0])) { |
@@ -640,18 +770,27 @@ discard block |
||
640 | 770 | $image_url = array(); |
641 | 771 | $image_url['thumbnail'] = $url_thumbnail; |
642 | 772 | $image_url['original'] = $url; |
643 | - if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) $exifCopyright = $this->getExifCopyright($url); |
|
644 | - else $exifCopyright = ''; |
|
645 | - if ($exifCopyright != '') $image_url['copyright'] = $exifCopyright; |
|
646 | - elseif (isset($source['copyright'])) $image_url['copyright'] = $source['copyright']; |
|
647 | - else $image_url['copyright'] = $source['source_website']; |
|
773 | + if ($source['exif'] && exif_imagetype($url) == IMAGETYPE_JPEG) { |
|
774 | + $exifCopyright = $this->getExifCopyright($url); |
|
775 | + } else { |
|
776 | + $exifCopyright = ''; |
|
777 | + } |
|
778 | + if ($exifCopyright != '') { |
|
779 | + $image_url['copyright'] = $exifCopyright; |
|
780 | + } elseif (isset($source['copyright'])) { |
|
781 | + $image_url['copyright'] = $source['copyright']; |
|
782 | + } else { |
|
783 | + $image_url['copyright'] = $source['source_website']; |
|
784 | + } |
|
648 | 785 | $image_url['source_website'] = $source['source_website']; |
649 | 786 | $image_url['source'] = $source['source']; |
650 | 787 | return $image_url; |
651 | 788 | } |
652 | 789 | } |
653 | 790 | return false; |
654 | - } else return false; |
|
791 | + } else { |
|
792 | + return false; |
|
793 | + } |
|
655 | 794 | } |
656 | 795 | } |
657 | 796 |
@@ -14,7 +14,7 @@ |
||
14 | 14 | /** |
15 | 15 | * Get SQL query part for filter used |
16 | 16 | * @param Array $filter the filter |
17 | - * @return Array the SQL part |
|
17 | + * @return string the SQL part |
|
18 | 18 | */ |
19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -6,7 +6,9 @@ discard block |
||
6 | 6 | public function __construct($dbc = null) { |
7 | 7 | $Connection = new Connection($dbc); |
8 | 8 | $this->db = $Connection->db; |
9 | - if ($this->db === null) die('Error: No DB connection.'); |
|
9 | + if ($this->db === null) { |
|
10 | + die('Error: No DB connection.'); |
|
11 | + } |
|
10 | 12 | } |
11 | 13 | |
12 | 14 | /** |
@@ -27,7 +29,9 @@ discard block |
||
27 | 29 | if (isset($filter[0]['source'])) { |
28 | 30 | $filters = array_merge($filters,$filter); |
29 | 31 | } |
30 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
32 | + if (is_array($globalFilter)) { |
|
33 | + $filter = array_merge($filter,$globalFilter); |
|
34 | + } |
|
31 | 35 | $filter_query_join = ''; |
32 | 36 | $filter_query_where = ''; |
33 | 37 | foreach($filters as $flt) { |
@@ -73,8 +77,11 @@ discard block |
||
73 | 77 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
74 | 78 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
75 | 79 | } |
76 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
77 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
80 | + if ($filter_query_where == '' && $where) { |
|
81 | + $filter_query_where = ' WHERE'; |
|
82 | + } elseif ($filter_query_where != '' && $and) { |
|
83 | + $filter_query_where .= ' AND'; |
|
84 | + } |
|
78 | 85 | if ($filter_query_where != '') { |
79 | 86 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
80 | 87 | } |
@@ -88,9 +95,14 @@ discard block |
||
88 | 95 | if ($over_country == '') { |
89 | 96 | $Marine = new Marine($this->db); |
90 | 97 | $data_country = $Marine->getCountryFromLatitudeLongitude($latitude,$longitude); |
91 | - if (!empty($data_country)) $country = $data_country['iso2']; |
|
92 | - else $country = ''; |
|
93 | - } else $country = $over_country; |
|
98 | + if (!empty($data_country)) { |
|
99 | + $country = $data_country['iso2']; |
|
100 | + } else { |
|
101 | + $country = ''; |
|
102 | + } |
|
103 | + } else { |
|
104 | + $country = $over_country; |
|
105 | + } |
|
94 | 106 | |
95 | 107 | //$country = $over_country; |
96 | 108 | // Route is not added in marine_archive |
@@ -593,7 +605,9 @@ discard block |
||
593 | 605 | $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR "; |
594 | 606 | $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR "; |
595 | 607 | $translate = $Translation->ident2icao($q_item); |
596 | - if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR "; |
|
608 | + if ($translate != $q_item) { |
|
609 | + $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR "; |
|
610 | + } |
|
597 | 611 | $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')"; |
598 | 612 | $additional_query .= ")"; |
599 | 613 | } |
@@ -811,7 +825,9 @@ discard block |
||
811 | 825 | date_default_timezone_set($globalTimezone); |
812 | 826 | $datetime = new DateTime(); |
813 | 827 | $offset = $datetime->format('P'); |
814 | - } else $offset = '+00:00'; |
|
828 | + } else { |
|
829 | + $offset = '+00:00'; |
|
830 | + } |
|
815 | 831 | |
816 | 832 | |
817 | 833 | if ($date_array[1] != "") |
@@ -1087,9 +1103,13 @@ discard block |
||
1087 | 1103 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
1088 | 1104 | } |
1089 | 1105 | } |
1090 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
1106 | + if ($sincedate != '') { |
|
1107 | + $query .= "AND date > '".$sincedate."' "; |
|
1108 | + } |
|
1091 | 1109 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
1092 | - if ($limit) $query .= " LIMIT 0,10"; |
|
1110 | + if ($limit) { |
|
1111 | + $query .= " LIMIT 0,10"; |
|
1112 | + } |
|
1093 | 1113 | |
1094 | 1114 | |
1095 | 1115 | $sth = $this->db->prepare($query); |
@@ -1133,9 +1153,13 @@ discard block |
||
1133 | 1153 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
1134 | 1154 | } |
1135 | 1155 | } |
1136 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
1156 | + if ($sincedate != '') { |
|
1157 | + $query .= "AND s.date > '".$sincedate."' "; |
|
1158 | + } |
|
1137 | 1159 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
1138 | - if ($limit) $query .= " LIMIT 0,10"; |
|
1160 | + if ($limit) { |
|
1161 | + $query .= " LIMIT 0,10"; |
|
1162 | + } |
|
1139 | 1163 | |
1140 | 1164 | |
1141 | 1165 | $sth = $this->db->prepare($query); |
@@ -10,10 +10,10 @@ discard block |
||
10 | 10 | } |
11 | 11 | |
12 | 12 | /** |
13 | - * Get SQL query part for filter used |
|
14 | - * @param Array $filter the filter |
|
15 | - * @return Array the SQL part |
|
16 | - */ |
|
13 | + * Get SQL query part for filter used |
|
14 | + * @param Array $filter the filter |
|
15 | + * @return Array the SQL part |
|
16 | + */ |
|
17 | 17 | public function getFilter($filter = array(),$where = false,$and = false) { |
18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
19 | 19 | $filters = array(); |
@@ -110,44 +110,44 @@ discard block |
||
110 | 110 | } |
111 | 111 | |
112 | 112 | |
113 | - /** |
|
114 | - * Gets all the spotter information based on a particular callsign |
|
115 | - * |
|
116 | - * @return Array the spotter information |
|
117 | - * |
|
118 | - */ |
|
119 | - public function getLastArchiveMarineDataByIdent($ident) |
|
120 | - { |
|
113 | + /** |
|
114 | + * Gets all the spotter information based on a particular callsign |
|
115 | + * |
|
116 | + * @return Array the spotter information |
|
117 | + * |
|
118 | + */ |
|
119 | + public function getLastArchiveMarineDataByIdent($ident) |
|
120 | + { |
|
121 | 121 | $Marine = new Marine($this->db); |
122 | - date_default_timezone_set('UTC'); |
|
122 | + date_default_timezone_set('UTC'); |
|
123 | 123 | |
124 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
125 | - //$query = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
126 | - $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
124 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
125 | + //$query = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
126 | + $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
127 | 127 | |
128 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident)); |
|
128 | + $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident)); |
|
129 | 129 | |
130 | - return $spotter_array; |
|
131 | - } |
|
130 | + return $spotter_array; |
|
131 | + } |
|
132 | 132 | |
133 | 133 | |
134 | - /** |
|
135 | - * Gets last the spotter information based on a particular id |
|
136 | - * |
|
137 | - * @return Array the spotter information |
|
138 | - * |
|
139 | - */ |
|
140 | - public function getLastArchiveMarineDataById($id) |
|
141 | - { |
|
142 | - $Marine = new Marine($this->db); |
|
143 | - date_default_timezone_set('UTC'); |
|
144 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
145 | - //$query = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id"; |
|
146 | - //$query = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
147 | - $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1"; |
|
134 | + /** |
|
135 | + * Gets last the spotter information based on a particular id |
|
136 | + * |
|
137 | + * @return Array the spotter information |
|
138 | + * |
|
139 | + */ |
|
140 | + public function getLastArchiveMarineDataById($id) |
|
141 | + { |
|
142 | + $Marine = new Marine($this->db); |
|
143 | + date_default_timezone_set('UTC'); |
|
144 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
145 | + //$query = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id"; |
|
146 | + //$query = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
147 | + $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1"; |
|
148 | 148 | |
149 | 149 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
150 | - /* |
|
150 | + /* |
|
151 | 151 | try { |
152 | 152 | $Connection = new Connection(); |
153 | 153 | $sth = Connection->$db->prepare($query); |
@@ -157,178 +157,178 @@ discard block |
||
157 | 157 | } |
158 | 158 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
159 | 159 | */ |
160 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id)); |
|
161 | - |
|
162 | - return $spotter_array; |
|
163 | - } |
|
164 | - |
|
165 | - /** |
|
166 | - * Gets all the spotter information based on a particular id |
|
167 | - * |
|
168 | - * @return Array the spotter information |
|
169 | - * |
|
170 | - */ |
|
171 | - public function getAllArchiveMarineDataById($id) |
|
160 | + $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id)); |
|
161 | + |
|
162 | + return $spotter_array; |
|
163 | + } |
|
164 | + |
|
165 | + /** |
|
166 | + * Gets all the spotter information based on a particular id |
|
167 | + * |
|
168 | + * @return Array the spotter information |
|
169 | + * |
|
170 | + */ |
|
171 | + public function getAllArchiveMarineDataById($id) |
|
172 | 172 | { |
173 | - date_default_timezone_set('UTC'); |
|
174 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
175 | - $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
173 | + date_default_timezone_set('UTC'); |
|
174 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
175 | + $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
176 | 176 | |
177 | 177 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
178 | 178 | |
179 | - try { |
|
180 | - $sth = $this->db->prepare($query); |
|
181 | - $sth->execute(array(':id' => $id)); |
|
182 | - } catch(PDOException $e) { |
|
183 | - echo $e->getMessage(); |
|
184 | - die; |
|
185 | - } |
|
186 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
187 | - |
|
188 | - return $spotter_array; |
|
189 | - } |
|
190 | - |
|
191 | - /** |
|
192 | - * Gets coordinate & time spotter information based on a particular id |
|
193 | - * |
|
194 | - * @return Array the spotter information |
|
195 | - * |
|
196 | - */ |
|
197 | - public function getCoordArchiveMarineDataById($id) |
|
198 | - { |
|
199 | - date_default_timezone_set('UTC'); |
|
200 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
201 | - $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id"; |
|
179 | + try { |
|
180 | + $sth = $this->db->prepare($query); |
|
181 | + $sth->execute(array(':id' => $id)); |
|
182 | + } catch(PDOException $e) { |
|
183 | + echo $e->getMessage(); |
|
184 | + die; |
|
185 | + } |
|
186 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
187 | + |
|
188 | + return $spotter_array; |
|
189 | + } |
|
190 | + |
|
191 | + /** |
|
192 | + * Gets coordinate & time spotter information based on a particular id |
|
193 | + * |
|
194 | + * @return Array the spotter information |
|
195 | + * |
|
196 | + */ |
|
197 | + public function getCoordArchiveMarineDataById($id) |
|
198 | + { |
|
199 | + date_default_timezone_set('UTC'); |
|
200 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
201 | + $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id"; |
|
202 | 202 | |
203 | 203 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
204 | 204 | |
205 | - try { |
|
206 | - $sth = $this->db->prepare($query); |
|
207 | - $sth->execute(array(':id' => $id)); |
|
208 | - } catch(PDOException $e) { |
|
209 | - echo $e->getMessage(); |
|
210 | - die; |
|
211 | - } |
|
212 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
205 | + try { |
|
206 | + $sth = $this->db->prepare($query); |
|
207 | + $sth->execute(array(':id' => $id)); |
|
208 | + } catch(PDOException $e) { |
|
209 | + echo $e->getMessage(); |
|
210 | + die; |
|
211 | + } |
|
212 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
213 | 213 | |
214 | - return $spotter_array; |
|
215 | - } |
|
214 | + return $spotter_array; |
|
215 | + } |
|
216 | 216 | |
217 | 217 | |
218 | - /** |
|
219 | - * Gets altitude information based on a particular callsign |
|
220 | - * |
|
221 | - * @return Array the spotter information |
|
222 | - * |
|
223 | - */ |
|
224 | - public function getAltitudeArchiveMarineDataByIdent($ident) |
|
225 | - { |
|
218 | + /** |
|
219 | + * Gets altitude information based on a particular callsign |
|
220 | + * |
|
221 | + * @return Array the spotter information |
|
222 | + * |
|
223 | + */ |
|
224 | + public function getAltitudeArchiveMarineDataByIdent($ident) |
|
225 | + { |
|
226 | 226 | |
227 | - date_default_timezone_set('UTC'); |
|
227 | + date_default_timezone_set('UTC'); |
|
228 | 228 | |
229 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
230 | - $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
229 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
230 | + $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
231 | 231 | |
232 | - try { |
|
233 | - $sth = $this->db->prepare($query); |
|
234 | - $sth->execute(array(':ident' => $ident)); |
|
235 | - } catch(PDOException $e) { |
|
236 | - echo $e->getMessage(); |
|
237 | - die; |
|
238 | - } |
|
239 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
232 | + try { |
|
233 | + $sth = $this->db->prepare($query); |
|
234 | + $sth->execute(array(':ident' => $ident)); |
|
235 | + } catch(PDOException $e) { |
|
236 | + echo $e->getMessage(); |
|
237 | + die; |
|
238 | + } |
|
239 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
240 | 240 | |
241 | - return $spotter_array; |
|
242 | - } |
|
241 | + return $spotter_array; |
|
242 | + } |
|
243 | 243 | |
244 | - /** |
|
245 | - * Gets altitude information based on a particular id |
|
246 | - * |
|
247 | - * @return Array the spotter information |
|
248 | - * |
|
249 | - */ |
|
250 | - public function getAltitudeArchiveMarineDataById($id) |
|
251 | - { |
|
244 | + /** |
|
245 | + * Gets altitude information based on a particular id |
|
246 | + * |
|
247 | + * @return Array the spotter information |
|
248 | + * |
|
249 | + */ |
|
250 | + public function getAltitudeArchiveMarineDataById($id) |
|
251 | + { |
|
252 | 252 | |
253 | - date_default_timezone_set('UTC'); |
|
253 | + date_default_timezone_set('UTC'); |
|
254 | 254 | |
255 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
256 | - $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
255 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
256 | + $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
257 | 257 | |
258 | - try { |
|
259 | - $sth = $this->db->prepare($query); |
|
260 | - $sth->execute(array(':id' => $id)); |
|
261 | - } catch(PDOException $e) { |
|
262 | - echo $e->getMessage(); |
|
263 | - die; |
|
264 | - } |
|
265 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
258 | + try { |
|
259 | + $sth = $this->db->prepare($query); |
|
260 | + $sth->execute(array(':id' => $id)); |
|
261 | + } catch(PDOException $e) { |
|
262 | + echo $e->getMessage(); |
|
263 | + die; |
|
264 | + } |
|
265 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
266 | 266 | |
267 | - return $spotter_array; |
|
268 | - } |
|
267 | + return $spotter_array; |
|
268 | + } |
|
269 | 269 | |
270 | - /** |
|
271 | - * Gets altitude & speed information based on a particular id |
|
272 | - * |
|
273 | - * @return Array the spotter information |
|
274 | - * |
|
275 | - */ |
|
276 | - public function getAltitudeSpeedArchiveMarineDataById($id) |
|
277 | - { |
|
270 | + /** |
|
271 | + * Gets altitude & speed information based on a particular id |
|
272 | + * |
|
273 | + * @return Array the spotter information |
|
274 | + * |
|
275 | + */ |
|
276 | + public function getAltitudeSpeedArchiveMarineDataById($id) |
|
277 | + { |
|
278 | 278 | |
279 | - date_default_timezone_set('UTC'); |
|
279 | + date_default_timezone_set('UTC'); |
|
280 | 280 | |
281 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
282 | - $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
281 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
282 | + $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
283 | 283 | |
284 | - try { |
|
285 | - $sth = $this->db->prepare($query); |
|
286 | - $sth->execute(array(':id' => $id)); |
|
287 | - } catch(PDOException $e) { |
|
288 | - echo $e->getMessage(); |
|
289 | - die; |
|
290 | - } |
|
291 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
284 | + try { |
|
285 | + $sth = $this->db->prepare($query); |
|
286 | + $sth->execute(array(':id' => $id)); |
|
287 | + } catch(PDOException $e) { |
|
288 | + echo $e->getMessage(); |
|
289 | + die; |
|
290 | + } |
|
291 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
292 | 292 | |
293 | - return $spotter_array; |
|
294 | - } |
|
293 | + return $spotter_array; |
|
294 | + } |
|
295 | 295 | |
296 | 296 | |
297 | - /** |
|
298 | - * Gets altitude information based on a particular callsign |
|
299 | - * |
|
300 | - * @return Array the spotter information |
|
301 | - * |
|
302 | - */ |
|
303 | - public function getLastAltitudeArchiveMarineDataByIdent($ident) |
|
304 | - { |
|
297 | + /** |
|
298 | + * Gets altitude information based on a particular callsign |
|
299 | + * |
|
300 | + * @return Array the spotter information |
|
301 | + * |
|
302 | + */ |
|
303 | + public function getLastAltitudeArchiveMarineDataByIdent($ident) |
|
304 | + { |
|
305 | 305 | |
306 | - date_default_timezone_set('UTC'); |
|
306 | + date_default_timezone_set('UTC'); |
|
307 | 307 | |
308 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
309 | - $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
308 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
309 | + $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
310 | 310 | // $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident"; |
311 | 311 | |
312 | - try { |
|
313 | - $sth = $this->db->prepare($query); |
|
314 | - $sth->execute(array(':ident' => $ident)); |
|
315 | - } catch(PDOException $e) { |
|
316 | - echo $e->getMessage(); |
|
317 | - die; |
|
318 | - } |
|
319 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
312 | + try { |
|
313 | + $sth = $this->db->prepare($query); |
|
314 | + $sth->execute(array(':ident' => $ident)); |
|
315 | + } catch(PDOException $e) { |
|
316 | + echo $e->getMessage(); |
|
317 | + die; |
|
318 | + } |
|
319 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
320 | 320 | |
321 | - return $spotter_array; |
|
322 | - } |
|
321 | + return $spotter_array; |
|
322 | + } |
|
323 | 323 | |
324 | 324 | |
325 | 325 | |
326 | - /** |
|
327 | - * Gets all the archive spotter information |
|
328 | - * |
|
329 | - * @return Array the spotter information |
|
330 | - * |
|
331 | - */ |
|
326 | + /** |
|
327 | + * Gets all the archive spotter information |
|
328 | + * |
|
329 | + * @return Array the spotter information |
|
330 | + * |
|
331 | + */ |
|
332 | 332 | public function getMarineArchiveData($ident,$fammarine_id,$date) |
333 | 333 | { |
334 | 334 | $Marine = new Marine($this->db); |
@@ -338,10 +338,10 @@ discard block |
||
338 | 338 | return $spotter_array; |
339 | 339 | } |
340 | 340 | |
341 | - /** |
|
342 | - * Delete all tracking data |
|
343 | - * |
|
344 | - */ |
|
341 | + /** |
|
342 | + * Delete all tracking data |
|
343 | + * |
|
344 | + */ |
|
345 | 345 | public function deleteMarineArchiveTrackData() |
346 | 346 | { |
347 | 347 | global $globalArchiveKeepTrackMonths, $globalDBdriver; |
@@ -360,34 +360,34 @@ discard block |
||
360 | 360 | } |
361 | 361 | |
362 | 362 | /** |
363 | - * Gets Minimal Live Marine data |
|
364 | - * |
|
365 | - * @return Array the spotter information |
|
366 | - * |
|
367 | - */ |
|
368 | - public function getMinLiveMarineData($begindate,$enddate,$filter = array()) |
|
369 | - { |
|
370 | - global $globalDBdriver, $globalLiveInterval; |
|
371 | - date_default_timezone_set('UTC'); |
|
372 | - |
|
373 | - $filter_query = ''; |
|
374 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
375 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
376 | - } |
|
377 | - // Use spotter_output also ? |
|
378 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
379 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
380 | - } |
|
381 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
382 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
|
383 | - } |
|
384 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
385 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
386 | - } |
|
363 | + * Gets Minimal Live Marine data |
|
364 | + * |
|
365 | + * @return Array the spotter information |
|
366 | + * |
|
367 | + */ |
|
368 | + public function getMinLiveMarineData($begindate,$enddate,$filter = array()) |
|
369 | + { |
|
370 | + global $globalDBdriver, $globalLiveInterval; |
|
371 | + date_default_timezone_set('UTC'); |
|
387 | 372 | |
388 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
389 | - if ($globalDBdriver == 'mysql') { |
|
390 | - /* |
|
373 | + $filter_query = ''; |
|
374 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
375 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
376 | + } |
|
377 | + // Use spotter_output also ? |
|
378 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
379 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
380 | + } |
|
381 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
382 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
|
383 | + } |
|
384 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
385 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
386 | + } |
|
387 | + |
|
388 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
389 | + if ($globalDBdriver == 'mysql') { |
|
390 | + /* |
|
391 | 391 | $query = 'SELECT a.aircraft_shadow, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk |
392 | 392 | FROM marine_archive |
393 | 393 | INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao'; |
@@ -406,56 +406,56 @@ discard block |
||
406 | 406 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao |
407 | 407 | WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
408 | 408 | '.$filter_query.' ORDER BY fammarine_id'; |
409 | - } else { |
|
410 | - //$query = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao'; |
|
411 | - $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
409 | + } else { |
|
410 | + //$query = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao'; |
|
411 | + $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
412 | 412 | FROM marine_archive |
413 | 413 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao |
414 | 414 | WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".' |
415 | 415 | '.$filter_query.' ORDER BY fammarine_id'; |
416 | - } |
|
417 | - //echo $query; |
|
418 | - try { |
|
419 | - $sth = $this->db->prepare($query); |
|
420 | - $sth->execute(); |
|
421 | - } catch(PDOException $e) { |
|
422 | - echo $e->getMessage(); |
|
423 | - die; |
|
424 | - } |
|
425 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
416 | + } |
|
417 | + //echo $query; |
|
418 | + try { |
|
419 | + $sth = $this->db->prepare($query); |
|
420 | + $sth->execute(); |
|
421 | + } catch(PDOException $e) { |
|
422 | + echo $e->getMessage(); |
|
423 | + die; |
|
424 | + } |
|
425 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
426 | 426 | |
427 | - return $spotter_array; |
|
428 | - } |
|
427 | + return $spotter_array; |
|
428 | + } |
|
429 | 429 | |
430 | 430 | /** |
431 | - * Gets Minimal Live Marine data |
|
432 | - * |
|
433 | - * @return Array the spotter information |
|
434 | - * |
|
435 | - */ |
|
436 | - public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array()) |
|
437 | - { |
|
438 | - global $globalDBdriver, $globalLiveInterval; |
|
439 | - date_default_timezone_set('UTC'); |
|
440 | - |
|
441 | - $filter_query = ''; |
|
442 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
443 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
444 | - } |
|
445 | - // Should use spotter_output also ? |
|
446 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
447 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
448 | - } |
|
449 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
450 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
|
451 | - } |
|
452 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
453 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
454 | - } |
|
431 | + * Gets Minimal Live Marine data |
|
432 | + * |
|
433 | + * @return Array the spotter information |
|
434 | + * |
|
435 | + */ |
|
436 | + public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array()) |
|
437 | + { |
|
438 | + global $globalDBdriver, $globalLiveInterval; |
|
439 | + date_default_timezone_set('UTC'); |
|
455 | 440 | |
456 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
457 | - if ($globalDBdriver == 'mysql') { |
|
458 | - /* |
|
441 | + $filter_query = ''; |
|
442 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
443 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
444 | + } |
|
445 | + // Should use spotter_output also ? |
|
446 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
447 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
448 | + } |
|
449 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
450 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
|
451 | + } |
|
452 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
453 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
454 | + } |
|
455 | + |
|
456 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
457 | + if ($globalDBdriver == 'mysql') { |
|
458 | + /* |
|
459 | 459 | $query = 'SELECT a.aircraft_shadow, marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk |
460 | 460 | FROM marine_archive |
461 | 461 | INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao'; |
@@ -466,95 +466,95 @@ discard block |
||
466 | 466 | WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
467 | 467 | '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow'; |
468 | 468 | |
469 | - } else { |
|
470 | - //$query = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow FROM marine_archive_output INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive_output.fammarine_id = s.fammarine_id AND marine_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao'; |
|
471 | - /* |
|
469 | + } else { |
|
470 | + //$query = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow FROM marine_archive_output INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive_output.fammarine_id = s.fammarine_id AND marine_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao'; |
|
471 | + /* |
|
472 | 472 | $query = 'SELECT marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow |
473 | 473 | FROM marine_archive_output |
474 | 474 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao |
475 | 475 | WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".' |
476 | 476 | '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow'; |
477 | 477 | */ |
478 | - $query = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow |
|
478 | + $query = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow |
|
479 | 479 | FROM marine_archive_output |
480 | 480 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao |
481 | 481 | WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".' |
482 | 482 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
483 | 483 | // .' GROUP BY spotter_output.fammarine_id, spotter_output.ident, spotter_output.aircraft_icao, spotter_output.departure_airport_icao, spotter_output.arrival_airport_icao, spotter_output.latitude, spotter_output.longitude, spotter_output.altitude, spotter_output.heading, spotter_output.ground_speed, spotter_output.squawk, a.aircraft_shadow'; |
484 | 484 | |
485 | - } |
|
486 | - //echo $query; |
|
487 | - try { |
|
488 | - $sth = $this->db->prepare($query); |
|
489 | - $sth->execute(); |
|
490 | - } catch(PDOException $e) { |
|
491 | - echo $e->getMessage(); |
|
492 | - die; |
|
493 | - } |
|
494 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
485 | + } |
|
486 | + //echo $query; |
|
487 | + try { |
|
488 | + $sth = $this->db->prepare($query); |
|
489 | + $sth->execute(); |
|
490 | + } catch(PDOException $e) { |
|
491 | + echo $e->getMessage(); |
|
492 | + die; |
|
493 | + } |
|
494 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
495 | 495 | |
496 | - return $spotter_array; |
|
497 | - } |
|
496 | + return $spotter_array; |
|
497 | + } |
|
498 | 498 | |
499 | 499 | /** |
500 | - * Gets count Live Marine data |
|
501 | - * |
|
502 | - * @return Array the spotter information |
|
503 | - * |
|
504 | - */ |
|
505 | - public function getLiveMarineCount($begindate,$enddate,$filter = array()) |
|
506 | - { |
|
507 | - global $globalDBdriver, $globalLiveInterval; |
|
508 | - date_default_timezone_set('UTC'); |
|
509 | - |
|
510 | - $filter_query = ''; |
|
511 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
512 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
513 | - } |
|
514 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
515 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
516 | - } |
|
517 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
518 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
|
519 | - } |
|
520 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
521 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
522 | - } |
|
500 | + * Gets count Live Marine data |
|
501 | + * |
|
502 | + * @return Array the spotter information |
|
503 | + * |
|
504 | + */ |
|
505 | + public function getLiveMarineCount($begindate,$enddate,$filter = array()) |
|
506 | + { |
|
507 | + global $globalDBdriver, $globalLiveInterval; |
|
508 | + date_default_timezone_set('UTC'); |
|
523 | 509 | |
524 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
525 | - if ($globalDBdriver == 'mysql') { |
|
510 | + $filter_query = ''; |
|
511 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
512 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
513 | + } |
|
514 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
515 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
516 | + } |
|
517 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
518 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
|
519 | + } |
|
520 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
521 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
522 | + } |
|
523 | + |
|
524 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
525 | + if ($globalDBdriver == 'mysql') { |
|
526 | 526 | $query = 'SELECT COUNT(DISTINCT fammarine_id) as nb |
527 | 527 | FROM marine_archive l |
528 | 528 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
529 | - } else { |
|
529 | + } else { |
|
530 | 530 | $query = 'SELECT COUNT(DISTINCT fammarine_id) as nb FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
531 | - } |
|
532 | - //echo $query; |
|
533 | - try { |
|
534 | - $sth = $this->db->prepare($query); |
|
535 | - $sth->execute(); |
|
536 | - } catch(PDOException $e) { |
|
537 | - echo $e->getMessage(); |
|
538 | - die; |
|
539 | - } |
|
531 | + } |
|
532 | + //echo $query; |
|
533 | + try { |
|
534 | + $sth = $this->db->prepare($query); |
|
535 | + $sth->execute(); |
|
536 | + } catch(PDOException $e) { |
|
537 | + echo $e->getMessage(); |
|
538 | + die; |
|
539 | + } |
|
540 | 540 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
541 | 541 | $sth->closeCursor(); |
542 | - return $result['nb']; |
|
542 | + return $result['nb']; |
|
543 | 543 | |
544 | - } |
|
544 | + } |
|
545 | 545 | |
546 | 546 | |
547 | 547 | |
548 | 548 | // marine_archive_output |
549 | 549 | |
550 | - /** |
|
551 | - * Gets all the spotter information |
|
552 | - * |
|
553 | - * @return Array the spotter information |
|
554 | - * |
|
555 | - */ |
|
556 | - public function searchMarineData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
557 | - { |
|
550 | + /** |
|
551 | + * Gets all the spotter information |
|
552 | + * |
|
553 | + * @return Array the spotter information |
|
554 | + * |
|
555 | + */ |
|
556 | + public function searchMarineData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
557 | + { |
|
558 | 558 | global $globalTimezone, $globalDBdriver; |
559 | 559 | require_once(dirname(__FILE__).'/class.Translation.php'); |
560 | 560 | $Translation = new Translation($this->db); |
@@ -568,159 +568,159 @@ discard block |
||
568 | 568 | $filter_query = $this->getFilter($filters); |
569 | 569 | if ($q != "") |
570 | 570 | { |
571 | - if (!is_string($q)) |
|
572 | - { |
|
571 | + if (!is_string($q)) |
|
572 | + { |
|
573 | 573 | return false; |
574 | - } else { |
|
574 | + } else { |
|
575 | 575 | |
576 | 576 | $q_array = explode(" ", $q); |
577 | 577 | |
578 | 578 | foreach ($q_array as $q_item){ |
579 | - $additional_query .= " AND ("; |
|
580 | - $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
581 | - $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
582 | - $additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
583 | - $additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
584 | - $additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
585 | - $additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR "; |
|
586 | - $additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR "; |
|
587 | - $additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
588 | - $additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
589 | - $additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
590 | - $additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
591 | - $additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
592 | - $additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
593 | - $additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
594 | - $additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
595 | - $additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR "; |
|
596 | - $additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR "; |
|
597 | - $additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
598 | - $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
599 | - $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR "; |
|
600 | - $translate = $Translation->ident2icao($q_item); |
|
601 | - if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR "; |
|
602 | - $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')"; |
|
603 | - $additional_query .= ")"; |
|
579 | + $additional_query .= " AND ("; |
|
580 | + $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
581 | + $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
582 | + $additional_query .= "(marine_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
583 | + $additional_query .= "(marine_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
584 | + $additional_query .= "(marine_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
585 | + $additional_query .= "(marine_archive_output.airline_name like '%".$q_item."%') OR "; |
|
586 | + $additional_query .= "(marine_archive_output.airline_country like '%".$q_item."%') OR "; |
|
587 | + $additional_query .= "(marine_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
588 | + $additional_query .= "(marine_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
589 | + $additional_query .= "(marine_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
590 | + $additional_query .= "(marine_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
591 | + $additional_query .= "(marine_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
592 | + $additional_query .= "(marine_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
593 | + $additional_query .= "(marine_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
594 | + $additional_query .= "(marine_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
595 | + $additional_query .= "(marine_archive_output.registration like '%".$q_item."%') OR "; |
|
596 | + $additional_query .= "(marine_archive_output.owner_name like '%".$q_item."%') OR "; |
|
597 | + $additional_query .= "(marine_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
598 | + $additional_query .= "(marine_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
599 | + $additional_query .= "(marine_archive_output.ident like '%".$q_item."%') OR "; |
|
600 | + $translate = $Translation->ident2icao($q_item); |
|
601 | + if ($translate != $q_item) $additional_query .= "(marine_archive_output.ident like '%".$translate."%') OR "; |
|
602 | + $additional_query .= "(marine_archive_output.highlight like '%".$q_item."%')"; |
|
603 | + $additional_query .= ")"; |
|
604 | + } |
|
604 | 605 | } |
605 | - } |
|
606 | 606 | } |
607 | 607 | |
608 | 608 | if ($registration != "") |
609 | 609 | { |
610 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
611 | - if (!is_string($registration)) |
|
612 | - { |
|
610 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
611 | + if (!is_string($registration)) |
|
612 | + { |
|
613 | 613 | return false; |
614 | - } else { |
|
614 | + } else { |
|
615 | 615 | $additional_query .= " AND (marine_archive_output.registration = '".$registration."')"; |
616 | - } |
|
616 | + } |
|
617 | 617 | } |
618 | 618 | |
619 | 619 | if ($aircraft_icao != "") |
620 | 620 | { |
621 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
622 | - if (!is_string($aircraft_icao)) |
|
623 | - { |
|
621 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
622 | + if (!is_string($aircraft_icao)) |
|
623 | + { |
|
624 | 624 | return false; |
625 | - } else { |
|
625 | + } else { |
|
626 | 626 | $additional_query .= " AND (marine_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
627 | - } |
|
627 | + } |
|
628 | 628 | } |
629 | 629 | |
630 | 630 | if ($aircraft_manufacturer != "") |
631 | 631 | { |
632 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
633 | - if (!is_string($aircraft_manufacturer)) |
|
634 | - { |
|
632 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
633 | + if (!is_string($aircraft_manufacturer)) |
|
634 | + { |
|
635 | 635 | return false; |
636 | - } else { |
|
636 | + } else { |
|
637 | 637 | $additional_query .= " AND (marine_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
638 | - } |
|
638 | + } |
|
639 | 639 | } |
640 | 640 | |
641 | 641 | if ($highlights == "true") |
642 | 642 | { |
643 | - if (!is_string($highlights)) |
|
644 | - { |
|
643 | + if (!is_string($highlights)) |
|
644 | + { |
|
645 | 645 | return false; |
646 | - } else { |
|
646 | + } else { |
|
647 | 647 | $additional_query .= " AND (marine_archive_output.highlight <> '')"; |
648 | - } |
|
648 | + } |
|
649 | 649 | } |
650 | 650 | |
651 | 651 | if ($airline_icao != "") |
652 | 652 | { |
653 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
654 | - if (!is_string($airline_icao)) |
|
655 | - { |
|
653 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
654 | + if (!is_string($airline_icao)) |
|
655 | + { |
|
656 | 656 | return false; |
657 | - } else { |
|
657 | + } else { |
|
658 | 658 | $additional_query .= " AND (marine_archive_output.airline_icao = '".$airline_icao."')"; |
659 | - } |
|
659 | + } |
|
660 | 660 | } |
661 | 661 | |
662 | 662 | if ($airline_country != "") |
663 | 663 | { |
664 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
665 | - if (!is_string($airline_country)) |
|
666 | - { |
|
664 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
665 | + if (!is_string($airline_country)) |
|
666 | + { |
|
667 | 667 | return false; |
668 | - } else { |
|
668 | + } else { |
|
669 | 669 | $additional_query .= " AND (marine_archive_output.airline_country = '".$airline_country."')"; |
670 | - } |
|
670 | + } |
|
671 | 671 | } |
672 | 672 | |
673 | 673 | if ($airline_type != "") |
674 | 674 | { |
675 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
676 | - if (!is_string($airline_type)) |
|
677 | - { |
|
675 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
676 | + if (!is_string($airline_type)) |
|
677 | + { |
|
678 | 678 | return false; |
679 | - } else { |
|
679 | + } else { |
|
680 | 680 | if ($airline_type == "passenger") |
681 | 681 | { |
682 | - $additional_query .= " AND (marine_archive_output.airline_type = 'passenger')"; |
|
682 | + $additional_query .= " AND (marine_archive_output.airline_type = 'passenger')"; |
|
683 | 683 | } |
684 | 684 | if ($airline_type == "cargo") |
685 | 685 | { |
686 | - $additional_query .= " AND (marine_archive_output.airline_type = 'cargo')"; |
|
686 | + $additional_query .= " AND (marine_archive_output.airline_type = 'cargo')"; |
|
687 | 687 | } |
688 | 688 | if ($airline_type == "military") |
689 | 689 | { |
690 | - $additional_query .= " AND (marine_archive_output.airline_type = 'military')"; |
|
690 | + $additional_query .= " AND (marine_archive_output.airline_type = 'military')"; |
|
691 | + } |
|
691 | 692 | } |
692 | - } |
|
693 | 693 | } |
694 | 694 | |
695 | 695 | if ($airport != "") |
696 | 696 | { |
697 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
698 | - if (!is_string($airport)) |
|
699 | - { |
|
697 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
698 | + if (!is_string($airport)) |
|
699 | + { |
|
700 | 700 | return false; |
701 | - } else { |
|
701 | + } else { |
|
702 | 702 | $additional_query .= " AND ((marine_archive_output.departure_airport_icao = '".$airport."') OR (marine_archive_output.arrival_airport_icao = '".$airport."'))"; |
703 | - } |
|
703 | + } |
|
704 | 704 | } |
705 | 705 | |
706 | 706 | if ($airport_country != "") |
707 | 707 | { |
708 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
709 | - if (!is_string($airport_country)) |
|
710 | - { |
|
708 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
709 | + if (!is_string($airport_country)) |
|
710 | + { |
|
711 | 711 | return false; |
712 | - } else { |
|
712 | + } else { |
|
713 | 713 | $additional_query .= " AND ((marine_archive_output.departure_airport_country = '".$airport_country."') OR (marine_archive_output.arrival_airport_country = '".$airport_country."'))"; |
714 | - } |
|
714 | + } |
|
715 | 715 | } |
716 | 716 | |
717 | 717 | if ($callsign != "") |
718 | 718 | { |
719 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
720 | - if (!is_string($callsign)) |
|
721 | - { |
|
719 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
720 | + if (!is_string($callsign)) |
|
721 | + { |
|
722 | 722 | return false; |
723 | - } else { |
|
723 | + } else { |
|
724 | 724 | $translate = $Translation->ident2icao($callsign); |
725 | 725 | if ($translate != $callsign) { |
726 | 726 | $additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)"; |
@@ -728,99 +728,99 @@ discard block |
||
728 | 728 | } else { |
729 | 729 | $additional_query .= " AND (marine_archive_output.ident = '".$callsign."')"; |
730 | 730 | } |
731 | - } |
|
731 | + } |
|
732 | 732 | } |
733 | 733 | |
734 | 734 | if ($owner != "") |
735 | 735 | { |
736 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
737 | - if (!is_string($owner)) |
|
738 | - { |
|
736 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
737 | + if (!is_string($owner)) |
|
738 | + { |
|
739 | 739 | return false; |
740 | - } else { |
|
740 | + } else { |
|
741 | 741 | $additional_query .= " AND (marine_archive_output.owner_name = '".$owner."')"; |
742 | - } |
|
742 | + } |
|
743 | 743 | } |
744 | 744 | |
745 | 745 | if ($pilot_name != "") |
746 | 746 | { |
747 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
748 | - if (!is_string($pilot_name)) |
|
749 | - { |
|
747 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
748 | + if (!is_string($pilot_name)) |
|
749 | + { |
|
750 | 750 | return false; |
751 | - } else { |
|
751 | + } else { |
|
752 | 752 | $additional_query .= " AND (marine_archive_output.pilot_name = '".$pilot_name."')"; |
753 | - } |
|
753 | + } |
|
754 | 754 | } |
755 | 755 | |
756 | 756 | if ($pilot_id != "") |
757 | 757 | { |
758 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
759 | - if (!is_string($pilot_id)) |
|
760 | - { |
|
758 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
759 | + if (!is_string($pilot_id)) |
|
760 | + { |
|
761 | 761 | return false; |
762 | - } else { |
|
762 | + } else { |
|
763 | 763 | $additional_query .= " AND (marine_archive_output.pilot_id = '".$pilot_id."')"; |
764 | - } |
|
764 | + } |
|
765 | 765 | } |
766 | 766 | |
767 | 767 | if ($departure_airport_route != "") |
768 | 768 | { |
769 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
770 | - if (!is_string($departure_airport_route)) |
|
771 | - { |
|
769 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
770 | + if (!is_string($departure_airport_route)) |
|
771 | + { |
|
772 | 772 | return false; |
773 | - } else { |
|
773 | + } else { |
|
774 | 774 | $additional_query .= " AND (marine_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
775 | - } |
|
775 | + } |
|
776 | 776 | } |
777 | 777 | |
778 | 778 | if ($arrival_airport_route != "") |
779 | 779 | { |
780 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
781 | - if (!is_string($arrival_airport_route)) |
|
782 | - { |
|
780 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
781 | + if (!is_string($arrival_airport_route)) |
|
782 | + { |
|
783 | 783 | return false; |
784 | - } else { |
|
784 | + } else { |
|
785 | 785 | $additional_query .= " AND (marine_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
786 | - } |
|
786 | + } |
|
787 | 787 | } |
788 | 788 | |
789 | 789 | if ($altitude != "") |
790 | 790 | { |
791 | - $altitude_array = explode(",", $altitude); |
|
791 | + $altitude_array = explode(",", $altitude); |
|
792 | 792 | |
793 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
794 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
793 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
794 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
795 | 795 | |
796 | 796 | |
797 | - if ($altitude_array[1] != "") |
|
798 | - { |
|
797 | + if ($altitude_array[1] != "") |
|
798 | + { |
|
799 | 799 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
800 | 800 | $altitude_array[1] = substr($altitude_array[1], 0, -2); |
801 | 801 | $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
802 | - } else { |
|
802 | + } else { |
|
803 | 803 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
804 | 804 | $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
805 | - } |
|
805 | + } |
|
806 | 806 | } |
807 | 807 | |
808 | 808 | if ($date_posted != "") |
809 | 809 | { |
810 | - $date_array = explode(",", $date_posted); |
|
810 | + $date_array = explode(",", $date_posted); |
|
811 | 811 | |
812 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
813 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
812 | + $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
813 | + $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
814 | 814 | |
815 | - if ($globalTimezone != '') { |
|
815 | + if ($globalTimezone != '') { |
|
816 | 816 | date_default_timezone_set($globalTimezone); |
817 | 817 | $datetime = new DateTime(); |
818 | 818 | $offset = $datetime->format('P'); |
819 | - } else $offset = '+00:00'; |
|
819 | + } else $offset = '+00:00'; |
|
820 | 820 | |
821 | 821 | |
822 | - if ($date_array[1] != "") |
|
823 | - { |
|
822 | + if ($date_array[1] != "") |
|
823 | + { |
|
824 | 824 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
825 | 825 | $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
826 | 826 | if ($globalDBdriver == 'mysql') { |
@@ -828,28 +828,28 @@ discard block |
||
828 | 828 | } else { |
829 | 829 | $additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) "; |
830 | 830 | } |
831 | - } else { |
|
831 | + } else { |
|
832 | 832 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
833 | - if ($globalDBdriver == 'mysql') { |
|
833 | + if ($globalDBdriver == 'mysql') { |
|
834 | 834 | $additional_query .= " AND TIMESTAMP(CONVERT_TZ(marine_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' "; |
835 | 835 | } else { |
836 | 836 | $additional_query .= " AND marine_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) "; |
837 | 837 | } |
838 | - } |
|
838 | + } |
|
839 | 839 | } |
840 | 840 | |
841 | 841 | if ($limit != "") |
842 | 842 | { |
843 | - $limit_array = explode(",", $limit); |
|
843 | + $limit_array = explode(",", $limit); |
|
844 | 844 | |
845 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
846 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
845 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
846 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
847 | 847 | |
848 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
849 | - { |
|
848 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
849 | + { |
|
850 | 850 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
851 | 851 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
852 | - } |
|
852 | + } |
|
853 | 853 | } |
854 | 854 | |
855 | 855 | |
@@ -880,33 +880,33 @@ discard block |
||
880 | 880 | $spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query); |
881 | 881 | |
882 | 882 | return $spotter_array; |
883 | - } |
|
883 | + } |
|
884 | 884 | |
885 | - public function deleteMarineArchiveData() |
|
886 | - { |
|
885 | + public function deleteMarineArchiveData() |
|
886 | + { |
|
887 | 887 | global $globalArchiveKeepMonths, $globalDBdriver; |
888 | - date_default_timezone_set('UTC'); |
|
889 | - if ($globalDBdriver == 'mysql') { |
|
888 | + date_default_timezone_set('UTC'); |
|
889 | + if ($globalDBdriver == 'mysql') { |
|
890 | 890 | $query = 'DELETE FROM marine_archive_output WHERE marine_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)'; |
891 | 891 | } else { |
892 | 892 | $query = "DELETE FROM marine_archive_output WHERE marine_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'"; |
893 | 893 | } |
894 | - try { |
|
895 | - $sth = $this->db->prepare($query); |
|
896 | - $sth->execute(); |
|
897 | - } catch(PDOException $e) { |
|
898 | - return "error"; |
|
899 | - } |
|
894 | + try { |
|
895 | + $sth = $this->db->prepare($query); |
|
896 | + $sth->execute(); |
|
897 | + } catch(PDOException $e) { |
|
898 | + return "error"; |
|
899 | + } |
|
900 | 900 | } |
901 | 901 | |
902 | - /** |
|
903 | - * Gets all the spotter information based on the callsign |
|
904 | - * |
|
905 | - * @return Array the spotter information |
|
906 | - * |
|
907 | - */ |
|
908 | - public function getMarineDataByIdent($ident = '', $limit = '', $sort = '') |
|
909 | - { |
|
902 | + /** |
|
903 | + * Gets all the spotter information based on the callsign |
|
904 | + * |
|
905 | + * @return Array the spotter information |
|
906 | + * |
|
907 | + */ |
|
908 | + public function getMarineDataByIdent($ident = '', $limit = '', $sort = '') |
|
909 | + { |
|
910 | 910 | $global_query = "SELECT marine_archive_output.* FROM marine_archive_output"; |
911 | 911 | |
912 | 912 | date_default_timezone_set('UTC'); |
@@ -918,35 +918,35 @@ discard block |
||
918 | 918 | |
919 | 919 | if ($ident != "") |
920 | 920 | { |
921 | - if (!is_string($ident)) |
|
922 | - { |
|
921 | + if (!is_string($ident)) |
|
922 | + { |
|
923 | 923 | return false; |
924 | - } else { |
|
924 | + } else { |
|
925 | 925 | $additional_query = " AND (marine_archive_output.ident = :ident)"; |
926 | 926 | $query_values = array(':ident' => $ident); |
927 | - } |
|
927 | + } |
|
928 | 928 | } |
929 | 929 | |
930 | 930 | if ($limit != "") |
931 | 931 | { |
932 | - $limit_array = explode(",", $limit); |
|
932 | + $limit_array = explode(",", $limit); |
|
933 | 933 | |
934 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
935 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
934 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
935 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
936 | 936 | |
937 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
938 | - { |
|
937 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
938 | + { |
|
939 | 939 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
940 | 940 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
941 | - } |
|
941 | + } |
|
942 | 942 | } |
943 | 943 | |
944 | 944 | if ($sort != "") |
945 | 945 | { |
946 | - $search_orderby_array = $Marine->getOrderBy(); |
|
947 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
946 | + $search_orderby_array = $Marine->getOrderBy(); |
|
947 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
948 | 948 | } else { |
949 | - $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
949 | + $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
950 | 950 | } |
951 | 951 | |
952 | 952 | $query = $global_query." WHERE marine_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
@@ -954,17 +954,17 @@ discard block |
||
954 | 954 | $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
955 | 955 | |
956 | 956 | return $spotter_array; |
957 | - } |
|
957 | + } |
|
958 | 958 | |
959 | 959 | |
960 | - /** |
|
961 | - * Gets all the spotter information based on the owner |
|
962 | - * |
|
963 | - * @return Array the spotter information |
|
964 | - * |
|
965 | - */ |
|
966 | - public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
967 | - { |
|
960 | + /** |
|
961 | + * Gets all the spotter information based on the owner |
|
962 | + * |
|
963 | + * @return Array the spotter information |
|
964 | + * |
|
965 | + */ |
|
966 | + public function getMarineDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
967 | + { |
|
968 | 968 | $global_query = "SELECT marine_archive_output.* FROM marine_archive_output"; |
969 | 969 | |
970 | 970 | date_default_timezone_set('UTC'); |
@@ -977,35 +977,35 @@ discard block |
||
977 | 977 | |
978 | 978 | if ($owner != "") |
979 | 979 | { |
980 | - if (!is_string($owner)) |
|
981 | - { |
|
980 | + if (!is_string($owner)) |
|
981 | + { |
|
982 | 982 | return false; |
983 | - } else { |
|
983 | + } else { |
|
984 | 984 | $additional_query = " AND (marine_archive_output.owner_name = :owner)"; |
985 | 985 | $query_values = array(':owner' => $owner); |
986 | - } |
|
986 | + } |
|
987 | 987 | } |
988 | 988 | |
989 | 989 | if ($limit != "") |
990 | 990 | { |
991 | - $limit_array = explode(",", $limit); |
|
991 | + $limit_array = explode(",", $limit); |
|
992 | 992 | |
993 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
994 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
993 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
994 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
995 | 995 | |
996 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
997 | - { |
|
996 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
997 | + { |
|
998 | 998 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
999 | 999 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
1000 | - } |
|
1000 | + } |
|
1001 | 1001 | } |
1002 | 1002 | |
1003 | 1003 | if ($sort != "") |
1004 | 1004 | { |
1005 | - $search_orderby_array = $Marine->getOrderBy(); |
|
1006 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
1005 | + $search_orderby_array = $Marine->getOrderBy(); |
|
1006 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
1007 | 1007 | } else { |
1008 | - $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
1008 | + $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
1009 | 1009 | } |
1010 | 1010 | |
1011 | 1011 | $query = $global_query.$filter_query." marine_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1013,16 +1013,16 @@ discard block |
||
1013 | 1013 | $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
1014 | 1014 | |
1015 | 1015 | return $spotter_array; |
1016 | - } |
|
1017 | - |
|
1018 | - /** |
|
1019 | - * Gets all the spotter information based on the pilot |
|
1020 | - * |
|
1021 | - * @return Array the spotter information |
|
1022 | - * |
|
1023 | - */ |
|
1024 | - public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
1025 | - { |
|
1016 | + } |
|
1017 | + |
|
1018 | + /** |
|
1019 | + * Gets all the spotter information based on the pilot |
|
1020 | + * |
|
1021 | + * @return Array the spotter information |
|
1022 | + * |
|
1023 | + */ |
|
1024 | + public function getMarineDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
1025 | + { |
|
1026 | 1026 | $global_query = "SELECT marine_archive_output.* FROM marine_archive_output"; |
1027 | 1027 | |
1028 | 1028 | date_default_timezone_set('UTC'); |
@@ -1041,24 +1041,24 @@ discard block |
||
1041 | 1041 | |
1042 | 1042 | if ($limit != "") |
1043 | 1043 | { |
1044 | - $limit_array = explode(",", $limit); |
|
1044 | + $limit_array = explode(",", $limit); |
|
1045 | 1045 | |
1046 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
1047 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
1046 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
1047 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
1048 | 1048 | |
1049 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
1050 | - { |
|
1049 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
1050 | + { |
|
1051 | 1051 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
1052 | 1052 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
1053 | - } |
|
1053 | + } |
|
1054 | 1054 | } |
1055 | 1055 | |
1056 | 1056 | if ($sort != "") |
1057 | 1057 | { |
1058 | - $search_orderby_array = $Marine->getOrderBy(); |
|
1059 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
1058 | + $search_orderby_array = $Marine->getOrderBy(); |
|
1059 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
1060 | 1060 | } else { |
1061 | - $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
1061 | + $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
1062 | 1062 | } |
1063 | 1063 | |
1064 | 1064 | $query = $global_query.$filter_query." marine_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1066,16 +1066,16 @@ discard block |
||
1066 | 1066 | $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
1067 | 1067 | |
1068 | 1068 | return $spotter_array; |
1069 | - } |
|
1070 | - |
|
1071 | - /** |
|
1072 | - * Gets all number of flight over countries |
|
1073 | - * |
|
1074 | - * @return Array the airline country list |
|
1075 | - * |
|
1076 | - */ |
|
1077 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
1078 | - { |
|
1069 | + } |
|
1070 | + |
|
1071 | + /** |
|
1072 | + * Gets all number of flight over countries |
|
1073 | + * |
|
1074 | + * @return Array the airline country list |
|
1075 | + * |
|
1076 | + */ |
|
1077 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
1078 | + { |
|
1079 | 1079 | global $globalDBdriver; |
1080 | 1080 | /* |
1081 | 1081 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1085,14 +1085,14 @@ discard block |
||
1085 | 1085 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
1086 | 1086 | FROM countries c, marine_archive s |
1087 | 1087 | WHERE c.iso2 = s.over_country "; |
1088 | - if ($olderthanmonths > 0) { |
|
1089 | - if ($globalDBdriver == 'mysql') { |
|
1088 | + if ($olderthanmonths > 0) { |
|
1089 | + if ($globalDBdriver == 'mysql') { |
|
1090 | 1090 | $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
1091 | 1091 | } else { |
1092 | 1092 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
1093 | 1093 | } |
1094 | 1094 | } |
1095 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
1095 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
1096 | 1096 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
1097 | 1097 | if ($limit) $query .= " LIMIT 0,10"; |
1098 | 1098 | |
@@ -1105,23 +1105,23 @@ discard block |
||
1105 | 1105 | |
1106 | 1106 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
1107 | 1107 | { |
1108 | - $temp_array['flight_count'] = $row['nb']; |
|
1109 | - $temp_array['flight_country'] = $row['name']; |
|
1110 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
1111 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
1112 | - $flight_array[] = $temp_array; |
|
1108 | + $temp_array['flight_count'] = $row['nb']; |
|
1109 | + $temp_array['flight_country'] = $row['name']; |
|
1110 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
1111 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
1112 | + $flight_array[] = $temp_array; |
|
1113 | 1113 | } |
1114 | 1114 | return $flight_array; |
1115 | - } |
|
1116 | - |
|
1117 | - /** |
|
1118 | - * Gets all number of flight over countries |
|
1119 | - * |
|
1120 | - * @return Array the airline country list |
|
1121 | - * |
|
1122 | - */ |
|
1123 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
1124 | - { |
|
1115 | + } |
|
1116 | + |
|
1117 | + /** |
|
1118 | + * Gets all number of flight over countries |
|
1119 | + * |
|
1120 | + * @return Array the airline country list |
|
1121 | + * |
|
1122 | + */ |
|
1123 | + public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
1124 | + { |
|
1125 | 1125 | global $globalDBdriver; |
1126 | 1126 | /* |
1127 | 1127 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1131,14 +1131,14 @@ discard block |
||
1131 | 1131 | $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
1132 | 1132 | FROM countries c, marine_archive s, spotter_output o |
1133 | 1133 | WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.fammarine_id = s.fammarine_id "; |
1134 | - if ($olderthanmonths > 0) { |
|
1135 | - if ($globalDBdriver == 'mysql') { |
|
1134 | + if ($olderthanmonths > 0) { |
|
1135 | + if ($globalDBdriver == 'mysql') { |
|
1136 | 1136 | $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
1137 | 1137 | } else { |
1138 | 1138 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
1139 | 1139 | } |
1140 | 1140 | } |
1141 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
1141 | + if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
1142 | 1142 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
1143 | 1143 | if ($limit) $query .= " LIMIT 0,10"; |
1144 | 1144 | |
@@ -1151,24 +1151,24 @@ discard block |
||
1151 | 1151 | |
1152 | 1152 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
1153 | 1153 | { |
1154 | - $temp_array['airline_icao'] = $row['airline_icao']; |
|
1155 | - $temp_array['flight_count'] = $row['nb']; |
|
1156 | - $temp_array['flight_country'] = $row['name']; |
|
1157 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
1158 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
1159 | - $flight_array[] = $temp_array; |
|
1154 | + $temp_array['airline_icao'] = $row['airline_icao']; |
|
1155 | + $temp_array['flight_count'] = $row['nb']; |
|
1156 | + $temp_array['flight_country'] = $row['name']; |
|
1157 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
1158 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
1159 | + $flight_array[] = $temp_array; |
|
1160 | 1160 | } |
1161 | 1161 | return $flight_array; |
1162 | - } |
|
1163 | - |
|
1164 | - /** |
|
1165 | - * Gets last spotter information based on a particular callsign |
|
1166 | - * |
|
1167 | - * @return Array the spotter information |
|
1168 | - * |
|
1169 | - */ |
|
1170 | - public function getDateArchiveMarineDataById($id,$date) |
|
1171 | - { |
|
1162 | + } |
|
1163 | + |
|
1164 | + /** |
|
1165 | + * Gets last spotter information based on a particular callsign |
|
1166 | + * |
|
1167 | + * @return Array the spotter information |
|
1168 | + * |
|
1169 | + */ |
|
1170 | + public function getDateArchiveMarineDataById($id,$date) |
|
1171 | + { |
|
1172 | 1172 | $Marine = new Marine($this->db); |
1173 | 1173 | date_default_timezone_set('UTC'); |
1174 | 1174 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -1176,16 +1176,16 @@ discard block |
||
1176 | 1176 | $date = date('c',$date); |
1177 | 1177 | $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
1178 | 1178 | return $spotter_array; |
1179 | - } |
|
1180 | - |
|
1181 | - /** |
|
1182 | - * Gets all the spotter information based on a particular callsign |
|
1183 | - * |
|
1184 | - * @return Array the spotter information |
|
1185 | - * |
|
1186 | - */ |
|
1187 | - public function getDateArchiveMarineDataByIdent($ident,$date) |
|
1188 | - { |
|
1179 | + } |
|
1180 | + |
|
1181 | + /** |
|
1182 | + * Gets all the spotter information based on a particular callsign |
|
1183 | + * |
|
1184 | + * @return Array the spotter information |
|
1185 | + * |
|
1186 | + */ |
|
1187 | + public function getDateArchiveMarineDataByIdent($ident,$date) |
|
1188 | + { |
|
1189 | 1189 | $Marine = new Marine($this->db); |
1190 | 1190 | date_default_timezone_set('UTC'); |
1191 | 1191 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -1193,16 +1193,16 @@ discard block |
||
1193 | 1193 | $date = date('c',$date); |
1194 | 1194 | $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
1195 | 1195 | return $spotter_array; |
1196 | - } |
|
1197 | - |
|
1198 | - /** |
|
1199 | - * Gets all the spotter information based on the airport |
|
1200 | - * |
|
1201 | - * @return Array the spotter information |
|
1202 | - * |
|
1203 | - */ |
|
1204 | - public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
1205 | - { |
|
1196 | + } |
|
1197 | + |
|
1198 | + /** |
|
1199 | + * Gets all the spotter information based on the airport |
|
1200 | + * |
|
1201 | + * @return Array the spotter information |
|
1202 | + * |
|
1203 | + */ |
|
1204 | + public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
1205 | + { |
|
1206 | 1206 | global $global_query; |
1207 | 1207 | $Marine = new Marine($this->db); |
1208 | 1208 | date_default_timezone_set('UTC'); |
@@ -1213,35 +1213,35 @@ discard block |
||
1213 | 1213 | |
1214 | 1214 | if ($airport != "") |
1215 | 1215 | { |
1216 | - if (!is_string($airport)) |
|
1217 | - { |
|
1216 | + if (!is_string($airport)) |
|
1217 | + { |
|
1218 | 1218 | return false; |
1219 | - } else { |
|
1219 | + } else { |
|
1220 | 1220 | $additional_query .= " AND ((marine_archive_output.departure_airport_icao = :airport) OR (marine_archive_output.arrival_airport_icao = :airport))"; |
1221 | 1221 | $query_values = array(':airport' => $airport); |
1222 | - } |
|
1222 | + } |
|
1223 | 1223 | } |
1224 | 1224 | |
1225 | 1225 | if ($limit != "") |
1226 | 1226 | { |
1227 | - $limit_array = explode(",", $limit); |
|
1227 | + $limit_array = explode(",", $limit); |
|
1228 | 1228 | |
1229 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
1230 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
1229 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
1230 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
1231 | 1231 | |
1232 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
1233 | - { |
|
1232 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
1233 | + { |
|
1234 | 1234 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
1235 | 1235 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
1236 | - } |
|
1236 | + } |
|
1237 | 1237 | } |
1238 | 1238 | |
1239 | 1239 | if ($sort != "") |
1240 | 1240 | { |
1241 | - $search_orderby_array = $Marine->getOrderBy(); |
|
1242 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
1241 | + $search_orderby_array = $Marine->getOrderBy(); |
|
1242 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
1243 | 1243 | } else { |
1244 | - $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
1244 | + $orderby_query = " ORDER BY marine_archive_output.date DESC"; |
|
1245 | 1245 | } |
1246 | 1246 | |
1247 | 1247 | $query = $global_query.$filter_query." marine_archive_output.ident <> '' ".$additional_query." AND ((marine_archive_output.departure_airport_icao <> 'NA') AND (marine_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query; |
@@ -1249,6 +1249,6 @@ discard block |
||
1249 | 1249 | $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
1250 | 1250 | |
1251 | 1251 | return $spotter_array; |
1252 | - } |
|
1252 | + } |
|
1253 | 1253 | } |
1254 | 1254 | ?> |
1255 | 1255 | \ No newline at end of file |
@@ -14,33 +14,33 @@ discard block |
||
14 | 14 | * @param Array $filter the filter |
15 | 15 | * @return Array the SQL part |
16 | 16 | */ |
17 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
17 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
18 | 18 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
19 | 19 | $filters = array(); |
20 | 20 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
21 | 21 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
22 | 22 | $filters = $globalStatsFilters[$globalFilterName]; |
23 | 23 | } else { |
24 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
24 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
25 | 25 | } |
26 | 26 | } |
27 | 27 | if (isset($filter[0]['source'])) { |
28 | - $filters = array_merge($filters,$filter); |
|
28 | + $filters = array_merge($filters, $filter); |
|
29 | 29 | } |
30 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
30 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
31 | 31 | $filter_query_join = ''; |
32 | 32 | $filter_query_where = ''; |
33 | - foreach($filters as $flt) { |
|
33 | + foreach ($filters as $flt) { |
|
34 | 34 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
35 | 35 | if (isset($flt['source'])) { |
36 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id"; |
|
36 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id"; |
|
37 | 37 | } else { |
38 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id"; |
|
38 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id"; |
|
39 | 39 | } |
40 | 40 | } |
41 | 41 | } |
42 | 42 | if (isset($filter['source']) && !empty($filter['source'])) { |
43 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
43 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
44 | 44 | } |
45 | 45 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
46 | 46 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -68,42 +68,42 @@ discard block |
||
68 | 68 | $filter_query_date .= " AND EXTRACT(DAY FROM marine_archive_output.date) = '".$filter['day']."'"; |
69 | 69 | } |
70 | 70 | } |
71 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id"; |
|
71 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id"; |
|
72 | 72 | } |
73 | 73 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
74 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
74 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
75 | 75 | } |
76 | 76 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
77 | 77 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
78 | 78 | if ($filter_query_where != '') { |
79 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
79 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
80 | 80 | } |
81 | 81 | $filter_query = $filter_query_join.$filter_query_where; |
82 | 82 | return $filter_query; |
83 | 83 | } |
84 | 84 | |
85 | 85 | // marine_archive |
86 | - public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') { |
|
86 | + public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') { |
|
87 | 87 | require_once(dirname(__FILE__).'/class.Marine.php'); |
88 | 88 | if ($over_country == '') { |
89 | 89 | $Marine = new Marine($this->db); |
90 | - $data_country = $Marine->getCountryFromLatitudeLongitude($latitude,$longitude); |
|
90 | + $data_country = $Marine->getCountryFromLatitudeLongitude($latitude, $longitude); |
|
91 | 91 | if (!empty($data_country)) $country = $data_country['iso2']; |
92 | 92 | else $country = ''; |
93 | 93 | } else $country = $over_country; |
94 | 94 | |
95 | 95 | //$country = $over_country; |
96 | 96 | // Route is not added in marine_archive |
97 | - $query = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) |
|
97 | + $query = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) |
|
98 | 98 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)'; |
99 | 99 | |
100 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date); |
|
100 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date); |
|
101 | 101 | |
102 | 102 | try { |
103 | 103 | $sth = $this->db->prepare($query); |
104 | 104 | $sth->execute($query_values); |
105 | 105 | $sth->closeCursor(); |
106 | - } catch(PDOException $e) { |
|
106 | + } catch (PDOException $e) { |
|
107 | 107 | return "error : ".$e->getMessage(); |
108 | 108 | } |
109 | 109 | return "success"; |
@@ -123,9 +123,9 @@ discard block |
||
123 | 123 | |
124 | 124 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
125 | 125 | //$query = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
126 | - $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
126 | + $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
127 | 127 | |
128 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident)); |
|
128 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident)); |
|
129 | 129 | |
130 | 130 | return $spotter_array; |
131 | 131 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
145 | 145 | //$query = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id"; |
146 | 146 | //$query = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
147 | - $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1"; |
|
147 | + $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1"; |
|
148 | 148 | |
149 | 149 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
150 | 150 | /* |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | } |
158 | 158 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
159 | 159 | */ |
160 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id)); |
|
160 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id)); |
|
161 | 161 | |
162 | 162 | return $spotter_array; |
163 | 163 | } |
@@ -172,14 +172,14 @@ discard block |
||
172 | 172 | { |
173 | 173 | date_default_timezone_set('UTC'); |
174 | 174 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
175 | - $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
175 | + $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
176 | 176 | |
177 | 177 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
178 | 178 | |
179 | 179 | try { |
180 | 180 | $sth = $this->db->prepare($query); |
181 | 181 | $sth->execute(array(':id' => $id)); |
182 | - } catch(PDOException $e) { |
|
182 | + } catch (PDOException $e) { |
|
183 | 183 | echo $e->getMessage(); |
184 | 184 | die; |
185 | 185 | } |
@@ -198,14 +198,14 @@ discard block |
||
198 | 198 | { |
199 | 199 | date_default_timezone_set('UTC'); |
200 | 200 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
201 | - $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id"; |
|
201 | + $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id"; |
|
202 | 202 | |
203 | 203 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
204 | 204 | |
205 | 205 | try { |
206 | 206 | $sth = $this->db->prepare($query); |
207 | 207 | $sth->execute(array(':id' => $id)); |
208 | - } catch(PDOException $e) { |
|
208 | + } catch (PDOException $e) { |
|
209 | 209 | echo $e->getMessage(); |
210 | 210 | die; |
211 | 211 | } |
@@ -227,12 +227,12 @@ discard block |
||
227 | 227 | date_default_timezone_set('UTC'); |
228 | 228 | |
229 | 229 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
230 | - $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
230 | + $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
231 | 231 | |
232 | 232 | try { |
233 | 233 | $sth = $this->db->prepare($query); |
234 | 234 | $sth->execute(array(':ident' => $ident)); |
235 | - } catch(PDOException $e) { |
|
235 | + } catch (PDOException $e) { |
|
236 | 236 | echo $e->getMessage(); |
237 | 237 | die; |
238 | 238 | } |
@@ -253,12 +253,12 @@ discard block |
||
253 | 253 | date_default_timezone_set('UTC'); |
254 | 254 | |
255 | 255 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
256 | - $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
256 | + $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
257 | 257 | |
258 | 258 | try { |
259 | 259 | $sth = $this->db->prepare($query); |
260 | 260 | $sth->execute(array(':id' => $id)); |
261 | - } catch(PDOException $e) { |
|
261 | + } catch (PDOException $e) { |
|
262 | 262 | echo $e->getMessage(); |
263 | 263 | die; |
264 | 264 | } |
@@ -279,12 +279,12 @@ discard block |
||
279 | 279 | date_default_timezone_set('UTC'); |
280 | 280 | |
281 | 281 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
282 | - $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
282 | + $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
283 | 283 | |
284 | 284 | try { |
285 | 285 | $sth = $this->db->prepare($query); |
286 | 286 | $sth->execute(array(':id' => $id)); |
287 | - } catch(PDOException $e) { |
|
287 | + } catch (PDOException $e) { |
|
288 | 288 | echo $e->getMessage(); |
289 | 289 | die; |
290 | 290 | } |
@@ -306,13 +306,13 @@ discard block |
||
306 | 306 | date_default_timezone_set('UTC'); |
307 | 307 | |
308 | 308 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
309 | - $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
309 | + $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
310 | 310 | // $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident"; |
311 | 311 | |
312 | 312 | try { |
313 | 313 | $sth = $this->db->prepare($query); |
314 | 314 | $sth->execute(array(':ident' => $ident)); |
315 | - } catch(PDOException $e) { |
|
315 | + } catch (PDOException $e) { |
|
316 | 316 | echo $e->getMessage(); |
317 | 317 | die; |
318 | 318 | } |
@@ -329,12 +329,12 @@ discard block |
||
329 | 329 | * @return Array the spotter information |
330 | 330 | * |
331 | 331 | */ |
332 | - public function getMarineArchiveData($ident,$fammarine_id,$date) |
|
332 | + public function getMarineArchiveData($ident, $fammarine_id, $date) |
|
333 | 333 | { |
334 | 334 | $Marine = new Marine($this->db); |
335 | 335 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
336 | 336 | $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.fammarine_id = :fammarine_id AND l.date LIKE :date GROUP BY l.fammarine_id) s on spotter_live.fammarine_id = s.fammarine_id AND spotter_live.date = s.maxdate"; |
337 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%')); |
|
337 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':fammarine_id' => $fammarine_id, ':date' => $date.'%')); |
|
338 | 338 | return $spotter_array; |
339 | 339 | } |
340 | 340 | |
@@ -353,7 +353,7 @@ discard block |
||
353 | 353 | try { |
354 | 354 | $sth = $this->db->prepare($query); |
355 | 355 | $sth->execute(); |
356 | - } catch(PDOException $e) { |
|
356 | + } catch (PDOException $e) { |
|
357 | 357 | echo $e->getMessage(); |
358 | 358 | die; |
359 | 359 | } |
@@ -365,24 +365,24 @@ discard block |
||
365 | 365 | * @return Array the spotter information |
366 | 366 | * |
367 | 367 | */ |
368 | - public function getMinLiveMarineData($begindate,$enddate,$filter = array()) |
|
368 | + public function getMinLiveMarineData($begindate, $enddate, $filter = array()) |
|
369 | 369 | { |
370 | 370 | global $globalDBdriver, $globalLiveInterval; |
371 | 371 | date_default_timezone_set('UTC'); |
372 | 372 | |
373 | 373 | $filter_query = ''; |
374 | 374 | if (isset($filter['source']) && !empty($filter['source'])) { |
375 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
375 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
376 | 376 | } |
377 | 377 | // Use spotter_output also ? |
378 | 378 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
379 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
379 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
380 | 380 | } |
381 | 381 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
382 | 382 | $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
383 | 383 | } |
384 | 384 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
385 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
385 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
386 | 386 | } |
387 | 387 | |
388 | 388 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -401,14 +401,14 @@ discard block |
||
401 | 401 | GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id |
402 | 402 | AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao'; |
403 | 403 | */ |
404 | - $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
404 | + $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
405 | 405 | FROM marine_archive |
406 | 406 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao |
407 | 407 | WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
408 | 408 | '.$filter_query.' ORDER BY fammarine_id'; |
409 | 409 | } else { |
410 | 410 | //$query = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao'; |
411 | - $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
411 | + $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
412 | 412 | FROM marine_archive |
413 | 413 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao |
414 | 414 | WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".' |
@@ -418,7 +418,7 @@ discard block |
||
418 | 418 | try { |
419 | 419 | $sth = $this->db->prepare($query); |
420 | 420 | $sth->execute(); |
421 | - } catch(PDOException $e) { |
|
421 | + } catch (PDOException $e) { |
|
422 | 422 | echo $e->getMessage(); |
423 | 423 | die; |
424 | 424 | } |
@@ -433,24 +433,24 @@ discard block |
||
433 | 433 | * @return Array the spotter information |
434 | 434 | * |
435 | 435 | */ |
436 | - public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array()) |
|
436 | + public function getMinLiveMarineDataPlayback($begindate, $enddate, $filter = array()) |
|
437 | 437 | { |
438 | 438 | global $globalDBdriver, $globalLiveInterval; |
439 | 439 | date_default_timezone_set('UTC'); |
440 | 440 | |
441 | 441 | $filter_query = ''; |
442 | 442 | if (isset($filter['source']) && !empty($filter['source'])) { |
443 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
443 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
444 | 444 | } |
445 | 445 | // Should use spotter_output also ? |
446 | 446 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
447 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
447 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
448 | 448 | } |
449 | 449 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
450 | 450 | $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
451 | 451 | } |
452 | 452 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
453 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
453 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
454 | 454 | } |
455 | 455 | |
456 | 456 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -460,7 +460,7 @@ discard block |
||
460 | 460 | FROM marine_archive |
461 | 461 | INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao'; |
462 | 462 | */ |
463 | - $query = 'SELECT a.aircraft_shadow, marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk |
|
463 | + $query = 'SELECT a.aircraft_shadow, marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk |
|
464 | 464 | FROM marine_archive_output |
465 | 465 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive_output.aircraft_icao = a.icao |
466 | 466 | WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -475,7 +475,7 @@ discard block |
||
475 | 475 | WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".' |
476 | 476 | '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow'; |
477 | 477 | */ |
478 | - $query = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow |
|
478 | + $query = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow |
|
479 | 479 | FROM marine_archive_output |
480 | 480 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao |
481 | 481 | WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".' |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | try { |
488 | 488 | $sth = $this->db->prepare($query); |
489 | 489 | $sth->execute(); |
490 | - } catch(PDOException $e) { |
|
490 | + } catch (PDOException $e) { |
|
491 | 491 | echo $e->getMessage(); |
492 | 492 | die; |
493 | 493 | } |
@@ -502,23 +502,23 @@ discard block |
||
502 | 502 | * @return Array the spotter information |
503 | 503 | * |
504 | 504 | */ |
505 | - public function getLiveMarineCount($begindate,$enddate,$filter = array()) |
|
505 | + public function getLiveMarineCount($begindate, $enddate, $filter = array()) |
|
506 | 506 | { |
507 | 507 | global $globalDBdriver, $globalLiveInterval; |
508 | 508 | date_default_timezone_set('UTC'); |
509 | 509 | |
510 | 510 | $filter_query = ''; |
511 | 511 | if (isset($filter['source']) && !empty($filter['source'])) { |
512 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
512 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
513 | 513 | } |
514 | 514 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
515 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
515 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
516 | 516 | } |
517 | 517 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
518 | 518 | $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
519 | 519 | } |
520 | 520 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
521 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
521 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
522 | 522 | } |
523 | 523 | |
524 | 524 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -533,7 +533,7 @@ discard block |
||
533 | 533 | try { |
534 | 534 | $sth = $this->db->prepare($query); |
535 | 535 | $sth->execute(); |
536 | - } catch(PDOException $e) { |
|
536 | + } catch (PDOException $e) { |
|
537 | 537 | echo $e->getMessage(); |
538 | 538 | die; |
539 | 539 | } |
@@ -553,7 +553,7 @@ discard block |
||
553 | 553 | * @return Array the spotter information |
554 | 554 | * |
555 | 555 | */ |
556 | - public function searchMarineData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
556 | + public function searchMarineData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) |
|
557 | 557 | { |
558 | 558 | global $globalTimezone, $globalDBdriver; |
559 | 559 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -575,7 +575,7 @@ discard block |
||
575 | 575 | |
576 | 576 | $q_array = explode(" ", $q); |
577 | 577 | |
578 | - foreach ($q_array as $q_item){ |
|
578 | + foreach ($q_array as $q_item) { |
|
579 | 579 | $additional_query .= " AND ("; |
580 | 580 | $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR "; |
581 | 581 | $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -607,7 +607,7 @@ discard block |
||
607 | 607 | |
608 | 608 | if ($registration != "") |
609 | 609 | { |
610 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
610 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
611 | 611 | if (!is_string($registration)) |
612 | 612 | { |
613 | 613 | return false; |
@@ -618,7 +618,7 @@ discard block |
||
618 | 618 | |
619 | 619 | if ($aircraft_icao != "") |
620 | 620 | { |
621 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
621 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
622 | 622 | if (!is_string($aircraft_icao)) |
623 | 623 | { |
624 | 624 | return false; |
@@ -629,7 +629,7 @@ discard block |
||
629 | 629 | |
630 | 630 | if ($aircraft_manufacturer != "") |
631 | 631 | { |
632 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
632 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
633 | 633 | if (!is_string($aircraft_manufacturer)) |
634 | 634 | { |
635 | 635 | return false; |
@@ -650,7 +650,7 @@ discard block |
||
650 | 650 | |
651 | 651 | if ($airline_icao != "") |
652 | 652 | { |
653 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
653 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
654 | 654 | if (!is_string($airline_icao)) |
655 | 655 | { |
656 | 656 | return false; |
@@ -661,7 +661,7 @@ discard block |
||
661 | 661 | |
662 | 662 | if ($airline_country != "") |
663 | 663 | { |
664 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
664 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
665 | 665 | if (!is_string($airline_country)) |
666 | 666 | { |
667 | 667 | return false; |
@@ -672,7 +672,7 @@ discard block |
||
672 | 672 | |
673 | 673 | if ($airline_type != "") |
674 | 674 | { |
675 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
675 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
676 | 676 | if (!is_string($airline_type)) |
677 | 677 | { |
678 | 678 | return false; |
@@ -694,7 +694,7 @@ discard block |
||
694 | 694 | |
695 | 695 | if ($airport != "") |
696 | 696 | { |
697 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
697 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
698 | 698 | if (!is_string($airport)) |
699 | 699 | { |
700 | 700 | return false; |
@@ -705,7 +705,7 @@ discard block |
||
705 | 705 | |
706 | 706 | if ($airport_country != "") |
707 | 707 | { |
708 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
708 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
709 | 709 | if (!is_string($airport_country)) |
710 | 710 | { |
711 | 711 | return false; |
@@ -716,7 +716,7 @@ discard block |
||
716 | 716 | |
717 | 717 | if ($callsign != "") |
718 | 718 | { |
719 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
719 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
720 | 720 | if (!is_string($callsign)) |
721 | 721 | { |
722 | 722 | return false; |
@@ -724,7 +724,7 @@ discard block |
||
724 | 724 | $translate = $Translation->ident2icao($callsign); |
725 | 725 | if ($translate != $callsign) { |
726 | 726 | $additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)"; |
727 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
727 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
728 | 728 | } else { |
729 | 729 | $additional_query .= " AND (marine_archive_output.ident = '".$callsign."')"; |
730 | 730 | } |
@@ -733,7 +733,7 @@ discard block |
||
733 | 733 | |
734 | 734 | if ($owner != "") |
735 | 735 | { |
736 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
736 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
737 | 737 | if (!is_string($owner)) |
738 | 738 | { |
739 | 739 | return false; |
@@ -744,7 +744,7 @@ discard block |
||
744 | 744 | |
745 | 745 | if ($pilot_name != "") |
746 | 746 | { |
747 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
747 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
748 | 748 | if (!is_string($pilot_name)) |
749 | 749 | { |
750 | 750 | return false; |
@@ -755,7 +755,7 @@ discard block |
||
755 | 755 | |
756 | 756 | if ($pilot_id != "") |
757 | 757 | { |
758 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
758 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
759 | 759 | if (!is_string($pilot_id)) |
760 | 760 | { |
761 | 761 | return false; |
@@ -766,7 +766,7 @@ discard block |
||
766 | 766 | |
767 | 767 | if ($departure_airport_route != "") |
768 | 768 | { |
769 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
769 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
770 | 770 | if (!is_string($departure_airport_route)) |
771 | 771 | { |
772 | 772 | return false; |
@@ -777,7 +777,7 @@ discard block |
||
777 | 777 | |
778 | 778 | if ($arrival_airport_route != "") |
779 | 779 | { |
780 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
780 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
781 | 781 | if (!is_string($arrival_airport_route)) |
782 | 782 | { |
783 | 783 | return false; |
@@ -790,8 +790,8 @@ discard block |
||
790 | 790 | { |
791 | 791 | $altitude_array = explode(",", $altitude); |
792 | 792 | |
793 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
794 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
793 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
794 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
795 | 795 | |
796 | 796 | |
797 | 797 | if ($altitude_array[1] != "") |
@@ -809,8 +809,8 @@ discard block |
||
809 | 809 | { |
810 | 810 | $date_array = explode(",", $date_posted); |
811 | 811 | |
812 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
813 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
812 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
813 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
814 | 814 | |
815 | 815 | if ($globalTimezone != '') { |
816 | 816 | date_default_timezone_set($globalTimezone); |
@@ -842,8 +842,8 @@ discard block |
||
842 | 842 | { |
843 | 843 | $limit_array = explode(",", $limit); |
844 | 844 | |
845 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
846 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
845 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
846 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
847 | 847 | |
848 | 848 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
849 | 849 | { |
@@ -854,8 +854,8 @@ discard block |
||
854 | 854 | |
855 | 855 | |
856 | 856 | if ($origLat != "" && $origLon != "" && $dist != "") { |
857 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
858 | - $query="SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
857 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
858 | + $query = "SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
859 | 859 | FROM marine_archive_output, marine_archive WHERE spotter_output_archive.fammarine_id = marine_archive.fammarine_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
860 | 860 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
861 | 861 | } else { |
@@ -872,12 +872,12 @@ discard block |
||
872 | 872 | $additional_query .= " AND (marine_archive_output.waypoints <> '')"; |
873 | 873 | } |
874 | 874 | |
875 | - $query = "SELECT marine_archive_output.* FROM marine_archive_output |
|
875 | + $query = "SELECT marine_archive_output.* FROM marine_archive_output |
|
876 | 876 | WHERE marine_archive_output.ident <> '' |
877 | 877 | ".$additional_query." |
878 | 878 | ".$filter_query.$orderby_query; |
879 | 879 | } |
880 | - $spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query); |
|
880 | + $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
|
881 | 881 | |
882 | 882 | return $spotter_array; |
883 | 883 | } |
@@ -894,7 +894,7 @@ discard block |
||
894 | 894 | try { |
895 | 895 | $sth = $this->db->prepare($query); |
896 | 896 | $sth->execute(); |
897 | - } catch(PDOException $e) { |
|
897 | + } catch (PDOException $e) { |
|
898 | 898 | return "error"; |
899 | 899 | } |
900 | 900 | } |
@@ -931,8 +931,8 @@ discard block |
||
931 | 931 | { |
932 | 932 | $limit_array = explode(",", $limit); |
933 | 933 | |
934 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
935 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
934 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
935 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
936 | 936 | |
937 | 937 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
938 | 938 | { |
@@ -973,7 +973,7 @@ discard block |
||
973 | 973 | $query_values = array(); |
974 | 974 | $limit_query = ''; |
975 | 975 | $additional_query = ''; |
976 | - $filter_query = $this->getFilter($filter,true,true); |
|
976 | + $filter_query = $this->getFilter($filter, true, true); |
|
977 | 977 | |
978 | 978 | if ($owner != "") |
979 | 979 | { |
@@ -990,8 +990,8 @@ discard block |
||
990 | 990 | { |
991 | 991 | $limit_array = explode(",", $limit); |
992 | 992 | |
993 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
994 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
993 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
994 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
995 | 995 | |
996 | 996 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
997 | 997 | { |
@@ -1031,7 +1031,7 @@ discard block |
||
1031 | 1031 | $query_values = array(); |
1032 | 1032 | $limit_query = ''; |
1033 | 1033 | $additional_query = ''; |
1034 | - $filter_query = $this->getFilter($filter,true,true); |
|
1034 | + $filter_query = $this->getFilter($filter, true, true); |
|
1035 | 1035 | |
1036 | 1036 | if ($pilot != "") |
1037 | 1037 | { |
@@ -1043,8 +1043,8 @@ discard block |
||
1043 | 1043 | { |
1044 | 1044 | $limit_array = explode(",", $limit); |
1045 | 1045 | |
1046 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
1047 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
1046 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
1047 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
1048 | 1048 | |
1049 | 1049 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
1050 | 1050 | { |
@@ -1074,7 +1074,7 @@ discard block |
||
1074 | 1074 | * @return Array the airline country list |
1075 | 1075 | * |
1076 | 1076 | */ |
1077 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
1077 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
1078 | 1078 | { |
1079 | 1079 | global $globalDBdriver; |
1080 | 1080 | /* |
@@ -1103,7 +1103,7 @@ discard block |
||
1103 | 1103 | $flight_array = array(); |
1104 | 1104 | $temp_array = array(); |
1105 | 1105 | |
1106 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1106 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1107 | 1107 | { |
1108 | 1108 | $temp_array['flight_count'] = $row['nb']; |
1109 | 1109 | $temp_array['flight_country'] = $row['name']; |
@@ -1120,7 +1120,7 @@ discard block |
||
1120 | 1120 | * @return Array the airline country list |
1121 | 1121 | * |
1122 | 1122 | */ |
1123 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
1123 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
1124 | 1124 | { |
1125 | 1125 | global $globalDBdriver; |
1126 | 1126 | /* |
@@ -1149,7 +1149,7 @@ discard block |
||
1149 | 1149 | $flight_array = array(); |
1150 | 1150 | $temp_array = array(); |
1151 | 1151 | |
1152 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1152 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1153 | 1153 | { |
1154 | 1154 | $temp_array['airline_icao'] = $row['airline_icao']; |
1155 | 1155 | $temp_array['flight_count'] = $row['nb']; |
@@ -1167,14 +1167,14 @@ discard block |
||
1167 | 1167 | * @return Array the spotter information |
1168 | 1168 | * |
1169 | 1169 | */ |
1170 | - public function getDateArchiveMarineDataById($id,$date) |
|
1170 | + public function getDateArchiveMarineDataById($id, $date) |
|
1171 | 1171 | { |
1172 | 1172 | $Marine = new Marine($this->db); |
1173 | 1173 | date_default_timezone_set('UTC'); |
1174 | 1174 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
1175 | 1175 | $query = 'SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC'; |
1176 | - $date = date('c',$date); |
|
1177 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
1176 | + $date = date('c', $date); |
|
1177 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
1178 | 1178 | return $spotter_array; |
1179 | 1179 | } |
1180 | 1180 | |
@@ -1184,14 +1184,14 @@ discard block |
||
1184 | 1184 | * @return Array the spotter information |
1185 | 1185 | * |
1186 | 1186 | */ |
1187 | - public function getDateArchiveMarineDataByIdent($ident,$date) |
|
1187 | + public function getDateArchiveMarineDataByIdent($ident, $date) |
|
1188 | 1188 | { |
1189 | 1189 | $Marine = new Marine($this->db); |
1190 | 1190 | date_default_timezone_set('UTC'); |
1191 | 1191 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
1192 | 1192 | $query = 'SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC'; |
1193 | - $date = date('c',$date); |
|
1194 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
1193 | + $date = date('c', $date); |
|
1194 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
1195 | 1195 | return $spotter_array; |
1196 | 1196 | } |
1197 | 1197 | |
@@ -1201,7 +1201,7 @@ discard block |
||
1201 | 1201 | * @return Array the spotter information |
1202 | 1202 | * |
1203 | 1203 | */ |
1204 | - public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
1204 | + public function getMarineDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
1205 | 1205 | { |
1206 | 1206 | global $global_query; |
1207 | 1207 | $Marine = new Marine($this->db); |
@@ -1209,7 +1209,7 @@ discard block |
||
1209 | 1209 | $query_values = array(); |
1210 | 1210 | $limit_query = ''; |
1211 | 1211 | $additional_query = ''; |
1212 | - $filter_query = $this->getFilter($filters,true,true); |
|
1212 | + $filter_query = $this->getFilter($filters, true, true); |
|
1213 | 1213 | |
1214 | 1214 | if ($airport != "") |
1215 | 1215 | { |
@@ -1226,8 +1226,8 @@ discard block |
||
1226 | 1226 | { |
1227 | 1227 | $limit_array = explode(",", $limit); |
1228 | 1228 | |
1229 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
1230 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
1229 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
1230 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
1231 | 1231 | |
1232 | 1232 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
1233 | 1233 | { |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | /** |
14 | 14 | * Get SQL query part for filter used |
15 | 15 | * @param Array $filter the filter |
16 | - * @return Array the SQL part |
|
16 | + * @return string the SQL part |
|
17 | 17 | */ |
18 | 18 | |
19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
@@ -566,25 +566,6 @@ discard block |
||
566 | 566 | * |
567 | 567 | * @param String $fammarine_id the ID |
568 | 568 | * @param String $ident the marine ident |
569 | - * @param String $departure_airport_icao the departure airport |
|
570 | - * @param String $arrival_airport_icao the arrival airport |
|
571 | - * @param String $latitude latitude of flight |
|
572 | - * @param String $longitude latitude of flight |
|
573 | - * @param String $waypoints waypoints of flight |
|
574 | - * @param String $heading heading of flight |
|
575 | - * @param String $groundspeed speed of flight |
|
576 | - * @param String $date date of flight |
|
577 | - * @param String $departure_airport_time departure time of flight |
|
578 | - * @param String $arrival_airport_time arrival time of flight |
|
579 | - * @param String $squawk squawk code of flight |
|
580 | - * @param String $route_stop route stop of flight |
|
581 | - * @param String $highlight highlight or not |
|
582 | - * @param String $ModeS ModesS code of flight |
|
583 | - * @param String $registration registration code of flight |
|
584 | - * @param String $pilot_id pilot id of flight (for virtual airlines) |
|
585 | - * @param String $pilot_name pilot name of flight (for virtual airlines) |
|
586 | - * @param String $verticalrate vertival rate of flight |
|
587 | - * @return String success or false |
|
588 | 569 | */ |
589 | 570 | 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 = '') |
590 | 571 | { |
@@ -1467,7 +1448,7 @@ discard block |
||
1467 | 1448 | /** |
1468 | 1449 | * Parses the direction degrees to working |
1469 | 1450 | * |
1470 | - * @param Float $direction the direction in degrees |
|
1451 | + * @param integer $direction the direction in degrees |
|
1471 | 1452 | * @return Array the direction information |
1472 | 1453 | * |
1473 | 1454 | */ |
@@ -11,10 +11,10 @@ discard block |
||
11 | 11 | } |
12 | 12 | |
13 | 13 | /** |
14 | - * Get SQL query part for filter used |
|
15 | - * @param Array $filter the filter |
|
16 | - * @return Array the SQL part |
|
17 | - */ |
|
14 | + * Get SQL query part for filter used |
|
15 | + * @param Array $filter the filter |
|
16 | + * @return Array the SQL part |
|
17 | + */ |
|
18 | 18 | |
19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -78,14 +78,14 @@ discard block |
||
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
81 | - * Executes the SQL statements to get the spotter information |
|
82 | - * |
|
83 | - * @param String $query the SQL query |
|
84 | - * @param Array $params parameter of the query |
|
85 | - * @param String $limitQuery the limit query |
|
86 | - * @return Array the spotter information |
|
87 | - * |
|
88 | - */ |
|
81 | + * Executes the SQL statements to get the spotter information |
|
82 | + * |
|
83 | + * @param String $query the SQL query |
|
84 | + * @param Array $params parameter of the query |
|
85 | + * @param String $limitQuery the limit query |
|
86 | + * @return Array the spotter information |
|
87 | + * |
|
88 | + */ |
|
89 | 89 | public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
90 | 90 | { |
91 | 91 | date_default_timezone_set('UTC'); |
@@ -213,11 +213,11 @@ discard block |
||
213 | 213 | |
214 | 214 | |
215 | 215 | /** |
216 | - * Gets all the spotter information based on the latest data entry |
|
217 | - * |
|
218 | - * @return Array the spotter information |
|
219 | - * |
|
220 | - */ |
|
216 | + * Gets all the spotter information based on the latest data entry |
|
217 | + * |
|
218 | + * @return Array the spotter information |
|
219 | + * |
|
220 | + */ |
|
221 | 221 | public function getLatestMarineData($limit = '', $sort = '', $filter = array()) |
222 | 222 | { |
223 | 223 | global $global_query; |
@@ -266,11 +266,11 @@ discard block |
||
266 | 266 | } |
267 | 267 | |
268 | 268 | /** |
269 | - * Gets all the spotter information based on the callsign |
|
270 | - * |
|
271 | - * @return Array the spotter information |
|
272 | - * |
|
273 | - */ |
|
269 | + * Gets all the spotter information based on the callsign |
|
270 | + * |
|
271 | + * @return Array the spotter information |
|
272 | + * |
|
273 | + */ |
|
274 | 274 | public function getMarineDataByIdent($ident = '', $limit = '', $sort = '', $filter = array()) |
275 | 275 | { |
276 | 276 | global $global_query; |
@@ -381,12 +381,12 @@ discard block |
||
381 | 381 | |
382 | 382 | |
383 | 383 | /** |
384 | - * Gets all source name |
|
385 | - * |
|
386 | - * @param String type format of source |
|
387 | - * @return Array list of source name |
|
388 | - * |
|
389 | - */ |
|
384 | + * Gets all source name |
|
385 | + * |
|
386 | + * @param String type format of source |
|
387 | + * @return Array list of source name |
|
388 | + * |
|
389 | + */ |
|
390 | 390 | public function getAllSourceName($type = '',$filters = array()) |
391 | 391 | { |
392 | 392 | $filter_query = $this->getFilter($filters,true,true); |
@@ -416,11 +416,11 @@ discard block |
||
416 | 416 | |
417 | 417 | |
418 | 418 | /** |
419 | - * Gets a list of all idents/callsigns |
|
420 | - * |
|
421 | - * @return Array list of ident/callsign names |
|
422 | - * |
|
423 | - */ |
|
419 | + * Gets a list of all idents/callsigns |
|
420 | + * |
|
421 | + * @return Array list of ident/callsign names |
|
422 | + * |
|
423 | + */ |
|
424 | 424 | public function getAllIdents($filters = array()) |
425 | 425 | { |
426 | 426 | $filter_query = $this->getFilter($filters,true,true); |
@@ -444,11 +444,11 @@ discard block |
||
444 | 444 | } |
445 | 445 | |
446 | 446 | /** |
447 | - * Gets all info from a mmsi |
|
448 | - * |
|
449 | - * @return Array list of mmsi info |
|
450 | - * |
|
451 | - */ |
|
447 | + * Gets all info from a mmsi |
|
448 | + * |
|
449 | + * @return Array list of mmsi info |
|
450 | + * |
|
451 | + */ |
|
452 | 452 | public function getIdentity($mmsi) |
453 | 453 | { |
454 | 454 | $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
@@ -505,18 +505,18 @@ discard block |
||
505 | 505 | |
506 | 506 | |
507 | 507 | /** |
508 | - * Update ident tracker data |
|
509 | - * |
|
510 | - * @param String $fammarine_id the ID |
|
511 | - * @param String $ident the marine ident |
|
512 | - * @return String success or false |
|
513 | - * |
|
514 | - */ |
|
508 | + * Update ident tracker data |
|
509 | + * |
|
510 | + * @param String $fammarine_id the ID |
|
511 | + * @param String $ident the marine ident |
|
512 | + * @return String success or false |
|
513 | + * |
|
514 | + */ |
|
515 | 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); |
@@ -530,19 +530,19 @@ discard block |
||
530 | 530 | } |
531 | 531 | |
532 | 532 | /** |
533 | - * Update Status data |
|
534 | - * |
|
535 | - * @param String $fammarine_id the ID |
|
536 | - * @param String $status_id the marine status id |
|
537 | - * @param String $status the marine status |
|
538 | - * @return String success or false |
|
539 | - * |
|
540 | - */ |
|
533 | + * Update Status data |
|
534 | + * |
|
535 | + * @param String $fammarine_id the ID |
|
536 | + * @param String $status_id the marine status id |
|
537 | + * @param String $status the marine status |
|
538 | + * @return String success or false |
|
539 | + * |
|
540 | + */ |
|
541 | 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); |
@@ -555,17 +555,17 @@ discard block |
||
555 | 555 | |
556 | 556 | } |
557 | 557 | /** |
558 | - * Update latest marine data |
|
559 | - * |
|
560 | - * @param String $fammarine_id the ID |
|
561 | - * @param String $ident the marine ident |
|
562 | - * @return String success or false |
|
563 | - * |
|
564 | - */ |
|
558 | + * Update latest marine data |
|
559 | + * |
|
560 | + * @param String $fammarine_id the ID |
|
561 | + * @param String $ident the marine ident |
|
562 | + * @return String success or false |
|
563 | + * |
|
564 | + */ |
|
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); |
@@ -579,30 +579,30 @@ discard block |
||
579 | 579 | } |
580 | 580 | |
581 | 581 | /** |
582 | - * Adds a new spotter data |
|
583 | - * |
|
584 | - * @param String $fammarine_id the ID |
|
585 | - * @param String $ident the marine ident |
|
586 | - * @param String $departure_airport_icao the departure airport |
|
587 | - * @param String $arrival_airport_icao the arrival airport |
|
588 | - * @param String $latitude latitude of flight |
|
589 | - * @param String $longitude latitude of flight |
|
590 | - * @param String $waypoints waypoints of flight |
|
591 | - * @param String $heading heading of flight |
|
592 | - * @param String $groundspeed speed of flight |
|
593 | - * @param String $date date of flight |
|
594 | - * @param String $departure_airport_time departure time of flight |
|
595 | - * @param String $arrival_airport_time arrival time of flight |
|
596 | - * @param String $squawk squawk code of flight |
|
597 | - * @param String $route_stop route stop of flight |
|
598 | - * @param String $highlight highlight or not |
|
599 | - * @param String $ModeS ModesS code of flight |
|
600 | - * @param String $registration registration code of flight |
|
601 | - * @param String $pilot_id pilot id of flight (for virtual airlines) |
|
602 | - * @param String $pilot_name pilot name of flight (for virtual airlines) |
|
603 | - * @param String $verticalrate vertival rate of flight |
|
604 | - * @return String success or false |
|
605 | - */ |
|
582 | + * Adds a new spotter data |
|
583 | + * |
|
584 | + * @param String $fammarine_id the ID |
|
585 | + * @param String $ident the marine ident |
|
586 | + * @param String $departure_airport_icao the departure airport |
|
587 | + * @param String $arrival_airport_icao the arrival airport |
|
588 | + * @param String $latitude latitude of flight |
|
589 | + * @param String $longitude latitude of flight |
|
590 | + * @param String $waypoints waypoints of flight |
|
591 | + * @param String $heading heading of flight |
|
592 | + * @param String $groundspeed speed of flight |
|
593 | + * @param String $date date of flight |
|
594 | + * @param String $departure_airport_time departure time of flight |
|
595 | + * @param String $arrival_airport_time arrival time of flight |
|
596 | + * @param String $squawk squawk code of flight |
|
597 | + * @param String $route_stop route stop of flight |
|
598 | + * @param String $highlight highlight or not |
|
599 | + * @param String $ModeS ModesS code of flight |
|
600 | + * @param String $registration registration code of flight |
|
601 | + * @param String $pilot_id pilot id of flight (for virtual airlines) |
|
602 | + * @param String $pilot_name pilot name of flight (for virtual airlines) |
|
603 | + * @param String $verticalrate vertival rate of flight |
|
604 | + * @return String success or false |
|
605 | + */ |
|
606 | 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; |
@@ -699,13 +699,13 @@ discard block |
||
699 | 699 | unset($Image); |
700 | 700 | } |
701 | 701 | |
702 | - if ($latitude == '' && $longitude == '') { |
|
703 | - $latitude = 0; |
|
704 | - $longitude = 0; |
|
705 | - } |
|
706 | - if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
707 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
708 | - if ($arrival_date == '') $arrival_date = NULL; |
|
702 | + if ($latitude == '' && $longitude == '') { |
|
703 | + $latitude = 0; |
|
704 | + $longitude = 0; |
|
705 | + } |
|
706 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
707 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
708 | + if ($arrival_date == '') $arrival_date = NULL; |
|
709 | 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 | |
@@ -716,7 +716,7 @@ discard block |
||
716 | 716 | $sth->execute($query_values); |
717 | 717 | $this->db = null; |
718 | 718 | } catch (PDOException $e) { |
719 | - return "error : ".$e->getMessage(); |
|
719 | + return "error : ".$e->getMessage(); |
|
720 | 720 | } |
721 | 721 | |
722 | 722 | return "success"; |
@@ -725,11 +725,11 @@ discard block |
||
725 | 725 | |
726 | 726 | |
727 | 727 | /** |
728 | - * Gets the aircraft ident within the last hour |
|
729 | - * |
|
730 | - * @return String the ident |
|
731 | - * |
|
732 | - */ |
|
728 | + * Gets the aircraft ident within the last hour |
|
729 | + * |
|
730 | + * @return String the ident |
|
731 | + * |
|
732 | + */ |
|
733 | 733 | public function getIdentFromLastHour($ident) |
734 | 734 | { |
735 | 735 | global $globalDBdriver, $globalTimezone; |
@@ -745,11 +745,11 @@ discard block |
||
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'"; |
747 | 747 | $query_data = array(':ident' => $ident); |
748 | - } |
|
748 | + } |
|
749 | 749 | |
750 | 750 | $sth = $this->db->prepare($query); |
751 | 751 | $sth->execute($query_data); |
752 | - $ident_result=''; |
|
752 | + $ident_result=''; |
|
753 | 753 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
754 | 754 | { |
755 | 755 | $ident_result = $row['ident']; |
@@ -760,11 +760,11 @@ discard block |
||
760 | 760 | |
761 | 761 | |
762 | 762 | /** |
763 | - * Gets the aircraft data from the last 20 seconds |
|
764 | - * |
|
765 | - * @return Array the spotter data |
|
766 | - * |
|
767 | - */ |
|
763 | + * Gets the aircraft data from the last 20 seconds |
|
764 | + * |
|
765 | + * @return Array the spotter data |
|
766 | + * |
|
767 | + */ |
|
768 | 768 | public function getRealTimeData($q = '') |
769 | 769 | { |
770 | 770 | global $globalDBdriver; |
@@ -802,11 +802,11 @@ discard block |
||
802 | 802 | |
803 | 803 | |
804 | 804 | /** |
805 | - * Gets all number of flight over countries |
|
806 | - * |
|
807 | - * @return Array the airline country list |
|
808 | - * |
|
809 | - */ |
|
805 | + * Gets all number of flight over countries |
|
806 | + * |
|
807 | + * @return Array the airline country list |
|
808 | + * |
|
809 | + */ |
|
810 | 810 | |
811 | 811 | public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
812 | 812 | { |
@@ -879,11 +879,11 @@ discard block |
||
879 | 879 | |
880 | 880 | |
881 | 881 | /** |
882 | - * Gets all callsigns that have flown over |
|
883 | - * |
|
884 | - * @return Array the callsign list |
|
885 | - * |
|
886 | - */ |
|
882 | + * Gets all callsigns that have flown over |
|
883 | + * |
|
884 | + * @return Array the callsign list |
|
885 | + * |
|
886 | + */ |
|
887 | 887 | public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
888 | 888 | { |
889 | 889 | global $globalDBdriver; |
@@ -950,11 +950,11 @@ discard block |
||
950 | 950 | |
951 | 951 | |
952 | 952 | /** |
953 | - * Counts all dates |
|
954 | - * |
|
955 | - * @return Array the date list |
|
956 | - * |
|
957 | - */ |
|
953 | + * Counts all dates |
|
954 | + * |
|
955 | + * @return Array the date list |
|
956 | + * |
|
957 | + */ |
|
958 | 958 | public function countAllDates($filters = array()) |
959 | 959 | { |
960 | 960 | global $globalTimezone, $globalDBdriver; |
@@ -1000,11 +1000,11 @@ discard block |
||
1000 | 1000 | |
1001 | 1001 | |
1002 | 1002 | /** |
1003 | - * Counts all dates during the last 7 days |
|
1004 | - * |
|
1005 | - * @return Array the date list |
|
1006 | - * |
|
1007 | - */ |
|
1003 | + * Counts all dates during the last 7 days |
|
1004 | + * |
|
1005 | + * @return Array the date list |
|
1006 | + * |
|
1007 | + */ |
|
1008 | 1008 | public function countAllDatesLast7Days($filters = array()) |
1009 | 1009 | { |
1010 | 1010 | global $globalTimezone, $globalDBdriver; |
@@ -1026,7 +1026,7 @@ discard block |
||
1026 | 1026 | $query .= " GROUP BY date_name |
1027 | 1027 | ORDER BY date_name ASC"; |
1028 | 1028 | $query_data = array(':offset' => $offset); |
1029 | - } |
|
1029 | + } |
|
1030 | 1030 | |
1031 | 1031 | $sth = $this->db->prepare($query); |
1032 | 1032 | $sth->execute($query_data); |
@@ -1046,11 +1046,11 @@ discard block |
||
1046 | 1046 | } |
1047 | 1047 | |
1048 | 1048 | /** |
1049 | - * Counts all dates during the last month |
|
1050 | - * |
|
1051 | - * @return Array the date list |
|
1052 | - * |
|
1053 | - */ |
|
1049 | + * Counts all dates during the last month |
|
1050 | + * |
|
1051 | + * @return Array the date list |
|
1052 | + * |
|
1053 | + */ |
|
1054 | 1054 | public function countAllDatesLastMonth($filters = array()) |
1055 | 1055 | { |
1056 | 1056 | global $globalTimezone, $globalDBdriver; |
@@ -1072,7 +1072,7 @@ discard block |
||
1072 | 1072 | $query .= " GROUP BY date_name |
1073 | 1073 | ORDER BY date_name ASC"; |
1074 | 1074 | $query_data = array(':offset' => $offset); |
1075 | - } |
|
1075 | + } |
|
1076 | 1076 | |
1077 | 1077 | $sth = $this->db->prepare($query); |
1078 | 1078 | $sth->execute($query_data); |
@@ -1094,11 +1094,11 @@ discard block |
||
1094 | 1094 | |
1095 | 1095 | |
1096 | 1096 | /** |
1097 | - * Counts all month |
|
1098 | - * |
|
1099 | - * @return Array the month list |
|
1100 | - * |
|
1101 | - */ |
|
1097 | + * Counts all month |
|
1098 | + * |
|
1099 | + * @return Array the month list |
|
1100 | + * |
|
1101 | + */ |
|
1102 | 1102 | public function countAllMonths($filters = array()) |
1103 | 1103 | { |
1104 | 1104 | global $globalTimezone, $globalDBdriver; |
@@ -1143,11 +1143,11 @@ discard block |
||
1143 | 1143 | |
1144 | 1144 | |
1145 | 1145 | /** |
1146 | - * Counts all dates during the last year |
|
1147 | - * |
|
1148 | - * @return Array the date list |
|
1149 | - * |
|
1150 | - */ |
|
1146 | + * Counts all dates during the last year |
|
1147 | + * |
|
1148 | + * @return Array the date list |
|
1149 | + * |
|
1150 | + */ |
|
1151 | 1151 | public function countAllMonthsLastYear($filters) |
1152 | 1152 | { |
1153 | 1153 | global $globalTimezone, $globalDBdriver; |
@@ -1169,7 +1169,7 @@ discard block |
||
1169 | 1169 | $query .= " GROUP BY year_name, month_name |
1170 | 1170 | ORDER BY year_name, month_name ASC"; |
1171 | 1171 | $query_data = array(':offset' => $offset); |
1172 | - } |
|
1172 | + } |
|
1173 | 1173 | |
1174 | 1174 | $sth = $this->db->prepare($query); |
1175 | 1175 | $sth->execute($query_data); |
@@ -1192,11 +1192,11 @@ discard block |
||
1192 | 1192 | |
1193 | 1193 | |
1194 | 1194 | /** |
1195 | - * Counts all hours |
|
1196 | - * |
|
1197 | - * @return Array the hour list |
|
1198 | - * |
|
1199 | - */ |
|
1195 | + * Counts all hours |
|
1196 | + * |
|
1197 | + * @return Array the hour list |
|
1198 | + * |
|
1199 | + */ |
|
1200 | 1200 | public function countAllHours($orderby,$filters = array()) |
1201 | 1201 | { |
1202 | 1202 | global $globalTimezone, $globalDBdriver; |
@@ -1259,11 +1259,11 @@ discard block |
||
1259 | 1259 | |
1260 | 1260 | |
1261 | 1261 | /** |
1262 | - * Counts all hours by date |
|
1263 | - * |
|
1264 | - * @return Array the hour list |
|
1265 | - * |
|
1266 | - */ |
|
1262 | + * Counts all hours by date |
|
1263 | + * |
|
1264 | + * @return Array the hour list |
|
1265 | + * |
|
1266 | + */ |
|
1267 | 1267 | public function countAllHoursByDate($date, $filters = array()) |
1268 | 1268 | { |
1269 | 1269 | global $globalTimezone, $globalDBdriver; |
@@ -1307,11 +1307,11 @@ discard block |
||
1307 | 1307 | |
1308 | 1308 | |
1309 | 1309 | /** |
1310 | - * Counts all hours by a ident/callsign |
|
1311 | - * |
|
1312 | - * @return Array the hour list |
|
1313 | - * |
|
1314 | - */ |
|
1310 | + * Counts all hours by a ident/callsign |
|
1311 | + * |
|
1312 | + * @return Array the hour list |
|
1313 | + * |
|
1314 | + */ |
|
1315 | 1315 | public function countAllHoursByIdent($ident, $filters = array()) |
1316 | 1316 | { |
1317 | 1317 | global $globalTimezone, $globalDBdriver; |
@@ -1356,11 +1356,11 @@ discard block |
||
1356 | 1356 | |
1357 | 1357 | |
1358 | 1358 | /** |
1359 | - * Counts all vessels |
|
1360 | - * |
|
1361 | - * @return Integer the number of vessels |
|
1362 | - * |
|
1363 | - */ |
|
1359 | + * Counts all vessels |
|
1360 | + * |
|
1361 | + * @return Integer the number of vessels |
|
1362 | + * |
|
1363 | + */ |
|
1364 | 1364 | public function countOverallMarine($filters = array(),$year = '',$month = '') |
1365 | 1365 | { |
1366 | 1366 | global $globalDBdriver; |
@@ -1395,11 +1395,11 @@ discard block |
||
1395 | 1395 | } |
1396 | 1396 | |
1397 | 1397 | /** |
1398 | - * Counts all vessel type |
|
1399 | - * |
|
1400 | - * @return Integer the number of vessels |
|
1401 | - * |
|
1402 | - */ |
|
1398 | + * Counts all vessel type |
|
1399 | + * |
|
1400 | + * @return Integer the number of vessels |
|
1401 | + * |
|
1402 | + */ |
|
1403 | 1403 | public function countOverallMarineTypes($filters = array(),$year = '',$month = '') |
1404 | 1404 | { |
1405 | 1405 | global $globalDBdriver; |
@@ -1434,11 +1434,11 @@ discard block |
||
1434 | 1434 | |
1435 | 1435 | |
1436 | 1436 | /** |
1437 | - * Counts all hours of today |
|
1438 | - * |
|
1439 | - * @return Array the hour list |
|
1440 | - * |
|
1441 | - */ |
|
1437 | + * Counts all hours of today |
|
1438 | + * |
|
1439 | + * @return Array the hour list |
|
1440 | + * |
|
1441 | + */ |
|
1442 | 1442 | public function countAllHoursFromToday($filters = array()) |
1443 | 1443 | { |
1444 | 1444 | global $globalTimezone, $globalDBdriver; |
@@ -1478,12 +1478,12 @@ discard block |
||
1478 | 1478 | } |
1479 | 1479 | |
1480 | 1480 | |
1481 | - /** |
|
1482 | - * Gets the Barrie Spotter ID based on the FlightAware ID |
|
1483 | - * |
|
1484 | - * @return Integer the Barrie Spotter ID |
|
1481 | + /** |
|
1482 | + * Gets the Barrie Spotter ID based on the FlightAware ID |
|
1483 | + * |
|
1484 | + * @return Integer the Barrie Spotter ID |
|
1485 | 1485 | q * |
1486 | - */ |
|
1486 | + */ |
|
1487 | 1487 | public function getMarineIDBasedOnFamMarineID($fammarine_id) |
1488 | 1488 | { |
1489 | 1489 | $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
@@ -1504,13 +1504,13 @@ discard block |
||
1504 | 1504 | |
1505 | 1505 | |
1506 | 1506 | /** |
1507 | - * Parses a date string |
|
1508 | - * |
|
1509 | - * @param String $dateString the date string |
|
1510 | - * @param String $timezone the timezone of a user |
|
1511 | - * @return Array the time information |
|
1512 | - * |
|
1513 | - */ |
|
1507 | + * Parses a date string |
|
1508 | + * |
|
1509 | + * @param String $dateString the date string |
|
1510 | + * @param String $timezone the timezone of a user |
|
1511 | + * @return Array the time information |
|
1512 | + * |
|
1513 | + */ |
|
1514 | 1514 | public function parseDateString($dateString, $timezone = '') |
1515 | 1515 | { |
1516 | 1516 | $time_array = array(); |
@@ -1543,12 +1543,12 @@ discard block |
||
1543 | 1543 | } |
1544 | 1544 | |
1545 | 1545 | /** |
1546 | - * Parses the direction degrees to working |
|
1547 | - * |
|
1548 | - * @param Float $direction the direction in degrees |
|
1549 | - * @return Array the direction information |
|
1550 | - * |
|
1551 | - */ |
|
1546 | + * Parses the direction degrees to working |
|
1547 | + * |
|
1548 | + * @param Float $direction the direction in degrees |
|
1549 | + * @return Array the direction information |
|
1550 | + * |
|
1551 | + */ |
|
1552 | 1552 | public function parseDirection($direction = 0) |
1553 | 1553 | { |
1554 | 1554 | if ($direction == '') $direction = 0; |
@@ -1627,12 +1627,12 @@ discard block |
||
1627 | 1627 | |
1628 | 1628 | |
1629 | 1629 | /** |
1630 | - * Gets Country from latitude/longitude |
|
1631 | - * |
|
1632 | - * @param Float $latitude latitute of the flight |
|
1633 | - * @param Float $longitude longitute of the flight |
|
1634 | - * @return String the countrie |
|
1635 | - */ |
|
1630 | + * Gets Country from latitude/longitude |
|
1631 | + * |
|
1632 | + * @param Float $latitude latitute of the flight |
|
1633 | + * @param Float $longitude longitute of the flight |
|
1634 | + * @return String the countrie |
|
1635 | + */ |
|
1636 | 1636 | public function getCountryFromLatitudeLongitude($latitude,$longitude) |
1637 | 1637 | { |
1638 | 1638 | global $globalDBdriver, $globalDebug; |
@@ -1669,11 +1669,11 @@ discard block |
||
1669 | 1669 | } |
1670 | 1670 | |
1671 | 1671 | /** |
1672 | - * Gets Country from iso2 |
|
1673 | - * |
|
1674 | - * @param String $iso2 ISO2 country code |
|
1675 | - * @return String the countrie |
|
1676 | - */ |
|
1672 | + * Gets Country from iso2 |
|
1673 | + * |
|
1674 | + * @param String $iso2 ISO2 country code |
|
1675 | + * @return String the countrie |
|
1676 | + */ |
|
1677 | 1677 | public function getCountryFromISO2($iso2) |
1678 | 1678 | { |
1679 | 1679 | global $globalDBdriver, $globalDebug; |
@@ -1702,12 +1702,12 @@ discard block |
||
1702 | 1702 | |
1703 | 1703 | |
1704 | 1704 | /** |
1705 | - * Gets the short url from bit.ly |
|
1706 | - * |
|
1707 | - * @param String $url the full url |
|
1708 | - * @return String the bit.ly url |
|
1709 | - * |
|
1710 | - */ |
|
1705 | + * Gets the short url from bit.ly |
|
1706 | + * |
|
1707 | + * @param String $url the full url |
|
1708 | + * @return String the bit.ly url |
|
1709 | + * |
|
1710 | + */ |
|
1711 | 1711 | public function getBitlyURL($url) |
1712 | 1712 | { |
1713 | 1713 | global $globalBitlyAccessToken; |
@@ -1734,11 +1734,11 @@ discard block |
||
1734 | 1734 | |
1735 | 1735 | |
1736 | 1736 | /** |
1737 | - * Gets all vessels types that have flown over |
|
1738 | - * |
|
1739 | - * @return Array the vessel type list |
|
1740 | - * |
|
1741 | - */ |
|
1737 | + * Gets all vessels types that have flown over |
|
1738 | + * |
|
1739 | + * @return Array the vessel type list |
|
1740 | + * |
|
1741 | + */ |
|
1742 | 1742 | public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
1743 | 1743 | { |
1744 | 1744 | global $globalDBdriver; |
@@ -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) { |
@@ -17,33 +17,33 @@ discard block |
||
17 | 17 | * @return Array the SQL part |
18 | 18 | */ |
19 | 19 | |
20 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
20 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
21 | 21 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
22 | 22 | $filters = array(); |
23 | 23 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
24 | 24 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
25 | 25 | $filters = $globalStatsFilters[$globalFilterName]; |
26 | 26 | } else { |
27 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
27 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
28 | 28 | } |
29 | 29 | } |
30 | 30 | if (isset($filter[0]['source'])) { |
31 | - $filters = array_merge($filters,$filter); |
|
31 | + $filters = array_merge($filters, $filter); |
|
32 | 32 | } |
33 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
33 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
34 | 34 | $filter_query_join = ''; |
35 | 35 | $filter_query_where = ''; |
36 | - foreach($filters as $flt) { |
|
36 | + foreach ($filters as $flt) { |
|
37 | 37 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
38 | 38 | if (isset($flt['source'])) { |
39 | - $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 | + $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"; |
|
40 | 40 | } else { |
41 | - $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 | + $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"; |
|
42 | 42 | } |
43 | 43 | } |
44 | 44 | } |
45 | 45 | if (isset($filter['source']) && !empty($filter['source'])) { |
46 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
46 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
47 | 47 | } |
48 | 48 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
49 | 49 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
73 | 73 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
74 | 74 | if ($filter_query_where != '') { |
75 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
75 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
76 | 76 | } |
77 | 77 | $filter_query = $filter_query_join.$filter_query_where; |
78 | 78 | return $filter_query; |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * @return Array the spotter information |
88 | 88 | * |
89 | 89 | */ |
90 | - public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
|
90 | + public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false) |
|
91 | 91 | { |
92 | 92 | date_default_timezone_set('UTC'); |
93 | 93 | if (!is_string($query)) |
@@ -107,13 +107,13 @@ discard block |
||
107 | 107 | $sth = $this->db->prepare($query.$limitQuery); |
108 | 108 | $sth->execute($params); |
109 | 109 | } catch (PDOException $e) { |
110 | - printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery); |
|
110 | + printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery); |
|
111 | 111 | exit(); |
112 | 112 | } |
113 | 113 | |
114 | 114 | $num_rows = 0; |
115 | 115 | $spotter_array = array(); |
116 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
116 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
117 | 117 | { |
118 | 118 | $num_rows++; |
119 | 119 | $temp_array = array(); |
@@ -145,10 +145,10 @@ discard block |
||
145 | 145 | } |
146 | 146 | if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed']; |
147 | 147 | |
148 | - if($temp_array['mmsi'] != "") |
|
148 | + if ($temp_array['mmsi'] != "") |
|
149 | 149 | { |
150 | 150 | $Image = new Image($this->db); |
151 | - if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']); |
|
151 | + if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'], '', $temp_array['ident']); |
|
152 | 152 | else $image_array = $Image->getMarineImage($temp_array['mmsi']); |
153 | 153 | unset($Image); |
154 | 154 | if (count($image_array) > 0) { |
@@ -184,17 +184,17 @@ discard block |
||
184 | 184 | { |
185 | 185 | $temp_array['date'] = "about ".$dateArray['hours']." hours ago"; |
186 | 186 | } else { |
187 | - $temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC")); |
|
187 | + $temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC")); |
|
188 | 188 | } |
189 | 189 | $temp_array['date_minutes_past'] = $dateArray['minutes']; |
190 | - $temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC")); |
|
191 | - $temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC")); |
|
190 | + $temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC")); |
|
191 | + $temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC")); |
|
192 | 192 | $temp_array['date_unix'] = strtotime($row['date']." UTC"); |
193 | 193 | if (isset($row['last_seen']) && $row['last_seen'] != '') { |
194 | 194 | if (strtotime($row['last_seen']) > strtotime($row['date'])) { |
195 | 195 | $temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']); |
196 | - $temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC")); |
|
197 | - $temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC")); |
|
196 | + $temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC")); |
|
197 | + $temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC")); |
|
198 | 198 | $temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC"); |
199 | 199 | } |
200 | 200 | } |
@@ -227,8 +227,8 @@ discard block |
||
227 | 227 | if ($limit != "") |
228 | 228 | { |
229 | 229 | $limit_array = explode(",", $limit); |
230 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
231 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
230 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
231 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
232 | 232 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
233 | 233 | { |
234 | 234 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
@@ -242,8 +242,8 @@ discard block |
||
242 | 242 | } else { |
243 | 243 | $orderby_query = " ORDER BY marine_output.date DESC"; |
244 | 244 | } |
245 | - $query = $global_query.$filter_query." ".$orderby_query; |
|
246 | - $spotter_array = $this->getDataFromDB($query, array(),$limit_query,true); |
|
245 | + $query = $global_query.$filter_query." ".$orderby_query; |
|
246 | + $spotter_array = $this->getDataFromDB($query, array(), $limit_query, true); |
|
247 | 247 | return $spotter_array; |
248 | 248 | } |
249 | 249 | |
@@ -261,8 +261,8 @@ discard block |
||
261 | 261 | if ($id == '') return array(); |
262 | 262 | $additional_query = "marine_output.fammarine_id = :id"; |
263 | 263 | $query_values = array(':id' => $id); |
264 | - $query = $global_query." WHERE ".$additional_query." "; |
|
265 | - $spotter_array = $this->getDataFromDB($query,$query_values); |
|
264 | + $query = $global_query." WHERE ".$additional_query." "; |
|
265 | + $spotter_array = $this->getDataFromDB($query, $query_values); |
|
266 | 266 | return $spotter_array; |
267 | 267 | } |
268 | 268 | |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | $query_values = array(); |
282 | 282 | $limit_query = ''; |
283 | 283 | $additional_query = ''; |
284 | - $filter_query = $this->getFilter($filter,true,true); |
|
284 | + $filter_query = $this->getFilter($filter, true, true); |
|
285 | 285 | if ($ident != "") |
286 | 286 | { |
287 | 287 | if (!is_string($ident)) |
@@ -297,8 +297,8 @@ discard block |
||
297 | 297 | { |
298 | 298 | $limit_array = explode(",", $limit); |
299 | 299 | |
300 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
301 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
300 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
301 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
302 | 302 | |
303 | 303 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
304 | 304 | { |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | return $spotter_array; |
323 | 323 | } |
324 | 324 | |
325 | - public function getMarineDataByDate($date = '', $limit = '', $sort = '',$filter = array()) |
|
325 | + public function getMarineDataByDate($date = '', $limit = '', $sort = '', $filter = array()) |
|
326 | 326 | { |
327 | 327 | global $global_query, $globalTimezone, $globalDBdriver; |
328 | 328 | |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | $limit_query = ''; |
331 | 331 | $additional_query = ''; |
332 | 332 | |
333 | - $filter_query = $this->getFilter($filter,true,true); |
|
333 | + $filter_query = $this->getFilter($filter, true, true); |
|
334 | 334 | |
335 | 335 | if ($date != "") |
336 | 336 | { |
@@ -356,8 +356,8 @@ discard block |
||
356 | 356 | { |
357 | 357 | $limit_array = explode(",", $limit); |
358 | 358 | |
359 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
360 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
359 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
360 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
361 | 361 | |
362 | 362 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
363 | 363 | { |
@@ -388,11 +388,11 @@ discard block |
||
388 | 388 | * @return Array list of source name |
389 | 389 | * |
390 | 390 | */ |
391 | - public function getAllSourceName($type = '',$filters = array()) |
|
391 | + public function getAllSourceName($type = '', $filters = array()) |
|
392 | 392 | { |
393 | - $filter_query = $this->getFilter($filters,true,true); |
|
393 | + $filter_query = $this->getFilter($filters, true, true); |
|
394 | 394 | $query_values = array(); |
395 | - $query = "SELECT DISTINCT marine_output.source_name |
|
395 | + $query = "SELECT DISTINCT marine_output.source_name |
|
396 | 396 | FROM marine_output".$filter_query." marine_output.source_name <> ''"; |
397 | 397 | if ($type != '') { |
398 | 398 | $query_values = array(':type' => $type); |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | $source_array = array(); |
408 | 408 | $temp_array = array(); |
409 | 409 | |
410 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
410 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
411 | 411 | { |
412 | 412 | $temp_array['source_name'] = $row['source_name']; |
413 | 413 | $source_array[] = $temp_array; |
@@ -424,8 +424,8 @@ discard block |
||
424 | 424 | */ |
425 | 425 | public function getAllIdents($filters = array()) |
426 | 426 | { |
427 | - $filter_query = $this->getFilter($filters,true,true); |
|
428 | - $query = "SELECT DISTINCT marine_output.ident |
|
427 | + $filter_query = $this->getFilter($filters, true, true); |
|
428 | + $query = "SELECT DISTINCT marine_output.ident |
|
429 | 429 | FROM marine_output".$filter_query." marine_output.ident <> '' |
430 | 430 | ORDER BY marine_output.date ASC LIMIT 700 OFFSET 0"; |
431 | 431 | |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | $ident_array = array(); |
436 | 436 | $temp_array = array(); |
437 | 437 | |
438 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
438 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
439 | 439 | { |
440 | 440 | $temp_array['ident'] = $row['ident']; |
441 | 441 | $ident_array[] = $temp_array; |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | */ |
453 | 453 | public function getIdentity($mmsi) |
454 | 454 | { |
455 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
|
455 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT); |
|
456 | 456 | $query = "SELECT * FROM marine_identity WHERE mmsi = :mmsi LIMIT 1"; |
457 | 457 | $sth = $this->db->prepare($query); |
458 | 458 | $sth->execute(array(':mmsi' => $mmsi)); |
@@ -477,12 +477,12 @@ discard block |
||
477 | 477 | } else $offset = '+00:00'; |
478 | 478 | |
479 | 479 | if ($globalDBdriver == 'mysql') { |
480 | - $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
|
480 | + $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
|
481 | 481 | FROM marine_output |
482 | 482 | WHERE marine_output.date <> '' |
483 | 483 | ORDER BY marine_output.date ASC LIMIT 0,200"; |
484 | 484 | } else { |
485 | - $query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
485 | + $query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
486 | 486 | FROM marine_output |
487 | 487 | WHERE marine_output.date <> '' |
488 | 488 | ORDER BY marine_output.date ASC LIMIT 0,200"; |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | $date_array = array(); |
495 | 495 | $temp_array = array(); |
496 | 496 | |
497 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
497 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
498 | 498 | { |
499 | 499 | $temp_array['date'] = $row['date']; |
500 | 500 | |
@@ -513,11 +513,11 @@ discard block |
||
513 | 513 | * @return String success or false |
514 | 514 | * |
515 | 515 | */ |
516 | - public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL) |
|
516 | + public function updateIdentMarineData($fammarine_id = '', $ident = '', $fromsource = NULL) |
|
517 | 517 | { |
518 | 518 | |
519 | 519 | $query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id'; |
520 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident); |
|
520 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident); |
|
521 | 521 | |
522 | 522 | try { |
523 | 523 | $sth = $this->db->prepare($query); |
@@ -539,11 +539,11 @@ discard block |
||
539 | 539 | * @return String success or false |
540 | 540 | * |
541 | 541 | */ |
542 | - public function updateStatusMarineData($fammarine_id = '', $status_id = '',$status = '') |
|
542 | + public function updateStatusMarineData($fammarine_id = '', $status_id = '', $status = '') |
|
543 | 543 | { |
544 | 544 | |
545 | 545 | $query = 'UPDATE marine_output SET status = :status, status_id = :status_id WHERE fammarine_id = :fammarine_id'; |
546 | - $query_values = array(':fammarine_id' => $fammarine_id,':status' => $status,':status_id' => $status_id); |
|
546 | + $query_values = array(':fammarine_id' => $fammarine_id, ':status' => $status, ':status_id' => $status_id); |
|
547 | 547 | |
548 | 548 | try { |
549 | 549 | $sth = $this->db->prepare($query); |
@@ -566,7 +566,7 @@ discard block |
||
566 | 566 | public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '') |
567 | 567 | { |
568 | 568 | $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'; |
569 | - $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
569 | + $query_values = array(':fammarine_id' => $fammarine_id, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident); |
|
570 | 570 | |
571 | 571 | try { |
572 | 572 | $sth = $this->db->prepare($query); |
@@ -604,7 +604,7 @@ discard block |
||
604 | 604 | * @param String $verticalrate vertival rate of flight |
605 | 605 | * @return String success or false |
606 | 606 | */ |
607 | - 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 | + 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 = '') |
|
608 | 608 | { |
609 | 609 | global $globalURL, $globalMarineImageFetch; |
610 | 610 | |
@@ -671,31 +671,31 @@ discard block |
||
671 | 671 | } |
672 | 672 | |
673 | 673 | |
674 | - if ($date == "" || strtotime($date) < time()-20*60) |
|
674 | + if ($date == "" || strtotime($date) < time() - 20*60) |
|
675 | 675 | { |
676 | 676 | $date = date("Y-m-d H:i:s", time()); |
677 | 677 | } |
678 | 678 | |
679 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
680 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
681 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
682 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
683 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
684 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
685 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
686 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
687 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
688 | - $status = filter_var($status,FILTER_SANITIZE_STRING); |
|
689 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
690 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
691 | - $arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING); |
|
692 | - $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
|
679 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
680 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
681 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
682 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
683 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
684 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
685 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
686 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
687 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
688 | + $status = filter_var($status, FILTER_SANITIZE_STRING); |
|
689 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
690 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
691 | + $arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING); |
|
692 | + $arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING); |
|
693 | 693 | |
694 | 694 | if (isset($globalMarineImageFetch) && $globalMarineImageFetch === TRUE) { |
695 | 695 | $Image = new Image($this->db); |
696 | - $image_array = $Image->getMarineImage($mmsi,$imo,$ident); |
|
696 | + $image_array = $Image->getMarineImage($mmsi, $imo, $ident); |
|
697 | 697 | if (!isset($image_array[0]['mmsi'])) { |
698 | - $Image->addMarineImage($mmsi,$imo,$ident); |
|
698 | + $Image->addMarineImage($mmsi, $imo, $ident); |
|
699 | 699 | } |
700 | 700 | unset($Image); |
701 | 701 | } |
@@ -707,10 +707,10 @@ discard block |
||
707 | 707 | if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
708 | 708 | if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
709 | 709 | if ($arrival_date == '') $arrival_date = NULL; |
710 | - $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 | + $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) |
|
711 | 711 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)"; |
712 | 712 | |
713 | - $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 | + $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); |
|
714 | 714 | try { |
715 | 715 | |
716 | 716 | $sth = $this->db->prepare($query); |
@@ -735,13 +735,13 @@ discard block |
||
735 | 735 | { |
736 | 736 | global $globalDBdriver, $globalTimezone; |
737 | 737 | if ($globalDBdriver == 'mysql') { |
738 | - $query = "SELECT marine_output.ident FROM marine_output |
|
738 | + $query = "SELECT marine_output.ident FROM marine_output |
|
739 | 739 | WHERE marine_output.ident = :ident |
740 | 740 | AND marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
741 | 741 | AND marine_output.date < UTC_TIMESTAMP()"; |
742 | 742 | $query_data = array(':ident' => $ident); |
743 | 743 | } else { |
744 | - $query = "SELECT marine_output.ident FROM marine_output |
|
744 | + $query = "SELECT marine_output.ident FROM marine_output |
|
745 | 745 | WHERE marine_output.ident = :ident |
746 | 746 | AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
747 | 747 | AND marine_output.date < now() AT TIME ZONE 'UTC'"; |
@@ -750,8 +750,8 @@ discard block |
||
750 | 750 | |
751 | 751 | $sth = $this->db->prepare($query); |
752 | 752 | $sth->execute($query_data); |
753 | - $ident_result=''; |
|
754 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
753 | + $ident_result = ''; |
|
754 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
755 | 755 | { |
756 | 756 | $ident_result = $row['ident']; |
757 | 757 | } |
@@ -777,8 +777,8 @@ discard block |
||
777 | 777 | return false; |
778 | 778 | } else { |
779 | 779 | $q_array = explode(" ", $q); |
780 | - foreach ($q_array as $q_item){ |
|
781 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
780 | + foreach ($q_array as $q_item) { |
|
781 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
782 | 782 | $additional_query .= " AND ("; |
783 | 783 | $additional_query .= "(marine_output.ident like '%".$q_item."%')"; |
784 | 784 | $additional_query .= ")"; |
@@ -786,11 +786,11 @@ discard block |
||
786 | 786 | } |
787 | 787 | } |
788 | 788 | if ($globalDBdriver == 'mysql') { |
789 | - $query = "SELECT marine_output.* FROM marine_output |
|
789 | + $query = "SELECT marine_output.* FROM marine_output |
|
790 | 790 | WHERE marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." |
791 | 791 | AND marine_output.date < UTC_TIMESTAMP()"; |
792 | 792 | } else { |
793 | - $query = "SELECT marine_output.* FROM marine_output |
|
793 | + $query = "SELECT marine_output.* FROM marine_output |
|
794 | 794 | WHERE marine_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." |
795 | 795 | AND marine_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
796 | 796 | } |
@@ -809,16 +809,16 @@ discard block |
||
809 | 809 | * |
810 | 810 | */ |
811 | 811 | |
812 | - public function countAllMarineOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array()) |
|
812 | + public function countAllMarineOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array()) |
|
813 | 813 | { |
814 | 814 | global $globalDBdriver, $globalArchive; |
815 | 815 | //$filter_query = $this->getFilter($filters,true,true); |
816 | - $Connection= new Connection($this->db); |
|
816 | + $Connection = new Connection($this->db); |
|
817 | 817 | if (!$Connection->tableExists('countries')) return array(); |
818 | 818 | require_once('class.SpotterLive.php'); |
819 | 819 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
820 | 820 | $MarineLive = new MarineLive($this->db); |
821 | - $filter_query = $MarineLive->getFilter($filters,true,true); |
|
821 | + $filter_query = $MarineLive->getFilter($filters, true, true); |
|
822 | 822 | $filter_query .= " over_country IS NOT NULL AND over_country <> ''"; |
823 | 823 | if ($olderthanmonths > 0) { |
824 | 824 | if ($globalDBdriver == 'mysql') { |
@@ -838,7 +838,7 @@ discard block |
||
838 | 838 | } else { |
839 | 839 | require_once(dirname(__FILE__)."/class.MarineArchive.php"); |
840 | 840 | $MarineArchive = new MarineArchive($this->db); |
841 | - $filter_query = $MarineArchive->getFilter($filters,true,true); |
|
841 | + $filter_query = $MarineArchive->getFilter($filters, true, true); |
|
842 | 842 | $filter_query .= " over_country <> ''"; |
843 | 843 | if ($olderthanmonths > 0) { |
844 | 844 | if ($globalDBdriver == 'mysql') { |
@@ -866,7 +866,7 @@ discard block |
||
866 | 866 | $flight_array = array(); |
867 | 867 | $temp_array = array(); |
868 | 868 | |
869 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
869 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
870 | 870 | { |
871 | 871 | $temp_array['marine_count'] = $row['nb']; |
872 | 872 | $temp_array['marine_country'] = $row['name']; |
@@ -885,11 +885,11 @@ discard block |
||
885 | 885 | * @return Array the callsign list |
886 | 886 | * |
887 | 887 | */ |
888 | - public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
|
888 | + public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
889 | 889 | { |
890 | 890 | global $globalDBdriver; |
891 | - $filter_query = $this->getFilter($filters,true,true); |
|
892 | - $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
|
891 | + $filter_query = $this->getFilter($filters, true, true); |
|
892 | + $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
|
893 | 893 | FROM marine_output".$filter_query." marine_output.ident <> ''"; |
894 | 894 | if ($olderthanmonths > 0) { |
895 | 895 | if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
@@ -903,28 +903,28 @@ discard block |
||
903 | 903 | if ($year != '') { |
904 | 904 | if ($globalDBdriver == 'mysql') { |
905 | 905 | $query .= " AND YEAR(marine_output.date) = :year"; |
906 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
906 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
907 | 907 | } else { |
908 | 908 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
909 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
909 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
910 | 910 | } |
911 | 911 | } |
912 | 912 | if ($month != '') { |
913 | 913 | if ($globalDBdriver == 'mysql') { |
914 | 914 | $query .= " AND MONTH(marine_output.date) = :month"; |
915 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
915 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
916 | 916 | } else { |
917 | 917 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
918 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
918 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
919 | 919 | } |
920 | 920 | } |
921 | 921 | if ($day != '') { |
922 | 922 | if ($globalDBdriver == 'mysql') { |
923 | 923 | $query .= " AND DAY(marine_output.date) = :day"; |
924 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
924 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
925 | 925 | } else { |
926 | 926 | $query .= " AND EXTRACT(DAY FROM marine_output.date) = :day"; |
927 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
927 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
928 | 928 | } |
929 | 929 | } |
930 | 930 | $query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC"; |
@@ -936,7 +936,7 @@ discard block |
||
936 | 936 | $callsign_array = array(); |
937 | 937 | $temp_array = array(); |
938 | 938 | |
939 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
939 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
940 | 940 | { |
941 | 941 | $temp_array['callsign_icao'] = $row['ident']; |
942 | 942 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -988,7 +988,7 @@ discard block |
||
988 | 988 | $date_array = array(); |
989 | 989 | $temp_array = array(); |
990 | 990 | |
991 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
991 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
992 | 992 | { |
993 | 993 | $temp_array['date_name'] = $row['date_name']; |
994 | 994 | $temp_array['date_count'] = $row['date_count']; |
@@ -1014,7 +1014,7 @@ discard block |
||
1014 | 1014 | $datetime = new DateTime(); |
1015 | 1015 | $offset = $datetime->format('P'); |
1016 | 1016 | } else $offset = '+00:00'; |
1017 | - $filter_query = $this->getFilter($filters,true,true); |
|
1017 | + $filter_query = $this->getFilter($filters, true, true); |
|
1018 | 1018 | if ($globalDBdriver == 'mysql') { |
1019 | 1019 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
1020 | 1020 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)"; |
@@ -1035,7 +1035,7 @@ discard block |
||
1035 | 1035 | $date_array = array(); |
1036 | 1036 | $temp_array = array(); |
1037 | 1037 | |
1038 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1038 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1039 | 1039 | { |
1040 | 1040 | $temp_array['date_name'] = $row['date_name']; |
1041 | 1041 | $temp_array['date_count'] = $row['date_count']; |
@@ -1060,7 +1060,7 @@ discard block |
||
1060 | 1060 | $datetime = new DateTime(); |
1061 | 1061 | $offset = $datetime->format('P'); |
1062 | 1062 | } else $offset = '+00:00'; |
1063 | - $filter_query = $this->getFilter($filters,true,true); |
|
1063 | + $filter_query = $this->getFilter($filters, true, true); |
|
1064 | 1064 | if ($globalDBdriver == 'mysql') { |
1065 | 1065 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
1066 | 1066 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)"; |
@@ -1081,7 +1081,7 @@ discard block |
||
1081 | 1081 | $date_array = array(); |
1082 | 1082 | $temp_array = array(); |
1083 | 1083 | |
1084 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1084 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1085 | 1085 | { |
1086 | 1086 | $temp_array['date_name'] = $row['date_name']; |
1087 | 1087 | $temp_array['date_count'] = $row['date_count']; |
@@ -1128,7 +1128,7 @@ discard block |
||
1128 | 1128 | $date_array = array(); |
1129 | 1129 | $temp_array = array(); |
1130 | 1130 | |
1131 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1131 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1132 | 1132 | { |
1133 | 1133 | $temp_array['month_name'] = $row['month_name']; |
1134 | 1134 | $temp_array['year_name'] = $row['year_name']; |
@@ -1157,7 +1157,7 @@ discard block |
||
1157 | 1157 | $datetime = new DateTime(); |
1158 | 1158 | $offset = $datetime->format('P'); |
1159 | 1159 | } else $offset = '+00:00'; |
1160 | - $filter_query = $this->getFilter($filters,true,true); |
|
1160 | + $filter_query = $this->getFilter($filters, true, true); |
|
1161 | 1161 | if ($globalDBdriver == 'mysql') { |
1162 | 1162 | $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 |
1163 | 1163 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)"; |
@@ -1178,7 +1178,7 @@ discard block |
||
1178 | 1178 | $date_array = array(); |
1179 | 1179 | $temp_array = array(); |
1180 | 1180 | |
1181 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1181 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1182 | 1182 | { |
1183 | 1183 | $temp_array['year_name'] = $row['year_name']; |
1184 | 1184 | $temp_array['month_name'] = $row['month_name']; |
@@ -1198,7 +1198,7 @@ discard block |
||
1198 | 1198 | * @return Array the hour list |
1199 | 1199 | * |
1200 | 1200 | */ |
1201 | - public function countAllHours($orderby,$filters = array()) |
|
1201 | + public function countAllHours($orderby, $filters = array()) |
|
1202 | 1202 | { |
1203 | 1203 | global $globalTimezone, $globalDBdriver; |
1204 | 1204 | if ($globalTimezone != '') { |
@@ -1246,7 +1246,7 @@ discard block |
||
1246 | 1246 | $hour_array = array(); |
1247 | 1247 | $temp_array = array(); |
1248 | 1248 | |
1249 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1249 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1250 | 1250 | { |
1251 | 1251 | $temp_array['hour_name'] = $row['hour_name']; |
1252 | 1252 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1268,8 +1268,8 @@ discard block |
||
1268 | 1268 | public function countAllHoursByDate($date, $filters = array()) |
1269 | 1269 | { |
1270 | 1270 | global $globalTimezone, $globalDBdriver; |
1271 | - $filter_query = $this->getFilter($filters,true,true); |
|
1272 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
1271 | + $filter_query = $this->getFilter($filters, true, true); |
|
1272 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
1273 | 1273 | if ($globalTimezone != '') { |
1274 | 1274 | date_default_timezone_set($globalTimezone); |
1275 | 1275 | $datetime = new DateTime($date); |
@@ -1277,12 +1277,12 @@ discard block |
||
1277 | 1277 | } else $offset = '+00:00'; |
1278 | 1278 | |
1279 | 1279 | if ($globalDBdriver == 'mysql') { |
1280 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
1280 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
1281 | 1281 | FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = :date |
1282 | 1282 | GROUP BY hour_name |
1283 | 1283 | ORDER BY hour_name ASC"; |
1284 | 1284 | } else { |
1285 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
1285 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
1286 | 1286 | FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date |
1287 | 1287 | GROUP BY hour_name |
1288 | 1288 | ORDER BY hour_name ASC"; |
@@ -1294,7 +1294,7 @@ discard block |
||
1294 | 1294 | $hour_array = array(); |
1295 | 1295 | $temp_array = array(); |
1296 | 1296 | |
1297 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1297 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1298 | 1298 | { |
1299 | 1299 | $temp_array['hour_name'] = $row['hour_name']; |
1300 | 1300 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1316,8 +1316,8 @@ discard block |
||
1316 | 1316 | public function countAllHoursByIdent($ident, $filters = array()) |
1317 | 1317 | { |
1318 | 1318 | global $globalTimezone, $globalDBdriver; |
1319 | - $filter_query = $this->getFilter($filters,true,true); |
|
1320 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
1319 | + $filter_query = $this->getFilter($filters, true, true); |
|
1320 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
1321 | 1321 | if ($globalTimezone != '') { |
1322 | 1322 | date_default_timezone_set($globalTimezone); |
1323 | 1323 | $datetime = new DateTime(); |
@@ -1325,12 +1325,12 @@ discard block |
||
1325 | 1325 | } else $offset = '+00:00'; |
1326 | 1326 | |
1327 | 1327 | if ($globalDBdriver == 'mysql') { |
1328 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
1328 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
1329 | 1329 | FROM marine_output".$filter_query." marine_output.ident = :ident |
1330 | 1330 | GROUP BY hour_name |
1331 | 1331 | ORDER BY hour_name ASC"; |
1332 | 1332 | } else { |
1333 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
1333 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
1334 | 1334 | FROM marine_output".$filter_query." marine_output.ident = :ident |
1335 | 1335 | GROUP BY hour_name |
1336 | 1336 | ORDER BY hour_name ASC"; |
@@ -1338,12 +1338,12 @@ discard block |
||
1338 | 1338 | |
1339 | 1339 | |
1340 | 1340 | $sth = $this->db->prepare($query); |
1341 | - $sth->execute(array(':ident' => $ident,':offset' => $offset)); |
|
1341 | + $sth->execute(array(':ident' => $ident, ':offset' => $offset)); |
|
1342 | 1342 | |
1343 | 1343 | $hour_array = array(); |
1344 | 1344 | $temp_array = array(); |
1345 | 1345 | |
1346 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1346 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1347 | 1347 | { |
1348 | 1348 | $temp_array['hour_name'] = $row['hour_name']; |
1349 | 1349 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1362,33 +1362,33 @@ discard block |
||
1362 | 1362 | * @return Integer the number of vessels |
1363 | 1363 | * |
1364 | 1364 | */ |
1365 | - public function countOverallMarine($filters = array(),$year = '',$month = '') |
|
1365 | + public function countOverallMarine($filters = array(), $year = '', $month = '') |
|
1366 | 1366 | { |
1367 | 1367 | global $globalDBdriver; |
1368 | 1368 | //$queryi = "SELECT COUNT(marine_output.marine_id) AS flight_count FROM marine_output"; |
1369 | - $queryi = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output"; |
|
1369 | + $queryi = "SELECT COUNT(DISTINCT marine_output.mmsi) AS flight_count FROM marine_output"; |
|
1370 | 1370 | $query_values = array(); |
1371 | 1371 | $query = ''; |
1372 | 1372 | if ($year != '') { |
1373 | 1373 | if ($globalDBdriver == 'mysql') { |
1374 | 1374 | $query .= " AND YEAR(marine_output.date) = :year"; |
1375 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
1375 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
1376 | 1376 | } else { |
1377 | 1377 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
1378 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
1378 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
1379 | 1379 | } |
1380 | 1380 | } |
1381 | 1381 | if ($month != '') { |
1382 | 1382 | if ($globalDBdriver == 'mysql') { |
1383 | 1383 | $query .= " AND MONTH(marine_output.date) = :month"; |
1384 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
1384 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
1385 | 1385 | } else { |
1386 | 1386 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
1387 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
1387 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
1388 | 1388 | } |
1389 | 1389 | } |
1390 | 1390 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
1391 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
1391 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
1392 | 1392 | |
1393 | 1393 | $sth = $this->db->prepare($queryi); |
1394 | 1394 | $sth->execute($query_values); |
@@ -1401,32 +1401,32 @@ discard block |
||
1401 | 1401 | * @return Integer the number of vessels |
1402 | 1402 | * |
1403 | 1403 | */ |
1404 | - public function countOverallMarineTypes($filters = array(),$year = '',$month = '') |
|
1404 | + public function countOverallMarineTypes($filters = array(), $year = '', $month = '') |
|
1405 | 1405 | { |
1406 | 1406 | global $globalDBdriver; |
1407 | - $queryi = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output"; |
|
1407 | + $queryi = "SELECT COUNT(DISTINCT marine_output.type) AS marine_count FROM marine_output"; |
|
1408 | 1408 | $query_values = array(); |
1409 | 1409 | $query = ''; |
1410 | 1410 | if ($year != '') { |
1411 | 1411 | if ($globalDBdriver == 'mysql') { |
1412 | 1412 | $query .= " AND YEAR(marine_output.date) = :year"; |
1413 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
1413 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
1414 | 1414 | } else { |
1415 | 1415 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
1416 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
1416 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
1417 | 1417 | } |
1418 | 1418 | } |
1419 | 1419 | if ($month != '') { |
1420 | 1420 | if ($globalDBdriver == 'mysql') { |
1421 | 1421 | $query .= " AND MONTH(marine_output.date) = :month"; |
1422 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
1422 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
1423 | 1423 | } else { |
1424 | 1424 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
1425 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
1425 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
1426 | 1426 | } |
1427 | 1427 | } |
1428 | 1428 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
1429 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
1429 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
1430 | 1430 | |
1431 | 1431 | $sth = $this->db->prepare($queryi); |
1432 | 1432 | $sth->execute($query_values); |
@@ -1443,7 +1443,7 @@ discard block |
||
1443 | 1443 | public function countAllHoursFromToday($filters = array()) |
1444 | 1444 | { |
1445 | 1445 | global $globalTimezone, $globalDBdriver; |
1446 | - $filter_query = $this->getFilter($filters,true,true); |
|
1446 | + $filter_query = $this->getFilter($filters, true, true); |
|
1447 | 1447 | if ($globalTimezone != '') { |
1448 | 1448 | date_default_timezone_set($globalTimezone); |
1449 | 1449 | $datetime = new DateTime(); |
@@ -1451,12 +1451,12 @@ discard block |
||
1451 | 1451 | } else $offset = '+00:00'; |
1452 | 1452 | |
1453 | 1453 | if ($globalDBdriver == 'mysql') { |
1454 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
1454 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
1455 | 1455 | FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = CURDATE() |
1456 | 1456 | GROUP BY hour_name |
1457 | 1457 | ORDER BY hour_name ASC"; |
1458 | 1458 | } else { |
1459 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
1459 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
1460 | 1460 | FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date) |
1461 | 1461 | GROUP BY hour_name |
1462 | 1462 | ORDER BY hour_name ASC"; |
@@ -1468,7 +1468,7 @@ discard block |
||
1468 | 1468 | $hour_array = array(); |
1469 | 1469 | $temp_array = array(); |
1470 | 1470 | |
1471 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1471 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1472 | 1472 | { |
1473 | 1473 | $temp_array['hour_name'] = $row['hour_name']; |
1474 | 1474 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1487,9 +1487,9 @@ discard block |
||
1487 | 1487 | */ |
1488 | 1488 | public function getMarineIDBasedOnFamMarineID($fammarine_id) |
1489 | 1489 | { |
1490 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
1490 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
1491 | 1491 | |
1492 | - $query = "SELECT marine_output.marine_id |
|
1492 | + $query = "SELECT marine_output.marine_id |
|
1493 | 1493 | FROM marine_output |
1494 | 1494 | WHERE marine_output.fammarine_id = '".$fammarine_id."'"; |
1495 | 1495 | |
@@ -1497,7 +1497,7 @@ discard block |
||
1497 | 1497 | $sth = $this->db->prepare($query); |
1498 | 1498 | $sth->execute(); |
1499 | 1499 | |
1500 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1500 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1501 | 1501 | { |
1502 | 1502 | return $row['marine_id']; |
1503 | 1503 | } |
@@ -1522,23 +1522,23 @@ discard block |
||
1522 | 1522 | } |
1523 | 1523 | |
1524 | 1524 | $current_date = date("Y-m-d H:i:s"); |
1525 | - $date = date("Y-m-d H:i:s",strtotime($dateString." UTC")); |
|
1525 | + $date = date("Y-m-d H:i:s", strtotime($dateString." UTC")); |
|
1526 | 1526 | |
1527 | 1527 | $diff = abs(strtotime($current_date) - strtotime($date)); |
1528 | 1528 | |
1529 | - $time_array['years'] = floor($diff / (365*60*60*24)); |
|
1529 | + $time_array['years'] = floor($diff/(365*60*60*24)); |
|
1530 | 1530 | $years = $time_array['years']; |
1531 | 1531 | |
1532 | - $time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24)); |
|
1532 | + $time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24)); |
|
1533 | 1533 | $months = $time_array['months']; |
1534 | 1534 | |
1535 | - $time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24)); |
|
1535 | + $time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24)); |
|
1536 | 1536 | $days = $time_array['days']; |
1537 | - $time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60)); |
|
1537 | + $time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60)); |
|
1538 | 1538 | $hours = $time_array['hours']; |
1539 | - $time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60); |
|
1539 | + $time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60); |
|
1540 | 1540 | $minutes = $time_array['minutes']; |
1541 | - $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 | + $time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
1542 | 1542 | |
1543 | 1543 | return $time_array; |
1544 | 1544 | } |
@@ -1561,63 +1561,63 @@ discard block |
||
1561 | 1561 | $temp_array['direction_degree'] = $direction; |
1562 | 1562 | $temp_array['direction_shortname'] = "N"; |
1563 | 1563 | $temp_array['direction_fullname'] = "North"; |
1564 | - } elseif ($direction >= 22.5 && $direction < 45){ |
|
1564 | + } elseif ($direction >= 22.5 && $direction < 45) { |
|
1565 | 1565 | $temp_array['direction_degree'] = $direction; |
1566 | 1566 | $temp_array['direction_shortname'] = "NNE"; |
1567 | 1567 | $temp_array['direction_fullname'] = "North-Northeast"; |
1568 | - } elseif ($direction >= 45 && $direction < 67.5){ |
|
1568 | + } elseif ($direction >= 45 && $direction < 67.5) { |
|
1569 | 1569 | $temp_array['direction_degree'] = $direction; |
1570 | 1570 | $temp_array['direction_shortname'] = "NE"; |
1571 | 1571 | $temp_array['direction_fullname'] = "Northeast"; |
1572 | - } elseif ($direction >= 67.5 && $direction < 90){ |
|
1572 | + } elseif ($direction >= 67.5 && $direction < 90) { |
|
1573 | 1573 | $temp_array['direction_degree'] = $direction; |
1574 | 1574 | $temp_array['direction_shortname'] = "ENE"; |
1575 | 1575 | $temp_array['direction_fullname'] = "East-Northeast"; |
1576 | - } elseif ($direction >= 90 && $direction < 112.5){ |
|
1576 | + } elseif ($direction >= 90 && $direction < 112.5) { |
|
1577 | 1577 | $temp_array['direction_degree'] = $direction; |
1578 | 1578 | $temp_array['direction_shortname'] = "E"; |
1579 | 1579 | $temp_array['direction_fullname'] = "East"; |
1580 | - } elseif ($direction >= 112.5 && $direction < 135){ |
|
1580 | + } elseif ($direction >= 112.5 && $direction < 135) { |
|
1581 | 1581 | $temp_array['direction_degree'] = $direction; |
1582 | 1582 | $temp_array['direction_shortname'] = "ESE"; |
1583 | 1583 | $temp_array['direction_fullname'] = "East-Southeast"; |
1584 | - } elseif ($direction >= 135 && $direction < 157.5){ |
|
1584 | + } elseif ($direction >= 135 && $direction < 157.5) { |
|
1585 | 1585 | $temp_array['direction_degree'] = $direction; |
1586 | 1586 | $temp_array['direction_shortname'] = "SE"; |
1587 | 1587 | $temp_array['direction_fullname'] = "Southeast"; |
1588 | - } elseif ($direction >= 157.5 && $direction < 180){ |
|
1588 | + } elseif ($direction >= 157.5 && $direction < 180) { |
|
1589 | 1589 | $temp_array['direction_degree'] = $direction; |
1590 | 1590 | $temp_array['direction_shortname'] = "SSE"; |
1591 | 1591 | $temp_array['direction_fullname'] = "South-Southeast"; |
1592 | - } elseif ($direction >= 180 && $direction < 202.5){ |
|
1592 | + } elseif ($direction >= 180 && $direction < 202.5) { |
|
1593 | 1593 | $temp_array['direction_degree'] = $direction; |
1594 | 1594 | $temp_array['direction_shortname'] = "S"; |
1595 | 1595 | $temp_array['direction_fullname'] = "South"; |
1596 | - } elseif ($direction >= 202.5 && $direction < 225){ |
|
1596 | + } elseif ($direction >= 202.5 && $direction < 225) { |
|
1597 | 1597 | $temp_array['direction_degree'] = $direction; |
1598 | 1598 | $temp_array['direction_shortname'] = "SSW"; |
1599 | 1599 | $temp_array['direction_fullname'] = "South-Southwest"; |
1600 | - } elseif ($direction >= 225 && $direction < 247.5){ |
|
1600 | + } elseif ($direction >= 225 && $direction < 247.5) { |
|
1601 | 1601 | $temp_array['direction_degree'] = $direction; |
1602 | 1602 | $temp_array['direction_shortname'] = "SW"; |
1603 | 1603 | $temp_array['direction_fullname'] = "Southwest"; |
1604 | - } elseif ($direction >= 247.5 && $direction < 270){ |
|
1604 | + } elseif ($direction >= 247.5 && $direction < 270) { |
|
1605 | 1605 | $temp_array['direction_degree'] = $direction; |
1606 | 1606 | $temp_array['direction_shortname'] = "WSW"; |
1607 | 1607 | $temp_array['direction_fullname'] = "West-Southwest"; |
1608 | - } elseif ($direction >= 270 && $direction < 292.5){ |
|
1608 | + } elseif ($direction >= 270 && $direction < 292.5) { |
|
1609 | 1609 | $temp_array['direction_degree'] = $direction; |
1610 | 1610 | $temp_array['direction_shortname'] = "W"; |
1611 | 1611 | $temp_array['direction_fullname'] = "West"; |
1612 | - } elseif ($direction >= 292.5 && $direction < 315){ |
|
1612 | + } elseif ($direction >= 292.5 && $direction < 315) { |
|
1613 | 1613 | $temp_array['direction_degree'] = $direction; |
1614 | 1614 | $temp_array['direction_shortname'] = "WNW"; |
1615 | 1615 | $temp_array['direction_fullname'] = "West-Northwest"; |
1616 | - } elseif ($direction >= 315 && $direction < 337.5){ |
|
1616 | + } elseif ($direction >= 315 && $direction < 337.5) { |
|
1617 | 1617 | $temp_array['direction_degree'] = $direction; |
1618 | 1618 | $temp_array['direction_shortname'] = "NW"; |
1619 | 1619 | $temp_array['direction_fullname'] = "Northwest"; |
1620 | - } elseif ($direction >= 337.5 && $direction < 360){ |
|
1620 | + } elseif ($direction >= 337.5 && $direction < 360) { |
|
1621 | 1621 | $temp_array['direction_degree'] = $direction; |
1622 | 1622 | $temp_array['direction_shortname'] = "NNW"; |
1623 | 1623 | $temp_array['direction_fullname'] = "North-Northwest"; |
@@ -1634,11 +1634,11 @@ discard block |
||
1634 | 1634 | * @param Float $longitude longitute of the flight |
1635 | 1635 | * @return String the countrie |
1636 | 1636 | */ |
1637 | - public function getCountryFromLatitudeLongitude($latitude,$longitude) |
|
1637 | + public function getCountryFromLatitudeLongitude($latitude, $longitude) |
|
1638 | 1638 | { |
1639 | 1639 | global $globalDBdriver, $globalDebug; |
1640 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
1641 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
1640 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
1641 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
1642 | 1642 | |
1643 | 1643 | $Connection = new Connection($this->db); |
1644 | 1644 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1678,7 +1678,7 @@ discard block |
||
1678 | 1678 | public function getCountryFromISO2($iso2) |
1679 | 1679 | { |
1680 | 1680 | global $globalDBdriver, $globalDebug; |
1681 | - $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
|
1681 | + $iso2 = filter_var($iso2, FILTER_SANITIZE_STRING); |
|
1682 | 1682 | |
1683 | 1683 | $Connection = new Connection($this->db); |
1684 | 1684 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1726,7 +1726,7 @@ discard block |
||
1726 | 1726 | |
1727 | 1727 | $bitly_data = json_decode($bitly_data); |
1728 | 1728 | $bitly_url = ''; |
1729 | - if ($bitly_data->status_txt = "OK"){ |
|
1729 | + if ($bitly_data->status_txt = "OK") { |
|
1730 | 1730 | $bitly_url = $bitly_data->data->url; |
1731 | 1731 | } |
1732 | 1732 | |
@@ -1740,11 +1740,11 @@ discard block |
||
1740 | 1740 | * @return Array the vessel type list |
1741 | 1741 | * |
1742 | 1742 | */ |
1743 | - public function countAllMarineTypes($limit = true,$olderthanmonths = 0,$sincedate = '',$filters = array(),$year = '',$month = '',$day = '') |
|
1743 | + public function countAllMarineTypes($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
1744 | 1744 | { |
1745 | 1745 | global $globalDBdriver; |
1746 | - $filter_query = $this->getFilter($filters,true,true); |
|
1747 | - $query = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count |
|
1746 | + $filter_query = $this->getFilter($filters, true, true); |
|
1747 | + $query = "SELECT marine_output.type AS marine_type, COUNT(marine_output.type) AS marine_type_count |
|
1748 | 1748 | FROM marine_output ".$filter_query." marine_output.type <> ''"; |
1749 | 1749 | if ($olderthanmonths > 0) { |
1750 | 1750 | if ($globalDBdriver == 'mysql') { |
@@ -1764,28 +1764,28 @@ discard block |
||
1764 | 1764 | if ($year != '') { |
1765 | 1765 | if ($globalDBdriver == 'mysql') { |
1766 | 1766 | $query .= " AND YEAR(marine_output.date) = :year"; |
1767 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
1767 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
1768 | 1768 | } else { |
1769 | 1769 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
1770 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
1770 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
1771 | 1771 | } |
1772 | 1772 | } |
1773 | 1773 | if ($month != '') { |
1774 | 1774 | if ($globalDBdriver == 'mysql') { |
1775 | 1775 | $query .= " AND MONTH(marine_output.date) = :month"; |
1776 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
1776 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
1777 | 1777 | } else { |
1778 | 1778 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
1779 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
1779 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
1780 | 1780 | } |
1781 | 1781 | } |
1782 | 1782 | if ($day != '') { |
1783 | 1783 | if ($globalDBdriver == 'mysql') { |
1784 | 1784 | $query .= " AND DAY(marine_output.date) = :day"; |
1785 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
1785 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
1786 | 1786 | } else { |
1787 | 1787 | $query .= " AND EXTRACT(DAY FROM marine_output.date) = :day"; |
1788 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
1788 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
1789 | 1789 | } |
1790 | 1790 | } |
1791 | 1791 | $query .= " GROUP BY marine_output.type ORDER BY marine_type_count DESC"; |
@@ -1794,7 +1794,7 @@ discard block |
||
1794 | 1794 | $sth->execute($query_values); |
1795 | 1795 | $marine_array = array(); |
1796 | 1796 | $temp_array = array(); |
1797 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1797 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
1798 | 1798 | { |
1799 | 1799 | $temp_array['marine_type'] = $row['marine_type']; |
1800 | 1800 | $temp_array['marine_type_count'] = $row['marine_type_count']; |
@@ -1805,7 +1805,7 @@ discard block |
||
1805 | 1805 | |
1806 | 1806 | public function getOrderBy() |
1807 | 1807 | { |
1808 | - $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 | + $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")); |
|
1809 | 1809 | |
1810 | 1810 | return $orderby; |
1811 | 1811 |
@@ -8,7 +8,9 @@ discard block |
||
8 | 8 | public function __construct($dbc = null) { |
9 | 9 | $Connection = new Connection($dbc); |
10 | 10 | $this->db = $Connection->db(); |
11 | - if ($this->db === null) die('Error: No DB connection.'); |
|
11 | + if ($this->db === null) { |
|
12 | + die('Error: No DB connection.'); |
|
13 | + } |
|
12 | 14 | } |
13 | 15 | |
14 | 16 | /** |
@@ -30,7 +32,9 @@ discard block |
||
30 | 32 | if (isset($filter[0]['source'])) { |
31 | 33 | $filters = array_merge($filters,$filter); |
32 | 34 | } |
33 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
35 | + if (is_array($globalFilter)) { |
|
36 | + $filter = array_merge($filter,$globalFilter); |
|
37 | + } |
|
34 | 38 | $filter_query_join = ''; |
35 | 39 | $filter_query_where = ''; |
36 | 40 | foreach($filters as $flt) { |
@@ -69,8 +73,11 @@ discard block |
||
69 | 73 | $filter_query_where .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'"; |
70 | 74 | } |
71 | 75 | } |
72 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
73 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
76 | + if ($filter_query_where == '' && $where) { |
|
77 | + $filter_query_where = ' WHERE'; |
|
78 | + } elseif ($filter_query_where != '' && $and) { |
|
79 | + $filter_query_where .= ' AND'; |
|
80 | + } |
|
74 | 81 | if ($filter_query_where != '') { |
75 | 82 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
76 | 83 | } |
@@ -124,32 +131,54 @@ discard block |
||
124 | 131 | $temp_array['spotter_id'] = $row['spotter_archive_id']; |
125 | 132 | } elseif (isset($row['spotter_archive_output_id'])) { |
126 | 133 | $temp_array['spotter_id'] = $row['spotter_archive_output_id']; |
127 | - */} |
|
128 | - elseif (isset($row['marineid'])) { |
|
134 | + */} elseif (isset($row['marineid'])) { |
|
129 | 135 | $temp_array['marine_id'] = $row['marineid']; |
130 | 136 | } else { |
131 | 137 | $temp_array['marine_id'] = ''; |
132 | 138 | } |
133 | - if (isset($row['fammarine_id'])) $temp_array['fammarine_id'] = $row['fammarine_id']; |
|
134 | - if (isset($row['mmsi'])) $temp_array['mmsi'] = $row['mmsi']; |
|
135 | - if (isset($row['type'])) $temp_array['type'] = $row['type']; |
|
136 | - if (isset($row['type_id'])) $temp_array['type_id'] = $row['type_id']; |
|
137 | - if (isset($row['ident'])) $temp_array['ident'] = $row['ident']; |
|
138 | - if (isset($row['latitude'])) $temp_array['latitude'] = $row['latitude']; |
|
139 | - if (isset($row['longitude'])) $temp_array['longitude'] = $row['longitude']; |
|
140 | - if (isset($row['format_source'])) $temp_array['format_source'] = $row['format_source']; |
|
139 | + if (isset($row['fammarine_id'])) { |
|
140 | + $temp_array['fammarine_id'] = $row['fammarine_id']; |
|
141 | + } |
|
142 | + if (isset($row['mmsi'])) { |
|
143 | + $temp_array['mmsi'] = $row['mmsi']; |
|
144 | + } |
|
145 | + if (isset($row['type'])) { |
|
146 | + $temp_array['type'] = $row['type']; |
|
147 | + } |
|
148 | + if (isset($row['type_id'])) { |
|
149 | + $temp_array['type_id'] = $row['type_id']; |
|
150 | + } |
|
151 | + if (isset($row['ident'])) { |
|
152 | + $temp_array['ident'] = $row['ident']; |
|
153 | + } |
|
154 | + if (isset($row['latitude'])) { |
|
155 | + $temp_array['latitude'] = $row['latitude']; |
|
156 | + } |
|
157 | + if (isset($row['longitude'])) { |
|
158 | + $temp_array['longitude'] = $row['longitude']; |
|
159 | + } |
|
160 | + if (isset($row['format_source'])) { |
|
161 | + $temp_array['format_source'] = $row['format_source']; |
|
162 | + } |
|
141 | 163 | if (isset($row['heading'])) { |
142 | 164 | $temp_array['heading'] = $row['heading']; |
143 | 165 | $heading_direction = $this->parseDirection($row['heading']); |
144 | - if (isset($heading_direction[0]['direction_fullname'])) $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
166 | + if (isset($heading_direction[0]['direction_fullname'])) { |
|
167 | + $temp_array['heading_name'] = $heading_direction[0]['direction_fullname']; |
|
168 | + } |
|
169 | + } |
|
170 | + if (isset($row['ground_speed'])) { |
|
171 | + $temp_array['ground_speed'] = $row['ground_speed']; |
|
145 | 172 | } |
146 | - if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed']; |
|
147 | 173 | |
148 | 174 | if($temp_array['mmsi'] != "") |
149 | 175 | { |
150 | 176 | $Image = new Image($this->db); |
151 | - if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']); |
|
152 | - else $image_array = $Image->getMarineImage($temp_array['mmsi']); |
|
177 | + if (isset($temp_array['ident']) && $temp_array['ident'] != '') { |
|
178 | + $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']); |
|
179 | + } else { |
|
180 | + $image_array = $Image->getMarineImage($temp_array['mmsi']); |
|
181 | + } |
|
153 | 182 | unset($Image); |
154 | 183 | if (count($image_array) > 0) { |
155 | 184 | $temp_array['image'] = $image_array[0]['image']; |
@@ -201,13 +230,21 @@ discard block |
||
201 | 230 | } |
202 | 231 | |
203 | 232 | $fromsource = NULL; |
204 | - if (isset($row['source_name']) && $row['source_name'] != '') $temp_array['source_name'] = $row['source_name']; |
|
205 | - if (isset($row['over_country']) && $row['over_country'] != '') $temp_array['over_country'] = $row['over_country']; |
|
206 | - if (isset($row['distance']) && $row['distance'] != '') $temp_array['distance'] = $row['distance']; |
|
233 | + if (isset($row['source_name']) && $row['source_name'] != '') { |
|
234 | + $temp_array['source_name'] = $row['source_name']; |
|
235 | + } |
|
236 | + if (isset($row['over_country']) && $row['over_country'] != '') { |
|
237 | + $temp_array['over_country'] = $row['over_country']; |
|
238 | + } |
|
239 | + if (isset($row['distance']) && $row['distance'] != '') { |
|
240 | + $temp_array['distance'] = $row['distance']; |
|
241 | + } |
|
207 | 242 | $temp_array['query_number_rows'] = $num_rows; |
208 | 243 | $spotter_array[] = $temp_array; |
209 | 244 | } |
210 | - if ($num_rows == 0) return array(); |
|
245 | + if ($num_rows == 0) { |
|
246 | + return array(); |
|
247 | + } |
|
211 | 248 | $spotter_array[0]['query_number_rows'] = $num_rows; |
212 | 249 | return $spotter_array; |
213 | 250 | } |
@@ -233,8 +270,12 @@ discard block |
||
233 | 270 | { |
234 | 271 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
235 | 272 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
236 | - } else $limit_query = ""; |
|
237 | - } else $limit_query = ""; |
|
273 | + } else { |
|
274 | + $limit_query = ""; |
|
275 | + } |
|
276 | + } else { |
|
277 | + $limit_query = ""; |
|
278 | + } |
|
238 | 279 | if ($sort != "") |
239 | 280 | { |
240 | 281 | $search_orderby_array = $this->getOrderBy(); |
@@ -258,7 +299,9 @@ discard block |
||
258 | 299 | global $global_query; |
259 | 300 | |
260 | 301 | date_default_timezone_set('UTC'); |
261 | - if ($id == '') return array(); |
|
302 | + if ($id == '') { |
|
303 | + return array(); |
|
304 | + } |
|
262 | 305 | $additional_query = "marine_output.fammarine_id = :id"; |
263 | 306 | $query_values = array(':id' => $id); |
264 | 307 | $query = $global_query." WHERE ".$additional_query." "; |
@@ -401,8 +444,11 @@ discard block |
||
401 | 444 | $query .= " ORDER BY marine_output.source_name ASC"; |
402 | 445 | |
403 | 446 | $sth = $this->db->prepare($query); |
404 | - if (!empty($query_values)) $sth->execute($query_values); |
|
405 | - else $sth->execute(); |
|
447 | + if (!empty($query_values)) { |
|
448 | + $sth->execute($query_values); |
|
449 | + } else { |
|
450 | + $sth->execute(); |
|
451 | + } |
|
406 | 452 | |
407 | 453 | $source_array = array(); |
408 | 454 | $temp_array = array(); |
@@ -457,8 +503,11 @@ discard block |
||
457 | 503 | $sth = $this->db->prepare($query); |
458 | 504 | $sth->execute(array(':mmsi' => $mmsi)); |
459 | 505 | $result = $sth->fetchAll(PDO::FETCH_ASSOC); |
460 | - if (isset($result[0])) return $result[0]; |
|
461 | - else return array(); |
|
506 | + if (isset($result[0])) { |
|
507 | + return $result[0]; |
|
508 | + } else { |
|
509 | + return array(); |
|
510 | + } |
|
462 | 511 | } |
463 | 512 | |
464 | 513 | /* |
@@ -474,7 +523,9 @@ discard block |
||
474 | 523 | date_default_timezone_set($globalTimezone); |
475 | 524 | $datetime = new DateTime(); |
476 | 525 | $offset = $datetime->format('P'); |
477 | - } else $offset = '+00:00'; |
|
526 | + } else { |
|
527 | + $offset = '+00:00'; |
|
528 | + } |
|
478 | 529 | |
479 | 530 | if ($globalDBdriver == 'mysql') { |
480 | 531 | $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
@@ -704,9 +755,15 @@ discard block |
||
704 | 755 | $latitude = 0; |
705 | 756 | $longitude = 0; |
706 | 757 | } |
707 | - if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
708 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
709 | - if ($arrival_date == '') $arrival_date = NULL; |
|
758 | + if ($heading == '' || $Common->isInteger($heading) === false) { |
|
759 | + $heading = 0; |
|
760 | + } |
|
761 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) { |
|
762 | + $groundspeed = 0; |
|
763 | + } |
|
764 | + if ($arrival_date == '') { |
|
765 | + $arrival_date = NULL; |
|
766 | + } |
|
710 | 767 | $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) |
711 | 768 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)"; |
712 | 769 | |
@@ -814,7 +871,9 @@ discard block |
||
814 | 871 | global $globalDBdriver, $globalArchive; |
815 | 872 | //$filter_query = $this->getFilter($filters,true,true); |
816 | 873 | $Connection= new Connection($this->db); |
817 | - if (!$Connection->tableExists('countries')) return array(); |
|
874 | + if (!$Connection->tableExists('countries')) { |
|
875 | + return array(); |
|
876 | + } |
|
818 | 877 | require_once('class.SpotterLive.php'); |
819 | 878 | if (!isset($globalArchive) || $globalArchive !== TRUE) { |
820 | 879 | $MarineLive = new MarineLive($this->db); |
@@ -858,7 +917,9 @@ discard block |
||
858 | 917 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb FROM countries c INNER JOIN (SELECT DISTINCT fammarine_id,over_country FROM marine_archive".$filter_query.") l ON c.iso2 = l.over_country "; |
859 | 918 | } |
860 | 919 | $query .= "GROUP BY c.name,c.iso3,c.iso2 ORDER BY nb DESC"; |
861 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
920 | + if ($limit) { |
|
921 | + $query .= " LIMIT 10 OFFSET 0"; |
|
922 | + } |
|
862 | 923 | |
863 | 924 | $sth = $this->db->prepare($query); |
864 | 925 | $sth->execute(); |
@@ -892,12 +953,18 @@ discard block |
||
892 | 953 | $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
893 | 954 | FROM marine_output".$filter_query." marine_output.ident <> ''"; |
894 | 955 | if ($olderthanmonths > 0) { |
895 | - if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
896 | - else $query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
956 | + if ($globalDBdriver == 'mysql') { |
|
957 | + $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
|
958 | + } else { |
|
959 | + $query .= " AND marine_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
|
960 | + } |
|
897 | 961 | } |
898 | 962 | if ($sincedate != '') { |
899 | - if ($globalDBdriver == 'mysql') $query .= " AND marine_output.date > '".$sincedate."'"; |
|
900 | - else $query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
963 | + if ($globalDBdriver == 'mysql') { |
|
964 | + $query .= " AND marine_output.date > '".$sincedate."'"; |
|
965 | + } else { |
|
966 | + $query .= " AND marine_output.date > CAST('".$sincedate."' AS TIMESTAMP)"; |
|
967 | + } |
|
901 | 968 | } |
902 | 969 | $query_values = array(); |
903 | 970 | if ($year != '') { |
@@ -928,7 +995,9 @@ discard block |
||
928 | 995 | } |
929 | 996 | } |
930 | 997 | $query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC"; |
931 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
998 | + if ($limit) { |
|
999 | + $query .= " LIMIT 10 OFFSET 0"; |
|
1000 | + } |
|
932 | 1001 | |
933 | 1002 | $sth = $this->db->prepare($query); |
934 | 1003 | $sth->execute($query_values); |
@@ -963,7 +1032,9 @@ discard block |
||
963 | 1032 | date_default_timezone_set($globalTimezone); |
964 | 1033 | $datetime = new DateTime(); |
965 | 1034 | $offset = $datetime->format('P'); |
966 | - } else $offset = '+00:00'; |
|
1035 | + } else { |
|
1036 | + $offset = '+00:00'; |
|
1037 | + } |
|
967 | 1038 | |
968 | 1039 | if ($globalDBdriver == 'mysql') { |
969 | 1040 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1013,7 +1084,9 @@ discard block |
||
1013 | 1084 | date_default_timezone_set($globalTimezone); |
1014 | 1085 | $datetime = new DateTime(); |
1015 | 1086 | $offset = $datetime->format('P'); |
1016 | - } else $offset = '+00:00'; |
|
1087 | + } else { |
|
1088 | + $offset = '+00:00'; |
|
1089 | + } |
|
1017 | 1090 | $filter_query = $this->getFilter($filters,true,true); |
1018 | 1091 | if ($globalDBdriver == 'mysql') { |
1019 | 1092 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1059,7 +1132,9 @@ discard block |
||
1059 | 1132 | date_default_timezone_set($globalTimezone); |
1060 | 1133 | $datetime = new DateTime(); |
1061 | 1134 | $offset = $datetime->format('P'); |
1062 | - } else $offset = '+00:00'; |
|
1135 | + } else { |
|
1136 | + $offset = '+00:00'; |
|
1137 | + } |
|
1063 | 1138 | $filter_query = $this->getFilter($filters,true,true); |
1064 | 1139 | if ($globalDBdriver == 'mysql') { |
1065 | 1140 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
@@ -1107,7 +1182,9 @@ discard block |
||
1107 | 1182 | date_default_timezone_set($globalTimezone); |
1108 | 1183 | $datetime = new DateTime(); |
1109 | 1184 | $offset = $datetime->format('P'); |
1110 | - } else $offset = '+00:00'; |
|
1185 | + } else { |
|
1186 | + $offset = '+00:00'; |
|
1187 | + } |
|
1111 | 1188 | |
1112 | 1189 | if ($globalDBdriver == 'mysql') { |
1113 | 1190 | $query = "SELECT YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name,MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, count(*) as date_count |
@@ -1156,7 +1233,9 @@ discard block |
||
1156 | 1233 | date_default_timezone_set($globalTimezone); |
1157 | 1234 | $datetime = new DateTime(); |
1158 | 1235 | $offset = $datetime->format('P'); |
1159 | - } else $offset = '+00:00'; |
|
1236 | + } else { |
|
1237 | + $offset = '+00:00'; |
|
1238 | + } |
|
1160 | 1239 | $filter_query = $this->getFilter($filters,true,true); |
1161 | 1240 | if ($globalDBdriver == 'mysql') { |
1162 | 1241 | $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 |
@@ -1205,7 +1284,9 @@ discard block |
||
1205 | 1284 | date_default_timezone_set($globalTimezone); |
1206 | 1285 | $datetime = new DateTime(); |
1207 | 1286 | $offset = $datetime->format('P'); |
1208 | - } else $offset = '+00:00'; |
|
1287 | + } else { |
|
1288 | + $offset = '+00:00'; |
|
1289 | + } |
|
1209 | 1290 | |
1210 | 1291 | $orderby_sql = ''; |
1211 | 1292 | if ($orderby == "hour") |
@@ -1274,7 +1355,9 @@ discard block |
||
1274 | 1355 | date_default_timezone_set($globalTimezone); |
1275 | 1356 | $datetime = new DateTime($date); |
1276 | 1357 | $offset = $datetime->format('P'); |
1277 | - } else $offset = '+00:00'; |
|
1358 | + } else { |
|
1359 | + $offset = '+00:00'; |
|
1360 | + } |
|
1278 | 1361 | |
1279 | 1362 | if ($globalDBdriver == 'mysql') { |
1280 | 1363 | $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1322,7 +1405,9 @@ discard block |
||
1322 | 1405 | date_default_timezone_set($globalTimezone); |
1323 | 1406 | $datetime = new DateTime(); |
1324 | 1407 | $offset = $datetime->format('P'); |
1325 | - } else $offset = '+00:00'; |
|
1408 | + } else { |
|
1409 | + $offset = '+00:00'; |
|
1410 | + } |
|
1326 | 1411 | |
1327 | 1412 | if ($globalDBdriver == 'mysql') { |
1328 | 1413 | $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1387,8 +1472,11 @@ discard block |
||
1387 | 1472 | $query_values = array_merge($query_values,array(':month' => $month)); |
1388 | 1473 | } |
1389 | 1474 | } |
1390 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
1391 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
1475 | + if (empty($query_values)) { |
|
1476 | + $queryi .= $this->getFilter($filters); |
|
1477 | + } else { |
|
1478 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
1479 | + } |
|
1392 | 1480 | |
1393 | 1481 | $sth = $this->db->prepare($queryi); |
1394 | 1482 | $sth->execute($query_values); |
@@ -1425,8 +1513,11 @@ discard block |
||
1425 | 1513 | $query_values = array_merge($query_values,array(':month' => $month)); |
1426 | 1514 | } |
1427 | 1515 | } |
1428 | - if (empty($query_values)) $queryi .= $this->getFilter($filters); |
|
1429 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
1516 | + if (empty($query_values)) { |
|
1517 | + $queryi .= $this->getFilter($filters); |
|
1518 | + } else { |
|
1519 | + $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
1520 | + } |
|
1430 | 1521 | |
1431 | 1522 | $sth = $this->db->prepare($queryi); |
1432 | 1523 | $sth->execute($query_values); |
@@ -1448,7 +1539,9 @@ discard block |
||
1448 | 1539 | date_default_timezone_set($globalTimezone); |
1449 | 1540 | $datetime = new DateTime(); |
1450 | 1541 | $offset = $datetime->format('P'); |
1451 | - } else $offset = '+00:00'; |
|
1542 | + } else { |
|
1543 | + $offset = '+00:00'; |
|
1544 | + } |
|
1452 | 1545 | |
1453 | 1546 | if ($globalDBdriver == 'mysql') { |
1454 | 1547 | $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
@@ -1552,7 +1645,9 @@ discard block |
||
1552 | 1645 | */ |
1553 | 1646 | public function parseDirection($direction = 0) |
1554 | 1647 | { |
1555 | - if ($direction == '') $direction = 0; |
|
1648 | + if ($direction == '') { |
|
1649 | + $direction = 0; |
|
1650 | + } |
|
1556 | 1651 | $direction_array = array(); |
1557 | 1652 | $temp_array = array(); |
1558 | 1653 | |
@@ -1641,7 +1736,9 @@ discard block |
||
1641 | 1736 | $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
1642 | 1737 | |
1643 | 1738 | $Connection = new Connection($this->db); |
1644 | - if (!$Connection->tableExists('countries')) return ''; |
|
1739 | + if (!$Connection->tableExists('countries')) { |
|
1740 | + return ''; |
|
1741 | + } |
|
1645 | 1742 | |
1646 | 1743 | try { |
1647 | 1744 | /* |
@@ -1661,9 +1758,13 @@ discard block |
||
1661 | 1758 | $sth->closeCursor(); |
1662 | 1759 | if (count($row) > 0) { |
1663 | 1760 | return $row; |
1664 | - } else return ''; |
|
1761 | + } else { |
|
1762 | + return ''; |
|
1763 | + } |
|
1665 | 1764 | } catch (PDOException $e) { |
1666 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
1765 | + if (isset($globalDebug) && $globalDebug) { |
|
1766 | + echo 'Error : '.$e->getMessage()."\n"; |
|
1767 | + } |
|
1667 | 1768 | return ''; |
1668 | 1769 | } |
1669 | 1770 | |
@@ -1681,7 +1782,9 @@ discard block |
||
1681 | 1782 | $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
1682 | 1783 | |
1683 | 1784 | $Connection = new Connection($this->db); |
1684 | - if (!$Connection->tableExists('countries')) return ''; |
|
1785 | + if (!$Connection->tableExists('countries')) { |
|
1786 | + return ''; |
|
1787 | + } |
|
1685 | 1788 | |
1686 | 1789 | try { |
1687 | 1790 | $query = "SELECT name,iso2,iso3 FROM countries WHERE iso2 = :iso2 LIMIT 1"; |
@@ -1693,9 +1796,13 @@ discard block |
||
1693 | 1796 | $sth->closeCursor(); |
1694 | 1797 | if (count($row) > 0) { |
1695 | 1798 | return $row; |
1696 | - } else return ''; |
|
1799 | + } else { |
|
1800 | + return ''; |
|
1801 | + } |
|
1697 | 1802 | } catch (PDOException $e) { |
1698 | - if (isset($globalDebug) && $globalDebug) echo 'Error : '.$e->getMessage()."\n"; |
|
1803 | + if (isset($globalDebug) && $globalDebug) { |
|
1804 | + echo 'Error : '.$e->getMessage()."\n"; |
|
1805 | + } |
|
1699 | 1806 | return ''; |
1700 | 1807 | } |
1701 | 1808 | |
@@ -1713,7 +1820,9 @@ discard block |
||
1713 | 1820 | { |
1714 | 1821 | global $globalBitlyAccessToken; |
1715 | 1822 | |
1716 | - if ($globalBitlyAccessToken == '') return $url; |
|
1823 | + if ($globalBitlyAccessToken == '') { |
|
1824 | + return $url; |
|
1825 | + } |
|
1717 | 1826 | |
1718 | 1827 | $google_url = 'https://api-ssl.bitly.com/v3/shorten?access_token='.$globalBitlyAccessToken.'&longUrl='.$url; |
1719 | 1828 | |
@@ -1789,7 +1898,9 @@ discard block |
||
1789 | 1898 | } |
1790 | 1899 | } |
1791 | 1900 | $query .= " GROUP BY marine_output.type ORDER BY marine_type_count DESC"; |
1792 | - if ($limit) $query .= " LIMIT 10 OFFSET 0"; |
|
1901 | + if ($limit) { |
|
1902 | + $query .= " LIMIT 10 OFFSET 0"; |
|
1903 | + } |
|
1793 | 1904 | $sth = $this->db->prepare($query); |
1794 | 1905 | $sth->execute($query_values); |
1795 | 1906 | $marine_array = array(); |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | /** |
15 | 15 | * Get SQL query part for filter used |
16 | 16 | * @param Array $filter the filter |
17 | - * @return Array the SQL part |
|
17 | + * @return string the SQL part |
|
18 | 18 | */ |
19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
@@ -794,10 +794,6 @@ discard block |
||
794 | 794 | * |
795 | 795 | * @param String $fammarine_id the ID from flightaware |
796 | 796 | * @param String $ident the flight ident |
797 | - * @param String $aircraft_icao the aircraft type |
|
798 | - * @param String $departure_airport_icao the departure airport |
|
799 | - * @param String $arrival_airport_icao the arrival airport |
|
800 | - * @return String success or false |
|
801 | 797 | * |
802 | 798 | */ |
803 | 799 | public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') |
@@ -13,10 +13,10 @@ discard block |
||
13 | 13 | |
14 | 14 | |
15 | 15 | /** |
16 | - * Get SQL query part for filter used |
|
17 | - * @param Array $filter the filter |
|
18 | - * @return Array the SQL part |
|
19 | - */ |
|
16 | + * Get SQL query part for filter used |
|
17 | + * @param Array $filter the filter |
|
18 | + * @return Array the SQL part |
|
19 | + */ |
|
20 | 20 | public function getFilter($filter = array(),$where = false,$and = false) { |
21 | 21 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
22 | 22 | $filters = array(); |
@@ -87,11 +87,11 @@ discard block |
||
87 | 87 | } |
88 | 88 | |
89 | 89 | /** |
90 | - * Gets all the spotter information based on the latest data entry |
|
91 | - * |
|
92 | - * @return Array the spotter information |
|
93 | - * |
|
94 | - */ |
|
90 | + * Gets all the spotter information based on the latest data entry |
|
91 | + * |
|
92 | + * @return Array the spotter information |
|
93 | + * |
|
94 | + */ |
|
95 | 95 | public function getLiveMarineData($limit = '', $sort = '', $filter = array()) |
96 | 96 | { |
97 | 97 | global $globalDBdriver, $globalLiveInterval; |
@@ -134,11 +134,11 @@ discard block |
||
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
137 | - * Gets Minimal Live Spotter data |
|
138 | - * |
|
139 | - * @return Array the spotter information |
|
140 | - * |
|
141 | - */ |
|
137 | + * Gets Minimal Live Spotter data |
|
138 | + * |
|
139 | + * @return Array the spotter information |
|
140 | + * |
|
141 | + */ |
|
142 | 142 | public function getMinLiveMarineData($filter = array()) |
143 | 143 | { |
144 | 144 | global $globalDBdriver, $globalLiveInterval; |
@@ -168,11 +168,11 @@ discard block |
||
168 | 168 | } |
169 | 169 | |
170 | 170 | /** |
171 | - * Gets Minimal Live Spotter data since xx seconds |
|
172 | - * |
|
173 | - * @return Array the spotter information |
|
174 | - * |
|
175 | - */ |
|
171 | + * Gets Minimal Live Spotter data since xx seconds |
|
172 | + * |
|
173 | + * @return Array the spotter information |
|
174 | + * |
|
175 | + */ |
|
176 | 176 | public function getMinLastLiveMarineData($coord = array(),$filter = array(), $limit = false) |
177 | 177 | { |
178 | 178 | global $globalDBdriver, $globalLiveInterval, $globalMap3DMarinesLimit, $globalArchive; |
@@ -243,11 +243,11 @@ discard block |
||
243 | 243 | } |
244 | 244 | |
245 | 245 | /** |
246 | - * Gets number of latest data entry |
|
247 | - * |
|
248 | - * @return String number of entry |
|
249 | - * |
|
250 | - */ |
|
246 | + * Gets number of latest data entry |
|
247 | + * |
|
248 | + * @return String number of entry |
|
249 | + * |
|
250 | + */ |
|
251 | 251 | public function getLiveMarineCount($filter = array()) |
252 | 252 | { |
253 | 253 | global $globalDBdriver, $globalLiveInterval; |
@@ -272,11 +272,11 @@ discard block |
||
272 | 272 | } |
273 | 273 | |
274 | 274 | /** |
275 | - * Gets all the spotter information based on the latest data entry and coord |
|
276 | - * |
|
277 | - * @return Array the spotter information |
|
278 | - * |
|
279 | - */ |
|
275 | + * Gets all the spotter information based on the latest data entry and coord |
|
276 | + * |
|
277 | + * @return Array the spotter information |
|
278 | + * |
|
279 | + */ |
|
280 | 280 | public function getLiveMarineDatabyCoord($coord, $filter = array()) |
281 | 281 | { |
282 | 282 | global $globalDBdriver, $globalLiveInterval; |
@@ -300,11 +300,11 @@ discard block |
||
300 | 300 | } |
301 | 301 | |
302 | 302 | /** |
303 | - * Gets all the spotter information based on the latest data entry and coord |
|
304 | - * |
|
305 | - * @return Array the spotter information |
|
306 | - * |
|
307 | - */ |
|
303 | + * Gets all the spotter information based on the latest data entry and coord |
|
304 | + * |
|
305 | + * @return Array the spotter information |
|
306 | + * |
|
307 | + */ |
|
308 | 308 | public function getMinLiveMarineDatabyCoord($coord, $filter = array()) |
309 | 309 | { |
310 | 310 | global $globalDBdriver, $globalLiveInterval; |
@@ -332,11 +332,11 @@ discard block |
||
332 | 332 | } |
333 | 333 | |
334 | 334 | /** |
335 | - * Gets all the spotter information based on a user's latitude and longitude |
|
336 | - * |
|
337 | - * @return Array the spotter information |
|
338 | - * |
|
339 | - */ |
|
335 | + * Gets all the spotter information based on a user's latitude and longitude |
|
336 | + * |
|
337 | + * @return Array the spotter information |
|
338 | + * |
|
339 | + */ |
|
340 | 340 | public function getLatestMarineForLayar($lat, $lng, $radius, $interval) |
341 | 341 | { |
342 | 342 | $Marine = new Marine($this->db); |
@@ -349,134 +349,134 @@ discard block |
||
349 | 349 | if ($lng != '') |
350 | 350 | { |
351 | 351 | if (!is_numeric($lng)) |
352 | - { |
|
353 | - return false; |
|
354 | - } |
|
355 | - } |
|
356 | - |
|
357 | - if ($radius != '') |
|
358 | - { |
|
359 | - if (!is_numeric($radius)) |
|
360 | - { |
|
361 | - return false; |
|
362 | - } |
|
363 | - } |
|
352 | + { |
|
353 | + return false; |
|
354 | + } |
|
355 | + } |
|
356 | + |
|
357 | + if ($radius != '') |
|
358 | + { |
|
359 | + if (!is_numeric($radius)) |
|
360 | + { |
|
361 | + return false; |
|
362 | + } |
|
363 | + } |
|
364 | 364 | $additional_query = ''; |
365 | 365 | if ($interval != '') |
366 | - { |
|
367 | - if (!is_string($interval)) |
|
368 | - { |
|
369 | - //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
|
370 | - return false; |
|
371 | - } else { |
|
372 | - if ($interval == '1m') |
|
373 | - { |
|
374 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
|
375 | - } else if ($interval == '15m'){ |
|
376 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date '; |
|
377 | - } |
|
378 | - } |
|
379 | - } else { |
|
380 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
|
381 | - } |
|
382 | - |
|
383 | - $query = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live |
|
366 | + { |
|
367 | + if (!is_string($interval)) |
|
368 | + { |
|
369 | + //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
|
370 | + return false; |
|
371 | + } else { |
|
372 | + if ($interval == '1m') |
|
373 | + { |
|
374 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
|
375 | + } else if ($interval == '15m'){ |
|
376 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date '; |
|
377 | + } |
|
378 | + } |
|
379 | + } else { |
|
380 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
|
381 | + } |
|
382 | + |
|
383 | + $query = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live |
|
384 | 384 | WHERE marine_live.latitude <> '' |
385 | 385 | AND marine_live.longitude <> '' |
386 | 386 | ".$additional_query." |
387 | 387 | HAVING distance < :radius |
388 | 388 | ORDER BY distance"; |
389 | 389 | |
390 | - $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
390 | + $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
391 | 391 | |
392 | - return $spotter_array; |
|
393 | - } |
|
392 | + return $spotter_array; |
|
393 | + } |
|
394 | 394 | |
395 | 395 | |
396 | - /** |
|
397 | - * Gets all the spotter information based on a particular callsign |
|
398 | - * |
|
399 | - * @return Array the spotter information |
|
400 | - * |
|
401 | - */ |
|
396 | + /** |
|
397 | + * Gets all the spotter information based on a particular callsign |
|
398 | + * |
|
399 | + * @return Array the spotter information |
|
400 | + * |
|
401 | + */ |
|
402 | 402 | public function getLastLiveMarineDataByIdent($ident) |
403 | 403 | { |
404 | 404 | $Marine = new Marine($this->db); |
405 | 405 | date_default_timezone_set('UTC'); |
406 | 406 | |
407 | 407 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
408 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
408 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
409 | 409 | |
410 | 410 | $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident),'',true); |
411 | 411 | |
412 | 412 | return $spotter_array; |
413 | 413 | } |
414 | 414 | |
415 | - /** |
|
416 | - * Gets all the spotter information based on a particular callsign |
|
417 | - * |
|
418 | - * @return Array the spotter information |
|
419 | - * |
|
420 | - */ |
|
415 | + /** |
|
416 | + * Gets all the spotter information based on a particular callsign |
|
417 | + * |
|
418 | + * @return Array the spotter information |
|
419 | + * |
|
420 | + */ |
|
421 | 421 | public function getDateLiveMarineDataByIdent($ident,$date) |
422 | 422 | { |
423 | 423 | $Marine = new Marine($this->db); |
424 | 424 | date_default_timezone_set('UTC'); |
425 | 425 | |
426 | 426 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
427 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
427 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
428 | 428 | |
429 | - $date = date('c',$date); |
|
429 | + $date = date('c',$date); |
|
430 | 430 | $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
431 | 431 | |
432 | 432 | return $spotter_array; |
433 | 433 | } |
434 | 434 | |
435 | - /** |
|
436 | - * Gets last spotter information based on a particular callsign |
|
437 | - * |
|
438 | - * @return Array the spotter information |
|
439 | - * |
|
440 | - */ |
|
435 | + /** |
|
436 | + * Gets last spotter information based on a particular callsign |
|
437 | + * |
|
438 | + * @return Array the spotter information |
|
439 | + * |
|
440 | + */ |
|
441 | 441 | public function getLastLiveMarineDataById($id) |
442 | 442 | { |
443 | 443 | $Marine = new Marine($this->db); |
444 | 444 | date_default_timezone_set('UTC'); |
445 | 445 | |
446 | 446 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
447 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
447 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
448 | 448 | |
449 | 449 | $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id),'',true); |
450 | 450 | |
451 | 451 | return $spotter_array; |
452 | 452 | } |
453 | 453 | |
454 | - /** |
|
455 | - * Gets last spotter information based on a particular callsign |
|
456 | - * |
|
457 | - * @return Array the spotter information |
|
458 | - * |
|
459 | - */ |
|
454 | + /** |
|
455 | + * Gets last spotter information based on a particular callsign |
|
456 | + * |
|
457 | + * @return Array the spotter information |
|
458 | + * |
|
459 | + */ |
|
460 | 460 | public function getDateLiveMarineDataById($id,$date) |
461 | 461 | { |
462 | 462 | $Marine = new Marine($this->db); |
463 | 463 | date_default_timezone_set('UTC'); |
464 | 464 | |
465 | 465 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
466 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
467 | - $date = date('c',$date); |
|
466 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
467 | + $date = date('c',$date); |
|
468 | 468 | $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
469 | 469 | |
470 | 470 | return $spotter_array; |
471 | 471 | } |
472 | 472 | |
473 | 473 | |
474 | - /** |
|
475 | - * Gets all the spotter information based on a particular id |
|
476 | - * |
|
477 | - * @return Array the spotter information |
|
478 | - * |
|
479 | - */ |
|
474 | + /** |
|
475 | + * Gets all the spotter information based on a particular id |
|
476 | + * |
|
477 | + * @return Array the spotter information |
|
478 | + * |
|
479 | + */ |
|
480 | 480 | public function getAllLiveMarineDataById($id,$liveinterval = false) |
481 | 481 | { |
482 | 482 | global $globalDBdriver, $globalLiveInterval; |
@@ -504,18 +504,18 @@ discard block |
||
504 | 504 | return $spotter_array; |
505 | 505 | } |
506 | 506 | |
507 | - /** |
|
508 | - * Gets all the spotter information based on a particular ident |
|
509 | - * |
|
510 | - * @return Array the spotter information |
|
511 | - * |
|
512 | - */ |
|
507 | + /** |
|
508 | + * Gets all the spotter information based on a particular ident |
|
509 | + * |
|
510 | + * @return Array the spotter information |
|
511 | + * |
|
512 | + */ |
|
513 | 513 | public function getAllLiveMarineDataByIdent($ident) |
514 | 514 | { |
515 | 515 | date_default_timezone_set('UTC'); |
516 | 516 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
517 | 517 | $query = self::$global_query.' WHERE marine_live.ident = :ident'; |
518 | - try { |
|
518 | + try { |
|
519 | 519 | |
520 | 520 | $sth = $this->db->prepare($query); |
521 | 521 | $sth->execute(array(':ident' => $ident)); |
@@ -529,23 +529,23 @@ discard block |
||
529 | 529 | |
530 | 530 | |
531 | 531 | /** |
532 | - * Deletes all info in the table |
|
533 | - * |
|
534 | - * @return String success or false |
|
535 | - * |
|
536 | - */ |
|
532 | + * Deletes all info in the table |
|
533 | + * |
|
534 | + * @return String success or false |
|
535 | + * |
|
536 | + */ |
|
537 | 537 | public function deleteLiveMarineData() |
538 | 538 | { |
539 | 539 | global $globalDBdriver; |
540 | 540 | if ($globalDBdriver == 'mysql') { |
541 | 541 | //$query = "DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= marine_live.date"; |
542 | 542 | $query = 'DELETE FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= marine_live.date'; |
543 | - //$query = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)"; |
|
543 | + //$query = "DELETE FROM marine_live WHERE marine_live.id IN (SELECT marine_live.id FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= marine_live.date)"; |
|
544 | 544 | } else { |
545 | 545 | $query = "DELETE FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date"; |
546 | 546 | } |
547 | 547 | |
548 | - try { |
|
548 | + try { |
|
549 | 549 | |
550 | 550 | $sth = $this->db->prepare($query); |
551 | 551 | $sth->execute(); |
@@ -557,18 +557,18 @@ discard block |
||
557 | 557 | } |
558 | 558 | |
559 | 559 | /** |
560 | - * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
561 | - * |
|
562 | - * @return String success or false |
|
563 | - * |
|
564 | - */ |
|
560 | + * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
561 | + * |
|
562 | + * @return String success or false |
|
563 | + * |
|
564 | + */ |
|
565 | 565 | public function deleteLiveMarineDataNotUpdated() |
566 | 566 | { |
567 | 567 | global $globalDBdriver, $globalDebug; |
568 | 568 | if ($globalDBdriver == 'mysql') { |
569 | 569 | //$query = 'SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < marine_live.date) LIMIT 800 OFFSET 0'; |
570 | - $query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0"; |
|
571 | - try { |
|
570 | + $query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 1200 OFFSET 0"; |
|
571 | + try { |
|
572 | 572 | |
573 | 573 | $sth = $this->db->prepare($query); |
574 | 574 | $sth->execute(); |
@@ -576,8 +576,8 @@ discard block |
||
576 | 576 | return "error"; |
577 | 577 | } |
578 | 578 | $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
579 | - $i = 0; |
|
580 | - $j =0; |
|
579 | + $i = 0; |
|
580 | + $j =0; |
|
581 | 581 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
582 | 582 | foreach($all as $row) |
583 | 583 | { |
@@ -585,20 +585,20 @@ discard block |
||
585 | 585 | $j++; |
586 | 586 | if ($j == 30) { |
587 | 587 | if ($globalDebug) echo "."; |
588 | - try { |
|
588 | + try { |
|
589 | 589 | |
590 | 590 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
591 | 591 | $sth->execute(); |
592 | 592 | } catch(PDOException $e) { |
593 | 593 | return "error"; |
594 | 594 | } |
595 | - $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
|
596 | - $j = 0; |
|
595 | + $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
|
596 | + $j = 0; |
|
597 | 597 | } |
598 | 598 | $query_delete .= "'".$row['fammarine_id']."',"; |
599 | 599 | } |
600 | 600 | if ($i > 0) { |
601 | - try { |
|
601 | + try { |
|
602 | 602 | |
603 | 603 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
604 | 604 | $sth->execute(); |
@@ -609,9 +609,9 @@ discard block |
||
609 | 609 | return "success"; |
610 | 610 | } elseif ($globalDBdriver == 'pgsql') { |
611 | 611 | //$query = "SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= marine_live.date AND marine_live.fammarine_id NOT IN (SELECT fammarine_id FROM marine_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < marine_live.date) LIMIT 800 OFFSET 0"; |
612 | - //$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
613 | - $query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)"; |
|
614 | - try { |
|
612 | + //$query = "SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
613 | + $query = "DELETE FROM marine_live WHERE fammarine_id IN (SELECT marine_live.fammarine_id FROM marine_live INNER JOIN (SELECT fammarine_id,MAX(date) as max_date FROM marine_live GROUP BY fammarine_id) s ON s.fammarine_id = marine_live.fammarine_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0)"; |
|
614 | + try { |
|
615 | 615 | |
616 | 616 | $sth = $this->db->prepare($query); |
617 | 617 | $sth->execute(); |
@@ -655,17 +655,17 @@ discard block |
||
655 | 655 | } |
656 | 656 | |
657 | 657 | /** |
658 | - * Deletes all info in the table for an ident |
|
659 | - * |
|
660 | - * @return String success or false |
|
661 | - * |
|
662 | - */ |
|
658 | + * Deletes all info in the table for an ident |
|
659 | + * |
|
660 | + * @return String success or false |
|
661 | + * |
|
662 | + */ |
|
663 | 663 | public function deleteLiveMarineDataByIdent($ident) |
664 | 664 | { |
665 | 665 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
666 | 666 | $query = 'DELETE FROM marine_live WHERE ident = :ident'; |
667 | 667 | |
668 | - try { |
|
668 | + try { |
|
669 | 669 | |
670 | 670 | $sth = $this->db->prepare($query); |
671 | 671 | $sth->execute(array(':ident' => $ident)); |
@@ -677,17 +677,17 @@ discard block |
||
677 | 677 | } |
678 | 678 | |
679 | 679 | /** |
680 | - * Deletes all info in the table for an id |
|
681 | - * |
|
682 | - * @return String success or false |
|
683 | - * |
|
684 | - */ |
|
680 | + * Deletes all info in the table for an id |
|
681 | + * |
|
682 | + * @return String success or false |
|
683 | + * |
|
684 | + */ |
|
685 | 685 | public function deleteLiveMarineDataById($id) |
686 | 686 | { |
687 | 687 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
688 | 688 | $query = 'DELETE FROM marine_live WHERE fammarine_id = :id'; |
689 | 689 | |
690 | - try { |
|
690 | + try { |
|
691 | 691 | |
692 | 692 | $sth = $this->db->prepare($query); |
693 | 693 | $sth->execute(array(':id' => $id)); |
@@ -700,11 +700,11 @@ discard block |
||
700 | 700 | |
701 | 701 | |
702 | 702 | /** |
703 | - * Gets the aircraft ident within the last hour |
|
704 | - * |
|
705 | - * @return String the ident |
|
706 | - * |
|
707 | - */ |
|
703 | + * Gets the aircraft ident within the last hour |
|
704 | + * |
|
705 | + * @return String the ident |
|
706 | + * |
|
707 | + */ |
|
708 | 708 | public function getIdentFromLastHour($ident) |
709 | 709 | { |
710 | 710 | global $globalDBdriver, $globalTimezone; |
@@ -730,14 +730,14 @@ discard block |
||
730 | 730 | $ident_result = $row['ident']; |
731 | 731 | } |
732 | 732 | return $ident_result; |
733 | - } |
|
733 | + } |
|
734 | 734 | |
735 | 735 | /** |
736 | - * Check recent aircraft |
|
737 | - * |
|
738 | - * @return String the ident |
|
739 | - * |
|
740 | - */ |
|
736 | + * Check recent aircraft |
|
737 | + * |
|
738 | + * @return String the ident |
|
739 | + * |
|
740 | + */ |
|
741 | 741 | public function checkIdentRecent($ident) |
742 | 742 | { |
743 | 743 | global $globalDBdriver, $globalTimezone; |
@@ -763,14 +763,14 @@ discard block |
||
763 | 763 | $ident_result = $row['fammarine_id']; |
764 | 764 | } |
765 | 765 | return $ident_result; |
766 | - } |
|
766 | + } |
|
767 | 767 | |
768 | 768 | /** |
769 | - * Check recent aircraft by id |
|
770 | - * |
|
771 | - * @return String the ident |
|
772 | - * |
|
773 | - */ |
|
769 | + * Check recent aircraft by id |
|
770 | + * |
|
771 | + * @return String the ident |
|
772 | + * |
|
773 | + */ |
|
774 | 774 | public function checkIdRecent($id) |
775 | 775 | { |
776 | 776 | global $globalDBdriver, $globalTimezone; |
@@ -796,14 +796,14 @@ discard block |
||
796 | 796 | $ident_result = $row['fammarine_id']; |
797 | 797 | } |
798 | 798 | return $ident_result; |
799 | - } |
|
799 | + } |
|
800 | 800 | |
801 | 801 | /** |
802 | - * Check recent aircraft by mmsi |
|
803 | - * |
|
804 | - * @return String the ident |
|
805 | - * |
|
806 | - */ |
|
802 | + * Check recent aircraft by mmsi |
|
803 | + * |
|
804 | + * @return String the ident |
|
805 | + * |
|
806 | + */ |
|
807 | 807 | public function checkMMSIRecent($mmsi) |
808 | 808 | { |
809 | 809 | global $globalDBdriver, $globalTimezone; |
@@ -829,19 +829,19 @@ discard block |
||
829 | 829 | $ident_result = $row['fammarine_id']; |
830 | 830 | } |
831 | 831 | return $ident_result; |
832 | - } |
|
832 | + } |
|
833 | 833 | |
834 | 834 | /** |
835 | - * Adds a new spotter data |
|
836 | - * |
|
837 | - * @param String $fammarine_id the ID from flightaware |
|
838 | - * @param String $ident the flight ident |
|
839 | - * @param String $aircraft_icao the aircraft type |
|
840 | - * @param String $departure_airport_icao the departure airport |
|
841 | - * @param String $arrival_airport_icao the arrival airport |
|
842 | - * @return String success or false |
|
843 | - * |
|
844 | - */ |
|
835 | + * Adds a new spotter data |
|
836 | + * |
|
837 | + * @param String $fammarine_id the ID from flightaware |
|
838 | + * @param String $ident the flight ident |
|
839 | + * @param String $aircraft_icao the aircraft type |
|
840 | + * @param String $departure_airport_icao the departure airport |
|
841 | + * @param String $arrival_airport_icao the arrival airport |
|
842 | + * @return String success or false |
|
843 | + * |
|
844 | + */ |
|
845 | 845 | public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') |
846 | 846 | { |
847 | 847 | global $globalURL, $globalArchive, $globalDebug; |
@@ -912,10 +912,10 @@ discard block |
||
912 | 912 | $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
913 | 913 | |
914 | 914 | |
915 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
916 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
917 | - if ($arrival_date == '') $arrival_date = NULL; |
|
918 | - $query = ''; |
|
915 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
916 | + if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
917 | + if ($arrival_date == '') $arrival_date = NULL; |
|
918 | + $query = ''; |
|
919 | 919 | if ($globalArchive) { |
920 | 920 | if ($globalDebug) echo '-- Delete previous data -- '; |
921 | 921 | $query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;'; |
@@ -8,7 +8,9 @@ discard block |
||
8 | 8 | public function __construct($dbc = null) { |
9 | 9 | $Connection = new Connection($dbc); |
10 | 10 | $this->db = $Connection->db(); |
11 | - if ($this->db === null) die('Error: No DB connection.'); |
|
11 | + if ($this->db === null) { |
|
12 | + die('Error: No DB connection.'); |
|
13 | + } |
|
12 | 14 | } |
13 | 15 | |
14 | 16 | |
@@ -30,7 +32,9 @@ discard block |
||
30 | 32 | if (isset($filter[0]['source'])) { |
31 | 33 | $filters = array_merge($filters,$filter); |
32 | 34 | } |
33 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
35 | + if (is_array($globalFilter)) { |
|
36 | + $filter = array_merge($filter,$globalFilter); |
|
37 | + } |
|
34 | 38 | $filter_query_join = ''; |
35 | 39 | $filter_query_where = ''; |
36 | 40 | foreach($filters as $flt) { |
@@ -77,8 +81,11 @@ discard block |
||
77 | 81 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
78 | 82 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
79 | 83 | } |
80 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
81 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
84 | + if ($filter_query_where == '' && $where) { |
|
85 | + $filter_query_where = ' WHERE'; |
|
86 | + } elseif ($filter_query_where != '' && $and) { |
|
87 | + $filter_query_where .= ' AND'; |
|
88 | + } |
|
82 | 89 | if ($filter_query_where != '') { |
83 | 90 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
84 | 91 | } |
@@ -119,9 +126,13 @@ discard block |
||
119 | 126 | $orderby_query = ' '.$search_orderby_array[$sort]['sql']; |
120 | 127 | } |
121 | 128 | } |
122 | - if ($orderby_query == '') $orderby_query= ' ORDER BY date DESC'; |
|
129 | + if ($orderby_query == '') { |
|
130 | + $orderby_query= ' ORDER BY date DESC'; |
|
131 | + } |
|
123 | 132 | |
124 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
133 | + if (!isset($globalLiveInterval)) { |
|
134 | + $globalLiveInterval = '200'; |
|
135 | + } |
|
125 | 136 | if ($globalDBdriver == 'mysql') { |
126 | 137 | //$query = "SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate"; |
127 | 138 | $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate'.$filter_query.$orderby_query; |
@@ -146,7 +157,9 @@ discard block |
||
146 | 157 | |
147 | 158 | $filter_query = $this->getFilter($filter,true,true); |
148 | 159 | |
149 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
160 | + if (!isset($globalLiveInterval)) { |
|
161 | + $globalLiveInterval = '200'; |
|
162 | + } |
|
150 | 163 | if ($globalDBdriver == 'mysql') { |
151 | 164 | $query = 'SELECT marine_live.mmsi, marine_live.ident, marine_live.type,marine_live.fammarine_id, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
152 | 165 | FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate'.$filter_query." marine_live.latitude <> 0 AND marine_live.longitude <> 0"; |
@@ -187,48 +200,72 @@ discard block |
||
187 | 200 | } |
188 | 201 | $filter_query = $this->getFilter($filter,true,true); |
189 | 202 | |
190 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
191 | - if (!isset($globalMap3DMarinesLimit) || $globalMap3DMarinesLimit == '') $globalMap3DMarinesLimit = '300'; |
|
203 | + if (!isset($globalLiveInterval)) { |
|
204 | + $globalLiveInterval = '200'; |
|
205 | + } |
|
206 | + if (!isset($globalMap3DMarinesLimit) || $globalMap3DMarinesLimit == '') { |
|
207 | + $globalMap3DMarinesLimit = '300'; |
|
208 | + } |
|
192 | 209 | if ($globalDBdriver == 'mysql') { |
193 | 210 | if (isset($globalArchive) && $globalArchive === TRUE) { |
194 | 211 | $query = 'SELECT * FROM (SELECT marine_archive.ident, marine_archive.fammarine_id,marine_archive.type, marine_archive.latitude, marine_archive.longitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.date, marine_archive.format_source |
195 | 212 | FROM marine_archive INNER JOIN (SELECT fammarine_id FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date) l ON l.flightaware_id = marine_archive.flightaware_id "; |
196 | - if ($usecoord) $query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
213 | + if ($usecoord) { |
|
214 | + $query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
215 | + } |
|
197 | 216 | $query .= "UNION |
198 | 217 | SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
199 | 218 | FROM marine_live".$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date"; |
200 | - if ($usecoord) $query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong; |
|
219 | + if ($usecoord) { |
|
220 | + $query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong; |
|
221 | + } |
|
201 | 222 | $query .= ") AS marine |
202 | 223 | WHERE latitude <> '0' AND longitude <> '0' |
203 | 224 | ORDER BY fammarine_id, date"; |
204 | - if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit; |
|
225 | + if ($limit) { |
|
226 | + $query .= " LIMIT ".$globalMap3DMarinesLimit; |
|
227 | + } |
|
205 | 228 | } else { |
206 | 229 | $query = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
207 | 230 | FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date "; |
208 | - if ($usecoord) $query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
231 | + if ($usecoord) { |
|
232 | + $query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
233 | + } |
|
209 | 234 | $query .= "AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' |
210 | 235 | ORDER BY marine_live.fammarine_id, marine_live.date"; |
211 | - if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit; |
|
236 | + if ($limit) { |
|
237 | + $query .= " LIMIT ".$globalMap3DMarinesLimit; |
|
238 | + } |
|
212 | 239 | } |
213 | 240 | } else { |
214 | 241 | if (isset($globalArchive) && $globalArchive === TRUE) { |
215 | 242 | $query = "SELECT * FROM (SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.type,marine_archive.latitude, marine_archive.longitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.date, marine_archive.format_source |
216 | 243 | FROM marine_archive INNER JOIN (SELECT flightaware_id FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date) l ON l.flightaware_id = marine_archive.flightaware_id "; |
217 | - if ($usecoord) $query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
244 | + if ($usecoord) { |
|
245 | + $query .= "AND marine_archive.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_archive.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
246 | + } |
|
218 | 247 | $query .= "UNION |
219 | 248 | SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
220 | 249 | FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date"; |
221 | - if ($usecoord) $query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong; |
|
250 | + if ($usecoord) { |
|
251 | + $query .= " AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong; |
|
252 | + } |
|
222 | 253 | $query .= ") AS marine WHERE latitude <> '0' AND longitude <> '0' "; |
223 | 254 | $query .= "ORDER BY fammarine_id, date"; |
224 | - if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit; |
|
255 | + if ($limit) { |
|
256 | + $query .= " LIMIT ".$globalMap3DMarinesLimit; |
|
257 | + } |
|
225 | 258 | } else { |
226 | 259 | $query = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
227 | 260 | FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date "; |
228 | - if ($usecoord) $query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
261 | + if ($usecoord) { |
|
262 | + $query .= "AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." "; |
|
263 | + } |
|
229 | 264 | $query .= "AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' |
230 | 265 | ORDER BY marine_live.fammarine_id, marine_live.date"; |
231 | - if ($limit) $query .= " LIMIT ".$globalMap3DMarinesLimit; |
|
266 | + if ($limit) { |
|
267 | + $query .= " LIMIT ".$globalMap3DMarinesLimit; |
|
268 | + } |
|
232 | 269 | } |
233 | 270 | } |
234 | 271 | try { |
@@ -253,7 +290,9 @@ discard block |
||
253 | 290 | global $globalDBdriver, $globalLiveInterval; |
254 | 291 | $filter_query = $this->getFilter($filter,true,true); |
255 | 292 | |
256 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
293 | + if (!isset($globalLiveInterval)) { |
|
294 | + $globalLiveInterval = '200'; |
|
295 | + } |
|
257 | 296 | if ($globalDBdriver == 'mysql') { |
258 | 297 | $query = 'SELECT COUNT(DISTINCT marine_live.fammarine_id) as nb FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
259 | 298 | } else { |
@@ -281,7 +320,9 @@ discard block |
||
281 | 320 | { |
282 | 321 | global $globalDBdriver, $globalLiveInterval; |
283 | 322 | $Spotter = new Spotter($this->db); |
284 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
323 | + if (!isset($globalLiveInterval)) { |
|
324 | + $globalLiveInterval = '200'; |
|
325 | + } |
|
285 | 326 | $filter_query = $this->getFilter($filter); |
286 | 327 | |
287 | 328 | if (is_array($coord)) { |
@@ -289,7 +330,9 @@ discard block |
||
289 | 330 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
290 | 331 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
291 | 332 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
292 | - } else return array(); |
|
333 | + } else { |
|
334 | + return array(); |
|
335 | + } |
|
293 | 336 | if ($globalDBdriver == 'mysql') { |
294 | 337 | $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND marine_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY marine_live.fammarine_id'.$filter_query; |
295 | 338 | } else { |
@@ -309,7 +352,9 @@ discard block |
||
309 | 352 | { |
310 | 353 | global $globalDBdriver, $globalLiveInterval; |
311 | 354 | $Spotter = new Spotter($this->db); |
312 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
355 | + if (!isset($globalLiveInterval)) { |
|
356 | + $globalLiveInterval = '200'; |
|
357 | + } |
|
313 | 358 | $filter_query = $this->getFilter($filter); |
314 | 359 | |
315 | 360 | if (is_array($coord)) { |
@@ -317,7 +362,9 @@ discard block |
||
317 | 362 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
318 | 363 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
319 | 364 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
320 | - } else return array(); |
|
365 | + } else { |
|
366 | + return array(); |
|
367 | + } |
|
321 | 368 | if ($globalDBdriver == 'mysql') { |
322 | 369 | $query = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
323 | 370 | FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' AND marine_live.latitude BETWEEN ".$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong." |
@@ -485,11 +532,15 @@ discard block |
||
485 | 532 | //$query = self::$global_query.' WHERE marine_live.fammarine_id = :id ORDER BY date'; |
486 | 533 | if ($globalDBdriver == 'mysql') { |
487 | 534 | $query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id'; |
488 | - if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
535 | + if ($liveinterval) { |
|
536 | + $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
537 | + } |
|
489 | 538 | $query .= ' ORDER BY date'; |
490 | 539 | } else { |
491 | 540 | $query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id'; |
492 | - if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
541 | + if ($liveinterval) { |
|
542 | + $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
543 | + } |
|
493 | 544 | $query .= ' ORDER BY date'; |
494 | 545 | } |
495 | 546 | |
@@ -584,7 +635,9 @@ discard block |
||
584 | 635 | $i++; |
585 | 636 | $j++; |
586 | 637 | if ($j == 30) { |
587 | - if ($globalDebug) echo "."; |
|
638 | + if ($globalDebug) { |
|
639 | + echo "."; |
|
640 | + } |
|
588 | 641 | try { |
589 | 642 | |
590 | 643 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
@@ -864,7 +917,9 @@ discard block |
||
864 | 917 | { |
865 | 918 | return false; |
866 | 919 | } |
867 | - } else return ''; |
|
920 | + } else { |
|
921 | + return ''; |
|
922 | + } |
|
868 | 923 | |
869 | 924 | if ($longitude != '') |
870 | 925 | { |
@@ -872,7 +927,9 @@ discard block |
||
872 | 927 | { |
873 | 928 | return false; |
874 | 929 | } |
875 | - } else return ''; |
|
930 | + } else { |
|
931 | + return ''; |
|
932 | + } |
|
876 | 933 | |
877 | 934 | |
878 | 935 | if ($heading != '') |
@@ -881,7 +938,9 @@ discard block |
||
881 | 938 | { |
882 | 939 | return false; |
883 | 940 | } |
884 | - } else $heading = 0; |
|
941 | + } else { |
|
942 | + $heading = 0; |
|
943 | + } |
|
885 | 944 | |
886 | 945 | if ($groundspeed != '') |
887 | 946 | { |
@@ -889,9 +948,13 @@ discard block |
||
889 | 948 | { |
890 | 949 | return false; |
891 | 950 | } |
892 | - } else $groundspeed = 0; |
|
951 | + } else { |
|
952 | + $groundspeed = 0; |
|
953 | + } |
|
893 | 954 | date_default_timezone_set('UTC'); |
894 | - if ($date == '') $date = date("Y-m-d H:i:s", time()); |
|
955 | + if ($date == '') { |
|
956 | + $date = date("Y-m-d H:i:s", time()); |
|
957 | + } |
|
895 | 958 | |
896 | 959 | |
897 | 960 | $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
@@ -912,12 +975,20 @@ discard block |
||
912 | 975 | $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
913 | 976 | |
914 | 977 | |
915 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
916 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
917 | - if ($arrival_date == '') $arrival_date = NULL; |
|
978 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) { |
|
979 | + $groundspeed = 0; |
|
980 | + } |
|
981 | + if ($heading == '' || $Common->isInteger($heading) === false ) { |
|
982 | + $heading = 0; |
|
983 | + } |
|
984 | + if ($arrival_date == '') { |
|
985 | + $arrival_date = NULL; |
|
986 | + } |
|
918 | 987 | $query = ''; |
919 | 988 | if ($globalArchive) { |
920 | - if ($globalDebug) echo '-- Delete previous data -- '; |
|
989 | + if ($globalDebug) { |
|
990 | + echo '-- Delete previous data -- '; |
|
991 | + } |
|
921 | 992 | $query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;'; |
922 | 993 | } |
923 | 994 | $query .= 'INSERT INTO marine_live (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) |
@@ -932,10 +1003,14 @@ discard block |
||
932 | 1003 | } |
933 | 1004 | |
934 | 1005 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
935 | - if ($globalDebug) echo '(Add to Marine archive : '; |
|
1006 | + if ($globalDebug) { |
|
1007 | + echo '(Add to Marine archive : '; |
|
1008 | + } |
|
936 | 1009 | $MarineArchive = new MarineArchive($this->db); |
937 | 1010 | $result = $MarineArchive->addMarineArchiveData($fammarine_id, $ident, $latitude, $longitude, $heading, $groundspeed, $date, $putinarchive, $mmsi,$type,$typeid,$imo, $callsign,$arrival_code,$arrival_date,$status,$noarchive,$format_source, $source_name, $over_country); |
938 | - if ($globalDebug) echo $result.')'; |
|
1011 | + if ($globalDebug) { |
|
1012 | + echo $result.')'; |
|
1013 | + } |
|
939 | 1014 | } |
940 | 1015 | return "success"; |
941 | 1016 | } |
@@ -17,33 +17,33 @@ discard block |
||
17 | 17 | * @param Array $filter the filter |
18 | 18 | * @return Array the SQL part |
19 | 19 | */ |
20 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
20 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
21 | 21 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
22 | 22 | $filters = array(); |
23 | 23 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
24 | 24 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
25 | 25 | $filters = $globalStatsFilters[$globalFilterName]; |
26 | 26 | } else { |
27 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
27 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
28 | 28 | } |
29 | 29 | } |
30 | 30 | if (isset($filter[0]['source'])) { |
31 | - $filters = array_merge($filters,$filter); |
|
31 | + $filters = array_merge($filters, $filter); |
|
32 | 32 | } |
33 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
33 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
34 | 34 | $filter_query_join = ''; |
35 | 35 | $filter_query_where = ''; |
36 | - foreach($filters as $flt) { |
|
36 | + foreach ($filters as $flt) { |
|
37 | 37 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
38 | 38 | if (isset($flt['source'])) { |
39 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND marine_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id"; |
|
39 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND marine_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id"; |
|
40 | 40 | } else { |
41 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id"; |
|
41 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id"; |
|
42 | 42 | } |
43 | 43 | } |
44 | 44 | } |
45 | 45 | if (isset($filter['source']) && !empty($filter['source'])) { |
46 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
46 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
47 | 47 | } |
48 | 48 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
49 | 49 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -72,15 +72,15 @@ discard block |
||
72 | 72 | $filter_query_date .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'"; |
73 | 73 | } |
74 | 74 | } |
75 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.fammarine_id = marine_live.fammarine_id"; |
|
75 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.fammarine_id = marine_live.fammarine_id"; |
|
76 | 76 | } |
77 | 77 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
78 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
78 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
79 | 79 | } |
80 | 80 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
81 | 81 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
82 | 82 | if ($filter_query_where != '') { |
83 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
83 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
84 | 84 | } |
85 | 85 | $filter_query = $filter_query_join.$filter_query_where; |
86 | 86 | return $filter_query; |
@@ -103,8 +103,8 @@ discard block |
||
103 | 103 | if ($limit != '') |
104 | 104 | { |
105 | 105 | $limit_array = explode(',', $limit); |
106 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
107 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
106 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
107 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
108 | 108 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
109 | 109 | { |
110 | 110 | $limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0]; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | $orderby_query = ' '.$search_orderby_array[$sort]['sql']; |
120 | 120 | } |
121 | 121 | } |
122 | - if ($orderby_query == '') $orderby_query= ' ORDER BY date DESC'; |
|
122 | + if ($orderby_query == '') $orderby_query = ' ORDER BY date DESC'; |
|
123 | 123 | |
124 | 124 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
125 | 125 | if ($globalDBdriver == 'mysql') { |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | } else { |
129 | 129 | $query = "SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate".$filter_query.$orderby_query; |
130 | 130 | } |
131 | - $spotter_array = $Marine->getDataFromDB($query.$limit_query,array(),'',true); |
|
131 | + $spotter_array = $Marine->getDataFromDB($query.$limit_query, array(), '', true); |
|
132 | 132 | |
133 | 133 | return $spotter_array; |
134 | 134 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | global $globalDBdriver, $globalLiveInterval; |
145 | 145 | date_default_timezone_set('UTC'); |
146 | 146 | |
147 | - $filter_query = $this->getFilter($filter,true,true); |
|
147 | + $filter_query = $this->getFilter($filter, true, true); |
|
148 | 148 | |
149 | 149 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
150 | 150 | if ($globalDBdriver == 'mysql') { |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | try { |
159 | 159 | $sth = $this->db->prepare($query); |
160 | 160 | $sth->execute(); |
161 | - } catch(PDOException $e) { |
|
161 | + } catch (PDOException $e) { |
|
162 | 162 | echo $e->getMessage(); |
163 | 163 | die; |
164 | 164 | } |
@@ -173,19 +173,19 @@ discard block |
||
173 | 173 | * @return Array the spotter information |
174 | 174 | * |
175 | 175 | */ |
176 | - public function getMinLastLiveMarineData($coord = array(),$filter = array(), $limit = false) |
|
176 | + public function getMinLastLiveMarineData($coord = array(), $filter = array(), $limit = false) |
|
177 | 177 | { |
178 | 178 | global $globalDBdriver, $globalLiveInterval, $globalMap3DMarinesLimit, $globalArchive; |
179 | 179 | date_default_timezone_set('UTC'); |
180 | 180 | $usecoord = false; |
181 | 181 | if (is_array($coord) && !empty($coord)) { |
182 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
183 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
184 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
185 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
182 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
183 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
184 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
185 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
186 | 186 | $usecoord = true; |
187 | 187 | } |
188 | - $filter_query = $this->getFilter($filter,true,true); |
|
188 | + $filter_query = $this->getFilter($filter, true, true); |
|
189 | 189 | |
190 | 190 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
191 | 191 | if (!isset($globalMap3DMarinesLimit) || $globalMap3DMarinesLimit == '') $globalMap3DMarinesLimit = '300'; |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | try { |
235 | 235 | $sth = $this->db->prepare($query); |
236 | 236 | $sth->execute(); |
237 | - } catch(PDOException $e) { |
|
237 | + } catch (PDOException $e) { |
|
238 | 238 | echo $e->getMessage(); |
239 | 239 | die; |
240 | 240 | } |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | public function getLiveMarineCount($filter = array()) |
252 | 252 | { |
253 | 253 | global $globalDBdriver, $globalLiveInterval; |
254 | - $filter_query = $this->getFilter($filter,true,true); |
|
254 | + $filter_query = $this->getFilter($filter, true, true); |
|
255 | 255 | |
256 | 256 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
257 | 257 | if ($globalDBdriver == 'mysql') { |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | try { |
263 | 263 | $sth = $this->db->prepare($query); |
264 | 264 | $sth->execute(); |
265 | - } catch(PDOException $e) { |
|
265 | + } catch (PDOException $e) { |
|
266 | 266 | echo $e->getMessage(); |
267 | 267 | die; |
268 | 268 | } |
@@ -285,10 +285,10 @@ discard block |
||
285 | 285 | $filter_query = $this->getFilter($filter); |
286 | 286 | |
287 | 287 | if (is_array($coord)) { |
288 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
289 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
290 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
291 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
288 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
289 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
290 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
291 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
292 | 292 | } else return array(); |
293 | 293 | if ($globalDBdriver == 'mysql') { |
294 | 294 | $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND marine_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY marine_live.fammarine_id'.$filter_query; |
@@ -313,17 +313,17 @@ discard block |
||
313 | 313 | $filter_query = $this->getFilter($filter); |
314 | 314 | |
315 | 315 | if (is_array($coord)) { |
316 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
317 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
318 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
319 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
316 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
317 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
318 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
319 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
320 | 320 | } else return array(); |
321 | 321 | if ($globalDBdriver == 'mysql') { |
322 | 322 | $query = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
323 | 323 | FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' AND marine_live.latitude BETWEEN ".$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong." |
324 | 324 | ORDER BY marine_live.fammarine_id, marine_live.date"; |
325 | 325 | } else { |
326 | - $query = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
|
326 | + $query = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
|
327 | 327 | FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." |
328 | 328 | ORDER BY marine_live.fammarine_id, marine_live.date"; |
329 | 329 | } |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | if ($interval == '1m') |
373 | 373 | { |
374 | 374 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
375 | - } else if ($interval == '15m'){ |
|
375 | + } else if ($interval == '15m') { |
|
376 | 376 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date '; |
377 | 377 | } |
378 | 378 | } |
@@ -380,14 +380,14 @@ discard block |
||
380 | 380 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
381 | 381 | } |
382 | 382 | |
383 | - $query = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live |
|
383 | + $query = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live |
|
384 | 384 | WHERE marine_live.latitude <> '' |
385 | 385 | AND marine_live.longitude <> '' |
386 | 386 | ".$additional_query." |
387 | 387 | HAVING distance < :radius |
388 | 388 | ORDER BY distance"; |
389 | 389 | |
390 | - $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
390 | + $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius)); |
|
391 | 391 | |
392 | 392 | return $spotter_array; |
393 | 393 | } |
@@ -405,9 +405,9 @@ discard block |
||
405 | 405 | date_default_timezone_set('UTC'); |
406 | 406 | |
407 | 407 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
408 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
408 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
409 | 409 | |
410 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident),'',true); |
|
410 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident), '', true); |
|
411 | 411 | |
412 | 412 | return $spotter_array; |
413 | 413 | } |
@@ -418,16 +418,16 @@ discard block |
||
418 | 418 | * @return Array the spotter information |
419 | 419 | * |
420 | 420 | */ |
421 | - public function getDateLiveMarineDataByIdent($ident,$date) |
|
421 | + public function getDateLiveMarineDataByIdent($ident, $date) |
|
422 | 422 | { |
423 | 423 | $Marine = new Marine($this->db); |
424 | 424 | date_default_timezone_set('UTC'); |
425 | 425 | |
426 | 426 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
427 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
427 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
428 | 428 | |
429 | - $date = date('c',$date); |
|
430 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
429 | + $date = date('c', $date); |
|
430 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
431 | 431 | |
432 | 432 | return $spotter_array; |
433 | 433 | } |
@@ -444,9 +444,9 @@ discard block |
||
444 | 444 | date_default_timezone_set('UTC'); |
445 | 445 | |
446 | 446 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
447 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
447 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
448 | 448 | |
449 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id),'',true); |
|
449 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id), '', true); |
|
450 | 450 | |
451 | 451 | return $spotter_array; |
452 | 452 | } |
@@ -457,15 +457,15 @@ discard block |
||
457 | 457 | * @return Array the spotter information |
458 | 458 | * |
459 | 459 | */ |
460 | - public function getDateLiveMarineDataById($id,$date) |
|
460 | + public function getDateLiveMarineDataById($id, $date) |
|
461 | 461 | { |
462 | 462 | $Marine = new Marine($this->db); |
463 | 463 | date_default_timezone_set('UTC'); |
464 | 464 | |
465 | 465 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
466 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
467 | - $date = date('c',$date); |
|
468 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
|
466 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
467 | + $date = date('c', $date); |
|
468 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true); |
|
469 | 469 | |
470 | 470 | return $spotter_array; |
471 | 471 | } |
@@ -477,7 +477,7 @@ discard block |
||
477 | 477 | * @return Array the spotter information |
478 | 478 | * |
479 | 479 | */ |
480 | - public function getAllLiveMarineDataById($id,$liveinterval = false) |
|
480 | + public function getAllLiveMarineDataById($id, $liveinterval = false) |
|
481 | 481 | { |
482 | 482 | global $globalDBdriver, $globalLiveInterval; |
483 | 483 | date_default_timezone_set('UTC'); |
@@ -496,7 +496,7 @@ discard block |
||
496 | 496 | try { |
497 | 497 | $sth = $this->db->prepare($query); |
498 | 498 | $sth->execute(array(':id' => $id)); |
499 | - } catch(PDOException $e) { |
|
499 | + } catch (PDOException $e) { |
|
500 | 500 | echo $e->getMessage(); |
501 | 501 | die; |
502 | 502 | } |
@@ -514,12 +514,12 @@ discard block |
||
514 | 514 | { |
515 | 515 | date_default_timezone_set('UTC'); |
516 | 516 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
517 | - $query = self::$global_query.' WHERE marine_live.ident = :ident'; |
|
517 | + $query = self::$global_query.' WHERE marine_live.ident = :ident'; |
|
518 | 518 | try { |
519 | 519 | |
520 | 520 | $sth = $this->db->prepare($query); |
521 | 521 | $sth->execute(array(':ident' => $ident)); |
522 | - } catch(PDOException $e) { |
|
522 | + } catch (PDOException $e) { |
|
523 | 523 | echo $e->getMessage(); |
524 | 524 | die; |
525 | 525 | } |
@@ -549,7 +549,7 @@ discard block |
||
549 | 549 | |
550 | 550 | $sth = $this->db->prepare($query); |
551 | 551 | $sth->execute(); |
552 | - } catch(PDOException $e) { |
|
552 | + } catch (PDOException $e) { |
|
553 | 553 | return "error"; |
554 | 554 | } |
555 | 555 | |
@@ -572,14 +572,14 @@ discard block |
||
572 | 572 | |
573 | 573 | $sth = $this->db->prepare($query); |
574 | 574 | $sth->execute(); |
575 | - } catch(PDOException $e) { |
|
575 | + } catch (PDOException $e) { |
|
576 | 576 | return "error"; |
577 | 577 | } |
578 | 578 | $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
579 | 579 | $i = 0; |
580 | - $j =0; |
|
580 | + $j = 0; |
|
581 | 581 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
582 | - foreach($all as $row) |
|
582 | + foreach ($all as $row) |
|
583 | 583 | { |
584 | 584 | $i++; |
585 | 585 | $j++; |
@@ -587,9 +587,9 @@ discard block |
||
587 | 587 | if ($globalDebug) echo "."; |
588 | 588 | try { |
589 | 589 | |
590 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
590 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
591 | 591 | $sth->execute(); |
592 | - } catch(PDOException $e) { |
|
592 | + } catch (PDOException $e) { |
|
593 | 593 | return "error"; |
594 | 594 | } |
595 | 595 | $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
@@ -600,9 +600,9 @@ discard block |
||
600 | 600 | if ($i > 0) { |
601 | 601 | try { |
602 | 602 | |
603 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
603 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
604 | 604 | $sth->execute(); |
605 | - } catch(PDOException $e) { |
|
605 | + } catch (PDOException $e) { |
|
606 | 606 | return "error"; |
607 | 607 | } |
608 | 608 | } |
@@ -615,7 +615,7 @@ discard block |
||
615 | 615 | |
616 | 616 | $sth = $this->db->prepare($query); |
617 | 617 | $sth->execute(); |
618 | - } catch(PDOException $e) { |
|
618 | + } catch (PDOException $e) { |
|
619 | 619 | return "error"; |
620 | 620 | } |
621 | 621 | /* $query_delete = "DELETE FROM marine_live WHERE fammarine_id IN ("; |
@@ -663,13 +663,13 @@ discard block |
||
663 | 663 | public function deleteLiveMarineDataByIdent($ident) |
664 | 664 | { |
665 | 665 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
666 | - $query = 'DELETE FROM marine_live WHERE ident = :ident'; |
|
666 | + $query = 'DELETE FROM marine_live WHERE ident = :ident'; |
|
667 | 667 | |
668 | 668 | try { |
669 | 669 | |
670 | 670 | $sth = $this->db->prepare($query); |
671 | 671 | $sth->execute(array(':ident' => $ident)); |
672 | - } catch(PDOException $e) { |
|
672 | + } catch (PDOException $e) { |
|
673 | 673 | return "error"; |
674 | 674 | } |
675 | 675 | |
@@ -685,13 +685,13 @@ discard block |
||
685 | 685 | public function deleteLiveMarineDataById($id) |
686 | 686 | { |
687 | 687 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
688 | - $query = 'DELETE FROM marine_live WHERE fammarine_id = :id'; |
|
688 | + $query = 'DELETE FROM marine_live WHERE fammarine_id = :id'; |
|
689 | 689 | |
690 | 690 | try { |
691 | 691 | |
692 | 692 | $sth = $this->db->prepare($query); |
693 | 693 | $sth->execute(array(':id' => $id)); |
694 | - } catch(PDOException $e) { |
|
694 | + } catch (PDOException $e) { |
|
695 | 695 | return "error"; |
696 | 696 | } |
697 | 697 | |
@@ -709,13 +709,13 @@ discard block |
||
709 | 709 | { |
710 | 710 | global $globalDBdriver, $globalTimezone; |
711 | 711 | if ($globalDBdriver == 'mysql') { |
712 | - $query = 'SELECT marine_live.ident FROM marine_live |
|
712 | + $query = 'SELECT marine_live.ident FROM marine_live |
|
713 | 713 | WHERE marine_live.ident = :ident |
714 | 714 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
715 | 715 | AND marine_live.date < UTC_TIMESTAMP()'; |
716 | 716 | $query_data = array(':ident' => $ident); |
717 | 717 | } else { |
718 | - $query = "SELECT marine_live.ident FROM marine_live |
|
718 | + $query = "SELECT marine_live.ident FROM marine_live |
|
719 | 719 | WHERE marine_live.ident = :ident |
720 | 720 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
721 | 721 | AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -724,8 +724,8 @@ discard block |
||
724 | 724 | |
725 | 725 | $sth = $this->db->prepare($query); |
726 | 726 | $sth->execute($query_data); |
727 | - $ident_result=''; |
|
728 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
727 | + $ident_result = ''; |
|
728 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
729 | 729 | { |
730 | 730 | $ident_result = $row['ident']; |
731 | 731 | } |
@@ -742,13 +742,13 @@ discard block |
||
742 | 742 | { |
743 | 743 | global $globalDBdriver, $globalTimezone; |
744 | 744 | if ($globalDBdriver == 'mysql') { |
745 | - $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
745 | + $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
746 | 746 | WHERE marine_live.ident = :ident |
747 | 747 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
748 | 748 | // AND marine_live.date < UTC_TIMESTAMP()"; |
749 | 749 | $query_data = array(':ident' => $ident); |
750 | 750 | } else { |
751 | - $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
751 | + $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
752 | 752 | WHERE marine_live.ident = :ident |
753 | 753 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'"; |
754 | 754 | // AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -757,8 +757,8 @@ discard block |
||
757 | 757 | |
758 | 758 | $sth = $this->db->prepare($query); |
759 | 759 | $sth->execute($query_data); |
760 | - $ident_result=''; |
|
761 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
760 | + $ident_result = ''; |
|
761 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
762 | 762 | { |
763 | 763 | $ident_result = $row['fammarine_id']; |
764 | 764 | } |
@@ -775,13 +775,13 @@ discard block |
||
775 | 775 | { |
776 | 776 | global $globalDBdriver, $globalTimezone; |
777 | 777 | if ($globalDBdriver == 'mysql') { |
778 | - $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
778 | + $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
779 | 779 | WHERE marine_live.fammarine_id = :id |
780 | 780 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
781 | 781 | // AND marine_live.date < UTC_TIMESTAMP()"; |
782 | 782 | $query_data = array(':id' => $id); |
783 | 783 | } else { |
784 | - $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
784 | + $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
785 | 785 | WHERE marine_live.fammarine_id = :id |
786 | 786 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
787 | 787 | // AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -790,8 +790,8 @@ discard block |
||
790 | 790 | |
791 | 791 | $sth = $this->db->prepare($query); |
792 | 792 | $sth->execute($query_data); |
793 | - $ident_result=''; |
|
794 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
793 | + $ident_result = ''; |
|
794 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
795 | 795 | { |
796 | 796 | $ident_result = $row['fammarine_id']; |
797 | 797 | } |
@@ -808,13 +808,13 @@ discard block |
||
808 | 808 | { |
809 | 809 | global $globalDBdriver, $globalTimezone; |
810 | 810 | if ($globalDBdriver == 'mysql') { |
811 | - $query = 'SELECT marine_live.fammarine_id FROM marine_live |
|
811 | + $query = 'SELECT marine_live.fammarine_id FROM marine_live |
|
812 | 812 | WHERE marine_live.mmsi = :mmsi |
813 | 813 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
814 | 814 | // AND marine_live.date < UTC_TIMESTAMP()"; |
815 | 815 | $query_data = array(':mmsi' => $mmsi); |
816 | 816 | } else { |
817 | - $query = "SELECT marine_live.fammarine_id FROM marine_live |
|
817 | + $query = "SELECT marine_live.fammarine_id FROM marine_live |
|
818 | 818 | WHERE marine_live.mmsi = :mmsi |
819 | 819 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
820 | 820 | // AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -823,8 +823,8 @@ discard block |
||
823 | 823 | |
824 | 824 | $sth = $this->db->prepare($query); |
825 | 825 | $sth->execute($query_data); |
826 | - $ident_result=''; |
|
827 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
826 | + $ident_result = ''; |
|
827 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
828 | 828 | { |
829 | 829 | $ident_result = $row['fammarine_id']; |
830 | 830 | } |
@@ -842,7 +842,7 @@ discard block |
||
842 | 842 | * @return String success or false |
843 | 843 | * |
844 | 844 | */ |
845 | - public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') |
|
845 | + public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') |
|
846 | 846 | { |
847 | 847 | global $globalURL, $globalArchive, $globalDebug; |
848 | 848 | $Common = new Common(); |
@@ -894,26 +894,26 @@ discard block |
||
894 | 894 | if ($date == '') $date = date("Y-m-d H:i:s", time()); |
895 | 895 | |
896 | 896 | |
897 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
898 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
899 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
900 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
901 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
902 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
903 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
904 | - $source_name = filter_var($source_name,FILTER_SANITIZE_STRING); |
|
905 | - $over_country = filter_var($over_country,FILTER_SANITIZE_STRING); |
|
906 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
907 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
|
908 | - $status = filter_var($status,FILTER_SANITIZE_STRING); |
|
909 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
910 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
911 | - $arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING); |
|
912 | - $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
|
897 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
898 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
899 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
900 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
901 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
902 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
903 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
904 | + $source_name = filter_var($source_name, FILTER_SANITIZE_STRING); |
|
905 | + $over_country = filter_var($over_country, FILTER_SANITIZE_STRING); |
|
906 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
907 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT); |
|
908 | + $status = filter_var($status, FILTER_SANITIZE_STRING); |
|
909 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
910 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
911 | + $arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING); |
|
912 | + $arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING); |
|
913 | 913 | |
914 | 914 | |
915 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
916 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
915 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
916 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
917 | 917 | if ($arrival_date == '') $arrival_date = NULL; |
918 | 918 | $query = ''; |
919 | 919 | if ($globalArchive) { |
@@ -923,19 +923,19 @@ discard block |
||
923 | 923 | $query .= 'INSERT INTO marine_live (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) |
924 | 924 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)'; |
925 | 925 | |
926 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date); |
|
926 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date); |
|
927 | 927 | try { |
928 | 928 | $sth = $this->db->prepare($query); |
929 | 929 | $sth->execute($query_values); |
930 | 930 | $sth->closeCursor(); |
931 | - } catch(PDOException $e) { |
|
931 | + } catch (PDOException $e) { |
|
932 | 932 | return "error : ".$e->getMessage(); |
933 | 933 | } |
934 | 934 | |
935 | 935 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
936 | 936 | if ($globalDebug) echo '(Add to Marine archive : '; |
937 | 937 | $MarineArchive = new MarineArchive($this->db); |
938 | - $result = $MarineArchive->addMarineArchiveData($fammarine_id, $ident, $latitude, $longitude, $heading, $groundspeed, $date, $putinarchive, $mmsi,$type,$typeid,$imo, $callsign,$arrival_code,$arrival_date,$status,$noarchive,$format_source, $source_name, $over_country); |
|
938 | + $result = $MarineArchive->addMarineArchiveData($fammarine_id, $ident, $latitude, $longitude, $heading, $groundspeed, $date, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $noarchive, $format_source, $source_name, $over_country); |
|
939 | 939 | if ($globalDebug) echo $result.')'; |
940 | 940 | } |
941 | 941 | return "success"; |
@@ -943,7 +943,7 @@ discard block |
||
943 | 943 | |
944 | 944 | public function getOrderBy() |
945 | 945 | { |
946 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_live.date DESC")); |
|
946 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_live.date DESC")); |
|
947 | 947 | return $orderby; |
948 | 948 | } |
949 | 949 |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
3 | 3 | $ident = ''; |
4 | -if (isset($_POST['ident'])) $ident = filter_input(INPUT_POST,'ident',FILTER_SANITIZE_STRING); |
|
5 | -if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
4 | +if (isset($_POST['ident'])) $ident = filter_input(INPUT_POST, 'ident', FILTER_SANITIZE_STRING); |
|
5 | +if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
6 | 6 | if ($ident != '') |
7 | 7 | { |
8 | 8 | if (isset($_GET['marine'])) header('Location: '.$globalURL.'/marine/ident/'.$ident); |
@@ -1,13 +1,20 @@ |
||
1 | 1 | <?php |
2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
3 | 3 | $ident = ''; |
4 | -if (isset($_POST['ident'])) $ident = filter_input(INPUT_POST,'ident',FILTER_SANITIZE_STRING); |
|
5 | -if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
4 | +if (isset($_POST['ident'])) { |
|
5 | + $ident = filter_input(INPUT_POST,'ident',FILTER_SANITIZE_STRING); |
|
6 | +} |
|
7 | +if (isset($_GET['ident'])) { |
|
8 | + $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
9 | +} |
|
6 | 10 | if ($ident != '') |
7 | 11 | { |
8 | - if (isset($_GET['marine'])) header('Location: '.$globalURL.'/marine/ident/'.$ident); |
|
9 | - else header('Location: '.$globalURL.'/ident/'.$ident); |
|
10 | -} else { |
|
12 | + if (isset($_GET['marine'])) { |
|
13 | + header('Location: '.$globalURL.'/marine/ident/'.$ident); |
|
14 | + } else { |
|
15 | + header('Location: '.$globalURL.'/ident/'.$ident); |
|
16 | + } |
|
17 | + } else { |
|
11 | 18 | header('Location: '.$globalURL); |
12 | 19 | } |
13 | 20 | ?> |
14 | 21 | \ No newline at end of file |
@@ -4,21 +4,21 @@ discard block |
||
4 | 4 | |
5 | 5 | $type = ''; |
6 | 6 | if (isset($_GET['marine'])) { |
7 | - require_once('require/class.Marine.php');; |
|
7 | + require_once('require/class.Marine.php'); ; |
|
8 | 8 | require_once('require/class.MarineLive.php'); |
9 | - $MarineLive=new MarineLive(); |
|
9 | + $MarineLive = new MarineLive(); |
|
10 | 10 | $type = 'marine'; |
11 | 11 | $page_url = $globalURL.'/marine/currently'; |
12 | 12 | } elseif (isset($_GET['tracker'])) { |
13 | - require_once('require/class.Tracker.php');; |
|
13 | + require_once('require/class.Tracker.php'); ; |
|
14 | 14 | require_once('require/class.TrackerLive.php'); |
15 | - $TrackerLive=new TrackerLive(); |
|
15 | + $TrackerLive = new TrackerLive(); |
|
16 | 16 | $type = 'tracker'; |
17 | 17 | $page_url = $globalURL.'/tracker/currently'; |
18 | 18 | } else { |
19 | - require_once('require/class.Spotter.php');; |
|
19 | + require_once('require/class.Spotter.php'); ; |
|
20 | 20 | require_once('require/class.SpotterLive.php'); |
21 | - $SpotterLive=new SpotterLive(); |
|
21 | + $SpotterLive = new SpotterLive(); |
|
22 | 22 | $type = 'aircraft'; |
23 | 23 | $page_url = $globalURL.'/currently'; |
24 | 24 | } |
@@ -26,12 +26,12 @@ discard block |
||
26 | 26 | $title = "Current Activity"; |
27 | 27 | require_once('header.php'); |
28 | 28 | //calculuation for the pagination |
29 | -if(!isset($_GET['limit'])) |
|
29 | +if (!isset($_GET['limit'])) |
|
30 | 30 | { |
31 | 31 | $limit_start = 0; |
32 | 32 | $limit_end = 25; |
33 | 33 | $absolute_difference = 25; |
34 | -} else { |
|
34 | +} else { |
|
35 | 35 | $limit_explode = explode(",", $_GET['limit']); |
36 | 36 | $limit_start = $limit_explode[0]; |
37 | 37 | $limit_end = $limit_explode[1]; |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | elseif ($type == 'marine') print '<p>'._("The table below shows the detailed information of all current vessels.").'</p>'; |
55 | 55 | elseif ($type == 'tracker') print '<p>'._("The table below shows the detailed information of all current trackers.").'</p>'; |
56 | 56 | |
57 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
57 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
58 | 58 | if ($sort != '') { |
59 | 59 | if ($type == 'aircraft') $spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference, $sort); |
60 | 60 | elseif ($type == 'marine') $spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference, $sort); |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | $limit_start = 0; |
32 | 32 | $limit_end = 25; |
33 | 33 | $absolute_difference = 25; |
34 | -} else { |
|
34 | +} else { |
|
35 | 35 | $limit_explode = explode(",", $_GET['limit']); |
36 | 36 | $limit_start = $limit_explode[0]; |
37 | 37 | $limit_end = $limit_explode[1]; |
@@ -50,20 +50,32 @@ discard block |
||
50 | 50 | print '</div>'; |
51 | 51 | |
52 | 52 | print '<div class="table column">'; |
53 | -if ($type == 'aircraft') print '<p>'._("The table below shows the detailed information of all current flights.").'</p>'; |
|
54 | -elseif ($type == 'marine') print '<p>'._("The table below shows the detailed information of all current vessels.").'</p>'; |
|
55 | -elseif ($type == 'tracker') print '<p>'._("The table below shows the detailed information of all current trackers.").'</p>'; |
|
53 | +if ($type == 'aircraft') { |
|
54 | + print '<p>'._("The table below shows the detailed information of all current flights.").'</p>'; |
|
55 | +} elseif ($type == 'marine') { |
|
56 | + print '<p>'._("The table below shows the detailed information of all current vessels.").'</p>'; |
|
57 | +} elseif ($type == 'tracker') { |
|
58 | + print '<p>'._("The table below shows the detailed information of all current trackers.").'</p>'; |
|
59 | +} |
|
56 | 60 | |
57 | 61 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
58 | 62 | if ($sort != '') { |
59 | - if ($type == 'aircraft') $spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference, $sort); |
|
60 | - elseif ($type == 'marine') $spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference, $sort); |
|
61 | - elseif ($type == 'tracker') $spotter_array = $TrackerLive->getLiveTrackerData($limit_start.",".$absolute_difference, $sort); |
|
62 | -} else { |
|
63 | - if ($type == 'aircraft') $spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference); |
|
64 | - elseif ($type == 'marine') $spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference); |
|
65 | - elseif ($type == 'tracker') $spotter_array = $TrackerLive->getLiveTrackerData($limit_start.",".$absolute_difference); |
|
66 | -} |
|
63 | + if ($type == 'aircraft') { |
|
64 | + $spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference, $sort); |
|
65 | + } elseif ($type == 'marine') { |
|
66 | + $spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference, $sort); |
|
67 | + } elseif ($type == 'tracker') { |
|
68 | + $spotter_array = $TrackerLive->getLiveTrackerData($limit_start.",".$absolute_difference, $sort); |
|
69 | + } |
|
70 | + } else { |
|
71 | + if ($type == 'aircraft') { |
|
72 | + $spotter_array = $SpotterLive->getLiveSpotterData($limit_start.",".$absolute_difference); |
|
73 | + } elseif ($type == 'marine') { |
|
74 | + $spotter_array = $MarineLive->getLiveMarineData($limit_start.",".$absolute_difference); |
|
75 | + } elseif ($type == 'tracker') { |
|
76 | + $spotter_array = $TrackerLive->getLiveTrackerData($limit_start.",".$absolute_difference); |
|
77 | + } |
|
78 | + } |
|
67 | 79 | |
68 | 80 | if (!empty($spotter_array)) |
69 | 81 | { |
@@ -3,7 +3,7 @@ |
||
3 | 3 | $type = 'aircraft'; |
4 | 4 | if (isset($_GET['marine'])) $type = 'marine'; |
5 | 5 | elseif (isset($_GET['tracker'])) $type = 'tracker'; |
6 | -$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING); |
|
6 | +$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING); |
|
7 | 7 | if ($date == '') $date = date('Y-m-d'); |
8 | 8 | if ($type == 'marine') header('Location: '.$globalURL.'/marine/date/'.$date); |
9 | 9 | elseif ($type == 'tracker') header('Location: '.$globalURL.'/tracker/date/'.$date); |
@@ -1,11 +1,20 @@ |
||
1 | 1 | <?php |
2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
3 | 3 | $type = 'aircraft'; |
4 | -if (isset($_GET['marine'])) $type = 'marine'; |
|
5 | -elseif (isset($_GET['tracker'])) $type = 'tracker'; |
|
4 | +if (isset($_GET['marine'])) { |
|
5 | + $type = 'marine'; |
|
6 | +} elseif (isset($_GET['tracker'])) { |
|
7 | + $type = 'tracker'; |
|
8 | +} |
|
6 | 9 | $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING); |
7 | -if ($date == '') $date = date('Y-m-d'); |
|
8 | -if ($type == 'marine') header('Location: '.$globalURL.'/marine/date/'.$date); |
|
9 | -elseif ($type == 'tracker') header('Location: '.$globalURL.'/tracker/date/'.$date); |
|
10 | -else header('Location: '.$globalURL.'/date/'.$date); |
|
10 | +if ($date == '') { |
|
11 | + $date = date('Y-m-d'); |
|
12 | +} |
|
13 | +if ($type == 'marine') { |
|
14 | + header('Location: '.$globalURL.'/marine/date/'.$date); |
|
15 | +} elseif ($type == 'tracker') { |
|
16 | + header('Location: '.$globalURL.'/tracker/date/'.$date); |
|
17 | +} else { |
|
18 | + header('Location: '.$globalURL.'/date/'.$date); |
|
19 | +} |
|
11 | 20 | ?> |
12 | 21 | \ No newline at end of file |
@@ -2,34 +2,34 @@ discard block |
||
2 | 2 | require_once('require/class.Connection.php'); |
3 | 3 | require_once('require/class.Language.php'); |
4 | 4 | $type = ''; |
5 | -$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING); |
|
5 | +$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING); |
|
6 | 6 | if (isset($_GET['marine'])) { |
7 | - require_once('require/class.Marine.php');; |
|
7 | + require_once('require/class.Marine.php'); ; |
|
8 | 8 | $Marine = new Marine(); |
9 | 9 | $type = 'marine'; |
10 | 10 | $page_url = $globalURL.'/marine/date/'.$date; |
11 | 11 | } elseif (isset($_GET['tracker'])) { |
12 | - require_once('require/class.Tracker.php');; |
|
12 | + require_once('require/class.Tracker.php'); ; |
|
13 | 13 | $Tracker = new Tracker(); |
14 | 14 | $type = 'tracker'; |
15 | 15 | $page_url = $globalURL.'/tracker/date/'.$date; |
16 | 16 | } else { |
17 | - require_once('require/class.Spotter.php');; |
|
17 | + require_once('require/class.Spotter.php'); ; |
|
18 | 18 | $Spotter = new Spotter(); |
19 | 19 | $type = 'aircraft'; |
20 | 20 | $page_url = $globalURL.'/date/'.$date; |
21 | 21 | } |
22 | 22 | |
23 | -if (!isset($_GET['date'])){ |
|
23 | +if (!isset($_GET['date'])) { |
|
24 | 24 | header('Location: '.$globalURL.''); |
25 | 25 | } else { |
26 | 26 | //calculuation for the pagination |
27 | - if(!isset($_GET['limit'])) |
|
27 | + if (!isset($_GET['limit'])) |
|
28 | 28 | { |
29 | 29 | $limit_start = 0; |
30 | 30 | $limit_end = 25; |
31 | 31 | $absolute_difference = 25; |
32 | - } else { |
|
32 | + } else { |
|
33 | 33 | $limit_explode = explode(",", $_GET['limit']); |
34 | 34 | $limit_start = $limit_explode[0]; |
35 | 35 | $limit_end = $limit_explode[1]; |
@@ -43,24 +43,24 @@ discard block |
||
43 | 43 | $limit_previous_1 = $limit_start - $absolute_difference; |
44 | 44 | $limit_previous_2 = $limit_end - $absolute_difference; |
45 | 45 | |
46 | - $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
46 | + $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
47 | 47 | if ($sort != '') |
48 | 48 | { |
49 | - if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
50 | - elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
51 | - else $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
49 | + if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date, $limit_start.",".$absolute_difference, $sort); |
|
50 | + elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date, $limit_start.",".$absolute_difference, $sort); |
|
51 | + else $spotter_array = $Spotter->getSpotterDataByDate($date, $limit_start.",".$absolute_difference, $sort); |
|
52 | 52 | } else { |
53 | - if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference); |
|
54 | - elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference); |
|
55 | - else $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference); |
|
53 | + if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date, $limit_start.",".$absolute_difference); |
|
54 | + elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date, $limit_start.",".$absolute_difference); |
|
55 | + else $spotter_array = $Spotter->getSpotterDataByDate($date, $limit_start.",".$absolute_difference); |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | if (!empty($spotter_array)) |
59 | 59 | { |
60 | 60 | date_default_timezone_set($globalTimezone); |
61 | - if ($type == 'marine') $title = sprintf(_("Detailed View for vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
62 | - elseif ($type == 'tracker') $title = sprintf(_("Detailed View for trackers from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
63 | - else $title = sprintf(_("Detailed View for flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
61 | + if ($type == 'marine') $title = sprintf(_("Detailed View for vessels from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
62 | + elseif ($type == 'tracker') $title = sprintf(_("Detailed View for trackers from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
63 | + else $title = sprintf(_("Detailed View for flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
64 | 64 | |
65 | 65 | require_once('header.php'); |
66 | 66 | print '<div class="select-item">'; |
@@ -78,15 +78,15 @@ discard block |
||
78 | 78 | print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>'; |
79 | 79 | print '<br />'; |
80 | 80 | print '<div class="info column">'; |
81 | - if ($type == 'marine') print '<h1>'.sprintf(_("Vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
82 | - else print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
81 | + if ($type == 'marine') print '<h1>'.sprintf(_("Vessels from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
82 | + else print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
83 | 83 | print '</div>'; |
84 | 84 | |
85 | 85 | if ($type == 'aircraft') include('date-sub-menu.php'); |
86 | 86 | print '<div class="table column">'; |
87 | - if ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
88 | - elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
89 | - else print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
87 | + if ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels on <strong>%s</strong>."), date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
88 | + elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers on <strong>%s</strong>."), date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
89 | + else print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."), date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
90 | 90 | |
91 | 91 | include('table-output.php'); |
92 | 92 | print '<div class="pagination">'; |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $limit_start = 0; |
30 | 30 | $limit_end = 25; |
31 | 31 | $absolute_difference = 25; |
32 | - } else { |
|
32 | + } else { |
|
33 | 33 | $limit_explode = explode(",", $_GET['limit']); |
34 | 34 | $limit_start = $limit_explode[0]; |
35 | 35 | $limit_end = $limit_explode[1]; |
@@ -46,21 +46,33 @@ discard block |
||
46 | 46 | $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
47 | 47 | if ($sort != '') |
48 | 48 | { |
49 | - if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
50 | - elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
51 | - else $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
49 | + if ($type == 'marine') { |
|
50 | + $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
51 | + } elseif ($type == 'tracker') { |
|
52 | + $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
53 | + } else { |
|
54 | + $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference, $sort); |
|
55 | + } |
|
52 | 56 | } else { |
53 | - if ($type == 'marine') $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference); |
|
54 | - elseif ($type == 'tracker') $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference); |
|
55 | - else $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference); |
|
57 | + if ($type == 'marine') { |
|
58 | + $spotter_array = $Marine->getMarineDataByDate($date,$limit_start.",".$absolute_difference); |
|
59 | + } elseif ($type == 'tracker') { |
|
60 | + $spotter_array = $Tracker->getTrackerDataByDate($date,$limit_start.",".$absolute_difference); |
|
61 | + } else { |
|
62 | + $spotter_array = $Spotter->getSpotterDataByDate($date,$limit_start.",".$absolute_difference); |
|
63 | + } |
|
56 | 64 | } |
57 | 65 | |
58 | 66 | if (!empty($spotter_array)) |
59 | 67 | { |
60 | 68 | date_default_timezone_set($globalTimezone); |
61 | - if ($type == 'marine') $title = sprintf(_("Detailed View for vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
62 | - elseif ($type == 'tracker') $title = sprintf(_("Detailed View for trackers from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
63 | - else $title = sprintf(_("Detailed View for flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
69 | + if ($type == 'marine') { |
|
70 | + $title = sprintf(_("Detailed View for vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
71 | + } elseif ($type == 'tracker') { |
|
72 | + $title = sprintf(_("Detailed View for trackers from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
73 | + } else { |
|
74 | + $title = sprintf(_("Detailed View for flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
75 | + } |
|
64 | 76 | |
65 | 77 | require_once('header.php'); |
66 | 78 | print '<div class="select-item">'; |
@@ -78,15 +90,24 @@ discard block |
||
78 | 90 | print '<script type="text/javascript">$(function () { $("#datepicker").datetimepicker({ format: "YYYY-MM-DD", defaultDate: "'.$date.'" }); }); </script>'; |
79 | 91 | print '<br />'; |
80 | 92 | print '<div class="info column">'; |
81 | - if ($type == 'marine') print '<h1>'.sprintf(_("Vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
82 | - else print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
93 | + if ($type == 'marine') { |
|
94 | + print '<h1>'.sprintf(_("Vessels from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
95 | + } else { |
|
96 | + print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
97 | + } |
|
83 | 98 | print '</div>'; |
84 | 99 | |
85 | - if ($type == 'aircraft') include('date-sub-menu.php'); |
|
100 | + if ($type == 'aircraft') { |
|
101 | + include('date-sub-menu.php'); |
|
102 | + } |
|
86 | 103 | print '<div class="table column">'; |
87 | - if ($type == 'marine') print '<p>'.sprintf(_("The table below shows the detailed information of all vessels on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
88 | - elseif ($type == 'tracker') print '<p>'.sprintf(_("The table below shows the detailed information of all trackers on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
89 | - else print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
104 | + if ($type == 'marine') { |
|
105 | + print '<p>'.sprintf(_("The table below shows the detailed information of all vessels on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
106 | + } elseif ($type == 'tracker') { |
|
107 | + print '<p>'.sprintf(_("The table below shows the detailed information of all trackers on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
108 | + } else { |
|
109 | + print '<p>'.sprintf(_("The table below shows the detailed information of all flights on <strong>%s</strong>."),date("l M j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
110 | + } |
|
90 | 111 | |
91 | 112 | include('table-output.php'); |
92 | 113 | print '<div class="pagination">'; |