Ysurac /
FlightAirMap
| @@ 29-31 (lines=3) @@ | ||
| 26 | if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 27 | $filter_query = " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 28 | } |
|
| 29 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 30 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_live.flightaware_id"; |
|
| 31 | } |
|
| 32 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 33 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
|
| 34 | } |
|
| @@ 84-86 (lines=3) @@ | ||
| 81 | if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 82 | $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 83 | } |
|
| 84 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 85 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_live.flightaware_id "; |
|
| 86 | } |
|
| 87 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 88 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
|
| 89 | } |
|
| @@ 142-144 (lines=3) @@ | ||
| 139 | if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 140 | $filter_query = " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 141 | } |
|
| 142 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 143 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_live.flightaware_id"; |
|
| 144 | } |
|
| 145 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 146 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
|
| 147 | } |
|
| @@ 182-184 (lines=3) @@ | ||
| 179 | $Spotter = new Spotter($this->db); |
|
| 180 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 181 | $filter_query = ''; |
|
| 182 | if (isset($filter['source'])) { |
|
| 183 | $filter_query = " AND format_source IN ('".implode(',',$filter['source'])."')"; |
|
| 184 | } |
|
| 185 | if (isset($filter['airlines'])) { |
|
| 186 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_live.flightaware_id"; |
|
| 187 | } |
|
| @@ 185-187 (lines=3) @@ | ||
| 182 | if (isset($filter['source'])) { |
|
| 183 | $filter_query = " AND format_source IN ('".implode(',',$filter['source'])."')"; |
|
| 184 | } |
|
| 185 | if (isset($filter['airlines'])) { |
|
| 186 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_live.flightaware_id"; |
|
| 187 | } |
|
| 188 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 189 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
|
| 190 | } |
|
| @@ 35-37 (lines=3) @@ | ||
| 32 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 33 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
|
| 34 | } |
|
| 35 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 36 | $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 37 | } |
|
| 38 | ||
| 39 | $limit_query = ''; |
|
| 40 | if ($limit != '') |
|
| @@ 81-83 (lines=3) @@ | ||
| 78 | date_default_timezone_set('UTC'); |
|
| 79 | ||
| 80 | $filter_query = ''; |
|
| 81 | if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 82 | $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 83 | } |
|
| 84 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 85 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_live.flightaware_id "; |
|
| 86 | } |
|
| @@ 90-92 (lines=3) @@ | ||
| 87 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 88 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
|
| 89 | } |
|
| 90 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 91 | $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 92 | } |
|
| 93 | ||
| 94 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 95 | if ($globalDBdriver == 'mysql') { |
|
| @@ 148-150 (lines=3) @@ | ||
| 145 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 146 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
|
| 147 | } |
|
| 148 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 149 | $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 150 | } |
|
| 151 | ||
| 152 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 153 | if ($globalDBdriver == 'mysql') { |
|
| @@ 191-193 (lines=3) @@ | ||
| 188 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 189 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
|
| 190 | } |
|
| 191 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 192 | $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 193 | } |
|
| 194 | ||
| 195 | if (is_array($coord)) { |
|
| 196 | $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| @@ 291-293 (lines=3) @@ | ||
| 288 | date_default_timezone_set('UTC'); |
|
| 289 | ||
| 290 | $filter_query = ''; |
|
| 291 | if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 292 | $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 293 | } |
|
| 294 | // Use spotter_output also ? |
|
| 295 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 296 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| @@ 295-297 (lines=3) @@ | ||
| 292 | $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 293 | } |
|
| 294 | // Use spotter_output also ? |
|
| 295 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 296 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 297 | } |
|
| 298 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 299 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 300 | } |
|
| @@ 301-303 (lines=3) @@ | ||
| 298 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 299 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 300 | } |
|
| 301 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 302 | $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 303 | } |
|
| 304 | ||
| 305 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 306 | if ($globalDBdriver == 'mysql') { |
|
| @@ 346-348 (lines=3) @@ | ||
| 343 | date_default_timezone_set('UTC'); |
|
| 344 | ||
| 345 | $filter_query = ''; |
|
| 346 | if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 347 | $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 348 | } |
|
| 349 | // FIXME : use spotter_output also |
|
| 350 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 351 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| @@ 350-352 (lines=3) @@ | ||
| 347 | $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 348 | } |
|
| 349 | // FIXME : use spotter_output also |
|
| 350 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 351 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 352 | } |
|
| 353 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 354 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 355 | } |
|
| @@ 356-358 (lines=3) @@ | ||
| 353 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 354 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_archive_output WHERE spotter_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 355 | } |
|
| 356 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 357 | $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 358 | } |
|
| 359 | ||
| 360 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 361 | if ($globalDBdriver == 'mysql') { |
|
| @@ 412-414 (lines=3) @@ | ||
| 409 | date_default_timezone_set('UTC'); |
|
| 410 | ||
| 411 | $filter_query = ''; |
|
| 412 | if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 413 | $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 414 | } |
|
| 415 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 416 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 417 | } |
|
| @@ 415-417 (lines=3) @@ | ||
| 412 | if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 413 | $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 414 | } |
|
| 415 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 416 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.flightaware_id = spotter_archive.flightaware_id "; |
|
| 417 | } |
|
| 418 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 419 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 420 | } |
|
| @@ 421-423 (lines=3) @@ | ||
| 418 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 419 | $filter_query .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_archive.flightaware_id "; |
|
| 420 | } |
|
| 421 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 422 | $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 423 | } |
|
| 424 | ||
| 425 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 426 | if ($globalDBdriver == 'mysql') { |
|
