Ysurac /
FlightAirMap
@@ -39,30 +39,30 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | |
| 41 | 41 | function quaternionrotate($heading, $attitude = 0, $bank = 0) { |
| 42 | - // Assuming the angles are in radians. |
|
| 43 | - $c1 = cos($heading/2); |
|
| 44 | - $s1 = sin($heading/2); |
|
| 45 | - $c2 = cos($attitude/2); |
|
| 46 | - $s2 = sin($attitude/2); |
|
| 47 | - $c3 = cos($bank/2); |
|
| 48 | - $s3 = sin($bank/2); |
|
| 49 | - $c1c2 = $c1*$c2; |
|
| 50 | - $s1s2 = $s1*$s2; |
|
| 51 | - $w =$c1c2*$c3 - $s1s2*$s3; |
|
| 52 | - $x =$c1c2*$s3 + $s1s2*$c3; |
|
| 53 | - $y =$s1*$c2*$c3 + $c1*$s2*$s3; |
|
| 54 | - $z =$c1*$s2*$c3 - $s1*$c2*$s3; |
|
| 55 | - return array('x' => $x,'y' => $y,'z' => $z,'w' => $w); |
|
| 42 | + // Assuming the angles are in radians. |
|
| 43 | + $c1 = cos($heading/2); |
|
| 44 | + $s1 = sin($heading/2); |
|
| 45 | + $c2 = cos($attitude/2); |
|
| 46 | + $s2 = sin($attitude/2); |
|
| 47 | + $c3 = cos($bank/2); |
|
| 48 | + $s3 = sin($bank/2); |
|
| 49 | + $c1c2 = $c1*$c2; |
|
| 50 | + $s1s2 = $s1*$s2; |
|
| 51 | + $w =$c1c2*$c3 - $s1s2*$s3; |
|
| 52 | + $x =$c1c2*$s3 + $s1s2*$c3; |
|
| 53 | + $y =$s1*$c2*$c3 + $c1*$s2*$s3; |
|
| 54 | + $z =$c1*$s2*$c3 - $s1*$c2*$s3; |
|
| 55 | + return array('x' => $x,'y' => $y,'z' => $z,'w' => $w); |
|
| 56 | 56 | // return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365'); |
| 57 | 57 | |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | |
| 61 | 61 | if (isset($_GET['download'])) { |
| 62 | - if ($_GET['download'] == "true") |
|
| 63 | - { |
|
| 62 | + if ($_GET['download'] == "true") |
|
| 63 | + { |
|
| 64 | 64 | header('Content-disposition: attachment; filename="flightairmap.json"'); |
| 65 | - } |
|
| 65 | + } |
|
| 66 | 66 | } |
| 67 | 67 | header('Content-Type: text/javascript'); |
| 68 | 68 | |
@@ -239,10 +239,10 @@ discard block |
||
| 239 | 239 | $image = "images/placeholder_thumb.png"; |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | - if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id']; |
|
| 243 | - elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid']; |
|
| 244 | - elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id']; |
|
| 245 | - if ($prev_flightaware_id != $id) { |
|
| 242 | + if (isset($spotter_item['flightaware_id'])) $id = $spotter_item['flightaware_id']; |
|
| 243 | + elseif (isset($spotter_item['famtrackid'])) $id = $spotter_item['famtrackid']; |
|
| 244 | + elseif (isset($spotter_item['fammarine_id'])) $id = $spotter_item['fammarine_id']; |
|
| 245 | + if ($prev_flightaware_id != $id) { |
|
| 246 | 246 | if ($prev_flightaware_id != '') { |
| 247 | 247 | if ($nblatlong == 1) { |
| 248 | 248 | $output .= ',"'.date("c").'", '; |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | $spotter_item['wake_category'] = $aircraft_info[0]['wake_category']; |
| 302 | 302 | $spotter_item['engine_count'] = $aircraft_info[0]['engine_count']; |
| 303 | 303 | } else $aircraft_shadow = ''; |
| 304 | - $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5'; |
|
| 304 | + $output .= ' "billboard" : {"image" : "'.$globalURL.'/images/aircrafts/new/'.$aircraft_shadow.'","scale" : 0.5'; |
|
| 305 | 305 | if (isset($_COOKIE['IconColorForce']) && $_COOKIE['IconColorForce'] && isset($_COOKIE['IconColor'])) { |
| 306 | 306 | $rgb = $Common->hex2rgb($_COOKIE['IconColor']); |
| 307 | 307 | $output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}'; |
@@ -331,7 +331,7 @@ discard block |
||
| 331 | 331 | $rgb = $Common->hex2rgb($_COOKIE['IconColor']); |
| 332 | 332 | $output .= ',"color": {"rgba" : ['.$rgb[0].','.$rgb[1].','.$rgb[2].',255]}'; |
| 333 | 333 | } |
| 334 | - $output .= '},'; |
|
| 334 | + $output .= '},'; |
|
| 335 | 335 | } elseif ($aircraft_icao != '') { |
| 336 | 336 | $aircraft_info = $Spotter->getAllAircraftInfo($aircraft_icao); |
| 337 | 337 | if (isset($aircraft_info[0]['engine_type'])) { |
@@ -9,20 +9,20 @@ discard block |
||
| 9 | 9 | require_once(dirname(__FILE__).'/class.Source.php'); |
| 10 | 10 | require_once(dirname(__FILE__).'/class.GeoidHeight.php'); |
| 11 | 11 | if (isset($globalServerAPRS) && $globalServerAPRS) { |
| 12 | - require_once(dirname(__FILE__).'/class.APRS.php'); |
|
| 12 | + require_once(dirname(__FILE__).'/class.APRS.php'); |
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | class SpotterImport { |
| 16 | - private $all_flights = array(); |
|
| 17 | - private $last_delete_hourly = 0; |
|
| 18 | - private $last_delete = 0; |
|
| 19 | - private $stats = array(); |
|
| 20 | - private $tmd = 0; |
|
| 21 | - private $source_location = array(); |
|
| 22 | - public $db = null; |
|
| 23 | - public $nb = 0; |
|
| 16 | + private $all_flights = array(); |
|
| 17 | + private $last_delete_hourly = 0; |
|
| 18 | + private $last_delete = 0; |
|
| 19 | + private $stats = array(); |
|
| 20 | + private $tmd = 0; |
|
| 21 | + private $source_location = array(); |
|
| 22 | + public $db = null; |
|
| 23 | + public $nb = 0; |
|
| 24 | 24 | |
| 25 | - public function __construct($dbc = null) { |
|
| 25 | + public function __construct($dbc = null) { |
|
| 26 | 26 | global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB, $GeoidClass, $globalDebug, $globalGeoid; |
| 27 | 27 | if (!(isset($globalNoDB) && $globalNoDB)) { |
| 28 | 28 | $Connection = new Connection($dbc); |
@@ -34,14 +34,14 @@ discard block |
||
| 34 | 34 | $currentdate = date('Y-m-d'); |
| 35 | 35 | $sourcestat = $Stats->getStatsSource($currentdate); |
| 36 | 36 | if (!empty($sourcestat)) { |
| 37 | - foreach($sourcestat as $srcst) { |
|
| 38 | - $type = $srcst['stats_type']; |
|
| 37 | + foreach($sourcestat as $srcst) { |
|
| 38 | + $type = $srcst['stats_type']; |
|
| 39 | 39 | if ($type == 'polar' || $type == 'hist') { |
| 40 | - $source = $srcst['source_name']; |
|
| 41 | - $data = $srcst['source_data']; |
|
| 42 | - $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 43 | - } |
|
| 44 | - } |
|
| 40 | + $source = $srcst['source_name']; |
|
| 41 | + $data = $srcst['source_data']; |
|
| 42 | + $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 43 | + } |
|
| 44 | + } |
|
| 45 | 45 | } |
| 46 | 46 | } |
| 47 | 47 | if (isset($globalServerAPRS) && $globalServerAPRS) { |
@@ -56,9 +56,9 @@ discard block |
||
| 56 | 56 | $GeoidClass = FALSE; |
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | - } |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - public function get_Schedule($id,$ident) { |
|
| 61 | + public function get_Schedule($id,$ident) { |
|
| 62 | 62 | global $globalDebug, $globalFork, $globalSchedulesFetch; |
| 63 | 63 | // Get schedule here, so it's done only one time |
| 64 | 64 | |
@@ -78,42 +78,42 @@ discard block |
||
| 78 | 78 | $operator = $Spotter->getOperator($ident); |
| 79 | 79 | $scheduleexist = false; |
| 80 | 80 | if ($Schedule->checkSchedule($operator) == 0) { |
| 81 | - $operator = $Translation->checkTranslation($ident); |
|
| 82 | - if ($Schedule->checkSchedule($operator) == 0) { |
|
| 81 | + $operator = $Translation->checkTranslation($ident); |
|
| 82 | + if ($Schedule->checkSchedule($operator) == 0) { |
|
| 83 | 83 | $schedule = $Schedule->fetchSchedule($operator); |
| 84 | 84 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 85 | - if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 86 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 87 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 88 | - // Should also check if route schedule = route from DB |
|
| 89 | - if ($schedule['DepartureAirportIATA'] != '') { |
|
| 85 | + if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 86 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 87 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 88 | + // Should also check if route schedule = route from DB |
|
| 89 | + if ($schedule['DepartureAirportIATA'] != '') { |
|
| 90 | 90 | if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) { |
| 91 | - $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
|
| 92 | - if (trim($airport_icao) != '') { |
|
| 91 | + $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
|
| 92 | + if (trim($airport_icao) != '') { |
|
| 93 | 93 | $this->all_flights[$id]['departure_airport'] = $airport_icao; |
| 94 | 94 | if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
| 95 | - } |
|
| 95 | + } |
|
| 96 | + } |
|
| 96 | 97 | } |
| 97 | - } |
|
| 98 | - if ($schedule['ArrivalAirportIATA'] != '') { |
|
| 98 | + if ($schedule['ArrivalAirportIATA'] != '') { |
|
| 99 | 99 | if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) { |
| 100 | - $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
|
| 101 | - if (trim($airport_icao) != '') { |
|
| 100 | + $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
|
| 101 | + if (trim($airport_icao) != '') { |
|
| 102 | 102 | $this->all_flights[$id]['arrival_airport'] = $airport_icao; |
| 103 | 103 | if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
| 104 | - } |
|
| 104 | + } |
|
| 105 | 105 | } |
| 106 | - } |
|
| 107 | - $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
|
| 106 | + } |
|
| 107 | + $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
|
| 108 | 108 | } |
| 109 | - } else $scheduleexist = true; |
|
| 109 | + } else $scheduleexist = true; |
|
| 110 | 110 | } else $scheduleexist = true; |
| 111 | 111 | // close connection, at least one way will work ? |
| 112 | - if ($scheduleexist) { |
|
| 112 | + if ($scheduleexist) { |
|
| 113 | 113 | if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
| 114 | - $sch = $Schedule->getSchedule($operator); |
|
| 114 | + $sch = $Schedule->getSchedule($operator); |
|
| 115 | 115 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time'])); |
| 116 | - } |
|
| 116 | + } |
|
| 117 | 117 | $Spotter->db = null; |
| 118 | 118 | $Schedule->db = null; |
| 119 | 119 | $Translation->db = null; |
@@ -128,78 +128,78 @@ discard block |
||
| 128 | 128 | } |
| 129 | 129 | */ |
| 130 | 130 | } |
| 131 | - } |
|
| 131 | + } |
|
| 132 | 132 | |
| 133 | - public function checkAll() { |
|
| 133 | + public function checkAll() { |
|
| 134 | 134 | global $globalDebug, $globalNoImport; |
| 135 | 135 | if ($globalDebug) echo "Update last seen flights data...\n"; |
| 136 | 136 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 137 | - foreach ($this->all_flights as $key => $flight) { |
|
| 137 | + foreach ($this->all_flights as $key => $flight) { |
|
| 138 | 138 | if (isset($this->all_flights[$key]['id'])) { |
| 139 | - //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
|
| 140 | - $Spotter = new Spotter($this->db); |
|
| 141 | - $real_arrival = $this->arrival($key); |
|
| 142 | - if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 143 | - } |
|
| 144 | - } |
|
| 139 | + //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
|
| 140 | + $Spotter = new Spotter($this->db); |
|
| 141 | + $real_arrival = $this->arrival($key); |
|
| 142 | + if (isset($this->all_flights[$key]['altitude']) && isset($this->all_flights[$key]['datetime'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 143 | + } |
|
| 144 | + } |
|
| 145 | + } |
|
| 145 | 146 | } |
| 146 | - } |
|
| 147 | 147 | |
| 148 | - public function arrival($key) { |
|
| 148 | + public function arrival($key) { |
|
| 149 | 149 | global $globalClosestMinDist, $globalDebug; |
| 150 | 150 | if ($globalDebug) echo 'Update arrival...'."\n"; |
| 151 | 151 | $Spotter = new Spotter($this->db); |
| 152 | - $airport_icao = ''; |
|
| 153 | - $airport_time = ''; |
|
| 154 | - if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 152 | + $airport_icao = ''; |
|
| 153 | + $airport_time = ''; |
|
| 154 | + if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 155 | 155 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 156 | - $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 157 | - if (isset($closestAirports[0])) { |
|
| 158 | - if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
|
| 159 | - $airport_icao = $closestAirports[0]['icao']; |
|
| 160 | - $airport_time = $this->all_flights[$key]['datetime']; |
|
| 161 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 162 | - } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
|
| 163 | - foreach ($closestAirports as $airport) { |
|
| 164 | - if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
|
| 165 | - $airport_icao = $airport['icao']; |
|
| 166 | - $airport_time = $this->all_flights[$key]['datetime']; |
|
| 167 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 168 | - break; |
|
| 169 | - } |
|
| 170 | - } |
|
| 171 | - } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 172 | - $airport_icao = $closestAirports[0]['icao']; |
|
| 173 | - $airport_time = $this->all_flights[$key]['datetime']; |
|
| 174 | - } else { |
|
| 175 | - if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 176 | - } |
|
| 177 | - } else { |
|
| 178 | - if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 179 | - } |
|
| 156 | + $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 157 | + if (isset($closestAirports[0])) { |
|
| 158 | + if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
|
| 159 | + $airport_icao = $closestAirports[0]['icao']; |
|
| 160 | + $airport_time = $this->all_flights[$key]['datetime']; |
|
| 161 | + if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 162 | + } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
|
| 163 | + foreach ($closestAirports as $airport) { |
|
| 164 | + if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
|
| 165 | + $airport_icao = $airport['icao']; |
|
| 166 | + $airport_time = $this->all_flights[$key]['datetime']; |
|
| 167 | + if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 168 | + break; |
|
| 169 | + } |
|
| 170 | + } |
|
| 171 | + } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 172 | + $airport_icao = $closestAirports[0]['icao']; |
|
| 173 | + $airport_time = $this->all_flights[$key]['datetime']; |
|
| 174 | + } else { |
|
| 175 | + if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 176 | + } |
|
| 177 | + } else { |
|
| 178 | + if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 179 | + } |
|
| 180 | 180 | |
| 181 | - } else { |
|
| 182 | - if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 183 | - } |
|
| 184 | - return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 185 | - } |
|
| 181 | + } else { |
|
| 182 | + if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 183 | + } |
|
| 184 | + return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 185 | + } |
|
| 186 | 186 | |
| 187 | 187 | |
| 188 | 188 | |
| 189 | - public function del() { |
|
| 189 | + public function del() { |
|
| 190 | 190 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 191 | 191 | // Delete old infos |
| 192 | 192 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 193 | 193 | foreach ($this->all_flights as $key => $flight) { |
| 194 | - if (isset($flight['lastupdate'])) { |
|
| 194 | + if (isset($flight['lastupdate'])) { |
|
| 195 | 195 | if ($flight['lastupdate'] < (time()-5900)) { |
| 196 | - $this->delKey($key); |
|
| 196 | + $this->delKey($key); |
|
| 197 | 197 | } |
| 198 | - } |
|
| 198 | + } |
|
| 199 | + } |
|
| 199 | 200 | } |
| 200 | - } |
|
| 201 | 201 | |
| 202 | - public function delKey($key) { |
|
| 202 | + public function delKey($key) { |
|
| 203 | 203 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 204 | 204 | // Delete old infos |
| 205 | 205 | if (isset($this->all_flights[$key]['id'])) { |
@@ -214,9 +214,9 @@ discard block |
||
| 214 | 214 | } |
| 215 | 215 | } |
| 216 | 216 | unset($this->all_flights[$key]); |
| 217 | - } |
|
| 217 | + } |
|
| 218 | 218 | |
| 219 | - public function add($line) { |
|
| 219 | + public function add($line) { |
|
| 220 | 220 | global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA, $globalAircraftMaxUpdate, $globalAircraftMinUpdate, $globalLiveInterval, $GeoidClass; |
| 221 | 221 | //if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE; |
| 222 | 222 | if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.01'; |
@@ -242,20 +242,20 @@ discard block |
||
| 242 | 242 | |
| 243 | 243 | // SBS format is CSV format |
| 244 | 244 | if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
| 245 | - //print_r($line); |
|
| 246 | - if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']); |
|
| 247 | - if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
|
| 245 | + //print_r($line); |
|
| 246 | + if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']); |
|
| 247 | + if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
|
| 248 | 248 | |
| 249 | 249 | // Increment message number |
| 250 | 250 | if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) { |
| 251 | - $current_date = date('Y-m-d'); |
|
| 252 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 253 | - else $source = ''; |
|
| 254 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 255 | - if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 256 | - $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 257 | - $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 258 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 251 | + $current_date = date('Y-m-d'); |
|
| 252 | + if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 253 | + else $source = ''; |
|
| 254 | + if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 255 | + if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 256 | + $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 257 | + $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 258 | + } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | /* |
@@ -271,54 +271,54 @@ discard block |
||
| 271 | 271 | //$this->db = $dbc; |
| 272 | 272 | |
| 273 | 273 | //$hex = trim($line['hex']); |
| 274 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 275 | - else $id = trim($line['id']); |
|
| 274 | + if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 275 | + else $id = trim($line['id']); |
|
| 276 | 276 | |
| 277 | 277 | if (!isset($this->all_flights[$id])) { |
| 278 | - if ($globalDebug) echo 'New flight...'."\n"; |
|
| 279 | - $this->all_flights[$id] = array(); |
|
| 280 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 281 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 282 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 283 | - if (!isset($line['id'])) { |
|
| 278 | + if ($globalDebug) echo 'New flight...'."\n"; |
|
| 279 | + $this->all_flights[$id] = array(); |
|
| 280 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 281 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 282 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 283 | + if (!isset($line['id'])) { |
|
| 284 | 284 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 285 | 285 | // if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
| 286 | 286 | // if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 287 | 287 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 288 | - //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 289 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 290 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 288 | + //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 289 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 290 | + if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 291 | 291 | } |
| 292 | 292 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 293 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 293 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 294 | 294 | } |
| 295 | 295 | |
| 296 | 296 | //print_r($this->all_flights); |
| 297 | 297 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 298 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 299 | - //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 298 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 299 | + //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 300 | 300 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 301 | - //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 302 | - if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') { |
|
| 301 | + //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 302 | + if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') { |
|
| 303 | 303 | $timeelapsed = microtime(true); |
| 304 | 304 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 305 | - $Spotter = new Spotter($this->db); |
|
| 306 | - if (isset($this->all_flights[$id]['source_type'])) { |
|
| 305 | + $Spotter = new Spotter($this->db); |
|
| 306 | + if (isset($this->all_flights[$id]['source_type'])) { |
|
| 307 | 307 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
| 308 | - } else { |
|
| 308 | + } else { |
|
| 309 | 309 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 310 | - } |
|
| 311 | - $Spotter->db = null; |
|
| 312 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 313 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 310 | + } |
|
| 311 | + $Spotter->db = null; |
|
| 312 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 313 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 314 | 314 | } |
| 315 | - } |
|
| 316 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 317 | - if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 315 | + } |
|
| 316 | + if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 317 | + if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 318 | 318 | } |
| 319 | - if (isset($line['id']) && !isset($line['hex'])) { |
|
| 320 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
|
| 321 | - } |
|
| 319 | + if (isset($line['id']) && !isset($line['hex'])) { |
|
| 320 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
|
| 321 | + } |
|
| 322 | 322 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 323 | 323 | $icao = $line['aircraft_icao']; |
| 324 | 324 | $Spotter = new Spotter($this->db); |
@@ -347,9 +347,9 @@ discard block |
||
| 347 | 347 | } |
| 348 | 348 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 349 | 349 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 350 | - if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
| 350 | + if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
| 351 | 351 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 352 | - } else { |
|
| 352 | + } else { |
|
| 353 | 353 | if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 354 | 354 | elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 355 | 355 | /* |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | print_r($line); |
| 359 | 359 | */ |
| 360 | 360 | return ''; |
| 361 | - } |
|
| 361 | + } |
|
| 362 | 362 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 363 | 363 | if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n"; |
| 364 | 364 | return ''; |
@@ -374,21 +374,21 @@ discard block |
||
| 374 | 374 | } |
| 375 | 375 | |
| 376 | 376 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 377 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 377 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 378 | 378 | } |
| 379 | 379 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 380 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 380 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 381 | 381 | } |
| 382 | 382 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 383 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 383 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 384 | 384 | } |
| 385 | 385 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 386 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 386 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 387 | 387 | } |
| 388 | 388 | |
| 389 | 389 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) { |
| 390 | 390 | |
| 391 | - if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 391 | + if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 392 | 392 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 393 | 393 | if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
| 394 | 394 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
@@ -397,23 +397,23 @@ discard block |
||
| 397 | 397 | elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 398 | 398 | elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 399 | 399 | } else { |
| 400 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 401 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 400 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 401 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 402 | 402 | $timeelapsed = microtime(true); |
| 403 | - $Spotter = new Spotter($this->db); |
|
| 404 | - $fromsource = NULL; |
|
| 405 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 406 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 403 | + $Spotter = new Spotter($this->db); |
|
| 404 | + $fromsource = NULL; |
|
| 405 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 406 | + elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 407 | 407 | elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
| 408 | 408 | elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
| 409 | 409 | elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
| 410 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 410 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 411 | 411 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 412 | 412 | $Spotter->db = null; |
| 413 | 413 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 414 | - } |
|
| 414 | + } |
|
| 415 | 415 | } |
| 416 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 416 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 417 | 417 | |
| 418 | 418 | /* |
| 419 | 419 | if (!isset($line['id'])) { |
@@ -423,63 +423,63 @@ discard block |
||
| 423 | 423 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 424 | 424 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 425 | 425 | */ |
| 426 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 426 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 427 | 427 | |
| 428 | - //$putinarchive = true; |
|
| 429 | - if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
| 428 | + //$putinarchive = true; |
|
| 429 | + if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
| 430 | 430 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
| 431 | - } |
|
| 432 | - if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
| 431 | + } |
|
| 432 | + if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
| 433 | 433 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
| 434 | - } |
|
| 435 | - if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
| 436 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 437 | - } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
| 434 | + } |
|
| 435 | + if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
| 436 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 437 | + } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
| 438 | 438 | $timeelapsed = microtime(true); |
| 439 | 439 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 440 | 440 | $Spotter = new Spotter($this->db); |
| 441 | 441 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 442 | 442 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 443 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 443 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 444 | 444 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 445 | - } |
|
| 446 | - } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
| 445 | + } |
|
| 446 | + } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
| 447 | 447 | $timeelapsed = microtime(true); |
| 448 | 448 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 449 | - $Spotter = new Spotter($this->db); |
|
| 450 | - $route = $Spotter->getRouteInfo(trim($line['ident'])); |
|
| 451 | - if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) { |
|
| 449 | + $Spotter = new Spotter($this->db); |
|
| 450 | + $route = $Spotter->getRouteInfo(trim($line['ident'])); |
|
| 451 | + if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) { |
|
| 452 | 452 | $Translation = new Translation($this->db); |
| 453 | 453 | $ident = $Translation->checkTranslation(trim($line['ident'])); |
| 454 | 454 | $route = $Spotter->getRouteInfo($ident); |
| 455 | 455 | $Translation->db = null; |
| 456 | - } |
|
| 457 | - $Spotter->db = null; |
|
| 458 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 459 | - } |
|
| 456 | + } |
|
| 457 | + $Spotter->db = null; |
|
| 458 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 459 | + } |
|
| 460 | 460 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 461 | - //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
| 462 | - if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
| 461 | + //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
| 462 | + if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
| 463 | 463 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop'])); |
| 464 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
|
| 465 | - } |
|
| 464 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
|
| 465 | + } |
|
| 466 | 466 | } |
| 467 | 467 | if (!isset($globalFork)) $globalFork = TRUE; |
| 468 | 468 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 469 | 469 | if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
| 470 | 470 | } |
| 471 | - } |
|
| 471 | + } |
|
| 472 | 472 | } |
| 473 | 473 | |
| 474 | 474 | if (isset($line['speed']) && $line['speed'] != '' && $line['speed'] != 0) { |
| 475 | 475 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 476 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 477 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 478 | - //$dataFound = true; |
|
| 476 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 477 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 478 | + //$dataFound = true; |
|
| 479 | 479 | } else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 480 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 481 | - if ($distance > 1000 && $distance < 10000) { |
|
| 482 | - // use datetime |
|
| 480 | + $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 481 | + if ($distance > 1000 && $distance < 10000) { |
|
| 482 | + // use datetime |
|
| 483 | 483 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 484 | 484 | $speed = $speed*3.6; |
| 485 | 485 | if ($speed < 1000) { |
@@ -488,48 +488,48 @@ discard block |
||
| 488 | 488 | } else { |
| 489 | 489 | if ($globalDebug) echo "ø IGNORED : Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 490 | 490 | } |
| 491 | - } |
|
| 491 | + } |
|
| 492 | 492 | } |
| 493 | 493 | |
| 494 | 494 | |
| 495 | 495 | |
| 496 | - if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 497 | - if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) { |
|
| 498 | - if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
| 499 | - return false; |
|
| 500 | - } |
|
| 501 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 502 | - else unset($timediff); |
|
| 503 | - if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']); |
|
| 504 | - else unset($timediff_archive); |
|
| 505 | - if ($this->tmd > 5 |
|
| 506 | - || (isset($line['format_source']) |
|
| 507 | - && $line['format_source'] == 'airwhere' |
|
| 508 | - && ((!isset($this->all_flights[$id]['latitude']) |
|
| 509 | - || !isset($this->all_flights[$id]['longitude'])) |
|
| 510 | - || (isset($this->all_flights[$id]['latitude']) |
|
| 511 | - && isset($this->all_flights[$id]['longitude']) |
|
| 512 | - && $this->all_flights[$id]['latitude'] != $line['latitude'] |
|
| 513 | - && $this->all_flights[$id]['longitude'] != $line['longitude'] |
|
| 514 | - ) |
|
| 515 | - ) |
|
| 516 | - ) |
|
| 517 | - || (isset($globalVA) && $globalVA) |
|
| 518 | - || (isset($globalIVAO) && $globalIVAO) |
|
| 519 | - || (isset($globalVATSIM) && $globalVATSIM) |
|
| 520 | - || (isset($globalphpVMS) && $globalphpVMS) |
|
| 521 | - || (isset($globalVAM) && $globalVAM) |
|
| 522 | - || !isset($timediff) |
|
| 523 | - || $timediff > $globalLiveInterval |
|
| 524 | - || ($timediff > 30 |
|
| 525 | - && isset($this->all_flights[$id]['latitude']) |
|
| 526 | - && isset($this->all_flights[$id]['longitude']) |
|
| 527 | - && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')) |
|
| 528 | - ) |
|
| 529 | - ) { |
|
| 496 | + if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 497 | + if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) { |
|
| 498 | + if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
| 499 | + return false; |
|
| 500 | + } |
|
| 501 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 502 | + else unset($timediff); |
|
| 503 | + if (isset($this->all_flights[$id]['time_last_archive_coord'])) $timediff_archive = round(time()-$this->all_flights[$id]['time_last_archive_coord']); |
|
| 504 | + else unset($timediff_archive); |
|
| 505 | + if ($this->tmd > 5 |
|
| 506 | + || (isset($line['format_source']) |
|
| 507 | + && $line['format_source'] == 'airwhere' |
|
| 508 | + && ((!isset($this->all_flights[$id]['latitude']) |
|
| 509 | + || !isset($this->all_flights[$id]['longitude'])) |
|
| 510 | + || (isset($this->all_flights[$id]['latitude']) |
|
| 511 | + && isset($this->all_flights[$id]['longitude']) |
|
| 512 | + && $this->all_flights[$id]['latitude'] != $line['latitude'] |
|
| 513 | + && $this->all_flights[$id]['longitude'] != $line['longitude'] |
|
| 514 | + ) |
|
| 515 | + ) |
|
| 516 | + ) |
|
| 517 | + || (isset($globalVA) && $globalVA) |
|
| 518 | + || (isset($globalIVAO) && $globalIVAO) |
|
| 519 | + || (isset($globalVATSIM) && $globalVATSIM) |
|
| 520 | + || (isset($globalphpVMS) && $globalphpVMS) |
|
| 521 | + || (isset($globalVAM) && $globalVAM) |
|
| 522 | + || !isset($timediff) |
|
| 523 | + || $timediff > $globalLiveInterval |
|
| 524 | + || ($timediff > 30 |
|
| 525 | + && isset($this->all_flights[$id]['latitude']) |
|
| 526 | + && isset($this->all_flights[$id]['longitude']) |
|
| 527 | + && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')) |
|
| 528 | + ) |
|
| 529 | + ) { |
|
| 530 | 530 | |
| 531 | 531 | if ((isset($timediff) && !isset($timediff_archive)) || (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude']))) { |
| 532 | - if ((isset($timediff_archive) && $timediff_archive > $globalAircraftMaxUpdate) |
|
| 532 | + if ((isset($timediff_archive) && $timediff_archive > $globalAircraftMaxUpdate) |
|
| 533 | 533 | || (isset($line['format_source']) && $line['format_source'] == 'airwhere') |
| 534 | 534 | || !$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
| 535 | 535 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
@@ -537,9 +537,9 @@ discard block |
||
| 537 | 537 | $this->all_flights[$id]['putinarchive'] = true; |
| 538 | 538 | $this->tmd = 0; |
| 539 | 539 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 540 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 541 | - $timeelapsed = microtime(true); |
|
| 542 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 540 | + if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 541 | + $timeelapsed = microtime(true); |
|
| 542 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 543 | 543 | $Spotter = new Spotter($this->db); |
| 544 | 544 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 545 | 545 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
@@ -547,11 +547,11 @@ discard block |
||
| 547 | 547 | $Spotter->db = null; |
| 548 | 548 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 549 | 549 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 550 | - } |
|
| 550 | + } |
|
| 551 | 551 | } |
| 552 | 552 | $this->all_flights[$id]['time_last_archive_coord'] = time(); |
| 553 | - } |
|
| 554 | - /* |
|
| 553 | + } |
|
| 554 | + /* |
|
| 555 | 555 | else { |
| 556 | 556 | if (!isset($timediff)) echo 'NO TIMEDIFF'; |
| 557 | 557 | else { |
@@ -565,16 +565,16 @@ discard block |
||
| 565 | 565 | } |
| 566 | 566 | |
| 567 | 567 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 568 | - //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
|
| 568 | + //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
|
| 569 | 569 | if (!isset($this->all_flights[$id]['archive_latitude'])) { |
| 570 | 570 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 571 | 571 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 572 | 572 | } |
| 573 | 573 | //if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) { |
| 574 | 574 | if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001)) { |
| 575 | - $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
| 576 | - $dataFound = true; |
|
| 577 | - $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 575 | + $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
| 576 | + $dataFound = true; |
|
| 577 | + $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 578 | 578 | } |
| 579 | 579 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 580 | 580 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
@@ -585,24 +585,24 @@ discard block |
||
| 585 | 585 | //$putinarchive = true; |
| 586 | 586 | } |
| 587 | 587 | */ |
| 588 | - /* |
|
| 588 | + /* |
|
| 589 | 589 | } elseif (isset($this->all_flights[$id]['latitude'])) { |
| 590 | 590 | if ($globalDebug) echo '!!! Strange latitude value - diff : '.abs($this->all_flights[$id]['latitude']-$line['latitude']).'- previous lat : '.$this->all_flights[$id]['latitude'].'- new lat : '.$line['latitude']."\n"; |
| 591 | 591 | } |
| 592 | 592 | */ |
| 593 | 593 | } |
| 594 | 594 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 595 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 596 | - //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == '' || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
|
| 595 | + if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 596 | + //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == '' || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
|
| 597 | 597 | if (!isset($this->all_flights[$id]['archive_longitude'])) { |
| 598 | 598 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 599 | 599 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 600 | 600 | } |
| 601 | 601 | //if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) { |
| 602 | 602 | if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || ($this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001)) { |
| 603 | - $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
| 604 | - $dataFound = true; |
|
| 605 | - $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 603 | + $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
| 604 | + $dataFound = true; |
|
| 605 | + $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 606 | 606 | } |
| 607 | 607 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 608 | 608 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
@@ -620,67 +620,67 @@ discard block |
||
| 620 | 620 | */ |
| 621 | 621 | } |
| 622 | 622 | |
| 623 | - } else if ($globalDebug && $timediff > 30) { |
|
| 623 | + } else if ($globalDebug && $timediff > 30) { |
|
| 624 | 624 | $this->tmd = $this->tmd + 1; |
| 625 | 625 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 626 | 626 | echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
| 627 | 627 | echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
| 628 | 628 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 629 | - } |
|
| 629 | + } |
|
| 630 | 630 | } |
| 631 | 631 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 632 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 633 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 632 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 633 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 634 | 634 | } |
| 635 | 635 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 636 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 637 | - //$dataFound = true; |
|
| 636 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 637 | + //$dataFound = true; |
|
| 638 | 638 | } |
| 639 | 639 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 640 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 640 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 641 | 641 | } |
| 642 | 642 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 643 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 643 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 644 | 644 | } |
| 645 | 645 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 646 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 647 | - //$dataFound = true; |
|
| 646 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 647 | + //$dataFound = true; |
|
| 648 | 648 | } |
| 649 | 649 | if (isset($line['ground']) && $line['ground'] != '') { |
| 650 | - if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
| 650 | + if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
| 651 | 651 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 652 | 652 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 653 | 653 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 654 | 654 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 655 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 655 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 656 | 656 | elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 657 | - } |
|
| 658 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 659 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 660 | - //$dataFound = true; |
|
| 657 | + } |
|
| 658 | + if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 659 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 660 | + //$dataFound = true; |
|
| 661 | 661 | } |
| 662 | 662 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 663 | - if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
|
| 664 | - if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 665 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 666 | - $highlight = ''; |
|
| 667 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 668 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 669 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 670 | - if ($highlight != '') { |
|
| 663 | + if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
|
| 664 | + if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 665 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 666 | + $highlight = ''; |
|
| 667 | + if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 668 | + if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 669 | + if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 670 | + if ($highlight != '') { |
|
| 671 | 671 | $timeelapsed = microtime(true); |
| 672 | 672 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 673 | - $Spotter = new Spotter($this->db); |
|
| 674 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 675 | - $Spotter->db = null; |
|
| 676 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 673 | + $Spotter = new Spotter($this->db); |
|
| 674 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 675 | + $Spotter->db = null; |
|
| 676 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 677 | 677 | } |
| 678 | 678 | //$putinarchive = true; |
| 679 | 679 | //$highlight = ''; |
| 680 | - } |
|
| 680 | + } |
|
| 681 | 681 | |
| 682 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 683 | - //$dataFound = true; |
|
| 682 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 683 | + //$dataFound = true; |
|
| 684 | 684 | } |
| 685 | 685 | |
| 686 | 686 | if (isset($line['altitude']) && $line['altitude'] != '') { |
@@ -691,13 +691,13 @@ discard block |
||
| 691 | 691 | $line['altitude'] = $line['altitude'] - $geoid; |
| 692 | 692 | } |
| 693 | 693 | } |
| 694 | - //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 694 | + //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 695 | 695 | if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
| 696 | 696 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
| 697 | 697 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
| 698 | 698 | //$dataFound = true; |
| 699 | - //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 700 | - if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
|
| 699 | + //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 700 | + if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
|
| 701 | 701 | if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 702 | 702 | if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
| 703 | 703 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
@@ -706,27 +706,27 @@ discard block |
||
| 706 | 706 | elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 707 | 707 | elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 708 | 708 | } |
| 709 | - } |
|
| 710 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
| 709 | + } |
|
| 710 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 714 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 714 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 715 | 715 | } |
| 716 | 716 | |
| 717 | 717 | if (isset($line['heading']) && $line['heading'] != '') { |
| 718 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 719 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 720 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 721 | - //$dataFound = true; |
|
| 718 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 719 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 720 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 721 | + //$dataFound = true; |
|
| 722 | 722 | } elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) { |
| 723 | - $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 724 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 725 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 726 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
|
| 723 | + $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 724 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 725 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 726 | + if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
|
| 727 | 727 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 728 | - // If not enough messages and ACARS set heading to 0 |
|
| 729 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 728 | + // If not enough messages and ACARS set heading to 0 |
|
| 729 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 730 | 730 | } |
| 731 | 731 | if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 732 | 732 | elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
@@ -739,125 +739,125 @@ discard block |
||
| 739 | 739 | //if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 740 | 740 | //if ($dataFound === true && isset($this->all_flights[$id]['hex'])) { |
| 741 | 741 | if ($dataFound === true && isset($this->all_flights[$id]['id'])) { |
| 742 | - $this->all_flights[$id]['lastupdate'] = time(); |
|
| 743 | - if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
| 744 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 745 | - //print_r($this->all_flights); |
|
| 746 | - //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
| 747 | - //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
| 748 | - if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
|
| 742 | + $this->all_flights[$id]['lastupdate'] = time(); |
|
| 743 | + if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
| 744 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 745 | + //print_r($this->all_flights); |
|
| 746 | + //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
| 747 | + //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
| 748 | + if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
|
| 749 | 749 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 750 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 751 | - $timeelapsed = microtime(true); |
|
| 752 | - $SpotterLive = new SpotterLive($this->db); |
|
| 753 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 750 | + if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 751 | + $timeelapsed = microtime(true); |
|
| 752 | + $SpotterLive = new SpotterLive($this->db); |
|
| 753 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 754 | 754 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 755 | 755 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 756 | - } elseif (isset($line['id'])) { |
|
| 756 | + } elseif (isset($line['id'])) { |
|
| 757 | 757 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 758 | 758 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 759 | - } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
| 759 | + } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
| 760 | 760 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 761 | 761 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 762 | - } else $recent_ident = ''; |
|
| 763 | - $SpotterLive->db=null; |
|
| 764 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 765 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 762 | + } else $recent_ident = ''; |
|
| 763 | + $SpotterLive->db=null; |
|
| 764 | + if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 765 | + elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 766 | 766 | } else $recent_ident = ''; |
| 767 | - } else { |
|
| 767 | + } else { |
|
| 768 | 768 | $recent_ident = ''; |
| 769 | 769 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
| 770 | - } |
|
| 771 | - //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 772 | - if($recent_ident == "") |
|
| 773 | - { |
|
| 770 | + } |
|
| 771 | + //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 772 | + if($recent_ident == "") |
|
| 773 | + { |
|
| 774 | 774 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 775 | 775 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 776 | 776 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 777 | 777 | //adds the spotter data for the archive |
| 778 | 778 | $ignoreImport = false; |
| 779 | 779 | foreach($globalAirportIgnore as $airportIgnore) { |
| 780 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 780 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 781 | 781 | $ignoreImport = true; |
| 782 | - } |
|
| 782 | + } |
|
| 783 | 783 | } |
| 784 | 784 | if (count($globalAirportAccept) > 0) { |
| 785 | - $ignoreImport = true; |
|
| 786 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 785 | + $ignoreImport = true; |
|
| 786 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 787 | 787 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 788 | - $ignoreImport = false; |
|
| 788 | + $ignoreImport = false; |
|
| 789 | + } |
|
| 789 | 790 | } |
| 790 | - } |
|
| 791 | 791 | } |
| 792 | 792 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 793 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 793 | + foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 794 | 794 | if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
| 795 | - $ignoreImport = true; |
|
| 795 | + $ignoreImport = true; |
|
| 796 | + } |
|
| 796 | 797 | } |
| 797 | - } |
|
| 798 | 798 | } |
| 799 | 799 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 800 | - $ignoreImport = true; |
|
| 801 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 800 | + $ignoreImport = true; |
|
| 801 | + foreach($globalAirlineAccept as $airlineAccept) { |
|
| 802 | 802 | if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
| 803 | - $ignoreImport = false; |
|
| 803 | + $ignoreImport = false; |
|
| 804 | + } |
|
| 804 | 805 | } |
| 805 | - } |
|
| 806 | 806 | } |
| 807 | 807 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 808 | - $ignoreImport = true; |
|
| 809 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 808 | + $ignoreImport = true; |
|
| 809 | + foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 810 | 810 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 811 | - $ignoreImport = false; |
|
| 811 | + $ignoreImport = false; |
|
| 812 | + } |
|
| 812 | 813 | } |
| 813 | - } |
|
| 814 | 814 | } |
| 815 | 815 | |
| 816 | 816 | if (!$ignoreImport) { |
| 817 | - $highlight = ''; |
|
| 818 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 819 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 820 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 821 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 822 | - $timeelapsed = microtime(true); |
|
| 823 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 817 | + $highlight = ''; |
|
| 818 | + if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 819 | + if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 820 | + if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 821 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 822 | + $timeelapsed = microtime(true); |
|
| 823 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 824 | 824 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 825 | - $Spotter = new Spotter($this->db); |
|
| 826 | - $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
| 827 | - $Spotter->db = null; |
|
| 828 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 825 | + $Spotter = new Spotter($this->db); |
|
| 826 | + $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
| 827 | + $Spotter->db = null; |
|
| 828 | + if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 829 | 829 | } |
| 830 | - } |
|
| 831 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 832 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 830 | + } |
|
| 831 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 832 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 833 | 833 | |
| 834 | - // Add source stat in DB |
|
| 835 | - $Stats = new Stats($this->db); |
|
| 836 | - if (!empty($this->stats)) { |
|
| 834 | + // Add source stat in DB |
|
| 835 | + $Stats = new Stats($this->db); |
|
| 836 | + if (!empty($this->stats)) { |
|
| 837 | 837 | if ($globalDebug) echo 'Add source stats : '; |
| 838 | - foreach($this->stats as $date => $data) { |
|
| 839 | - foreach($data as $source => $sourced) { |
|
| 840 | - //print_r($sourced); |
|
| 841 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 842 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 843 | - if (isset($sourced['msg'])) { |
|
| 844 | - if (time() - $sourced['msg']['date'] > 10) { |
|
| 845 | - $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 846 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 847 | - unset($this->stats[$date][$source]['msg']); |
|
| 848 | - } |
|
| 849 | - } |
|
| 850 | - } |
|
| 851 | - if ($date != date('Y-m-d')) { |
|
| 852 | - unset($this->stats[$date]); |
|
| 853 | - } |
|
| 854 | - } |
|
| 855 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 838 | + foreach($this->stats as $date => $data) { |
|
| 839 | + foreach($data as $source => $sourced) { |
|
| 840 | + //print_r($sourced); |
|
| 841 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 842 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 843 | + if (isset($sourced['msg'])) { |
|
| 844 | + if (time() - $sourced['msg']['date'] > 10) { |
|
| 845 | + $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 846 | + echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 847 | + unset($this->stats[$date][$source]['msg']); |
|
| 848 | + } |
|
| 849 | + } |
|
| 850 | + } |
|
| 851 | + if ($date != date('Y-m-d')) { |
|
| 852 | + unset($this->stats[$date]); |
|
| 853 | + } |
|
| 854 | + } |
|
| 855 | + if ($globalDebug) echo 'Done'."\n"; |
|
| 856 | 856 | |
| 857 | - } |
|
| 858 | - $Stats->db = null; |
|
| 859 | - } |
|
| 860 | - $this->del(); |
|
| 857 | + } |
|
| 858 | + $Stats->db = null; |
|
| 859 | + } |
|
| 860 | + $this->del(); |
|
| 861 | 861 | } elseif ($globalDebug) echo 'Ignore data'."\n"; |
| 862 | 862 | //$ignoreImport = false; |
| 863 | 863 | $this->all_flights[$id]['addedSpotter'] = 1; |
@@ -875,41 +875,41 @@ discard block |
||
| 875 | 875 | */ |
| 876 | 876 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
| 877 | 877 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 878 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 879 | - //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
|
| 880 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 878 | + if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 879 | + //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
|
| 880 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 881 | 881 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 882 | - $SpotterLive = new SpotterLive($this->db); |
|
| 883 | - $SpotterLive->deleteLiveSpotterData(); |
|
| 884 | - $SpotterLive->db=null; |
|
| 882 | + $SpotterLive = new SpotterLive($this->db); |
|
| 883 | + $SpotterLive->deleteLiveSpotterData(); |
|
| 884 | + $SpotterLive->db=null; |
|
| 885 | 885 | } |
| 886 | - } |
|
| 887 | - if ($globalDebug) echo " Done\n"; |
|
| 888 | - $this->last_delete = time(); |
|
| 886 | + } |
|
| 887 | + if ($globalDebug) echo " Done\n"; |
|
| 888 | + $this->last_delete = time(); |
|
| 889 | 889 | } |
| 890 | - } else { |
|
| 890 | + } else { |
|
| 891 | 891 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) { |
| 892 | - $this->all_flights[$id]['id'] = $recent_ident; |
|
| 893 | - $this->all_flights[$id]['addedSpotter'] = 1; |
|
| 892 | + $this->all_flights[$id]['id'] = $recent_ident; |
|
| 893 | + $this->all_flights[$id]['addedSpotter'] = 1; |
|
| 894 | 894 | } |
| 895 | 895 | if (isset($globalDaemon) && !$globalDaemon) { |
| 896 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 896 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 897 | 897 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 898 | - $Spotter = new Spotter($this->db); |
|
| 899 | - $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 900 | - $Spotter->db = null; |
|
| 898 | + $Spotter = new Spotter($this->db); |
|
| 899 | + $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 900 | + $Spotter->db = null; |
|
| 901 | + } |
|
| 901 | 902 | } |
| 902 | - } |
|
| 903 | 903 | } |
| 904 | 904 | |
| 905 | - } |
|
| 905 | + } |
|
| 906 | 906 | } |
| 907 | - } |
|
| 908 | - //adds the spotter LIVE data |
|
| 909 | - //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
|
| 910 | - //echo "\nAdd in Live !! \n"; |
|
| 911 | - //echo "{$line[8]} {$line[7]} - MODES:{$line[4]} CALLSIGN:{$line[10]} ALT:{$line[11]} VEL:{$line[12]} HDG:{$line[13]} LAT:{$line[14]} LON:{$line[15]} VR:{$line[16]} SQUAWK:{$line[17]}\n"; |
|
| 912 | - if ($globalDebug) { |
|
| 907 | + } |
|
| 908 | + //adds the spotter LIVE data |
|
| 909 | + //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
|
| 910 | + //echo "\nAdd in Live !! \n"; |
|
| 911 | + //echo "{$line[8]} {$line[7]} - MODES:{$line[4]} CALLSIGN:{$line[10]} ALT:{$line[11]} VEL:{$line[12]} HDG:{$line[13]} LAT:{$line[14]} LON:{$line[15]} VR:{$line[16]} SQUAWK:{$line[17]}\n"; |
|
| 912 | + if ($globalDebug) { |
|
| 913 | 913 | if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
| 914 | 914 | if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name'].' - Source name : '.$this->all_flights[$id]['source_name']."\n"; |
| 915 | 915 | else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Pilot : '.$this->all_flights[$id]['pilot_name']."\n"; |
@@ -917,60 +917,60 @@ discard block |
||
| 917 | 917 | if (isset($this->all_flights[$id]['source_name'])) echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time'].' - Source Name : '.$this->all_flights[$id]['source_name']."\n"; |
| 918 | 918 | else echo 'DATA : hex : '.$this->all_flights[$id]['hex'].' - ident : '.$this->all_flights[$id]['ident'].' - ICAO : '.$this->all_flights[$id]['aircraft_icao'].' - Departure Airport : '.$this->all_flights[$id]['departure_airport'].' - Arrival Airport : '.$this->all_flights[$id]['arrival_airport'].' - Latitude : '.$this->all_flights[$id]['latitude'].' - Longitude : '.$this->all_flights[$id]['longitude'].' - waypoints : '.$this->all_flights[$id]['waypoints'].' - Altitude : '.$this->all_flights[$id]['altitude'].' - Heading : '.$this->all_flights[$id]['heading'].' - Speed : '.$this->all_flights[$id]['speed'].' - Departure Airport Time : '.$this->all_flights[$id]['departure_airport_time'].' - Arrival Airport time : '.$this->all_flights[$id]['arrival_airport_time']."\n"; |
| 919 | 919 | } |
| 920 | - } |
|
| 921 | - $ignoreImport = false; |
|
| 922 | - if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
| 923 | - if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
| 920 | + } |
|
| 921 | + $ignoreImport = false; |
|
| 922 | + if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
| 923 | + if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
| 924 | 924 | |
| 925 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 926 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 927 | - $ignoreImport = true; |
|
| 925 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 926 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 927 | + $ignoreImport = true; |
|
| 928 | + } |
|
| 928 | 929 | } |
| 929 | - } |
|
| 930 | - if (count($globalAirportAccept) > 0) { |
|
| 931 | - $ignoreImport = true; |
|
| 932 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 933 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 930 | + if (count($globalAirportAccept) > 0) { |
|
| 931 | + $ignoreImport = true; |
|
| 932 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 933 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 934 | 934 | $ignoreImport = false; |
| 935 | - } |
|
| 935 | + } |
|
| 936 | 936 | } |
| 937 | - } |
|
| 938 | - if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
| 937 | + } |
|
| 938 | + if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
| 939 | 939 | foreach($globalAirlineIgnore as $airlineIgnore) { |
| 940 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 940 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 941 | 941 | $ignoreImport = true; |
| 942 | - } |
|
| 942 | + } |
|
| 943 | 943 | } |
| 944 | - } |
|
| 945 | - if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
| 944 | + } |
|
| 945 | + if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
| 946 | 946 | $ignoreImport = true; |
| 947 | 947 | foreach($globalAirlineAccept as $airlineAccept) { |
| 948 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 948 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 949 | 949 | $ignoreImport = false; |
| 950 | - } |
|
| 950 | + } |
|
| 951 | + } |
|
| 951 | 952 | } |
| 952 | - } |
|
| 953 | - if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
| 953 | + if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
| 954 | 954 | $ignoreImport = true; |
| 955 | 955 | foreach($globalPilotIdAccept as $pilotIdAccept) { |
| 956 | - if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
| 957 | - $ignoreImport = false; |
|
| 958 | - } |
|
| 956 | + if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
| 957 | + $ignoreImport = false; |
|
| 958 | + } |
|
| 959 | + } |
|
| 959 | 960 | } |
| 960 | - } |
|
| 961 | 961 | |
| 962 | - if (!$ignoreImport) { |
|
| 962 | + if (!$ignoreImport) { |
|
| 963 | 963 | if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
| 964 | 964 | if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 965 | 965 | $timeelapsed = microtime(true); |
| 966 | 966 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 967 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 967 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 968 | 968 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 969 | 969 | $SpotterLive = new SpotterLive($this->db); |
| 970 | 970 | $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
| 971 | 971 | $SpotterLive->db = null; |
| 972 | 972 | if ($globalDebug) echo $result."\n"; |
| 973 | - } |
|
| 973 | + } |
|
| 974 | 974 | } |
| 975 | 975 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 976 | 976 | $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
@@ -982,7 +982,7 @@ discard block |
||
| 982 | 982 | //if ($line['format_source'] != 'aprs') { |
| 983 | 983 | //if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) { |
| 984 | 984 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 985 | - if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 985 | + if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 986 | 986 | $source = $this->all_flights[$id]['source_name']; |
| 987 | 987 | if ($source == '') $source = $this->all_flights[$id]['format_source']; |
| 988 | 988 | if (!isset($this->source_location[$source])) { |
@@ -1008,7 +1008,7 @@ discard block |
||
| 1008 | 1008 | if ($stats_heading == 16) $stats_heading = 0; |
| 1009 | 1009 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 1010 | 1010 | for ($i=0;$i<=15;$i++) { |
| 1011 | - $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 1011 | + $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 1012 | 1012 | } |
| 1013 | 1013 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
| 1014 | 1014 | } else { |
@@ -1021,17 +1021,17 @@ discard block |
||
| 1021 | 1021 | //var_dump($this->stats); |
| 1022 | 1022 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 1023 | 1023 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 1024 | - end($this->stats[$current_date][$source]['hist']); |
|
| 1025 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 1024 | + end($this->stats[$current_date][$source]['hist']); |
|
| 1025 | + $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 1026 | 1026 | } else $mini = 0; |
| 1027 | 1027 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 1028 | - $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 1028 | + $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 1029 | 1029 | } |
| 1030 | 1030 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
| 1031 | 1031 | } else { |
| 1032 | 1032 | $this->stats[$current_date][$source]['hist'][$distance] += 1; |
| 1033 | 1033 | } |
| 1034 | - } |
|
| 1034 | + } |
|
| 1035 | 1035 | } |
| 1036 | 1036 | |
| 1037 | 1037 | $this->all_flights[$id]['lastupdate'] = time(); |
@@ -1041,7 +1041,7 @@ discard block |
||
| 1041 | 1041 | //$this->del(); |
| 1042 | 1042 | |
| 1043 | 1043 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 1044 | - if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 1044 | + if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 1045 | 1045 | if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
| 1046 | 1046 | $SpotterLive = new SpotterLive($this->db); |
| 1047 | 1047 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
@@ -1049,19 +1049,19 @@ discard block |
||
| 1049 | 1049 | //SpotterLive->deleteLiveSpotterData(); |
| 1050 | 1050 | if ($globalDebug) echo " Done\n"; |
| 1051 | 1051 | $this->last_delete_hourly = time(); |
| 1052 | - } else { |
|
| 1052 | + } else { |
|
| 1053 | 1053 | $this->del(); |
| 1054 | 1054 | $this->last_delete_hourly = time(); |
| 1055 | - } |
|
| 1055 | + } |
|
| 1056 | 1056 | } |
| 1057 | 1057 | |
| 1058 | - } |
|
| 1059 | - //$ignoreImport = false; |
|
| 1058 | + } |
|
| 1059 | + //$ignoreImport = false; |
|
| 1060 | 1060 | } |
| 1061 | 1061 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 1062 | 1062 | if ($send) return $this->all_flights[$id]; |
| 1063 | - } |
|
| 1063 | + } |
|
| 1064 | + } |
|
| 1064 | 1065 | } |
| 1065 | - } |
|
| 1066 | 1066 | } |
| 1067 | 1067 | ?> |
@@ -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(); |
@@ -151,44 +151,44 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
| 154 | - /** |
|
| 155 | - * Gets all the spotter information based on a particular callsign |
|
| 156 | - * |
|
| 157 | - * @return Array the spotter information |
|
| 158 | - * |
|
| 159 | - */ |
|
| 160 | - public function getLastArchiveSpotterDataByIdent($ident) |
|
| 161 | - { |
|
| 154 | + /** |
|
| 155 | + * Gets all the spotter information based on a particular callsign |
|
| 156 | + * |
|
| 157 | + * @return Array the spotter information |
|
| 158 | + * |
|
| 159 | + */ |
|
| 160 | + public function getLastArchiveSpotterDataByIdent($ident) |
|
| 161 | + { |
|
| 162 | 162 | $Spotter = new Spotter($this->db); |
| 163 | - date_default_timezone_set('UTC'); |
|
| 163 | + date_default_timezone_set('UTC'); |
|
| 164 | 164 | |
| 165 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 166 | - //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 167 | - $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 165 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 166 | + //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 167 | + $query = "SELECT spotter_archive.* FROM spotter_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 168 | 168 | |
| 169 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 169 | + $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident)); |
|
| 170 | 170 | |
| 171 | - return $spotter_array; |
|
| 172 | - } |
|
| 171 | + return $spotter_array; |
|
| 172 | + } |
|
| 173 | 173 | |
| 174 | 174 | |
| 175 | - /** |
|
| 176 | - * Gets last the spotter information based on a particular id |
|
| 177 | - * |
|
| 178 | - * @return Array the spotter information |
|
| 179 | - * |
|
| 180 | - */ |
|
| 181 | - public function getLastArchiveSpotterDataById($id) |
|
| 182 | - { |
|
| 183 | - $Spotter = new Spotter($this->db); |
|
| 184 | - date_default_timezone_set('UTC'); |
|
| 185 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 186 | - //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 187 | - //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 188 | - $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 175 | + /** |
|
| 176 | + * Gets last the spotter information based on a particular id |
|
| 177 | + * |
|
| 178 | + * @return Array the spotter information |
|
| 179 | + * |
|
| 180 | + */ |
|
| 181 | + public function getLastArchiveSpotterDataById($id) |
|
| 182 | + { |
|
| 183 | + $Spotter = new Spotter($this->db); |
|
| 184 | + date_default_timezone_set('UTC'); |
|
| 185 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 186 | + //$query = SpotterArchive->$global_query." WHERE spotter_archive.flightaware_id = :id"; |
|
| 187 | + //$query = "SELECT spotter_archive.* FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate LIMIT 1"; |
|
| 188 | + $query = "SELECT * FROM spotter_archive WHERE flightaware_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 189 | 189 | |
| 190 | 190 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 191 | - /* |
|
| 191 | + /* |
|
| 192 | 192 | try { |
| 193 | 193 | $Connection = new Connection(); |
| 194 | 194 | $sth = Connection->$db->prepare($query); |
@@ -198,122 +198,122 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 200 | 200 | */ |
| 201 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | - |
|
| 203 | - return $spotter_array; |
|
| 204 | - } |
|
| 205 | - |
|
| 206 | - /** |
|
| 207 | - * Gets all the spotter information based on a particular id |
|
| 208 | - * |
|
| 209 | - * @return Array the spotter information |
|
| 210 | - * |
|
| 211 | - */ |
|
| 212 | - public function getAllArchiveSpotterDataById($id) |
|
| 201 | + $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id)); |
|
| 202 | + |
|
| 203 | + return $spotter_array; |
|
| 204 | + } |
|
| 205 | + |
|
| 206 | + /** |
|
| 207 | + * Gets all the spotter information based on a particular id |
|
| 208 | + * |
|
| 209 | + * @return Array the spotter information |
|
| 210 | + * |
|
| 211 | + */ |
|
| 212 | + public function getAllArchiveSpotterDataById($id) |
|
| 213 | 213 | { |
| 214 | - date_default_timezone_set('UTC'); |
|
| 215 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 216 | - $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 214 | + date_default_timezone_set('UTC'); |
|
| 215 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 216 | + $query = $this->global_query." WHERE spotter_archive.flightaware_id = :id ORDER BY date"; |
|
| 217 | 217 | |
| 218 | 218 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 219 | 219 | |
| 220 | - try { |
|
| 221 | - $sth = $this->db->prepare($query); |
|
| 222 | - $sth->execute(array(':id' => $id)); |
|
| 223 | - } catch(PDOException $e) { |
|
| 224 | - echo $e->getMessage(); |
|
| 225 | - die; |
|
| 226 | - } |
|
| 227 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 228 | - |
|
| 229 | - return $spotter_array; |
|
| 230 | - } |
|
| 231 | - |
|
| 232 | - /** |
|
| 233 | - * Gets coordinate & time spotter information based on a particular id |
|
| 234 | - * |
|
| 235 | - * @return Array the spotter information |
|
| 236 | - * |
|
| 237 | - */ |
|
| 238 | - public function getCoordArchiveSpotterDataById($id) |
|
| 239 | - { |
|
| 240 | - date_default_timezone_set('UTC'); |
|
| 241 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 242 | - $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 220 | + try { |
|
| 221 | + $sth = $this->db->prepare($query); |
|
| 222 | + $sth->execute(array(':id' => $id)); |
|
| 223 | + } catch(PDOException $e) { |
|
| 224 | + echo $e->getMessage(); |
|
| 225 | + die; |
|
| 226 | + } |
|
| 227 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 228 | + |
|
| 229 | + return $spotter_array; |
|
| 230 | + } |
|
| 231 | + |
|
| 232 | + /** |
|
| 233 | + * Gets coordinate & time spotter information based on a particular id |
|
| 234 | + * |
|
| 235 | + * @return Array the spotter information |
|
| 236 | + * |
|
| 237 | + */ |
|
| 238 | + public function getCoordArchiveSpotterDataById($id) |
|
| 239 | + { |
|
| 240 | + date_default_timezone_set('UTC'); |
|
| 241 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 242 | + $query = "SELECT spotter_archive.latitude, spotter_archive.longitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id"; |
|
| 243 | 243 | |
| 244 | 244 | // $spotter_array = Spotter->getDataFromDB($query,array(':id' => $id)); |
| 245 | 245 | |
| 246 | - try { |
|
| 247 | - $sth = $this->db->prepare($query); |
|
| 248 | - $sth->execute(array(':id' => $id)); |
|
| 249 | - } catch(PDOException $e) { |
|
| 250 | - echo $e->getMessage(); |
|
| 251 | - die; |
|
| 252 | - } |
|
| 253 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 246 | + try { |
|
| 247 | + $sth = $this->db->prepare($query); |
|
| 248 | + $sth->execute(array(':id' => $id)); |
|
| 249 | + } catch(PDOException $e) { |
|
| 250 | + echo $e->getMessage(); |
|
| 251 | + die; |
|
| 252 | + } |
|
| 253 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 254 | 254 | |
| 255 | - return $spotter_array; |
|
| 256 | - } |
|
| 255 | + return $spotter_array; |
|
| 256 | + } |
|
| 257 | 257 | |
| 258 | 258 | |
| 259 | - /** |
|
| 260 | - * Gets altitude information based on a particular callsign |
|
| 261 | - * |
|
| 262 | - * @return Array the spotter information |
|
| 263 | - * |
|
| 264 | - */ |
|
| 265 | - public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 266 | - { |
|
| 259 | + /** |
|
| 260 | + * Gets altitude information based on a particular callsign |
|
| 261 | + * |
|
| 262 | + * @return Array the spotter information |
|
| 263 | + * |
|
| 264 | + */ |
|
| 265 | + public function getAltitudeArchiveSpotterDataByIdent($ident) |
|
| 266 | + { |
|
| 267 | 267 | |
| 268 | - date_default_timezone_set('UTC'); |
|
| 268 | + date_default_timezone_set('UTC'); |
|
| 269 | 269 | |
| 270 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 271 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 270 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 271 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.ident = :ident AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 272 | 272 | |
| 273 | - try { |
|
| 274 | - $sth = $this->db->prepare($query); |
|
| 275 | - $sth->execute(array(':ident' => $ident)); |
|
| 276 | - } catch(PDOException $e) { |
|
| 277 | - echo $e->getMessage(); |
|
| 278 | - die; |
|
| 279 | - } |
|
| 280 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 273 | + try { |
|
| 274 | + $sth = $this->db->prepare($query); |
|
| 275 | + $sth->execute(array(':ident' => $ident)); |
|
| 276 | + } catch(PDOException $e) { |
|
| 277 | + echo $e->getMessage(); |
|
| 278 | + die; |
|
| 279 | + } |
|
| 280 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 281 | 281 | |
| 282 | - return $spotter_array; |
|
| 283 | - } |
|
| 282 | + return $spotter_array; |
|
| 283 | + } |
|
| 284 | 284 | |
| 285 | - /** |
|
| 286 | - * Gets altitude information based on a particular id |
|
| 287 | - * |
|
| 288 | - * @return Array the spotter information |
|
| 289 | - * |
|
| 290 | - */ |
|
| 291 | - public function getAltitudeArchiveSpotterDataById($id) |
|
| 292 | - { |
|
| 285 | + /** |
|
| 286 | + * Gets altitude information based on a particular id |
|
| 287 | + * |
|
| 288 | + * @return Array the spotter information |
|
| 289 | + * |
|
| 290 | + */ |
|
| 291 | + public function getAltitudeArchiveSpotterDataById($id) |
|
| 292 | + { |
|
| 293 | 293 | |
| 294 | - date_default_timezone_set('UTC'); |
|
| 294 | + date_default_timezone_set('UTC'); |
|
| 295 | 295 | |
| 296 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 297 | - $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 296 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 297 | + $query = "SELECT spotter_archive.altitude, spotter_archive.date FROM spotter_archive WHERE spotter_archive.flightaware_id = :id AND spotter_archive.latitude <> 0 AND spotter_archive.longitude <> 0 ORDER BY date"; |
|
| 298 | 298 | |
| 299 | - try { |
|
| 300 | - $sth = $this->db->prepare($query); |
|
| 301 | - $sth->execute(array(':id' => $id)); |
|
| 302 | - } catch(PDOException $e) { |
|
| 303 | - echo $e->getMessage(); |
|
| 304 | - die; |
|
| 305 | - } |
|
| 306 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 299 | + try { |
|
| 300 | + $sth = $this->db->prepare($query); |
|
| 301 | + $sth->execute(array(':id' => $id)); |
|
| 302 | + } catch(PDOException $e) { |
|
| 303 | + echo $e->getMessage(); |
|
| 304 | + die; |
|
| 305 | + } |
|
| 306 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 307 | 307 | |
| 308 | - return $spotter_array; |
|
| 309 | - } |
|
| 308 | + return $spotter_array; |
|
| 309 | + } |
|
| 310 | 310 | |
| 311 | - /** |
|
| 312 | - * Gets altitude & speed information based on a particular id |
|
| 313 | - * |
|
| 314 | - * @return Array the spotter information |
|
| 315 | - * |
|
| 316 | - */ |
|
| 311 | + /** |
|
| 312 | + * Gets altitude & speed information based on a particular id |
|
| 313 | + * |
|
| 314 | + * @return Array the spotter information |
|
| 315 | + * |
|
| 316 | + */ |
|
| 317 | 317 | public function getAltitudeSpeedArchiveSpotterDataById($id) |
| 318 | 318 | { |
| 319 | 319 | date_default_timezone_set('UTC'); |
@@ -330,12 +330,12 @@ discard block |
||
| 330 | 330 | return $spotter_array; |
| 331 | 331 | } |
| 332 | 332 | |
| 333 | - /** |
|
| 334 | - * Gets altitude information based on a particular callsign |
|
| 335 | - * |
|
| 336 | - * @return Array the spotter information |
|
| 337 | - * |
|
| 338 | - */ |
|
| 333 | + /** |
|
| 334 | + * Gets altitude information based on a particular callsign |
|
| 335 | + * |
|
| 336 | + * @return Array the spotter information |
|
| 337 | + * |
|
| 338 | + */ |
|
| 339 | 339 | public function getLastAltitudeArchiveSpotterDataByIdent($ident) |
| 340 | 340 | { |
| 341 | 341 | date_default_timezone_set('UTC'); |
@@ -355,12 +355,12 @@ discard block |
||
| 355 | 355 | |
| 356 | 356 | |
| 357 | 357 | |
| 358 | - /** |
|
| 359 | - * Gets all the archive spotter information |
|
| 360 | - * |
|
| 361 | - * @return Array the spotter information |
|
| 362 | - * |
|
| 363 | - */ |
|
| 358 | + /** |
|
| 359 | + * Gets all the archive spotter information |
|
| 360 | + * |
|
| 361 | + * @return Array the spotter information |
|
| 362 | + * |
|
| 363 | + */ |
|
| 364 | 364 | public function getSpotterArchiveData($ident,$flightaware_id,$date) |
| 365 | 365 | { |
| 366 | 366 | $Spotter = new Spotter($this->db); |
@@ -388,34 +388,34 @@ discard block |
||
| 388 | 388 | } |
| 389 | 389 | |
| 390 | 390 | /** |
| 391 | - * Gets Minimal Live Spotter data |
|
| 392 | - * |
|
| 393 | - * @return Array the spotter information |
|
| 394 | - * |
|
| 395 | - */ |
|
| 396 | - public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 397 | - { |
|
| 398 | - global $globalDBdriver, $globalLiveInterval; |
|
| 399 | - date_default_timezone_set('UTC'); |
|
| 400 | - |
|
| 401 | - $filter_query = ''; |
|
| 402 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 403 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 404 | - } |
|
| 405 | - // Use spotter_output also ? |
|
| 406 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 407 | - $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 "; |
|
| 408 | - } |
|
| 409 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 410 | - $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 "; |
|
| 411 | - } |
|
| 412 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 413 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 414 | - } |
|
| 391 | + * Gets Minimal Live Spotter data |
|
| 392 | + * |
|
| 393 | + * @return Array the spotter information |
|
| 394 | + * |
|
| 395 | + */ |
|
| 396 | + public function getMinLiveSpotterData($begindate,$enddate,$filter = array()) |
|
| 397 | + { |
|
| 398 | + global $globalDBdriver, $globalLiveInterval; |
|
| 399 | + date_default_timezone_set('UTC'); |
|
| 400 | + |
|
| 401 | + $filter_query = ''; |
|
| 402 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 403 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 404 | + } |
|
| 405 | + // Use spotter_output also ? |
|
| 406 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 407 | + $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 "; |
|
| 408 | + } |
|
| 409 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 410 | + $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 "; |
|
| 411 | + } |
|
| 412 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 413 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 414 | + } |
|
| 415 | 415 | |
| 416 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 417 | - if ($globalDBdriver == 'mysql') { |
|
| 418 | - /* |
|
| 416 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 417 | + if ($globalDBdriver == 'mysql') { |
|
| 418 | + /* |
|
| 419 | 419 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 420 | 420 | FROM spotter_archive |
| 421 | 421 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -434,56 +434,56 @@ discard block |
||
| 434 | 434 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 435 | 435 | WHERE spotter_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 436 | 436 | '.$filter_query.' ORDER BY flightaware_id'; |
| 437 | - } else { |
|
| 438 | - //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
|
| 439 | - $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 437 | + } else { |
|
| 438 | + //$query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow FROM spotter_archive INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao'; |
|
| 439 | + $query = 'SELECT spotter_archive.date,spotter_archive.flightaware_id, spotter_archive.ident, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 440 | 440 | FROM spotter_archive |
| 441 | 441 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive.aircraft_icao = a.icao |
| 442 | 442 | WHERE spotter_archive.date >= '."'".$begindate."'".' AND spotter_archive.date <= '."'".$enddate."'".' |
| 443 | 443 | '.$filter_query.' ORDER BY flightaware_id'; |
| 444 | - } |
|
| 445 | - //echo $query; |
|
| 446 | - try { |
|
| 447 | - $sth = $this->db->prepare($query); |
|
| 448 | - $sth->execute(); |
|
| 449 | - } catch(PDOException $e) { |
|
| 450 | - echo $e->getMessage(); |
|
| 451 | - die; |
|
| 452 | - } |
|
| 453 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 444 | + } |
|
| 445 | + //echo $query; |
|
| 446 | + try { |
|
| 447 | + $sth = $this->db->prepare($query); |
|
| 448 | + $sth->execute(); |
|
| 449 | + } catch(PDOException $e) { |
|
| 450 | + echo $e->getMessage(); |
|
| 451 | + die; |
|
| 452 | + } |
|
| 453 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 454 | 454 | |
| 455 | - return $spotter_array; |
|
| 456 | - } |
|
| 455 | + return $spotter_array; |
|
| 456 | + } |
|
| 457 | 457 | |
| 458 | 458 | /** |
| 459 | - * Gets Minimal Live Spotter data |
|
| 460 | - * |
|
| 461 | - * @return Array the spotter information |
|
| 462 | - * |
|
| 463 | - */ |
|
| 464 | - public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 465 | - { |
|
| 466 | - global $globalDBdriver, $globalLiveInterval; |
|
| 467 | - date_default_timezone_set('UTC'); |
|
| 468 | - |
|
| 469 | - $filter_query = ''; |
|
| 470 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 471 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 472 | - } |
|
| 473 | - // Should use spotter_output also ? |
|
| 474 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 475 | - $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 "; |
|
| 476 | - } |
|
| 477 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 478 | - $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 "; |
|
| 479 | - } |
|
| 480 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 481 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 482 | - } |
|
| 459 | + * Gets Minimal Live Spotter data |
|
| 460 | + * |
|
| 461 | + * @return Array the spotter information |
|
| 462 | + * |
|
| 463 | + */ |
|
| 464 | + public function getMinLiveSpotterDataPlayback($begindate,$enddate,$filter = array()) |
|
| 465 | + { |
|
| 466 | + global $globalDBdriver, $globalLiveInterval; |
|
| 467 | + date_default_timezone_set('UTC'); |
|
| 468 | + |
|
| 469 | + $filter_query = ''; |
|
| 470 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 471 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 472 | + } |
|
| 473 | + // Should use spotter_output also ? |
|
| 474 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 475 | + $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 "; |
|
| 476 | + } |
|
| 477 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 478 | + $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 "; |
|
| 479 | + } |
|
| 480 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 481 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 482 | + } |
|
| 483 | 483 | |
| 484 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 485 | - if ($globalDBdriver == 'mysql') { |
|
| 486 | - /* |
|
| 484 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 485 | + if ($globalDBdriver == 'mysql') { |
|
| 486 | + /* |
|
| 487 | 487 | $query = 'SELECT a.aircraft_shadow, spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk |
| 488 | 488 | FROM spotter_archive |
| 489 | 489 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.flightaware_id) s on spotter_archive.flightaware_id = s.flightaware_id AND spotter_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON spotter_archive.aircraft_icao = a.icao'; |
@@ -494,95 +494,95 @@ discard block |
||
| 494 | 494 | WHERE (spotter_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
| 495 | 495 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 496 | 496 | |
| 497 | - } else { |
|
| 498 | - //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 499 | - /* |
|
| 497 | + } else { |
|
| 498 | + //$query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow FROM spotter_archive_output INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_archive_output.flightaware_id = s.flightaware_id AND spotter_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao'; |
|
| 499 | + /* |
|
| 500 | 500 | $query = 'SELECT spotter_archive_output.ident, spotter_archive_output.flightaware_id, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
| 501 | 501 | FROM spotter_archive_output |
| 502 | 502 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 503 | 503 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 504 | 504 | '.$filter_query.' GROUP BY spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao, spotter_archive_output.arrival_airport_icao, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow'; |
| 505 | 505 | */ |
| 506 | - $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 506 | + $query = 'SELECT DISTINCT spotter_archive_output.flightaware_id, spotter_archive_output.ident, spotter_archive_output.aircraft_icao, spotter_archive_output.departure_airport_icao as departure_airport, spotter_archive_output.arrival_airport_icao as arrival_airport, spotter_archive_output.latitude, spotter_archive_output.longitude, spotter_archive_output.altitude, spotter_archive_output.heading, spotter_archive_output.ground_speed, spotter_archive_output.squawk, a.aircraft_shadow |
|
| 507 | 507 | FROM spotter_archive_output |
| 508 | 508 | INNER JOIN (SELECT * FROM aircraft) a on spotter_archive_output.aircraft_icao = a.icao |
| 509 | 509 | WHERE spotter_archive_output.date >= '."'".$begindate."'".' AND spotter_archive_output.date <= '."'".$enddate."'".' |
| 510 | 510 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
| 511 | 511 | // .' GROUP BY spotter_output.flightaware_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'; |
| 512 | 512 | |
| 513 | - } |
|
| 514 | - //echo $query; |
|
| 515 | - try { |
|
| 516 | - $sth = $this->db->prepare($query); |
|
| 517 | - $sth->execute(); |
|
| 518 | - } catch(PDOException $e) { |
|
| 519 | - echo $e->getMessage(); |
|
| 520 | - die; |
|
| 521 | - } |
|
| 522 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 513 | + } |
|
| 514 | + //echo $query; |
|
| 515 | + try { |
|
| 516 | + $sth = $this->db->prepare($query); |
|
| 517 | + $sth->execute(); |
|
| 518 | + } catch(PDOException $e) { |
|
| 519 | + echo $e->getMessage(); |
|
| 520 | + die; |
|
| 521 | + } |
|
| 522 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 523 | 523 | |
| 524 | - return $spotter_array; |
|
| 525 | - } |
|
| 524 | + return $spotter_array; |
|
| 525 | + } |
|
| 526 | 526 | |
| 527 | 527 | /** |
| 528 | - * Gets count Live Spotter data |
|
| 529 | - * |
|
| 530 | - * @return Array the spotter information |
|
| 531 | - * |
|
| 532 | - */ |
|
| 533 | - public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 534 | - { |
|
| 535 | - global $globalDBdriver, $globalLiveInterval; |
|
| 536 | - date_default_timezone_set('UTC'); |
|
| 537 | - |
|
| 538 | - $filter_query = ''; |
|
| 539 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 540 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 541 | - } |
|
| 542 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 543 | - $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 "; |
|
| 544 | - } |
|
| 545 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 546 | - $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 "; |
|
| 547 | - } |
|
| 548 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 549 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 550 | - } |
|
| 528 | + * Gets count Live Spotter data |
|
| 529 | + * |
|
| 530 | + * @return Array the spotter information |
|
| 531 | + * |
|
| 532 | + */ |
|
| 533 | + public function getLiveSpotterCount($begindate,$enddate,$filter = array()) |
|
| 534 | + { |
|
| 535 | + global $globalDBdriver, $globalLiveInterval; |
|
| 536 | + date_default_timezone_set('UTC'); |
|
| 551 | 537 | |
| 552 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 553 | - if ($globalDBdriver == 'mysql') { |
|
| 538 | + $filter_query = ''; |
|
| 539 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 540 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 541 | + } |
|
| 542 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 543 | + $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 "; |
|
| 544 | + } |
|
| 545 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 546 | + $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 "; |
|
| 547 | + } |
|
| 548 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 549 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 550 | + } |
|
| 551 | + |
|
| 552 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 553 | + if ($globalDBdriver == 'mysql') { |
|
| 554 | 554 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb |
| 555 | 555 | FROM spotter_archive l |
| 556 | 556 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
| 557 | - } else { |
|
| 557 | + } else { |
|
| 558 | 558 | $query = 'SELECT COUNT(DISTINCT flightaware_id) as nb FROM spotter_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
| 559 | - } |
|
| 560 | - //echo $query; |
|
| 561 | - try { |
|
| 562 | - $sth = $this->db->prepare($query); |
|
| 563 | - $sth->execute(); |
|
| 564 | - } catch(PDOException $e) { |
|
| 565 | - echo $e->getMessage(); |
|
| 566 | - die; |
|
| 567 | - } |
|
| 559 | + } |
|
| 560 | + //echo $query; |
|
| 561 | + try { |
|
| 562 | + $sth = $this->db->prepare($query); |
|
| 563 | + $sth->execute(); |
|
| 564 | + } catch(PDOException $e) { |
|
| 565 | + echo $e->getMessage(); |
|
| 566 | + die; |
|
| 567 | + } |
|
| 568 | 568 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 569 | 569 | $sth->closeCursor(); |
| 570 | - return $result['nb']; |
|
| 570 | + return $result['nb']; |
|
| 571 | 571 | |
| 572 | - } |
|
| 572 | + } |
|
| 573 | 573 | |
| 574 | 574 | |
| 575 | 575 | |
| 576 | 576 | // Spotter_Archive_output |
| 577 | 577 | |
| 578 | - /** |
|
| 579 | - * Gets all the spotter information |
|
| 580 | - * |
|
| 581 | - * @return Array the spotter information |
|
| 582 | - * |
|
| 583 | - */ |
|
| 584 | - public function searchSpotterData($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()) |
|
| 585 | - { |
|
| 578 | + /** |
|
| 579 | + * Gets all the spotter information |
|
| 580 | + * |
|
| 581 | + * @return Array the spotter information |
|
| 582 | + * |
|
| 583 | + */ |
|
| 584 | + public function searchSpotterData($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()) |
|
| 585 | + { |
|
| 586 | 586 | global $globalTimezone, $globalDBdriver; |
| 587 | 587 | require_once(dirname(__FILE__).'/class.Translation.php'); |
| 588 | 588 | $Translation = new Translation($this->db); |
@@ -596,159 +596,159 @@ discard block |
||
| 596 | 596 | $filter_query = $this->getFilter($filters); |
| 597 | 597 | if ($q != "") |
| 598 | 598 | { |
| 599 | - if (!is_string($q)) |
|
| 600 | - { |
|
| 599 | + if (!is_string($q)) |
|
| 600 | + { |
|
| 601 | 601 | return false; |
| 602 | - } else { |
|
| 602 | + } else { |
|
| 603 | 603 | |
| 604 | 604 | $q_array = explode(" ", $q); |
| 605 | 605 | |
| 606 | 606 | foreach ($q_array as $q_item){ |
| 607 | - $additional_query .= " AND ("; |
|
| 608 | - $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 609 | - $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 610 | - $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 611 | - $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 612 | - $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 613 | - $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 614 | - $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 615 | - $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 616 | - $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 617 | - $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 618 | - $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 619 | - $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 620 | - $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 621 | - $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 622 | - $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 623 | - $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 624 | - $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 625 | - $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 626 | - $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 627 | - $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 628 | - $translate = $Translation->ident2icao($q_item); |
|
| 629 | - if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 630 | - $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 631 | - $additional_query .= ")"; |
|
| 607 | + $additional_query .= " AND ("; |
|
| 608 | + $additional_query .= "(spotter_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 609 | + $additional_query .= "(spotter_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 610 | + $additional_query .= "(spotter_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 611 | + $additional_query .= "(spotter_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 612 | + $additional_query .= "(spotter_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 613 | + $additional_query .= "(spotter_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 614 | + $additional_query .= "(spotter_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 615 | + $additional_query .= "(spotter_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 616 | + $additional_query .= "(spotter_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 617 | + $additional_query .= "(spotter_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 618 | + $additional_query .= "(spotter_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 619 | + $additional_query .= "(spotter_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 620 | + $additional_query .= "(spotter_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 621 | + $additional_query .= "(spotter_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 622 | + $additional_query .= "(spotter_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 623 | + $additional_query .= "(spotter_archive_output.registration like '%".$q_item."%') OR "; |
|
| 624 | + $additional_query .= "(spotter_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 625 | + $additional_query .= "(spotter_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 626 | + $additional_query .= "(spotter_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 627 | + $additional_query .= "(spotter_archive_output.ident like '%".$q_item."%') OR "; |
|
| 628 | + $translate = $Translation->ident2icao($q_item); |
|
| 629 | + if ($translate != $q_item) $additional_query .= "(spotter_archive_output.ident like '%".$translate."%') OR "; |
|
| 630 | + $additional_query .= "(spotter_archive_output.highlight like '%".$q_item."%')"; |
|
| 631 | + $additional_query .= ")"; |
|
| 632 | + } |
|
| 632 | 633 | } |
| 633 | - } |
|
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | if ($registration != "") |
| 637 | 637 | { |
| 638 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 639 | - if (!is_string($registration)) |
|
| 640 | - { |
|
| 638 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 639 | + if (!is_string($registration)) |
|
| 640 | + { |
|
| 641 | 641 | return false; |
| 642 | - } else { |
|
| 642 | + } else { |
|
| 643 | 643 | $additional_query .= " AND (spotter_archive_output.registration = '".$registration."')"; |
| 644 | - } |
|
| 644 | + } |
|
| 645 | 645 | } |
| 646 | 646 | |
| 647 | 647 | if ($aircraft_icao != "") |
| 648 | 648 | { |
| 649 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 650 | - if (!is_string($aircraft_icao)) |
|
| 651 | - { |
|
| 649 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 650 | + if (!is_string($aircraft_icao)) |
|
| 651 | + { |
|
| 652 | 652 | return false; |
| 653 | - } else { |
|
| 653 | + } else { |
|
| 654 | 654 | $additional_query .= " AND (spotter_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
| 655 | - } |
|
| 655 | + } |
|
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | if ($aircraft_manufacturer != "") |
| 659 | 659 | { |
| 660 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 661 | - if (!is_string($aircraft_manufacturer)) |
|
| 662 | - { |
|
| 660 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 661 | + if (!is_string($aircraft_manufacturer)) |
|
| 662 | + { |
|
| 663 | 663 | return false; |
| 664 | - } else { |
|
| 664 | + } else { |
|
| 665 | 665 | $additional_query .= " AND (spotter_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
| 666 | - } |
|
| 666 | + } |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | if ($highlights == "true") |
| 670 | 670 | { |
| 671 | - if (!is_string($highlights)) |
|
| 672 | - { |
|
| 671 | + if (!is_string($highlights)) |
|
| 672 | + { |
|
| 673 | 673 | return false; |
| 674 | - } else { |
|
| 674 | + } else { |
|
| 675 | 675 | $additional_query .= " AND (spotter_archive_output.highlight <> '')"; |
| 676 | - } |
|
| 676 | + } |
|
| 677 | 677 | } |
| 678 | 678 | |
| 679 | 679 | if ($airline_icao != "") |
| 680 | 680 | { |
| 681 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 682 | - if (!is_string($airline_icao)) |
|
| 683 | - { |
|
| 681 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 682 | + if (!is_string($airline_icao)) |
|
| 683 | + { |
|
| 684 | 684 | return false; |
| 685 | - } else { |
|
| 685 | + } else { |
|
| 686 | 686 | $additional_query .= " AND (spotter_archive_output.airline_icao = '".$airline_icao."')"; |
| 687 | - } |
|
| 687 | + } |
|
| 688 | 688 | } |
| 689 | 689 | |
| 690 | 690 | if ($airline_country != "") |
| 691 | 691 | { |
| 692 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 693 | - if (!is_string($airline_country)) |
|
| 694 | - { |
|
| 692 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 693 | + if (!is_string($airline_country)) |
|
| 694 | + { |
|
| 695 | 695 | return false; |
| 696 | - } else { |
|
| 696 | + } else { |
|
| 697 | 697 | $additional_query .= " AND (spotter_archive_output.airline_country = '".$airline_country."')"; |
| 698 | - } |
|
| 698 | + } |
|
| 699 | 699 | } |
| 700 | 700 | |
| 701 | 701 | if ($airline_type != "") |
| 702 | 702 | { |
| 703 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 704 | - if (!is_string($airline_type)) |
|
| 705 | - { |
|
| 703 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 704 | + if (!is_string($airline_type)) |
|
| 705 | + { |
|
| 706 | 706 | return false; |
| 707 | - } else { |
|
| 707 | + } else { |
|
| 708 | 708 | if ($airline_type == "passenger") |
| 709 | 709 | { |
| 710 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 710 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'passenger')"; |
|
| 711 | 711 | } |
| 712 | 712 | if ($airline_type == "cargo") |
| 713 | 713 | { |
| 714 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 714 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'cargo')"; |
|
| 715 | 715 | } |
| 716 | 716 | if ($airline_type == "military") |
| 717 | 717 | { |
| 718 | - $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 718 | + $additional_query .= " AND (spotter_archive_output.airline_type = 'military')"; |
|
| 719 | + } |
|
| 719 | 720 | } |
| 720 | - } |
|
| 721 | 721 | } |
| 722 | 722 | |
| 723 | 723 | if ($airport != "") |
| 724 | 724 | { |
| 725 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 726 | - if (!is_string($airport)) |
|
| 727 | - { |
|
| 725 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 726 | + if (!is_string($airport)) |
|
| 727 | + { |
|
| 728 | 728 | return false; |
| 729 | - } else { |
|
| 729 | + } else { |
|
| 730 | 730 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = '".$airport."') OR (spotter_archive_output.arrival_airport_icao = '".$airport."'))"; |
| 731 | - } |
|
| 731 | + } |
|
| 732 | 732 | } |
| 733 | 733 | |
| 734 | 734 | if ($airport_country != "") |
| 735 | 735 | { |
| 736 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 737 | - if (!is_string($airport_country)) |
|
| 738 | - { |
|
| 736 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 737 | + if (!is_string($airport_country)) |
|
| 738 | + { |
|
| 739 | 739 | return false; |
| 740 | - } else { |
|
| 740 | + } else { |
|
| 741 | 741 | $additional_query .= " AND ((spotter_archive_output.departure_airport_country = '".$airport_country."') OR (spotter_archive_output.arrival_airport_country = '".$airport_country."'))"; |
| 742 | - } |
|
| 742 | + } |
|
| 743 | 743 | } |
| 744 | 744 | |
| 745 | 745 | if ($callsign != "") |
| 746 | 746 | { |
| 747 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 748 | - if (!is_string($callsign)) |
|
| 749 | - { |
|
| 747 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 748 | + if (!is_string($callsign)) |
|
| 749 | + { |
|
| 750 | 750 | return false; |
| 751 | - } else { |
|
| 751 | + } else { |
|
| 752 | 752 | $translate = $Translation->ident2icao($callsign); |
| 753 | 753 | if ($translate != $callsign) { |
| 754 | 754 | $additional_query .= " AND (spotter_archive_output.ident = :callsign OR spotter_archive_output.ident = :translate)"; |
@@ -756,81 +756,81 @@ discard block |
||
| 756 | 756 | } else { |
| 757 | 757 | $additional_query .= " AND (spotter_archive_output.ident = '".$callsign."')"; |
| 758 | 758 | } |
| 759 | - } |
|
| 759 | + } |
|
| 760 | 760 | } |
| 761 | 761 | |
| 762 | 762 | if ($owner != "") |
| 763 | 763 | { |
| 764 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 765 | - if (!is_string($owner)) |
|
| 766 | - { |
|
| 764 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 765 | + if (!is_string($owner)) |
|
| 766 | + { |
|
| 767 | 767 | return false; |
| 768 | - } else { |
|
| 768 | + } else { |
|
| 769 | 769 | $additional_query .= " AND (spotter_archive_output.owner_name = '".$owner."')"; |
| 770 | - } |
|
| 770 | + } |
|
| 771 | 771 | } |
| 772 | 772 | |
| 773 | 773 | if ($pilot_name != "") |
| 774 | 774 | { |
| 775 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 776 | - if (!is_string($pilot_name)) |
|
| 777 | - { |
|
| 775 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 776 | + if (!is_string($pilot_name)) |
|
| 777 | + { |
|
| 778 | 778 | return false; |
| 779 | - } else { |
|
| 779 | + } else { |
|
| 780 | 780 | $additional_query .= " AND (spotter_archive_output.pilot_name = '".$pilot_name."')"; |
| 781 | - } |
|
| 781 | + } |
|
| 782 | 782 | } |
| 783 | 783 | |
| 784 | 784 | if ($pilot_id != "") |
| 785 | 785 | { |
| 786 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 787 | - if (!is_string($pilot_id)) |
|
| 788 | - { |
|
| 786 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 787 | + if (!is_string($pilot_id)) |
|
| 788 | + { |
|
| 789 | 789 | return false; |
| 790 | - } else { |
|
| 790 | + } else { |
|
| 791 | 791 | $additional_query .= " AND (spotter_archive_output.pilot_id = '".$pilot_id."')"; |
| 792 | - } |
|
| 792 | + } |
|
| 793 | 793 | } |
| 794 | 794 | |
| 795 | 795 | if ($departure_airport_route != "") |
| 796 | 796 | { |
| 797 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 798 | - if (!is_string($departure_airport_route)) |
|
| 799 | - { |
|
| 797 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 798 | + if (!is_string($departure_airport_route)) |
|
| 799 | + { |
|
| 800 | 800 | return false; |
| 801 | - } else { |
|
| 801 | + } else { |
|
| 802 | 802 | $additional_query .= " AND (spotter_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
| 803 | - } |
|
| 803 | + } |
|
| 804 | 804 | } |
| 805 | 805 | |
| 806 | 806 | if ($arrival_airport_route != "") |
| 807 | 807 | { |
| 808 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 809 | - if (!is_string($arrival_airport_route)) |
|
| 810 | - { |
|
| 808 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 809 | + if (!is_string($arrival_airport_route)) |
|
| 810 | + { |
|
| 811 | 811 | return false; |
| 812 | - } else { |
|
| 812 | + } else { |
|
| 813 | 813 | $additional_query .= " AND (spotter_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
| 814 | - } |
|
| 814 | + } |
|
| 815 | 815 | } |
| 816 | 816 | |
| 817 | 817 | if ($altitude != "") |
| 818 | 818 | { |
| 819 | - $altitude_array = explode(",", $altitude); |
|
| 819 | + $altitude_array = explode(",", $altitude); |
|
| 820 | 820 | |
| 821 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 822 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 821 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 822 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 823 | 823 | |
| 824 | 824 | |
| 825 | - if ($altitude_array[1] != "") |
|
| 826 | - { |
|
| 825 | + if ($altitude_array[1] != "") |
|
| 826 | + { |
|
| 827 | 827 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 828 | 828 | $altitude_array[1] = substr($altitude_array[1], 0, -2); |
| 829 | 829 | $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
| 830 | - } else { |
|
| 830 | + } else { |
|
| 831 | 831 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 832 | 832 | $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
| 833 | - } |
|
| 833 | + } |
|
| 834 | 834 | } |
| 835 | 835 | |
| 836 | 836 | if ($date_posted != "") |
@@ -915,14 +915,14 @@ discard block |
||
| 915 | 915 | } |
| 916 | 916 | } |
| 917 | 917 | |
| 918 | - /** |
|
| 919 | - * Gets all the spotter information based on the callsign |
|
| 920 | - * |
|
| 921 | - * @return Array the spotter information |
|
| 922 | - * |
|
| 923 | - */ |
|
| 924 | - public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 925 | - { |
|
| 918 | + /** |
|
| 919 | + * Gets all the spotter information based on the callsign |
|
| 920 | + * |
|
| 921 | + * @return Array the spotter information |
|
| 922 | + * |
|
| 923 | + */ |
|
| 924 | + public function getSpotterDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 925 | + { |
|
| 926 | 926 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 927 | 927 | |
| 928 | 928 | date_default_timezone_set('UTC'); |
@@ -934,35 +934,35 @@ discard block |
||
| 934 | 934 | |
| 935 | 935 | if ($ident != "") |
| 936 | 936 | { |
| 937 | - if (!is_string($ident)) |
|
| 938 | - { |
|
| 937 | + if (!is_string($ident)) |
|
| 938 | + { |
|
| 939 | 939 | return false; |
| 940 | - } else { |
|
| 940 | + } else { |
|
| 941 | 941 | $additional_query = " AND spotter_archive_output.ident = :ident"; |
| 942 | 942 | $query_values = array(':ident' => $ident); |
| 943 | - } |
|
| 943 | + } |
|
| 944 | 944 | } |
| 945 | 945 | |
| 946 | 946 | if ($limit != "") |
| 947 | 947 | { |
| 948 | - $limit_array = explode(",", $limit); |
|
| 948 | + $limit_array = explode(",", $limit); |
|
| 949 | 949 | |
| 950 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 951 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 950 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 951 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 952 | 952 | |
| 953 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 954 | - { |
|
| 953 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 954 | + { |
|
| 955 | 955 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 956 | 956 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 957 | - } |
|
| 957 | + } |
|
| 958 | 958 | } |
| 959 | 959 | |
| 960 | 960 | if ($sort != "") |
| 961 | 961 | { |
| 962 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 963 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 962 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 963 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 964 | 964 | } else { |
| 965 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 965 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 966 | 966 | } |
| 967 | 967 | |
| 968 | 968 | $query = $global_query." WHERE spotter_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
@@ -970,17 +970,17 @@ discard block |
||
| 970 | 970 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 971 | 971 | |
| 972 | 972 | return $spotter_array; |
| 973 | - } |
|
| 973 | + } |
|
| 974 | 974 | |
| 975 | 975 | |
| 976 | - /** |
|
| 977 | - * Gets all the spotter information based on the owner |
|
| 978 | - * |
|
| 979 | - * @return Array the spotter information |
|
| 980 | - * |
|
| 981 | - */ |
|
| 982 | - public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 983 | - { |
|
| 976 | + /** |
|
| 977 | + * Gets all the spotter information based on the owner |
|
| 978 | + * |
|
| 979 | + * @return Array the spotter information |
|
| 980 | + * |
|
| 981 | + */ |
|
| 982 | + public function getSpotterDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 983 | + { |
|
| 984 | 984 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 985 | 985 | |
| 986 | 986 | date_default_timezone_set('UTC'); |
@@ -993,35 +993,35 @@ discard block |
||
| 993 | 993 | |
| 994 | 994 | if ($owner != "") |
| 995 | 995 | { |
| 996 | - if (!is_string($owner)) |
|
| 997 | - { |
|
| 996 | + if (!is_string($owner)) |
|
| 997 | + { |
|
| 998 | 998 | return false; |
| 999 | - } else { |
|
| 999 | + } else { |
|
| 1000 | 1000 | $additional_query = " AND (spotter_archive_output.owner_name = :owner)"; |
| 1001 | 1001 | $query_values = array(':owner' => $owner); |
| 1002 | - } |
|
| 1002 | + } |
|
| 1003 | 1003 | } |
| 1004 | 1004 | |
| 1005 | 1005 | if ($limit != "") |
| 1006 | 1006 | { |
| 1007 | - $limit_array = explode(",", $limit); |
|
| 1007 | + $limit_array = explode(",", $limit); |
|
| 1008 | 1008 | |
| 1009 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1010 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1009 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1010 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1011 | 1011 | |
| 1012 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1013 | - { |
|
| 1012 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1013 | + { |
|
| 1014 | 1014 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1015 | 1015 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1016 | - } |
|
| 1016 | + } |
|
| 1017 | 1017 | } |
| 1018 | 1018 | |
| 1019 | 1019 | if ($sort != "") |
| 1020 | 1020 | { |
| 1021 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1022 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1021 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1022 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1023 | 1023 | } else { |
| 1024 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1024 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1025 | 1025 | } |
| 1026 | 1026 | |
| 1027 | 1027 | $query = $global_query.$filter_query." spotter_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1029,16 +1029,16 @@ discard block |
||
| 1029 | 1029 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1030 | 1030 | |
| 1031 | 1031 | return $spotter_array; |
| 1032 | - } |
|
| 1033 | - |
|
| 1034 | - /** |
|
| 1035 | - * Gets all the spotter information based on the pilot |
|
| 1036 | - * |
|
| 1037 | - * @return Array the spotter information |
|
| 1038 | - * |
|
| 1039 | - */ |
|
| 1040 | - public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1041 | - { |
|
| 1032 | + } |
|
| 1033 | + |
|
| 1034 | + /** |
|
| 1035 | + * Gets all the spotter information based on the pilot |
|
| 1036 | + * |
|
| 1037 | + * @return Array the spotter information |
|
| 1038 | + * |
|
| 1039 | + */ |
|
| 1040 | + public function getSpotterDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1041 | + { |
|
| 1042 | 1042 | $global_query = "SELECT spotter_archive_output.* FROM spotter_archive_output"; |
| 1043 | 1043 | |
| 1044 | 1044 | date_default_timezone_set('UTC'); |
@@ -1057,24 +1057,24 @@ discard block |
||
| 1057 | 1057 | |
| 1058 | 1058 | if ($limit != "") |
| 1059 | 1059 | { |
| 1060 | - $limit_array = explode(",", $limit); |
|
| 1060 | + $limit_array = explode(",", $limit); |
|
| 1061 | 1061 | |
| 1062 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1063 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1062 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1063 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1064 | 1064 | |
| 1065 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1066 | - { |
|
| 1065 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1066 | + { |
|
| 1067 | 1067 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1068 | 1068 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1069 | - } |
|
| 1069 | + } |
|
| 1070 | 1070 | } |
| 1071 | 1071 | |
| 1072 | 1072 | if ($sort != "") |
| 1073 | 1073 | { |
| 1074 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1075 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1074 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1075 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1076 | 1076 | } else { |
| 1077 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1077 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1078 | 1078 | } |
| 1079 | 1079 | |
| 1080 | 1080 | $query = $global_query.$filter_query." spotter_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1082,16 +1082,16 @@ discard block |
||
| 1082 | 1082 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1083 | 1083 | |
| 1084 | 1084 | return $spotter_array; |
| 1085 | - } |
|
| 1086 | - |
|
| 1087 | - /** |
|
| 1088 | - * Gets all number of flight over countries |
|
| 1089 | - * |
|
| 1090 | - * @return Array the airline country list |
|
| 1091 | - * |
|
| 1092 | - */ |
|
| 1093 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1094 | - { |
|
| 1085 | + } |
|
| 1086 | + |
|
| 1087 | + /** |
|
| 1088 | + * Gets all number of flight over countries |
|
| 1089 | + * |
|
| 1090 | + * @return Array the airline country list |
|
| 1091 | + * |
|
| 1092 | + */ |
|
| 1093 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1094 | + { |
|
| 1095 | 1095 | global $globalDBdriver; |
| 1096 | 1096 | /* |
| 1097 | 1097 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1101,14 +1101,14 @@ discard block |
||
| 1101 | 1101 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1102 | 1102 | FROM countries c, spotter_archive s |
| 1103 | 1103 | WHERE c.iso2 = s.over_country "; |
| 1104 | - if ($olderthanmonths > 0) { |
|
| 1105 | - if ($globalDBdriver == 'mysql') { |
|
| 1104 | + if ($olderthanmonths > 0) { |
|
| 1105 | + if ($globalDBdriver == 'mysql') { |
|
| 1106 | 1106 | $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1107 | 1107 | } else { |
| 1108 | 1108 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1109 | 1109 | } |
| 1110 | 1110 | } |
| 1111 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1111 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1112 | 1112 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1113 | 1113 | if ($limit) $query .= " LIMIT 0,10"; |
| 1114 | 1114 | |
@@ -1121,23 +1121,23 @@ discard block |
||
| 1121 | 1121 | |
| 1122 | 1122 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1123 | 1123 | { |
| 1124 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1125 | - $temp_array['flight_country'] = $row['name']; |
|
| 1126 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1127 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1128 | - $flight_array[] = $temp_array; |
|
| 1124 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1125 | + $temp_array['flight_country'] = $row['name']; |
|
| 1126 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1127 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1128 | + $flight_array[] = $temp_array; |
|
| 1129 | 1129 | } |
| 1130 | 1130 | return $flight_array; |
| 1131 | - } |
|
| 1132 | - |
|
| 1133 | - /** |
|
| 1134 | - * Gets all number of flight over countries |
|
| 1135 | - * |
|
| 1136 | - * @return Array the airline country list |
|
| 1137 | - * |
|
| 1138 | - */ |
|
| 1139 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1140 | - { |
|
| 1131 | + } |
|
| 1132 | + |
|
| 1133 | + /** |
|
| 1134 | + * Gets all number of flight over countries |
|
| 1135 | + * |
|
| 1136 | + * @return Array the airline country list |
|
| 1137 | + * |
|
| 1138 | + */ |
|
| 1139 | + public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1140 | + { |
|
| 1141 | 1141 | global $globalDBdriver; |
| 1142 | 1142 | /* |
| 1143 | 1143 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1147,14 +1147,14 @@ discard block |
||
| 1147 | 1147 | $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1148 | 1148 | FROM countries c, spotter_archive s, spotter_output o |
| 1149 | 1149 | WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.flightaware_id = s.flightaware_id "; |
| 1150 | - if ($olderthanmonths > 0) { |
|
| 1151 | - if ($globalDBdriver == 'mysql') { |
|
| 1150 | + if ($olderthanmonths > 0) { |
|
| 1151 | + if ($globalDBdriver == 'mysql') { |
|
| 1152 | 1152 | $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1153 | 1153 | } else { |
| 1154 | 1154 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1155 | 1155 | } |
| 1156 | 1156 | } |
| 1157 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1157 | + if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1158 | 1158 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1159 | 1159 | if ($limit) $query .= " LIMIT 0,10"; |
| 1160 | 1160 | |
@@ -1167,24 +1167,24 @@ discard block |
||
| 1167 | 1167 | |
| 1168 | 1168 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1169 | 1169 | { |
| 1170 | - $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1171 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1172 | - $temp_array['flight_country'] = $row['name']; |
|
| 1173 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1174 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1175 | - $flight_array[] = $temp_array; |
|
| 1170 | + $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1171 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1172 | + $temp_array['flight_country'] = $row['name']; |
|
| 1173 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1174 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1175 | + $flight_array[] = $temp_array; |
|
| 1176 | 1176 | } |
| 1177 | 1177 | return $flight_array; |
| 1178 | - } |
|
| 1179 | - |
|
| 1180 | - /** |
|
| 1181 | - * Gets last spotter information based on a particular callsign |
|
| 1182 | - * |
|
| 1183 | - * @return Array the spotter information |
|
| 1184 | - * |
|
| 1185 | - */ |
|
| 1186 | - public function getDateArchiveSpotterDataById($id,$date) |
|
| 1187 | - { |
|
| 1178 | + } |
|
| 1179 | + |
|
| 1180 | + /** |
|
| 1181 | + * Gets last spotter information based on a particular callsign |
|
| 1182 | + * |
|
| 1183 | + * @return Array the spotter information |
|
| 1184 | + * |
|
| 1185 | + */ |
|
| 1186 | + public function getDateArchiveSpotterDataById($id,$date) |
|
| 1187 | + { |
|
| 1188 | 1188 | $Spotter = new Spotter($this->db); |
| 1189 | 1189 | date_default_timezone_set('UTC'); |
| 1190 | 1190 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -1192,16 +1192,16 @@ discard block |
||
| 1192 | 1192 | $date = date('c',$date); |
| 1193 | 1193 | $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
| 1194 | 1194 | return $spotter_array; |
| 1195 | - } |
|
| 1196 | - |
|
| 1197 | - /** |
|
| 1198 | - * Gets all the spotter information based on a particular callsign |
|
| 1199 | - * |
|
| 1200 | - * @return Array the spotter information |
|
| 1201 | - * |
|
| 1202 | - */ |
|
| 1203 | - public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1204 | - { |
|
| 1195 | + } |
|
| 1196 | + |
|
| 1197 | + /** |
|
| 1198 | + * Gets all the spotter information based on a particular callsign |
|
| 1199 | + * |
|
| 1200 | + * @return Array the spotter information |
|
| 1201 | + * |
|
| 1202 | + */ |
|
| 1203 | + public function getDateArchiveSpotterDataByIdent($ident,$date) |
|
| 1204 | + { |
|
| 1205 | 1205 | $Spotter = new Spotter($this->db); |
| 1206 | 1206 | date_default_timezone_set('UTC'); |
| 1207 | 1207 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -1209,16 +1209,16 @@ discard block |
||
| 1209 | 1209 | $date = date('c',$date); |
| 1210 | 1210 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 1211 | 1211 | return $spotter_array; |
| 1212 | - } |
|
| 1213 | - |
|
| 1214 | - /** |
|
| 1215 | - * Gets all the spotter information based on the airport |
|
| 1216 | - * |
|
| 1217 | - * @return Array the spotter information |
|
| 1218 | - * |
|
| 1219 | - */ |
|
| 1220 | - public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1221 | - { |
|
| 1212 | + } |
|
| 1213 | + |
|
| 1214 | + /** |
|
| 1215 | + * Gets all the spotter information based on the airport |
|
| 1216 | + * |
|
| 1217 | + * @return Array the spotter information |
|
| 1218 | + * |
|
| 1219 | + */ |
|
| 1220 | + public function getSpotterDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1221 | + { |
|
| 1222 | 1222 | global $global_query; |
| 1223 | 1223 | $Spotter = new Spotter($this->db); |
| 1224 | 1224 | date_default_timezone_set('UTC'); |
@@ -1229,35 +1229,35 @@ discard block |
||
| 1229 | 1229 | |
| 1230 | 1230 | if ($airport != "") |
| 1231 | 1231 | { |
| 1232 | - if (!is_string($airport)) |
|
| 1233 | - { |
|
| 1232 | + if (!is_string($airport)) |
|
| 1233 | + { |
|
| 1234 | 1234 | return false; |
| 1235 | - } else { |
|
| 1235 | + } else { |
|
| 1236 | 1236 | $additional_query .= " AND ((spotter_archive_output.departure_airport_icao = :airport) OR (spotter_archive_output.arrival_airport_icao = :airport))"; |
| 1237 | 1237 | $query_values = array(':airport' => $airport); |
| 1238 | - } |
|
| 1238 | + } |
|
| 1239 | 1239 | } |
| 1240 | 1240 | |
| 1241 | 1241 | if ($limit != "") |
| 1242 | 1242 | { |
| 1243 | - $limit_array = explode(",", $limit); |
|
| 1243 | + $limit_array = explode(",", $limit); |
|
| 1244 | 1244 | |
| 1245 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1246 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1245 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1246 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1247 | 1247 | |
| 1248 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1249 | - { |
|
| 1248 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1249 | + { |
|
| 1250 | 1250 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1251 | 1251 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1252 | - } |
|
| 1252 | + } |
|
| 1253 | 1253 | } |
| 1254 | 1254 | |
| 1255 | 1255 | if ($sort != "") |
| 1256 | 1256 | { |
| 1257 | - $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1258 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1257 | + $search_orderby_array = $Spotter->getOrderBy(); |
|
| 1258 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1259 | 1259 | } else { |
| 1260 | - $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1260 | + $orderby_query = " ORDER BY spotter_archive_output.date DESC"; |
|
| 1261 | 1261 | } |
| 1262 | 1262 | |
| 1263 | 1263 | $query = $global_query.$filter_query." spotter_archive_output.ident <> '' ".$additional_query." AND ((spotter_archive_output.departure_airport_icao <> 'NA') AND (spotter_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query; |
@@ -1265,6 +1265,6 @@ discard block |
||
| 1265 | 1265 | $spotter_array = $Spotter->getDataFromDB($query, $query_values, $limit_query); |
| 1266 | 1266 | |
| 1267 | 1267 | return $spotter_array; |
| 1268 | - } |
|
| 1268 | + } |
|
| 1269 | 1269 | } |
| 1270 | 1270 | ?> |
| 1271 | 1271 | \ No newline at end of file |
@@ -329,15 +329,15 @@ |
||
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | <?php |
| 332 | - if (isset($globalMapUseBbox) && $globalMapUseBbox) { |
|
| 332 | + if (isset($globalMapUseBbox) && $globalMapUseBbox) { |
|
| 333 | 333 | ?> |
| 334 | 334 | var loc_geojson = Cesium.loadJson("<?php print $globalURL; ?>/location-geojson.php?coord="+bbox()); |
| 335 | 335 | <?php |
| 336 | - } else { |
|
| 336 | + } else { |
|
| 337 | 337 | ?> |
| 338 | 338 | var loc_geojson = Cesium.loadJson("<?php print $globalURL; ?>/location-geojson.php"); |
| 339 | 339 | <?php |
| 340 | - } |
|
| 340 | + } |
|
| 341 | 341 | ?> |
| 342 | 342 | loc_geojson.then(function(geojsondata) { |
| 343 | 343 | loc = new Cesium.CustomDataSource('location'); |
@@ -85,38 +85,38 @@ discard block |
||
| 85 | 85 | try { |
| 86 | 86 | //$Connection = new Connection(); |
| 87 | 87 | $sth = $Connection->db->prepare($query); |
| 88 | - $sth->execute(array(':source' => $database_file)); |
|
| 89 | - } catch(PDOException $e) { |
|
| 90 | - return "error : ".$e->getMessage(); |
|
| 91 | - } |
|
| 88 | + $sth->execute(array(':source' => $database_file)); |
|
| 89 | + } catch(PDOException $e) { |
|
| 90 | + return "error : ".$e->getMessage(); |
|
| 91 | + } |
|
| 92 | 92 | |
| 93 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 94 | - update_db::connect_sqlite($database_file); |
|
| 93 | + if ($globalDebug) echo " - Add routes to DB -"; |
|
| 94 | + update_db::connect_sqlite($database_file); |
|
| 95 | 95 | //$query = 'select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID'; |
| 96 | 96 | $query = "select Route.RouteID, Route.callsign, operator.Icao AS operator_icao, FromAir.Icao AS FromAirportIcao, ToAir.Icao AS ToAirportIcao, rstp.allstop AS AllStop from Route inner join operator ON Route.operatorId = operator.operatorId LEFT JOIN Airport AS FromAir ON route.FromAirportId = FromAir.AirportId LEFT JOIN Airport AS ToAir ON ToAir.AirportID = route.ToAirportID LEFT JOIN (select RouteId,GROUP_CONCAT(icao,' ') as allstop from routestop left join Airport as air ON routestop.AirportId = air.AirportID group by RouteID) AS rstp ON Route.RouteID = rstp.RouteID"; |
| 97 | 97 | try { |
| 98 | - $sth = update_db::$db_sqlite->prepare($query); |
|
| 99 | - $sth->execute(); |
|
| 100 | - } catch(PDOException $e) { |
|
| 101 | - return "error : ".$e->getMessage(); |
|
| 102 | - } |
|
| 98 | + $sth = update_db::$db_sqlite->prepare($query); |
|
| 99 | + $sth->execute(); |
|
| 100 | + } catch(PDOException $e) { |
|
| 101 | + return "error : ".$e->getMessage(); |
|
| 102 | + } |
|
| 103 | 103 | //$query_dest = 'INSERT INTO routes (`RouteID`,`CallSign`,`Operator_ICAO`,`FromAirport_ICAO`,`ToAirport_ICAO`,`RouteStop`,`Source`) VALUES (:RouteID, :CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)'; |
| 104 | 104 | $query_dest = 'INSERT INTO routes (CallSign,Operator_ICAO,FromAirport_ICAO,ToAirport_ICAO,RouteStop,Source) VALUES (:CallSign, :Operator_ICAO, :FromAirport_ICAO, :ToAirport_ICAO, :routestop, :source)'; |
| 105 | 105 | $Connection = new Connection(); |
| 106 | 106 | $sth_dest = $Connection->db->prepare($query_dest); |
| 107 | 107 | try { |
| 108 | 108 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 109 | - while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 109 | + while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 110 | 110 | //$query_dest_values = array(':RouteID' => $values['RouteId'],':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
| 111 | 111 | $query_dest_values = array(':CallSign' => $values['Callsign'],':Operator_ICAO' => $values['operator_icao'],':FromAirport_ICAO' => $values['FromAirportIcao'],':ToAirport_ICAO' => $values['ToAirportIcao'],':routestop' => $values['AllStop'],':source' => $database_file); |
| 112 | 112 | $sth_dest->execute($query_dest_values); |
| 113 | - } |
|
| 113 | + } |
|
| 114 | 114 | if ($globalTransaction) $Connection->db->commit(); |
| 115 | 115 | } catch(PDOException $e) { |
| 116 | 116 | if ($globalTransaction) $Connection->db->rollBack(); |
| 117 | 117 | return "error : ".$e->getMessage(); |
| 118 | 118 | } |
| 119 | - return ''; |
|
| 119 | + return ''; |
|
| 120 | 120 | } |
| 121 | 121 | public static function retrieve_route_oneworld($database_file) { |
| 122 | 122 | global $globalDebug, $globalTransaction; |
@@ -127,12 +127,12 @@ discard block |
||
| 127 | 127 | try { |
| 128 | 128 | //$Connection = new Connection(); |
| 129 | 129 | $sth = $Connection->db->prepare($query); |
| 130 | - $sth->execute(array(':source' => 'oneworld')); |
|
| 131 | - } catch(PDOException $e) { |
|
| 132 | - return "error : ".$e->getMessage(); |
|
| 133 | - } |
|
| 130 | + $sth->execute(array(':source' => 'oneworld')); |
|
| 131 | + } catch(PDOException $e) { |
|
| 132 | + return "error : ".$e->getMessage(); |
|
| 133 | + } |
|
| 134 | 134 | |
| 135 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 135 | + if ($globalDebug) echo " - Add routes to DB -"; |
|
| 136 | 136 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 137 | 137 | $Spotter = new Spotter(); |
| 138 | 138 | if ($fh = fopen($database_file,"r")) { |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | } |
| 157 | 157 | if ($globalTransaction) $Connection->db->commit(); |
| 158 | 158 | } |
| 159 | - return ''; |
|
| 159 | + return ''; |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | public static function retrieve_route_skyteam($database_file) { |
@@ -168,12 +168,12 @@ discard block |
||
| 168 | 168 | try { |
| 169 | 169 | //$Connection = new Connection(); |
| 170 | 170 | $sth = $Connection->db->prepare($query); |
| 171 | - $sth->execute(array(':source' => 'skyteam')); |
|
| 172 | - } catch(PDOException $e) { |
|
| 173 | - return "error : ".$e->getMessage(); |
|
| 174 | - } |
|
| 171 | + $sth->execute(array(':source' => 'skyteam')); |
|
| 172 | + } catch(PDOException $e) { |
|
| 173 | + return "error : ".$e->getMessage(); |
|
| 174 | + } |
|
| 175 | 175 | |
| 176 | - if ($globalDebug) echo " - Add routes to DB -"; |
|
| 176 | + if ($globalDebug) echo " - Add routes to DB -"; |
|
| 177 | 177 | |
| 178 | 178 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 179 | 179 | $Spotter = new Spotter(); |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | return "error : ".$e->getMessage(); |
| 200 | 200 | } |
| 201 | 201 | } |
| 202 | - return ''; |
|
| 202 | + return ''; |
|
| 203 | 203 | } |
| 204 | 204 | public static function retrieve_modes_sqlite_to_dest($database_file) { |
| 205 | 205 | global $globalTransaction; |
@@ -208,27 +208,27 @@ discard block |
||
| 208 | 208 | try { |
| 209 | 209 | $Connection = new Connection(); |
| 210 | 210 | $sth = $Connection->db->prepare($query); |
| 211 | - $sth->execute(array(':source' => $database_file)); |
|
| 212 | - } catch(PDOException $e) { |
|
| 213 | - return "error : ".$e->getMessage(); |
|
| 214 | - } |
|
| 211 | + $sth->execute(array(':source' => $database_file)); |
|
| 212 | + } catch(PDOException $e) { |
|
| 213 | + return "error : ".$e->getMessage(); |
|
| 214 | + } |
|
| 215 | 215 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source IS NULL OR Source = :source"; |
| 216 | 216 | try { |
| 217 | 217 | $Connection = new Connection(); |
| 218 | 218 | $sth = $Connection->db->prepare($query); |
| 219 | - $sth->execute(array(':source' => $database_file)); |
|
| 220 | - } catch(PDOException $e) { |
|
| 221 | - return "error : ".$e->getMessage(); |
|
| 222 | - } |
|
| 219 | + $sth->execute(array(':source' => $database_file)); |
|
| 220 | + } catch(PDOException $e) { |
|
| 221 | + return "error : ".$e->getMessage(); |
|
| 222 | + } |
|
| 223 | 223 | |
| 224 | - update_db::connect_sqlite($database_file); |
|
| 224 | + update_db::connect_sqlite($database_file); |
|
| 225 | 225 | $query = 'select * from Aircraft'; |
| 226 | 226 | try { |
| 227 | - $sth = update_db::$db_sqlite->prepare($query); |
|
| 228 | - $sth->execute(); |
|
| 229 | - } catch(PDOException $e) { |
|
| 230 | - return "error : ".$e->getMessage(); |
|
| 231 | - } |
|
| 227 | + $sth = update_db::$db_sqlite->prepare($query); |
|
| 228 | + $sth->execute(); |
|
| 229 | + } catch(PDOException $e) { |
|
| 230 | + return "error : ".$e->getMessage(); |
|
| 231 | + } |
|
| 232 | 232 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 233 | 233 | $query_dest = 'INSERT INTO aircraft_modes (LastModified, ModeS,ModeSCountry,Registration,ICAOTypeCode,type_flight,Source) VALUES (:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:type,:source)'; |
| 234 | 234 | |
@@ -239,17 +239,17 @@ discard block |
||
| 239 | 239 | $sth_dest_owner = $Connection->db->prepare($query_dest_owner); |
| 240 | 240 | try { |
| 241 | 241 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 242 | - while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 242 | + while ($values = $sth->fetch(PDO::FETCH_ASSOC)) { |
|
| 243 | 243 | //$query_dest_values = array(':AircraftID' => $values['AircraftID'],':FirstCreated' => $values['FirstCreated'],':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':SerialNo' => $values['SerialNo'], ':OperatorFlagCode' => $values['OperatorFlagCode'], ':Manufacturer' => $values['Manufacturer'], ':Type' => $values['Type'], ':FirstRegDate' => $values['FirstRegDate'], ':CurrentRegDate' => $values['CurrentRegDate'], ':Country' => $values['Country'], ':PreviousID' => $values['PreviousID'], ':DeRegDate' => $values['DeRegDate'], ':Status' => $values['Status'], ':PopularName' => $values['PopularName'],':GenericName' => $values['GenericName'],':AircraftClass' => $values['AircraftClass'], ':Engines' => $values['Engines'], ':OwnershipStatus' => $values['OwnershipStatus'],':RegisteredOwners' => $values['RegisteredOwners'],':MTOW' => $values['MTOW'], ':TotalHours' => $values['TotalHours'],':YearBuilt' => $values['YearBuilt'], ':CofACategory' => $values['CofACategory'], ':CofAExpiry' => $values['CofAExpiry'], ':UserNotes' => $values['UserNotes'], ':Interested' => $values['Interested'], ':UserTag' => $values['UserTag'], ':InfoUrl' => $values['InfoURL'], ':PictureUrl1' => $values['PictureURL1'], ':PictureUrl2' => $values['PictureURL2'], ':PictureUrl3' => $values['PictureURL3'], ':UserBool1' => $values['UserBool1'], ':UserBool2' => $values['UserBool2'], ':UserBool3' => $values['UserBool3'], ':UserBool4' => $values['UserBool4'], ':UserBool5' => $values['UserBool5'], ':UserString1' => $values['UserString1'], ':UserString2' => $values['UserString2'], ':UserString3' => $values['UserString3'], ':UserString4' => $values['UserString4'], ':UserString5' => $values['UserString5'], ':UserInt1' => $values['UserInt1'], ':UserInt2' => $values['UserInt2'], ':UserInt3' => $values['UserInt3'], ':UserInt4' => $values['UserInt4'], ':UserInt5' => $values['UserInt5']); |
| 244 | 244 | if ($values['UserString4'] == 'M') $type = 'military'; |
| 245 | 245 | else $type = null; |
| 246 | 246 | $query_dest_values = array(':LastModified' => $values['LastModified'],':ModeS' => $values['ModeS'],':ModeSCountry' => $values['ModeSCountry'],':Registration' => $values['Registration'],':ICAOTypeCode' => $values['ICAOTypeCode'],':source' => $database_file,':type' => $type); |
| 247 | 247 | $sth_dest->execute($query_dest_values); |
| 248 | 248 | if ($values['RegisteredOwners'] != '' && $values['RegisteredOwners'] != NULL && $values['RegisteredOwners'] != 'Private') { |
| 249 | - $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']); |
|
| 250 | - $sth_dest_owner->execute($query_dest_owner_values); |
|
| 249 | + $query_dest_owner_values = array(':registration' => $values['Registration'],':source' => $database_file,':owner' => $values['RegisteredOwners']); |
|
| 250 | + $sth_dest_owner->execute($query_dest_owner_values); |
|
| 251 | 251 | } |
| 252 | - } |
|
| 252 | + } |
|
| 253 | 253 | if ($globalTransaction) $Connection->db->commit(); |
| 254 | 254 | } catch(PDOException $e) { |
| 255 | 255 | return "error : ".$e->getMessage(); |
@@ -260,10 +260,10 @@ discard block |
||
| 260 | 260 | try { |
| 261 | 261 | $Connection = new Connection(); |
| 262 | 262 | $sth = $Connection->db->prepare($query); |
| 263 | - $sth->execute(array(':source' => $database_file)); |
|
| 264 | - } catch(PDOException $e) { |
|
| 265 | - return "error : ".$e->getMessage(); |
|
| 266 | - } |
|
| 263 | + $sth->execute(array(':source' => $database_file)); |
|
| 264 | + } catch(PDOException $e) { |
|
| 265 | + return "error : ".$e->getMessage(); |
|
| 266 | + } |
|
| 267 | 267 | return ''; |
| 268 | 268 | } |
| 269 | 269 | |
@@ -275,10 +275,10 @@ discard block |
||
| 275 | 275 | try { |
| 276 | 276 | $Connection = new Connection(); |
| 277 | 277 | $sth = $Connection->db->prepare($query); |
| 278 | - $sth->execute(array(':source' => $database_file)); |
|
| 279 | - } catch(PDOException $e) { |
|
| 280 | - return "error : ".$e->getMessage(); |
|
| 281 | - } |
|
| 278 | + $sth->execute(array(':source' => $database_file)); |
|
| 279 | + } catch(PDOException $e) { |
|
| 280 | + return "error : ".$e->getMessage(); |
|
| 281 | + } |
|
| 282 | 282 | |
| 283 | 283 | if ($fh = fopen($database_file,"r")) { |
| 284 | 284 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
@@ -288,26 +288,26 @@ discard block |
||
| 288 | 288 | $sth_dest = $Connection->db->prepare($query_dest); |
| 289 | 289 | try { |
| 290 | 290 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 291 | - while (!feof($fh)) { |
|
| 292 | - $values = array(); |
|
| 293 | - $line = $Common->hex2str(fgets($fh,9999)); |
|
| 291 | + while (!feof($fh)) { |
|
| 292 | + $values = array(); |
|
| 293 | + $line = $Common->hex2str(fgets($fh,9999)); |
|
| 294 | 294 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 295 | - $values['ModeS'] = substr($line,0,6); |
|
| 296 | - $values['Registration'] = trim(substr($line,69,6)); |
|
| 297 | - $aircraft_name = trim(substr($line,48,6)); |
|
| 298 | - // Check if we can find ICAO, else set it to GLID |
|
| 299 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 300 | - $search_more = ''; |
|
| 301 | - if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 302 | - $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
|
| 303 | - $sth_search = $Connection->db->prepare($query_search); |
|
| 295 | + $values['ModeS'] = substr($line,0,6); |
|
| 296 | + $values['Registration'] = trim(substr($line,69,6)); |
|
| 297 | + $aircraft_name = trim(substr($line,48,6)); |
|
| 298 | + // Check if we can find ICAO, else set it to GLID |
|
| 299 | + $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 300 | + $search_more = ''; |
|
| 301 | + if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 302 | + $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
|
| 303 | + $sth_search = $Connection->db->prepare($query_search); |
|
| 304 | 304 | try { |
| 305 | - $sth_search->execute(); |
|
| 306 | - $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
|
| 307 | - //if (count($result) > 0) { |
|
| 308 | - if (isset($result['icao']) && $result['icao'] != '') { |
|
| 309 | - $values['ICAOTypeCode'] = $result['icao']; |
|
| 310 | - } |
|
| 305 | + $sth_search->execute(); |
|
| 306 | + $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
|
| 307 | + //if (count($result) > 0) { |
|
| 308 | + if (isset($result['icao']) && $result['icao'] != '') { |
|
| 309 | + $values['ICAOTypeCode'] = $result['icao']; |
|
| 310 | + } |
|
| 311 | 311 | } catch(PDOException $e) { |
| 312 | 312 | return "error : ".$e->getMessage(); |
| 313 | 313 | } |
@@ -330,10 +330,10 @@ discard block |
||
| 330 | 330 | try { |
| 331 | 331 | $Connection = new Connection(); |
| 332 | 332 | $sth = $Connection->db->prepare($query); |
| 333 | - $sth->execute(array(':source' => $database_file)); |
|
| 334 | - } catch(PDOException $e) { |
|
| 335 | - return "error : ".$e->getMessage(); |
|
| 336 | - } |
|
| 333 | + $sth->execute(array(':source' => $database_file)); |
|
| 334 | + } catch(PDOException $e) { |
|
| 335 | + return "error : ".$e->getMessage(); |
|
| 336 | + } |
|
| 337 | 337 | return ''; |
| 338 | 338 | } |
| 339 | 339 | |
@@ -344,10 +344,10 @@ discard block |
||
| 344 | 344 | try { |
| 345 | 345 | $Connection = new Connection(); |
| 346 | 346 | $sth = $Connection->db->prepare($query); |
| 347 | - $sth->execute(array(':source' => $database_file)); |
|
| 348 | - } catch(PDOException $e) { |
|
| 349 | - return "error : ".$e->getMessage(); |
|
| 350 | - } |
|
| 347 | + $sth->execute(array(':source' => $database_file)); |
|
| 348 | + } catch(PDOException $e) { |
|
| 349 | + return "error : ".$e->getMessage(); |
|
| 350 | + } |
|
| 351 | 351 | |
| 352 | 352 | if ($fh = fopen($database_file,"r")) { |
| 353 | 353 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
@@ -358,25 +358,25 @@ discard block |
||
| 358 | 358 | try { |
| 359 | 359 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 360 | 360 | $tmp = fgetcsv($fh,9999,',',"'"); |
| 361 | - while (!feof($fh)) { |
|
| 362 | - $line = fgetcsv($fh,9999,',',"'"); |
|
| 361 | + while (!feof($fh)) { |
|
| 362 | + $line = fgetcsv($fh,9999,',',"'"); |
|
| 363 | 363 | |
| 364 | 364 | //FFFFFF RIDEAU VALLEY SOARINGASW-20 C-FBKN MZ 123.400 |
| 365 | 365 | //print_r($line); |
| 366 | - $values['ModeS'] = $line[1]; |
|
| 367 | - $values['Registration'] = $line[3]; |
|
| 368 | - $values['ICAOTypeCode'] = ''; |
|
| 369 | - $aircraft_name = $line[2]; |
|
| 370 | - // Check if we can find ICAO, else set it to GLID |
|
| 371 | - $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 372 | - $search_more = ''; |
|
| 373 | - if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 374 | - $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
|
| 375 | - $sth_search = $Connection->db->prepare($query_search); |
|
| 366 | + $values['ModeS'] = $line[1]; |
|
| 367 | + $values['Registration'] = $line[3]; |
|
| 368 | + $values['ICAOTypeCode'] = ''; |
|
| 369 | + $aircraft_name = $line[2]; |
|
| 370 | + // Check if we can find ICAO, else set it to GLID |
|
| 371 | + $aircraft_name_split = explode(' ',$aircraft_name); |
|
| 372 | + $search_more = ''; |
|
| 373 | + if (count($aircraft_name) > 1 && strlen($aircraft_name_split[1]) > 3) $search_more .= " AND LIKE '%".$aircraft_name_split[0]."%'"; |
|
| 374 | + $query_search = "SELECT * FROM aircraft WHERE type LIKE '%".$aircraft_name."%'".$search_more; |
|
| 375 | + $sth_search = $Connection->db->prepare($query_search); |
|
| 376 | 376 | try { |
| 377 | - $sth_search->execute(); |
|
| 378 | - $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
|
| 379 | - if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
|
| 377 | + $sth_search->execute(); |
|
| 378 | + $result = $sth_search->fetch(PDO::FETCH_ASSOC); |
|
| 379 | + if (isset($result['icao']) && $result['icao'] != '') $values['ICAOTypeCode'] = $result['icao']; |
|
| 380 | 380 | } catch(PDOException $e) { |
| 381 | 381 | return "error : ".$e->getMessage(); |
| 382 | 382 | } |
@@ -399,10 +399,10 @@ discard block |
||
| 399 | 399 | try { |
| 400 | 400 | $Connection = new Connection(); |
| 401 | 401 | $sth = $Connection->db->prepare($query); |
| 402 | - $sth->execute(array(':source' => $database_file)); |
|
| 403 | - } catch(PDOException $e) { |
|
| 404 | - return "error : ".$e->getMessage(); |
|
| 405 | - } |
|
| 402 | + $sth->execute(array(':source' => $database_file)); |
|
| 403 | + } catch(PDOException $e) { |
|
| 404 | + return "error : ".$e->getMessage(); |
|
| 405 | + } |
|
| 406 | 406 | return ''; |
| 407 | 407 | } |
| 408 | 408 | |
@@ -413,16 +413,16 @@ discard block |
||
| 413 | 413 | try { |
| 414 | 414 | $Connection = new Connection(); |
| 415 | 415 | $sth = $Connection->db->prepare($query); |
| 416 | - $sth->execute(array(':source' => $database_file)); |
|
| 417 | - } catch(PDOException $e) { |
|
| 418 | - return "error : ".$e->getMessage(); |
|
| 419 | - } |
|
| 416 | + $sth->execute(array(':source' => $database_file)); |
|
| 417 | + } catch(PDOException $e) { |
|
| 418 | + return "error : ".$e->getMessage(); |
|
| 419 | + } |
|
| 420 | 420 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
| 421 | 421 | $Spotter = new Spotter(); |
| 422 | 422 | if ($fh = fopen($database_file,"r")) { |
| 423 | 423 | //$query_dest = 'INSERT INTO aircraft_modes (`AircraftID`,`FirstCreated`,`LastModified`, `ModeS`,`ModeSCountry`,`Registration`,`ICAOTypeCode`,`SerialNo`, `OperatorFlagCode`, `Manufacturer`, `Type`, `FirstRegDate`, `CurrentRegDate`, `Country`, `PreviousID`, `DeRegDate`, `Status`, `PopularName`,`GenericName`,`AircraftClass`, `Engines`, `OwnershipStatus`,`RegisteredOwners`,`MTOW`, `TotalHours`, `YearBuilt`, `CofACategory`, `CofAExpiry`, `UserNotes`, `Interested`, `UserTag`, `InfoUrl`, `PictureUrl1`, `PictureUrl2`, `PictureUrl3`, `UserBool1`, `UserBool2`, `UserBool3`, `UserBool4`, `UserBool5`, `UserString1`, `UserString2`, `UserString3`, `UserString4`, `UserString5`, `UserInt1`, `UserInt2`, `UserInt3`, `UserInt4`, `UserInt5`) VALUES (:AircraftID,:FirstCreated,:LastModified,:ModeS,:ModeSCountry,:Registration,:ICAOTypeCode,:SerialNo, :OperatorFlagCode, :Manufacturer, :Type, :FirstRegDate, :CurrentRegDate, :Country, :PreviousID, :DeRegDate, :Status, :PopularName,:GenericName,:AircraftClass, :Engines, :OwnershipStatus,:RegisteredOwners,:MTOW, :TotalHours,:YearBuilt, :CofACategory, :CofAExpiry, :UserNotes, :Interested, :UserTag, :InfoUrl, :PictureUrl1, :PictureUrl2, :PictureUrl3, :UserBool1, :UserBool2, :UserBool3, :UserBool4, :UserBool5, :UserString1, :UserString2, :UserString3, :UserString4, :UserString5, :UserInt1, :UserInt2, :UserInt3, :UserInt4, :UserInt5)'; |
| 424 | 424 | $query_dest = 'INSERT INTO aircraft_owner (registration,base,owner,date_first_reg,Source) VALUES (:registration,:base,:owner,:date_first_reg,:source)'; |
| 425 | - $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)'; |
|
| 425 | + $query_modes = 'INSERT INTO aircraft_modes (ModeS,ModeSCountry,Registration,ICAOTypeCode,Source) VALUES (:modes,:modescountry,:registration,:icaotypecode,:source)'; |
|
| 426 | 426 | |
| 427 | 427 | $Connection = new Connection(); |
| 428 | 428 | $sth_dest = $Connection->db->prepare($query_dest); |
@@ -430,126 +430,126 @@ discard block |
||
| 430 | 430 | try { |
| 431 | 431 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 432 | 432 | $tmp = fgetcsv($fh,9999,',','"'); |
| 433 | - while (!feof($fh)) { |
|
| 434 | - $line = fgetcsv($fh,9999,',','"'); |
|
| 435 | - $values = array(); |
|
| 436 | - //print_r($line); |
|
| 437 | - if ($country == 'F') { |
|
| 438 | - $values['registration'] = $line[0]; |
|
| 439 | - $values['base'] = $line[4]; |
|
| 440 | - $values['owner'] = $line[5]; |
|
| 441 | - if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 442 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 443 | - $values['cancel'] = $line[7]; |
|
| 433 | + while (!feof($fh)) { |
|
| 434 | + $line = fgetcsv($fh,9999,',','"'); |
|
| 435 | + $values = array(); |
|
| 436 | + //print_r($line); |
|
| 437 | + if ($country == 'F') { |
|
| 438 | + $values['registration'] = $line[0]; |
|
| 439 | + $values['base'] = $line[4]; |
|
| 440 | + $values['owner'] = $line[5]; |
|
| 441 | + if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 442 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 443 | + $values['cancel'] = $line[7]; |
|
| 444 | 444 | } elseif ($country == 'EI') { |
| 445 | - // TODO : add modeS & reg to aircraft_modes |
|
| 446 | - $values['registration'] = $line[0]; |
|
| 447 | - $values['base'] = $line[3]; |
|
| 448 | - $values['owner'] = $line[2]; |
|
| 449 | - if ($line[1] == '') $values['date_first_reg'] = null; |
|
| 450 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 451 | - $values['cancel'] = ''; |
|
| 452 | - $values['modes'] = $line[7]; |
|
| 453 | - $values['icao'] = $line[8]; |
|
| 445 | + // TODO : add modeS & reg to aircraft_modes |
|
| 446 | + $values['registration'] = $line[0]; |
|
| 447 | + $values['base'] = $line[3]; |
|
| 448 | + $values['owner'] = $line[2]; |
|
| 449 | + if ($line[1] == '') $values['date_first_reg'] = null; |
|
| 450 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[1])); |
|
| 451 | + $values['cancel'] = ''; |
|
| 452 | + $values['modes'] = $line[7]; |
|
| 453 | + $values['icao'] = $line[8]; |
|
| 454 | 454 | |
| 455 | 455 | } elseif ($country == 'HB') { |
| 456 | - // TODO : add modeS & reg to aircraft_modes |
|
| 457 | - $values['registration'] = $line[0]; |
|
| 458 | - $values['base'] = null; |
|
| 459 | - $values['owner'] = $line[5]; |
|
| 460 | - $values['date_first_reg'] = null; |
|
| 461 | - $values['cancel'] = ''; |
|
| 462 | - $values['modes'] = $line[4]; |
|
| 463 | - $values['icao'] = $line[7]; |
|
| 456 | + // TODO : add modeS & reg to aircraft_modes |
|
| 457 | + $values['registration'] = $line[0]; |
|
| 458 | + $values['base'] = null; |
|
| 459 | + $values['owner'] = $line[5]; |
|
| 460 | + $values['date_first_reg'] = null; |
|
| 461 | + $values['cancel'] = ''; |
|
| 462 | + $values['modes'] = $line[4]; |
|
| 463 | + $values['icao'] = $line[7]; |
|
| 464 | 464 | } elseif ($country == 'OK') { |
| 465 | - // TODO : add modeS & reg to aircraft_modes |
|
| 466 | - $values['registration'] = $line[3]; |
|
| 467 | - $values['base'] = null; |
|
| 468 | - $values['owner'] = $line[5]; |
|
| 469 | - if ($line[18] == '') $values['date_first_reg'] = null; |
|
| 470 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 471 | - $values['cancel'] = ''; |
|
| 465 | + // TODO : add modeS & reg to aircraft_modes |
|
| 466 | + $values['registration'] = $line[3]; |
|
| 467 | + $values['base'] = null; |
|
| 468 | + $values['owner'] = $line[5]; |
|
| 469 | + if ($line[18] == '') $values['date_first_reg'] = null; |
|
| 470 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[18])); |
|
| 471 | + $values['cancel'] = ''; |
|
| 472 | 472 | } elseif ($country == 'VH') { |
| 473 | - // TODO : add modeS & reg to aircraft_modes |
|
| 474 | - $values['registration'] = $line[0]; |
|
| 475 | - $values['base'] = null; |
|
| 476 | - $values['owner'] = $line[12]; |
|
| 477 | - if ($line[28] == '') $values['date_first_reg'] = null; |
|
| 478 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 479 | - |
|
| 480 | - $values['cancel'] = $line[39]; |
|
| 473 | + // TODO : add modeS & reg to aircraft_modes |
|
| 474 | + $values['registration'] = $line[0]; |
|
| 475 | + $values['base'] = null; |
|
| 476 | + $values['owner'] = $line[12]; |
|
| 477 | + if ($line[28] == '') $values['date_first_reg'] = null; |
|
| 478 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[28])); |
|
| 479 | + |
|
| 480 | + $values['cancel'] = $line[39]; |
|
| 481 | 481 | } elseif ($country == 'OE' || $country == '9A' || $country == 'VP' || $country == 'LX' || $country == 'P2' || $country == 'HC') { |
| 482 | - $values['registration'] = $line[0]; |
|
| 483 | - $values['base'] = null; |
|
| 484 | - $values['owner'] = $line[4]; |
|
| 485 | - $values['date_first_reg'] = null; |
|
| 486 | - $values['cancel'] = ''; |
|
| 482 | + $values['registration'] = $line[0]; |
|
| 483 | + $values['base'] = null; |
|
| 484 | + $values['owner'] = $line[4]; |
|
| 485 | + $values['date_first_reg'] = null; |
|
| 486 | + $values['cancel'] = ''; |
|
| 487 | 487 | } elseif ($country == 'CC') { |
| 488 | - $values['registration'] = $line[0]; |
|
| 489 | - $values['base'] = null; |
|
| 490 | - $values['owner'] = $line[6]; |
|
| 491 | - $values['date_first_reg'] = null; |
|
| 492 | - $values['cancel'] = ''; |
|
| 488 | + $values['registration'] = $line[0]; |
|
| 489 | + $values['base'] = null; |
|
| 490 | + $values['owner'] = $line[6]; |
|
| 491 | + $values['date_first_reg'] = null; |
|
| 492 | + $values['cancel'] = ''; |
|
| 493 | 493 | } elseif ($country == 'HJ') { |
| 494 | - $values['registration'] = $line[0]; |
|
| 495 | - $values['base'] = null; |
|
| 496 | - $values['owner'] = $line[8]; |
|
| 497 | - if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 498 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 499 | - $values['cancel'] = ''; |
|
| 494 | + $values['registration'] = $line[0]; |
|
| 495 | + $values['base'] = null; |
|
| 496 | + $values['owner'] = $line[8]; |
|
| 497 | + if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 498 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 499 | + $values['cancel'] = ''; |
|
| 500 | 500 | } elseif ($country == 'PP') { |
| 501 | - $values['registration'] = $line[0]; |
|
| 502 | - $values['base'] = null; |
|
| 503 | - $values['owner'] = $line[4]; |
|
| 504 | - if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 505 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 506 | - $values['cancel'] = $line[7]; |
|
| 501 | + $values['registration'] = $line[0]; |
|
| 502 | + $values['base'] = null; |
|
| 503 | + $values['owner'] = $line[4]; |
|
| 504 | + if ($line[6] == '') $values['date_first_reg'] = null; |
|
| 505 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[6])); |
|
| 506 | + $values['cancel'] = $line[7]; |
|
| 507 | 507 | } elseif ($country == 'E7') { |
| 508 | - $values['registration'] = $line[0]; |
|
| 509 | - $values['base'] = null; |
|
| 510 | - $values['owner'] = $line[4]; |
|
| 511 | - if ($line[5] == '') $values['date_first_reg'] = null; |
|
| 512 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 513 | - $values['cancel'] = ''; |
|
| 508 | + $values['registration'] = $line[0]; |
|
| 509 | + $values['base'] = null; |
|
| 510 | + $values['owner'] = $line[4]; |
|
| 511 | + if ($line[5] == '') $values['date_first_reg'] = null; |
|
| 512 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 513 | + $values['cancel'] = ''; |
|
| 514 | 514 | } elseif ($country == '8Q') { |
| 515 | - $values['registration'] = $line[0]; |
|
| 516 | - $values['base'] = null; |
|
| 517 | - $values['owner'] = $line[3]; |
|
| 518 | - if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 519 | - else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 520 | - $values['cancel'] = ''; |
|
| 515 | + $values['registration'] = $line[0]; |
|
| 516 | + $values['base'] = null; |
|
| 517 | + $values['owner'] = $line[3]; |
|
| 518 | + if ($line[7] == '') $values['date_first_reg'] = null; |
|
| 519 | + else $values['date_first_reg'] = date("Y-m-d",strtotime($line[7])); |
|
| 520 | + $values['cancel'] = ''; |
|
| 521 | 521 | } elseif ($country == 'ZK') { |
| 522 | - $values['registration'] = $line[0]; |
|
| 523 | - $values['base'] = null; |
|
| 524 | - $values['owner'] = $line[3]; |
|
| 525 | - $values['date_first_reg'] = null; |
|
| 526 | - $values['cancel'] = ''; |
|
| 527 | - $values['modes'] = $line[5]; |
|
| 528 | - $values['icao'] = $line[9]; |
|
| 522 | + $values['registration'] = $line[0]; |
|
| 523 | + $values['base'] = null; |
|
| 524 | + $values['owner'] = $line[3]; |
|
| 525 | + $values['date_first_reg'] = null; |
|
| 526 | + $values['cancel'] = ''; |
|
| 527 | + $values['modes'] = $line[5]; |
|
| 528 | + $values['icao'] = $line[9]; |
|
| 529 | 529 | } elseif ($country == 'M') { |
| 530 | - $values['registration'] = $line[0]; |
|
| 531 | - $values['base'] = null; |
|
| 532 | - $values['owner'] = $line[6]; |
|
| 533 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 534 | - $values['cancel'] = date("Y-m-d",strtotime($line[8])); |
|
| 535 | - $values['modes'] = $line[4]; |
|
| 536 | - $values['icao'] = $line[10]; |
|
| 530 | + $values['registration'] = $line[0]; |
|
| 531 | + $values['base'] = null; |
|
| 532 | + $values['owner'] = $line[6]; |
|
| 533 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[5])); |
|
| 534 | + $values['cancel'] = date("Y-m-d",strtotime($line[8])); |
|
| 535 | + $values['modes'] = $line[4]; |
|
| 536 | + $values['icao'] = $line[10]; |
|
| 537 | 537 | } elseif ($country == 'OY') { |
| 538 | - $values['registration'] = $line[0]; |
|
| 539 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[4])); |
|
| 540 | - $values['modes'] = $line[5]; |
|
| 541 | - $values['icao'] = $line[6]; |
|
| 538 | + $values['registration'] = $line[0]; |
|
| 539 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[4])); |
|
| 540 | + $values['modes'] = $line[5]; |
|
| 541 | + $values['icao'] = $line[6]; |
|
| 542 | 542 | } elseif ($country == 'PH') { |
| 543 | - $values['registration'] = $line[0]; |
|
| 544 | - $values['date_first_reg'] = date("Y-m-d",strtotime($line[3])); |
|
| 545 | - $values['modes'] = $line[4]; |
|
| 546 | - $values['icao'] = $line[5]; |
|
| 543 | + $values['registration'] = $line[0]; |
|
| 544 | + $values['date_first_reg'] = date("Y-m-d",strtotime($line[3])); |
|
| 545 | + $values['modes'] = $line[4]; |
|
| 546 | + $values['icao'] = $line[5]; |
|
| 547 | 547 | } elseif ($country == 'OM' || $country == 'TF') { |
| 548 | - $values['registration'] = $line[0]; |
|
| 549 | - $values['base'] = null; |
|
| 550 | - $values['owner'] = $line[3]; |
|
| 551 | - $values['date_first_reg'] = null; |
|
| 552 | - $values['cancel'] = ''; |
|
| 548 | + $values['registration'] = $line[0]; |
|
| 549 | + $values['base'] = null; |
|
| 550 | + $values['owner'] = $line[3]; |
|
| 551 | + $values['date_first_reg'] = null; |
|
| 552 | + $values['cancel'] = ''; |
|
| 553 | 553 | } |
| 554 | 554 | if (isset($values['cancel']) && $values['cancel'] == '' && $values['registration'] != null && isset($values['owner'])) { |
| 555 | 555 | $query_dest_values = array(':registration' => $values['registration'],':base' => $values['base'],':date_first_reg' => $values['date_first_reg'],':owner' => $values['owner'],':source' => $database_file); |
@@ -682,7 +682,7 @@ discard block |
||
| 682 | 682 | return "error : ".$e->getMessage(); |
| 683 | 683 | } |
| 684 | 684 | */ |
| 685 | - /* |
|
| 685 | + /* |
|
| 686 | 686 | $query = 'ALTER TABLE airport DROP INDEX icaoidx'; |
| 687 | 687 | try { |
| 688 | 688 | $Connection = new Connection(); |
@@ -927,10 +927,10 @@ discard block |
||
| 927 | 927 | try { |
| 928 | 928 | $Connection = new Connection(); |
| 929 | 929 | $sth = $Connection->db->prepare($query); |
| 930 | - $sth->execute(array(':source' => 'translation.csv')); |
|
| 931 | - } catch(PDOException $e) { |
|
| 932 | - return "error : ".$e->getMessage(); |
|
| 933 | - } |
|
| 930 | + $sth->execute(array(':source' => 'translation.csv')); |
|
| 931 | + } catch(PDOException $e) { |
|
| 932 | + return "error : ".$e->getMessage(); |
|
| 933 | + } |
|
| 934 | 934 | |
| 935 | 935 | |
| 936 | 936 | //update_db::unzip($out_file); |
@@ -949,21 +949,21 @@ discard block |
||
| 949 | 949 | $data = $row; |
| 950 | 950 | $operator = $data[2]; |
| 951 | 951 | if ($operator != '' && is_numeric(substr(substr($operator, 0, 3), -1, 1))) { |
| 952 | - $airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2)); |
|
| 953 | - //echo substr($operator, 0, 2)."\n";; |
|
| 954 | - if (count($airline_array) > 0) { |
|
| 952 | + $airline_array = $Spotter->getAllAirlineInfo(substr($operator, 0, 2)); |
|
| 953 | + //echo substr($operator, 0, 2)."\n";; |
|
| 954 | + if (count($airline_array) > 0) { |
|
| 955 | 955 | //print_r($airline_array); |
| 956 | 956 | $operator = $airline_array[0]['icao'].substr($operator,2); |
| 957 | - } |
|
| 958 | - } |
|
| 957 | + } |
|
| 958 | + } |
|
| 959 | 959 | |
| 960 | 960 | $operator_correct = $data[3]; |
| 961 | 961 | if ($operator_correct != '' && is_numeric(substr(substr($operator_correct, 0, 3), -1, 1))) { |
| 962 | - $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2)); |
|
| 963 | - if (count($airline_array) > 0) { |
|
| 964 | - $operator_correct = $airline_array[0]['icao'].substr($operator_correct,2); |
|
| 965 | - } |
|
| 966 | - } |
|
| 962 | + $airline_array = $Spotter->getAllAirlineInfo(substr($operator_correct, 0, 2)); |
|
| 963 | + if (count($airline_array) > 0) { |
|
| 964 | + $operator_correct = $airline_array[0]['icao'].substr($operator_correct,2); |
|
| 965 | + } |
|
| 966 | + } |
|
| 967 | 967 | $query = 'INSERT INTO translation (Reg,Reg_correct,Operator,Operator_correct,Source) VALUES (:Reg, :Reg_correct, :Operator, :Operator_correct, :source)'; |
| 968 | 968 | try { |
| 969 | 969 | $sth = $Connection->db->prepare($query); |
@@ -977,7 +977,7 @@ discard block |
||
| 977 | 977 | //$Connection->db->commit(); |
| 978 | 978 | } |
| 979 | 979 | return ''; |
| 980 | - } |
|
| 980 | + } |
|
| 981 | 981 | |
| 982 | 982 | public static function translation_fam() { |
| 983 | 983 | global $tmp_dir, $globalTransaction; |
@@ -1015,7 +1015,7 @@ discard block |
||
| 1015 | 1015 | //$Connection->db->commit(); |
| 1016 | 1016 | } |
| 1017 | 1017 | return ''; |
| 1018 | - } |
|
| 1018 | + } |
|
| 1019 | 1019 | |
| 1020 | 1020 | /* |
| 1021 | 1021 | * This function use FAA public data. |
@@ -1027,19 +1027,19 @@ discard block |
||
| 1027 | 1027 | try { |
| 1028 | 1028 | $Connection = new Connection(); |
| 1029 | 1029 | $sth = $Connection->db->prepare($query); |
| 1030 | - $sth->execute(array(':source' => 'website_faa')); |
|
| 1031 | - } catch(PDOException $e) { |
|
| 1032 | - return "error : ".$e->getMessage(); |
|
| 1033 | - } |
|
| 1030 | + $sth->execute(array(':source' => 'website_faa')); |
|
| 1031 | + } catch(PDOException $e) { |
|
| 1032 | + return "error : ".$e->getMessage(); |
|
| 1033 | + } |
|
| 1034 | 1034 | |
| 1035 | 1035 | $query = "DELETE FROM aircraft_owner WHERE Source = '' OR Source = :source"; |
| 1036 | 1036 | try { |
| 1037 | 1037 | $Connection = new Connection(); |
| 1038 | 1038 | $sth = $Connection->db->prepare($query); |
| 1039 | - $sth->execute(array(':source' => 'website_faa')); |
|
| 1040 | - } catch(PDOException $e) { |
|
| 1041 | - return "error : ".$e->getMessage(); |
|
| 1042 | - } |
|
| 1039 | + $sth->execute(array(':source' => 'website_faa')); |
|
| 1040 | + } catch(PDOException $e) { |
|
| 1041 | + return "error : ".$e->getMessage(); |
|
| 1042 | + } |
|
| 1043 | 1043 | |
| 1044 | 1044 | $delimiter = ","; |
| 1045 | 1045 | $mfr = array(); |
@@ -1207,7 +1207,7 @@ discard block |
||
| 1207 | 1207 | } |
| 1208 | 1208 | */ |
| 1209 | 1209 | return ''; |
| 1210 | - } |
|
| 1210 | + } |
|
| 1211 | 1211 | |
| 1212 | 1212 | public static function owner_fam() { |
| 1213 | 1213 | global $tmp_dir, $globalTransaction; |
@@ -1215,10 +1215,10 @@ discard block |
||
| 1215 | 1215 | try { |
| 1216 | 1216 | $Connection = new Connection(); |
| 1217 | 1217 | $sth = $Connection->db->prepare($query); |
| 1218 | - $sth->execute(array(':source' => 'website_fam')); |
|
| 1219 | - } catch(PDOException $e) { |
|
| 1220 | - return "error : ".$e->getMessage(); |
|
| 1221 | - } |
|
| 1218 | + $sth->execute(array(':source' => 'website_fam')); |
|
| 1219 | + } catch(PDOException $e) { |
|
| 1220 | + return "error : ".$e->getMessage(); |
|
| 1221 | + } |
|
| 1222 | 1222 | |
| 1223 | 1223 | $delimiter = "\t"; |
| 1224 | 1224 | $Connection = new Connection(); |
@@ -1244,7 +1244,7 @@ discard block |
||
| 1244 | 1244 | if ($globalTransaction) $Connection->db->commit(); |
| 1245 | 1245 | } |
| 1246 | 1246 | return ''; |
| 1247 | - } |
|
| 1247 | + } |
|
| 1248 | 1248 | |
| 1249 | 1249 | public static function routes_fam() { |
| 1250 | 1250 | global $tmp_dir, $globalTransaction, $globalDebug; |
@@ -1279,7 +1279,7 @@ discard block |
||
| 1279 | 1279 | if ($globalTransaction) $Connection->db->commit(); |
| 1280 | 1280 | } |
| 1281 | 1281 | return ''; |
| 1282 | - } |
|
| 1282 | + } |
|
| 1283 | 1283 | |
| 1284 | 1284 | public static function marine_identity_fam() { |
| 1285 | 1285 | global $tmp_dir, $globalTransaction; |
@@ -1287,10 +1287,10 @@ discard block |
||
| 1287 | 1287 | try { |
| 1288 | 1288 | $Connection = new Connection(); |
| 1289 | 1289 | $sth = $Connection->db->prepare($query); |
| 1290 | - $sth->execute(); |
|
| 1291 | - } catch(PDOException $e) { |
|
| 1292 | - return "error : ".$e->getMessage(); |
|
| 1293 | - } |
|
| 1290 | + $sth->execute(); |
|
| 1291 | + } catch(PDOException $e) { |
|
| 1292 | + return "error : ".$e->getMessage(); |
|
| 1293 | + } |
|
| 1294 | 1294 | |
| 1295 | 1295 | |
| 1296 | 1296 | //update_db::unzip($out_file); |
@@ -1320,7 +1320,7 @@ discard block |
||
| 1320 | 1320 | if ($globalTransaction) $Connection->db->commit(); |
| 1321 | 1321 | } |
| 1322 | 1322 | return ''; |
| 1323 | - } |
|
| 1323 | + } |
|
| 1324 | 1324 | |
| 1325 | 1325 | public static function satellite_fam() { |
| 1326 | 1326 | global $tmp_dir, $globalTransaction; |
@@ -1391,7 +1391,7 @@ discard block |
||
| 1391 | 1391 | if ($globalTransaction) $Connection->db->commit(); |
| 1392 | 1392 | } |
| 1393 | 1393 | return ''; |
| 1394 | - } |
|
| 1394 | + } |
|
| 1395 | 1395 | |
| 1396 | 1396 | public static function tle($filename,$tletype) { |
| 1397 | 1397 | require_once(dirname(__FILE__).'/../require/class.Spotter.php'); |
@@ -1402,10 +1402,10 @@ discard block |
||
| 1402 | 1402 | try { |
| 1403 | 1403 | $Connection = new Connection(); |
| 1404 | 1404 | $sth = $Connection->db->prepare($query); |
| 1405 | - $sth->execute(array(':source' => $filename)); |
|
| 1406 | - } catch(PDOException $e) { |
|
| 1407 | - return "error : ".$e->getMessage(); |
|
| 1408 | - } |
|
| 1405 | + $sth->execute(array(':source' => $filename)); |
|
| 1406 | + } catch(PDOException $e) { |
|
| 1407 | + return "error : ".$e->getMessage(); |
|
| 1408 | + } |
|
| 1409 | 1409 | |
| 1410 | 1410 | $Connection = new Connection(); |
| 1411 | 1411 | if (($handle = fopen($filename, 'r')) !== FALSE) |
@@ -1440,7 +1440,7 @@ discard block |
||
| 1440 | 1440 | //$Connection->db->commit(); |
| 1441 | 1441 | } |
| 1442 | 1442 | return ''; |
| 1443 | - } |
|
| 1443 | + } |
|
| 1444 | 1444 | |
| 1445 | 1445 | public static function satellite_ucsdb($filename) { |
| 1446 | 1446 | global $tmp_dir, $globalTransaction; |
@@ -1699,11 +1699,11 @@ discard block |
||
| 1699 | 1699 | try { |
| 1700 | 1700 | $sth = $Connection->db->prepare($query); |
| 1701 | 1701 | $sth->execute(array( |
| 1702 | - ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'], |
|
| 1703 | - ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'], |
|
| 1704 | - ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], |
|
| 1705 | - ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
| 1706 | - ) |
|
| 1702 | + ':name' => $result['name'], ':name_alternate' => '', ':country_un' => '', ':country_owner' => $result['country_owner'], ':owner' => $result['owner'], ':users' => '', ':purpose' => '', ':purpose_detailed' => '', ':orbit' => $result['status'], |
|
| 1703 | + ':type' => '', ':longitude_geo' => NULL, ':perigee' => !empty($result['perigee']) ? $result['perigee'] : NULL, ':apogee' => !empty($result['apogee']) ? $result['apogee'] : NULL, ':eccentricity' => NULL, ':inclination' => $result['inclination'], |
|
| 1704 | + ':period' => !empty($result['period']) ? $result['period'] : NULL, ':launch_mass' => NULL, ':dry_mass' => NULL, ':power' => NULL, ':launch_date' => $result['launch_date'], ':lifetime' => $result['lifetime'], |
|
| 1705 | + ':contractor' => '',':country_contractor' => '', ':launch_site' => $result['launch_site'], ':launch_vehicule' => '', ':cospar' => $result['cospar'], ':norad' => $result['norad'], ':comments' => '', ':source_orbital' => '', ':sources' => '' |
|
| 1706 | + ) |
|
| 1707 | 1707 | ); |
| 1708 | 1708 | } catch(PDOException $e) { |
| 1709 | 1709 | return "error : ".$e->getMessage(); |
@@ -1727,13 +1727,13 @@ discard block |
||
| 1727 | 1727 | //$Connection->db->commit(); |
| 1728 | 1728 | } |
| 1729 | 1729 | return ''; |
| 1730 | - } |
|
| 1730 | + } |
|
| 1731 | 1731 | |
| 1732 | 1732 | /** |
| 1733 | - * Convert a HTML table to an array |
|
| 1734 | - * @param String $data HTML page |
|
| 1735 | - * @return Array array of the tables in HTML page |
|
| 1736 | - */ |
|
| 1733 | + * Convert a HTML table to an array |
|
| 1734 | + * @param String $data HTML page |
|
| 1735 | + * @return Array array of the tables in HTML page |
|
| 1736 | + */ |
|
| 1737 | 1737 | /* |
| 1738 | 1738 | private static function table2array($data) { |
| 1739 | 1739 | $html = str_get_html($data); |
@@ -1763,11 +1763,11 @@ discard block |
||
| 1763 | 1763 | return(array_filter($tabledata)); |
| 1764 | 1764 | } |
| 1765 | 1765 | */ |
| 1766 | - /** |
|
| 1767 | - * Get data from form result |
|
| 1768 | - * @param String $url form URL |
|
| 1769 | - * @return String the result |
|
| 1770 | - */ |
|
| 1766 | + /** |
|
| 1767 | + * Get data from form result |
|
| 1768 | + * @param String $url form URL |
|
| 1769 | + * @return String the result |
|
| 1770 | + */ |
|
| 1771 | 1771 | /* |
| 1772 | 1772 | private static function getData($url) { |
| 1773 | 1773 | $ch = curl_init(); |
@@ -1917,7 +1917,7 @@ discard block |
||
| 1917 | 1917 | if ($globalTransaction) $Connection->db->commit(); |
| 1918 | 1918 | } |
| 1919 | 1919 | return ''; |
| 1920 | - } |
|
| 1920 | + } |
|
| 1921 | 1921 | |
| 1922 | 1922 | public static function update_airspace() { |
| 1923 | 1923 | global $tmp_dir, $globalDBdriver; |
@@ -1927,11 +1927,11 @@ discard block |
||
| 1927 | 1927 | $query = 'DROP TABLE airspace'; |
| 1928 | 1928 | try { |
| 1929 | 1929 | $sth = $Connection->db->prepare($query); |
| 1930 | - $sth->execute(); |
|
| 1931 | - } catch(PDOException $e) { |
|
| 1930 | + $sth->execute(); |
|
| 1931 | + } catch(PDOException $e) { |
|
| 1932 | 1932 | return "error : ".$e->getMessage(); |
| 1933 | - } |
|
| 1934 | - } |
|
| 1933 | + } |
|
| 1934 | + } |
|
| 1935 | 1935 | |
| 1936 | 1936 | |
| 1937 | 1937 | if ($globalDBdriver == 'mysql') update_db::gunzip('../db/airspace.sql.gz',$tmp_dir.'airspace.sql'); |
@@ -1996,10 +1996,10 @@ discard block |
||
| 1996 | 1996 | $query = 'DROP TABLE countries'; |
| 1997 | 1997 | try { |
| 1998 | 1998 | $sth = $Connection->db->prepare($query); |
| 1999 | - $sth->execute(); |
|
| 2000 | - } catch(PDOException $e) { |
|
| 2001 | - echo "error : ".$e->getMessage(); |
|
| 2002 | - } |
|
| 1999 | + $sth->execute(); |
|
| 2000 | + } catch(PDOException $e) { |
|
| 2001 | + echo "error : ".$e->getMessage(); |
|
| 2002 | + } |
|
| 2003 | 2003 | } |
| 2004 | 2004 | if ($globalDBdriver == 'mysql') { |
| 2005 | 2005 | update_db::gunzip('../db/countries.sql.gz',$tmp_dir.'countries.sql'); |
@@ -2458,7 +2458,7 @@ discard block |
||
| 2458 | 2458 | $error = update_db::airlines_fam(); |
| 2459 | 2459 | update_db::insert_airlines_version($airlines_md5); |
| 2460 | 2460 | } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." md5 failed. Download failed."; |
| 2461 | - } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed."; |
|
| 2461 | + } else $error = "File ".$tmp_dir.'airlines.tsv.gz'." doesn't exist. Download failed."; |
|
| 2462 | 2462 | } elseif ($globalDebug) echo "No update."; |
| 2463 | 2463 | } else $error = "File ".$tmp_dir.'airlines.tsv.gz.md5'." doesn't exist. Download failed."; |
| 2464 | 2464 | if ($error != '') { |
@@ -2832,12 +2832,12 @@ discard block |
||
| 2832 | 2832 | echo $data; |
| 2833 | 2833 | */ |
| 2834 | 2834 | if (file_exists($tmp_dir.'aircrafts.html')) { |
| 2835 | - //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
|
| 2836 | - $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2837 | - $result = fread($fh,100000000); |
|
| 2838 | - //echo $result; |
|
| 2839 | - //var_dump(str_get_html($result)); |
|
| 2840 | - //print_r(self::table2array($result)); |
|
| 2835 | + //var_dump(file_get_html($tmp_dir.'aircrafts.html')); |
|
| 2836 | + $fh = fopen($tmp_dir.'aircrafts.html',"r"); |
|
| 2837 | + $result = fread($fh,100000000); |
|
| 2838 | + //echo $result; |
|
| 2839 | + //var_dump(str_get_html($result)); |
|
| 2840 | + //print_r(self::table2array($result)); |
|
| 2841 | 2841 | } |
| 2842 | 2842 | |
| 2843 | 2843 | } |
@@ -2851,10 +2851,10 @@ discard block |
||
| 2851 | 2851 | try { |
| 2852 | 2852 | $Connection = new Connection(); |
| 2853 | 2853 | $sth = $Connection->db->prepare($query); |
| 2854 | - $sth->execute(); |
|
| 2855 | - } catch(PDOException $e) { |
|
| 2856 | - return "error : ".$e->getMessage(); |
|
| 2857 | - } |
|
| 2854 | + $sth->execute(); |
|
| 2855 | + } catch(PDOException $e) { |
|
| 2856 | + return "error : ".$e->getMessage(); |
|
| 2857 | + } |
|
| 2858 | 2858 | |
| 2859 | 2859 | $error = ''; |
| 2860 | 2860 | if ($globalDebug) echo "Notam : Download..."; |
@@ -2910,8 +2910,8 @@ discard block |
||
| 2910 | 2910 | $data['date_end'] = date("Y-m-d H:i:s",strtotime($to)); |
| 2911 | 2911 | $data['permanent'] = 0; |
| 2912 | 2912 | } else { |
| 2913 | - $data['date_end'] = NULL; |
|
| 2914 | - $data['permanent'] = 1; |
|
| 2913 | + $data['date_end'] = NULL; |
|
| 2914 | + $data['permanent'] = 1; |
|
| 2915 | 2915 | } |
| 2916 | 2916 | $data['full_notam'] = $notam['title'].'<br>'.$notam['description']; |
| 2917 | 2917 | $NOTAM = new NOTAM(); |
@@ -2985,13 +2985,13 @@ discard block |
||
| 2985 | 2985 | try { |
| 2986 | 2986 | $Connection = new Connection(); |
| 2987 | 2987 | $sth = $Connection->db->prepare($query); |
| 2988 | - $sth->execute(); |
|
| 2989 | - } catch(PDOException $e) { |
|
| 2990 | - return "error : ".$e->getMessage(); |
|
| 2991 | - } |
|
| 2992 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 2993 | - if ($row['nb'] > 0) return false; |
|
| 2994 | - else return true; |
|
| 2988 | + $sth->execute(); |
|
| 2989 | + } catch(PDOException $e) { |
|
| 2990 | + return "error : ".$e->getMessage(); |
|
| 2991 | + } |
|
| 2992 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 2993 | + if ($row['nb'] > 0) return false; |
|
| 2994 | + else return true; |
|
| 2995 | 2995 | } |
| 2996 | 2996 | |
| 2997 | 2997 | public static function insert_last_update() { |
@@ -3000,10 +3000,10 @@ discard block |
||
| 3000 | 3000 | try { |
| 3001 | 3001 | $Connection = new Connection(); |
| 3002 | 3002 | $sth = $Connection->db->prepare($query); |
| 3003 | - $sth->execute(); |
|
| 3004 | - } catch(PDOException $e) { |
|
| 3005 | - return "error : ".$e->getMessage(); |
|
| 3006 | - } |
|
| 3003 | + $sth->execute(); |
|
| 3004 | + } catch(PDOException $e) { |
|
| 3005 | + return "error : ".$e->getMessage(); |
|
| 3006 | + } |
|
| 3007 | 3007 | } |
| 3008 | 3008 | |
| 3009 | 3009 | public static function check_airspace_version($version) { |
@@ -3011,13 +3011,13 @@ discard block |
||
| 3011 | 3011 | try { |
| 3012 | 3012 | $Connection = new Connection(); |
| 3013 | 3013 | $sth = $Connection->db->prepare($query); |
| 3014 | - $sth->execute(array(':version' => $version)); |
|
| 3015 | - } catch(PDOException $e) { |
|
| 3016 | - return "error : ".$e->getMessage(); |
|
| 3017 | - } |
|
| 3018 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3019 | - if ($row['nb'] > 0) return true; |
|
| 3020 | - else return false; |
|
| 3014 | + $sth->execute(array(':version' => $version)); |
|
| 3015 | + } catch(PDOException $e) { |
|
| 3016 | + return "error : ".$e->getMessage(); |
|
| 3017 | + } |
|
| 3018 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3019 | + if ($row['nb'] > 0) return true; |
|
| 3020 | + else return false; |
|
| 3021 | 3021 | } |
| 3022 | 3022 | |
| 3023 | 3023 | public static function check_geoid_version($version) { |
@@ -3025,13 +3025,13 @@ discard block |
||
| 3025 | 3025 | try { |
| 3026 | 3026 | $Connection = new Connection(); |
| 3027 | 3027 | $sth = $Connection->db->prepare($query); |
| 3028 | - $sth->execute(array(':version' => $version)); |
|
| 3029 | - } catch(PDOException $e) { |
|
| 3030 | - return "error : ".$e->getMessage(); |
|
| 3031 | - } |
|
| 3032 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3033 | - if ($row['nb'] > 0) return true; |
|
| 3034 | - else return false; |
|
| 3028 | + $sth->execute(array(':version' => $version)); |
|
| 3029 | + } catch(PDOException $e) { |
|
| 3030 | + return "error : ".$e->getMessage(); |
|
| 3031 | + } |
|
| 3032 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3033 | + if ($row['nb'] > 0) return true; |
|
| 3034 | + else return false; |
|
| 3035 | 3035 | } |
| 3036 | 3036 | |
| 3037 | 3037 | public static function check_marine_identity_version($version) { |
@@ -3132,10 +3132,10 @@ discard block |
||
| 3132 | 3132 | try { |
| 3133 | 3133 | $Connection = new Connection(); |
| 3134 | 3134 | $sth = $Connection->db->prepare($query); |
| 3135 | - $sth->execute(array(':version' => $version)); |
|
| 3136 | - } catch(PDOException $e) { |
|
| 3137 | - return "error : ".$e->getMessage(); |
|
| 3138 | - } |
|
| 3135 | + $sth->execute(array(':version' => $version)); |
|
| 3136 | + } catch(PDOException $e) { |
|
| 3137 | + return "error : ".$e->getMessage(); |
|
| 3138 | + } |
|
| 3139 | 3139 | } |
| 3140 | 3140 | |
| 3141 | 3141 | public static function insert_marine_identity_version($version) { |
@@ -3172,13 +3172,13 @@ discard block |
||
| 3172 | 3172 | try { |
| 3173 | 3173 | $Connection = new Connection(); |
| 3174 | 3174 | $sth = $Connection->db->prepare($query); |
| 3175 | - $sth->execute(); |
|
| 3176 | - } catch(PDOException $e) { |
|
| 3177 | - return "error : ".$e->getMessage(); |
|
| 3178 | - } |
|
| 3179 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3180 | - if ($row['nb'] > 0) return false; |
|
| 3181 | - else return true; |
|
| 3175 | + $sth->execute(); |
|
| 3176 | + } catch(PDOException $e) { |
|
| 3177 | + return "error : ".$e->getMessage(); |
|
| 3178 | + } |
|
| 3179 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3180 | + if ($row['nb'] > 0) return false; |
|
| 3181 | + else return true; |
|
| 3182 | 3182 | } |
| 3183 | 3183 | |
| 3184 | 3184 | public static function insert_last_notam_update() { |
@@ -3187,10 +3187,10 @@ discard block |
||
| 3187 | 3187 | try { |
| 3188 | 3188 | $Connection = new Connection(); |
| 3189 | 3189 | $sth = $Connection->db->prepare($query); |
| 3190 | - $sth->execute(); |
|
| 3191 | - } catch(PDOException $e) { |
|
| 3192 | - return "error : ".$e->getMessage(); |
|
| 3193 | - } |
|
| 3190 | + $sth->execute(); |
|
| 3191 | + } catch(PDOException $e) { |
|
| 3192 | + return "error : ".$e->getMessage(); |
|
| 3193 | + } |
|
| 3194 | 3194 | } |
| 3195 | 3195 | |
| 3196 | 3196 | public static function check_last_airspace_update() { |
@@ -3203,13 +3203,13 @@ discard block |
||
| 3203 | 3203 | try { |
| 3204 | 3204 | $Connection = new Connection(); |
| 3205 | 3205 | $sth = $Connection->db->prepare($query); |
| 3206 | - $sth->execute(); |
|
| 3207 | - } catch(PDOException $e) { |
|
| 3208 | - return "error : ".$e->getMessage(); |
|
| 3209 | - } |
|
| 3210 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3211 | - if ($row['nb'] > 0) return false; |
|
| 3212 | - else return true; |
|
| 3206 | + $sth->execute(); |
|
| 3207 | + } catch(PDOException $e) { |
|
| 3208 | + return "error : ".$e->getMessage(); |
|
| 3209 | + } |
|
| 3210 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3211 | + if ($row['nb'] > 0) return false; |
|
| 3212 | + else return true; |
|
| 3213 | 3213 | } |
| 3214 | 3214 | |
| 3215 | 3215 | public static function insert_last_airspace_update() { |
@@ -3218,10 +3218,10 @@ discard block |
||
| 3218 | 3218 | try { |
| 3219 | 3219 | $Connection = new Connection(); |
| 3220 | 3220 | $sth = $Connection->db->prepare($query); |
| 3221 | - $sth->execute(); |
|
| 3222 | - } catch(PDOException $e) { |
|
| 3223 | - return "error : ".$e->getMessage(); |
|
| 3224 | - } |
|
| 3221 | + $sth->execute(); |
|
| 3222 | + } catch(PDOException $e) { |
|
| 3223 | + return "error : ".$e->getMessage(); |
|
| 3224 | + } |
|
| 3225 | 3225 | } |
| 3226 | 3226 | |
| 3227 | 3227 | public static function check_last_geoid_update() { |
@@ -3234,13 +3234,13 @@ discard block |
||
| 3234 | 3234 | try { |
| 3235 | 3235 | $Connection = new Connection(); |
| 3236 | 3236 | $sth = $Connection->db->prepare($query); |
| 3237 | - $sth->execute(); |
|
| 3238 | - } catch(PDOException $e) { |
|
| 3239 | - return "error : ".$e->getMessage(); |
|
| 3240 | - } |
|
| 3241 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3242 | - if ($row['nb'] > 0) return false; |
|
| 3243 | - else return true; |
|
| 3237 | + $sth->execute(); |
|
| 3238 | + } catch(PDOException $e) { |
|
| 3239 | + return "error : ".$e->getMessage(); |
|
| 3240 | + } |
|
| 3241 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3242 | + if ($row['nb'] > 0) return false; |
|
| 3243 | + else return true; |
|
| 3244 | 3244 | } |
| 3245 | 3245 | |
| 3246 | 3246 | public static function insert_last_geoid_update() { |
@@ -3249,10 +3249,10 @@ discard block |
||
| 3249 | 3249 | try { |
| 3250 | 3250 | $Connection = new Connection(); |
| 3251 | 3251 | $sth = $Connection->db->prepare($query); |
| 3252 | - $sth->execute(); |
|
| 3253 | - } catch(PDOException $e) { |
|
| 3254 | - return "error : ".$e->getMessage(); |
|
| 3255 | - } |
|
| 3252 | + $sth->execute(); |
|
| 3253 | + } catch(PDOException $e) { |
|
| 3254 | + return "error : ".$e->getMessage(); |
|
| 3255 | + } |
|
| 3256 | 3256 | } |
| 3257 | 3257 | |
| 3258 | 3258 | public static function check_last_owner_update() { |
@@ -3358,13 +3358,13 @@ discard block |
||
| 3358 | 3358 | try { |
| 3359 | 3359 | $Connection = new Connection(); |
| 3360 | 3360 | $sth = $Connection->db->prepare($query); |
| 3361 | - $sth->execute(); |
|
| 3362 | - } catch(PDOException $e) { |
|
| 3363 | - return "error : ".$e->getMessage(); |
|
| 3364 | - } |
|
| 3365 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3366 | - if ($row['nb'] > 0) return false; |
|
| 3367 | - else return true; |
|
| 3361 | + $sth->execute(); |
|
| 3362 | + } catch(PDOException $e) { |
|
| 3363 | + return "error : ".$e->getMessage(); |
|
| 3364 | + } |
|
| 3365 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 3366 | + if ($row['nb'] > 0) return false; |
|
| 3367 | + else return true; |
|
| 3368 | 3368 | } |
| 3369 | 3369 | |
| 3370 | 3370 | public static function insert_last_schedules_update() { |
@@ -3544,10 +3544,10 @@ discard block |
||
| 3544 | 3544 | try { |
| 3545 | 3545 | $Connection = new Connection(); |
| 3546 | 3546 | $sth = $Connection->db->prepare($query); |
| 3547 | - $sth->execute(); |
|
| 3548 | - } catch(PDOException $e) { |
|
| 3549 | - return "error : ".$e->getMessage(); |
|
| 3550 | - } |
|
| 3547 | + $sth->execute(); |
|
| 3548 | + } catch(PDOException $e) { |
|
| 3549 | + return "error : ".$e->getMessage(); |
|
| 3550 | + } |
|
| 3551 | 3551 | } |
| 3552 | 3552 | public static function delete_duplicateowner() { |
| 3553 | 3553 | global $globalDBdriver; |
@@ -3559,10 +3559,10 @@ discard block |
||
| 3559 | 3559 | try { |
| 3560 | 3560 | $Connection = new Connection(); |
| 3561 | 3561 | $sth = $Connection->db->prepare($query); |
| 3562 | - $sth->execute(); |
|
| 3563 | - } catch(PDOException $e) { |
|
| 3564 | - return "error : ".$e->getMessage(); |
|
| 3565 | - } |
|
| 3562 | + $sth->execute(); |
|
| 3563 | + } catch(PDOException $e) { |
|
| 3564 | + return "error : ".$e->getMessage(); |
|
| 3565 | + } |
|
| 3566 | 3566 | } |
| 3567 | 3567 | |
| 3568 | 3568 | public static function update_all() { |
@@ -17,9 +17,9 @@ discard block |
||
| 17 | 17 | foreach($spotter_array as $spotter_item) |
| 18 | 18 | { |
| 19 | 19 | $output .= '<url>'; |
| 20 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>'; |
|
| 21 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 22 | - $output .= '<changefreq>weekly</changefreq>'; |
|
| 20 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/flightid/'.$spotter_item['spotter_id'].'</loc>'; |
|
| 21 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 22 | + $output .= '<changefreq>weekly</changefreq>'; |
|
| 23 | 23 | $output .= '</url>'; |
| 24 | 24 | } |
| 25 | 25 | $output .= '</urlset>'; |
@@ -34,9 +34,9 @@ discard block |
||
| 34 | 34 | foreach($aircraft_types as $aircraft_item) |
| 35 | 35 | { |
| 36 | 36 | $output .= '<url>'; |
| 37 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>'; |
|
| 38 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 39 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 37 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft/'.urlencode($aircraft_item['aircraft_icao']).'</loc>'; |
|
| 38 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 39 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 40 | 40 | $output .= '</url>'; |
| 41 | 41 | } |
| 42 | 42 | $output .= '</urlset>'; |
@@ -51,9 +51,9 @@ discard block |
||
| 51 | 51 | foreach($aircraft_registrations as $aircraft_item) |
| 52 | 52 | { |
| 53 | 53 | $output .= '<url>'; |
| 54 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>'; |
|
| 55 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 56 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 54 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/registration/'.urlencode($aircraft_item['registration']).'</loc>'; |
|
| 55 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 56 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 57 | 57 | $output .= '</url>'; |
| 58 | 58 | } |
| 59 | 59 | $output .= '</urlset>'; |
@@ -67,9 +67,9 @@ discard block |
||
| 67 | 67 | foreach($airline_names as $airline_item) |
| 68 | 68 | { |
| 69 | 69 | $output .= '<url>'; |
| 70 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>'; |
|
| 71 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 72 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 70 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline/'.urlencode($airline_item['airline_icao']).'</loc>'; |
|
| 71 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 72 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 73 | 73 | $output .= '</url>'; |
| 74 | 74 | } |
| 75 | 75 | $output .= '</urlset>'; |
@@ -84,9 +84,9 @@ discard block |
||
| 84 | 84 | foreach($airport_names as $airport_item) |
| 85 | 85 | { |
| 86 | 86 | $output .= '<url>'; |
| 87 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>'; |
|
| 88 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 89 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 87 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport/'.$airport_item['airport_icao'].'</loc>'; |
|
| 88 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 89 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 90 | 90 | $output .= '</url>'; |
| 91 | 91 | } |
| 92 | 92 | $output .= '</urlset>'; |
@@ -101,9 +101,9 @@ discard block |
||
| 101 | 101 | foreach($manufacturer_names as $manufacturer_item) |
| 102 | 102 | { |
| 103 | 103 | $output .= '<url>'; |
| 104 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.urlencode(strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer']))).'</loc>'; |
|
| 105 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 106 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 104 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/manufacturer/'.urlencode(strtolower(str_replace(" ", "-", $manufacturer_item['aircraft_manufacturer']))).'</loc>'; |
|
| 105 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 106 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 107 | 107 | $output .= '</url>'; |
| 108 | 108 | } |
| 109 | 109 | $output .= '</urlset>'; |
@@ -117,9 +117,9 @@ discard block |
||
| 117 | 117 | foreach($country_names as $country_item) |
| 118 | 118 | { |
| 119 | 119 | $output .= '<url>'; |
| 120 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.urlencode(strtolower(str_replace(" ", "-", $country_item['country']))).'</loc>'; |
|
| 121 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 122 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 120 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/country/'.urlencode(strtolower(str_replace(" ", "-", $country_item['country']))).'</loc>'; |
|
| 121 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 122 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 123 | 123 | $output .= '</url>'; |
| 124 | 124 | } |
| 125 | 125 | $output .= '</urlset>'; |
@@ -134,9 +134,9 @@ discard block |
||
| 134 | 134 | { |
| 135 | 135 | if (ctype_alnum($ident_item['ident'])) { |
| 136 | 136 | $output .= '<url>'; |
| 137 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/ident/'.urlencode($ident_item['ident']).'</loc>'; |
|
| 138 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 139 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 137 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/ident/'.urlencode($ident_item['ident']).'</loc>'; |
|
| 138 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 139 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 140 | 140 | $output .= '</url>'; |
| 141 | 141 | } |
| 142 | 142 | } |
@@ -151,9 +151,9 @@ discard block |
||
| 151 | 151 | foreach($date_names as $date_item) |
| 152 | 152 | { |
| 153 | 153 | $output .= '<url>'; |
| 154 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>'; |
|
| 155 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 156 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 154 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/date/'.date("Y-m-d", strtotime($date_item['date'])).'</loc>'; |
|
| 155 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 156 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 157 | 157 | $output .= '</url>'; |
| 158 | 158 | } |
| 159 | 159 | $output .= '</urlset>'; |
@@ -167,9 +167,9 @@ discard block |
||
| 167 | 167 | foreach($route_names as $route_item) |
| 168 | 168 | { |
| 169 | 169 | $output .= '<url>'; |
| 170 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>'; |
|
| 171 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 172 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 170 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/route/'.$route_item['airport_departure_icao'].'/'.$route_item['airport_arrival_icao'].'</loc>'; |
|
| 171 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 172 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 173 | 173 | $output .= '</url>'; |
| 174 | 174 | } |
| 175 | 175 | $output .= '</urlset>'; |
@@ -181,34 +181,34 @@ discard block |
||
| 181 | 181 | |
| 182 | 182 | /* STATIC PAGES */ |
| 183 | 183 | $output .= '<url>'; |
| 184 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/</loc>'; |
|
| 185 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 186 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 184 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/</loc>'; |
|
| 185 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 186 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 187 | 187 | $output .= '</url>'; |
| 188 | 188 | $output .= '<url>'; |
| 189 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/latest</loc>'; |
|
| 190 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 191 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 189 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/latest</loc>'; |
|
| 190 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 191 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 192 | 192 | $output .= '</url>'; |
| 193 | 193 | $output .= '<url>'; |
| 194 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/highlights</loc>'; |
|
| 195 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 196 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 194 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/highlights</loc>'; |
|
| 195 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 196 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 197 | 197 | $output .= '</url>'; |
| 198 | 198 | $output .= '<url>'; |
| 199 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft</loc>'; |
|
| 200 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 201 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 199 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/aircraft</loc>'; |
|
| 200 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 201 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 202 | 202 | $output .= '</url>'; |
| 203 | 203 | $output .= '<url>'; |
| 204 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline</loc>'; |
|
| 205 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 206 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 204 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airline</loc>'; |
|
| 205 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 206 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 207 | 207 | $output .= '</url>'; |
| 208 | 208 | $output .= '<url>'; |
| 209 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport</loc>'; |
|
| 210 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 211 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 209 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/airport</loc>'; |
|
| 210 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 211 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 212 | 212 | $output .= '</url>'; |
| 213 | 213 | /* |
| 214 | 214 | $output .= '<url>'; |
@@ -218,82 +218,82 @@ discard block |
||
| 218 | 218 | $output .= '</url>'; |
| 219 | 219 | */ |
| 220 | 220 | $output .= '<url>'; |
| 221 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/about</loc>'; |
|
| 222 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 223 | - $output .= '<changefreq>weekly</changefreq>'; |
|
| 221 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/about</loc>'; |
|
| 222 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 223 | + $output .= '<changefreq>weekly</changefreq>'; |
|
| 224 | 224 | $output .= '</url>'; |
| 225 | 225 | |
| 226 | 226 | |
| 227 | 227 | /* STATISTIC PAGES */ |
| 228 | 228 | $output .= '<url>'; |
| 229 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/aircraft</loc>'; |
|
| 230 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 231 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 229 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/aircraft</loc>'; |
|
| 230 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 231 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 232 | 232 | $output .= '</url>'; |
| 233 | 233 | $output .= '<url>'; |
| 234 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/registration</loc>'; |
|
| 235 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 236 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 234 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/registration</loc>'; |
|
| 235 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 236 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 237 | 237 | $output .= '</url>'; |
| 238 | 238 | $output .= '<url>'; |
| 239 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/manufacturer</loc>'; |
|
| 240 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 241 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 239 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/manufacturer</loc>'; |
|
| 240 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 241 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 242 | 242 | $output .= '</url>'; |
| 243 | 243 | $output .= '<url>'; |
| 244 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline</loc>'; |
|
| 245 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 246 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 244 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline</loc>'; |
|
| 245 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 246 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 247 | 247 | $output .= '</url>'; |
| 248 | 248 | $output .= '<url>'; |
| 249 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline-country</loc>'; |
|
| 250 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 251 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 249 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airline-country</loc>'; |
|
| 250 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 251 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 252 | 252 | $output .= '</url>'; |
| 253 | 253 | $output .= '<url>'; |
| 254 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure</loc>'; |
|
| 255 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 256 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 254 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure</loc>'; |
|
| 255 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 256 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 257 | 257 | $output .= '</url>'; |
| 258 | 258 | $output .= '<url>'; |
| 259 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure-country</loc>'; |
|
| 260 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 261 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 259 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-departure-country</loc>'; |
|
| 260 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 261 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 262 | 262 | $output .= '</url>'; |
| 263 | 263 | $output .= '<url>'; |
| 264 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival</loc>'; |
|
| 265 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 266 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 264 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival</loc>'; |
|
| 265 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 266 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 267 | 267 | $output .= '</url>'; |
| 268 | 268 | $output .= '<url>'; |
| 269 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival-country</loc>'; |
|
| 270 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 271 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 269 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/airport-arrival-country</loc>'; |
|
| 270 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 271 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 272 | 272 | $output .= '</url>'; |
| 273 | 273 | $output .= '<url>'; |
| 274 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-airport</loc>'; |
|
| 275 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 276 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 274 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-airport</loc>'; |
|
| 275 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 276 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 277 | 277 | $output .= '</url>'; |
| 278 | 278 | $output .= '<url>'; |
| 279 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-waypoint</loc>'; |
|
| 280 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 281 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 279 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/route-waypoint</loc>'; |
|
| 280 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 281 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 282 | 282 | $output .= '</url>'; |
| 283 | 283 | $output .= '<url>'; |
| 284 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/callsign</loc>'; |
|
| 285 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 286 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 284 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/callsign</loc>'; |
|
| 285 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 286 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 287 | 287 | $output .= '</url>'; |
| 288 | 288 | $output .= '<url>'; |
| 289 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/date</loc>'; |
|
| 290 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 291 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 289 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/date</loc>'; |
|
| 290 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 291 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 292 | 292 | $output .= '</url>'; |
| 293 | 293 | $output .= '<url>'; |
| 294 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/time</loc>'; |
|
| 295 | - $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 296 | - $output .= '<changefreq>daily</changefreq>'; |
|
| 294 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/statistics/time</loc>'; |
|
| 295 | + $output .= '<lastmod>'.date("c", time()).'</lastmod>'; |
|
| 296 | + $output .= '<changefreq>daily</changefreq>'; |
|
| 297 | 297 | $output .= '</url>'; |
| 298 | 298 | $output .= '</urlset>'; |
| 299 | 299 | |
@@ -303,31 +303,31 @@ discard block |
||
| 303 | 303 | $output .= '<?xml version="1.0" encoding="UTF-8"?>'; |
| 304 | 304 | $output .= '<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'; |
| 305 | 305 | $output .= '<sitemap>'; |
| 306 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/static</loc>'; |
|
| 306 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/static</loc>'; |
|
| 307 | 307 | $output .= '</sitemap>'; |
| 308 | 308 | $output .= '<sitemap>'; |
| 309 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/flight</loc>'; |
|
| 309 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/flight</loc>'; |
|
| 310 | 310 | $output .= '</sitemap>'; |
| 311 | 311 | $output .= '<sitemap>'; |
| 312 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/aircraft</loc>'; |
|
| 312 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/aircraft</loc>'; |
|
| 313 | 313 | $output .= '</sitemap>'; |
| 314 | 314 | $output .= '<sitemap>'; |
| 315 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/registration</loc>'; |
|
| 315 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/registration</loc>'; |
|
| 316 | 316 | $output .= '</sitemap>'; |
| 317 | 317 | $output .= '<sitemap>'; |
| 318 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airline</loc>'; |
|
| 318 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airline</loc>'; |
|
| 319 | 319 | $output .= '</sitemap>'; |
| 320 | 320 | $output .= '<sitemap>'; |
| 321 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airport</loc>'; |
|
| 321 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/airport</loc>'; |
|
| 322 | 322 | $output .= '</sitemap>'; |
| 323 | 323 | $output .= '<sitemap>'; |
| 324 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/manufacturer</loc>'; |
|
| 324 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/manufacturer</loc>'; |
|
| 325 | 325 | $output .= '</sitemap>'; |
| 326 | 326 | $output .= '<sitemap>'; |
| 327 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/country</loc>'; |
|
| 327 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/country</loc>'; |
|
| 328 | 328 | $output .= '</sitemap>'; |
| 329 | 329 | $output .= '<sitemap>'; |
| 330 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/ident</loc>'; |
|
| 330 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/ident</loc>'; |
|
| 331 | 331 | $output .= '</sitemap>'; |
| 332 | 332 | /* |
| 333 | 333 | $output .= '<sitemap>'; |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | $output .= '</sitemap>'; |
| 336 | 336 | */ |
| 337 | 337 | $output .= '<sitemap>'; |
| 338 | - $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/route</loc>'; |
|
| 338 | + $output .= '<loc>'.'http://'.$_SERVER['HTTP_HOST'].$globalURL.'/sitemap/route</loc>'; |
|
| 339 | 339 | $output .= '</sitemap>'; |
| 340 | 340 | $output .= '</sitemapindex>'; |
| 341 | 341 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | <?php }; if (isset($globalSatellite) && $globalSatellite) { ?><td><div id="ibxsatellite"><h4><?php echo _("Satellites Displayed"); ?></h4><br /><i class="fa fa-spinner fa-pulse fa-fw"></i></div></td><?php } ?> |
| 48 | 48 | </tr></table></div> |
| 49 | 49 | <?php |
| 50 | - if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
| 50 | + if ((!isset($_COOKIE['MapFormat']) && isset($globalMap3Ddefault) && $globalMap3Ddefault) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d')) { |
|
| 51 | 51 | ?> |
| 52 | 52 | <script src="<?php echo $globalURL; ?>/js/map.3d.js.php"></script> |
| 53 | 53 | <?php |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | <script src="<?php echo $globalURL; ?>/js/map-marine.3d.js.php"></script> |
| 72 | 72 | <?php |
| 73 | 73 | } |
| 74 | - } |
|
| 74 | + } |
|
| 75 | 75 | ?> |
| 76 | 76 | |
| 77 | 77 | <div id="sidebar" class="sidebar collapsed"> |
@@ -82,34 +82,34 @@ discard block |
||
| 82 | 82 | <li><a href="#" onclick="getUserLocation(); return false;" title="<?php echo _("Plot your Location"); ?>"><i class="fa fa-map-marker"></i></a></li> |
| 83 | 83 | <li><a href="#" onclick="getCompassDirection(); return false;" title="<?php echo _("Compass Mode"); ?>"><i class="fa fa-compass"></i></a></li> |
| 84 | 84 | <?php |
| 85 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 85 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 86 | 86 | if (isset($globalArchive) && $globalArchive == TRUE) { |
| 87 | 87 | ?> |
| 88 | 88 | <li><a href="#archive" role="tab" title="<?php echo _("Archive"); ?>"><i class="fa fa-archive"></i></a></li> |
| 89 | 89 | <?php |
| 90 | 90 | } |
| 91 | - } |
|
| 91 | + } |
|
| 92 | 92 | ?> |
| 93 | 93 | <li><a href="#home" role="tab" title="<?php echo _("Layers"); ?>"><i class="fa fa-map"></i></a></li> |
| 94 | 94 | <li><a href="#filters" role="tab" title="<?php echo _("Filters"); ?>"><i class="fa fa-filter"></i></a></li> |
| 95 | 95 | <li><a href="#settings" role="tab" title="<?php echo _("Settings"); ?>"><i class="fa fa-gears"></i></a></li> |
| 96 | 96 | <?php |
| 97 | - if (isset($globalMap3D) && $globalMap3D) { |
|
| 97 | + if (isset($globalMap3D) && $globalMap3D) { |
|
| 98 | 98 | if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
| 99 | 99 | ?> |
| 100 | 100 | <li><a href="#" onclick="show3D(); return false;" role="tab" title="3D"><b>3D</b></a></li> |
| 101 | 101 | <?php |
| 102 | - if (isset($globalSatellite) && $globalSatellite) { |
|
| 102 | + if (isset($globalSatellite) && $globalSatellite) { |
|
| 103 | 103 | ?> |
| 104 | 104 | <li><a href="#satellites" role="tab" title="<?php echo _("Satellites"); ?>"><i class="satellite"></i></a></li> |
| 105 | 105 | <?php |
| 106 | - } |
|
| 106 | + } |
|
| 107 | 107 | } else { |
| 108 | 108 | ?> |
| 109 | 109 | <li><a href="#" onclick="show2D(); return false;" role="tab" title="2D"><b>2D</b></a></li> |
| 110 | 110 | <?php |
| 111 | 111 | } |
| 112 | - } |
|
| 112 | + } |
|
| 113 | 113 | ?> |
| 114 | 114 | </ul> |
| 115 | 115 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | ?> |
| 185 | 185 | </div> |
| 186 | 186 | <?php |
| 187 | - if (isset($globalArchive) && $globalArchive == TRUE) { |
|
| 187 | + if (isset($globalArchive) && $globalArchive == TRUE) { |
|
| 188 | 188 | ?> |
| 189 | 189 | <div class="sidebar-pane" id="archive"> |
| 190 | 190 | <h1 class="sidebar-header"><?php echo _("Playback"); ?> <i>Bêta</i><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -243,7 +243,7 @@ discard block |
||
| 243 | 243 | </form> |
| 244 | 244 | </div> |
| 245 | 245 | <?php |
| 246 | - } |
|
| 246 | + } |
|
| 247 | 247 | ?> |
| 248 | 248 | <div class="sidebar-pane" id="settings"> |
| 249 | 249 | <h1 class="sidebar-header"><?php echo _("Settings"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -254,56 +254,56 @@ discard block |
||
| 254 | 254 | <?php |
| 255 | 255 | if (!isset($_COOKIE['MapType']) || $_COOKIE['MapType'] == '') $MapType = $globalMapProvider; |
| 256 | 256 | else $MapType = $_COOKIE['MapType']; |
| 257 | - ?> |
|
| 257 | + ?> |
|
| 258 | 258 | <?php |
| 259 | 259 | if (isset($globalBingMapKey) && $globalBingMapKey != '') { |
| 260 | - ?> |
|
| 260 | + ?> |
|
| 261 | 261 | <option value="Bing-Aerial"<?php if ($MapType == 'Bing-Aerial') print ' selected'; ?>>Bing-Aerial</option> |
| 262 | 262 | <option value="Bing-Hybrid"<?php if ($MapType == 'Bing-Hybrid') print ' selected'; ?>>Bing-Hybrid</option> |
| 263 | 263 | <option value="Bing-Road"<?php if ($MapType == 'Bing-Road') print ' selected'; ?>>Bing-Road</option> |
| 264 | 264 | <?php |
| 265 | 265 | } |
| 266 | - ?> |
|
| 266 | + ?> |
|
| 267 | 267 | <?php |
| 268 | - if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 269 | - ?> |
|
| 268 | + if ((!isset($_COOKIE['MapFormat']) && (!isset($globalMap3Ddefault) || !$globalMap3Ddefault)) || (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] != '3d')) { |
|
| 269 | + ?> |
|
| 270 | 270 | <?php |
| 271 | - if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
| 272 | - ?> |
|
| 271 | + if (isset($globalHereappId) && $globalHereappId != '' && isset($globalHereappCode) && $globalHereappCode != '') { |
|
| 272 | + ?> |
|
| 273 | 273 | <option value="Here-Aerial"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Aerial</option> |
| 274 | 274 | <option value="Here-Hybrid"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Hybrid</option> |
| 275 | 275 | <option value="Here-Road"<?php if ($MapType == 'Here') print ' selected'; ?>>Here-Road</option> |
| 276 | 276 | <?php |
| 277 | - } |
|
| 278 | - ?> |
|
| 277 | + } |
|
| 278 | + ?> |
|
| 279 | 279 | <?php |
| 280 | - if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
| 281 | - ?> |
|
| 280 | + if (isset($globalGoogleAPIKey) && $globalGoogleAPIKey != '') { |
|
| 281 | + ?> |
|
| 282 | 282 | <option value="Google-Roadmap"<?php if ($MapType == 'Google-Roadmap') print ' selected'; ?>>Google Roadmap</option> |
| 283 | 283 | <option value="Google-Satellite"<?php if ($MapType == 'Google-Satellite') print ' selected'; ?>>Google Satellite</option> |
| 284 | 284 | <option value="Google-Hybrid"<?php if ($MapType == 'Google-Hybrid') print ' selected'; ?>>Google Hybrid</option> |
| 285 | 285 | <option value="Google-Terrain"<?php if ($MapType == 'Google-Terrain') print ' selected'; ?>>Google Terrain</option> |
| 286 | 286 | <?php |
| 287 | - } |
|
| 288 | - ?> |
|
| 287 | + } |
|
| 288 | + ?> |
|
| 289 | 289 | <?php |
| 290 | - if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
| 291 | - ?> |
|
| 290 | + if (isset($globalMapQuestKey) && $globalMapQuestKey != '') { |
|
| 291 | + ?> |
|
| 292 | 292 | <option value="MapQuest-OSM"<?php if ($MapType == 'MapQuest-OSM') print ' selected'; ?>>MapQuest-OSM</option> |
| 293 | 293 | <option value="MapQuest-Aerial"<?php if ($MapType == 'MapQuest-Aerial') print ' selected'; ?>>MapQuest-Aerial</option> |
| 294 | 294 | <option value="MapQuest-Hybrid"<?php if ($MapType == 'MapQuest-Hybrid') print ' selected'; ?>>MapQuest-Hybrid</option> |
| 295 | 295 | <?php |
| 296 | - } |
|
| 297 | - ?> |
|
| 296 | + } |
|
| 297 | + ?> |
|
| 298 | 298 | <option value="Yandex"<?php if ($MapType == 'Yandex') print ' selected'; ?>>Yandex</option> |
| 299 | 299 | <?php |
| 300 | 300 | } |
| 301 | - ?> |
|
| 301 | + ?> |
|
| 302 | 302 | <?php |
| 303 | - if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 303 | + if (isset($globalMapboxToken) && $globalMapboxToken != '') { |
|
| 304 | 304 | if (!isset($_COOKIE['MapTypeId'])) $MapBoxId = 'default'; |
| 305 | 305 | else $MapBoxId = $_COOKIE['MapTypeId']; |
| 306 | - ?> |
|
| 306 | + ?> |
|
| 307 | 307 | <option value="Mapbox-default"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'default') print ' selected'; ?>>Mapbox default</option> |
| 308 | 308 | <option value="Mapbox-mapbox.streets"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.streets') print ' selected'; ?>>Mapbox streets</option> |
| 309 | 309 | <option value="Mapbox-mapbox.light"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.light') print ' selected'; ?>>Mapbox light</option> |
@@ -317,13 +317,13 @@ discard block |
||
| 317 | 317 | <option value="Mapbox-mapbox.pirates"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.pirates') print ' selected'; ?>>Mapbox pirates</option> |
| 318 | 318 | <option value="Mapbox-mapbox.emerald"<?php if ($MapType == 'Mapbox' && $MapBoxId == 'mapbox.emerald') print ' selected'; ?>>Mapbox emerald</option> |
| 319 | 319 | <?php |
| 320 | - } |
|
| 321 | - ?> |
|
| 320 | + } |
|
| 321 | + ?> |
|
| 322 | 322 | <option value="OpenStreetMap"<?php if ($MapType == 'OpenStreetMap') print ' selected'; ?>>OpenStreetMap</option> |
| 323 | 323 | </select> |
| 324 | 324 | </li> |
| 325 | 325 | <?php |
| 326 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 326 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 327 | 327 | ?> |
| 328 | 328 | <li><?php echo _("Type of Terrain:"); ?> |
| 329 | 329 | <select class="selectpicker" onchange="terrainType(this);"> |
@@ -334,10 +334,10 @@ discard block |
||
| 334 | 334 | </select> |
| 335 | 335 | </li> |
| 336 | 336 | <?php |
| 337 | - } |
|
| 337 | + } |
|
| 338 | 338 | ?> |
| 339 | 339 | <?php |
| 340 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 340 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 341 | 341 | ?> |
| 342 | 342 | <?php |
| 343 | 343 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | <li><div class="checkbox"><label><input type="checkbox" name="satelliteestimation" value="1" onclick="clickSatelliteEstimation(this)" <?php if ((isset($_COOKIE['satelliteestimation']) && $_COOKIE['satelliteestimation'] == 'true') || (!isset($_COOKIE['satelliteestimation']) && !isset($globalMapEstimation)) || (!isset($_COOKIE['satelliteestimation']) && isset($globalMapEstimation) && $globalMapEstimation)) print 'checked'; ?> ><?php echo _("Satellites animate between updates"); ?></label></div></li> |
| 355 | 355 | <?php |
| 356 | 356 | } |
| 357 | - } |
|
| 357 | + } |
|
| 358 | 358 | ?> |
| 359 | 359 | <li><div class="checkbox"><label><input type="checkbox" name="displayairports" value="1" onclick="clickDisplayAirports(this)" <?php if (isset($_COOKIE['displayairports']) && $_COOKIE['displayairports'] == 'true' || !isset($_COOKIE['displayairports'])) print 'checked'; ?> ><?php echo _("Display airports on map"); ?></label></div></li> |
| 360 | 360 | <li><div class="checkbox"><label><input type="checkbox" name="displaygroundstation" value="1" onclick="clickDisplayGroundStation(this)" <?php if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) print 'checked'; ?> ><?php echo _("Display ground station on map"); ?></label></div></li> |
@@ -366,81 +366,81 @@ discard block |
||
| 366 | 366 | <li><div class="checkbox"><label><input type="checkbox" name="displayfires" value="1" onclick="clickDisplayFires(this)" <?php if ((isset($_COOKIE['show_Fires']) && $_COOKIE['show_Fires'] == 'true') || (!isset($_COOKIE['show_Fires']) && (isset($globalMapFires) && $globalMapFires === TRUE))) print 'checked'; ?> ><?php echo _("Display fires on map"); ?></label></div></li> |
| 367 | 367 | <?php |
| 368 | 368 | } |
| 369 | - if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 369 | + if (isset($_COOKIE['MapFormat']) && $_COOKIE['MapFormat'] == '3d') { |
|
| 370 | 370 | ?> |
| 371 | 371 | <li><div class="checkbox"><label><input type="checkbox" name="displayminimap" value="1" onclick="clickDisplayMinimap(this)" <?php if (!isset($_COOKIE['displayminimap']) || (isset($_COOKIE['displayminimap']) && $_COOKIE['displayminimap'] == 'true')) print 'checked'; ?> ><?php echo _("Show mini-map"); ?></label></div></li> |
| 372 | 372 | <?php |
| 373 | - } |
|
| 374 | - if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 373 | + } |
|
| 374 | + if (time() > mktime(0,0,0,12,1,date("Y")) && time() < mktime(0,0,0,12,31,date("Y"))) { |
|
| 375 | 375 | ?> |
| 376 | 376 | <li><div class="checkbox"><label><input type="checkbox" name="displaysanta" value="1" onclick="clickSanta(this)"><i class="fa fa-snowflake-o" aria-hidden="true"></i> <?php echo _("Show Santa Claus now"); ?> <i class="fa fa-snowflake-o" aria-hidden="true"></i></label></div></li> |
| 377 | 377 | <?php |
| 378 | - } |
|
| 378 | + } |
|
| 379 | 379 | ?> |
| 380 | 380 | <?php |
| 381 | 381 | if (function_exists('array_column')) { |
| 382 | - if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 383 | - ?> |
|
| 382 | + if (array_search(TRUE, array_column($globalSources, 'sourcestats')) !== FALSE) { |
|
| 383 | + ?> |
|
| 384 | 384 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
| 385 | 385 | <?php |
| 386 | - } |
|
| 386 | + } |
|
| 387 | 387 | } elseif (isset($globalSources)) { |
| 388 | - $dispolar = false; |
|
| 389 | - foreach ($globalSources as $testsource) { |
|
| 390 | - if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 391 | - } |
|
| 392 | - if ($dispolar) { |
|
| 393 | - ?> |
|
| 388 | + $dispolar = false; |
|
| 389 | + foreach ($globalSources as $testsource) { |
|
| 390 | + if (isset($globalSources['sourcestats']) && $globalSources['sourcestats'] !== FALSE) $dispolar = true; |
|
| 391 | + } |
|
| 392 | + if ($dispolar) { |
|
| 393 | + ?> |
|
| 394 | 394 | <li><div class="checkbox"><label><input type="checkbox" name="flightpolar" value="1" onclick="clickPolar(this)" <?php if ((isset($_COOKIE['polar']) && $_COOKIE['polar'] == 'true')) print 'checked'; ?> ><?php echo _("Display polar on map"); ?></label></div></li> |
| 395 | 395 | <?php |
| 396 | - } |
|
| 397 | - } |
|
| 398 | - ?> |
|
| 396 | + } |
|
| 397 | + } |
|
| 398 | + ?> |
|
| 399 | 399 | <?php |
| 400 | - if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 400 | + if (!isset($_COOKIE['MapFormat']) || $_COOKIE['MapFormat'] != '3d') { |
|
| 401 | 401 | ?> |
| 402 | 402 | |
| 403 | 403 | <?php |
| 404 | 404 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 405 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 406 | - ?> |
|
| 405 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 406 | + ?> |
|
| 407 | 407 | <li><input type="checkbox" name="aircraftcoloraltitude" value="1" onclick="iconColorAltitude(this)" <?php if (isset($_COOKIE['IconColorAltitude']) && $_COOKIE['IconColorAltitude'] == 'true') print 'checked'; ?> ><?php echo _("Aircraft icon color based on altitude"); ?></li> |
| 408 | 408 | <?php |
| 409 | 409 | if (!isset($_COOKIE['IconColorAltitude']) || $_COOKIE['IconColorAltitude'] == 'false') { |
| 410 | - ?> |
|
| 410 | + ?> |
|
| 411 | 411 | <li><?php echo _("Aircraft icon color:"); ?> |
| 412 | 412 | <input type="color" name="aircraftcolor" id="html5colorpicker" onchange="iconColor(aircraftcolor.value);" value="#<?php if (isset($_COOKIE['IconColor'])) print $_COOKIE['IconColor']; elseif (isset($globalAircraftIconColor)) print $globalAircraftIconColor; else print '1a3151'; ?>"> |
| 413 | 413 | </li> |
| 414 | 414 | <?php |
| 415 | 415 | } |
| 416 | - } |
|
| 417 | - } |
|
| 418 | - ?> |
|
| 416 | + } |
|
| 417 | + } |
|
| 418 | + ?> |
|
| 419 | 419 | <?php |
| 420 | 420 | if (isset($globalMarine) && $globalMarine === TRUE) { |
| 421 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 422 | - ?> |
|
| 421 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 422 | + ?> |
|
| 423 | 423 | <li><?php echo _("Marine icon color:"); ?> |
| 424 | 424 | <input type="color" name="marinecolor" id="html5colorpicker" onchange="MarineiconColor(marinecolor.value);" value="#<?php if (isset($_COOKIE['MarineIconColor'])) print $_COOKIE['MarineIconColor']; elseif (isset($globalMarineIconColor)) print $globalMarineIconColor; else print '1a3151'; ?>"> |
| 425 | 425 | </li> |
| 426 | 426 | <?php |
| 427 | - } |
|
| 428 | - } |
|
| 429 | - ?> |
|
| 427 | + } |
|
| 428 | + } |
|
| 429 | + ?> |
|
| 430 | 430 | <?php |
| 431 | 431 | if (isset($globalTracker) && $globalTracker === TRUE) { |
| 432 | - if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 433 | - ?> |
|
| 432 | + if (extension_loaded('gd') && function_exists('gd_info')) { |
|
| 433 | + ?> |
|
| 434 | 434 | <li><?php echo _("Tracker icon color:"); ?> |
| 435 | 435 | <input type="color" name="trackercolor" id="html5colorpicker" onchange="TrackericonColor(trackercolor.value);" value="#<?php if (isset($_COOKIE['TrackerIconColor'])) print $_COOKIE['TrackerIconColor']; elseif (isset($globalTrackerIconColor)) print $globalTrackerIconColor; else print '1a3151'; ?>"> |
| 436 | 436 | </li> |
| 437 | 437 | <?php |
| 438 | - } |
|
| 439 | - } |
|
| 440 | - ?> |
|
| 438 | + } |
|
| 439 | + } |
|
| 440 | + ?> |
|
| 441 | 441 | <?php |
| 442 | 442 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
| 443 | - ?> |
|
| 443 | + ?> |
|
| 444 | 444 | <li><?php echo _("Show airport icon at zoom level:"); ?> |
| 445 | 445 | <div class="range"> |
| 446 | 446 | <input type="range" min="0" max="19" step="1" name="airportzoom" onchange="range.value=value;airportDisplayZoom(airportzoom.value);" value="<?php if (isset($_COOKIE['AirportZoom'])) print $_COOKIE['AirportZoom']; elseif (isset($globalAirportZoom)) print $globalAirportZoom; else print '7'; ?>"> |
@@ -449,9 +449,9 @@ discard block |
||
| 449 | 449 | </li> |
| 450 | 450 | <?php |
| 451 | 451 | } |
| 452 | - ?> |
|
| 452 | + ?> |
|
| 453 | 453 | <?php |
| 454 | - } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
| 454 | + } elseif (isset($_COOKIE['MapFormat']) || $_COOKIE['MapFOrmat'] == '3d') { |
|
| 455 | 455 | ?> |
| 456 | 456 | <?php |
| 457 | 457 | if (!isset($globalAircraft) || $globalAircraft === TRUE) { |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | </li> |
| 483 | 483 | <?php |
| 484 | 484 | } |
| 485 | - } |
|
| 485 | + } |
|
| 486 | 486 | ?> |
| 487 | 487 | <li><?php echo _("Distance unit:"); ?> |
| 488 | 488 | <select class="selectpicker" onchange="unitdistance(this);"> |
@@ -515,19 +515,19 @@ discard block |
||
| 515 | 515 | <ul> |
| 516 | 516 | <?php |
| 517 | 517 | if (!isset($globalAircraft) || $globalAircraft) { |
| 518 | - ?> |
|
| 518 | + ?> |
|
| 519 | 519 | <?php |
| 520 | 520 | if (((isset($globalVATSIM) && $globalVATSIM) || isset($globalIVAO) && $globalIVAO || isset($globalphpVMS) && $globalphpVMS) && (!isset($globalMapVAchoose) || $globalMapVAchoose)) { |
| 521 | - ?> |
|
| 521 | + ?> |
|
| 522 | 522 | <?php if (isset($globalVATSIM) && $globalVATSIM) { ?><li><input type="checkbox" name="vatsim" value="1" onclick="clickVATSIM(this)" <?php if ((isset($_COOKIE['ShowVATSIM']) && $_COOKIE['ShowVATSIM'] == 'true') || !isset($_COOKIE['ShowVATSIM'])) print 'checked'; ?> ><?php echo _("Display VATSIM data"); ?></li><?php } ?> |
| 523 | 523 | <?php if (isset($globalIVAO) && $globalIVAO) { ?><li><input type="checkbox" name="ivao" value="1" onclick="clickIVAO(this)" <?php if ((isset($_COOKIE['ShowIVAO']) && $_COOKIE['ShowIVAO'] == 'true') || !isset($_COOKIE['ShowIVAO'])) print 'checked'; ?> ><?php echo _("Display IVAO data"); ?></li><?php } ?> |
| 524 | 524 | <?php if (isset($globalphpVMS) && $globalphpVMS) { ?><li><input type="checkbox" name="phpvms" value="1" onclick="clickphpVMS(this)" <?php if ((isset($_COOKIE['ShowVMS']) && $_COOKIE['ShowVMS'] == 'true') || !isset($_COOKIE['ShowVMS'])) print 'checked'; ?> ><?php echo _("Display phpVMS data"); ?></li><?php } ?> |
| 525 | 525 | <?php |
| 526 | 526 | } |
| 527 | - ?> |
|
| 527 | + ?> |
|
| 528 | 528 | <?php |
| 529 | 529 | if (!(isset($globalVA) && $globalVA) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS) && isset($globalSBS1) && $globalSBS1 && isset($globalAPRS) && $globalAPRS && (!isset($globalMapchoose) || $globalMapchoose)) { |
| 530 | - ?> |
|
| 530 | + ?> |
|
| 531 | 531 | <?php if (isset($globalSBS1) && $globalSBS1) { ?> |
| 532 | 532 | <li><div class="checkbox"><label><input type="checkbox" name="sbs" value="1" onclick="clickSBS1(this)" <?php if ((isset($_COOKIE['ShowSBS1']) && $_COOKIE['ShowSBS1'] == 'true') || !isset($_COOKIE['ShowSBS1'])) print 'checked'; ?> ><?php echo _("Display ADS-B data"); ?></label></div></li> |
| 533 | 533 | <?php } ?> |
@@ -536,7 +536,7 @@ discard block |
||
| 536 | 536 | <?php } ?> |
| 537 | 537 | <?php |
| 538 | 538 | } |
| 539 | - ?> |
|
| 539 | + ?> |
|
| 540 | 540 | <li><?php echo _("Display airlines:"); ?> |
| 541 | 541 | <br/> |
| 542 | 542 | <select class="selectpicker" multiple onchange="airlines(this);" id="display_airlines"> |
@@ -556,14 +556,14 @@ discard block |
||
| 556 | 556 | echo '<option value="'.$airline['airline_icao'].'">'.$airline_name.'</option>'; |
| 557 | 557 | } |
| 558 | 558 | } |
| 559 | - ?> |
|
| 559 | + ?> |
|
| 560 | 560 | </select> |
| 561 | 561 | </li> |
| 562 | 562 | <?php |
| 563 | 563 | $Spotter = new Spotter(); |
| 564 | 564 | $allalliancenames = $Spotter->getAllAllianceNames(); |
| 565 | 565 | if (!empty($allalliancenames)) { |
| 566 | - ?> |
|
| 566 | + ?> |
|
| 567 | 567 | <li><?php echo _("Display alliance:"); ?> |
| 568 | 568 | <br/> |
| 569 | 569 | <select class="selectpicker" onchange="alliance(this);" id="display_alliance"> |
@@ -577,18 +577,18 @@ discard block |
||
| 577 | 577 | echo '<option value="'.$alliance_name.'">'.$alliance_name.'</option>'; |
| 578 | 578 | } |
| 579 | 579 | } |
| 580 | - ?> |
|
| 580 | + ?> |
|
| 581 | 581 | </select> |
| 582 | 582 | </li> |
| 583 | 583 | <?php |
| 584 | 584 | } |
| 585 | - ?> |
|
| 585 | + ?> |
|
| 586 | 586 | <?php |
| 587 | 587 | } |
| 588 | - ?> |
|
| 588 | + ?> |
|
| 589 | 589 | <?php |
| 590 | 590 | if (isset($globalAPRS) && $globalAPRS) { |
| 591 | - ?> |
|
| 591 | + ?> |
|
| 592 | 592 | <li><?php echo _("Display APRS sources name:"); ?> |
| 593 | 593 | <select class="selectpicker" multiple onchange="sources(this);"> |
| 594 | 594 | <?php |
@@ -612,18 +612,18 @@ discard block |
||
| 612 | 612 | echo '<option value="'.$src['name'].'">'.$src['name'].'</option>'; |
| 613 | 613 | } |
| 614 | 614 | } |
| 615 | - ?> |
|
| 615 | + ?> |
|
| 616 | 616 | </select> |
| 617 | 617 | </li> |
| 618 | 618 | <?php |
| 619 | 619 | } |
| 620 | - ?> |
|
| 620 | + ?> |
|
| 621 | 621 | <?php |
| 622 | 622 | if (!isset($globalAircraft) && $globalAircraft) { |
| 623 | - ?> |
|
| 623 | + ?> |
|
| 624 | 624 | <?php |
| 625 | 625 | if (!(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalIVAO) && $globalIVAO) && !(isset($globalphpVMS) && $globalphpVMS)) { |
| 626 | - ?> |
|
| 626 | + ?> |
|
| 627 | 627 | <li><?php echo _("Display airlines of type:"); ?><br/> |
| 628 | 628 | <select class="selectpicker" onchange="airlinestype(this);"> |
| 629 | 629 | <option value="all"<?php if (!isset($_COOKIE['filter_airlinestype']) || $_COOKIE['filter_airlinestype'] == 'all' || $_COOKIE['filter_airlinestype'] == '') echo ' selected'; ?>><?php echo _("All"); ?></option> |
@@ -634,14 +634,14 @@ discard block |
||
| 634 | 634 | </li> |
| 635 | 635 | <?php |
| 636 | 636 | } |
| 637 | - ?> |
|
| 637 | + ?> |
|
| 638 | 638 | <li> |
| 639 | 639 | <?php echo _("Display flight with ident:"); ?> |
| 640 | 640 | <input type="text" name="identfilter" onchange="identfilter();" id="identfilter" value="<?php if (isset($_COOKIE['filter_ident'])) print $_COOKIE['filter_ident']; ?>" /> |
| 641 | 641 | </li> |
| 642 | 642 | <?php |
| 643 | 643 | } |
| 644 | - ?> |
|
| 644 | + ?> |
|
| 645 | 645 | </ul> |
| 646 | 646 | </form> |
| 647 | 647 | <form method="post"> |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | </form> |
| 651 | 651 | </div> |
| 652 | 652 | <?php |
| 653 | - if (isset($globalSatellite) && $globalSatellite) { |
|
| 653 | + if (isset($globalSatellite) && $globalSatellite) { |
|
| 654 | 654 | ?> |
| 655 | 655 | <div class="sidebar-pane" id="satellites"> |
| 656 | 656 | <h1 class="sidebar-header"><?php echo _("Satellites"); ?><span class="sidebar-close"><i class="fa fa-caret-left"></i></span></h1> |
@@ -690,14 +690,14 @@ discard block |
||
| 690 | 690 | print '<option value="'.$type['tle_type'].'">'.$type_name.'</option>'; |
| 691 | 691 | } |
| 692 | 692 | } |
| 693 | - ?> |
|
| 693 | + ?> |
|
| 694 | 694 | </select> |
| 695 | 695 | </li> |
| 696 | 696 | </ul> |
| 697 | 697 | </form> |
| 698 | 698 | </div> |
| 699 | 699 | <?php |
| 700 | - } |
|
| 700 | + } |
|
| 701 | 701 | ?> |
| 702 | 702 | </div> |
| 703 | 703 | </div> |
@@ -14,40 +14,40 @@ |
||
| 14 | 14 | { |
| 15 | 15 | $coords = explode(',',$_GET['coord']); |
| 16 | 16 | if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
| 17 | - || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) { |
|
| 17 | + || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) { |
|
| 18 | 18 | //$spotter_array = $Source->getAllLocationInfo(); |
| 19 | 19 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs',$coords)); |
| 20 | 20 | } |
| 21 | 21 | if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') |
| 22 | - || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) { |
|
| 22 | + || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) { |
|
| 23 | 23 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx',$coords)); |
| 24 | 24 | } |
| 25 | 25 | if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') |
| 26 | - || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) { |
|
| 26 | + || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) { |
|
| 27 | 27 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning',$coords)); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') |
| 31 | - || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) { |
|
| 31 | + || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) { |
|
| 32 | 32 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',$coords,true)); |
| 33 | 33 | } |
| 34 | 34 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('')); |
| 35 | 35 | } else { |
| 36 | 36 | if ((isset($_COOKIE['show_GroundStation']) && $_COOKIE['show_GroundStation'] == 'true') |
| 37 | - || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) { |
|
| 37 | + || (!isset($_COOKIE['show_GroundStation']) && (isset($globalMapGroundStation) && $globalMapGroundStation === TRUE))) { |
|
| 38 | 38 | //$spotter_array = $Source->getAllLocationInfo(); |
| 39 | 39 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('gs')); |
| 40 | 40 | } |
| 41 | 41 | if ((isset($_COOKIE['show_WeatherStation']) && $_COOKIE['show_WeatherStation'] == 'true') |
| 42 | - || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) { |
|
| 42 | + || (!isset($_COOKIE['show_WeatherStation']) && (isset($globalMapWeatherStation) && $globalMapWeatherStation === TRUE))) { |
|
| 43 | 43 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('wx')); |
| 44 | 44 | } |
| 45 | 45 | if ((isset($_COOKIE['show_Lightning']) && $_COOKIE['show_Lightning'] == 'true') |
| 46 | - || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) { |
|
| 46 | + || (!isset($_COOKIE['show_Lightning']) && (isset($globalMapLightning) && $globalMapLightning === TRUE))) { |
|
| 47 | 47 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('lightning')); |
| 48 | 48 | } |
| 49 | 49 | if ((isset($_COOKIE['show_Fire']) && $_COOKIE['show_Fire'] == 'true') |
| 50 | - || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) { |
|
| 50 | + || (!isset($_COOKIE['show_Fire']) && (isset($globalMapFires) && $globalMapFires === TRUE))) { |
|
| 51 | 51 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('fires',array(),true)); |
| 52 | 52 | } |
| 53 | 53 | $spotter_array = array_merge($spotter_array,$Source->getLocationInfoByType('')); |
@@ -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(); |
@@ -106,44 +106,44 @@ discard block |
||
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | |
| 109 | - /** |
|
| 110 | - * Gets all the spotter information based on a particular callsign |
|
| 111 | - * |
|
| 112 | - * @return Array the spotter information |
|
| 113 | - * |
|
| 114 | - */ |
|
| 115 | - public function getLastArchiveTrackerDataByIdent($ident) |
|
| 116 | - { |
|
| 109 | + /** |
|
| 110 | + * Gets all the spotter information based on a particular callsign |
|
| 111 | + * |
|
| 112 | + * @return Array the spotter information |
|
| 113 | + * |
|
| 114 | + */ |
|
| 115 | + public function getLastArchiveTrackerDataByIdent($ident) |
|
| 116 | + { |
|
| 117 | 117 | $Tracker = new Tracker($this->db); |
| 118 | - date_default_timezone_set('UTC'); |
|
| 118 | + date_default_timezone_set('UTC'); |
|
| 119 | 119 | |
| 120 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 121 | - //$query = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
|
| 122 | - $query = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 120 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 121 | + //$query = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
|
| 122 | + $query = "SELECT tracker_archive.* FROM tracker_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 123 | 123 | |
| 124 | - $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident)); |
|
| 124 | + $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident)); |
|
| 125 | 125 | |
| 126 | - return $spotter_array; |
|
| 127 | - } |
|
| 126 | + return $spotter_array; |
|
| 127 | + } |
|
| 128 | 128 | |
| 129 | 129 | |
| 130 | - /** |
|
| 131 | - * Gets last the spotter information based on a particular id |
|
| 132 | - * |
|
| 133 | - * @return Array the spotter information |
|
| 134 | - * |
|
| 135 | - */ |
|
| 136 | - public function getLastArchiveTrackerDataById($id) |
|
| 137 | - { |
|
| 138 | - $Tracker = new Tracker($this->db); |
|
| 139 | - date_default_timezone_set('UTC'); |
|
| 140 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 141 | - //$query = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id"; |
|
| 142 | - //$query = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
|
| 143 | - $query = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1"; |
|
| 130 | + /** |
|
| 131 | + * Gets last the spotter information based on a particular id |
|
| 132 | + * |
|
| 133 | + * @return Array the spotter information |
|
| 134 | + * |
|
| 135 | + */ |
|
| 136 | + public function getLastArchiveTrackerDataById($id) |
|
| 137 | + { |
|
| 138 | + $Tracker = new Tracker($this->db); |
|
| 139 | + date_default_timezone_set('UTC'); |
|
| 140 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 141 | + //$query = TrackerArchive->$global_query." WHERE tracker_archive.famtrackid = :id"; |
|
| 142 | + //$query = "SELECT tracker_archive.* FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.famtrackid = :id GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
|
| 143 | + $query = "SELECT * FROM tracker_archive WHERE famtrackid = :id ORDER BY date DESC LIMIT 1"; |
|
| 144 | 144 | |
| 145 | 145 | // $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id)); |
| 146 | - /* |
|
| 146 | + /* |
|
| 147 | 147 | try { |
| 148 | 148 | $Connection = new Connection(); |
| 149 | 149 | $sth = Connection->$db->prepare($query); |
@@ -153,188 +153,188 @@ discard block |
||
| 153 | 153 | } |
| 154 | 154 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 155 | 155 | */ |
| 156 | - $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id)); |
|
| 157 | - |
|
| 158 | - return $spotter_array; |
|
| 159 | - } |
|
| 160 | - |
|
| 161 | - /** |
|
| 162 | - * Gets all the spotter information based on a particular id |
|
| 163 | - * |
|
| 164 | - * @return Array the spotter information |
|
| 165 | - * |
|
| 166 | - */ |
|
| 167 | - public function getAllArchiveTrackerDataById($id) |
|
| 156 | + $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id)); |
|
| 157 | + |
|
| 158 | + return $spotter_array; |
|
| 159 | + } |
|
| 160 | + |
|
| 161 | + /** |
|
| 162 | + * Gets all the spotter information based on a particular id |
|
| 163 | + * |
|
| 164 | + * @return Array the spotter information |
|
| 165 | + * |
|
| 166 | + */ |
|
| 167 | + public function getAllArchiveTrackerDataById($id) |
|
| 168 | 168 | { |
| 169 | - date_default_timezone_set('UTC'); |
|
| 170 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 171 | - $query = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 169 | + date_default_timezone_set('UTC'); |
|
| 170 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 171 | + $query = $this->global_query." WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 172 | 172 | |
| 173 | 173 | // $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id)); |
| 174 | 174 | |
| 175 | - try { |
|
| 176 | - $sth = $this->db->prepare($query); |
|
| 177 | - $sth->execute(array(':id' => $id)); |
|
| 178 | - } catch(PDOException $e) { |
|
| 179 | - echo $e->getMessage(); |
|
| 180 | - die; |
|
| 181 | - } |
|
| 182 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 183 | - |
|
| 184 | - return $spotter_array; |
|
| 185 | - } |
|
| 186 | - |
|
| 187 | - /** |
|
| 188 | - * Gets coordinate & time spotter information based on a particular id |
|
| 189 | - * |
|
| 190 | - * @return Array the spotter information |
|
| 191 | - * |
|
| 192 | - */ |
|
| 193 | - public function getCoordArchiveTrackerDataById($id) |
|
| 194 | - { |
|
| 195 | - date_default_timezone_set('UTC'); |
|
| 196 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 197 | - $query = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id"; |
|
| 175 | + try { |
|
| 176 | + $sth = $this->db->prepare($query); |
|
| 177 | + $sth->execute(array(':id' => $id)); |
|
| 178 | + } catch(PDOException $e) { |
|
| 179 | + echo $e->getMessage(); |
|
| 180 | + die; |
|
| 181 | + } |
|
| 182 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 183 | + |
|
| 184 | + return $spotter_array; |
|
| 185 | + } |
|
| 186 | + |
|
| 187 | + /** |
|
| 188 | + * Gets coordinate & time spotter information based on a particular id |
|
| 189 | + * |
|
| 190 | + * @return Array the spotter information |
|
| 191 | + * |
|
| 192 | + */ |
|
| 193 | + public function getCoordArchiveTrackerDataById($id) |
|
| 194 | + { |
|
| 195 | + date_default_timezone_set('UTC'); |
|
| 196 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 197 | + $query = "SELECT tracker_archive.latitude, tracker_archive.longitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id"; |
|
| 198 | 198 | |
| 199 | 199 | // $spotter_array = Tracker->getDataFromDB($query,array(':id' => $id)); |
| 200 | 200 | |
| 201 | - try { |
|
| 202 | - $sth = $this->db->prepare($query); |
|
| 203 | - $sth->execute(array(':id' => $id)); |
|
| 204 | - } catch(PDOException $e) { |
|
| 205 | - echo $e->getMessage(); |
|
| 206 | - die; |
|
| 207 | - } |
|
| 208 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 201 | + try { |
|
| 202 | + $sth = $this->db->prepare($query); |
|
| 203 | + $sth->execute(array(':id' => $id)); |
|
| 204 | + } catch(PDOException $e) { |
|
| 205 | + echo $e->getMessage(); |
|
| 206 | + die; |
|
| 207 | + } |
|
| 208 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 209 | 209 | |
| 210 | - return $spotter_array; |
|
| 211 | - } |
|
| 210 | + return $spotter_array; |
|
| 211 | + } |
|
| 212 | 212 | |
| 213 | 213 | |
| 214 | - /** |
|
| 215 | - * Gets altitude information based on a particular callsign |
|
| 216 | - * |
|
| 217 | - * @return Array the spotter information |
|
| 218 | - * |
|
| 219 | - */ |
|
| 220 | - public function getAltitudeArchiveTrackerDataByIdent($ident) |
|
| 221 | - { |
|
| 214 | + /** |
|
| 215 | + * Gets altitude information based on a particular callsign |
|
| 216 | + * |
|
| 217 | + * @return Array the spotter information |
|
| 218 | + * |
|
| 219 | + */ |
|
| 220 | + public function getAltitudeArchiveTrackerDataByIdent($ident) |
|
| 221 | + { |
|
| 222 | 222 | |
| 223 | - date_default_timezone_set('UTC'); |
|
| 223 | + date_default_timezone_set('UTC'); |
|
| 224 | 224 | |
| 225 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 226 | - $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date"; |
|
| 225 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 226 | + $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date"; |
|
| 227 | 227 | |
| 228 | - try { |
|
| 229 | - $sth = $this->db->prepare($query); |
|
| 230 | - $sth->execute(array(':ident' => $ident)); |
|
| 231 | - } catch(PDOException $e) { |
|
| 232 | - echo $e->getMessage(); |
|
| 233 | - die; |
|
| 234 | - } |
|
| 235 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 228 | + try { |
|
| 229 | + $sth = $this->db->prepare($query); |
|
| 230 | + $sth->execute(array(':ident' => $ident)); |
|
| 231 | + } catch(PDOException $e) { |
|
| 232 | + echo $e->getMessage(); |
|
| 233 | + die; |
|
| 234 | + } |
|
| 235 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 236 | 236 | |
| 237 | - return $spotter_array; |
|
| 238 | - } |
|
| 237 | + return $spotter_array; |
|
| 238 | + } |
|
| 239 | 239 | |
| 240 | - /** |
|
| 241 | - * Gets altitude information based on a particular id |
|
| 242 | - * |
|
| 243 | - * @return Array the spotter information |
|
| 244 | - * |
|
| 245 | - */ |
|
| 246 | - public function getAltitudeArchiveTrackerDataById($id) |
|
| 247 | - { |
|
| 240 | + /** |
|
| 241 | + * Gets altitude information based on a particular id |
|
| 242 | + * |
|
| 243 | + * @return Array the spotter information |
|
| 244 | + * |
|
| 245 | + */ |
|
| 246 | + public function getAltitudeArchiveTrackerDataById($id) |
|
| 247 | + { |
|
| 248 | 248 | |
| 249 | - date_default_timezone_set('UTC'); |
|
| 249 | + date_default_timezone_set('UTC'); |
|
| 250 | 250 | |
| 251 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 252 | - $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date"; |
|
| 251 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 252 | + $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id AND tracker_archive.latitude <> 0 AND tracker_archive.longitude <> 0 ORDER BY date"; |
|
| 253 | 253 | |
| 254 | - try { |
|
| 255 | - $sth = $this->db->prepare($query); |
|
| 256 | - $sth->execute(array(':id' => $id)); |
|
| 257 | - } catch(PDOException $e) { |
|
| 258 | - echo $e->getMessage(); |
|
| 259 | - die; |
|
| 260 | - } |
|
| 261 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 254 | + try { |
|
| 255 | + $sth = $this->db->prepare($query); |
|
| 256 | + $sth->execute(array(':id' => $id)); |
|
| 257 | + } catch(PDOException $e) { |
|
| 258 | + echo $e->getMessage(); |
|
| 259 | + die; |
|
| 260 | + } |
|
| 261 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 262 | 262 | |
| 263 | - return $spotter_array; |
|
| 264 | - } |
|
| 263 | + return $spotter_array; |
|
| 264 | + } |
|
| 265 | 265 | |
| 266 | - /** |
|
| 267 | - * Gets altitude & speed information based on a particular id |
|
| 268 | - * |
|
| 269 | - * @return Array the spotter information |
|
| 270 | - * |
|
| 271 | - */ |
|
| 272 | - public function getAltitudeSpeedArchiveTrackerDataById($id) |
|
| 273 | - { |
|
| 266 | + /** |
|
| 267 | + * Gets altitude & speed information based on a particular id |
|
| 268 | + * |
|
| 269 | + * @return Array the spotter information |
|
| 270 | + * |
|
| 271 | + */ |
|
| 272 | + public function getAltitudeSpeedArchiveTrackerDataById($id) |
|
| 273 | + { |
|
| 274 | 274 | |
| 275 | - date_default_timezone_set('UTC'); |
|
| 275 | + date_default_timezone_set('UTC'); |
|
| 276 | 276 | |
| 277 | - $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 278 | - $query = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 277 | + $id = filter_var($id, FILTER_SANITIZE_STRING); |
|
| 278 | + $query = "SELECT tracker_archive.altitude, tracker_archive.ground_speed, tracker_archive.date FROM tracker_archive WHERE tracker_archive.famtrackid = :id ORDER BY date"; |
|
| 279 | 279 | |
| 280 | - try { |
|
| 281 | - $sth = $this->db->prepare($query); |
|
| 282 | - $sth->execute(array(':id' => $id)); |
|
| 283 | - } catch(PDOException $e) { |
|
| 284 | - echo $e->getMessage(); |
|
| 285 | - die; |
|
| 286 | - } |
|
| 287 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 280 | + try { |
|
| 281 | + $sth = $this->db->prepare($query); |
|
| 282 | + $sth->execute(array(':id' => $id)); |
|
| 283 | + } catch(PDOException $e) { |
|
| 284 | + echo $e->getMessage(); |
|
| 285 | + die; |
|
| 286 | + } |
|
| 287 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 288 | 288 | |
| 289 | - return $spotter_array; |
|
| 290 | - } |
|
| 289 | + return $spotter_array; |
|
| 290 | + } |
|
| 291 | 291 | |
| 292 | 292 | |
| 293 | - /** |
|
| 294 | - * Gets altitude information based on a particular callsign |
|
| 295 | - * |
|
| 296 | - * @return Array the spotter information |
|
| 297 | - * |
|
| 298 | - */ |
|
| 299 | - public function getLastAltitudeArchiveTrackerDataByIdent($ident) |
|
| 300 | - { |
|
| 293 | + /** |
|
| 294 | + * Gets altitude information based on a particular callsign |
|
| 295 | + * |
|
| 296 | + * @return Array the spotter information |
|
| 297 | + * |
|
| 298 | + */ |
|
| 299 | + public function getLastAltitudeArchiveTrackerDataByIdent($ident) |
|
| 300 | + { |
|
| 301 | 301 | |
| 302 | - date_default_timezone_set('UTC'); |
|
| 302 | + date_default_timezone_set('UTC'); |
|
| 303 | 303 | |
| 304 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 305 | - $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
|
| 304 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 305 | + $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE l.ident = :ident GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate LIMIT 1"; |
|
| 306 | 306 | // $query = "SELECT tracker_archive.altitude, tracker_archive.date FROM tracker_archive WHERE tracker_archive.ident = :ident"; |
| 307 | 307 | |
| 308 | - try { |
|
| 309 | - $sth = $this->db->prepare($query); |
|
| 310 | - $sth->execute(array(':ident' => $ident)); |
|
| 311 | - } catch(PDOException $e) { |
|
| 312 | - echo $e->getMessage(); |
|
| 313 | - die; |
|
| 314 | - } |
|
| 315 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 308 | + try { |
|
| 309 | + $sth = $this->db->prepare($query); |
|
| 310 | + $sth->execute(array(':ident' => $ident)); |
|
| 311 | + } catch(PDOException $e) { |
|
| 312 | + echo $e->getMessage(); |
|
| 313 | + die; |
|
| 314 | + } |
|
| 315 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 316 | 316 | |
| 317 | - return $spotter_array; |
|
| 318 | - } |
|
| 317 | + return $spotter_array; |
|
| 318 | + } |
|
| 319 | 319 | |
| 320 | 320 | |
| 321 | 321 | |
| 322 | - /** |
|
| 323 | - * Gets all the archive spotter information |
|
| 324 | - * |
|
| 325 | - * @return Array the spotter information |
|
| 326 | - * |
|
| 327 | - */ |
|
| 328 | - public function getTrackerArchiveData($ident,$famtrackid,$date) |
|
| 329 | - { |
|
| 330 | - $Tracker = new Tracker($this->db); |
|
| 331 | - $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 332 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate"; |
|
| 322 | + /** |
|
| 323 | + * Gets all the archive spotter information |
|
| 324 | + * |
|
| 325 | + * @return Array the spotter information |
|
| 326 | + * |
|
| 327 | + */ |
|
| 328 | + public function getTrackerArchiveData($ident,$famtrackid,$date) |
|
| 329 | + { |
|
| 330 | + $Tracker = new Tracker($this->db); |
|
| 331 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 332 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.famtrackid = :famtrackid AND l.date LIKE :date GROUP BY l.famtrackid) s on spotter_live.famtrackid = s.famtrackid AND spotter_live.date = s.maxdate"; |
|
| 333 | 333 | |
| 334 | - $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%')); |
|
| 334 | + $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':famtrackid' => $famtrackid,':date' => $date.'%')); |
|
| 335 | 335 | |
| 336 | - return $spotter_array; |
|
| 337 | - } |
|
| 336 | + return $spotter_array; |
|
| 337 | + } |
|
| 338 | 338 | |
| 339 | 339 | public function deleteTrackerArchiveTrackData() |
| 340 | 340 | { |
@@ -354,34 +354,34 @@ discard block |
||
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | /** |
| 357 | - * Gets Minimal Live Tracker data |
|
| 358 | - * |
|
| 359 | - * @return Array the spotter information |
|
| 360 | - * |
|
| 361 | - */ |
|
| 362 | - public function getMinLiveTrackerData($begindate,$enddate,$filter = array()) |
|
| 363 | - { |
|
| 364 | - global $globalDBdriver, $globalLiveInterval; |
|
| 365 | - date_default_timezone_set('UTC'); |
|
| 366 | - |
|
| 367 | - $filter_query = ''; |
|
| 368 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 369 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 370 | - } |
|
| 371 | - // Use spotter_output also ? |
|
| 372 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 373 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 374 | - } |
|
| 375 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 376 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
|
| 377 | - } |
|
| 378 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 379 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 380 | - } |
|
| 357 | + * Gets Minimal Live Tracker data |
|
| 358 | + * |
|
| 359 | + * @return Array the spotter information |
|
| 360 | + * |
|
| 361 | + */ |
|
| 362 | + public function getMinLiveTrackerData($begindate,$enddate,$filter = array()) |
|
| 363 | + { |
|
| 364 | + global $globalDBdriver, $globalLiveInterval; |
|
| 365 | + date_default_timezone_set('UTC'); |
|
| 381 | 366 | |
| 382 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 383 | - if ($globalDBdriver == 'mysql') { |
|
| 384 | - /* |
|
| 367 | + $filter_query = ''; |
|
| 368 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 369 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 370 | + } |
|
| 371 | + // Use spotter_output also ? |
|
| 372 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 373 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 374 | + } |
|
| 375 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 376 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
|
| 377 | + } |
|
| 378 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 379 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 380 | + } |
|
| 381 | + |
|
| 382 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 383 | + if ($globalDBdriver == 'mysql') { |
|
| 384 | + /* |
|
| 385 | 385 | $query = 'SELECT a.aircraft_shadow, tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk |
| 386 | 386 | FROM tracker_archive |
| 387 | 387 | INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao'; |
@@ -400,56 +400,56 @@ discard block |
||
| 400 | 400 | INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao |
| 401 | 401 | WHERE tracker_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 402 | 402 | '.$filter_query.' ORDER BY famtrackid'; |
| 403 | - } else { |
|
| 404 | - //$query = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao'; |
|
| 405 | - $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 403 | + } else { |
|
| 404 | + //$query = 'SELECT tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow FROM tracker_archive INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao'; |
|
| 405 | + $query = 'SELECT tracker_archive.date,tracker_archive.famtrackid, tracker_archive.ident, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 406 | 406 | FROM tracker_archive |
| 407 | 407 | INNER JOIN (SELECT * FROM aircraft) a on tracker_archive.aircraft_icao = a.icao |
| 408 | 408 | WHERE tracker_archive.date >= '."'".$begindate."'".' AND tracker_archive.date <= '."'".$enddate."'".' |
| 409 | 409 | '.$filter_query.' ORDER BY famtrackid'; |
| 410 | - } |
|
| 411 | - //echo $query; |
|
| 412 | - try { |
|
| 413 | - $sth = $this->db->prepare($query); |
|
| 414 | - $sth->execute(); |
|
| 415 | - } catch(PDOException $e) { |
|
| 416 | - echo $e->getMessage(); |
|
| 417 | - die; |
|
| 418 | - } |
|
| 419 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 410 | + } |
|
| 411 | + //echo $query; |
|
| 412 | + try { |
|
| 413 | + $sth = $this->db->prepare($query); |
|
| 414 | + $sth->execute(); |
|
| 415 | + } catch(PDOException $e) { |
|
| 416 | + echo $e->getMessage(); |
|
| 417 | + die; |
|
| 418 | + } |
|
| 419 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 420 | 420 | |
| 421 | - return $spotter_array; |
|
| 422 | - } |
|
| 421 | + return $spotter_array; |
|
| 422 | + } |
|
| 423 | 423 | |
| 424 | 424 | /** |
| 425 | - * Gets Minimal Live Tracker data |
|
| 426 | - * |
|
| 427 | - * @return Array the spotter information |
|
| 428 | - * |
|
| 429 | - */ |
|
| 430 | - public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array()) |
|
| 431 | - { |
|
| 432 | - global $globalDBdriver, $globalLiveInterval; |
|
| 433 | - date_default_timezone_set('UTC'); |
|
| 434 | - |
|
| 435 | - $filter_query = ''; |
|
| 436 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 437 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 438 | - } |
|
| 439 | - // Should use spotter_output also ? |
|
| 440 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 441 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 442 | - } |
|
| 443 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 444 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
|
| 445 | - } |
|
| 446 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 447 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 448 | - } |
|
| 425 | + * Gets Minimal Live Tracker data |
|
| 426 | + * |
|
| 427 | + * @return Array the spotter information |
|
| 428 | + * |
|
| 429 | + */ |
|
| 430 | + public function getMinLiveTrackerDataPlayback($begindate,$enddate,$filter = array()) |
|
| 431 | + { |
|
| 432 | + global $globalDBdriver, $globalLiveInterval; |
|
| 433 | + date_default_timezone_set('UTC'); |
|
| 434 | + |
|
| 435 | + $filter_query = ''; |
|
| 436 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 437 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 438 | + } |
|
| 439 | + // Should use spotter_output also ? |
|
| 440 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 441 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 442 | + } |
|
| 443 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 444 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM tracker_archive_output WHERE tracker_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
|
| 445 | + } |
|
| 446 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 447 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 448 | + } |
|
| 449 | 449 | |
| 450 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 451 | - if ($globalDBdriver == 'mysql') { |
|
| 452 | - /* |
|
| 450 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 451 | + if ($globalDBdriver == 'mysql') { |
|
| 452 | + /* |
|
| 453 | 453 | $query = 'SELECT a.aircraft_shadow, tracker_archive.ident, tracker_archive.famtrackid, tracker_archive.aircraft_icao, tracker_archive.departure_airport_icao as departure_airport, tracker_archive.arrival_airport_icao as arrival_airport, tracker_archive.latitude, tracker_archive.longitude, tracker_archive.altitude, tracker_archive.heading, tracker_archive.ground_speed, tracker_archive.squawk |
| 454 | 454 | FROM tracker_archive |
| 455 | 455 | INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.famtrackid) s on tracker_archive.famtrackid = s.famtrackid AND tracker_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON tracker_archive.aircraft_icao = a.icao'; |
@@ -460,95 +460,95 @@ discard block |
||
| 460 | 460 | WHERE (tracker_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
| 461 | 461 | '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow'; |
| 462 | 462 | |
| 463 | - } else { |
|
| 464 | - //$query = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow FROM tracker_archive_output INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive_output.famtrackid = s.famtrackid AND tracker_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao'; |
|
| 465 | - /* |
|
| 463 | + } else { |
|
| 464 | + //$query = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow FROM tracker_archive_output INNER JOIN (SELECT l.famtrackid, max(l.date) as maxdate FROM tracker_archive_output l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.famtrackid) s on tracker_archive_output.famtrackid = s.famtrackid AND tracker_archive_output.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao'; |
|
| 465 | + /* |
|
| 466 | 466 | $query = 'SELECT tracker_archive_output.ident, tracker_archive_output.famtrackid, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow |
| 467 | 467 | FROM tracker_archive_output |
| 468 | 468 | INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao |
| 469 | 469 | WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".' |
| 470 | 470 | '.$filter_query.' GROUP BY tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao, tracker_archive_output.arrival_airport_icao, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow'; |
| 471 | 471 | */ |
| 472 | - $query = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow |
|
| 472 | + $query = 'SELECT DISTINCT tracker_archive_output.famtrackid, tracker_archive_output.ident, tracker_archive_output.aircraft_icao, tracker_archive_output.departure_airport_icao as departure_airport, tracker_archive_output.arrival_airport_icao as arrival_airport, tracker_archive_output.latitude, tracker_archive_output.longitude, tracker_archive_output.altitude, tracker_archive_output.heading, tracker_archive_output.ground_speed, tracker_archive_output.squawk, a.aircraft_shadow |
|
| 473 | 473 | FROM tracker_archive_output |
| 474 | 474 | INNER JOIN (SELECT * FROM aircraft) a on tracker_archive_output.aircraft_icao = a.icao |
| 475 | 475 | WHERE tracker_archive_output.date >= '."'".$begindate."'".' AND tracker_archive_output.date <= '."'".$enddate."'".' |
| 476 | 476 | '.$filter_query.' LIMIT 200 OFFSET 0'; |
| 477 | 477 | // .' GROUP BY spotter_output.famtrackid, 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'; |
| 478 | 478 | |
| 479 | - } |
|
| 480 | - //echo $query; |
|
| 481 | - try { |
|
| 482 | - $sth = $this->db->prepare($query); |
|
| 483 | - $sth->execute(); |
|
| 484 | - } catch(PDOException $e) { |
|
| 485 | - echo $e->getMessage(); |
|
| 486 | - die; |
|
| 487 | - } |
|
| 488 | - $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 479 | + } |
|
| 480 | + //echo $query; |
|
| 481 | + try { |
|
| 482 | + $sth = $this->db->prepare($query); |
|
| 483 | + $sth->execute(); |
|
| 484 | + } catch(PDOException $e) { |
|
| 485 | + echo $e->getMessage(); |
|
| 486 | + die; |
|
| 487 | + } |
|
| 488 | + $spotter_array = $sth->fetchAll(PDO::FETCH_ASSOC); |
|
| 489 | 489 | |
| 490 | - return $spotter_array; |
|
| 491 | - } |
|
| 490 | + return $spotter_array; |
|
| 491 | + } |
|
| 492 | 492 | |
| 493 | 493 | /** |
| 494 | - * Gets count Live Tracker data |
|
| 495 | - * |
|
| 496 | - * @return Array the spotter information |
|
| 497 | - * |
|
| 498 | - */ |
|
| 499 | - public function getLiveTrackerCount($begindate,$enddate,$filter = array()) |
|
| 500 | - { |
|
| 501 | - global $globalDBdriver, $globalLiveInterval; |
|
| 502 | - date_default_timezone_set('UTC'); |
|
| 503 | - |
|
| 504 | - $filter_query = ''; |
|
| 505 | - if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 506 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 507 | - } |
|
| 508 | - if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 509 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 510 | - } |
|
| 511 | - if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 512 | - $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
|
| 513 | - } |
|
| 514 | - if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 515 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 516 | - } |
|
| 494 | + * Gets count Live Tracker data |
|
| 495 | + * |
|
| 496 | + * @return Array the spotter information |
|
| 497 | + * |
|
| 498 | + */ |
|
| 499 | + public function getLiveTrackerCount($begindate,$enddate,$filter = array()) |
|
| 500 | + { |
|
| 501 | + global $globalDBdriver, $globalLiveInterval; |
|
| 502 | + date_default_timezone_set('UTC'); |
|
| 517 | 503 | |
| 518 | - //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 519 | - if ($globalDBdriver == 'mysql') { |
|
| 504 | + $filter_query = ''; |
|
| 505 | + if (isset($filter['source']) && !empty($filter['source'])) { |
|
| 506 | + $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 507 | + } |
|
| 508 | + if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
|
| 509 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.famtrackid = tracker_archive.famtrackid "; |
|
| 510 | + } |
|
| 511 | + if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
|
| 512 | + $filter_query .= " INNER JOIN (SELECT famtrackid FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.famtrackid = tracker_archive.famtrackid "; |
|
| 513 | + } |
|
| 514 | + if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
|
| 515 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 516 | + } |
|
| 517 | + |
|
| 518 | + //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 519 | + if ($globalDBdriver == 'mysql') { |
|
| 520 | 520 | $query = 'SELECT COUNT(DISTINCT famtrackid) as nb |
| 521 | 521 | FROM tracker_archive l |
| 522 | 522 | WHERE (l.date BETWEEN DATE_SUB('."'".$begindate."'".',INTERVAL '.$globalLiveInterval.' SECOND) AND '."'".$begindate."'".')'.$filter_query; |
| 523 | - } else { |
|
| 523 | + } else { |
|
| 524 | 524 | $query = 'SELECT COUNT(DISTINCT famtrackid) as nb FROM tracker_archive l WHERE (l.date BETWEEN '."'".$begindate."' - INTERVAL '".$globalLiveInterval." SECONDS' AND "."'".$enddate."'".')'.$filter_query; |
| 525 | - } |
|
| 526 | - //echo $query; |
|
| 527 | - try { |
|
| 528 | - $sth = $this->db->prepare($query); |
|
| 529 | - $sth->execute(); |
|
| 530 | - } catch(PDOException $e) { |
|
| 531 | - echo $e->getMessage(); |
|
| 532 | - die; |
|
| 533 | - } |
|
| 525 | + } |
|
| 526 | + //echo $query; |
|
| 527 | + try { |
|
| 528 | + $sth = $this->db->prepare($query); |
|
| 529 | + $sth->execute(); |
|
| 530 | + } catch(PDOException $e) { |
|
| 531 | + echo $e->getMessage(); |
|
| 532 | + die; |
|
| 533 | + } |
|
| 534 | 534 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 535 | 535 | $sth->closeCursor(); |
| 536 | - return $result['nb']; |
|
| 536 | + return $result['nb']; |
|
| 537 | 537 | |
| 538 | - } |
|
| 538 | + } |
|
| 539 | 539 | |
| 540 | 540 | |
| 541 | 541 | |
| 542 | 542 | // tracker_archive_output |
| 543 | 543 | |
| 544 | - /** |
|
| 545 | - * Gets all the spotter information |
|
| 546 | - * |
|
| 547 | - * @return Array the spotter information |
|
| 548 | - * |
|
| 549 | - */ |
|
| 550 | - public function searchTrackerData($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()) |
|
| 551 | - { |
|
| 544 | + /** |
|
| 545 | + * Gets all the spotter information |
|
| 546 | + * |
|
| 547 | + * @return Array the spotter information |
|
| 548 | + * |
|
| 549 | + */ |
|
| 550 | + public function searchTrackerData($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()) |
|
| 551 | + { |
|
| 552 | 552 | global $globalTimezone, $globalDBdriver; |
| 553 | 553 | require_once(dirname(__FILE__).'/class.Translation.php'); |
| 554 | 554 | $Translation = new Translation($this->db); |
@@ -562,159 +562,159 @@ discard block |
||
| 562 | 562 | $filter_query = $this->getFilter($filters); |
| 563 | 563 | if ($q != "") |
| 564 | 564 | { |
| 565 | - if (!is_string($q)) |
|
| 566 | - { |
|
| 565 | + if (!is_string($q)) |
|
| 566 | + { |
|
| 567 | 567 | return false; |
| 568 | - } else { |
|
| 568 | + } else { |
|
| 569 | 569 | |
| 570 | 570 | $q_array = explode(" ", $q); |
| 571 | 571 | |
| 572 | 572 | foreach ($q_array as $q_item){ |
| 573 | - $additional_query .= " AND ("; |
|
| 574 | - $additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 575 | - $additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 576 | - $additional_query .= "(tracker_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 577 | - $additional_query .= "(tracker_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 578 | - $additional_query .= "(tracker_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 579 | - $additional_query .= "(tracker_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 580 | - $additional_query .= "(tracker_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 581 | - $additional_query .= "(tracker_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 582 | - $additional_query .= "(tracker_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 583 | - $additional_query .= "(tracker_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 584 | - $additional_query .= "(tracker_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 585 | - $additional_query .= "(tracker_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 586 | - $additional_query .= "(tracker_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 587 | - $additional_query .= "(tracker_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 588 | - $additional_query .= "(tracker_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 589 | - $additional_query .= "(tracker_archive_output.registration like '%".$q_item."%') OR "; |
|
| 590 | - $additional_query .= "(tracker_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 591 | - $additional_query .= "(tracker_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 592 | - $additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 593 | - $additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR "; |
|
| 594 | - $translate = $Translation->ident2icao($q_item); |
|
| 595 | - if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR "; |
|
| 596 | - $additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')"; |
|
| 597 | - $additional_query .= ")"; |
|
| 573 | + $additional_query .= " AND ("; |
|
| 574 | + $additional_query .= "(tracker_archive_output.spotter_id like '%".$q_item."%') OR "; |
|
| 575 | + $additional_query .= "(tracker_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
|
| 576 | + $additional_query .= "(tracker_archive_output.aircraft_name like '%".$q_item."%') OR "; |
|
| 577 | + $additional_query .= "(tracker_archive_output.aircraft_manufacturer like '%".$q_item."%') OR "; |
|
| 578 | + $additional_query .= "(tracker_archive_output.airline_icao like '%".$q_item."%') OR "; |
|
| 579 | + $additional_query .= "(tracker_archive_output.airline_name like '%".$q_item."%') OR "; |
|
| 580 | + $additional_query .= "(tracker_archive_output.airline_country like '%".$q_item."%') OR "; |
|
| 581 | + $additional_query .= "(tracker_archive_output.departure_airport_icao like '%".$q_item."%') OR "; |
|
| 582 | + $additional_query .= "(tracker_archive_output.departure_airport_name like '%".$q_item."%') OR "; |
|
| 583 | + $additional_query .= "(tracker_archive_output.departure_airport_city like '%".$q_item."%') OR "; |
|
| 584 | + $additional_query .= "(tracker_archive_output.departure_airport_country like '%".$q_item."%') OR "; |
|
| 585 | + $additional_query .= "(tracker_archive_output.arrival_airport_icao like '%".$q_item."%') OR "; |
|
| 586 | + $additional_query .= "(tracker_archive_output.arrival_airport_name like '%".$q_item."%') OR "; |
|
| 587 | + $additional_query .= "(tracker_archive_output.arrival_airport_city like '%".$q_item."%') OR "; |
|
| 588 | + $additional_query .= "(tracker_archive_output.arrival_airport_country like '%".$q_item."%') OR "; |
|
| 589 | + $additional_query .= "(tracker_archive_output.registration like '%".$q_item."%') OR "; |
|
| 590 | + $additional_query .= "(tracker_archive_output.owner_name like '%".$q_item."%') OR "; |
|
| 591 | + $additional_query .= "(tracker_archive_output.pilot_id like '%".$q_item."%') OR "; |
|
| 592 | + $additional_query .= "(tracker_archive_output.pilot_name like '%".$q_item."%') OR "; |
|
| 593 | + $additional_query .= "(tracker_archive_output.ident like '%".$q_item."%') OR "; |
|
| 594 | + $translate = $Translation->ident2icao($q_item); |
|
| 595 | + if ($translate != $q_item) $additional_query .= "(tracker_archive_output.ident like '%".$translate."%') OR "; |
|
| 596 | + $additional_query .= "(tracker_archive_output.highlight like '%".$q_item."%')"; |
|
| 597 | + $additional_query .= ")"; |
|
| 598 | + } |
|
| 598 | 599 | } |
| 599 | - } |
|
| 600 | 600 | } |
| 601 | 601 | |
| 602 | 602 | if ($registration != "") |
| 603 | 603 | { |
| 604 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 605 | - if (!is_string($registration)) |
|
| 606 | - { |
|
| 604 | + $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 605 | + if (!is_string($registration)) |
|
| 606 | + { |
|
| 607 | 607 | return false; |
| 608 | - } else { |
|
| 608 | + } else { |
|
| 609 | 609 | $additional_query .= " AND (tracker_archive_output.registration = '".$registration."')"; |
| 610 | - } |
|
| 610 | + } |
|
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | if ($aircraft_icao != "") |
| 614 | 614 | { |
| 615 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 616 | - if (!is_string($aircraft_icao)) |
|
| 617 | - { |
|
| 615 | + $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 616 | + if (!is_string($aircraft_icao)) |
|
| 617 | + { |
|
| 618 | 618 | return false; |
| 619 | - } else { |
|
| 619 | + } else { |
|
| 620 | 620 | $additional_query .= " AND (tracker_archive_output.aircraft_icao = '".$aircraft_icao."')"; |
| 621 | - } |
|
| 621 | + } |
|
| 622 | 622 | } |
| 623 | 623 | |
| 624 | 624 | if ($aircraft_manufacturer != "") |
| 625 | 625 | { |
| 626 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 627 | - if (!is_string($aircraft_manufacturer)) |
|
| 628 | - { |
|
| 626 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 627 | + if (!is_string($aircraft_manufacturer)) |
|
| 628 | + { |
|
| 629 | 629 | return false; |
| 630 | - } else { |
|
| 630 | + } else { |
|
| 631 | 631 | $additional_query .= " AND (tracker_archive_output.aircraft_manufacturer = '".$aircraft_manufacturer."')"; |
| 632 | - } |
|
| 632 | + } |
|
| 633 | 633 | } |
| 634 | 634 | |
| 635 | 635 | if ($highlights == "true") |
| 636 | 636 | { |
| 637 | - if (!is_string($highlights)) |
|
| 638 | - { |
|
| 637 | + if (!is_string($highlights)) |
|
| 638 | + { |
|
| 639 | 639 | return false; |
| 640 | - } else { |
|
| 640 | + } else { |
|
| 641 | 641 | $additional_query .= " AND (tracker_archive_output.highlight <> '')"; |
| 642 | - } |
|
| 642 | + } |
|
| 643 | 643 | } |
| 644 | 644 | |
| 645 | 645 | if ($airline_icao != "") |
| 646 | 646 | { |
| 647 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 648 | - if (!is_string($airline_icao)) |
|
| 649 | - { |
|
| 647 | + $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 648 | + if (!is_string($airline_icao)) |
|
| 649 | + { |
|
| 650 | 650 | return false; |
| 651 | - } else { |
|
| 651 | + } else { |
|
| 652 | 652 | $additional_query .= " AND (tracker_archive_output.airline_icao = '".$airline_icao."')"; |
| 653 | - } |
|
| 653 | + } |
|
| 654 | 654 | } |
| 655 | 655 | |
| 656 | 656 | if ($airline_country != "") |
| 657 | 657 | { |
| 658 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 659 | - if (!is_string($airline_country)) |
|
| 660 | - { |
|
| 658 | + $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 659 | + if (!is_string($airline_country)) |
|
| 660 | + { |
|
| 661 | 661 | return false; |
| 662 | - } else { |
|
| 662 | + } else { |
|
| 663 | 663 | $additional_query .= " AND (tracker_archive_output.airline_country = '".$airline_country."')"; |
| 664 | - } |
|
| 664 | + } |
|
| 665 | 665 | } |
| 666 | 666 | |
| 667 | 667 | if ($airline_type != "") |
| 668 | 668 | { |
| 669 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 670 | - if (!is_string($airline_type)) |
|
| 671 | - { |
|
| 669 | + $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 670 | + if (!is_string($airline_type)) |
|
| 671 | + { |
|
| 672 | 672 | return false; |
| 673 | - } else { |
|
| 673 | + } else { |
|
| 674 | 674 | if ($airline_type == "passenger") |
| 675 | 675 | { |
| 676 | - $additional_query .= " AND (tracker_archive_output.airline_type = 'passenger')"; |
|
| 676 | + $additional_query .= " AND (tracker_archive_output.airline_type = 'passenger')"; |
|
| 677 | 677 | } |
| 678 | 678 | if ($airline_type == "cargo") |
| 679 | 679 | { |
| 680 | - $additional_query .= " AND (tracker_archive_output.airline_type = 'cargo')"; |
|
| 680 | + $additional_query .= " AND (tracker_archive_output.airline_type = 'cargo')"; |
|
| 681 | 681 | } |
| 682 | 682 | if ($airline_type == "military") |
| 683 | 683 | { |
| 684 | - $additional_query .= " AND (tracker_archive_output.airline_type = 'military')"; |
|
| 684 | + $additional_query .= " AND (tracker_archive_output.airline_type = 'military')"; |
|
| 685 | + } |
|
| 685 | 686 | } |
| 686 | - } |
|
| 687 | 687 | } |
| 688 | 688 | |
| 689 | 689 | if ($airport != "") |
| 690 | 690 | { |
| 691 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 692 | - if (!is_string($airport)) |
|
| 693 | - { |
|
| 691 | + $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 692 | + if (!is_string($airport)) |
|
| 693 | + { |
|
| 694 | 694 | return false; |
| 695 | - } else { |
|
| 695 | + } else { |
|
| 696 | 696 | $additional_query .= " AND ((tracker_archive_output.departure_airport_icao = '".$airport."') OR (tracker_archive_output.arrival_airport_icao = '".$airport."'))"; |
| 697 | - } |
|
| 697 | + } |
|
| 698 | 698 | } |
| 699 | 699 | |
| 700 | 700 | if ($airport_country != "") |
| 701 | 701 | { |
| 702 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 703 | - if (!is_string($airport_country)) |
|
| 704 | - { |
|
| 702 | + $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 703 | + if (!is_string($airport_country)) |
|
| 704 | + { |
|
| 705 | 705 | return false; |
| 706 | - } else { |
|
| 706 | + } else { |
|
| 707 | 707 | $additional_query .= " AND ((tracker_archive_output.departure_airport_country = '".$airport_country."') OR (tracker_archive_output.arrival_airport_country = '".$airport_country."'))"; |
| 708 | - } |
|
| 708 | + } |
|
| 709 | 709 | } |
| 710 | 710 | |
| 711 | 711 | if ($callsign != "") |
| 712 | 712 | { |
| 713 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 714 | - if (!is_string($callsign)) |
|
| 715 | - { |
|
| 713 | + $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 714 | + if (!is_string($callsign)) |
|
| 715 | + { |
|
| 716 | 716 | return false; |
| 717 | - } else { |
|
| 717 | + } else { |
|
| 718 | 718 | $translate = $Translation->ident2icao($callsign); |
| 719 | 719 | if ($translate != $callsign) { |
| 720 | 720 | $additional_query .= " AND (tracker_archive_output.ident = :callsign OR tracker_archive_output.ident = :translate)"; |
@@ -722,99 +722,99 @@ discard block |
||
| 722 | 722 | } else { |
| 723 | 723 | $additional_query .= " AND (tracker_archive_output.ident = '".$callsign."')"; |
| 724 | 724 | } |
| 725 | - } |
|
| 725 | + } |
|
| 726 | 726 | } |
| 727 | 727 | |
| 728 | 728 | if ($owner != "") |
| 729 | 729 | { |
| 730 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 731 | - if (!is_string($owner)) |
|
| 732 | - { |
|
| 730 | + $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 731 | + if (!is_string($owner)) |
|
| 732 | + { |
|
| 733 | 733 | return false; |
| 734 | - } else { |
|
| 734 | + } else { |
|
| 735 | 735 | $additional_query .= " AND (tracker_archive_output.owner_name = '".$owner."')"; |
| 736 | - } |
|
| 736 | + } |
|
| 737 | 737 | } |
| 738 | 738 | |
| 739 | 739 | if ($pilot_name != "") |
| 740 | 740 | { |
| 741 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 742 | - if (!is_string($pilot_name)) |
|
| 743 | - { |
|
| 741 | + $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 742 | + if (!is_string($pilot_name)) |
|
| 743 | + { |
|
| 744 | 744 | return false; |
| 745 | - } else { |
|
| 745 | + } else { |
|
| 746 | 746 | $additional_query .= " AND (tracker_archive_output.pilot_name = '".$pilot_name."')"; |
| 747 | - } |
|
| 747 | + } |
|
| 748 | 748 | } |
| 749 | 749 | |
| 750 | 750 | if ($pilot_id != "") |
| 751 | 751 | { |
| 752 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 753 | - if (!is_string($pilot_id)) |
|
| 754 | - { |
|
| 752 | + $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 753 | + if (!is_string($pilot_id)) |
|
| 754 | + { |
|
| 755 | 755 | return false; |
| 756 | - } else { |
|
| 756 | + } else { |
|
| 757 | 757 | $additional_query .= " AND (tracker_archive_output.pilot_id = '".$pilot_id."')"; |
| 758 | - } |
|
| 758 | + } |
|
| 759 | 759 | } |
| 760 | 760 | |
| 761 | 761 | if ($departure_airport_route != "") |
| 762 | 762 | { |
| 763 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 764 | - if (!is_string($departure_airport_route)) |
|
| 765 | - { |
|
| 763 | + $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 764 | + if (!is_string($departure_airport_route)) |
|
| 765 | + { |
|
| 766 | 766 | return false; |
| 767 | - } else { |
|
| 767 | + } else { |
|
| 768 | 768 | $additional_query .= " AND (tracker_archive_output.departure_airport_icao = '".$departure_airport_route."')"; |
| 769 | - } |
|
| 769 | + } |
|
| 770 | 770 | } |
| 771 | 771 | |
| 772 | 772 | if ($arrival_airport_route != "") |
| 773 | 773 | { |
| 774 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 775 | - if (!is_string($arrival_airport_route)) |
|
| 776 | - { |
|
| 774 | + $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 775 | + if (!is_string($arrival_airport_route)) |
|
| 776 | + { |
|
| 777 | 777 | return false; |
| 778 | - } else { |
|
| 778 | + } else { |
|
| 779 | 779 | $additional_query .= " AND (tracker_archive_output.arrival_airport_icao = '".$arrival_airport_route."')"; |
| 780 | - } |
|
| 780 | + } |
|
| 781 | 781 | } |
| 782 | 782 | |
| 783 | 783 | if ($altitude != "") |
| 784 | 784 | { |
| 785 | - $altitude_array = explode(",", $altitude); |
|
| 785 | + $altitude_array = explode(",", $altitude); |
|
| 786 | 786 | |
| 787 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 788 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 787 | + $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 788 | + $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 789 | 789 | |
| 790 | 790 | |
| 791 | - if ($altitude_array[1] != "") |
|
| 792 | - { |
|
| 791 | + if ($altitude_array[1] != "") |
|
| 792 | + { |
|
| 793 | 793 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 794 | 794 | $altitude_array[1] = substr($altitude_array[1], 0, -2); |
| 795 | 795 | $additional_query .= " AND altitude BETWEEN '".$altitude_array[0]."' AND '".$altitude_array[1]."' "; |
| 796 | - } else { |
|
| 796 | + } else { |
|
| 797 | 797 | $altitude_array[0] = substr($altitude_array[0], 0, -2); |
| 798 | 798 | $additional_query .= " AND altitude <= '".$altitude_array[0]."' "; |
| 799 | - } |
|
| 799 | + } |
|
| 800 | 800 | } |
| 801 | 801 | |
| 802 | 802 | if ($date_posted != "") |
| 803 | 803 | { |
| 804 | - $date_array = explode(",", $date_posted); |
|
| 804 | + $date_array = explode(",", $date_posted); |
|
| 805 | 805 | |
| 806 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 807 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 806 | + $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 807 | + $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 808 | 808 | |
| 809 | - if ($globalTimezone != '') { |
|
| 809 | + if ($globalTimezone != '') { |
|
| 810 | 810 | date_default_timezone_set($globalTimezone); |
| 811 | 811 | $datetime = new DateTime(); |
| 812 | 812 | $offset = $datetime->format('P'); |
| 813 | - } else $offset = '+00:00'; |
|
| 813 | + } else $offset = '+00:00'; |
|
| 814 | 814 | |
| 815 | 815 | |
| 816 | - if ($date_array[1] != "") |
|
| 817 | - { |
|
| 816 | + if ($date_array[1] != "") |
|
| 817 | + { |
|
| 818 | 818 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 819 | 819 | $date_array[1] = date("Y-m-d H:i:s", strtotime($date_array[1])); |
| 820 | 820 | if ($globalDBdriver == 'mysql') { |
@@ -822,28 +822,28 @@ discard block |
||
| 822 | 822 | } else { |
| 823 | 823 | $additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." <= CAST('".$date_array[1]."' AS TIMESTAMP) "; |
| 824 | 824 | } |
| 825 | - } else { |
|
| 825 | + } else { |
|
| 826 | 826 | $date_array[0] = date("Y-m-d H:i:s", strtotime($date_array[0])); |
| 827 | - if ($globalDBdriver == 'mysql') { |
|
| 827 | + if ($globalDBdriver == 'mysql') { |
|
| 828 | 828 | $additional_query .= " AND TIMESTAMP(CONVERT_TZ(tracker_archive_output.date,'+00:00', '".$offset."')) >= '".$date_array[0]."' "; |
| 829 | 829 | } else { |
| 830 | 830 | $additional_query .= " AND tracker_archive_output.date::timestamp AT TIME ZONE INTERVAL ".$offset." >= CAST('".$date_array[0]."' AS TIMESTAMP) "; |
| 831 | 831 | } |
| 832 | - } |
|
| 832 | + } |
|
| 833 | 833 | } |
| 834 | 834 | |
| 835 | 835 | if ($limit != "") |
| 836 | 836 | { |
| 837 | - $limit_array = explode(",", $limit); |
|
| 837 | + $limit_array = explode(",", $limit); |
|
| 838 | 838 | |
| 839 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 840 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 839 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 840 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 841 | 841 | |
| 842 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 843 | - { |
|
| 842 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 843 | + { |
|
| 844 | 844 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 845 | 845 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 846 | - } |
|
| 846 | + } |
|
| 847 | 847 | } |
| 848 | 848 | |
| 849 | 849 | |
@@ -874,33 +874,33 @@ discard block |
||
| 874 | 874 | $spotter_array = $Tracker->getDataFromDB($query, $query_values,$limit_query); |
| 875 | 875 | |
| 876 | 876 | return $spotter_array; |
| 877 | - } |
|
| 877 | + } |
|
| 878 | 878 | |
| 879 | - public function deleteTrackerArchiveData() |
|
| 880 | - { |
|
| 879 | + public function deleteTrackerArchiveData() |
|
| 880 | + { |
|
| 881 | 881 | global $globalArchiveKeepMonths, $globalDBdriver; |
| 882 | - date_default_timezone_set('UTC'); |
|
| 883 | - if ($globalDBdriver == 'mysql') { |
|
| 882 | + date_default_timezone_set('UTC'); |
|
| 883 | + if ($globalDBdriver == 'mysql') { |
|
| 884 | 884 | $query = 'DELETE FROM tracker_archive_output WHERE tracker_archive_output.date < DATE_SUB(UTC_TIMESTAMP(), INTERVAL '.$globalArchiveKeepMonths.' MONTH)'; |
| 885 | 885 | } else { |
| 886 | 886 | $query = "DELETE FROM tracker_archive_output WHERE tracker_archive_output.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalArchiveKeepMonths." MONTH'"; |
| 887 | 887 | } |
| 888 | - try { |
|
| 889 | - $sth = $this->db->prepare($query); |
|
| 890 | - $sth->execute(); |
|
| 891 | - } catch(PDOException $e) { |
|
| 892 | - return "error"; |
|
| 893 | - } |
|
| 888 | + try { |
|
| 889 | + $sth = $this->db->prepare($query); |
|
| 890 | + $sth->execute(); |
|
| 891 | + } catch(PDOException $e) { |
|
| 892 | + return "error"; |
|
| 893 | + } |
|
| 894 | 894 | } |
| 895 | 895 | |
| 896 | - /** |
|
| 897 | - * Gets all the spotter information based on the callsign |
|
| 898 | - * |
|
| 899 | - * @return Array the spotter information |
|
| 900 | - * |
|
| 901 | - */ |
|
| 902 | - public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 903 | - { |
|
| 896 | + /** |
|
| 897 | + * Gets all the spotter information based on the callsign |
|
| 898 | + * |
|
| 899 | + * @return Array the spotter information |
|
| 900 | + * |
|
| 901 | + */ |
|
| 902 | + public function getTrackerDataByIdent($ident = '', $limit = '', $sort = '') |
|
| 903 | + { |
|
| 904 | 904 | $global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output"; |
| 905 | 905 | |
| 906 | 906 | date_default_timezone_set('UTC'); |
@@ -912,35 +912,35 @@ discard block |
||
| 912 | 912 | |
| 913 | 913 | if ($ident != "") |
| 914 | 914 | { |
| 915 | - if (!is_string($ident)) |
|
| 916 | - { |
|
| 915 | + if (!is_string($ident)) |
|
| 916 | + { |
|
| 917 | 917 | return false; |
| 918 | - } else { |
|
| 918 | + } else { |
|
| 919 | 919 | $additional_query = " AND (tracker_archive_output.ident = :ident)"; |
| 920 | 920 | $query_values = array(':ident' => $ident); |
| 921 | - } |
|
| 921 | + } |
|
| 922 | 922 | } |
| 923 | 923 | |
| 924 | 924 | if ($limit != "") |
| 925 | 925 | { |
| 926 | - $limit_array = explode(",", $limit); |
|
| 926 | + $limit_array = explode(",", $limit); |
|
| 927 | 927 | |
| 928 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 929 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 928 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 929 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 930 | 930 | |
| 931 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 932 | - { |
|
| 931 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 932 | + { |
|
| 933 | 933 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 934 | 934 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 935 | - } |
|
| 935 | + } |
|
| 936 | 936 | } |
| 937 | 937 | |
| 938 | 938 | if ($sort != "") |
| 939 | 939 | { |
| 940 | - $search_orderby_array = $Tracker->getOrderBy(); |
|
| 941 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 940 | + $search_orderby_array = $Tracker->getOrderBy(); |
|
| 941 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 942 | 942 | } else { |
| 943 | - $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 943 | + $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 944 | 944 | } |
| 945 | 945 | |
| 946 | 946 | $query = $global_query." WHERE tracker_archive_output.ident <> '' ".$additional_query." ".$orderby_query; |
@@ -948,17 +948,17 @@ discard block |
||
| 948 | 948 | $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
| 949 | 949 | |
| 950 | 950 | return $spotter_array; |
| 951 | - } |
|
| 951 | + } |
|
| 952 | 952 | |
| 953 | 953 | |
| 954 | - /** |
|
| 955 | - * Gets all the spotter information based on the owner |
|
| 956 | - * |
|
| 957 | - * @return Array the spotter information |
|
| 958 | - * |
|
| 959 | - */ |
|
| 960 | - public function getTrackerDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 961 | - { |
|
| 954 | + /** |
|
| 955 | + * Gets all the spotter information based on the owner |
|
| 956 | + * |
|
| 957 | + * @return Array the spotter information |
|
| 958 | + * |
|
| 959 | + */ |
|
| 960 | + public function getTrackerDataByOwner($owner = '', $limit = '', $sort = '', $filter = array()) |
|
| 961 | + { |
|
| 962 | 962 | $global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output"; |
| 963 | 963 | |
| 964 | 964 | date_default_timezone_set('UTC'); |
@@ -971,35 +971,35 @@ discard block |
||
| 971 | 971 | |
| 972 | 972 | if ($owner != "") |
| 973 | 973 | { |
| 974 | - if (!is_string($owner)) |
|
| 975 | - { |
|
| 974 | + if (!is_string($owner)) |
|
| 975 | + { |
|
| 976 | 976 | return false; |
| 977 | - } else { |
|
| 977 | + } else { |
|
| 978 | 978 | $additional_query = " AND (tracker_archive_output.owner_name = :owner)"; |
| 979 | 979 | $query_values = array(':owner' => $owner); |
| 980 | - } |
|
| 980 | + } |
|
| 981 | 981 | } |
| 982 | 982 | |
| 983 | 983 | if ($limit != "") |
| 984 | 984 | { |
| 985 | - $limit_array = explode(",", $limit); |
|
| 985 | + $limit_array = explode(",", $limit); |
|
| 986 | 986 | |
| 987 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 988 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 987 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 988 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 989 | 989 | |
| 990 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 991 | - { |
|
| 990 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 991 | + { |
|
| 992 | 992 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 993 | 993 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 994 | - } |
|
| 994 | + } |
|
| 995 | 995 | } |
| 996 | 996 | |
| 997 | 997 | if ($sort != "") |
| 998 | 998 | { |
| 999 | - $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1000 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 999 | + $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1000 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1001 | 1001 | } else { |
| 1002 | - $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1002 | + $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1003 | 1003 | } |
| 1004 | 1004 | |
| 1005 | 1005 | $query = $global_query.$filter_query." tracker_archive_output.owner_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1007,16 +1007,16 @@ discard block |
||
| 1007 | 1007 | $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
| 1008 | 1008 | |
| 1009 | 1009 | return $spotter_array; |
| 1010 | - } |
|
| 1011 | - |
|
| 1012 | - /** |
|
| 1013 | - * Gets all the spotter information based on the pilot |
|
| 1014 | - * |
|
| 1015 | - * @return Array the spotter information |
|
| 1016 | - * |
|
| 1017 | - */ |
|
| 1018 | - public function getTrackerDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1019 | - { |
|
| 1010 | + } |
|
| 1011 | + |
|
| 1012 | + /** |
|
| 1013 | + * Gets all the spotter information based on the pilot |
|
| 1014 | + * |
|
| 1015 | + * @return Array the spotter information |
|
| 1016 | + * |
|
| 1017 | + */ |
|
| 1018 | + public function getTrackerDataByPilot($pilot = '', $limit = '', $sort = '', $filter = array()) |
|
| 1019 | + { |
|
| 1020 | 1020 | $global_query = "SELECT tracker_archive_output.* FROM tracker_archive_output"; |
| 1021 | 1021 | |
| 1022 | 1022 | date_default_timezone_set('UTC'); |
@@ -1035,24 +1035,24 @@ discard block |
||
| 1035 | 1035 | |
| 1036 | 1036 | if ($limit != "") |
| 1037 | 1037 | { |
| 1038 | - $limit_array = explode(",", $limit); |
|
| 1038 | + $limit_array = explode(",", $limit); |
|
| 1039 | 1039 | |
| 1040 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1041 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1040 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1041 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1042 | 1042 | |
| 1043 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1044 | - { |
|
| 1043 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1044 | + { |
|
| 1045 | 1045 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1046 | 1046 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1047 | - } |
|
| 1047 | + } |
|
| 1048 | 1048 | } |
| 1049 | 1049 | |
| 1050 | 1050 | if ($sort != "") |
| 1051 | 1051 | { |
| 1052 | - $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1053 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1052 | + $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1053 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1054 | 1054 | } else { |
| 1055 | - $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1055 | + $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1056 | 1056 | } |
| 1057 | 1057 | |
| 1058 | 1058 | $query = $global_query.$filter_query." tracker_archive_output.pilot_name <> '' ".$additional_query." ".$orderby_query; |
@@ -1060,16 +1060,16 @@ discard block |
||
| 1060 | 1060 | $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
| 1061 | 1061 | |
| 1062 | 1062 | return $spotter_array; |
| 1063 | - } |
|
| 1064 | - |
|
| 1065 | - /** |
|
| 1066 | - * Gets all number of flight over countries |
|
| 1067 | - * |
|
| 1068 | - * @return Array the airline country list |
|
| 1069 | - * |
|
| 1070 | - */ |
|
| 1071 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1072 | - { |
|
| 1063 | + } |
|
| 1064 | + |
|
| 1065 | + /** |
|
| 1066 | + * Gets all number of flight over countries |
|
| 1067 | + * |
|
| 1068 | + * @return Array the airline country list |
|
| 1069 | + * |
|
| 1070 | + */ |
|
| 1071 | + public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1072 | + { |
|
| 1073 | 1073 | global $globalDBdriver; |
| 1074 | 1074 | /* |
| 1075 | 1075 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1079,14 +1079,14 @@ discard block |
||
| 1079 | 1079 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1080 | 1080 | FROM countries c, tracker_archive s |
| 1081 | 1081 | WHERE c.iso2 = s.over_country "; |
| 1082 | - if ($olderthanmonths > 0) { |
|
| 1083 | - if ($globalDBdriver == 'mysql') { |
|
| 1082 | + if ($olderthanmonths > 0) { |
|
| 1083 | + if ($globalDBdriver == 'mysql') { |
|
| 1084 | 1084 | $query .= 'AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1085 | 1085 | } else { |
| 1086 | 1086 | $query .= "AND date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1087 | 1087 | } |
| 1088 | 1088 | } |
| 1089 | - if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1089 | + if ($sincedate != '') $query .= "AND date > '".$sincedate."' "; |
|
| 1090 | 1090 | $query .= "GROUP BY c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1091 | 1091 | if ($limit) $query .= " LIMIT 0,10"; |
| 1092 | 1092 | |
@@ -1099,23 +1099,23 @@ discard block |
||
| 1099 | 1099 | |
| 1100 | 1100 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1101 | 1101 | { |
| 1102 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1103 | - $temp_array['flight_country'] = $row['name']; |
|
| 1104 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1105 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1106 | - $flight_array[] = $temp_array; |
|
| 1102 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1103 | + $temp_array['flight_country'] = $row['name']; |
|
| 1104 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1105 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1106 | + $flight_array[] = $temp_array; |
|
| 1107 | 1107 | } |
| 1108 | 1108 | return $flight_array; |
| 1109 | - } |
|
| 1110 | - |
|
| 1111 | - /** |
|
| 1112 | - * Gets all number of flight over countries |
|
| 1113 | - * |
|
| 1114 | - * @return Array the airline country list |
|
| 1115 | - * |
|
| 1116 | - */ |
|
| 1117 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1118 | - { |
|
| 1109 | + } |
|
| 1110 | + |
|
| 1111 | + /** |
|
| 1112 | + * Gets all number of flight over countries |
|
| 1113 | + * |
|
| 1114 | + * @return Array the airline country list |
|
| 1115 | + * |
|
| 1116 | + */ |
|
| 1117 | + public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1118 | + { |
|
| 1119 | 1119 | global $globalDBdriver; |
| 1120 | 1120 | /* |
| 1121 | 1121 | $query = "SELECT c.name, c.iso3, c.iso2, count(c.name) as nb |
@@ -1125,14 +1125,14 @@ discard block |
||
| 1125 | 1125 | $query = "SELECT o.airline_icao,c.name, c.iso3, c.iso2, count(c.name) as nb |
| 1126 | 1126 | FROM countries c, tracker_archive s, spotter_output o |
| 1127 | 1127 | WHERE c.iso2 = s.over_country AND o.airline_icao <> '' AND o.famtrackid = s.famtrackid "; |
| 1128 | - if ($olderthanmonths > 0) { |
|
| 1129 | - if ($globalDBdriver == 'mysql') { |
|
| 1128 | + if ($olderthanmonths > 0) { |
|
| 1129 | + if ($globalDBdriver == 'mysql') { |
|
| 1130 | 1130 | $query .= 'AND s.date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH) '; |
| 1131 | 1131 | } else { |
| 1132 | 1132 | $query .= "AND s.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$olderthanmonths." MONTHS'"; |
| 1133 | 1133 | } |
| 1134 | 1134 | } |
| 1135 | - if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1135 | + if ($sincedate != '') $query .= "AND s.date > '".$sincedate."' "; |
|
| 1136 | 1136 | $query .= "GROUP BY o.airline_icao,c.name, c.iso3, c.iso2 ORDER BY nb DESC"; |
| 1137 | 1137 | if ($limit) $query .= " LIMIT 0,10"; |
| 1138 | 1138 | |
@@ -1145,24 +1145,24 @@ discard block |
||
| 1145 | 1145 | |
| 1146 | 1146 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
| 1147 | 1147 | { |
| 1148 | - $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1149 | - $temp_array['flight_count'] = $row['nb']; |
|
| 1150 | - $temp_array['flight_country'] = $row['name']; |
|
| 1151 | - $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1152 | - $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1153 | - $flight_array[] = $temp_array; |
|
| 1148 | + $temp_array['airline_icao'] = $row['airline_icao']; |
|
| 1149 | + $temp_array['flight_count'] = $row['nb']; |
|
| 1150 | + $temp_array['flight_country'] = $row['name']; |
|
| 1151 | + $temp_array['flight_country_iso3'] = $row['iso3']; |
|
| 1152 | + $temp_array['flight_country_iso2'] = $row['iso2']; |
|
| 1153 | + $flight_array[] = $temp_array; |
|
| 1154 | 1154 | } |
| 1155 | 1155 | return $flight_array; |
| 1156 | - } |
|
| 1157 | - |
|
| 1158 | - /** |
|
| 1159 | - * Gets last spotter information based on a particular callsign |
|
| 1160 | - * |
|
| 1161 | - * @return Array the spotter information |
|
| 1162 | - * |
|
| 1163 | - */ |
|
| 1164 | - public function getDateArchiveTrackerDataById($id,$date) |
|
| 1165 | - { |
|
| 1156 | + } |
|
| 1157 | + |
|
| 1158 | + /** |
|
| 1159 | + * Gets last spotter information based on a particular callsign |
|
| 1160 | + * |
|
| 1161 | + * @return Array the spotter information |
|
| 1162 | + * |
|
| 1163 | + */ |
|
| 1164 | + public function getDateArchiveTrackerDataById($id,$date) |
|
| 1165 | + { |
|
| 1166 | 1166 | $Tracker = new Tracker($this->db); |
| 1167 | 1167 | date_default_timezone_set('UTC'); |
| 1168 | 1168 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
@@ -1170,16 +1170,16 @@ discard block |
||
| 1170 | 1170 | $date = date('c',$date); |
| 1171 | 1171 | $spotter_array = $Tracker->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
| 1172 | 1172 | return $spotter_array; |
| 1173 | - } |
|
| 1174 | - |
|
| 1175 | - /** |
|
| 1176 | - * Gets all the spotter information based on a particular callsign |
|
| 1177 | - * |
|
| 1178 | - * @return Array the spotter information |
|
| 1179 | - * |
|
| 1180 | - */ |
|
| 1181 | - public function getDateArchiveTrackerDataByIdent($ident,$date) |
|
| 1182 | - { |
|
| 1173 | + } |
|
| 1174 | + |
|
| 1175 | + /** |
|
| 1176 | + * Gets all the spotter information based on a particular callsign |
|
| 1177 | + * |
|
| 1178 | + * @return Array the spotter information |
|
| 1179 | + * |
|
| 1180 | + */ |
|
| 1181 | + public function getDateArchiveTrackerDataByIdent($ident,$date) |
|
| 1182 | + { |
|
| 1183 | 1183 | $Tracker = new Tracker($this->db); |
| 1184 | 1184 | date_default_timezone_set('UTC'); |
| 1185 | 1185 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
@@ -1187,16 +1187,16 @@ discard block |
||
| 1187 | 1187 | $date = date('c',$date); |
| 1188 | 1188 | $spotter_array = $Tracker->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 1189 | 1189 | return $spotter_array; |
| 1190 | - } |
|
| 1191 | - |
|
| 1192 | - /** |
|
| 1193 | - * Gets all the spotter information based on the airport |
|
| 1194 | - * |
|
| 1195 | - * @return Array the spotter information |
|
| 1196 | - * |
|
| 1197 | - */ |
|
| 1198 | - public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1199 | - { |
|
| 1190 | + } |
|
| 1191 | + |
|
| 1192 | + /** |
|
| 1193 | + * Gets all the spotter information based on the airport |
|
| 1194 | + * |
|
| 1195 | + * @return Array the spotter information |
|
| 1196 | + * |
|
| 1197 | + */ |
|
| 1198 | + public function getTrackerDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1199 | + { |
|
| 1200 | 1200 | global $global_query; |
| 1201 | 1201 | $Tracker = new Tracker($this->db); |
| 1202 | 1202 | date_default_timezone_set('UTC'); |
@@ -1207,35 +1207,35 @@ discard block |
||
| 1207 | 1207 | |
| 1208 | 1208 | if ($airport != "") |
| 1209 | 1209 | { |
| 1210 | - if (!is_string($airport)) |
|
| 1211 | - { |
|
| 1210 | + if (!is_string($airport)) |
|
| 1211 | + { |
|
| 1212 | 1212 | return false; |
| 1213 | - } else { |
|
| 1213 | + } else { |
|
| 1214 | 1214 | $additional_query .= " AND ((tracker_archive_output.departure_airport_icao = :airport) OR (tracker_archive_output.arrival_airport_icao = :airport))"; |
| 1215 | 1215 | $query_values = array(':airport' => $airport); |
| 1216 | - } |
|
| 1216 | + } |
|
| 1217 | 1217 | } |
| 1218 | 1218 | |
| 1219 | 1219 | if ($limit != "") |
| 1220 | 1220 | { |
| 1221 | - $limit_array = explode(",", $limit); |
|
| 1221 | + $limit_array = explode(",", $limit); |
|
| 1222 | 1222 | |
| 1223 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1224 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1223 | + $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1224 | + $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1225 | 1225 | |
| 1226 | - if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1227 | - { |
|
| 1226 | + if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
|
| 1227 | + { |
|
| 1228 | 1228 | //$limit_query = " LIMIT ".$limit_array[0].",".$limit_array[1]; |
| 1229 | 1229 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
| 1230 | - } |
|
| 1230 | + } |
|
| 1231 | 1231 | } |
| 1232 | 1232 | |
| 1233 | 1233 | if ($sort != "") |
| 1234 | 1234 | { |
| 1235 | - $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1236 | - $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1235 | + $search_orderby_array = $Tracker->getOrderBy(); |
|
| 1236 | + $orderby_query = $search_orderby_array[$sort]['sql']; |
|
| 1237 | 1237 | } else { |
| 1238 | - $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1238 | + $orderby_query = " ORDER BY tracker_archive_output.date DESC"; |
|
| 1239 | 1239 | } |
| 1240 | 1240 | |
| 1241 | 1241 | $query = $global_query.$filter_query." tracker_archive_output.ident <> '' ".$additional_query." AND ((tracker_archive_output.departure_airport_icao <> 'NA') AND (tracker_archive_output.arrival_airport_icao <> 'NA')) ".$orderby_query; |
@@ -1243,6 +1243,6 @@ discard block |
||
| 1243 | 1243 | $spotter_array = $Tracker->getDataFromDB($query, $query_values, $limit_query); |
| 1244 | 1244 | |
| 1245 | 1245 | return $spotter_array; |
| 1246 | - } |
|
| 1246 | + } |
|
| 1247 | 1247 | } |
| 1248 | 1248 | ?> |
| 1249 | 1249 | \ No newline at end of file |
