Ysurac /
FlightAirMap
@@ -53,7 +53,9 @@ discard block |
||
| 53 | 53 | $dbc = $this->db; |
| 54 | 54 | $this->all_flights[$id]['schedule_check'] = true; |
| 55 | 55 | if ($globalSchedulesFetch) { |
| 56 | - if ($globalDebug) echo 'Getting schedule info...'."\n"; |
|
| 56 | + if ($globalDebug) { |
|
| 57 | + echo 'Getting schedule info...'."\n"; |
|
| 58 | + } |
|
| 57 | 59 | $Spotter = new Spotter($dbc); |
| 58 | 60 | $Schedule = new Schedule($dbc); |
| 59 | 61 | $Translation = new Translation($dbc); |
@@ -64,7 +66,9 @@ discard block |
||
| 64 | 66 | if ($Schedule->checkSchedule($operator) == 0) { |
| 65 | 67 | $schedule = $Schedule->fetchSchedule($operator); |
| 66 | 68 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 67 | - if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 69 | + if ($globalDebug) { |
|
| 70 | + echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 71 | + } |
|
| 68 | 72 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
| 69 | 73 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
| 70 | 74 | // Should also check if route schedule = route from DB |
@@ -73,7 +77,9 @@ discard block |
||
| 73 | 77 | $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
| 74 | 78 | if (trim($airport_icao) != '') { |
| 75 | 79 | $this->all_flights[$id]['departure_airport'] = $airport_icao; |
| 76 | - if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
|
| 80 | + if ($globalDebug) { |
|
| 81 | + echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
|
| 82 | + } |
|
| 77 | 83 | } |
| 78 | 84 | } |
| 79 | 85 | } |
@@ -82,17 +88,25 @@ discard block |
||
| 82 | 88 | $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
| 83 | 89 | if (trim($airport_icao) != '') { |
| 84 | 90 | $this->all_flights[$id]['arrival_airport'] = $airport_icao; |
| 85 | - if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
|
| 91 | + if ($globalDebug) { |
|
| 92 | + echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
|
| 93 | + } |
|
| 86 | 94 | } |
| 87 | 95 | } |
| 88 | 96 | } |
| 89 | 97 | $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']); |
| 90 | 98 | } |
| 91 | - } else $scheduleexist = true; |
|
| 92 | - } else $scheduleexist = true; |
|
| 99 | + } else { |
|
| 100 | + $scheduleexist = true; |
|
| 101 | + } |
|
| 102 | + } else { |
|
| 103 | + $scheduleexist = true; |
|
| 104 | + } |
|
| 93 | 105 | // close connection, at least one way will work ? |
| 94 | 106 | if ($scheduleexist) { |
| 95 | - if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
|
| 107 | + if ($globalDebug) { |
|
| 108 | + echo "-> get arrival/departure airport info for ".$ident."\n"; |
|
| 109 | + } |
|
| 96 | 110 | $sch = $Schedule->getSchedule($operator); |
| 97 | 111 | $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'])); |
| 98 | 112 | } |
@@ -114,7 +128,9 @@ discard block |
||
| 114 | 128 | |
| 115 | 129 | public function checkAll() { |
| 116 | 130 | global $globalDebug; |
| 117 | - if ($globalDebug) echo "Update last seen flights data...\n"; |
|
| 131 | + if ($globalDebug) { |
|
| 132 | + echo "Update last seen flights data...\n"; |
|
| 133 | + } |
|
| 118 | 134 | foreach ($this->all_flights as $key => $flight) { |
| 119 | 135 | if (isset($this->all_flights[$key]['id'])) { |
| 120 | 136 | //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
@@ -127,24 +143,32 @@ discard block |
||
| 127 | 143 | |
| 128 | 144 | public function arrival($key) { |
| 129 | 145 | global $globalClosestMinDist, $globalDebug; |
| 130 | - if ($globalDebug) echo 'Update arrival...'."\n"; |
|
| 146 | + if ($globalDebug) { |
|
| 147 | + echo 'Update arrival...'."\n"; |
|
| 148 | + } |
|
| 131 | 149 | $Spotter = new Spotter($this->db); |
| 132 | 150 | $airport_icao = ''; |
| 133 | 151 | $airport_time = ''; |
| 134 | - if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 152 | + if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') { |
|
| 153 | + $globalClosestMinDist = 50; |
|
| 154 | + } |
|
| 135 | 155 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 136 | 156 | $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
| 137 | 157 | if (isset($closestAirports[0])) { |
| 138 | 158 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
| 139 | 159 | $airport_icao = $closestAirports[0]['icao']; |
| 140 | 160 | $airport_time = $this->all_flights[$key]['datetime']; |
| 141 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 161 | + if ($globalDebug) { |
|
| 162 | + echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 163 | + } |
|
| 142 | 164 | } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
| 143 | 165 | foreach ($closestAirports as $airport) { |
| 144 | 166 | if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
| 145 | 167 | $airport_icao = $airport['icao']; |
| 146 | 168 | $airport_time = $this->all_flights[$key]['datetime']; |
| 147 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 169 | + if ($globalDebug) { |
|
| 170 | + echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 171 | + } |
|
| 148 | 172 | break; |
| 149 | 173 | } |
| 150 | 174 | } |
@@ -152,14 +176,20 @@ discard block |
||
| 152 | 176 | $airport_icao = $closestAirports[0]['icao']; |
| 153 | 177 | $airport_time = $this->all_flights[$key]['datetime']; |
| 154 | 178 | } else { |
| 155 | - if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 179 | + if ($globalDebug) { |
|
| 180 | + echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 181 | + } |
|
| 156 | 182 | } |
| 157 | 183 | } else { |
| 158 | - if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 184 | + if ($globalDebug) { |
|
| 185 | + echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 186 | + } |
|
| 159 | 187 | } |
| 160 | 188 | |
| 161 | 189 | } else { |
| 162 | - if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 190 | + if ($globalDebug) { |
|
| 191 | + echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 192 | + } |
|
| 163 | 193 | } |
| 164 | 194 | return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
| 165 | 195 | } |
@@ -169,12 +199,16 @@ discard block |
||
| 169 | 199 | public function del() { |
| 170 | 200 | global $globalDebug; |
| 171 | 201 | // Delete old infos |
| 172 | - if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
|
| 202 | + if ($globalDebug) { |
|
| 203 | + echo 'Delete old values and update latest data...'."\n"; |
|
| 204 | + } |
|
| 173 | 205 | foreach ($this->all_flights as $key => $flight) { |
| 174 | 206 | if (isset($flight['lastupdate'])) { |
| 175 | 207 | if ($flight['lastupdate'] < (time()-3000)) { |
| 176 | 208 | if (isset($this->all_flights[$key]['id'])) { |
| 177 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 209 | + if ($globalDebug) { |
|
| 210 | + echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 211 | + } |
|
| 178 | 212 | /* |
| 179 | 213 | $SpotterLive = new SpotterLive(); |
| 180 | 214 | $SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']); |
@@ -184,7 +218,9 @@ discard block |
||
| 184 | 218 | $Spotter = new Spotter($this->db); |
| 185 | 219 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 186 | 220 | $result = $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']); |
| 187 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 221 | + if ($globalDebug && $result != 'success') { |
|
| 222 | + echo '!!! ERROR : '.$result."\n"; |
|
| 223 | + } |
|
| 188 | 224 | } |
| 189 | 225 | // Put in archive |
| 190 | 226 | // $Spotter->db = null; |
@@ -198,8 +234,10 @@ discard block |
||
| 198 | 234 | public function add($line) { |
| 199 | 235 | global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights; |
| 200 | 236 | //if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE; |
| 201 | - if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
|
| 202 | -/* |
|
| 237 | + if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') { |
|
| 238 | + $globalCoordMinChange = '0.02'; |
|
| 239 | + } |
|
| 240 | + /* |
|
| 203 | 241 | $Spotter = new Spotter(); |
| 204 | 242 | $dbc = $Spotter->db; |
| 205 | 243 | $SpotterLive = new SpotterLive($dbc); |
@@ -227,11 +265,15 @@ discard block |
||
| 227 | 265 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
| 228 | 266 | $current_date = date('Y-m-d'); |
| 229 | 267 | $source = $line['source_name']; |
| 230 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 268 | + if ($source == '' || $line['format_source'] == 'aprs') { |
|
| 269 | + $source = $line['format_source']; |
|
| 270 | + } |
|
| 231 | 271 | if (!isset($this->stats[$current_date][$source]['msg'])) { |
| 232 | 272 | $this->stats[$current_date][$source]['msg']['date'] = time(); |
| 233 | 273 | $this->stats[$current_date][$source]['msg']['nb'] = 1; |
| 234 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 274 | + } else { |
|
| 275 | + $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 276 | + } |
|
| 235 | 277 | } |
| 236 | 278 | |
| 237 | 279 | /* |
@@ -247,8 +289,11 @@ discard block |
||
| 247 | 289 | //$this->db = $dbc; |
| 248 | 290 | |
| 249 | 291 | $hex = trim($line['hex']); |
| 250 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 251 | - else $id = trim($line['id']); |
|
| 292 | + if (!isset($line['id'])) { |
|
| 293 | + $id = trim($line['hex']); |
|
| 294 | + } else { |
|
| 295 | + $id = trim($line['id']); |
|
| 296 | + } |
|
| 252 | 297 | |
| 253 | 298 | //print_r($this->all_flights); |
| 254 | 299 | if (!isset($this->all_flights[$id]['hex']) && ctype_xdigit($hex)) { |
@@ -263,13 +308,20 @@ discard block |
||
| 263 | 308 | $Spotter = new Spotter($this->db); |
| 264 | 309 | $aircraft_icao = $Spotter->getAllAircraftType($hex); |
| 265 | 310 | $Spotter->db = null; |
| 266 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 311 | + if ($globalDebugTimeElapsed) { |
|
| 312 | + echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 313 | + } |
|
| 267 | 314 | |
| 268 | 315 | if ($aircraft_icao == '' && isset($line['aircraft_type'])) { |
| 269 | - if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID'; |
|
| 270 | - elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
|
| 271 | - elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
|
| 272 | - elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
|
| 316 | + if ($line['aircraft_type'] == 'PARA_GLIDER') { |
|
| 317 | + $aircraft_icao = 'GLID'; |
|
| 318 | + } elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') { |
|
| 319 | + $aircraft_icao = 'UHEL'; |
|
| 320 | + } elseif ($line['aircraft_type'] == 'TOW_PLANE') { |
|
| 321 | + $aircraft_icao = 'TOWPLANE'; |
|
| 322 | + } elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') { |
|
| 323 | + $aircraft_icao = 'POWAIRC'; |
|
| 324 | + } |
|
| 273 | 325 | } |
| 274 | 326 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
| 275 | 327 | } else if (isset($line['aircraft_name'])) { |
@@ -277,21 +329,36 @@ discard block |
||
| 277 | 329 | $Spotter = new Spotter($this->db); |
| 278 | 330 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 279 | 331 | $Spotter->db = null; |
| 280 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 281 | - else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
|
| 282 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao'])); |
|
| 332 | + if ($aircraft_icao != '') { |
|
| 333 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 334 | + } else { |
|
| 335 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
|
| 336 | + } |
|
| 337 | + } else { |
|
| 338 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $line['aircraft_icao'])); |
|
| 339 | + } |
|
| 283 | 340 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', '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)); |
| 284 | 341 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
| 285 | 342 | if (!isset($line['id'])) { |
| 286 | - if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 287 | -// 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'))); |
|
| 343 | + if (!isset($globalDaemon)) { |
|
| 344 | + $globalDaemon = TRUE; |
|
| 345 | + } |
|
| 346 | + // 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'))); |
|
| 288 | 347 | // 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'))); |
| 289 | - 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')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 348 | + 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')) { |
|
| 349 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 350 | + } |
|
| 290 | 351 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 291 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 352 | + } else { |
|
| 353 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 354 | + } |
|
| 292 | 355 | |
| 293 | - if ($globalDebug) echo "*********** New aircraft hex : ".$hex." ***********\n"; |
|
| 294 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 356 | + if ($globalDebug) { |
|
| 357 | + echo "*********** New aircraft hex : ".$hex." ***********\n"; |
|
| 358 | + } |
|
| 359 | + if ($globalAllFlights !== FALSE) { |
|
| 360 | + $dataFound = true; |
|
| 361 | + } |
|
| 295 | 362 | } |
| 296 | 363 | |
| 297 | 364 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
@@ -299,8 +366,11 @@ discard block |
||
| 299 | 366 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 300 | 367 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 301 | 368 | } else { |
| 302 | - 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"; |
|
| 303 | - 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"; |
|
| 369 | + if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
| 370 | + echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 371 | + } elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
| 372 | + echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 373 | + } |
|
| 304 | 374 | /* |
| 305 | 375 | echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']); |
| 306 | 376 | print_r($this->all_flights[$id]); |
@@ -332,15 +402,25 @@ discard block |
||
| 332 | 402 | $timeelapsed = microtime(true); |
| 333 | 403 | $Spotter = new Spotter($this->db); |
| 334 | 404 | $fromsource = NULL; |
| 335 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 336 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 337 | - elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
| 338 | - elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 339 | - elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 405 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') { |
|
| 406 | + $fromsource = $globalAirlinesSource; |
|
| 407 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') { |
|
| 408 | + $fromsource = 'vatsim'; |
|
| 409 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') { |
|
| 410 | + $fromsource = 'ivao'; |
|
| 411 | + } elseif (isset($globalVATSIM) && $globalVATSIM) { |
|
| 412 | + $fromsource = 'vatsim'; |
|
| 413 | + } elseif (isset($globalIVAO) && $globalIVAO) { |
|
| 414 | + $fromsource = 'ivao'; |
|
| 415 | + } |
|
| 340 | 416 | $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
| 341 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 417 | + if ($globalDebug && $result != 'success') { |
|
| 418 | + echo '!!! ERROR : '.$result."\n"; |
|
| 419 | + } |
|
| 342 | 420 | $Spotter->db = null; |
| 343 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 421 | + if ($globalDebugTimeElapsed) { |
|
| 422 | + echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 423 | + } |
|
| 344 | 424 | } |
| 345 | 425 | |
| 346 | 426 | /* |
@@ -351,7 +431,9 @@ discard block |
||
| 351 | 431 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 352 | 432 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 353 | 433 | */ |
| 354 | - 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'])); |
|
| 434 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 435 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 436 | + } |
|
| 355 | 437 | |
| 356 | 438 | //$putinarchive = true; |
| 357 | 439 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
@@ -368,7 +450,9 @@ discard block |
||
| 368 | 450 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 369 | 451 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 370 | 452 | $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' => '')); |
| 371 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 453 | + if ($globalDebugTimeElapsed) { |
|
| 454 | + echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 455 | + } |
|
| 372 | 456 | |
| 373 | 457 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 374 | 458 | $timeelapsed = microtime(true); |
@@ -381,7 +465,9 @@ discard block |
||
| 381 | 465 | $Translation->db = null; |
| 382 | 466 | } |
| 383 | 467 | $Spotter->db = null; |
| 384 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 468 | + if ($globalDebugTimeElapsed) { |
|
| 469 | + echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 470 | + } |
|
| 385 | 471 | |
| 386 | 472 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 387 | 473 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
@@ -390,9 +476,13 @@ discard block |
||
| 390 | 476 | $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'])); |
| 391 | 477 | } |
| 392 | 478 | } |
| 393 | - if (!isset($globalFork)) $globalFork = TRUE; |
|
| 479 | + if (!isset($globalFork)) { |
|
| 480 | + $globalFork = TRUE; |
|
| 481 | + } |
|
| 394 | 482 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 395 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 483 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) { |
|
| 484 | + $this->get_Schedule($id,trim($line['ident'])); |
|
| 485 | + } |
|
| 396 | 486 | } |
| 397 | 487 | } |
| 398 | 488 | } |
@@ -408,16 +498,23 @@ discard block |
||
| 408 | 498 | // use datetime |
| 409 | 499 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 410 | 500 | $speed = $speed*3.6; |
| 411 | - if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 412 | - if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
|
| 501 | + if ($speed < 1000) { |
|
| 502 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 503 | + } |
|
| 504 | + if ($globalDebug) { |
|
| 505 | + echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
|
| 506 | + } |
|
| 413 | 507 | } |
| 414 | 508 | } |
| 415 | 509 | |
| 416 | 510 | |
| 417 | 511 | |
| 418 | 512 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 419 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 420 | - else unset($timediff); |
|
| 513 | + if (isset($this->all_flights[$id]['time_last_coord'])) { |
|
| 514 | + $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 515 | + } else { |
|
| 516 | + unset($timediff); |
|
| 517 | + } |
|
| 421 | 518 | if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 800 || ($timediff > 10 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
| 422 | 519 | if (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'])) { |
| 423 | 520 | if (!$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'])) { |
@@ -425,21 +522,31 @@ discard block |
||
| 425 | 522 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 426 | 523 | $this->all_flights[$id]['putinarchive'] = true; |
| 427 | 524 | |
| 428 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 525 | + if ($globalDebug) { |
|
| 526 | + echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 527 | + } |
|
| 429 | 528 | $timeelapsed = microtime(true); |
| 430 | 529 | $Spotter = new Spotter($this->db); |
| 431 | 530 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 432 | - if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
| 531 | + if (!empty($all_country)) { |
|
| 532 | + $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
| 533 | + } |
|
| 433 | 534 | $Spotter->db = null; |
| 434 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 535 | + if ($globalDebugTimeElapsed) { |
|
| 536 | + echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 537 | + } |
|
| 435 | 538 | $this->tmd = 0; |
| 436 | - if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
| 539 | + if ($globalDebug) { |
|
| 540 | + echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
| 541 | + } |
|
| 437 | 542 | } |
| 438 | 543 | } |
| 439 | 544 | |
| 440 | 545 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 441 | 546 | //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) { |
| 442 | - if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
| 547 | + if (!isset($this->all_flights[$id]['archive_latitude'])) { |
|
| 548 | + $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
| 549 | + } |
|
| 443 | 550 | 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') { |
| 444 | 551 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 445 | 552 | $dataFound = true; |
@@ -461,9 +568,13 @@ discard block |
||
| 461 | 568 | */ |
| 462 | 569 | } |
| 463 | 570 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 464 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 571 | + if ($line['longitude'] > 180) { |
|
| 572 | + $line['longitude'] = $line['longitude'] - 360; |
|
| 573 | + } |
|
| 465 | 574 | //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) { |
| 466 | - if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
| 575 | + if (!isset($this->all_flights[$id]['archive_longitude'])) { |
|
| 576 | + $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
| 577 | + } |
|
| 467 | 578 | 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') { |
| 468 | 579 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 469 | 580 | $dataFound = true; |
@@ -494,7 +605,9 @@ discard block |
||
| 494 | 605 | } |
| 495 | 606 | } |
| 496 | 607 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 497 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 608 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) { |
|
| 609 | + $dataFound = true; |
|
| 610 | + } |
|
| 498 | 611 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
| 499 | 612 | } |
| 500 | 613 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
@@ -516,11 +629,17 @@ discard block |
||
| 516 | 629 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 517 | 630 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 518 | 631 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 519 | - 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'].'-'.date('YmdGi'))); |
|
| 520 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 521 | - 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'])); |
|
| 632 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) { |
|
| 633 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi'))); |
|
| 634 | + } elseif (isset($line['id'])) { |
|
| 635 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 636 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 637 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 638 | + } |
|
| 639 | + } |
|
| 640 | + if ($line['ground'] != 1) { |
|
| 641 | + $line['ground'] = 0; |
|
| 522 | 642 | } |
| 523 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 524 | 643 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
| 525 | 644 | //$dataFound = true; |
| 526 | 645 | } |
@@ -528,28 +647,40 @@ discard block |
||
| 528 | 647 | 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'])) { |
| 529 | 648 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
| 530 | 649 | $highlight = ''; |
| 531 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 532 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 533 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 650 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
| 651 | + $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 652 | + } |
|
| 653 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
| 654 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 655 | + } |
|
| 656 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
| 657 | + $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 658 | + } |
|
| 534 | 659 | if ($highlight != '') { |
| 535 | 660 | $timeelapsed = microtime(true); |
| 536 | 661 | $Spotter = new Spotter($this->db); |
| 537 | 662 | $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
| 538 | 663 | $Spotter->db = null; |
| 539 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 664 | + if ($globalDebugTimeElapsed) { |
|
| 665 | + echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 666 | + } |
|
| 540 | 667 | |
| 541 | 668 | $this->all_flights[$id]['putinarchive'] = true; |
| 542 | 669 | //$putinarchive = true; |
| 543 | 670 | //$highlight = ''; |
| 544 | 671 | } |
| 545 | 672 | |
| 546 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 673 | + } else { |
|
| 674 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 675 | + } |
|
| 547 | 676 | //$dataFound = true; |
| 548 | 677 | } |
| 549 | 678 | |
| 550 | 679 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 551 | 680 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 552 | - if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 2) $this->all_flights[$id]['putinarchive'] = true; |
|
| 681 | + if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 2) { |
|
| 682 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 683 | + } |
|
| 553 | 684 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
| 554 | 685 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
| 555 | 686 | //$dataFound = true; |
@@ -561,21 +692,30 @@ discard block |
||
| 561 | 692 | } |
| 562 | 693 | |
| 563 | 694 | if (isset($line['heading']) && $line['heading'] != '') { |
| 564 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 2) $this->all_flights[$id]['putinarchive'] = true; |
|
| 695 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 2) { |
|
| 696 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 697 | + } |
|
| 565 | 698 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
| 566 | 699 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
| 567 | 700 | //$dataFound = true; |
| 568 | 701 | } 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']) { |
| 569 | 702 | $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']); |
| 570 | 703 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
| 571 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 2) $this->all_flights[$id]['putinarchive'] = true; |
|
| 572 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 704 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 2) { |
|
| 705 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 706 | + } |
|
| 707 | + if ($globalDebug) { |
|
| 708 | + echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 709 | + } |
|
| 573 | 710 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 574 | 711 | // If not enough messages and ACARS set heading to 0 |
| 575 | 712 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
| 576 | 713 | } |
| 577 | - if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 578 | - elseif (isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 714 | + if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) { |
|
| 715 | + $dataFound = false; |
|
| 716 | + } elseif (isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) { |
|
| 717 | + $dataFound = false; |
|
| 718 | + } |
|
| 579 | 719 | |
| 580 | 720 | // print_r($this->all_flights[$id]); |
| 581 | 721 | //gets the callsign from the last hour |
@@ -590,23 +730,36 @@ discard block |
||
| 590 | 730 | //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
| 591 | 731 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
| 592 | 732 | if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
| 593 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 733 | + if ($globalDebug) { |
|
| 734 | + echo "Check if aircraft is already in DB..."; |
|
| 735 | + } |
|
| 594 | 736 | $timeelapsed = microtime(true); |
| 595 | 737 | $SpotterLive = new SpotterLive($this->db); |
| 596 | 738 | 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')) { |
| 597 | 739 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 598 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 740 | + if ($globalDebugTimeElapsed) { |
|
| 741 | + echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 742 | + } |
|
| 599 | 743 | } elseif (isset($line['id'])) { |
| 600 | 744 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 601 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 745 | + if ($globalDebugTimeElapsed) { |
|
| 746 | + echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 747 | + } |
|
| 602 | 748 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 603 | 749 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 604 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 605 | - } else $recent_ident = ''; |
|
| 750 | + if ($globalDebugTimeElapsed) { |
|
| 751 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 752 | + } |
|
| 753 | + } else { |
|
| 754 | + $recent_ident = ''; |
|
| 755 | + } |
|
| 606 | 756 | $SpotterLive->db=null; |
| 607 | 757 | |
| 608 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 609 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 758 | + if ($globalDebug && $recent_ident == '') { |
|
| 759 | + echo " Not in DB.\n"; |
|
| 760 | + } elseif ($globalDebug && $recent_ident != '') { |
|
| 761 | + echo " Already in DB.\n"; |
|
| 762 | + } |
|
| 610 | 763 | } else { |
| 611 | 764 | $recent_ident = ''; |
| 612 | 765 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
@@ -614,7 +767,9 @@ discard block |
||
| 614 | 767 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 615 | 768 | if($recent_ident == "") |
| 616 | 769 | { |
| 617 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
| 770 | + if ($globalDebug) { |
|
| 771 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
| 772 | + } |
|
| 618 | 773 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 619 | 774 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 620 | 775 | //adds the spotter data for the archive |
@@ -658,26 +813,44 @@ discard block |
||
| 658 | 813 | |
| 659 | 814 | if (!$ignoreImport) { |
| 660 | 815 | $highlight = ''; |
| 661 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 662 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 663 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 664 | - 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'))); |
|
| 816 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
| 817 | + $highlight = 'Squawk 7500 : Hijack'; |
|
| 818 | + } |
|
| 819 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
| 820 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 821 | + } |
|
| 822 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
| 823 | + $highlight = 'Squawk 7700 : Emergency'; |
|
| 824 | + } |
|
| 825 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 826 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 827 | + } |
|
| 665 | 828 | $timeelapsed = microtime(true); |
| 666 | 829 | $Spotter = new Spotter($this->db); |
| 667 | 830 | $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]['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']); |
| 668 | 831 | $Spotter->db = null; |
| 669 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 670 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 832 | + if ($globalDebug && isset($result)) { |
|
| 833 | + echo $result."\n"; |
|
| 834 | + } |
|
| 835 | + if ($globalDebugTimeElapsed) { |
|
| 836 | + echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 837 | + } |
|
| 671 | 838 | |
| 672 | 839 | // Add source stat in DB |
| 673 | 840 | $Stats = new Stats($this->db); |
| 674 | 841 | if (!empty($this->stats)) { |
| 675 | - if ($globalDebug) echo 'Add source stats : '; |
|
| 842 | + if ($globalDebug) { |
|
| 843 | + echo 'Add source stats : '; |
|
| 844 | + } |
|
| 676 | 845 | foreach($this->stats as $date => $data) { |
| 677 | 846 | foreach($data as $source => $sourced) { |
| 678 | 847 | //print_r($sourced); |
| 679 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 680 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 848 | + if (isset($sourced['polar'])) { |
|
| 849 | + echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 850 | + } |
|
| 851 | + if (isset($sourced['hist'])) { |
|
| 852 | + echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 853 | + } |
|
| 681 | 854 | if (isset($sourced['msg'])) { |
| 682 | 855 | if (time() - $sourced['msg']['date'] > 10) { |
| 683 | 856 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
@@ -690,13 +863,17 @@ discard block |
||
| 690 | 863 | unset($this->stats[$date]); |
| 691 | 864 | } |
| 692 | 865 | } |
| 693 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 866 | + if ($globalDebug) { |
|
| 867 | + echo 'Done'."\n"; |
|
| 868 | + } |
|
| 694 | 869 | |
| 695 | 870 | } |
| 696 | 871 | $Stats->db = null; |
| 697 | 872 | |
| 698 | 873 | $this->del(); |
| 699 | - } elseif ($globalDebug) echo 'Ignore data'."\n"; |
|
| 874 | + } elseif ($globalDebug) { |
|
| 875 | + echo 'Ignore data'."\n"; |
|
| 876 | + } |
|
| 700 | 877 | //$ignoreImport = false; |
| 701 | 878 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 702 | 879 | //print_r($this->all_flights[$id]); |
@@ -713,12 +890,16 @@ discard block |
||
| 713 | 890 | */ |
| 714 | 891 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
| 715 | 892 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 716 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 893 | + if ($globalDebug) { |
|
| 894 | + echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 895 | + } |
|
| 717 | 896 | //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 718 | 897 | $SpotterLive = new SpotterLive($this->db); |
| 719 | 898 | $SpotterLive->deleteLiveSpotterData(); |
| 720 | 899 | $SpotterLive->db=null; |
| 721 | - if ($globalDebug) echo " Done\n"; |
|
| 900 | + if ($globalDebug) { |
|
| 901 | + echo " Done\n"; |
|
| 902 | + } |
|
| 722 | 903 | $this->last_delete = time(); |
| 723 | 904 | } |
| 724 | 905 | } else { |
@@ -741,11 +922,17 @@ discard block |
||
| 741 | 922 | //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"; |
| 742 | 923 | if ($globalDebug) { |
| 743 | 924 | if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
| 744 | - 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"; |
|
| 745 | - 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"; |
|
| 925 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
| 926 | + 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"; |
|
| 927 | + } else { |
|
| 928 | + 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"; |
|
| 929 | + } |
|
| 746 | 930 | } else { |
| 747 | - 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"; |
|
| 748 | - 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"; |
|
| 931 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
| 932 | + 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"; |
|
| 933 | + } else { |
|
| 934 | + 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"; |
|
| 935 | + } |
|
| 749 | 936 | } |
| 750 | 937 | } |
| 751 | 938 | $ignoreImport = false; |
@@ -791,19 +978,25 @@ discard block |
||
| 791 | 978 | |
| 792 | 979 | if (!$ignoreImport) { |
| 793 | 980 | 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'])) { |
| 794 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
| 981 | + if ($globalDebug) { |
|
| 982 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
| 983 | + } |
|
| 795 | 984 | $timeelapsed = microtime(true); |
| 796 | 985 | $SpotterLive = new SpotterLive($this->db); |
| 797 | 986 | $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]['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']); |
| 798 | 987 | $SpotterLive->db = null; |
| 799 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 988 | + if ($globalDebugTimeElapsed) { |
|
| 989 | + echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 990 | + } |
|
| 800 | 991 | |
| 801 | 992 | // Put statistics in $this->stats variable |
| 802 | 993 | //if ($line['format_source'] != 'aprs') { |
| 803 | 994 | //if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) { |
| 804 | 995 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 805 | 996 | $source = $this->all_flights[$id]['source_name']; |
| 806 | - if ($source == '') $source = $this->all_flights[$id]['format_source']; |
|
| 997 | + if ($source == '') { |
|
| 998 | + $source = $this->all_flights[$id]['format_source']; |
|
| 999 | + } |
|
| 807 | 1000 | if (!isset($this->source_location[$source])) { |
| 808 | 1001 | $Location = new Source(); |
| 809 | 1002 | $coord = $Location->getLocationInfobySourceName($source); |
@@ -824,7 +1017,9 @@ discard block |
||
| 824 | 1017 | $stats_heading = round($stats_heading/22.5); |
| 825 | 1018 | $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
| 826 | 1019 | $current_date = date('Y-m-d'); |
| 827 | - if ($stats_heading == 16) $stats_heading = 0; |
|
| 1020 | + if ($stats_heading == 16) { |
|
| 1021 | + $stats_heading = 0; |
|
| 1022 | + } |
|
| 828 | 1023 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 829 | 1024 | for ($i=0;$i<=15;$i++) { |
| 830 | 1025 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
@@ -842,7 +1037,9 @@ discard block |
||
| 842 | 1037 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 843 | 1038 | end($this->stats[$current_date][$source]['hist']); |
| 844 | 1039 | $mini = key($this->stats[$current_date][$source]['hist'])+10; |
| 845 | - } else $mini = 0; |
|
| 1040 | + } else { |
|
| 1041 | + $mini = 0; |
|
| 1042 | + } |
|
| 846 | 1043 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 847 | 1044 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 848 | 1045 | } |
@@ -853,20 +1050,30 @@ discard block |
||
| 853 | 1050 | } |
| 854 | 1051 | |
| 855 | 1052 | $this->all_flights[$id]['lastupdate'] = time(); |
| 856 | - if ($this->all_flights[$id]['putinarchive']) $send = true; |
|
| 1053 | + if ($this->all_flights[$id]['putinarchive']) { |
|
| 1054 | + $send = true; |
|
| 1055 | + } |
|
| 857 | 1056 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 858 | - if ($globalDebug) echo $result."\n"; |
|
| 859 | - } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 1057 | + if ($globalDebug) { |
|
| 1058 | + echo $result."\n"; |
|
| 1059 | + } |
|
| 1060 | + } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) { |
|
| 1061 | + echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 1062 | + } |
|
| 860 | 1063 | //$this->del(); |
| 861 | 1064 | |
| 862 | 1065 | |
| 863 | 1066 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 864 | - if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
| 1067 | + if ($globalDebug) { |
|
| 1068 | + echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
| 1069 | + } |
|
| 865 | 1070 | $SpotterLive = new SpotterLive($this->db); |
| 866 | 1071 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 867 | 1072 | $SpotterLive->db = null; |
| 868 | 1073 | //SpotterLive->deleteLiveSpotterData(); |
| 869 | - if ($globalDebug) echo " Done\n"; |
|
| 1074 | + if ($globalDebug) { |
|
| 1075 | + echo " Done\n"; |
|
| 1076 | + } |
|
| 870 | 1077 | $this->last_delete_hourly = time(); |
| 871 | 1078 | } |
| 872 | 1079 | |
@@ -874,7 +1081,9 @@ discard block |
||
| 874 | 1081 | //$ignoreImport = false; |
| 875 | 1082 | } |
| 876 | 1083 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 877 | - if ($send) return $this->all_flights[$id]; |
|
| 1084 | + if ($send) { |
|
| 1085 | + return $this->all_flights[$id]; |
|
| 1086 | + } |
|
| 878 | 1087 | } |
| 879 | 1088 | } |
| 880 | 1089 | } |
@@ -258,7 +258,9 @@ discard block |
||
| 258 | 258 | // Update table countries |
| 259 | 259 | if ($Connection->tableExists('airspace')) { |
| 260 | 260 | $error .= update_db::update_countries(); |
| 261 | - if ($error != '') return $error; |
|
| 261 | + if ($error != '') { |
|
| 262 | + return $error; |
|
| 263 | + } |
|
| 262 | 264 | } |
| 263 | 265 | // Update schema_version to 7 |
| 264 | 266 | $query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'"; |
@@ -314,7 +316,9 @@ discard block |
||
| 314 | 316 | $error = ''; |
| 315 | 317 | // Update table aircraft |
| 316 | 318 | $error .= create_db::import_file('../db/source_location.sql'); |
| 317 | - if ($error != '') return $error; |
|
| 319 | + if ($error != '') { |
|
| 320 | + return $error; |
|
| 321 | + } |
|
| 318 | 322 | // Update schema_version to 6 |
| 319 | 323 | $query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'"; |
| 320 | 324 | try { |
@@ -331,7 +335,9 @@ discard block |
||
| 331 | 335 | $error = ''; |
| 332 | 336 | // Update table aircraft |
| 333 | 337 | $error .= create_db::import_file('../db/notam.sql'); |
| 334 | - if ($error != '') return $error; |
|
| 338 | + if ($error != '') { |
|
| 339 | + return $error; |
|
| 340 | + } |
|
| 335 | 341 | $query = "DELETE FROM config WHERE name = 'last_update_db'; |
| 336 | 342 | INSERT INTO config (name,value) VALUES ('last_update_db',NOW()); |
| 337 | 343 | DELETE FROM config WHERE name = 'last_update_notam_db'; |
@@ -365,7 +371,9 @@ discard block |
||
| 365 | 371 | $error = ''; |
| 366 | 372 | // Update table atc |
| 367 | 373 | $error .= create_db::import_file('../db/atc.sql'); |
| 368 | - if ($error != '') return $error; |
|
| 374 | + if ($error != '') { |
|
| 375 | + return $error; |
|
| 376 | + } |
|
| 369 | 377 | |
| 370 | 378 | $query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'"; |
| 371 | 379 | try { |
@@ -389,13 +397,21 @@ discard block |
||
| 389 | 397 | $error = ''; |
| 390 | 398 | // Add tables |
| 391 | 399 | $error .= create_db::import_file('../db/aircraft_owner.sql'); |
| 392 | - if ($error != '') return $error; |
|
| 400 | + if ($error != '') { |
|
| 401 | + return $error; |
|
| 402 | + } |
|
| 393 | 403 | $error .= create_db::import_file('../db/metar.sql'); |
| 394 | - if ($error != '') return $error; |
|
| 404 | + if ($error != '') { |
|
| 405 | + return $error; |
|
| 406 | + } |
|
| 395 | 407 | $error .= create_db::import_file('../db/taf.sql'); |
| 396 | - if ($error != '') return $error; |
|
| 408 | + if ($error != '') { |
|
| 409 | + return $error; |
|
| 410 | + } |
|
| 397 | 411 | $error .= create_db::import_file('../db/airport.sql'); |
| 398 | - if ($error != '') return $error; |
|
| 412 | + if ($error != '') { |
|
| 413 | + return $error; |
|
| 414 | + } |
|
| 399 | 415 | |
| 400 | 416 | $query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'"; |
| 401 | 417 | try { |
@@ -469,19 +485,33 @@ discard block |
||
| 469 | 485 | $error = ''; |
| 470 | 486 | // Add tables |
| 471 | 487 | $error .= create_db::import_file('../db/stats.sql'); |
| 472 | - if ($error != '') return $error; |
|
| 488 | + if ($error != '') { |
|
| 489 | + return $error; |
|
| 490 | + } |
|
| 473 | 491 | $error .= create_db::import_file('../db/stats_aircraft.sql'); |
| 474 | - if ($error != '') return $error; |
|
| 492 | + if ($error != '') { |
|
| 493 | + return $error; |
|
| 494 | + } |
|
| 475 | 495 | $error .= create_db::import_file('../db/stats_airline.sql'); |
| 476 | - if ($error != '') return $error; |
|
| 496 | + if ($error != '') { |
|
| 497 | + return $error; |
|
| 498 | + } |
|
| 477 | 499 | $error .= create_db::import_file('../db/stats_airport.sql'); |
| 478 | - if ($error != '') return $error; |
|
| 500 | + if ($error != '') { |
|
| 501 | + return $error; |
|
| 502 | + } |
|
| 479 | 503 | $error .= create_db::import_file('../db/stats_owner.sql'); |
| 480 | - if ($error != '') return $error; |
|
| 504 | + if ($error != '') { |
|
| 505 | + return $error; |
|
| 506 | + } |
|
| 481 | 507 | $error .= create_db::import_file('../db/stats_pilot.sql'); |
| 482 | - if ($error != '') return $error; |
|
| 508 | + if ($error != '') { |
|
| 509 | + return $error; |
|
| 510 | + } |
|
| 483 | 511 | $error .= create_db::import_file('../db/spotter_archive_output.sql'); |
| 484 | - if ($error != '') return $error; |
|
| 512 | + if ($error != '') { |
|
| 513 | + return $error; |
|
| 514 | + } |
|
| 485 | 515 | |
| 486 | 516 | $query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'"; |
| 487 | 517 | try { |
@@ -521,7 +551,9 @@ discard block |
||
| 521 | 551 | // Add tables |
| 522 | 552 | if (!$Connection->tableExists('stats_flight')) { |
| 523 | 553 | $error .= create_db::import_file('../db/stats_flight.sql'); |
| 524 | - if ($error != '') return $error; |
|
| 554 | + if ($error != '') { |
|
| 555 | + return $error; |
|
| 556 | + } |
|
| 525 | 557 | } |
| 526 | 558 | $query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'"; |
| 527 | 559 | try { |
@@ -545,7 +577,9 @@ discard block |
||
| 545 | 577 | } catch(PDOException $e) { |
| 546 | 578 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 547 | 579 | } |
| 548 | - if ($error != '') return $error; |
|
| 580 | + if ($error != '') { |
|
| 581 | + return $error; |
|
| 582 | + } |
|
| 549 | 583 | $query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'"; |
| 550 | 584 | try { |
| 551 | 585 | $sth = $Connection->db->prepare($query); |
@@ -566,7 +600,9 @@ discard block |
||
| 566 | 600 | if (!$Connection->tableExists('stats_callsign')) { |
| 567 | 601 | $error .= create_db::import_file('../db/stats_callsign.sql'); |
| 568 | 602 | } |
| 569 | - if ($error != '') return $error; |
|
| 603 | + if ($error != '') { |
|
| 604 | + return $error; |
|
| 605 | + } |
|
| 570 | 606 | $query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'"; |
| 571 | 607 | try { |
| 572 | 608 | $sth = $Connection->db->prepare($query); |
@@ -584,7 +620,9 @@ discard block |
||
| 584 | 620 | if (!$Connection->tableExists('stats_country')) { |
| 585 | 621 | $error .= create_db::import_file('../db/stats_country.sql'); |
| 586 | 622 | } |
| 587 | - if ($error != '') return $error; |
|
| 623 | + if ($error != '') { |
|
| 624 | + return $error; |
|
| 625 | + } |
|
| 588 | 626 | $query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'"; |
| 589 | 627 | try { |
| 590 | 628 | $sth = $Connection->db->prepare($query); |
@@ -607,7 +645,9 @@ discard block |
||
| 607 | 645 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 608 | 646 | } |
| 609 | 647 | } |
| 610 | - if ($error != '') return $error; |
|
| 648 | + if ($error != '') { |
|
| 649 | + return $error; |
|
| 650 | + } |
|
| 611 | 651 | $query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'"; |
| 612 | 652 | try { |
| 613 | 653 | $sth = $Connection->db->prepare($query); |
@@ -623,7 +663,9 @@ discard block |
||
| 623 | 663 | $error = ''; |
| 624 | 664 | // Update airport table |
| 625 | 665 | $error .= create_db::import_file('../db/airport.sql'); |
| 626 | - if ($error != '') return 'Import airport.sql : '.$error; |
|
| 666 | + if ($error != '') { |
|
| 667 | + return 'Import airport.sql : '.$error; |
|
| 668 | + } |
|
| 627 | 669 | // Remove primary key on Spotter_Archive |
| 628 | 670 | $query = "alter table spotter_archive drop spotter_archive_id"; |
| 629 | 671 | try { |
@@ -699,7 +741,9 @@ discard block |
||
| 699 | 741 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 700 | 742 | } |
| 701 | 743 | } |
| 702 | - if ($error != '') return $error; |
|
| 744 | + if ($error != '') { |
|
| 745 | + return $error; |
|
| 746 | + } |
|
| 703 | 747 | $query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'"; |
| 704 | 748 | try { |
| 705 | 749 | $sth = $Connection->db->prepare($query); |
@@ -717,7 +761,9 @@ discard block |
||
| 717 | 761 | // Update airline table |
| 718 | 762 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 719 | 763 | $error .= create_db::import_file('../db/airlines.sql'); |
| 720 | - if ($error != '') return 'Import airlines.sql : '.$error; |
|
| 764 | + if ($error != '') { |
|
| 765 | + return 'Import airlines.sql : '.$error; |
|
| 766 | + } |
|
| 721 | 767 | } |
| 722 | 768 | if (!$Connection->checkColumnName('aircraft_modes','type_flight')) { |
| 723 | 769 | // Add column over_country |
@@ -729,7 +775,9 @@ discard block |
||
| 729 | 775 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 730 | 776 | } |
| 731 | 777 | } |
| 732 | - if ($error != '') return $error; |
|
| 778 | + if ($error != '') { |
|
| 779 | + return $error; |
|
| 780 | + } |
|
| 733 | 781 | /* |
| 734 | 782 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 735 | 783 | // Force update ModeS (this will put type_flight data |
@@ -759,7 +807,9 @@ discard block |
||
| 759 | 807 | } catch(PDOException $e) { |
| 760 | 808 | return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n"; |
| 761 | 809 | } |
| 762 | - if ($error != '') return $error; |
|
| 810 | + if ($error != '') { |
|
| 811 | + return $error; |
|
| 812 | + } |
|
| 763 | 813 | } |
| 764 | 814 | $query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'"; |
| 765 | 815 | try { |
@@ -782,7 +832,9 @@ discard block |
||
| 782 | 832 | } else { |
| 783 | 833 | $error .= create_db::import_file('../db/pgsql/stats_source.sql'); |
| 784 | 834 | } |
| 785 | - if ($error != '') return $error; |
|
| 835 | + if ($error != '') { |
|
| 836 | + return $error; |
|
| 837 | + } |
|
| 786 | 838 | } |
| 787 | 839 | $query = "UPDATE config SET value = '23' WHERE name = 'schema_version'"; |
| 788 | 840 | try { |
@@ -804,12 +856,16 @@ discard block |
||
| 804 | 856 | if ($globalDBdriver == 'mysql') { |
| 805 | 857 | if (!$Connection->tableExists('tle')) { |
| 806 | 858 | $error .= create_db::import_file('../db/tle.sql'); |
| 807 | - if ($error != '') return $error; |
|
| 859 | + if ($error != '') { |
|
| 860 | + return $error; |
|
| 861 | + } |
|
| 808 | 862 | } |
| 809 | 863 | } else { |
| 810 | 864 | if (!$Connection->tableExists('tle')) { |
| 811 | 865 | $error .= create_db::import_file('../db/pgsql/tle.sql'); |
| 812 | - if ($error != '') return $error; |
|
| 866 | + if ($error != '') { |
|
| 867 | + return $error; |
|
| 868 | + } |
|
| 813 | 869 | } |
| 814 | 870 | $query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)"; |
| 815 | 871 | try { |
@@ -849,7 +905,9 @@ discard block |
||
| 849 | 905 | } else { |
| 850 | 906 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 851 | 907 | } |
| 852 | - if ($error != '') return 'Import airlines.sql : '.$error; |
|
| 908 | + if ($error != '') { |
|
| 909 | + return 'Import airlines.sql : '.$error; |
|
| 910 | + } |
|
| 853 | 911 | if (!$Connection->checkColumnName('airlines','forsource')) { |
| 854 | 912 | // Add forsource to airlines |
| 855 | 913 | $query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL"; |
@@ -1332,20 +1390,28 @@ discard block |
||
| 1332 | 1390 | } |
| 1333 | 1391 | if ($globalDBdriver == 'mysql') { |
| 1334 | 1392 | $error .= create_db::import_file('../db/airlines.sql'); |
| 1335 | - if ($error != '') return $error; |
|
| 1393 | + if ($error != '') { |
|
| 1394 | + return $error; |
|
| 1395 | + } |
|
| 1336 | 1396 | } else { |
| 1337 | 1397 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 1338 | - if ($error != '') return $error; |
|
| 1398 | + if ($error != '') { |
|
| 1399 | + return $error; |
|
| 1400 | + } |
|
| 1339 | 1401 | } |
| 1340 | 1402 | if ((isset($globalVATSIM) && $globalVATSIM) || (isset($globalIVAO) && $globalIVAO)) { |
| 1341 | 1403 | include_once(dirname(__FILE__).'/class.update_db.php'); |
| 1342 | 1404 | if (isset($globalVATSIM) && $globalVATSIM) { |
| 1343 | 1405 | $error .= update_db::update_vatsim(); |
| 1344 | - if ($error != '') return $error; |
|
| 1406 | + if ($error != '') { |
|
| 1407 | + return $error; |
|
| 1408 | + } |
|
| 1345 | 1409 | } |
| 1346 | 1410 | if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) { |
| 1347 | 1411 | $error .= update_db::update_IVAO(); |
| 1348 | - if ($error != '') return $error; |
|
| 1412 | + if ($error != '') { |
|
| 1413 | + return $error; |
|
| 1414 | + } |
|
| 1349 | 1415 | } |
| 1350 | 1416 | } |
| 1351 | 1417 | |
@@ -1412,8 +1478,11 @@ discard block |
||
| 1412 | 1478 | $stats = array(); |
| 1413 | 1479 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 1414 | 1480 | $hours = gmdate('H',strtotime($row['last_seen']) - strtotime($row['date'])); |
| 1415 | - if (isset($stats[$hours])) $stats[$hours] = $stats[$hours] + 1; |
|
| 1416 | - else $stats[$hours] = 1; |
|
| 1481 | + if (isset($stats[$hours])) { |
|
| 1482 | + $stats[$hours] = $stats[$hours] + 1; |
|
| 1483 | + } else { |
|
| 1484 | + $stats[$hours] = 1; |
|
| 1485 | + } |
|
| 1417 | 1486 | } |
| 1418 | 1487 | if (!empty($stats)) { |
| 1419 | 1488 | asort($stats); |
@@ -1450,8 +1519,11 @@ discard block |
||
| 1450 | 1519 | $stats = array(); |
| 1451 | 1520 | while($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 1452 | 1521 | $hours = gmdate('H',strtotime($row['last_seen']) - strtotime($row['date'])); |
| 1453 | - if (isset($stats[$hours])) $stats[$hours] = $stats[$hours] + 1; |
|
| 1454 | - else $stats[$hours] = 1; |
|
| 1522 | + if (isset($stats[$hours])) { |
|
| 1523 | + $stats[$hours] = $stats[$hours] + 1; |
|
| 1524 | + } else { |
|
| 1525 | + $stats[$hours] = 1; |
|
| 1526 | + } |
|
| 1455 | 1527 | } |
| 1456 | 1528 | if (!empty($stats)) { |
| 1457 | 1529 | asort($stats); |
@@ -1497,8 +1569,11 @@ discard block |
||
| 1497 | 1569 | if ($Connection->tableExists('aircraft')) { |
| 1498 | 1570 | if (!$Connection->tableExists('config')) { |
| 1499 | 1571 | $version = '1'; |
| 1500 | - if ($update) return self::update_from_1(); |
|
| 1501 | - else return $version; |
|
| 1572 | + if ($update) { |
|
| 1573 | + return self::update_from_1(); |
|
| 1574 | + } else { |
|
| 1575 | + return $version; |
|
| 1576 | + } |
|
| 1502 | 1577 | } else { |
| 1503 | 1578 | $Connection = new Connection(); |
| 1504 | 1579 | $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
@@ -1512,142 +1587,246 @@ discard block |
||
| 1512 | 1587 | if ($update) { |
| 1513 | 1588 | if ($result['value'] == '2') { |
| 1514 | 1589 | $error = self::update_from_2(); |
| 1515 | - if ($error != '') return $error; |
|
| 1516 | - else return self::check_version(true); |
|
| 1590 | + if ($error != '') { |
|
| 1591 | + return $error; |
|
| 1592 | + } else { |
|
| 1593 | + return self::check_version(true); |
|
| 1594 | + } |
|
| 1517 | 1595 | } elseif ($result['value'] == '3') { |
| 1518 | 1596 | $error = self::update_from_3(); |
| 1519 | - if ($error != '') return $error; |
|
| 1520 | - else return self::check_version(true); |
|
| 1597 | + if ($error != '') { |
|
| 1598 | + return $error; |
|
| 1599 | + } else { |
|
| 1600 | + return self::check_version(true); |
|
| 1601 | + } |
|
| 1521 | 1602 | } elseif ($result['value'] == '4') { |
| 1522 | 1603 | $error = self::update_from_4(); |
| 1523 | - if ($error != '') return $error; |
|
| 1524 | - else return self::check_version(true); |
|
| 1604 | + if ($error != '') { |
|
| 1605 | + return $error; |
|
| 1606 | + } else { |
|
| 1607 | + return self::check_version(true); |
|
| 1608 | + } |
|
| 1525 | 1609 | } elseif ($result['value'] == '5') { |
| 1526 | 1610 | $error = self::update_from_5(); |
| 1527 | - if ($error != '') return $error; |
|
| 1528 | - else return self::check_version(true); |
|
| 1611 | + if ($error != '') { |
|
| 1612 | + return $error; |
|
| 1613 | + } else { |
|
| 1614 | + return self::check_version(true); |
|
| 1615 | + } |
|
| 1529 | 1616 | } elseif ($result['value'] == '6') { |
| 1530 | 1617 | $error = self::update_from_6(); |
| 1531 | - if ($error != '') return $error; |
|
| 1532 | - else return self::check_version(true); |
|
| 1618 | + if ($error != '') { |
|
| 1619 | + return $error; |
|
| 1620 | + } else { |
|
| 1621 | + return self::check_version(true); |
|
| 1622 | + } |
|
| 1533 | 1623 | } elseif ($result['value'] == '7') { |
| 1534 | 1624 | $error = self::update_from_7(); |
| 1535 | - if ($error != '') return $error; |
|
| 1536 | - else return self::check_version(true); |
|
| 1625 | + if ($error != '') { |
|
| 1626 | + return $error; |
|
| 1627 | + } else { |
|
| 1628 | + return self::check_version(true); |
|
| 1629 | + } |
|
| 1537 | 1630 | } elseif ($result['value'] == '8') { |
| 1538 | 1631 | $error = self::update_from_8(); |
| 1539 | - if ($error != '') return $error; |
|
| 1540 | - else return self::check_version(true); |
|
| 1632 | + if ($error != '') { |
|
| 1633 | + return $error; |
|
| 1634 | + } else { |
|
| 1635 | + return self::check_version(true); |
|
| 1636 | + } |
|
| 1541 | 1637 | } elseif ($result['value'] == '9') { |
| 1542 | 1638 | $error = self::update_from_9(); |
| 1543 | - if ($error != '') return $error; |
|
| 1544 | - else return self::check_version(true); |
|
| 1639 | + if ($error != '') { |
|
| 1640 | + return $error; |
|
| 1641 | + } else { |
|
| 1642 | + return self::check_version(true); |
|
| 1643 | + } |
|
| 1545 | 1644 | } elseif ($result['value'] == '10') { |
| 1546 | 1645 | $error = self::update_from_10(); |
| 1547 | - if ($error != '') return $error; |
|
| 1548 | - else return self::check_version(true); |
|
| 1646 | + if ($error != '') { |
|
| 1647 | + return $error; |
|
| 1648 | + } else { |
|
| 1649 | + return self::check_version(true); |
|
| 1650 | + } |
|
| 1549 | 1651 | } elseif ($result['value'] == '11') { |
| 1550 | 1652 | $error = self::update_from_11(); |
| 1551 | - if ($error != '') return $error; |
|
| 1552 | - else return self::check_version(true); |
|
| 1653 | + if ($error != '') { |
|
| 1654 | + return $error; |
|
| 1655 | + } else { |
|
| 1656 | + return self::check_version(true); |
|
| 1657 | + } |
|
| 1553 | 1658 | } elseif ($result['value'] == '12') { |
| 1554 | 1659 | $error = self::update_from_12(); |
| 1555 | - if ($error != '') return $error; |
|
| 1556 | - else return self::check_version(true); |
|
| 1660 | + if ($error != '') { |
|
| 1661 | + return $error; |
|
| 1662 | + } else { |
|
| 1663 | + return self::check_version(true); |
|
| 1664 | + } |
|
| 1557 | 1665 | } elseif ($result['value'] == '13') { |
| 1558 | 1666 | $error = self::update_from_13(); |
| 1559 | - if ($error != '') return $error; |
|
| 1560 | - else return self::check_version(true); |
|
| 1667 | + if ($error != '') { |
|
| 1668 | + return $error; |
|
| 1669 | + } else { |
|
| 1670 | + return self::check_version(true); |
|
| 1671 | + } |
|
| 1561 | 1672 | } elseif ($result['value'] == '14') { |
| 1562 | 1673 | $error = self::update_from_14(); |
| 1563 | - if ($error != '') return $error; |
|
| 1564 | - else return self::check_version(true); |
|
| 1674 | + if ($error != '') { |
|
| 1675 | + return $error; |
|
| 1676 | + } else { |
|
| 1677 | + return self::check_version(true); |
|
| 1678 | + } |
|
| 1565 | 1679 | } elseif ($result['value'] == '15') { |
| 1566 | 1680 | $error = self::update_from_15(); |
| 1567 | - if ($error != '') return $error; |
|
| 1568 | - else return self::check_version(true); |
|
| 1681 | + if ($error != '') { |
|
| 1682 | + return $error; |
|
| 1683 | + } else { |
|
| 1684 | + return self::check_version(true); |
|
| 1685 | + } |
|
| 1569 | 1686 | } elseif ($result['value'] == '16') { |
| 1570 | 1687 | $error = self::update_from_16(); |
| 1571 | - if ($error != '') return $error; |
|
| 1572 | - else return self::check_version(true); |
|
| 1688 | + if ($error != '') { |
|
| 1689 | + return $error; |
|
| 1690 | + } else { |
|
| 1691 | + return self::check_version(true); |
|
| 1692 | + } |
|
| 1573 | 1693 | } elseif ($result['value'] == '17') { |
| 1574 | 1694 | $error = self::update_from_17(); |
| 1575 | - if ($error != '') return $error; |
|
| 1576 | - else return self::check_version(true); |
|
| 1695 | + if ($error != '') { |
|
| 1696 | + return $error; |
|
| 1697 | + } else { |
|
| 1698 | + return self::check_version(true); |
|
| 1699 | + } |
|
| 1577 | 1700 | } elseif ($result['value'] == '18') { |
| 1578 | 1701 | $error = self::update_from_18(); |
| 1579 | - if ($error != '') return $error; |
|
| 1580 | - else return self::check_version(true); |
|
| 1702 | + if ($error != '') { |
|
| 1703 | + return $error; |
|
| 1704 | + } else { |
|
| 1705 | + return self::check_version(true); |
|
| 1706 | + } |
|
| 1581 | 1707 | } elseif ($result['value'] == '19') { |
| 1582 | 1708 | $error = self::update_from_19(); |
| 1583 | - if ($error != '') return $error; |
|
| 1584 | - else return self::check_version(true); |
|
| 1709 | + if ($error != '') { |
|
| 1710 | + return $error; |
|
| 1711 | + } else { |
|
| 1712 | + return self::check_version(true); |
|
| 1713 | + } |
|
| 1585 | 1714 | } elseif ($result['value'] == '20') { |
| 1586 | 1715 | $error = self::update_from_20(); |
| 1587 | - if ($error != '') return $error; |
|
| 1588 | - else return self::check_version(true); |
|
| 1716 | + if ($error != '') { |
|
| 1717 | + return $error; |
|
| 1718 | + } else { |
|
| 1719 | + return self::check_version(true); |
|
| 1720 | + } |
|
| 1589 | 1721 | } elseif ($result['value'] == '21') { |
| 1590 | 1722 | $error = self::update_from_21(); |
| 1591 | - if ($error != '') return $error; |
|
| 1592 | - else return self::check_version(true); |
|
| 1723 | + if ($error != '') { |
|
| 1724 | + return $error; |
|
| 1725 | + } else { |
|
| 1726 | + return self::check_version(true); |
|
| 1727 | + } |
|
| 1593 | 1728 | } elseif ($result['value'] == '22') { |
| 1594 | 1729 | $error = self::update_from_22(); |
| 1595 | - if ($error != '') return $error; |
|
| 1596 | - else return self::check_version(true); |
|
| 1730 | + if ($error != '') { |
|
| 1731 | + return $error; |
|
| 1732 | + } else { |
|
| 1733 | + return self::check_version(true); |
|
| 1734 | + } |
|
| 1597 | 1735 | } elseif ($result['value'] == '23') { |
| 1598 | 1736 | $error = self::update_from_23(); |
| 1599 | - if ($error != '') return $error; |
|
| 1600 | - else return self::check_version(true); |
|
| 1737 | + if ($error != '') { |
|
| 1738 | + return $error; |
|
| 1739 | + } else { |
|
| 1740 | + return self::check_version(true); |
|
| 1741 | + } |
|
| 1601 | 1742 | } elseif ($result['value'] == '24') { |
| 1602 | 1743 | $error = self::update_from_24(); |
| 1603 | - if ($error != '') return $error; |
|
| 1604 | - else return self::check_version(true); |
|
| 1744 | + if ($error != '') { |
|
| 1745 | + return $error; |
|
| 1746 | + } else { |
|
| 1747 | + return self::check_version(true); |
|
| 1748 | + } |
|
| 1605 | 1749 | } elseif ($result['value'] == '25') { |
| 1606 | 1750 | $error = self::update_from_25(); |
| 1607 | - if ($error != '') return $error; |
|
| 1608 | - else return self::check_version(true); |
|
| 1751 | + if ($error != '') { |
|
| 1752 | + return $error; |
|
| 1753 | + } else { |
|
| 1754 | + return self::check_version(true); |
|
| 1755 | + } |
|
| 1609 | 1756 | } elseif ($result['value'] == '26') { |
| 1610 | 1757 | $error = self::update_from_26(); |
| 1611 | - if ($error != '') return $error; |
|
| 1612 | - else return self::check_version(true); |
|
| 1758 | + if ($error != '') { |
|
| 1759 | + return $error; |
|
| 1760 | + } else { |
|
| 1761 | + return self::check_version(true); |
|
| 1762 | + } |
|
| 1613 | 1763 | } elseif ($result['value'] == '27') { |
| 1614 | 1764 | $error = self::update_from_27(); |
| 1615 | - if ($error != '') return $error; |
|
| 1616 | - else return self::check_version(true); |
|
| 1765 | + if ($error != '') { |
|
| 1766 | + return $error; |
|
| 1767 | + } else { |
|
| 1768 | + return self::check_version(true); |
|
| 1769 | + } |
|
| 1617 | 1770 | } elseif ($result['value'] == '28') { |
| 1618 | 1771 | $error = self::update_from_28(); |
| 1619 | - if ($error != '') return $error; |
|
| 1620 | - else return self::check_version(true); |
|
| 1772 | + if ($error != '') { |
|
| 1773 | + return $error; |
|
| 1774 | + } else { |
|
| 1775 | + return self::check_version(true); |
|
| 1776 | + } |
|
| 1621 | 1777 | } elseif ($result['value'] == '29') { |
| 1622 | 1778 | $error = self::update_from_29(); |
| 1623 | - if ($error != '') return $error; |
|
| 1624 | - else return self::check_version(true); |
|
| 1779 | + if ($error != '') { |
|
| 1780 | + return $error; |
|
| 1781 | + } else { |
|
| 1782 | + return self::check_version(true); |
|
| 1783 | + } |
|
| 1625 | 1784 | } elseif ($result['value'] == '30') { |
| 1626 | 1785 | $error = self::update_from_30(); |
| 1627 | - if ($error != '') return $error; |
|
| 1628 | - else return self::check_version(true); |
|
| 1786 | + if ($error != '') { |
|
| 1787 | + return $error; |
|
| 1788 | + } else { |
|
| 1789 | + return self::check_version(true); |
|
| 1790 | + } |
|
| 1629 | 1791 | } elseif ($result['value'] == '31') { |
| 1630 | 1792 | $error = self::update_from_31(); |
| 1631 | - if ($error != '') return $error; |
|
| 1632 | - else return self::check_version(true); |
|
| 1793 | + if ($error != '') { |
|
| 1794 | + return $error; |
|
| 1795 | + } else { |
|
| 1796 | + return self::check_version(true); |
|
| 1797 | + } |
|
| 1633 | 1798 | } elseif ($result['value'] == '32') { |
| 1634 | 1799 | $error = self::update_from_32(); |
| 1635 | - if ($error != '') return $error; |
|
| 1636 | - else return self::check_version(true); |
|
| 1800 | + if ($error != '') { |
|
| 1801 | + return $error; |
|
| 1802 | + } else { |
|
| 1803 | + return self::check_version(true); |
|
| 1804 | + } |
|
| 1637 | 1805 | } elseif ($result['value'] == '33') { |
| 1638 | 1806 | $error = self::update_from_33(); |
| 1639 | - if ($error != '') return $error; |
|
| 1640 | - else return self::check_version(true); |
|
| 1807 | + if ($error != '') { |
|
| 1808 | + return $error; |
|
| 1809 | + } else { |
|
| 1810 | + return self::check_version(true); |
|
| 1811 | + } |
|
| 1641 | 1812 | } elseif ($result['value'] == '34') { |
| 1642 | 1813 | $error = self::update_from_34(); |
| 1643 | - if ($error != '') return $error; |
|
| 1644 | - else return self::check_version(true); |
|
| 1645 | - } else return ''; |
|
| 1814 | + if ($error != '') { |
|
| 1815 | + return $error; |
|
| 1816 | + } else { |
|
| 1817 | + return self::check_version(true); |
|
| 1818 | + } |
|
| 1819 | + } else { |
|
| 1820 | + return ''; |
|
| 1821 | + } |
|
| 1822 | + } else { |
|
| 1823 | + return $result['value']; |
|
| 1646 | 1824 | } |
| 1647 | - else return $result['value']; |
|
| 1648 | 1825 | } |
| 1649 | 1826 | |
| 1650 | - } else return $version; |
|
| 1827 | + } else { |
|
| 1828 | + return $version; |
|
| 1829 | + } |
|
| 1651 | 1830 | } |
| 1652 | 1831 | |
| 1653 | 1832 | } |
