Ysurac /
FlightAirMap
@@ -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,10 +313,10 @@ 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 | /* |
| 322 | 322 | if ($globalDBdriver == 'mysql') { |
@@ -331,13 +331,13 @@ discard block |
||
| 331 | 331 | */ |
| 332 | 332 | if ($globalDBdriver == 'mysql') { |
| 333 | 333 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 334 | - $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 |
|
| 334 | + $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 |
|
| 335 | 335 | FROM marine_live |
| 336 | 336 | '.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= marine_live.date |
| 337 | 337 | AND marine_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' |
| 338 | 338 | AND marine_live.latitude <> 0 AND marine_live.longitude <> 0'; |
| 339 | 339 | } else { |
| 340 | - $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 |
|
| 340 | + $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 |
|
| 341 | 341 | FROM marine_live |
| 342 | 342 | INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate |
| 343 | 343 | FROM marine_live l |
@@ -349,14 +349,14 @@ discard block |
||
| 349 | 349 | } |
| 350 | 350 | } else { |
| 351 | 351 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 352 | - $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 |
|
| 352 | + $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 |
|
| 353 | 353 | FROM marine_live |
| 354 | 354 | ".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date |
| 355 | 355 | AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." |
| 356 | 356 | AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." |
| 357 | 357 | AND marine_live.latitude <> '0' AND marine_live.longitude <> '0'"; |
| 358 | 358 | } else { |
| 359 | - $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 |
|
| 359 | + $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 |
|
| 360 | 360 | FROM marine_live |
| 361 | 361 | INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate |
| 362 | 362 | FROM marine_live l |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | if ($interval == '1m') |
| 414 | 414 | { |
| 415 | 415 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
| 416 | - } else if ($interval == '15m'){ |
|
| 416 | + } else if ($interval == '15m') { |
|
| 417 | 417 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date '; |
| 418 | 418 | } |
| 419 | 419 | } |
@@ -421,14 +421,14 @@ discard block |
||
| 421 | 421 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
| 422 | 422 | } |
| 423 | 423 | |
| 424 | - $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 |
|
| 424 | + $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 |
|
| 425 | 425 | WHERE marine_live.latitude <> '' |
| 426 | 426 | AND marine_live.longitude <> '' |
| 427 | 427 | ".$additional_query." |
| 428 | 428 | HAVING distance < :radius |
| 429 | 429 | ORDER BY distance"; |
| 430 | 430 | |
| 431 | - $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 431 | + $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius)); |
|
| 432 | 432 | |
| 433 | 433 | return $spotter_array; |
| 434 | 434 | } |
@@ -446,9 +446,9 @@ discard block |
||
| 446 | 446 | date_default_timezone_set('UTC'); |
| 447 | 447 | |
| 448 | 448 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 449 | - $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'; |
|
| 449 | + $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'; |
|
| 450 | 450 | |
| 451 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident),'',true); |
|
| 451 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident), '', true); |
|
| 452 | 452 | |
| 453 | 453 | return $spotter_array; |
| 454 | 454 | } |
@@ -459,16 +459,16 @@ discard block |
||
| 459 | 459 | * @return Array the spotter information |
| 460 | 460 | * |
| 461 | 461 | */ |
| 462 | - public function getDateLiveMarineDataByIdent($ident,$date) |
|
| 462 | + public function getDateLiveMarineDataByIdent($ident, $date) |
|
| 463 | 463 | { |
| 464 | 464 | $Marine = new Marine($this->db); |
| 465 | 465 | date_default_timezone_set('UTC'); |
| 466 | 466 | |
| 467 | 467 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 468 | - $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'; |
|
| 468 | + $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'; |
|
| 469 | 469 | |
| 470 | - $date = date('c',$date); |
|
| 471 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 470 | + $date = date('c', $date); |
|
| 471 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 472 | 472 | |
| 473 | 473 | return $spotter_array; |
| 474 | 474 | } |
@@ -485,9 +485,9 @@ discard block |
||
| 485 | 485 | date_default_timezone_set('UTC'); |
| 486 | 486 | |
| 487 | 487 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 488 | - $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'; |
|
| 488 | + $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'; |
|
| 489 | 489 | |
| 490 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id),'',true); |
|
| 490 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id), '', true); |
|
| 491 | 491 | |
| 492 | 492 | return $spotter_array; |
| 493 | 493 | } |
@@ -498,15 +498,15 @@ discard block |
||
| 498 | 498 | * @return Array the spotter information |
| 499 | 499 | * |
| 500 | 500 | */ |
| 501 | - public function getDateLiveMarineDataById($id,$date) |
|
| 501 | + public function getDateLiveMarineDataById($id, $date) |
|
| 502 | 502 | { |
| 503 | 503 | $Marine = new Marine($this->db); |
| 504 | 504 | date_default_timezone_set('UTC'); |
| 505 | 505 | |
| 506 | 506 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 507 | - $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'; |
|
| 508 | - $date = date('c',$date); |
|
| 509 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
|
| 507 | + $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'; |
|
| 508 | + $date = date('c', $date); |
|
| 509 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true); |
|
| 510 | 510 | |
| 511 | 511 | return $spotter_array; |
| 512 | 512 | } |
@@ -518,7 +518,7 @@ discard block |
||
| 518 | 518 | * @return Array the spotter information |
| 519 | 519 | * |
| 520 | 520 | */ |
| 521 | - public function getAllLiveMarineDataById($id,$liveinterval = false) |
|
| 521 | + public function getAllLiveMarineDataById($id, $liveinterval = false) |
|
| 522 | 522 | { |
| 523 | 523 | global $globalDBdriver, $globalLiveInterval; |
| 524 | 524 | date_default_timezone_set('UTC'); |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | try { |
| 538 | 538 | $sth = $this->db->prepare($query); |
| 539 | 539 | $sth->execute(array(':id' => $id)); |
| 540 | - } catch(PDOException $e) { |
|
| 540 | + } catch (PDOException $e) { |
|
| 541 | 541 | echo $e->getMessage(); |
| 542 | 542 | die; |
| 543 | 543 | } |
@@ -555,12 +555,12 @@ discard block |
||
| 555 | 555 | { |
| 556 | 556 | date_default_timezone_set('UTC'); |
| 557 | 557 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 558 | - $query = self::$global_query.' WHERE marine_live.ident = :ident'; |
|
| 558 | + $query = self::$global_query.' WHERE marine_live.ident = :ident'; |
|
| 559 | 559 | try { |
| 560 | 560 | |
| 561 | 561 | $sth = $this->db->prepare($query); |
| 562 | 562 | $sth->execute(array(':ident' => $ident)); |
| 563 | - } catch(PDOException $e) { |
|
| 563 | + } catch (PDOException $e) { |
|
| 564 | 564 | echo $e->getMessage(); |
| 565 | 565 | die; |
| 566 | 566 | } |
@@ -590,7 +590,7 @@ discard block |
||
| 590 | 590 | |
| 591 | 591 | $sth = $this->db->prepare($query); |
| 592 | 592 | $sth->execute(); |
| 593 | - } catch(PDOException $e) { |
|
| 593 | + } catch (PDOException $e) { |
|
| 594 | 594 | return "error"; |
| 595 | 595 | } |
| 596 | 596 | |
@@ -613,14 +613,14 @@ discard block |
||
| 613 | 613 | |
| 614 | 614 | $sth = $this->db->prepare($query); |
| 615 | 615 | $sth->execute(); |
| 616 | - } catch(PDOException $e) { |
|
| 616 | + } catch (PDOException $e) { |
|
| 617 | 617 | return "error"; |
| 618 | 618 | } |
| 619 | 619 | $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
| 620 | 620 | $i = 0; |
| 621 | - $j =0; |
|
| 621 | + $j = 0; |
|
| 622 | 622 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 623 | - foreach($all as $row) |
|
| 623 | + foreach ($all as $row) |
|
| 624 | 624 | { |
| 625 | 625 | $i++; |
| 626 | 626 | $j++; |
@@ -628,9 +628,9 @@ discard block |
||
| 628 | 628 | if ($globalDebug) echo "."; |
| 629 | 629 | try { |
| 630 | 630 | |
| 631 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 631 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 632 | 632 | $sth->execute(); |
| 633 | - } catch(PDOException $e) { |
|
| 633 | + } catch (PDOException $e) { |
|
| 634 | 634 | return "error"; |
| 635 | 635 | } |
| 636 | 636 | $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
@@ -641,9 +641,9 @@ discard block |
||
| 641 | 641 | if ($i > 0) { |
| 642 | 642 | try { |
| 643 | 643 | |
| 644 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 644 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 645 | 645 | $sth->execute(); |
| 646 | - } catch(PDOException $e) { |
|
| 646 | + } catch (PDOException $e) { |
|
| 647 | 647 | return "error"; |
| 648 | 648 | } |
| 649 | 649 | } |
@@ -656,7 +656,7 @@ discard block |
||
| 656 | 656 | |
| 657 | 657 | $sth = $this->db->prepare($query); |
| 658 | 658 | $sth->execute(); |
| 659 | - } catch(PDOException $e) { |
|
| 659 | + } catch (PDOException $e) { |
|
| 660 | 660 | return "error"; |
| 661 | 661 | } |
| 662 | 662 | /* $query_delete = "DELETE FROM marine_live WHERE fammarine_id IN ("; |
@@ -704,13 +704,13 @@ discard block |
||
| 704 | 704 | public function deleteLiveMarineDataByIdent($ident) |
| 705 | 705 | { |
| 706 | 706 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 707 | - $query = 'DELETE FROM marine_live WHERE ident = :ident'; |
|
| 707 | + $query = 'DELETE FROM marine_live WHERE ident = :ident'; |
|
| 708 | 708 | |
| 709 | 709 | try { |
| 710 | 710 | |
| 711 | 711 | $sth = $this->db->prepare($query); |
| 712 | 712 | $sth->execute(array(':ident' => $ident)); |
| 713 | - } catch(PDOException $e) { |
|
| 713 | + } catch (PDOException $e) { |
|
| 714 | 714 | return "error"; |
| 715 | 715 | } |
| 716 | 716 | |
@@ -726,13 +726,13 @@ discard block |
||
| 726 | 726 | public function deleteLiveMarineDataById($id) |
| 727 | 727 | { |
| 728 | 728 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 729 | - $query = 'DELETE FROM marine_live WHERE fammarine_id = :id'; |
|
| 729 | + $query = 'DELETE FROM marine_live WHERE fammarine_id = :id'; |
|
| 730 | 730 | |
| 731 | 731 | try { |
| 732 | 732 | |
| 733 | 733 | $sth = $this->db->prepare($query); |
| 734 | 734 | $sth->execute(array(':id' => $id)); |
| 735 | - } catch(PDOException $e) { |
|
| 735 | + } catch (PDOException $e) { |
|
| 736 | 736 | return "error"; |
| 737 | 737 | } |
| 738 | 738 | |
@@ -750,13 +750,13 @@ discard block |
||
| 750 | 750 | { |
| 751 | 751 | global $globalDBdriver, $globalTimezone; |
| 752 | 752 | if ($globalDBdriver == 'mysql') { |
| 753 | - $query = 'SELECT marine_live.ident FROM marine_live |
|
| 753 | + $query = 'SELECT marine_live.ident FROM marine_live |
|
| 754 | 754 | WHERE marine_live.ident = :ident |
| 755 | 755 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 756 | 756 | AND marine_live.date < UTC_TIMESTAMP()'; |
| 757 | 757 | $query_data = array(':ident' => $ident); |
| 758 | 758 | } else { |
| 759 | - $query = "SELECT marine_live.ident FROM marine_live |
|
| 759 | + $query = "SELECT marine_live.ident FROM marine_live |
|
| 760 | 760 | WHERE marine_live.ident = :ident |
| 761 | 761 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 762 | 762 | AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -765,8 +765,8 @@ discard block |
||
| 765 | 765 | |
| 766 | 766 | $sth = $this->db->prepare($query); |
| 767 | 767 | $sth->execute($query_data); |
| 768 | - $ident_result=''; |
|
| 769 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 768 | + $ident_result = ''; |
|
| 769 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 770 | 770 | { |
| 771 | 771 | $ident_result = $row['ident']; |
| 772 | 772 | } |
@@ -783,13 +783,13 @@ discard block |
||
| 783 | 783 | { |
| 784 | 784 | global $globalDBdriver, $globalTimezone; |
| 785 | 785 | if ($globalDBdriver == 'mysql') { |
| 786 | - $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 786 | + $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 787 | 787 | WHERE marine_live.ident = :ident |
| 788 | 788 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 789 | 789 | // AND marine_live.date < UTC_TIMESTAMP()"; |
| 790 | 790 | $query_data = array(':ident' => $ident); |
| 791 | 791 | } else { |
| 792 | - $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 792 | + $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 793 | 793 | WHERE marine_live.ident = :ident |
| 794 | 794 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'"; |
| 795 | 795 | // AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -798,8 +798,8 @@ discard block |
||
| 798 | 798 | |
| 799 | 799 | $sth = $this->db->prepare($query); |
| 800 | 800 | $sth->execute($query_data); |
| 801 | - $ident_result=''; |
|
| 802 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 801 | + $ident_result = ''; |
|
| 802 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 803 | 803 | { |
| 804 | 804 | $ident_result = $row['fammarine_id']; |
| 805 | 805 | } |
@@ -816,13 +816,13 @@ discard block |
||
| 816 | 816 | { |
| 817 | 817 | global $globalDBdriver, $globalTimezone; |
| 818 | 818 | if ($globalDBdriver == 'mysql') { |
| 819 | - $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 819 | + $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 820 | 820 | WHERE marine_live.fammarine_id = :id |
| 821 | 821 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 822 | 822 | // AND marine_live.date < UTC_TIMESTAMP()"; |
| 823 | 823 | $query_data = array(':id' => $id); |
| 824 | 824 | } else { |
| 825 | - $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 825 | + $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 826 | 826 | WHERE marine_live.fammarine_id = :id |
| 827 | 827 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 828 | 828 | // AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -831,8 +831,8 @@ discard block |
||
| 831 | 831 | |
| 832 | 832 | $sth = $this->db->prepare($query); |
| 833 | 833 | $sth->execute($query_data); |
| 834 | - $ident_result=''; |
|
| 835 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 834 | + $ident_result = ''; |
|
| 835 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 836 | 836 | { |
| 837 | 837 | $ident_result = $row['fammarine_id']; |
| 838 | 838 | } |
@@ -849,13 +849,13 @@ discard block |
||
| 849 | 849 | { |
| 850 | 850 | global $globalDBdriver, $globalTimezone; |
| 851 | 851 | if ($globalDBdriver == 'mysql') { |
| 852 | - $query = 'SELECT marine_live.fammarine_id FROM marine_live |
|
| 852 | + $query = 'SELECT marine_live.fammarine_id FROM marine_live |
|
| 853 | 853 | WHERE marine_live.mmsi = :mmsi |
| 854 | 854 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 855 | 855 | // AND marine_live.date < UTC_TIMESTAMP()"; |
| 856 | 856 | $query_data = array(':mmsi' => $mmsi); |
| 857 | 857 | } else { |
| 858 | - $query = "SELECT marine_live.fammarine_id FROM marine_live |
|
| 858 | + $query = "SELECT marine_live.fammarine_id FROM marine_live |
|
| 859 | 859 | WHERE marine_live.mmsi = :mmsi |
| 860 | 860 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 861 | 861 | // AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -864,8 +864,8 @@ discard block |
||
| 864 | 864 | |
| 865 | 865 | $sth = $this->db->prepare($query); |
| 866 | 866 | $sth->execute($query_data); |
| 867 | - $ident_result=''; |
|
| 868 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 867 | + $ident_result = ''; |
|
| 868 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 869 | 869 | { |
| 870 | 870 | $ident_result = $row['fammarine_id']; |
| 871 | 871 | } |
@@ -883,7 +883,7 @@ discard block |
||
| 883 | 883 | * @return String success or false |
| 884 | 884 | * |
| 885 | 885 | */ |
| 886 | - 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 = '') |
|
| 886 | + 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 = '') |
|
| 887 | 887 | { |
| 888 | 888 | global $globalURL, $globalArchive, $globalDebug; |
| 889 | 889 | $Common = new Common(); |
@@ -935,26 +935,26 @@ discard block |
||
| 935 | 935 | if ($date == '') $date = date("Y-m-d H:i:s", time()); |
| 936 | 936 | |
| 937 | 937 | |
| 938 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
| 939 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 940 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 941 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 942 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 943 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 944 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 945 | - $source_name = filter_var($source_name,FILTER_SANITIZE_STRING); |
|
| 946 | - $over_country = filter_var($over_country,FILTER_SANITIZE_STRING); |
|
| 947 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 948 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
|
| 949 | - $status = filter_var($status,FILTER_SANITIZE_STRING); |
|
| 950 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
| 951 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 952 | - $arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING); |
|
| 953 | - $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
|
| 938 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
| 939 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 940 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 941 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 942 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 943 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 944 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 945 | + $source_name = filter_var($source_name, FILTER_SANITIZE_STRING); |
|
| 946 | + $over_country = filter_var($over_country, FILTER_SANITIZE_STRING); |
|
| 947 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 948 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT); |
|
| 949 | + $status = filter_var($status, FILTER_SANITIZE_STRING); |
|
| 950 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
| 951 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 952 | + $arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING); |
|
| 953 | + $arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING); |
|
| 954 | 954 | |
| 955 | 955 | |
| 956 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 957 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 956 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 957 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 958 | 958 | if ($arrival_date == '') $arrival_date = NULL; |
| 959 | 959 | $query = ''; |
| 960 | 960 | if ($globalArchive) { |
@@ -964,19 +964,19 @@ discard block |
||
| 964 | 964 | $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) |
| 965 | 965 | 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)'; |
| 966 | 966 | |
| 967 | - $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); |
|
| 967 | + $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); |
|
| 968 | 968 | try { |
| 969 | 969 | $sth = $this->db->prepare($query); |
| 970 | 970 | $sth->execute($query_values); |
| 971 | 971 | $sth->closeCursor(); |
| 972 | - } catch(PDOException $e) { |
|
| 972 | + } catch (PDOException $e) { |
|
| 973 | 973 | return "error : ".$e->getMessage(); |
| 974 | 974 | } |
| 975 | 975 | |
| 976 | 976 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 977 | 977 | if ($globalDebug) echo '(Add to Marine archive : '; |
| 978 | 978 | $MarineArchive = new MarineArchive($this->db); |
| 979 | - $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); |
|
| 979 | + $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); |
|
| 980 | 980 | if ($globalDebug) echo $result.')'; |
| 981 | 981 | } |
| 982 | 982 | return "success"; |
@@ -984,7 +984,7 @@ discard block |
||
| 984 | 984 | |
| 985 | 985 | public function getOrderBy() |
| 986 | 986 | { |
| 987 | - $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")); |
|
| 987 | + $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")); |
|
| 988 | 988 | return $orderby; |
| 989 | 989 | } |
| 990 | 990 | |
@@ -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 | $Marine = new Marine($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 | $Marine = new Marine($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 | /* |
| 322 | 369 | if ($globalDBdriver == 'mysql') { |
| 323 | 370 | $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 |
@@ -526,11 +573,15 @@ discard block |
||
| 526 | 573 | //$query = self::$global_query.' WHERE marine_live.fammarine_id = :id ORDER BY date'; |
| 527 | 574 | if ($globalDBdriver == 'mysql') { |
| 528 | 575 | $query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id'; |
| 529 | - if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 576 | + if ($liveinterval) { |
|
| 577 | + $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 578 | + } |
|
| 530 | 579 | $query .= ' ORDER BY date'; |
| 531 | 580 | } else { |
| 532 | 581 | $query = 'SELECT marine_live.* FROM marine_live WHERE marine_live.fammarine_id = :id'; |
| 533 | - if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 582 | + if ($liveinterval) { |
|
| 583 | + $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 584 | + } |
|
| 534 | 585 | $query .= ' ORDER BY date'; |
| 535 | 586 | } |
| 536 | 587 | |
@@ -625,7 +676,9 @@ discard block |
||
| 625 | 676 | $i++; |
| 626 | 677 | $j++; |
| 627 | 678 | if ($j == 30) { |
| 628 | - if ($globalDebug) echo "."; |
|
| 679 | + if ($globalDebug) { |
|
| 680 | + echo "."; |
|
| 681 | + } |
|
| 629 | 682 | try { |
| 630 | 683 | |
| 631 | 684 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
@@ -905,7 +958,9 @@ discard block |
||
| 905 | 958 | { |
| 906 | 959 | return false; |
| 907 | 960 | } |
| 908 | - } else return ''; |
|
| 961 | + } else { |
|
| 962 | + return ''; |
|
| 963 | + } |
|
| 909 | 964 | |
| 910 | 965 | if ($longitude != '') |
| 911 | 966 | { |
@@ -913,7 +968,9 @@ discard block |
||
| 913 | 968 | { |
| 914 | 969 | return false; |
| 915 | 970 | } |
| 916 | - } else return ''; |
|
| 971 | + } else { |
|
| 972 | + return ''; |
|
| 973 | + } |
|
| 917 | 974 | |
| 918 | 975 | |
| 919 | 976 | if ($heading != '') |
@@ -922,7 +979,9 @@ discard block |
||
| 922 | 979 | { |
| 923 | 980 | return false; |
| 924 | 981 | } |
| 925 | - } else $heading = 0; |
|
| 982 | + } else { |
|
| 983 | + $heading = 0; |
|
| 984 | + } |
|
| 926 | 985 | |
| 927 | 986 | if ($groundspeed != '') |
| 928 | 987 | { |
@@ -930,9 +989,13 @@ discard block |
||
| 930 | 989 | { |
| 931 | 990 | return false; |
| 932 | 991 | } |
| 933 | - } else $groundspeed = 0; |
|
| 992 | + } else { |
|
| 993 | + $groundspeed = 0; |
|
| 994 | + } |
|
| 934 | 995 | date_default_timezone_set('UTC'); |
| 935 | - if ($date == '') $date = date("Y-m-d H:i:s", time()); |
|
| 996 | + if ($date == '') { |
|
| 997 | + $date = date("Y-m-d H:i:s", time()); |
|
| 998 | + } |
|
| 936 | 999 | |
| 937 | 1000 | |
| 938 | 1001 | $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
@@ -953,12 +1016,20 @@ discard block |
||
| 953 | 1016 | $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
| 954 | 1017 | |
| 955 | 1018 | |
| 956 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 957 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 958 | - if ($arrival_date == '') $arrival_date = NULL; |
|
| 1019 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) { |
|
| 1020 | + $groundspeed = 0; |
|
| 1021 | + } |
|
| 1022 | + if ($heading == '' || $Common->isInteger($heading) === false ) { |
|
| 1023 | + $heading = 0; |
|
| 1024 | + } |
|
| 1025 | + if ($arrival_date == '') { |
|
| 1026 | + $arrival_date = NULL; |
|
| 1027 | + } |
|
| 959 | 1028 | $query = ''; |
| 960 | 1029 | if ($globalArchive) { |
| 961 | - if ($globalDebug) echo '-- Delete previous data -- '; |
|
| 1030 | + if ($globalDebug) { |
|
| 1031 | + echo '-- Delete previous data -- '; |
|
| 1032 | + } |
|
| 962 | 1033 | $query .= 'DELETE FROM marine_live WHERE fammarine_id = :fammarine_id;'; |
| 963 | 1034 | } |
| 964 | 1035 | $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) |
@@ -974,10 +1045,14 @@ discard block |
||
| 974 | 1045 | } |
| 975 | 1046 | |
| 976 | 1047 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 977 | - if ($globalDebug) echo '(Add to Marine archive : '; |
|
| 1048 | + if ($globalDebug) { |
|
| 1049 | + echo '(Add to Marine archive : '; |
|
| 1050 | + } |
|
| 978 | 1051 | $MarineArchive = new MarineArchive($this->db); |
| 979 | 1052 | $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); |
| 980 | - if ($globalDebug) echo $result.')'; |
|
| 1053 | + if ($globalDebug) { |
|
| 1054 | + echo $result.')'; |
|
| 1055 | + } |
|
| 981 | 1056 | } |
| 982 | 1057 | return "success"; |
| 983 | 1058 | } |
