Ysurac /
FlightAirMap
@@ -46,6 +46,10 @@ |
||
| 46 | 46 | |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | + /** |
|
| 50 | + * @param string $id |
|
| 51 | + * @param string $ident |
|
| 52 | + */ |
|
| 49 | 53 | public function get_Schedule($id,$ident) { |
| 50 | 54 | global $globalDebug, $globalFork, $globalSchedulesFetch; |
| 51 | 55 | // Get schedule here, so it's done only one time |
@@ -8,20 +8,20 @@ discard block |
||
| 8 | 8 | require_once(dirname(__FILE__).'/class.Stats.php'); |
| 9 | 9 | require_once(dirname(__FILE__).'/class.Source.php'); |
| 10 | 10 | if (isset($globalServerAPRS) && $globalServerAPRS) { |
| 11 | - require_once(dirname(__FILE__).'/class.APRS.php'); |
|
| 11 | + require_once(dirname(__FILE__).'/class.APRS.php'); |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | 14 | class SpotterImport { |
| 15 | - private $all_flights = array(); |
|
| 16 | - private $last_delete_hourly = 0; |
|
| 17 | - private $last_delete = 0; |
|
| 18 | - private $stats = array(); |
|
| 19 | - private $tmd = 0; |
|
| 20 | - private $source_location = array(); |
|
| 21 | - public $db = null; |
|
| 22 | - public $nb = 0; |
|
| 23 | - |
|
| 24 | - public function __construct($dbc = null) { |
|
| 15 | + private $all_flights = array(); |
|
| 16 | + private $last_delete_hourly = 0; |
|
| 17 | + private $last_delete = 0; |
|
| 18 | + private $stats = array(); |
|
| 19 | + private $tmd = 0; |
|
| 20 | + private $source_location = array(); |
|
| 21 | + public $db = null; |
|
| 22 | + public $nb = 0; |
|
| 23 | + |
|
| 24 | + public function __construct($dbc = null) { |
|
| 25 | 25 | global $globalBeta, $globalServerAPRS, $APRSSpotter, $globalNoDB; |
| 26 | 26 | if (!(isset($globalNoDB) && $globalNoDB)) { |
| 27 | 27 | $Connection = new Connection($dbc); |
@@ -33,14 +33,14 @@ discard block |
||
| 33 | 33 | $currentdate = date('Y-m-d'); |
| 34 | 34 | $sourcestat = $Stats->getStatsSource($currentdate); |
| 35 | 35 | if (!empty($sourcestat)) { |
| 36 | - foreach($sourcestat as $srcst) { |
|
| 37 | - $type = $srcst['stats_type']; |
|
| 36 | + foreach($sourcestat as $srcst) { |
|
| 37 | + $type = $srcst['stats_type']; |
|
| 38 | 38 | if ($type == 'polar' || $type == 'hist') { |
| 39 | - $source = $srcst['source_name']; |
|
| 40 | - $data = $srcst['source_data']; |
|
| 41 | - $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 42 | - } |
|
| 43 | - } |
|
| 39 | + $source = $srcst['source_name']; |
|
| 40 | + $data = $srcst['source_data']; |
|
| 41 | + $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 42 | + } |
|
| 43 | + } |
|
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | if (isset($globalServerAPRS) && $globalServerAPRS) { |
@@ -48,9 +48,9 @@ discard block |
||
| 48 | 48 | //$APRSSpotter->connect(); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - } |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - public function get_Schedule($id,$ident) { |
|
| 53 | + public function get_Schedule($id,$ident) { |
|
| 54 | 54 | global $globalDebug, $globalFork, $globalSchedulesFetch; |
| 55 | 55 | // Get schedule here, so it's done only one time |
| 56 | 56 | |
@@ -70,42 +70,42 @@ discard block |
||
| 70 | 70 | $operator = $Spotter->getOperator($ident); |
| 71 | 71 | $scheduleexist = false; |
| 72 | 72 | if ($Schedule->checkSchedule($operator) == 0) { |
| 73 | - $operator = $Translation->checkTranslation($ident); |
|
| 74 | - if ($Schedule->checkSchedule($operator) == 0) { |
|
| 73 | + $operator = $Translation->checkTranslation($ident); |
|
| 74 | + if ($Schedule->checkSchedule($operator) == 0) { |
|
| 75 | 75 | $schedule = $Schedule->fetchSchedule($operator); |
| 76 | 76 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 77 | - if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 78 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 80 | - // Should also check if route schedule = route from DB |
|
| 81 | - if ($schedule['DepartureAirportIATA'] != '') { |
|
| 77 | + if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 78 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 80 | + // Should also check if route schedule = route from DB |
|
| 81 | + if ($schedule['DepartureAirportIATA'] != '') { |
|
| 82 | 82 | if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) { |
| 83 | - $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
|
| 84 | - if (trim($airport_icao) != '') { |
|
| 83 | + $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
|
| 84 | + if (trim($airport_icao) != '') { |
|
| 85 | 85 | $this->all_flights[$id]['departure_airport'] = $airport_icao; |
| 86 | 86 | if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
| 87 | - } |
|
| 87 | + } |
|
| 88 | + } |
|
| 88 | 89 | } |
| 89 | - } |
|
| 90 | - if ($schedule['ArrivalAirportIATA'] != '') { |
|
| 90 | + if ($schedule['ArrivalAirportIATA'] != '') { |
|
| 91 | 91 | if ($this->all_flights[$id]['arrival_airport'] != $Spotter->getAirportIcao($schedule['ArrivalAirportIATA'])) { |
| 92 | - $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
|
| 93 | - if (trim($airport_icao) != '') { |
|
| 92 | + $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
|
| 93 | + if (trim($airport_icao) != '') { |
|
| 94 | 94 | $this->all_flights[$id]['arrival_airport'] = $airport_icao; |
| 95 | 95 | if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
| 96 | - } |
|
| 96 | + } |
|
| 97 | 97 | } |
| 98 | - } |
|
| 99 | - $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']); |
|
| 98 | + } |
|
| 99 | + $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']); |
|
| 100 | 100 | } |
| 101 | - } else $scheduleexist = true; |
|
| 101 | + } else $scheduleexist = true; |
|
| 102 | 102 | } else $scheduleexist = true; |
| 103 | 103 | // close connection, at least one way will work ? |
| 104 | - if ($scheduleexist) { |
|
| 104 | + if ($scheduleexist) { |
|
| 105 | 105 | if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
| 106 | - $sch = $Schedule->getSchedule($operator); |
|
| 106 | + $sch = $Schedule->getSchedule($operator); |
|
| 107 | 107 | $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'])); |
| 108 | - } |
|
| 108 | + } |
|
| 109 | 109 | $Spotter->db = null; |
| 110 | 110 | $Schedule->db = null; |
| 111 | 111 | $Translation->db = null; |
@@ -120,96 +120,96 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | */ |
| 122 | 122 | } |
| 123 | - } |
|
| 123 | + } |
|
| 124 | 124 | |
| 125 | - public function checkAll() { |
|
| 125 | + public function checkAll() { |
|
| 126 | 126 | global $globalDebug, $globalNoImport; |
| 127 | 127 | if ($globalDebug) echo "Update last seen flights data...\n"; |
| 128 | 128 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 129 | - foreach ($this->all_flights as $key => $flight) { |
|
| 129 | + foreach ($this->all_flights as $key => $flight) { |
|
| 130 | 130 | if (isset($this->all_flights[$key]['id'])) { |
| 131 | - //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
|
| 132 | - $Spotter = new Spotter($this->db); |
|
| 133 | - $real_arrival = $this->arrival($key); |
|
| 134 | - if (isset($this->all_flights[$key]['altitude'])) $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']); |
|
| 135 | - } |
|
| 136 | - } |
|
| 131 | + //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
|
| 132 | + $Spotter = new Spotter($this->db); |
|
| 133 | + $real_arrival = $this->arrival($key); |
|
| 134 | + if (isset($this->all_flights[$key]['altitude'])) $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']); |
|
| 135 | + } |
|
| 136 | + } |
|
| 137 | + } |
|
| 137 | 138 | } |
| 138 | - } |
|
| 139 | 139 | |
| 140 | - public function arrival($key) { |
|
| 140 | + public function arrival($key) { |
|
| 141 | 141 | global $globalClosestMinDist, $globalDebug; |
| 142 | 142 | if ($globalDebug) echo 'Update arrival...'."\n"; |
| 143 | 143 | $Spotter = new Spotter($this->db); |
| 144 | - $airport_icao = ''; |
|
| 145 | - $airport_time = ''; |
|
| 146 | - if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 144 | + $airport_icao = ''; |
|
| 145 | + $airport_time = ''; |
|
| 146 | + if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 147 | 147 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 148 | - $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 149 | - if (isset($closestAirports[0])) { |
|
| 150 | - if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
|
| 151 | - $airport_icao = $closestAirports[0]['icao']; |
|
| 152 | - $airport_time = $this->all_flights[$key]['datetime']; |
|
| 153 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 154 | - } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
|
| 155 | - foreach ($closestAirports as $airport) { |
|
| 156 | - if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
|
| 157 | - $airport_icao = $airport['icao']; |
|
| 158 | - $airport_time = $this->all_flights[$key]['datetime']; |
|
| 159 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 160 | - break; |
|
| 161 | - } |
|
| 162 | - } |
|
| 163 | - } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 164 | - $airport_icao = $closestAirports[0]['icao']; |
|
| 165 | - $airport_time = $this->all_flights[$key]['datetime']; |
|
| 166 | - } else { |
|
| 167 | - if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 168 | - } |
|
| 169 | - } else { |
|
| 170 | - if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 171 | - } |
|
| 172 | - |
|
| 173 | - } else { |
|
| 174 | - if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 175 | - } |
|
| 176 | - return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 177 | - } |
|
| 178 | - |
|
| 179 | - |
|
| 180 | - |
|
| 181 | - public function del() { |
|
| 148 | + $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 149 | + if (isset($closestAirports[0])) { |
|
| 150 | + if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
|
| 151 | + $airport_icao = $closestAirports[0]['icao']; |
|
| 152 | + $airport_time = $this->all_flights[$key]['datetime']; |
|
| 153 | + if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 154 | + } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
|
| 155 | + foreach ($closestAirports as $airport) { |
|
| 156 | + if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
|
| 157 | + $airport_icao = $airport['icao']; |
|
| 158 | + $airport_time = $this->all_flights[$key]['datetime']; |
|
| 159 | + if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 160 | + break; |
|
| 161 | + } |
|
| 162 | + } |
|
| 163 | + } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 164 | + $airport_icao = $closestAirports[0]['icao']; |
|
| 165 | + $airport_time = $this->all_flights[$key]['datetime']; |
|
| 166 | + } else { |
|
| 167 | + if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 168 | + } |
|
| 169 | + } else { |
|
| 170 | + if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 171 | + } |
|
| 172 | + |
|
| 173 | + } else { |
|
| 174 | + if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 175 | + } |
|
| 176 | + return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 177 | + } |
|
| 178 | + |
|
| 179 | + |
|
| 180 | + |
|
| 181 | + public function del() { |
|
| 182 | 182 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 183 | 183 | // Delete old infos |
| 184 | 184 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 185 | 185 | foreach ($this->all_flights as $key => $flight) { |
| 186 | - if (isset($flight['lastupdate'])) { |
|
| 187 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 188 | - if (isset($this->all_flights[$key]['id'])) { |
|
| 189 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 186 | + if (isset($flight['lastupdate'])) { |
|
| 187 | + if ($flight['lastupdate'] < (time()-3000)) { |
|
| 188 | + if (isset($this->all_flights[$key]['id'])) { |
|
| 189 | + if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 190 | 190 | /* |
| 191 | 191 | $SpotterLive = new SpotterLive(); |
| 192 | 192 | $SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']); |
| 193 | 193 | $SpotterLive->db = null; |
| 194 | 194 | */ |
| 195 | 195 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 196 | - $real_arrival = $this->arrival($key); |
|
| 197 | - $Spotter = new Spotter($this->db); |
|
| 198 | - if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
|
| 196 | + $real_arrival = $this->arrival($key); |
|
| 197 | + $Spotter = new Spotter($this->db); |
|
| 198 | + if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
|
| 199 | 199 | $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']); |
| 200 | 200 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 201 | - } |
|
| 201 | + } |
|
| 202 | 202 | // Put in archive |
| 203 | 203 | // $Spotter->db = null; |
| 204 | 204 | } |
| 205 | - } |
|
| 206 | - unset($this->all_flights[$key]); |
|
| 207 | - } |
|
| 208 | - } |
|
| 209 | - } |
|
| 210 | - } |
|
| 205 | + } |
|
| 206 | + unset($this->all_flights[$key]); |
|
| 207 | + } |
|
| 208 | + } |
|
| 209 | + } |
|
| 210 | + } |
|
| 211 | 211 | |
| 212 | - public function add($line) { |
|
| 212 | + public function add($line) { |
|
| 213 | 213 | global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB; |
| 214 | 214 | //if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE; |
| 215 | 215 | if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
@@ -234,18 +234,18 @@ discard block |
||
| 234 | 234 | |
| 235 | 235 | // SBS format is CSV format |
| 236 | 236 | if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
| 237 | - //print_r($line); |
|
| 238 | - if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
|
| 237 | + //print_r($line); |
|
| 238 | + if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
|
| 239 | 239 | |
| 240 | 240 | // Increment message number |
| 241 | 241 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
| 242 | - $current_date = date('Y-m-d'); |
|
| 243 | - $source = $line['source_name']; |
|
| 244 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 245 | - if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 246 | - $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 247 | - $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 248 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 242 | + $current_date = date('Y-m-d'); |
|
| 243 | + $source = $line['source_name']; |
|
| 244 | + if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 245 | + if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 246 | + $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 247 | + $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 248 | + } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | /* |
@@ -261,49 +261,49 @@ discard block |
||
| 261 | 261 | //$this->db = $dbc; |
| 262 | 262 | |
| 263 | 263 | //$hex = trim($line['hex']); |
| 264 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 265 | - else $id = trim($line['id']); |
|
| 264 | + if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 265 | + else $id = trim($line['id']); |
|
| 266 | 266 | |
| 267 | 267 | if (!isset($this->all_flights[$id])) { |
| 268 | - $this->all_flights[$id] = array(); |
|
| 269 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 270 | - $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,'source_type' => '')); |
|
| 271 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 272 | - if (!isset($line['id'])) { |
|
| 268 | + $this->all_flights[$id] = array(); |
|
| 269 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 270 | + $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,'source_type' => '')); |
|
| 271 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 272 | + if (!isset($line['id'])) { |
|
| 273 | 273 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 274 | 274 | // 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'))); |
| 275 | 275 | // 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'))); |
| 276 | 276 | 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' => $id.'-'.date('YmdHi'))); |
| 277 | - //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 278 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 279 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 277 | + //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 278 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 279 | + if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 280 | 280 | } |
| 281 | 281 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 282 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 282 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | //print_r($this->all_flights); |
| 286 | 286 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 287 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 288 | - //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 287 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 288 | + //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 289 | 289 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 290 | - //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 291 | - if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') { |
|
| 290 | + //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 291 | + if (!isset($line['aircraft_name']) && (!isset($line['aircraft_icao']) || $line['aircraft_icao'] == '????') && $line['format_source'] != 'whazzup' && $line['format_source'] != 'vatsimtxt' && $line['format_source'] != 'pireps' && $line['format_source'] != 'phpvmacars' && $line['format_source'] != 'vam' && $line['format_source'] != 'flightgearsp' && $line['format_source'] != 'flightgearmp') { |
|
| 292 | 292 | $timeelapsed = microtime(true); |
| 293 | 293 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 294 | - $Spotter = new Spotter($this->db); |
|
| 295 | - if (isset($this->all_flights[$id]['source_type'])) { |
|
| 294 | + $Spotter = new Spotter($this->db); |
|
| 295 | + if (isset($this->all_flights[$id]['source_type'])) { |
|
| 296 | 296 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
| 297 | - } else { |
|
| 297 | + } else { |
|
| 298 | 298 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 299 | - } |
|
| 300 | - $Spotter->db = null; |
|
| 301 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 302 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 299 | + } |
|
| 300 | + $Spotter->db = null; |
|
| 301 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 302 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 303 | 303 | } |
| 304 | - } |
|
| 305 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 306 | - if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 304 | + } |
|
| 305 | + if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 306 | + if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 307 | 307 | } |
| 308 | 308 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 309 | 309 | $icao = $line['aircraft_icao']; |
@@ -333,9 +333,9 @@ discard block |
||
| 333 | 333 | } |
| 334 | 334 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 335 | 335 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 336 | - if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
| 336 | + if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
| 337 | 337 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 338 | - } else { |
|
| 338 | + } else { |
|
| 339 | 339 | 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"; |
| 340 | 340 | 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"; |
| 341 | 341 | /* |
@@ -344,7 +344,7 @@ discard block |
||
| 344 | 344 | print_r($line); |
| 345 | 345 | */ |
| 346 | 346 | return ''; |
| 347 | - } |
|
| 347 | + } |
|
| 348 | 348 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 349 | 349 | if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 350 | 350 | return ''; |
@@ -360,36 +360,36 @@ discard block |
||
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 363 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 363 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 364 | 364 | } |
| 365 | 365 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 366 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 366 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 367 | 367 | } |
| 368 | 368 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 369 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id'])); |
|
| 369 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id'])); |
|
| 370 | 370 | } |
| 371 | 371 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 372 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name'])); |
|
| 372 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name'])); |
|
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) { |
| 376 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 377 | - if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 376 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 377 | + if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 378 | 378 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 379 | - $timeelapsed = microtime(true); |
|
| 380 | - $Spotter = new Spotter($this->db); |
|
| 381 | - $fromsource = NULL; |
|
| 382 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 383 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 384 | - elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
| 385 | - elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 386 | - elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 387 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 388 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 389 | - $Spotter->db = null; |
|
| 390 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 391 | - } |
|
| 392 | - } |
|
| 379 | + $timeelapsed = microtime(true); |
|
| 380 | + $Spotter = new Spotter($this->db); |
|
| 381 | + $fromsource = NULL; |
|
| 382 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 383 | + elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 384 | + elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
| 385 | + elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 386 | + elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 387 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 388 | + if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 389 | + $Spotter->db = null; |
|
| 390 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 391 | + } |
|
| 392 | + } |
|
| 393 | 393 | |
| 394 | 394 | /* |
| 395 | 395 | if (!isset($line['id'])) { |
@@ -399,104 +399,104 @@ discard block |
||
| 399 | 399 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 400 | 400 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 401 | 401 | */ |
| 402 | - 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'])); |
|
| 402 | + 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'])); |
|
| 403 | 403 | |
| 404 | - //$putinarchive = true; |
|
| 405 | - if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
| 404 | + //$putinarchive = true; |
|
| 405 | + if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
| 406 | 406 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
| 407 | - } |
|
| 408 | - if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
| 407 | + } |
|
| 408 | + if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
| 409 | 409 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
| 410 | - } |
|
| 411 | - if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
| 412 | - $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' => '')); |
|
| 413 | - } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
| 410 | + } |
|
| 411 | + if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
| 412 | + $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' => '')); |
|
| 413 | + } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
| 414 | 414 | $timeelapsed = microtime(true); |
| 415 | 415 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 416 | 416 | $Spotter = new Spotter($this->db); |
| 417 | 417 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 418 | 418 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 419 | - $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' => '')); |
|
| 419 | + $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' => '')); |
|
| 420 | 420 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 421 | - } |
|
| 422 | - } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
| 421 | + } |
|
| 422 | + } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
| 423 | 423 | $timeelapsed = microtime(true); |
| 424 | 424 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 425 | - $Spotter = new Spotter($this->db); |
|
| 426 | - $route = $Spotter->getRouteInfo(trim($line['ident'])); |
|
| 427 | - if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) { |
|
| 425 | + $Spotter = new Spotter($this->db); |
|
| 426 | + $route = $Spotter->getRouteInfo(trim($line['ident'])); |
|
| 427 | + if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) { |
|
| 428 | 428 | $Translation = new Translation($this->db); |
| 429 | 429 | $ident = $Translation->checkTranslation(trim($line['ident'])); |
| 430 | 430 | $route = $Spotter->getRouteInfo($ident); |
| 431 | 431 | $Translation->db = null; |
| 432 | - } |
|
| 433 | - $Spotter->db = null; |
|
| 434 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 435 | - } |
|
| 432 | + } |
|
| 433 | + $Spotter->db = null; |
|
| 434 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 435 | + } |
|
| 436 | 436 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 437 | - //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
| 438 | - if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
| 437 | + //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
| 438 | + if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
| 439 | 439 | // $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'])); |
| 440 | - $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'])); |
|
| 441 | - } |
|
| 440 | + $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'])); |
|
| 441 | + } |
|
| 442 | 442 | } |
| 443 | 443 | if (!isset($globalFork)) $globalFork = TRUE; |
| 444 | 444 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 445 | 445 | if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
| 446 | 446 | } |
| 447 | - } |
|
| 447 | + } |
|
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | if (isset($line['speed']) && $line['speed'] != '') { |
| 451 | 451 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 452 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 453 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 454 | - //$dataFound = true; |
|
| 452 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 453 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 454 | + //$dataFound = true; |
|
| 455 | 455 | } else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 456 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 457 | - if ($distance > 1000 && $distance < 10000) { |
|
| 458 | - // use datetime |
|
| 456 | + $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 457 | + if ($distance > 1000 && $distance < 10000) { |
|
| 458 | + // use datetime |
|
| 459 | 459 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 460 | 460 | $speed = $speed*3.6; |
| 461 | 461 | if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
| 462 | 462 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 463 | - } |
|
| 463 | + } |
|
| 464 | 464 | } |
| 465 | 465 | |
| 466 | 466 | |
| 467 | 467 | |
| 468 | - if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 469 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 470 | - else unset($timediff); |
|
| 471 | - if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && 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')))) { |
|
| 468 | + if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
|
| 469 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 470 | + else unset($timediff); |
|
| 471 | + if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && 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')))) { |
|
| 472 | 472 | 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'])) { |
| 473 | - 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'])) { |
|
| 473 | + 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'])) { |
|
| 474 | 474 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 475 | 475 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 476 | 476 | $this->all_flights[$id]['putinarchive'] = true; |
| 477 | 477 | $this->tmd = 0; |
| 478 | 478 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 479 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 480 | - $timeelapsed = microtime(true); |
|
| 481 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 479 | + if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 480 | + $timeelapsed = microtime(true); |
|
| 481 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 482 | 482 | $Spotter = new Spotter($this->db); |
| 483 | 483 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 484 | 484 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
| 485 | 485 | $Spotter->db = null; |
| 486 | 486 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 487 | 487 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 488 | - } |
|
| 488 | + } |
|
| 489 | + } |
|
| 489 | 490 | } |
| 490 | - } |
|
| 491 | 491 | } |
| 492 | 492 | |
| 493 | 493 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 494 | - //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) { |
|
| 494 | + //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) { |
|
| 495 | 495 | if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 496 | 496 | 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') { |
| 497 | - $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
| 498 | - $dataFound = true; |
|
| 499 | - $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 497 | + $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
| 498 | + $dataFound = true; |
|
| 499 | + $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 500 | 500 | } |
| 501 | 501 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 502 | 502 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
@@ -507,20 +507,20 @@ discard block |
||
| 507 | 507 | //$putinarchive = true; |
| 508 | 508 | } |
| 509 | 509 | */ |
| 510 | - /* |
|
| 510 | + /* |
|
| 511 | 511 | } elseif (isset($this->all_flights[$id]['latitude'])) { |
| 512 | 512 | if ($globalDebug) echo '!!! Strange latitude value - diff : '.abs($this->all_flights[$id]['latitude']-$line['latitude']).'- previous lat : '.$this->all_flights[$id]['latitude'].'- new lat : '.$line['latitude']."\n"; |
| 513 | 513 | } |
| 514 | 514 | */ |
| 515 | 515 | } |
| 516 | 516 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 517 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 518 | - //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) { |
|
| 517 | + if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 518 | + //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) { |
|
| 519 | 519 | if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 520 | 520 | 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') { |
| 521 | - $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
| 522 | - $dataFound = true; |
|
| 523 | - $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 521 | + $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
| 522 | + $dataFound = true; |
|
| 523 | + $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 524 | 524 | } |
| 525 | 525 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 526 | 526 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
@@ -538,95 +538,95 @@ discard block |
||
| 538 | 538 | */ |
| 539 | 539 | } |
| 540 | 540 | |
| 541 | - } else if ($globalDebug && $timediff > 30) { |
|
| 541 | + } else if ($globalDebug && $timediff > 30) { |
|
| 542 | 542 | $this->tmd = $this->tmd + 1; |
| 543 | 543 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 544 | 544 | echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
| 545 | 545 | echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
| 546 | 546 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 547 | - } |
|
| 547 | + } |
|
| 548 | 548 | } |
| 549 | 549 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 550 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 551 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 550 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 551 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 552 | 552 | } |
| 553 | 553 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 554 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 555 | - //$dataFound = true; |
|
| 554 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 555 | + //$dataFound = true; |
|
| 556 | 556 | } |
| 557 | 557 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 558 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 558 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 559 | 559 | } |
| 560 | 560 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 561 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 561 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 562 | 562 | } |
| 563 | 563 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 564 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 565 | - //$dataFound = true; |
|
| 564 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 565 | + //$dataFound = true; |
|
| 566 | 566 | } |
| 567 | 567 | if (isset($line['ground']) && $line['ground'] != '') { |
| 568 | - if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
| 568 | + if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
| 569 | 569 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 570 | 570 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 571 | 571 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 572 | 572 | 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'))); |
| 573 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 573 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 574 | 574 | 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'])); |
| 575 | - } |
|
| 576 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 577 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 578 | - //$dataFound = true; |
|
| 575 | + } |
|
| 576 | + if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 577 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 578 | + //$dataFound = true; |
|
| 579 | 579 | } |
| 580 | 580 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 581 | - 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'])) { |
|
| 582 | - if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 583 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 584 | - $highlight = ''; |
|
| 585 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 586 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 587 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 588 | - if ($highlight != '') { |
|
| 581 | + 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'])) { |
|
| 582 | + if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 583 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 584 | + $highlight = ''; |
|
| 585 | + if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 586 | + if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 587 | + if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 588 | + if ($highlight != '') { |
|
| 589 | 589 | $timeelapsed = microtime(true); |
| 590 | 590 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 591 | - $Spotter = new Spotter($this->db); |
|
| 592 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 593 | - $Spotter->db = null; |
|
| 594 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 591 | + $Spotter = new Spotter($this->db); |
|
| 592 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 593 | + $Spotter->db = null; |
|
| 594 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 595 | 595 | } |
| 596 | 596 | //$putinarchive = true; |
| 597 | 597 | //$highlight = ''; |
| 598 | - } |
|
| 598 | + } |
|
| 599 | 599 | |
| 600 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 601 | - //$dataFound = true; |
|
| 600 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 601 | + //$dataFound = true; |
|
| 602 | 602 | } |
| 603 | 603 | |
| 604 | 604 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 605 | - //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 605 | + //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 606 | 606 | if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
| 607 | 607 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
| 608 | 608 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
| 609 | 609 | //$dataFound = true; |
| 610 | - //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 610 | + //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 614 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 614 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 615 | 615 | } |
| 616 | 616 | |
| 617 | 617 | if (isset($line['heading']) && $line['heading'] != '') { |
| 618 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 619 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 620 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 621 | - //$dataFound = true; |
|
| 618 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 619 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 620 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 621 | + //$dataFound = true; |
|
| 622 | 622 | } 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']) { |
| 623 | - $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']); |
|
| 624 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 625 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 626 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 623 | + $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']); |
|
| 624 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 625 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 626 | + if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 627 | 627 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 628 | - // If not enough messages and ACARS set heading to 0 |
|
| 629 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 628 | + // If not enough messages and ACARS set heading to 0 |
|
| 629 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 630 | 630 | } |
| 631 | 631 | if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 632 | 632 | elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
@@ -637,125 +637,125 @@ discard block |
||
| 637 | 637 | //if ($dataFound == true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['ident'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 638 | 638 | //if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 639 | 639 | if ($dataFound === true && isset($this->all_flights[$id]['hex'])) { |
| 640 | - $this->all_flights[$id]['lastupdate'] = time(); |
|
| 641 | - if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
| 642 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 643 | - //print_r($this->all_flights); |
|
| 644 | - //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
| 645 | - //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
| 646 | - if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
|
| 640 | + $this->all_flights[$id]['lastupdate'] = time(); |
|
| 641 | + if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
| 642 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 643 | + //print_r($this->all_flights); |
|
| 644 | + //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
| 645 | + //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
| 646 | + if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
|
| 647 | 647 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 648 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 649 | - $timeelapsed = microtime(true); |
|
| 650 | - $SpotterLive = new SpotterLive($this->db); |
|
| 651 | - 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')) { |
|
| 648 | + if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 649 | + $timeelapsed = microtime(true); |
|
| 650 | + $SpotterLive = new SpotterLive($this->db); |
|
| 651 | + 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')) { |
|
| 652 | 652 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 653 | 653 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 654 | - } elseif (isset($line['id'])) { |
|
| 654 | + } elseif (isset($line['id'])) { |
|
| 655 | 655 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 656 | 656 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 657 | - } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
| 657 | + } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
| 658 | 658 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 659 | 659 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 660 | - } else $recent_ident = ''; |
|
| 661 | - $SpotterLive->db=null; |
|
| 662 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 663 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 660 | + } else $recent_ident = ''; |
|
| 661 | + $SpotterLive->db=null; |
|
| 662 | + if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 663 | + elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 664 | 664 | } else $recent_ident = ''; |
| 665 | - } else { |
|
| 665 | + } else { |
|
| 666 | 666 | $recent_ident = ''; |
| 667 | 667 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
| 668 | - } |
|
| 669 | - //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 670 | - if($recent_ident == "") |
|
| 671 | - { |
|
| 668 | + } |
|
| 669 | + //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 670 | + if($recent_ident == "") |
|
| 671 | + { |
|
| 672 | 672 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 673 | 673 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 674 | 674 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 675 | 675 | //adds the spotter data for the archive |
| 676 | 676 | $ignoreImport = false; |
| 677 | 677 | foreach($globalAirportIgnore as $airportIgnore) { |
| 678 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 678 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 679 | 679 | $ignoreImport = true; |
| 680 | - } |
|
| 680 | + } |
|
| 681 | 681 | } |
| 682 | 682 | if (count($globalAirportAccept) > 0) { |
| 683 | - $ignoreImport = true; |
|
| 684 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 683 | + $ignoreImport = true; |
|
| 684 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 685 | 685 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 686 | - $ignoreImport = false; |
|
| 686 | + $ignoreImport = false; |
|
| 687 | + } |
|
| 687 | 688 | } |
| 688 | - } |
|
| 689 | 689 | } |
| 690 | 690 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 691 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 691 | + foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 692 | 692 | if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
| 693 | - $ignoreImport = true; |
|
| 693 | + $ignoreImport = true; |
|
| 694 | + } |
|
| 694 | 695 | } |
| 695 | - } |
|
| 696 | 696 | } |
| 697 | 697 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 698 | - $ignoreImport = true; |
|
| 699 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 698 | + $ignoreImport = true; |
|
| 699 | + foreach($globalAirlineAccept as $airlineAccept) { |
|
| 700 | 700 | if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
| 701 | - $ignoreImport = false; |
|
| 701 | + $ignoreImport = false; |
|
| 702 | + } |
|
| 702 | 703 | } |
| 703 | - } |
|
| 704 | 704 | } |
| 705 | 705 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 706 | - $ignoreImport = true; |
|
| 707 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 706 | + $ignoreImport = true; |
|
| 707 | + foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 708 | 708 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 709 | - $ignoreImport = false; |
|
| 709 | + $ignoreImport = false; |
|
| 710 | + } |
|
| 710 | 711 | } |
| 711 | - } |
|
| 712 | 712 | } |
| 713 | 713 | |
| 714 | 714 | if (!$ignoreImport) { |
| 715 | - $highlight = ''; |
|
| 716 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 717 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 718 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 719 | - 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'))); |
|
| 720 | - $timeelapsed = microtime(true); |
|
| 721 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 715 | + $highlight = ''; |
|
| 716 | + if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 717 | + if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 718 | + if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 719 | + 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'))); |
|
| 720 | + $timeelapsed = microtime(true); |
|
| 721 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 722 | 722 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 723 | - $Spotter = new Spotter($this->db); |
|
| 724 | - $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
| 725 | - $Spotter->db = null; |
|
| 726 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 723 | + $Spotter = new Spotter($this->db); |
|
| 724 | + $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
| 725 | + $Spotter->db = null; |
|
| 726 | + if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 727 | + } |
|
| 727 | 728 | } |
| 728 | - } |
|
| 729 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 730 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 729 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 730 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 731 | 731 | |
| 732 | - // Add source stat in DB |
|
| 733 | - $Stats = new Stats($this->db); |
|
| 734 | - if (!empty($this->stats)) { |
|
| 732 | + // Add source stat in DB |
|
| 733 | + $Stats = new Stats($this->db); |
|
| 734 | + if (!empty($this->stats)) { |
|
| 735 | 735 | if ($globalDebug) echo 'Add source stats : '; |
| 736 | - foreach($this->stats as $date => $data) { |
|
| 737 | - foreach($data as $source => $sourced) { |
|
| 738 | - //print_r($sourced); |
|
| 739 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 740 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 741 | - if (isset($sourced['msg'])) { |
|
| 742 | - if (time() - $sourced['msg']['date'] > 10) { |
|
| 743 | - $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 744 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 745 | - unset($this->stats[$date][$source]['msg']); |
|
| 746 | - } |
|
| 747 | - } |
|
| 748 | - } |
|
| 749 | - if ($date != date('Y-m-d')) { |
|
| 750 | - unset($this->stats[$date]); |
|
| 751 | - } |
|
| 752 | - } |
|
| 753 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 754 | - |
|
| 755 | - } |
|
| 756 | - $Stats->db = null; |
|
| 757 | - } |
|
| 758 | - $this->del(); |
|
| 736 | + foreach($this->stats as $date => $data) { |
|
| 737 | + foreach($data as $source => $sourced) { |
|
| 738 | + //print_r($sourced); |
|
| 739 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 740 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 741 | + if (isset($sourced['msg'])) { |
|
| 742 | + if (time() - $sourced['msg']['date'] > 10) { |
|
| 743 | + $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 744 | + echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 745 | + unset($this->stats[$date][$source]['msg']); |
|
| 746 | + } |
|
| 747 | + } |
|
| 748 | + } |
|
| 749 | + if ($date != date('Y-m-d')) { |
|
| 750 | + unset($this->stats[$date]); |
|
| 751 | + } |
|
| 752 | + } |
|
| 753 | + if ($globalDebug) echo 'Done'."\n"; |
|
| 754 | + |
|
| 755 | + } |
|
| 756 | + $Stats->db = null; |
|
| 757 | + } |
|
| 758 | + $this->del(); |
|
| 759 | 759 | } elseif ($globalDebug) echo 'Ignore data'."\n"; |
| 760 | 760 | //$ignoreImport = false; |
| 761 | 761 | $this->all_flights[$id]['addedSpotter'] = 1; |
@@ -773,41 +773,41 @@ discard block |
||
| 773 | 773 | */ |
| 774 | 774 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
| 775 | 775 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 776 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 777 | - //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
|
| 778 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 776 | + if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 777 | + //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
|
| 778 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 779 | 779 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 780 | - $SpotterLive = new SpotterLive($this->db); |
|
| 781 | - $SpotterLive->deleteLiveSpotterData(); |
|
| 782 | - $SpotterLive->db=null; |
|
| 780 | + $SpotterLive = new SpotterLive($this->db); |
|
| 781 | + $SpotterLive->deleteLiveSpotterData(); |
|
| 782 | + $SpotterLive->db=null; |
|
| 783 | + } |
|
| 783 | 784 | } |
| 784 | - } |
|
| 785 | - if ($globalDebug) echo " Done\n"; |
|
| 786 | - $this->last_delete = time(); |
|
| 785 | + if ($globalDebug) echo " Done\n"; |
|
| 786 | + $this->last_delete = time(); |
|
| 787 | 787 | } |
| 788 | - } else { |
|
| 788 | + } else { |
|
| 789 | 789 | 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')) { |
| 790 | - $this->all_flights[$id]['id'] = $recent_ident; |
|
| 791 | - $this->all_flights[$id]['addedSpotter'] = 1; |
|
| 790 | + $this->all_flights[$id]['id'] = $recent_ident; |
|
| 791 | + $this->all_flights[$id]['addedSpotter'] = 1; |
|
| 792 | 792 | } |
| 793 | 793 | if (isset($globalDaemon) && !$globalDaemon) { |
| 794 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 794 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 795 | 795 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 796 | - $Spotter = new Spotter($this->db); |
|
| 797 | - $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 798 | - $Spotter->db = null; |
|
| 796 | + $Spotter = new Spotter($this->db); |
|
| 797 | + $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 798 | + $Spotter->db = null; |
|
| 799 | + } |
|
| 799 | 800 | } |
| 800 | - } |
|
| 801 | 801 | } |
| 802 | 802 | |
| 803 | - } |
|
| 803 | + } |
|
| 804 | + } |
|
| 804 | 805 | } |
| 805 | - } |
|
| 806 | - //adds the spotter LIVE data |
|
| 807 | - //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
|
| 808 | - //echo "\nAdd in Live !! \n"; |
|
| 809 | - //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"; |
|
| 810 | - if ($globalDebug) { |
|
| 806 | + //adds the spotter LIVE data |
|
| 807 | + //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
|
| 808 | + //echo "\nAdd in Live !! \n"; |
|
| 809 | + //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"; |
|
| 810 | + if ($globalDebug) { |
|
| 811 | 811 | if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
| 812 | 812 | 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"; |
| 813 | 813 | 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"; |
@@ -815,60 +815,60 @@ discard block |
||
| 815 | 815 | 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"; |
| 816 | 816 | 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"; |
| 817 | 817 | } |
| 818 | - } |
|
| 819 | - $ignoreImport = false; |
|
| 820 | - if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
| 821 | - if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
| 818 | + } |
|
| 819 | + $ignoreImport = false; |
|
| 820 | + if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
| 821 | + if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
| 822 | 822 | |
| 823 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 824 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 825 | - $ignoreImport = true; |
|
| 823 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 824 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 825 | + $ignoreImport = true; |
|
| 826 | 826 | } |
| 827 | - } |
|
| 828 | - if (count($globalAirportAccept) > 0) { |
|
| 829 | - $ignoreImport = true; |
|
| 830 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 831 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 827 | + } |
|
| 828 | + if (count($globalAirportAccept) > 0) { |
|
| 829 | + $ignoreImport = true; |
|
| 830 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 831 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 832 | 832 | $ignoreImport = false; |
| 833 | - } |
|
| 833 | + } |
|
| 834 | + } |
|
| 834 | 835 | } |
| 835 | - } |
|
| 836 | - if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
| 836 | + if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
| 837 | 837 | foreach($globalAirlineIgnore as $airlineIgnore) { |
| 838 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 838 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 839 | 839 | $ignoreImport = true; |
| 840 | - } |
|
| 840 | + } |
|
| 841 | 841 | } |
| 842 | - } |
|
| 843 | - if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
| 842 | + } |
|
| 843 | + if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
| 844 | 844 | $ignoreImport = true; |
| 845 | 845 | foreach($globalAirlineAccept as $airlineAccept) { |
| 846 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 846 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 847 | 847 | $ignoreImport = false; |
| 848 | - } |
|
| 848 | + } |
|
| 849 | + } |
|
| 849 | 850 | } |
| 850 | - } |
|
| 851 | - if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
| 851 | + if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
| 852 | 852 | $ignoreImport = true; |
| 853 | 853 | foreach($globalPilotIdAccept as $pilotIdAccept) { |
| 854 | - if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
| 855 | - $ignoreImport = false; |
|
| 856 | - } |
|
| 854 | + if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
| 855 | + $ignoreImport = false; |
|
| 856 | + } |
|
| 857 | + } |
|
| 857 | 858 | } |
| 858 | - } |
|
| 859 | 859 | |
| 860 | - if (!$ignoreImport) { |
|
| 860 | + if (!$ignoreImport) { |
|
| 861 | 861 | 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'])) { |
| 862 | 862 | 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'))); |
| 863 | 863 | $timeelapsed = microtime(true); |
| 864 | 864 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 865 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 865 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 866 | 866 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 867 | 867 | $SpotterLive = new SpotterLive($this->db); |
| 868 | 868 | $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
| 869 | 869 | $SpotterLive->db = null; |
| 870 | 870 | if ($globalDebug) echo $result."\n"; |
| 871 | - } |
|
| 871 | + } |
|
| 872 | 872 | } |
| 873 | 873 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 874 | 874 | $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
@@ -880,7 +880,7 @@ discard block |
||
| 880 | 880 | //if ($line['format_source'] != 'aprs') { |
| 881 | 881 | //if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) { |
| 882 | 882 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 883 | - if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 883 | + if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 884 | 884 | $source = $this->all_flights[$id]['source_name']; |
| 885 | 885 | if ($source == '') $source = $this->all_flights[$id]['format_source']; |
| 886 | 886 | if (!isset($this->source_location[$source])) { |
@@ -906,7 +906,7 @@ discard block |
||
| 906 | 906 | if ($stats_heading == 16) $stats_heading = 0; |
| 907 | 907 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 908 | 908 | for ($i=0;$i<=15;$i++) { |
| 909 | - $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 909 | + $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 910 | 910 | } |
| 911 | 911 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
| 912 | 912 | } else { |
@@ -919,17 +919,17 @@ discard block |
||
| 919 | 919 | //var_dump($this->stats); |
| 920 | 920 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 921 | 921 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 922 | - end($this->stats[$current_date][$source]['hist']); |
|
| 923 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 922 | + end($this->stats[$current_date][$source]['hist']); |
|
| 923 | + $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 924 | 924 | } else $mini = 0; |
| 925 | 925 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 926 | - $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 926 | + $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 927 | 927 | } |
| 928 | 928 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
| 929 | 929 | } else { |
| 930 | 930 | $this->stats[$current_date][$source]['hist'][$distance] += 1; |
| 931 | 931 | } |
| 932 | - } |
|
| 932 | + } |
|
| 933 | 933 | } |
| 934 | 934 | |
| 935 | 935 | $this->all_flights[$id]['lastupdate'] = time(); |
@@ -939,7 +939,7 @@ discard block |
||
| 939 | 939 | //$this->del(); |
| 940 | 940 | |
| 941 | 941 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 942 | - if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 942 | + if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 943 | 943 | if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
| 944 | 944 | $SpotterLive = new SpotterLive($this->db); |
| 945 | 945 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
@@ -947,19 +947,19 @@ discard block |
||
| 947 | 947 | //SpotterLive->deleteLiveSpotterData(); |
| 948 | 948 | if ($globalDebug) echo " Done\n"; |
| 949 | 949 | $this->last_delete_hourly = time(); |
| 950 | - } else { |
|
| 950 | + } else { |
|
| 951 | 951 | $this->del(); |
| 952 | 952 | $this->last_delete_hourly = time(); |
| 953 | - } |
|
| 953 | + } |
|
| 954 | 954 | } |
| 955 | 955 | |
| 956 | - } |
|
| 957 | - //$ignoreImport = false; |
|
| 956 | + } |
|
| 957 | + //$ignoreImport = false; |
|
| 958 | 958 | } |
| 959 | 959 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 960 | 960 | if ($send) return $this->all_flights[$id]; |
| 961 | - } |
|
| 961 | + } |
|
| 962 | + } |
|
| 962 | 963 | } |
| 963 | - } |
|
| 964 | 964 | } |
| 965 | 965 | ?> |
@@ -33,12 +33,12 @@ discard block |
||
| 33 | 33 | $currentdate = date('Y-m-d'); |
| 34 | 34 | $sourcestat = $Stats->getStatsSource($currentdate); |
| 35 | 35 | if (!empty($sourcestat)) { |
| 36 | - foreach($sourcestat as $srcst) { |
|
| 36 | + foreach ($sourcestat as $srcst) { |
|
| 37 | 37 | $type = $srcst['stats_type']; |
| 38 | 38 | if ($type == 'polar' || $type == 'hist') { |
| 39 | 39 | $source = $srcst['source_name']; |
| 40 | 40 | $data = $srcst['source_data']; |
| 41 | - $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 41 | + $this->stats[$currentdate][$source][$type] = json_decode($data, true); |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - public function get_Schedule($id,$ident) { |
|
| 53 | + public function get_Schedule($id, $ident) { |
|
| 54 | 54 | global $globalDebug, $globalFork, $globalSchedulesFetch; |
| 55 | 55 | // Get schedule here, so it's done only one time |
| 56 | 56 | |
@@ -75,8 +75,8 @@ discard block |
||
| 75 | 75 | $schedule = $Schedule->fetchSchedule($operator); |
| 76 | 76 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 77 | 77 | if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
| 78 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 78 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 80 | 80 | // Should also check if route schedule = route from DB |
| 81 | 81 | if ($schedule['DepartureAirportIATA'] != '') { |
| 82 | 82 | if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) { |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | - $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']); |
|
| 99 | + $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']); |
|
| 100 | 100 | } |
| 101 | 101 | } else $scheduleexist = true; |
| 102 | 102 | } else $scheduleexist = true; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | if ($scheduleexist) { |
| 105 | 105 | if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
| 106 | 106 | $sch = $Schedule->getSchedule($operator); |
| 107 | - $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'])); |
|
| 107 | + $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'])); |
|
| 108 | 108 | } |
| 109 | 109 | $Spotter->db = null; |
| 110 | 110 | $Schedule->db = null; |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
| 132 | 132 | $Spotter = new Spotter($this->db); |
| 133 | 133 | $real_arrival = $this->arrival($key); |
| 134 | - if (isset($this->all_flights[$key]['altitude'])) $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']); |
|
| 134 | + if (isset($this->all_flights[$key]['altitude'])) $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']); |
|
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | } |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | $airport_time = ''; |
| 146 | 146 | if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
| 147 | 147 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 148 | - $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 148 | + $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist); |
|
| 149 | 149 | if (isset($closestAirports[0])) { |
| 150 | 150 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
| 151 | 151 | $airport_icao = $closestAirports[0]['icao']; |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | break; |
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | - } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 163 | + } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) { |
|
| 164 | 164 | $airport_icao = $closestAirports[0]['icao']; |
| 165 | 165 | $airport_time = $this->all_flights[$key]['datetime']; |
| 166 | 166 | } else { |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | } else { |
| 174 | 174 | if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
| 175 | 175 | } |
| 176 | - return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 176 | + return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 185 | 185 | foreach ($this->all_flights as $key => $flight) { |
| 186 | 186 | if (isset($flight['lastupdate'])) { |
| 187 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 187 | + if ($flight['lastupdate'] < (time() - 3000)) { |
|
| 188 | 188 | if (isset($this->all_flights[$key]['id'])) { |
| 189 | 189 | if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
| 190 | 190 | /* |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | $real_arrival = $this->arrival($key); |
| 197 | 197 | $Spotter = new Spotter($this->db); |
| 198 | 198 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 199 | - $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']); |
|
| 199 | + $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']); |
|
| 200 | 200 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 201 | 201 | } |
| 202 | 202 | // Put in archive |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | $send = false; |
| 234 | 234 | |
| 235 | 235 | // SBS format is CSV format |
| 236 | - if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
| 236 | + if (is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
| 237 | 237 | //print_r($line); |
| 238 | 238 | if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
| 239 | 239 | |
@@ -266,25 +266,25 @@ discard block |
||
| 266 | 266 | |
| 267 | 267 | if (!isset($this->all_flights[$id])) { |
| 268 | 268 | $this->all_flights[$id] = array(); |
| 269 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 270 | - $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,'source_type' => '')); |
|
| 271 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 269 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 270 | + $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, 'source_type' => '')); |
|
| 271 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time())); |
|
| 272 | 272 | if (!isset($line['id'])) { |
| 273 | 273 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 274 | 274 | // 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'))); |
| 275 | 275 | // 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'))); |
| 276 | - 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' => $id.'-'.date('YmdHi'))); |
|
| 276 | + 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' => $id.'-'.date('YmdHi'))); |
|
| 277 | 277 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 278 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 278 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 279 | 279 | if ($globalAllFlights !== FALSE) $dataFound = true; |
| 280 | 280 | } |
| 281 | 281 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 282 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 282 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type'])); |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | //print_r($this->all_flights); |
| 286 | 286 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 287 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 287 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex']))); |
|
| 288 | 288 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 289 | 289 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 290 | 290 | //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
@@ -293,13 +293,13 @@ discard block |
||
| 293 | 293 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 294 | 294 | $Spotter = new Spotter($this->db); |
| 295 | 295 | if (isset($this->all_flights[$id]['source_type'])) { |
| 296 | - $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
|
| 296 | + $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']); |
|
| 297 | 297 | } else { |
| 298 | 298 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 299 | 299 | } |
| 300 | 300 | $Spotter->db = null; |
| 301 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 302 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 301 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 302 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 303 | 303 | } |
| 304 | 304 | } |
| 305 | 305 | if ($globalAllFlights !== FALSE) $dataFound = true; |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | $Spotter = new Spotter($this->db); |
| 311 | 311 | if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
| 312 | 312 | $Spotter->db = null; |
| 313 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
|
| 313 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao)); |
|
| 314 | 314 | } |
| 315 | 315 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) { |
| 316 | 316 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | $Spotter = new Spotter($this->db); |
| 319 | 319 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 320 | 320 | $Spotter->db = null; |
| 321 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 321 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
@@ -326,15 +326,15 @@ discard block |
||
| 326 | 326 | elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
| 327 | 327 | elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
| 328 | 328 | elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
| 329 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 329 | + if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 330 | 330 | } |
| 331 | 331 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
| 332 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
|
| 332 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA')); |
|
| 333 | 333 | } |
| 334 | 334 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 335 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 335 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 336 | 336 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 337 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
|
| 337 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime'])); |
|
| 338 | 338 | } else { |
| 339 | 339 | 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"; |
| 340 | 340 | 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"; |
@@ -345,35 +345,35 @@ discard block |
||
| 345 | 345 | */ |
| 346 | 346 | return ''; |
| 347 | 347 | } |
| 348 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 348 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 349 | 349 | if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 350 | 350 | return ''; |
| 351 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 351 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 352 | 352 | if ($globalDebug) echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 353 | 353 | return ''; |
| 354 | 354 | } elseif (!isset($line['datetime'])) { |
| 355 | 355 | date_default_timezone_set('UTC'); |
| 356 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 356 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 357 | 357 | } else { |
| 358 | 358 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 359 | 359 | return ''; |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 363 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 363 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration'])); |
|
| 364 | 364 | } |
| 365 | 365 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 366 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 366 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints'])); |
|
| 367 | 367 | } |
| 368 | 368 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 369 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id'])); |
|
| 369 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => $line['pilot_id'])); |
|
| 370 | 370 | } |
| 371 | 371 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 372 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name'])); |
|
| 372 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => $line['pilot_name'])); |
|
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) { |
| 376 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 376 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
| 377 | 377 | if ($this->all_flights[$id]['addedSpotter'] == 1) { |
| 378 | 378 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 379 | 379 | $timeelapsed = microtime(true); |
@@ -384,10 +384,10 @@ discard block |
||
| 384 | 384 | elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
| 385 | 385 | elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
| 386 | 386 | elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
| 387 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 387 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource); |
|
| 388 | 388 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 389 | 389 | $Spotter->db = null; |
| 390 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 390 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 391 | 391 | } |
| 392 | 392 | } |
| 393 | 393 | |
@@ -399,25 +399,25 @@ discard block |
||
| 399 | 399 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 400 | 400 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 401 | 401 | */ |
| 402 | - 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'])); |
|
| 402 | + 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'])); |
|
| 403 | 403 | |
| 404 | 404 | //$putinarchive = true; |
| 405 | 405 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
| 406 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 406 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 407 | 407 | } |
| 408 | 408 | if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
| 409 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 409 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 410 | 410 | } |
| 411 | 411 | if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
| 412 | - $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' => '')); |
|
| 412 | + $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' => '')); |
|
| 413 | 413 | } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
| 414 | 414 | $timeelapsed = microtime(true); |
| 415 | 415 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 416 | 416 | $Spotter = new Spotter($this->db); |
| 417 | 417 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 418 | 418 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 419 | - $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' => '')); |
|
| 420 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 419 | + $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' => '')); |
|
| 420 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 421 | 421 | } |
| 422 | 422 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 423 | 423 | $timeelapsed = microtime(true); |
@@ -431,34 +431,34 @@ discard block |
||
| 431 | 431 | $Translation->db = null; |
| 432 | 432 | } |
| 433 | 433 | $Spotter->db = null; |
| 434 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 434 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 435 | 435 | } |
| 436 | 436 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 437 | 437 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
| 438 | 438 | if ($route['fromairport_icao'] != $route['toairport_icao']) { |
| 439 | 439 | // $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'])); |
| 440 | - $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'])); |
|
| 440 | + $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'])); |
|
| 441 | 441 | } |
| 442 | 442 | } |
| 443 | 443 | if (!isset($globalFork)) $globalFork = TRUE; |
| 444 | 444 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 445 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 445 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident'])); |
|
| 446 | 446 | } |
| 447 | 447 | } |
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | if (isset($line['speed']) && $line['speed'] != '') { |
| 451 | 451 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 452 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 453 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 452 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed']))); |
|
| 453 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true)); |
|
| 454 | 454 | //$dataFound = true; |
| 455 | 455 | } else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 456 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 456 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'); |
|
| 457 | 457 | if ($distance > 1000 && $distance < 10000) { |
| 458 | 458 | // use datetime |
| 459 | 459 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 460 | 460 | $speed = $speed*3.6; |
| 461 | - if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 461 | + if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed))); |
|
| 462 | 462 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 463 | 463 | } |
| 464 | 464 | } |
@@ -466,11 +466,11 @@ discard block |
||
| 466 | 466 | |
| 467 | 467 | |
| 468 | 468 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 469 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 469 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']); |
|
| 470 | 470 | else unset($timediff); |
| 471 | - if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && 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')))) { |
|
| 471 | + if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && 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')))) { |
|
| 472 | 472 | 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'])) { |
| 473 | - 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'])) { |
|
| 473 | + 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'])) { |
|
| 474 | 474 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 475 | 475 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 476 | 476 | $this->all_flights[$id]['putinarchive'] = true; |
@@ -480,10 +480,10 @@ discard block |
||
| 480 | 480 | $timeelapsed = microtime(true); |
| 481 | 481 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 482 | 482 | $Spotter = new Spotter($this->db); |
| 483 | - $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 483 | + $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 484 | 484 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
| 485 | 485 | $Spotter->db = null; |
| 486 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 486 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 487 | 487 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 488 | 488 | } |
| 489 | 489 | } |
@@ -493,13 +493,13 @@ discard block |
||
| 493 | 493 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 494 | 494 | //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) { |
| 495 | 495 | if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 496 | - 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') { |
|
| 496 | + 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') { |
|
| 497 | 497 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 498 | 498 | $dataFound = true; |
| 499 | 499 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 500 | 500 | } |
| 501 | 501 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 502 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
|
| 502 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude'])); |
|
| 503 | 503 | /* |
| 504 | 504 | if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) { |
| 505 | 505 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
@@ -517,13 +517,13 @@ discard block |
||
| 517 | 517 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 518 | 518 | //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) { |
| 519 | 519 | if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 520 | - 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') { |
|
| 520 | + 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') { |
|
| 521 | 521 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 522 | 522 | $dataFound = true; |
| 523 | 523 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 524 | 524 | } |
| 525 | 525 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 526 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
|
| 526 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude'])); |
|
| 527 | 527 | /* |
| 528 | 528 | if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) { |
| 529 | 529 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
@@ -541,46 +541,46 @@ discard block |
||
| 541 | 541 | } else if ($globalDebug && $timediff > 30) { |
| 542 | 542 | $this->tmd = $this->tmd + 1; |
| 543 | 543 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 544 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
|
| 545 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 544 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -"; |
|
| 545 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 546 | 546 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 547 | 547 | } |
| 548 | 548 | } |
| 549 | 549 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 550 | 550 | if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 551 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 551 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update'])); |
|
| 552 | 552 | } |
| 553 | 553 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 554 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 554 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate'])); |
|
| 555 | 555 | //$dataFound = true; |
| 556 | 556 | } |
| 557 | 557 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 558 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 558 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source'])); |
|
| 559 | 559 | } |
| 560 | 560 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 561 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 561 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name'])); |
|
| 562 | 562 | } |
| 563 | 563 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 564 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 564 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency'])); |
|
| 565 | 565 | //$dataFound = true; |
| 566 | 566 | } |
| 567 | 567 | if (isset($line['ground']) && $line['ground'] != '') { |
| 568 | 568 | if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
| 569 | 569 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 570 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 571 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 572 | - 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'))); |
|
| 573 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 574 | - 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'])); |
|
| 570 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 571 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 572 | + 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'))); |
|
| 573 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 574 | + 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'])); |
|
| 575 | 575 | } |
| 576 | 576 | if ($line['ground'] != 1) $line['ground'] = 0; |
| 577 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 577 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground'])); |
|
| 578 | 578 | //$dataFound = true; |
| 579 | 579 | } |
| 580 | 580 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 581 | 581 | 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'])) { |
| 582 | 582 | if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
| 583 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 583 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 584 | 584 | $highlight = ''; |
| 585 | 585 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
| 586 | 586 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
@@ -589,47 +589,47 @@ discard block |
||
| 589 | 589 | $timeelapsed = microtime(true); |
| 590 | 590 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 591 | 591 | $Spotter = new Spotter($this->db); |
| 592 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 592 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight); |
|
| 593 | 593 | $Spotter->db = null; |
| 594 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 594 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 595 | 595 | } |
| 596 | 596 | //$putinarchive = true; |
| 597 | 597 | //$highlight = ''; |
| 598 | 598 | } |
| 599 | 599 | |
| 600 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 600 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 601 | 601 | //$dataFound = true; |
| 602 | 602 | } |
| 603 | 603 | |
| 604 | 604 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 605 | 605 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 606 | - if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
| 607 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
|
| 608 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
|
| 606 | + if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
| 607 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100))); |
|
| 608 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude'])); |
|
| 609 | 609 | //$dataFound = true; |
| 610 | 610 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 614 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 614 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true)); |
|
| 615 | 615 | } |
| 616 | 616 | |
| 617 | 617 | if (isset($line['heading']) && $line['heading'] != '') { |
| 618 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 619 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 620 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 618 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 619 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading']))); |
|
| 620 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true)); |
|
| 621 | 621 | //$dataFound = true; |
| 622 | 622 | } 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']) { |
| 623 | - $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']); |
|
| 624 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 625 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 623 | + $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']); |
|
| 624 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading))); |
|
| 625 | + if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 626 | 626 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
| 627 | 627 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 628 | 628 | // If not enough messages and ACARS set heading to 0 |
| 629 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 629 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0)); |
|
| 630 | 630 | } |
| 631 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 632 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 631 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 632 | + elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 633 | 633 | |
| 634 | 634 | // print_r($this->all_flights[$id]); |
| 635 | 635 | //gets the callsign from the last hour |
@@ -639,7 +639,7 @@ discard block |
||
| 639 | 639 | if ($dataFound === true && isset($this->all_flights[$id]['hex'])) { |
| 640 | 640 | $this->all_flights[$id]['lastupdate'] = time(); |
| 641 | 641 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
| 642 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 642 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 643 | 643 | //print_r($this->all_flights); |
| 644 | 644 | //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
| 645 | 645 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
@@ -650,61 +650,61 @@ discard block |
||
| 650 | 650 | $SpotterLive = new SpotterLive($this->db); |
| 651 | 651 | 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')) { |
| 652 | 652 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 653 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 653 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 654 | 654 | } elseif (isset($line['id'])) { |
| 655 | 655 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 656 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 656 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 657 | 657 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 658 | 658 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 659 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 659 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 660 | 660 | } else $recent_ident = ''; |
| 661 | - $SpotterLive->db=null; |
|
| 661 | + $SpotterLive->db = null; |
|
| 662 | 662 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 663 | 663 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 664 | 664 | } else $recent_ident = ''; |
| 665 | 665 | } else { |
| 666 | 666 | $recent_ident = ''; |
| 667 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
|
| 667 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0)); |
|
| 668 | 668 | } |
| 669 | 669 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 670 | - if($recent_ident == "") |
|
| 670 | + if ($recent_ident == "") |
|
| 671 | 671 | { |
| 672 | 672 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 673 | 673 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 674 | 674 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 675 | 675 | //adds the spotter data for the archive |
| 676 | 676 | $ignoreImport = false; |
| 677 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 677 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 678 | 678 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 679 | 679 | $ignoreImport = true; |
| 680 | 680 | } |
| 681 | 681 | } |
| 682 | 682 | if (count($globalAirportAccept) > 0) { |
| 683 | 683 | $ignoreImport = true; |
| 684 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 684 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 685 | 685 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 686 | 686 | $ignoreImport = false; |
| 687 | 687 | } |
| 688 | 688 | } |
| 689 | 689 | } |
| 690 | 690 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 691 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 692 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 691 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 692 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) { |
|
| 693 | 693 | $ignoreImport = true; |
| 694 | 694 | } |
| 695 | 695 | } |
| 696 | 696 | } |
| 697 | 697 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 698 | 698 | $ignoreImport = true; |
| 699 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 700 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 699 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 700 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) { |
|
| 701 | 701 | $ignoreImport = false; |
| 702 | 702 | } |
| 703 | 703 | } |
| 704 | 704 | } |
| 705 | 705 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 706 | 706 | $ignoreImport = true; |
| 707 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 707 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 708 | 708 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 709 | 709 | $ignoreImport = false; |
| 710 | 710 | } |
@@ -716,32 +716,32 @@ discard block |
||
| 716 | 716 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
| 717 | 717 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
| 718 | 718 | if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
| 719 | - 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'))); |
|
| 719 | + 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'))); |
|
| 720 | 720 | $timeelapsed = microtime(true); |
| 721 | 721 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 722 | 722 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 723 | 723 | $Spotter = new Spotter($this->db); |
| 724 | - $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
| 724 | + $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $highlight, $this->all_flights[$id]['hex'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['source_type']); |
|
| 725 | 725 | $Spotter->db = null; |
| 726 | 726 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 727 | 727 | } |
| 728 | 728 | } |
| 729 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 729 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 730 | 730 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 731 | 731 | |
| 732 | 732 | // Add source stat in DB |
| 733 | 733 | $Stats = new Stats($this->db); |
| 734 | 734 | if (!empty($this->stats)) { |
| 735 | 735 | if ($globalDebug) echo 'Add source stats : '; |
| 736 | - foreach($this->stats as $date => $data) { |
|
| 737 | - foreach($data as $source => $sourced) { |
|
| 736 | + foreach ($this->stats as $date => $data) { |
|
| 737 | + foreach ($data as $source => $sourced) { |
|
| 738 | 738 | //print_r($sourced); |
| 739 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 740 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 739 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date); |
|
| 740 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date); |
|
| 741 | 741 | if (isset($sourced['msg'])) { |
| 742 | 742 | if (time() - $sourced['msg']['date'] > 10) { |
| 743 | 743 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 744 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 744 | + echo $Stats->addStatSource($nbmsg, $source, 'msg', $date); |
|
| 745 | 745 | unset($this->stats[$date][$source]['msg']); |
| 746 | 746 | } |
| 747 | 747 | } |
@@ -779,14 +779,14 @@ discard block |
||
| 779 | 779 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 780 | 780 | $SpotterLive = new SpotterLive($this->db); |
| 781 | 781 | $SpotterLive->deleteLiveSpotterData(); |
| 782 | - $SpotterLive->db=null; |
|
| 782 | + $SpotterLive->db = null; |
|
| 783 | 783 | } |
| 784 | 784 | } |
| 785 | 785 | if ($globalDebug) echo " Done\n"; |
| 786 | 786 | $this->last_delete = time(); |
| 787 | 787 | } |
| 788 | 788 | } else { |
| 789 | - 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')) { |
|
| 789 | + 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')) { |
|
| 790 | 790 | $this->all_flights[$id]['id'] = $recent_ident; |
| 791 | 791 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 792 | 792 | } |
@@ -794,7 +794,7 @@ discard block |
||
| 794 | 794 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 795 | 795 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 796 | 796 | $Spotter = new Spotter($this->db); |
| 797 | - $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 797 | + $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time']); |
|
| 798 | 798 | $Spotter->db = null; |
| 799 | 799 | } |
| 800 | 800 | } |
@@ -820,37 +820,37 @@ discard block |
||
| 820 | 820 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 821 | 821 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 822 | 822 | |
| 823 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 823 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 824 | 824 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 825 | 825 | $ignoreImport = true; |
| 826 | 826 | } |
| 827 | 827 | } |
| 828 | 828 | if (count($globalAirportAccept) > 0) { |
| 829 | 829 | $ignoreImport = true; |
| 830 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 830 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 831 | 831 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 832 | 832 | $ignoreImport = false; |
| 833 | 833 | } |
| 834 | 834 | } |
| 835 | 835 | } |
| 836 | 836 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 837 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 838 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 837 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 838 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) { |
|
| 839 | 839 | $ignoreImport = true; |
| 840 | 840 | } |
| 841 | 841 | } |
| 842 | 842 | } |
| 843 | 843 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 844 | 844 | $ignoreImport = true; |
| 845 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 846 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 845 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 846 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) { |
|
| 847 | 847 | $ignoreImport = false; |
| 848 | 848 | } |
| 849 | 849 | } |
| 850 | 850 | } |
| 851 | 851 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 852 | 852 | $ignoreImport = true; |
| 853 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 853 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 854 | 854 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 855 | 855 | $ignoreImport = false; |
| 856 | 856 | } |
@@ -858,23 +858,23 @@ discard block |
||
| 858 | 858 | } |
| 859 | 859 | |
| 860 | 860 | if (!$ignoreImport) { |
| 861 | - 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'])) { |
|
| 862 | - 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'))); |
|
| 861 | + 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'])) { |
|
| 862 | + 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'))); |
|
| 863 | 863 | $timeelapsed = microtime(true); |
| 864 | 864 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 865 | 865 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 866 | 866 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 867 | 867 | $SpotterLive = new SpotterLive($this->db); |
| 868 | - $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
|
| 868 | + $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']); |
|
| 869 | 869 | $SpotterLive->db = null; |
| 870 | 870 | if ($globalDebug) echo $result."\n"; |
| 871 | 871 | } |
| 872 | 872 | } |
| 873 | 873 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 874 | - $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
|
| 874 | + $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']); |
|
| 875 | 875 | } |
| 876 | 876 | $this->all_flights[$id]['putinarchive'] = false; |
| 877 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 877 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 878 | 878 | |
| 879 | 879 | // Put statistics in $this->stats variable |
| 880 | 880 | //if ($line['format_source'] != 'aprs') { |
@@ -893,19 +893,19 @@ discard block |
||
| 893 | 893 | $latitude = $globalCenterLatitude; |
| 894 | 894 | $longitude = $globalCenterLongitude; |
| 895 | 895 | } |
| 896 | - $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 896 | + $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 897 | 897 | } else { |
| 898 | 898 | $latitude = $this->source_location[$source]['latitude']; |
| 899 | 899 | $longitude = $this->source_location[$source]['longitude']; |
| 900 | 900 | } |
| 901 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 901 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 902 | 902 | //$stats_heading = $stats_heading%22.5; |
| 903 | 903 | $stats_heading = round($stats_heading/22.5); |
| 904 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 904 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 905 | 905 | $current_date = date('Y-m-d'); |
| 906 | 906 | if ($stats_heading == 16) $stats_heading = 0; |
| 907 | 907 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 908 | - for ($i=0;$i<=15;$i++) { |
|
| 908 | + for ($i = 0; $i <= 15; $i++) { |
|
| 909 | 909 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 910 | 910 | } |
| 911 | 911 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -920,9 +920,9 @@ discard block |
||
| 920 | 920 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 921 | 921 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 922 | 922 | end($this->stats[$current_date][$source]['hist']); |
| 923 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 923 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 924 | 924 | } else $mini = 0; |
| 925 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 925 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 926 | 926 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 927 | 927 | } |
| 928 | 928 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -935,7 +935,7 @@ discard block |
||
| 935 | 935 | $this->all_flights[$id]['lastupdate'] = time(); |
| 936 | 936 | if ($this->all_flights[$id]['putinarchive']) $send = true; |
| 937 | 937 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 938 | - } 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"; |
|
| 938 | + } 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"; |
|
| 939 | 939 | //$this->del(); |
| 940 | 940 | |
| 941 | 941 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
@@ -63,7 +63,9 @@ discard block |
||
| 63 | 63 | $dbc = $this->db; |
| 64 | 64 | $this->all_flights[$id]['schedule_check'] = true; |
| 65 | 65 | if ($globalSchedulesFetch) { |
| 66 | - if ($globalDebug) echo 'Getting schedule info...'."\n"; |
|
| 66 | + if ($globalDebug) { |
|
| 67 | + echo 'Getting schedule info...'."\n"; |
|
| 68 | + } |
|
| 67 | 69 | $Spotter = new Spotter($dbc); |
| 68 | 70 | $Schedule = new Schedule($dbc); |
| 69 | 71 | $Translation = new Translation($dbc); |
@@ -74,7 +76,9 @@ discard block |
||
| 74 | 76 | if ($Schedule->checkSchedule($operator) == 0) { |
| 75 | 77 | $schedule = $Schedule->fetchSchedule($operator); |
| 76 | 78 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 77 | - if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 79 | + if ($globalDebug) { |
|
| 80 | + echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
|
| 81 | + } |
|
| 78 | 82 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
| 79 | 83 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
| 80 | 84 | // Should also check if route schedule = route from DB |
@@ -83,7 +87,9 @@ discard block |
||
| 83 | 87 | $airport_icao = $Spotter->getAirportIcao($schedule['DepartureAirportIATA']); |
| 84 | 88 | if (trim($airport_icao) != '') { |
| 85 | 89 | $this->all_flights[$id]['departure_airport'] = $airport_icao; |
| 86 | - if ($globalDebug) echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
|
| 90 | + if ($globalDebug) { |
|
| 91 | + echo "-> Change departure airport to ".$airport_icao." for ".$ident."\n"; |
|
| 92 | + } |
|
| 87 | 93 | } |
| 88 | 94 | } |
| 89 | 95 | } |
@@ -92,17 +98,25 @@ discard block |
||
| 92 | 98 | $airport_icao = $Spotter->getAirportIcao($schedule['ArrivalAirportIATA']); |
| 93 | 99 | if (trim($airport_icao) != '') { |
| 94 | 100 | $this->all_flights[$id]['arrival_airport'] = $airport_icao; |
| 95 | - if ($globalDebug) echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
|
| 101 | + if ($globalDebug) { |
|
| 102 | + echo "-> Change arrival airport to ".$airport_icao." for ".$ident."\n"; |
|
| 103 | + } |
|
| 96 | 104 | } |
| 97 | 105 | } |
| 98 | 106 | } |
| 99 | 107 | $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
| 100 | 108 | } |
| 101 | - } else $scheduleexist = true; |
|
| 102 | - } else $scheduleexist = true; |
|
| 109 | + } else { |
|
| 110 | + $scheduleexist = true; |
|
| 111 | + } |
|
| 112 | + } else { |
|
| 113 | + $scheduleexist = true; |
|
| 114 | + } |
|
| 103 | 115 | // close connection, at least one way will work ? |
| 104 | 116 | if ($scheduleexist) { |
| 105 | - if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
|
| 117 | + if ($globalDebug) { |
|
| 118 | + echo "-> get arrival/departure airport info for ".$ident."\n"; |
|
| 119 | + } |
|
| 106 | 120 | $sch = $Schedule->getSchedule($operator); |
| 107 | 121 | $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'])); |
| 108 | 122 | } |
@@ -124,14 +138,18 @@ discard block |
||
| 124 | 138 | |
| 125 | 139 | public function checkAll() { |
| 126 | 140 | global $globalDebug, $globalNoImport; |
| 127 | - if ($globalDebug) echo "Update last seen flights data...\n"; |
|
| 141 | + if ($globalDebug) { |
|
| 142 | + echo "Update last seen flights data...\n"; |
|
| 143 | + } |
|
| 128 | 144 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 129 | 145 | foreach ($this->all_flights as $key => $flight) { |
| 130 | 146 | if (isset($this->all_flights[$key]['id'])) { |
| 131 | 147 | //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
| 132 | 148 | $Spotter = new Spotter($this->db); |
| 133 | 149 | $real_arrival = $this->arrival($key); |
| 134 | - if (isset($this->all_flights[$key]['altitude'])) $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']); |
|
| 150 | + if (isset($this->all_flights[$key]['altitude'])) { |
|
| 151 | + $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']); |
|
| 152 | + } |
|
| 135 | 153 | } |
| 136 | 154 | } |
| 137 | 155 | } |
@@ -139,24 +157,32 @@ discard block |
||
| 139 | 157 | |
| 140 | 158 | public function arrival($key) { |
| 141 | 159 | global $globalClosestMinDist, $globalDebug; |
| 142 | - if ($globalDebug) echo 'Update arrival...'."\n"; |
|
| 160 | + if ($globalDebug) { |
|
| 161 | + echo 'Update arrival...'."\n"; |
|
| 162 | + } |
|
| 143 | 163 | $Spotter = new Spotter($this->db); |
| 144 | 164 | $airport_icao = ''; |
| 145 | 165 | $airport_time = ''; |
| 146 | - if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
|
| 166 | + if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') { |
|
| 167 | + $globalClosestMinDist = 50; |
|
| 168 | + } |
|
| 147 | 169 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 148 | 170 | $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
| 149 | 171 | if (isset($closestAirports[0])) { |
| 150 | 172 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
| 151 | 173 | $airport_icao = $closestAirports[0]['icao']; |
| 152 | 174 | $airport_time = $this->all_flights[$key]['datetime']; |
| 153 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 175 | + if ($globalDebug) { |
|
| 176 | + echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 177 | + } |
|
| 154 | 178 | } elseif (count($closestAirports > 1) && isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] != '') { |
| 155 | 179 | foreach ($closestAirports as $airport) { |
| 156 | 180 | if ($this->all_flights[$key]['arrival_airport'] == $airport['icao']) { |
| 157 | 181 | $airport_icao = $airport['icao']; |
| 158 | 182 | $airport_time = $this->all_flights[$key]['datetime']; |
| 159 | - if ($globalDebug) echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 183 | + if ($globalDebug) { |
|
| 184 | + echo "---++ Find arrival airport. airport_icao : ".$airport_icao."\n"; |
|
| 185 | + } |
|
| 160 | 186 | break; |
| 161 | 187 | } |
| 162 | 188 | } |
@@ -164,14 +190,20 @@ discard block |
||
| 164 | 190 | $airport_icao = $closestAirports[0]['icao']; |
| 165 | 191 | $airport_time = $this->all_flights[$key]['datetime']; |
| 166 | 192 | } else { |
| 167 | - if ($globalDebug) echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 193 | + if ($globalDebug) { |
|
| 194 | + echo "----- Can't find arrival airport. Airport altitude : ".$closestAirports[0]['altitude'].' - flight altitude : '.$this->all_flights[$key]['altitude_real']."\n"; |
|
| 195 | + } |
|
| 168 | 196 | } |
| 169 | 197 | } else { |
| 170 | - if ($globalDebug) echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 198 | + if ($globalDebug) { |
|
| 199 | + echo "----- No Airport near last coord. Latitude : ".$this->all_flights[$key]['latitude'].' - Longitude : '.$this->all_flights[$key]['longitude'].' - MinDist : '.$globalClosestMinDist."\n"; |
|
| 200 | + } |
|
| 171 | 201 | } |
| 172 | 202 | |
| 173 | 203 | } else { |
| 174 | - if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 204 | + if ($globalDebug) { |
|
| 205 | + echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
|
| 206 | + } |
|
| 175 | 207 | } |
| 176 | 208 | return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
| 177 | 209 | } |
@@ -181,12 +213,16 @@ discard block |
||
| 181 | 213 | public function del() { |
| 182 | 214 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 183 | 215 | // Delete old infos |
| 184 | - if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
|
| 216 | + if ($globalDebug) { |
|
| 217 | + echo 'Delete old values and update latest data...'."\n"; |
|
| 218 | + } |
|
| 185 | 219 | foreach ($this->all_flights as $key => $flight) { |
| 186 | 220 | if (isset($flight['lastupdate'])) { |
| 187 | 221 | if ($flight['lastupdate'] < (time()-3000)) { |
| 188 | 222 | if (isset($this->all_flights[$key]['id'])) { |
| 189 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 223 | + if ($globalDebug) { |
|
| 224 | + echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 225 | + } |
|
| 190 | 226 | /* |
| 191 | 227 | $SpotterLive = new SpotterLive(); |
| 192 | 228 | $SpotterLive->deleteLiveSpotterDataById($this->all_flights[$key]['id']); |
@@ -197,7 +233,9 @@ discard block |
||
| 197 | 233 | $Spotter = new Spotter($this->db); |
| 198 | 234 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 199 | 235 | $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']); |
| 200 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 236 | + if ($globalDebug && $result != 'success') { |
|
| 237 | + echo '!!! ERROR : '.$result."\n"; |
|
| 238 | + } |
|
| 201 | 239 | } |
| 202 | 240 | // Put in archive |
| 203 | 241 | // $Spotter->db = null; |
@@ -212,8 +250,10 @@ discard block |
||
| 212 | 250 | public function add($line) { |
| 213 | 251 | global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB; |
| 214 | 252 | //if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE; |
| 215 | - if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
|
| 216 | -/* |
|
| 253 | + if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') { |
|
| 254 | + $globalCoordMinChange = '0.02'; |
|
| 255 | + } |
|
| 256 | + /* |
|
| 217 | 257 | $Spotter = new Spotter(); |
| 218 | 258 | $dbc = $Spotter->db; |
| 219 | 259 | $SpotterLive = new SpotterLive($dbc); |
@@ -241,11 +281,15 @@ discard block |
||
| 241 | 281 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE) { |
| 242 | 282 | $current_date = date('Y-m-d'); |
| 243 | 283 | $source = $line['source_name']; |
| 244 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 284 | + if ($source == '' || $line['format_source'] == 'aprs') { |
|
| 285 | + $source = $line['format_source']; |
|
| 286 | + } |
|
| 245 | 287 | if (!isset($this->stats[$current_date][$source]['msg'])) { |
| 246 | 288 | $this->stats[$current_date][$source]['msg']['date'] = time(); |
| 247 | 289 | $this->stats[$current_date][$source]['msg']['nb'] = 1; |
| 248 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 290 | + } else { |
|
| 291 | + $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 292 | + } |
|
| 249 | 293 | } |
| 250 | 294 | |
| 251 | 295 | /* |
@@ -261,22 +305,35 @@ discard block |
||
| 261 | 305 | //$this->db = $dbc; |
| 262 | 306 | |
| 263 | 307 | //$hex = trim($line['hex']); |
| 264 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 265 | - else $id = trim($line['id']); |
|
| 308 | + if (!isset($line['id'])) { |
|
| 309 | + $id = trim($line['hex']); |
|
| 310 | + } else { |
|
| 311 | + $id = trim($line['id']); |
|
| 312 | + } |
|
| 266 | 313 | |
| 267 | 314 | if (!isset($this->all_flights[$id])) { |
| 268 | 315 | $this->all_flights[$id] = array(); |
| 269 | 316 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 270 | 317 | $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,'source_type' => '')); |
| 271 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 318 | + if (isset($globalDaemon) && $globalDaemon === FALSE) { |
|
| 319 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 320 | + } |
|
| 272 | 321 | if (!isset($line['id'])) { |
| 273 | - if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 274 | -// 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'))); |
|
| 322 | + if (!isset($globalDaemon)) { |
|
| 323 | + $globalDaemon = TRUE; |
|
| 324 | + } |
|
| 325 | + // 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'))); |
|
| 275 | 326 | // 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'))); |
| 276 | - 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' => $id.'-'.date('YmdHi'))); |
|
| 327 | + 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')) { |
|
| 328 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 329 | + } |
|
| 277 | 330 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 278 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 279 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 331 | + } else { |
|
| 332 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 333 | + } |
|
| 334 | + if ($globalAllFlights !== FALSE) { |
|
| 335 | + $dataFound = true; |
|
| 336 | + } |
|
| 280 | 337 | } |
| 281 | 338 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 282 | 339 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
@@ -298,17 +355,27 @@ discard block |
||
| 298 | 355 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 299 | 356 | } |
| 300 | 357 | $Spotter->db = null; |
| 301 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 302 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 358 | + if ($globalDebugTimeElapsed) { |
|
| 359 | + echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 360 | + } |
|
| 361 | + if ($aircraft_icao != '') { |
|
| 362 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 363 | + } |
|
| 303 | 364 | } |
| 304 | 365 | } |
| 305 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 306 | - if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 366 | + if ($globalAllFlights !== FALSE) { |
|
| 367 | + $dataFound = true; |
|
| 368 | + } |
|
| 369 | + if ($globalDebug) { |
|
| 370 | + echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 371 | + } |
|
| 307 | 372 | } |
| 308 | 373 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 309 | 374 | $icao = $line['aircraft_icao']; |
| 310 | 375 | $Spotter = new Spotter($this->db); |
| 311 | - if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
|
| 376 | + if (isset($Spotter->aircraft_correct_icaotype[$icao])) { |
|
| 377 | + $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
|
| 378 | + } |
|
| 312 | 379 | $Spotter->db = null; |
| 313 | 380 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
| 314 | 381 | } |
@@ -318,15 +385,24 @@ discard block |
||
| 318 | 385 | $Spotter = new Spotter($this->db); |
| 319 | 386 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 320 | 387 | $Spotter->db = null; |
| 321 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 388 | + if ($aircraft_icao != '') { |
|
| 389 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 390 | + } |
|
| 322 | 391 | } |
| 323 | 392 | } |
| 324 | 393 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
| 325 | - if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID'; |
|
| 326 | - elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
|
| 327 | - elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
|
| 328 | - elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
|
| 329 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 394 | + if ($line['aircraft_type'] == 'PARA_GLIDER') { |
|
| 395 | + $aircraft_icao = 'GLID'; |
|
| 396 | + } elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') { |
|
| 397 | + $aircraft_icao = 'UHEL'; |
|
| 398 | + } elseif ($line['aircraft_type'] == 'TOW_PLANE') { |
|
| 399 | + $aircraft_icao = 'TOWPLANE'; |
|
| 400 | + } elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') { |
|
| 401 | + $aircraft_icao = 'POWAIRC'; |
|
| 402 | + } |
|
| 403 | + if (isset($aircraft_icao)) { |
|
| 404 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 405 | + } |
|
| 330 | 406 | } |
| 331 | 407 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
| 332 | 408 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
@@ -336,8 +412,11 @@ discard block |
||
| 336 | 412 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 337 | 413 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 338 | 414 | } else { |
| 339 | - 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"; |
|
| 340 | - 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"; |
|
| 415 | + if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
| 416 | + echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 417 | + } elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
| 418 | + echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 419 | + } |
|
| 341 | 420 | /* |
| 342 | 421 | echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']); |
| 343 | 422 | print_r($this->all_flights[$id]); |
@@ -346,16 +425,22 @@ discard block |
||
| 346 | 425 | return ''; |
| 347 | 426 | } |
| 348 | 427 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 349 | - if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 428 | + if ($globalDebug) { |
|
| 429 | + echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 430 | + } |
|
| 350 | 431 | return ''; |
| 351 | 432 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
| 352 | - if ($globalDebug) echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 433 | + if ($globalDebug) { |
|
| 434 | + echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 435 | + } |
|
| 353 | 436 | return ''; |
| 354 | 437 | } elseif (!isset($line['datetime'])) { |
| 355 | 438 | date_default_timezone_set('UTC'); |
| 356 | 439 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
| 357 | 440 | } else { |
| 358 | - if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 441 | + if ($globalDebug) { |
|
| 442 | + echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 443 | + } |
|
| 359 | 444 | return ''; |
| 360 | 445 | } |
| 361 | 446 | |
@@ -379,15 +464,25 @@ discard block |
||
| 379 | 464 | $timeelapsed = microtime(true); |
| 380 | 465 | $Spotter = new Spotter($this->db); |
| 381 | 466 | $fromsource = NULL; |
| 382 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 383 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 384 | - elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
| 385 | - elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 386 | - elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 467 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') { |
|
| 468 | + $fromsource = $globalAirlinesSource; |
|
| 469 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') { |
|
| 470 | + $fromsource = 'vatsim'; |
|
| 471 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') { |
|
| 472 | + $fromsource = 'ivao'; |
|
| 473 | + } elseif (isset($globalVATSIM) && $globalVATSIM) { |
|
| 474 | + $fromsource = 'vatsim'; |
|
| 475 | + } elseif (isset($globalIVAO) && $globalIVAO) { |
|
| 476 | + $fromsource = 'ivao'; |
|
| 477 | + } |
|
| 387 | 478 | $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
| 388 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 479 | + if ($globalDebug && $result != 'success') { |
|
| 480 | + echo '!!! ERROR : '.$result."\n"; |
|
| 481 | + } |
|
| 389 | 482 | $Spotter->db = null; |
| 390 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 483 | + if ($globalDebugTimeElapsed) { |
|
| 484 | + echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 485 | + } |
|
| 391 | 486 | } |
| 392 | 487 | } |
| 393 | 488 | |
@@ -399,7 +494,9 @@ discard block |
||
| 399 | 494 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 400 | 495 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 401 | 496 | */ |
| 402 | - 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'])); |
|
| 497 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 498 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 499 | + } |
|
| 403 | 500 | |
| 404 | 501 | //$putinarchive = true; |
| 405 | 502 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
@@ -417,7 +514,9 @@ discard block |
||
| 417 | 514 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 418 | 515 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 419 | 516 | $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' => '')); |
| 420 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 517 | + if ($globalDebugTimeElapsed) { |
|
| 518 | + echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 519 | + } |
|
| 421 | 520 | } |
| 422 | 521 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 423 | 522 | $timeelapsed = microtime(true); |
@@ -431,7 +530,9 @@ discard block |
||
| 431 | 530 | $Translation->db = null; |
| 432 | 531 | } |
| 433 | 532 | $Spotter->db = null; |
| 434 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 533 | + if ($globalDebugTimeElapsed) { |
|
| 534 | + echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 535 | + } |
|
| 435 | 536 | } |
| 436 | 537 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 437 | 538 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
@@ -440,9 +541,13 @@ discard block |
||
| 440 | 541 | $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'])); |
| 441 | 542 | } |
| 442 | 543 | } |
| 443 | - if (!isset($globalFork)) $globalFork = TRUE; |
|
| 544 | + if (!isset($globalFork)) { |
|
| 545 | + $globalFork = TRUE; |
|
| 546 | + } |
|
| 444 | 547 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 445 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 548 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) { |
|
| 549 | + $this->get_Schedule($id,trim($line['ident'])); |
|
| 550 | + } |
|
| 446 | 551 | } |
| 447 | 552 | } |
| 448 | 553 | } |
@@ -458,16 +563,23 @@ discard block |
||
| 458 | 563 | // use datetime |
| 459 | 564 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 460 | 565 | $speed = $speed*3.6; |
| 461 | - if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 462 | - if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
| 566 | + if ($speed < 1000) { |
|
| 567 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 568 | + } |
|
| 569 | + if ($globalDebug) { |
|
| 570 | + echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
| 571 | + } |
|
| 463 | 572 | } |
| 464 | 573 | } |
| 465 | 574 | |
| 466 | 575 | |
| 467 | 576 | |
| 468 | 577 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 469 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 470 | - else unset($timediff); |
|
| 578 | + if (isset($this->all_flights[$id]['time_last_coord'])) { |
|
| 579 | + $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 580 | + } else { |
|
| 581 | + unset($timediff); |
|
| 582 | + } |
|
| 471 | 583 | if ($this->tmd > 5 || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && 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')))) { |
| 472 | 584 | 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'])) { |
| 473 | 585 | 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'])) { |
@@ -476,15 +588,23 @@ discard block |
||
| 476 | 588 | $this->all_flights[$id]['putinarchive'] = true; |
| 477 | 589 | $this->tmd = 0; |
| 478 | 590 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 479 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 591 | + if ($globalDebug) { |
|
| 592 | + echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 593 | + } |
|
| 480 | 594 | $timeelapsed = microtime(true); |
| 481 | 595 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 482 | 596 | $Spotter = new Spotter($this->db); |
| 483 | 597 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 484 | - if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
| 598 | + if (!empty($all_country)) { |
|
| 599 | + $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
| 600 | + } |
|
| 485 | 601 | $Spotter->db = null; |
| 486 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 487 | - if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
| 602 | + if ($globalDebugTimeElapsed) { |
|
| 603 | + echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 604 | + } |
|
| 605 | + if ($globalDebug) { |
|
| 606 | + echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
| 607 | + } |
|
| 488 | 608 | } |
| 489 | 609 | } |
| 490 | 610 | } |
@@ -492,7 +612,9 @@ discard block |
||
| 492 | 612 | |
| 493 | 613 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 494 | 614 | //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) { |
| 495 | - if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
| 615 | + if (!isset($this->all_flights[$id]['archive_latitude'])) { |
|
| 616 | + $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
| 617 | + } |
|
| 496 | 618 | 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') { |
| 497 | 619 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 498 | 620 | $dataFound = true; |
@@ -514,9 +636,13 @@ discard block |
||
| 514 | 636 | */ |
| 515 | 637 | } |
| 516 | 638 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 517 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 639 | + if ($line['longitude'] > 180) { |
|
| 640 | + $line['longitude'] = $line['longitude'] - 360; |
|
| 641 | + } |
|
| 518 | 642 | //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) { |
| 519 | - if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
| 643 | + if (!isset($this->all_flights[$id]['archive_longitude'])) { |
|
| 644 | + $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
| 645 | + } |
|
| 520 | 646 | 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') { |
| 521 | 647 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 522 | 648 | $dataFound = true; |
@@ -547,7 +673,9 @@ discard block |
||
| 547 | 673 | } |
| 548 | 674 | } |
| 549 | 675 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 550 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 676 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) { |
|
| 677 | + $dataFound = true; |
|
| 678 | + } |
|
| 551 | 679 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
| 552 | 680 | } |
| 553 | 681 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
@@ -569,41 +697,61 @@ discard block |
||
| 569 | 697 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 570 | 698 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 571 | 699 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 572 | - 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'))); |
|
| 573 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 574 | - 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'])); |
|
| 700 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) { |
|
| 701 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi'))); |
|
| 702 | + } elseif (isset($line['id'])) { |
|
| 703 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 704 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 705 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 706 | + } |
|
| 707 | + } |
|
| 708 | + if ($line['ground'] != 1) { |
|
| 709 | + $line['ground'] = 0; |
|
| 575 | 710 | } |
| 576 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 577 | 711 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
| 578 | 712 | //$dataFound = true; |
| 579 | 713 | } |
| 580 | 714 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 581 | 715 | 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'])) { |
| 582 | - if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 716 | + if ($this->all_flights[$id]['squawk'] != $line['squawk']) { |
|
| 717 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 718 | + } |
|
| 583 | 719 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
| 584 | 720 | $highlight = ''; |
| 585 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 586 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 587 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 721 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
| 722 | + $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 723 | + } |
|
| 724 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
| 725 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 726 | + } |
|
| 727 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
| 728 | + $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 729 | + } |
|
| 588 | 730 | if ($highlight != '') { |
| 589 | 731 | $timeelapsed = microtime(true); |
| 590 | 732 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 591 | 733 | $Spotter = new Spotter($this->db); |
| 592 | 734 | $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
| 593 | 735 | $Spotter->db = null; |
| 594 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 736 | + if ($globalDebugTimeElapsed) { |
|
| 737 | + echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 738 | + } |
|
| 595 | 739 | } |
| 596 | 740 | //$putinarchive = true; |
| 597 | 741 | //$highlight = ''; |
| 598 | 742 | } |
| 599 | 743 | |
| 600 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 744 | + } else { |
|
| 745 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 746 | + } |
|
| 601 | 747 | //$dataFound = true; |
| 602 | 748 | } |
| 603 | 749 | |
| 604 | 750 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 605 | 751 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 606 | - if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
| 752 | + if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) { |
|
| 753 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 754 | + } |
|
| 607 | 755 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
| 608 | 756 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
| 609 | 757 | //$dataFound = true; |
@@ -615,21 +763,30 @@ discard block |
||
| 615 | 763 | } |
| 616 | 764 | |
| 617 | 765 | if (isset($line['heading']) && $line['heading'] != '') { |
| 618 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 766 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) { |
|
| 767 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 768 | + } |
|
| 619 | 769 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
| 620 | 770 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
| 621 | 771 | //$dataFound = true; |
| 622 | 772 | } 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']) { |
| 623 | 773 | $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']); |
| 624 | 774 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
| 625 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 626 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 775 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) { |
|
| 776 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 777 | + } |
|
| 778 | + if ($globalDebug) { |
|
| 779 | + echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
|
| 780 | + } |
|
| 627 | 781 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 628 | 782 | // If not enough messages and ACARS set heading to 0 |
| 629 | 783 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
| 630 | 784 | } |
| 631 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 632 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 785 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) { |
|
| 786 | + $dataFound = false; |
|
| 787 | + } elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) { |
|
| 788 | + $dataFound = false; |
|
| 789 | + } |
|
| 633 | 790 | |
| 634 | 791 | // print_r($this->all_flights[$id]); |
| 635 | 792 | //gets the callsign from the last hour |
@@ -645,23 +802,38 @@ discard block |
||
| 645 | 802 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
| 646 | 803 | if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
| 647 | 804 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 648 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 805 | + if ($globalDebug) { |
|
| 806 | + echo "Check if aircraft is already in DB..."; |
|
| 807 | + } |
|
| 649 | 808 | $timeelapsed = microtime(true); |
| 650 | 809 | $SpotterLive = new SpotterLive($this->db); |
| 651 | 810 | 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')) { |
| 652 | 811 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 653 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 812 | + if ($globalDebugTimeElapsed) { |
|
| 813 | + echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 814 | + } |
|
| 654 | 815 | } elseif (isset($line['id'])) { |
| 655 | 816 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 656 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 817 | + if ($globalDebugTimeElapsed) { |
|
| 818 | + echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 819 | + } |
|
| 657 | 820 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 658 | 821 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 659 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 660 | - } else $recent_ident = ''; |
|
| 822 | + if ($globalDebugTimeElapsed) { |
|
| 823 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 824 | + } |
|
| 825 | + } else { |
|
| 826 | + $recent_ident = ''; |
|
| 827 | + } |
|
| 661 | 828 | $SpotterLive->db=null; |
| 662 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 663 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 664 | - } else $recent_ident = ''; |
|
| 829 | + if ($globalDebug && $recent_ident == '') { |
|
| 830 | + echo " Not in DB.\n"; |
|
| 831 | + } elseif ($globalDebug && $recent_ident != '') { |
|
| 832 | + echo " Already in DB.\n"; |
|
| 833 | + } |
|
| 834 | + } else { |
|
| 835 | + $recent_ident = ''; |
|
| 836 | + } |
|
| 665 | 837 | } else { |
| 666 | 838 | $recent_ident = ''; |
| 667 | 839 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
@@ -669,7 +841,9 @@ discard block |
||
| 669 | 841 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 670 | 842 | if($recent_ident == "") |
| 671 | 843 | { |
| 672 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
| 844 | + if ($globalDebug) { |
|
| 845 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
| 846 | + } |
|
| 673 | 847 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 674 | 848 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 675 | 849 | //adds the spotter data for the archive |
@@ -713,31 +887,49 @@ discard block |
||
| 713 | 887 | |
| 714 | 888 | if (!$ignoreImport) { |
| 715 | 889 | $highlight = ''; |
| 716 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 717 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 718 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 719 | - 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'))); |
|
| 890 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
| 891 | + $highlight = 'Squawk 7500 : Hijack'; |
|
| 892 | + } |
|
| 893 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
| 894 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 895 | + } |
|
| 896 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
| 897 | + $highlight = 'Squawk 7700 : Emergency'; |
|
| 898 | + } |
|
| 899 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 900 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 901 | + } |
|
| 720 | 902 | $timeelapsed = microtime(true); |
| 721 | 903 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 722 | 904 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 723 | 905 | $Spotter = new Spotter($this->db); |
| 724 | 906 | $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
| 725 | 907 | $Spotter->db = null; |
| 726 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 908 | + if ($globalDebug && isset($result)) { |
|
| 909 | + echo $result."\n"; |
|
| 910 | + } |
|
| 727 | 911 | } |
| 728 | 912 | } |
| 729 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 913 | + if ($globalDebugTimeElapsed) { |
|
| 914 | + echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 915 | + } |
|
| 730 | 916 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 731 | 917 | |
| 732 | 918 | // Add source stat in DB |
| 733 | 919 | $Stats = new Stats($this->db); |
| 734 | 920 | if (!empty($this->stats)) { |
| 735 | - if ($globalDebug) echo 'Add source stats : '; |
|
| 921 | + if ($globalDebug) { |
|
| 922 | + echo 'Add source stats : '; |
|
| 923 | + } |
|
| 736 | 924 | foreach($this->stats as $date => $data) { |
| 737 | 925 | foreach($data as $source => $sourced) { |
| 738 | 926 | //print_r($sourced); |
| 739 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 740 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 927 | + if (isset($sourced['polar'])) { |
|
| 928 | + echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 929 | + } |
|
| 930 | + if (isset($sourced['hist'])) { |
|
| 931 | + echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 932 | + } |
|
| 741 | 933 | if (isset($sourced['msg'])) { |
| 742 | 934 | if (time() - $sourced['msg']['date'] > 10) { |
| 743 | 935 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
@@ -750,13 +942,17 @@ discard block |
||
| 750 | 942 | unset($this->stats[$date]); |
| 751 | 943 | } |
| 752 | 944 | } |
| 753 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 945 | + if ($globalDebug) { |
|
| 946 | + echo 'Done'."\n"; |
|
| 947 | + } |
|
| 754 | 948 | |
| 755 | 949 | } |
| 756 | 950 | $Stats->db = null; |
| 757 | 951 | } |
| 758 | 952 | $this->del(); |
| 759 | - } elseif ($globalDebug) echo 'Ignore data'."\n"; |
|
| 953 | + } elseif ($globalDebug) { |
|
| 954 | + echo 'Ignore data'."\n"; |
|
| 955 | + } |
|
| 760 | 956 | //$ignoreImport = false; |
| 761 | 957 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 762 | 958 | //print_r($this->all_flights[$id]); |
@@ -773,7 +969,9 @@ discard block |
||
| 773 | 969 | */ |
| 774 | 970 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
| 775 | 971 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 776 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 972 | + if ($globalDebug) { |
|
| 973 | + echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 974 | + } |
|
| 777 | 975 | //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 778 | 976 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 779 | 977 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -782,7 +980,9 @@ discard block |
||
| 782 | 980 | $SpotterLive->db=null; |
| 783 | 981 | } |
| 784 | 982 | } |
| 785 | - if ($globalDebug) echo " Done\n"; |
|
| 983 | + if ($globalDebug) { |
|
| 984 | + echo " Done\n"; |
|
| 985 | + } |
|
| 786 | 986 | $this->last_delete = time(); |
| 787 | 987 | } |
| 788 | 988 | } else { |
@@ -809,11 +1009,17 @@ discard block |
||
| 809 | 1009 | //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"; |
| 810 | 1010 | if ($globalDebug) { |
| 811 | 1011 | if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
| 812 | - 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"; |
|
| 813 | - 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"; |
|
| 1012 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
| 1013 | + 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"; |
|
| 1014 | + } else { |
|
| 1015 | + 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"; |
|
| 1016 | + } |
|
| 814 | 1017 | } else { |
| 815 | - 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"; |
|
| 816 | - 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"; |
|
| 1018 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
| 1019 | + 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"; |
|
| 1020 | + } else { |
|
| 1021 | + 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"; |
|
| 1022 | + } |
|
| 817 | 1023 | } |
| 818 | 1024 | } |
| 819 | 1025 | $ignoreImport = false; |
@@ -859,22 +1065,30 @@ discard block |
||
| 859 | 1065 | |
| 860 | 1066 | if (!$ignoreImport) { |
| 861 | 1067 | 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'])) { |
| 862 | - 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'))); |
|
| 1068 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 1069 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 1070 | + } |
|
| 863 | 1071 | $timeelapsed = microtime(true); |
| 864 | 1072 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 865 | 1073 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 866 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
| 1074 | + if ($globalDebug) { |
|
| 1075 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
| 1076 | + } |
|
| 867 | 1077 | $SpotterLive = new SpotterLive($this->db); |
| 868 | 1078 | $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
| 869 | 1079 | $SpotterLive->db = null; |
| 870 | - if ($globalDebug) echo $result."\n"; |
|
| 1080 | + if ($globalDebug) { |
|
| 1081 | + echo $result."\n"; |
|
| 1082 | + } |
|
| 871 | 1083 | } |
| 872 | 1084 | } |
| 873 | 1085 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 874 | 1086 | $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
| 875 | 1087 | } |
| 876 | 1088 | $this->all_flights[$id]['putinarchive'] = false; |
| 877 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1089 | + if ($globalDebugTimeElapsed) { |
|
| 1090 | + echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1091 | + } |
|
| 878 | 1092 | |
| 879 | 1093 | // Put statistics in $this->stats variable |
| 880 | 1094 | //if ($line['format_source'] != 'aprs') { |
@@ -882,7 +1096,9 @@ discard block |
||
| 882 | 1096 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 883 | 1097 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $line['format_source'] != 'aprs' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 884 | 1098 | $source = $this->all_flights[$id]['source_name']; |
| 885 | - if ($source == '') $source = $this->all_flights[$id]['format_source']; |
|
| 1099 | + if ($source == '') { |
|
| 1100 | + $source = $this->all_flights[$id]['format_source']; |
|
| 1101 | + } |
|
| 886 | 1102 | if (!isset($this->source_location[$source])) { |
| 887 | 1103 | $Location = new Source(); |
| 888 | 1104 | $coord = $Location->getLocationInfobySourceName($source); |
@@ -903,7 +1119,9 @@ discard block |
||
| 903 | 1119 | $stats_heading = round($stats_heading/22.5); |
| 904 | 1120 | $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
| 905 | 1121 | $current_date = date('Y-m-d'); |
| 906 | - if ($stats_heading == 16) $stats_heading = 0; |
|
| 1122 | + if ($stats_heading == 16) { |
|
| 1123 | + $stats_heading = 0; |
|
| 1124 | + } |
|
| 907 | 1125 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 908 | 1126 | for ($i=0;$i<=15;$i++) { |
| 909 | 1127 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
@@ -921,7 +1139,9 @@ discard block |
||
| 921 | 1139 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 922 | 1140 | end($this->stats[$current_date][$source]['hist']); |
| 923 | 1141 | $mini = key($this->stats[$current_date][$source]['hist'])+10; |
| 924 | - } else $mini = 0; |
|
| 1142 | + } else { |
|
| 1143 | + $mini = 0; |
|
| 1144 | + } |
|
| 925 | 1145 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 926 | 1146 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 927 | 1147 | } |
@@ -933,19 +1153,27 @@ discard block |
||
| 933 | 1153 | } |
| 934 | 1154 | |
| 935 | 1155 | $this->all_flights[$id]['lastupdate'] = time(); |
| 936 | - if ($this->all_flights[$id]['putinarchive']) $send = true; |
|
| 1156 | + if ($this->all_flights[$id]['putinarchive']) { |
|
| 1157 | + $send = true; |
|
| 1158 | + } |
|
| 937 | 1159 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 938 | - } 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"; |
|
| 1160 | + } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) { |
|
| 1161 | + echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 1162 | + } |
|
| 939 | 1163 | //$this->del(); |
| 940 | 1164 | |
| 941 | 1165 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 942 | 1166 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 943 | - if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
| 1167 | + if ($globalDebug) { |
|
| 1168 | + echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
| 1169 | + } |
|
| 944 | 1170 | $SpotterLive = new SpotterLive($this->db); |
| 945 | 1171 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 946 | 1172 | $SpotterLive->db = null; |
| 947 | 1173 | //SpotterLive->deleteLiveSpotterData(); |
| 948 | - if ($globalDebug) echo " Done\n"; |
|
| 1174 | + if ($globalDebug) { |
|
| 1175 | + echo " Done\n"; |
|
| 1176 | + } |
|
| 949 | 1177 | $this->last_delete_hourly = time(); |
| 950 | 1178 | } else { |
| 951 | 1179 | $this->del(); |
@@ -957,7 +1185,9 @@ discard block |
||
| 957 | 1185 | //$ignoreImport = false; |
| 958 | 1186 | } |
| 959 | 1187 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 960 | - if ($send) return $this->all_flights[$id]; |
|
| 1188 | + if ($send) { |
|
| 1189 | + return $this->all_flights[$id]; |
|
| 1190 | + } |
|
| 961 | 1191 | } |
| 962 | 1192 | } |
| 963 | 1193 | } |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
| 3 | -$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING); |
|
| 3 | +$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING); |
|
| 4 | 4 | if ($date == '') $date = date('Y-m-d'); |
| 5 | 5 | header('Location: '.$globalURL.'/date/'.$date); |
| 6 | 6 | ?> |
| 7 | 7 | \ No newline at end of file |
@@ -1,6 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
| 3 | 3 | $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING); |
| 4 | -if ($date == '') $date = date('Y-m-d'); |
|
| 4 | +if ($date == '') { |
|
| 5 | + $date = date('Y-m-d'); |
|
| 6 | +} |
|
| 5 | 7 | header('Location: '.$globalURL.'/date/'.$date); |
| 6 | 8 | ?> |
| 7 | 9 | \ No newline at end of file |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
| 3 | -$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING); |
|
| 3 | +$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING); |
|
| 4 | 4 | if ($date == '') $date = date('Y-m-d'); |
| 5 | 5 | header('Location: '.$globalURL.'/accident/'.$date); |
| 6 | 6 | ?> |
| 7 | 7 | \ No newline at end of file |
@@ -1,6 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
| 3 | 3 | $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING); |
| 4 | -if ($date == '') $date = date('Y-m-d'); |
|
| 4 | +if ($date == '') { |
|
| 5 | + $date = date('Y-m-d'); |
|
| 6 | +} |
|
| 5 | 7 | header('Location: '.$globalURL.'/accident/'.$date); |
| 6 | 8 | ?> |
| 7 | 9 | \ No newline at end of file |
@@ -19,13 +19,13 @@ discard block |
||
| 19 | 19 | print '<div id="chart" class="chart" width="100%"></div><script>'; |
| 20 | 20 | $year_data = ''; |
| 21 | 21 | $year_cnt = ''; |
| 22 | -foreach($date_array as $year_item) |
|
| 22 | +foreach ($date_array as $year_item) |
|
| 23 | 23 | { |
| 24 | 24 | $year_data .= '"'.$year_item['year'].'-01-01",'; |
| 25 | 25 | $year_cnt .= $year_item['count'].','; |
| 26 | 26 | } |
| 27 | 27 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 28 | -$year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 28 | +$year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 29 | 29 | print 'c3.generate({ |
| 30 | 30 | bindto: "#chart", |
| 31 | 31 | data: { x: "x", |
@@ -35,12 +35,12 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | if (!empty($date_array)) |
| 37 | 37 | { |
| 38 | - foreach($date_array as $key => $row) { |
|
| 38 | + foreach ($date_array as $key => $row) { |
|
| 39 | 39 | $years[$key] = $row['year']; |
| 40 | 40 | $counts[$key] = $row['count']; |
| 41 | 41 | } |
| 42 | 42 | //array_multisort($years,SORT_DESC,$date_array); |
| 43 | - array_multisort($counts,SORT_DESC,$date_array); |
|
| 43 | + array_multisort($counts, SORT_DESC, $date_array); |
|
| 44 | 44 | print '<div class="table-responsive">'; |
| 45 | 45 | print '<table class="common-date table-striped">'; |
| 46 | 46 | print '<thead>'; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | print '</thead>'; |
| 51 | 51 | print '<tbody>'; |
| 52 | 52 | $i = 1; |
| 53 | - foreach($date_array as $date_item) |
|
| 53 | + foreach ($date_array as $date_item) |
|
| 54 | 54 | { |
| 55 | 55 | print '<tr>'; |
| 56 | 56 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | $route_array = $Spotter->countAllRoutes(); |
| 19 | 19 | print '<div id="chart" class="chart" width="100%"></div><script>'; |
| 20 | 20 | $route_data = ''; |
| 21 | -foreach($route_array as $route_item) |
|
| 21 | +foreach ($route_array as $route_item) |
|
| 22 | 22 | { |
| 23 | 23 | $route_data .= '[ "'.$route_item['airport_departure_icao'].' - '.$route_item['airport_arrival_icao'].'",'.$route_item['route_count'].'],'; |
| 24 | 24 | } |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | print '</thead>'; |
| 47 | 47 | print '<tbody>'; |
| 48 | 48 | $i = 1; |
| 49 | - foreach($route_array as $route_item) |
|
| 49 | + foreach ($route_array as $route_item) |
|
| 50 | 50 | { |
| 51 | 51 | print '<tr>'; |
| 52 | 52 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -5,7 +5,9 @@ |
||
| 5 | 5 | $Spotter = new Spotter(); |
| 6 | 6 | $title = _("Statistics").' - '._("Most common Route by Airport"); |
| 7 | 7 | require_once('header.php'); |
| 8 | -if (!isset($filter_name)) $filter_name = ''; |
|
| 8 | +if (!isset($filter_name)) { |
|
| 9 | + $filter_name = ''; |
|
| 10 | +} |
|
| 9 | 11 | include('statistics-sub-menu.php'); |
| 10 | 12 | |
| 11 | 13 | print '<script type="text/javascript" src="'.$globalURL.'/js/d3.min.js"></script>'; |
@@ -6,11 +6,15 @@ discard block |
||
| 6 | 6 | $beginpage = microtime(true); |
| 7 | 7 | $Stats = new Stats(); |
| 8 | 8 | |
| 9 | -if (!isset($filter_name)) $filter_name = ''; |
|
| 9 | +if (!isset($filter_name)) { |
|
| 10 | + $filter_name = ''; |
|
| 11 | +} |
|
| 10 | 12 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
| 11 | 13 | if ($airline_icao == '' && isset($globalFilter)) { |
| 12 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
| 13 | -} |
|
| 14 | + if (isset($globalFilter['airline'])) { |
|
| 15 | + $airline_icao = $globalFilter['airline'][0]; |
|
| 16 | + } |
|
| 17 | + } |
|
| 14 | 18 | if ($airline_icao != '' && $airline_icao != 'all') { |
| 15 | 19 | $Spotter = new Spotter(); |
| 16 | 20 | $airline_info = $Spotter->getAllAirlineInfo($airline_icao); |
@@ -41,14 +45,21 @@ discard block |
||
| 41 | 45 | <script type="text/javascript" src="<?php echo $globalURL; ?>/js/datamaps.world.min.js"></script> |
| 42 | 46 | <div class="column"> |
| 43 | 47 | <div class="info"> |
| 44 | - <h1><?php if (isset($airline_name)) echo _("Statistics for ").$airline_name; else echo _("Statistics"); ?></h1> |
|
| 48 | + <h1><?php if (isset($airline_name)) { |
|
| 49 | + echo _("Statistics for ").$airline_name; |
|
| 50 | +} else { |
|
| 51 | + echo _("Statistics"); |
|
| 52 | +} |
|
| 53 | +?></h1> |
|
| 45 | 54 | <?php |
| 46 | 55 | $last_update = $Stats->getLastStatsUpdate(); |
| 47 | 56 | //if (isset($last_update[0]['value'])) print '<!-- Last update : '.$last_update[0]['value'].' -->'; |
| 48 | 57 | if (isset($last_update[0]['value'])) { |
| 49 | 58 | date_default_timezone_set('UTC'); |
| 50 | 59 | $lastupdate = strtotime($last_update[0]['value']); |
| 51 | - if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone); |
|
| 60 | + if (isset($globalTimezone) && $globalTimezone != '') { |
|
| 61 | + date_default_timezone_set($globalTimezone); |
|
| 62 | + } |
|
| 52 | 63 | print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>'; |
| 53 | 64 | } |
| 54 | 65 | ?> |
@@ -100,8 +111,9 @@ discard block |
||
| 100 | 111 | <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
| 101 | 112 | <?php |
| 102 | 113 | $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
| 103 | - if (count($aircraft_array) == 0) print _("No data available"); |
|
| 104 | - else { |
|
| 114 | + if (count($aircraft_array) == 0) { |
|
| 115 | + print _("No data available"); |
|
| 116 | + } else { |
|
| 105 | 117 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 106 | 118 | $aircraft_data = ''; |
| 107 | 119 | foreach($aircraft_array as $aircraft_item) |
@@ -123,11 +135,17 @@ discard block |
||
| 123 | 135 | <?php |
| 124 | 136 | if ($year != '' && $month != '') { |
| 125 | 137 | ?> |
| 126 | - <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 138 | + <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 139 | + echo '/'.$airline_icao; |
|
| 140 | +} |
|
| 141 | +?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 127 | 142 | <?php |
| 128 | 143 | } else { |
| 129 | 144 | ?> |
| 130 | - <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 145 | + <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 146 | + echo '/'.$airline_icao; |
|
| 147 | +} |
|
| 148 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 131 | 149 | <?php |
| 132 | 150 | } |
| 133 | 151 | ?> |
@@ -158,11 +176,15 @@ discard block |
||
| 158 | 176 | print '</script>'; |
| 159 | 177 | if ($year != '' && $month != '') { |
| 160 | 178 | print '<div class="more"><a href="'.$globalURL.'/statistics/airline'; |
| 161 | - if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
|
| 179 | + if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 180 | + echo '/'.$airline_icao; |
|
| 181 | + } |
|
| 162 | 182 | print '/'.$year.'/'.$month.'/" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 163 | 183 | } else { |
| 164 | 184 | print '<div class="more"><a href="'.$globalURL.'/statistics/airline'; |
| 165 | - if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
|
| 185 | + if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 186 | + echo '/'.$airline_icao; |
|
| 187 | + } |
|
| 166 | 188 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 167 | 189 | } |
| 168 | 190 | print '</div>'; |
@@ -186,8 +208,9 @@ discard block |
||
| 186 | 208 | <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2> |
| 187 | 209 | <?php |
| 188 | 210 | $pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month); |
| 189 | - if (count($pilot_array) == 0) print _("No data available"); |
|
| 190 | - else { |
|
| 211 | + if (count($pilot_array) == 0) { |
|
| 212 | + print _("No data available"); |
|
| 213 | + } else { |
|
| 191 | 214 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 192 | 215 | $pilot_data = ''; |
| 193 | 216 | foreach($pilot_array as $pilot_item) |
@@ -206,7 +229,9 @@ discard block |
||
| 206 | 229 | } |
| 207 | 230 | print '<div class="more">'; |
| 208 | 231 | print '<a href="'.$globalURL.'/statistics/pilot'; |
| 209 | - if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
|
| 232 | + if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 233 | + echo '/'.$airline_icao; |
|
| 234 | + } |
|
| 210 | 235 | print'" class="btn btn-default btn" role="button">'._("See full statistic").'»</a>'; |
| 211 | 236 | print '</div>'; |
| 212 | 237 | ?> |
@@ -220,8 +245,9 @@ discard block |
||
| 220 | 245 | <h2><?php echo _("Top 10 Most Common Owners"); ?></h2> |
| 221 | 246 | <?php |
| 222 | 247 | $owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month); |
| 223 | - if (count($owner_array) == 0) print _("No data available"); |
|
| 224 | - else { |
|
| 248 | + if (count($owner_array) == 0) { |
|
| 249 | + print _("No data available"); |
|
| 250 | + } else { |
|
| 225 | 251 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 226 | 252 | $owner_data = ''; |
| 227 | 253 | foreach($owner_array as $owner_item) |
@@ -240,7 +266,10 @@ discard block |
||
| 240 | 266 | } |
| 241 | 267 | ?> |
| 242 | 268 | <div class="more"> |
| 243 | - <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 269 | + <a href="<?php print $globalURL; ?>/statistics/owner<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 270 | + echo '/'.$airline_icao; |
|
| 271 | +} |
|
| 272 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 244 | 273 | </div> |
| 245 | 274 | </div> |
| 246 | 275 | |
@@ -253,8 +282,9 @@ discard block |
||
| 253 | 282 | <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2> |
| 254 | 283 | <?php |
| 255 | 284 | //$flightover_array = $Stats->countAllFlightOverCountries(); |
| 256 | - if (count($flightover_array) == 0) print _("No data available"); |
|
| 257 | - else { |
|
| 285 | + if (count($flightover_array) == 0) { |
|
| 286 | + print _("No data available"); |
|
| 287 | + } else { |
|
| 258 | 288 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 259 | 289 | print 'var series = ['; |
| 260 | 290 | $flightover_data = ''; |
@@ -297,7 +327,10 @@ discard block |
||
| 297 | 327 | } |
| 298 | 328 | ?> |
| 299 | 329 | <div class="more"> |
| 300 | - <a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 330 | + <a href="<?php print $globalURL; ?>/statistics/country<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 331 | + echo '/'.$airline_icao; |
|
| 332 | +} |
|
| 333 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 301 | 334 | </div> |
| 302 | 335 | </div> |
| 303 | 336 | <?php |
@@ -364,7 +397,9 @@ discard block |
||
| 364 | 397 | print '</script>'; |
| 365 | 398 | |
| 366 | 399 | print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure'; |
| 367 | - if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
|
| 400 | + if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 401 | + echo '/'.$airline_icao; |
|
| 402 | + } |
|
| 368 | 403 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 369 | 404 | } |
| 370 | 405 | ?> |
@@ -427,7 +462,9 @@ discard block |
||
| 427 | 462 | |
| 428 | 463 | |
| 429 | 464 | print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival'; |
| 430 | - if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
|
| 465 | + if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 466 | + echo '/'.$airline_icao; |
|
| 467 | + } |
|
| 431 | 468 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 432 | 469 | } |
| 433 | 470 | ?> |
@@ -442,8 +479,9 @@ discard block |
||
| 442 | 479 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 443 | 480 | <?php |
| 444 | 481 | $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
| 445 | - if (count($year_array) == 0) print _("No data available"); |
|
| 446 | - else { |
|
| 482 | + if (count($year_array) == 0) { |
|
| 483 | + print _("No data available"); |
|
| 484 | + } else { |
|
| 447 | 485 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 448 | 486 | $year_data = ''; |
| 449 | 487 | $year_cnt = ''; |
@@ -463,7 +501,10 @@ discard block |
||
| 463 | 501 | } |
| 464 | 502 | ?> |
| 465 | 503 | <div class="more"> |
| 466 | - <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 504 | + <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 505 | + echo '/'.$airline_icao; |
|
| 506 | +} |
|
| 507 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 467 | 508 | </div> |
| 468 | 509 | </div> |
| 469 | 510 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -471,8 +512,9 @@ discard block |
||
| 471 | 512 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 472 | 513 | <?php |
| 473 | 514 | $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
| 474 | - if (count($month_array) == 0) print _("No data available"); |
|
| 475 | - else { |
|
| 515 | + if (count($month_array) == 0) { |
|
| 516 | + print _("No data available"); |
|
| 517 | + } else { |
|
| 476 | 518 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 477 | 519 | $month_data = ''; |
| 478 | 520 | $month_cnt = ''; |
@@ -493,7 +535,10 @@ discard block |
||
| 493 | 535 | } |
| 494 | 536 | ?> |
| 495 | 537 | <div class="more"> |
| 496 | - <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 538 | + <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 539 | + echo '/'.$airline_icao; |
|
| 540 | +} |
|
| 541 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 497 | 542 | </div> |
| 498 | 543 | </div> |
| 499 | 544 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -502,8 +547,9 @@ discard block |
||
| 502 | 547 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
| 503 | 548 | <?php |
| 504 | 549 | $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
| 505 | - if (empty($date_array)) print _("No data available"); |
|
| 506 | - else { |
|
| 550 | + if (empty($date_array)) { |
|
| 551 | + print _("No data available"); |
|
| 552 | + } else { |
|
| 507 | 553 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 508 | 554 | $date_data = ''; |
| 509 | 555 | $date_cnt = ''; |
@@ -524,7 +570,10 @@ discard block |
||
| 524 | 570 | } |
| 525 | 571 | ?> |
| 526 | 572 | <div class="more"> |
| 527 | - <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 573 | + <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 574 | + echo '/'.$airline_icao; |
|
| 575 | +} |
|
| 576 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 528 | 577 | </div> |
| 529 | 578 | </div> |
| 530 | 579 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -532,8 +581,9 @@ discard block |
||
| 532 | 581 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 533 | 582 | <?php |
| 534 | 583 | $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
| 535 | - if (empty($hour_array)) print _("No data available"); |
|
| 536 | - else { |
|
| 584 | + if (empty($hour_array)) { |
|
| 585 | + print _("No data available"); |
|
| 586 | + } else { |
|
| 537 | 587 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 538 | 588 | $hour_data = ''; |
| 539 | 589 | $hour_cnt = ''; |
@@ -554,7 +604,10 @@ discard block |
||
| 554 | 604 | } |
| 555 | 605 | ?> |
| 556 | 606 | <div class="more"> |
| 557 | - <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 607 | + <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') { |
|
| 608 | + echo '/'.$airline_icao; |
|
| 609 | +} |
|
| 610 | +?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
|
| 558 | 611 | </div> |
| 559 | 612 | </div> |
| 560 | 613 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -571,8 +624,9 @@ discard block |
||
| 571 | 624 | <h2><?php echo _("Fatalities by Years"); ?></h2> |
| 572 | 625 | <?php |
| 573 | 626 | $year_array = $Stats->countFatalitiesByYear(); |
| 574 | - if (count($year_array) == 0) print _("No data available"); |
|
| 575 | - else { |
|
| 627 | + if (count($year_array) == 0) { |
|
| 628 | + print _("No data available"); |
|
| 629 | + } else { |
|
| 576 | 630 | print '<div id="chart32" class="chart" width="100%"></div><script>'; |
| 577 | 631 | $year_data = ''; |
| 578 | 632 | $year_cnt = ''; |
@@ -603,8 +657,9 @@ discard block |
||
| 603 | 657 | <h2><?php echo _("Fatalities last 12 Months"); ?></h2> |
| 604 | 658 | <?php |
| 605 | 659 | $year_array = $Stats->countFatalitiesLast12Months(); |
| 606 | - if (count($year_array) == 0) print _("No data available"); |
|
| 607 | - else { |
|
| 660 | + if (count($year_array) == 0) { |
|
| 661 | + print _("No data available"); |
|
| 662 | + } else { |
|
| 608 | 663 | print '<div id="chart33" class="chart" width="100%"></div><script>'; |
| 609 | 664 | $year_data = ''; |
| 610 | 665 | $year_cnt = ''; |
@@ -664,8 +719,11 @@ discard block |
||
| 664 | 719 | $distance = $distance; |
| 665 | 720 | $unit = 'km'; |
| 666 | 721 | } |
| 667 | - if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 668 | - else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 722 | + if (!isset($polar_data)) { |
|
| 723 | + $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 724 | + } else { |
|
| 725 | + $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 726 | + } |
|
| 669 | 727 | } |
| 670 | 728 | ?> |
| 671 | 729 | <div class="col-md-6"> |
@@ -717,8 +775,11 @@ discard block |
||
| 717 | 775 | foreach ($msg as $eachmsg) { |
| 718 | 776 | //$eachmsg = $msg[0]; |
| 719 | 777 | $data = $eachmsg['source_data']; |
| 720 | - if ($data > 500) $max = (round(($data+100)/100))*100; |
|
| 721 | - else $max = 500; |
|
| 778 | + if ($data > 500) { |
|
| 779 | + $max = (round(($data+100)/100))*100; |
|
| 780 | + } else { |
|
| 781 | + $max = 500; |
|
| 782 | + } |
|
| 722 | 783 | ?> |
| 723 | 784 | <div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
| 724 | 785 | <script> |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | $Stats = new Stats(); |
| 8 | 8 | |
| 9 | 9 | if (!isset($filter_name)) $filter_name = ''; |
| 10 | -$airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
|
| 10 | +$airline_icao = (string) filter_input(INPUT_GET, 'airline', FILTER_SANITIZE_STRING); |
|
| 11 | 11 | if ($airline_icao == '' && isset($globalFilter)) { |
| 12 | 12 | if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
| 13 | 13 | } |
@@ -22,8 +22,8 @@ discard block |
||
| 22 | 22 | $title = _("Statistics"); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | -$year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
|
| 26 | -$month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
|
| 25 | +$year = filter_input(INPUT_GET, 'year', FILTER_SANITIZE_NUMBER_INT); |
|
| 26 | +$month = filter_input(INPUT_GET, 'month', FILTER_SANITIZE_NUMBER_INT); |
|
| 27 | 27 | |
| 28 | 28 | require_once('header.php'); |
| 29 | 29 | |
@@ -49,36 +49,36 @@ discard block |
||
| 49 | 49 | date_default_timezone_set('UTC'); |
| 50 | 50 | $lastupdate = strtotime($last_update[0]['value']); |
| 51 | 51 | if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone); |
| 52 | - print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>'; |
|
| 52 | + print '<i>Last update: '.date('Y-m-d G:i:s', $lastupdate).'</i>'; |
|
| 53 | 53 | } |
| 54 | 54 | ?> |
| 55 | 55 | </div> |
| 56 | 56 | <?php include('statistics-sub-menu.php'); ?> |
| 57 | 57 | <p class="global-stats"> |
| 58 | - <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Flights"); ?></span> |
|
| 59 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 60 | - <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
|
| 61 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 58 | + <span><span class="badge"><?php print number_format($Stats->countOverallFlights($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Flights"); ?></span> |
|
| 59 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 60 | + <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
|
| 61 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 62 | 62 | <?php |
| 63 | 63 | if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
| 64 | 64 | ?> |
| 65 | - <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span> |
|
| 66 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 65 | + <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Pilots"); ?></span> |
|
| 66 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 67 | 67 | <?php |
| 68 | 68 | } else { |
| 69 | 69 | ?> |
| 70 | - <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span> |
|
| 71 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 70 | + <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Owners"); ?></span> |
|
| 71 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 72 | 72 | <?php |
| 73 | 73 | } |
| 74 | 74 | ?> |
| 75 | - <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
| 76 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 75 | + <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao, $filter_name, $year, $month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
|
| 76 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 77 | 77 | <?php |
| 78 | 78 | if ($airline_icao == '') { |
| 79 | 79 | ?> |
| 80 | - <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
| 81 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 80 | + <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name, $year, $month)); ?></span> <?php echo _("Airlines"); ?></span> |
|
| 81 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 82 | 82 | <?php |
| 83 | 83 | } |
| 84 | 84 | ?> |
@@ -86,25 +86,25 @@ discard block |
||
| 86 | 86 | if (!(isset($globalIVAO) && $globalIVAO) && !(isset($globalVATSIM) && $globalVATSIM) && !(isset($globalphpVMS) && $globalphpVMS)) { |
| 87 | 87 | if ($airline_icao == '' || $airline_icao == 'all') { |
| 88 | 88 | ?> |
| 89 | - <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name,$year,$month)); ?></span> <?php echo _("Military"); ?></span> |
|
| 90 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 89 | + <span><span class="badge"><?php print number_format($Stats->countOverallMilitaryFlights($filter_name, $year, $month)); ?></span> <?php echo _("Military"); ?></span> |
|
| 90 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 91 | 91 | <?php |
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | ?> |
| 95 | 95 | </p> |
| 96 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 96 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 97 | 97 | <div class="specific-stats"> |
| 98 | 98 | <div class="row column"> |
| 99 | 99 | <div class="col-md-6"> |
| 100 | 100 | <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
| 101 | 101 | <?php |
| 102 | - $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
| 102 | + $aircraft_array = $Stats->countAllAircraftTypes(true, $airline_icao, $filter_name, $year, $month); |
|
| 103 | 103 | if (count($aircraft_array) == 0) print _("No data available"); |
| 104 | 104 | else { |
| 105 | 105 | print '<div id="chart1" class="chart" width="100%"></div><script>'; |
| 106 | 106 | $aircraft_data = ''; |
| 107 | - foreach($aircraft_array as $aircraft_item) |
|
| 107 | + foreach ($aircraft_array as $aircraft_item) |
|
| 108 | 108 | { |
| 109 | 109 | $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
| 110 | 110 | } |
@@ -133,17 +133,17 @@ discard block |
||
| 133 | 133 | ?> |
| 134 | 134 | </div> |
| 135 | 135 | </div> |
| 136 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 136 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 137 | 137 | <?php |
| 138 | 138 | // echo $airline_icao; |
| 139 | 139 | if ($airline_icao == '' || $airline_icao == 'all') { |
| 140 | - $airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month); |
|
| 140 | + $airline_array = $Stats->countAllAirlines(true, $filter_name, $year, $month); |
|
| 141 | 141 | if (count($airline_array) > 0) { |
| 142 | 142 | print '<div class="col-md-6">'; |
| 143 | 143 | print '<h2>'._("Top 10 Most Common Airline").'</h2>'; |
| 144 | 144 | print '<div id="chart2" class="chart" width="100%"></div><script>'; |
| 145 | 145 | $airline_data = ''; |
| 146 | - foreach($airline_array as $airline_item) |
|
| 146 | + foreach ($airline_array as $airline_item) |
|
| 147 | 147 | { |
| 148 | 148 | $airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],'; |
| 149 | 149 | } |
@@ -169,13 +169,13 @@ discard block |
||
| 169 | 169 | } |
| 170 | 170 | ?> |
| 171 | 171 | </div> |
| 172 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 172 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 173 | 173 | <?php |
| 174 | 174 | } |
| 175 | 175 | ?> |
| 176 | 176 | <div class="row column"> |
| 177 | 177 | <?php |
| 178 | - $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month); |
|
| 178 | + $flightover_array = $Stats->countAllFlightOverCountries(false, $airline_icao, $filter_name, $year, $month); |
|
| 179 | 179 | if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
| 180 | 180 | if (empty($flightover_array)) { |
| 181 | 181 | print '<div class="col-md-12">'; |
@@ -185,12 +185,12 @@ discard block |
||
| 185 | 185 | ?> |
| 186 | 186 | <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2> |
| 187 | 187 | <?php |
| 188 | - $pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month); |
|
| 188 | + $pilot_array = $Stats->countAllPilots(true, $airline_icao, $filter_name, $year, $month); |
|
| 189 | 189 | if (count($pilot_array) == 0) print _("No data available"); |
| 190 | 190 | else { |
| 191 | 191 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 192 | 192 | $pilot_data = ''; |
| 193 | - foreach($pilot_array as $pilot_item) |
|
| 193 | + foreach ($pilot_array as $pilot_item) |
|
| 194 | 194 | { |
| 195 | 195 | $pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],'; |
| 196 | 196 | } |
@@ -212,19 +212,19 @@ discard block |
||
| 212 | 212 | ?> |
| 213 | 213 | </div> |
| 214 | 214 | |
| 215 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 215 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 216 | 216 | <?php |
| 217 | 217 | } else { |
| 218 | 218 | ?> |
| 219 | 219 | <div class="col-md-6"> |
| 220 | 220 | <h2><?php echo _("Top 10 Most Common Owners"); ?></h2> |
| 221 | 221 | <?php |
| 222 | - $owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month); |
|
| 222 | + $owner_array = $Stats->countAllOwners(true, $airline_icao, $filter_name, $year, $month); |
|
| 223 | 223 | if (count($owner_array) == 0) print _("No data available"); |
| 224 | 224 | else { |
| 225 | 225 | print '<div id="chart7" class="chart" width="100%"></div><script>'; |
| 226 | 226 | $owner_data = ''; |
| 227 | - foreach($owner_array as $owner_item) |
|
| 227 | + foreach ($owner_array as $owner_item) |
|
| 228 | 228 | { |
| 229 | 229 | $owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],'; |
| 230 | 230 | } |
@@ -244,7 +244,7 @@ discard block |
||
| 244 | 244 | </div> |
| 245 | 245 | </div> |
| 246 | 246 | |
| 247 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 247 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 248 | 248 | <?php |
| 249 | 249 | } |
| 250 | 250 | if (!empty($flightover_array)) { |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | print '<div id="chart10" class="chart" width="100%"></div><script>'; |
| 259 | 259 | print 'var series = ['; |
| 260 | 260 | $flightover_data = ''; |
| 261 | - foreach($flightover_array as $flightover_item) |
|
| 261 | + foreach ($flightover_array as $flightover_item) |
|
| 262 | 262 | { |
| 263 | 263 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
| 264 | 264 | } |
@@ -304,21 +304,21 @@ discard block |
||
| 304 | 304 | } |
| 305 | 305 | ?> |
| 306 | 306 | </div> |
| 307 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 307 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 308 | 308 | |
| 309 | 309 | |
| 310 | 310 | </div> |
| 311 | 311 | <div class="row column"> |
| 312 | 312 | <div class="col-md-6"> |
| 313 | 313 | <?php |
| 314 | - $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 314 | + $airport_airport_array = $Stats->countAllDepartureAirports(true, $airline_icao, $filter_name, $year, $month); |
|
| 315 | 315 | if (count($airport_airport_array) > 0) { |
| 316 | 316 | print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>'; |
| 317 | 317 | print '<div id="chart3" class="chart" width="100%"></div><script>'; |
| 318 | 318 | print "\n"; |
| 319 | 319 | print 'var series = ['; |
| 320 | 320 | $airport_data = ''; |
| 321 | - foreach($airport_airport_array as $airport_item) |
|
| 321 | + foreach ($airport_airport_array as $airport_item) |
|
| 322 | 322 | { |
| 323 | 323 | $airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],'; |
| 324 | 324 | } |
@@ -369,18 +369,18 @@ discard block |
||
| 369 | 369 | } |
| 370 | 370 | ?> |
| 371 | 371 | </div> |
| 372 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 372 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 373 | 373 | |
| 374 | 374 | <div class="col-md-6"> |
| 375 | 375 | <?php |
| 376 | - $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 376 | + $airport_airport_array2 = $Stats->countAllArrivalAirports(true, $airline_icao, $filter_name, $year, $month); |
|
| 377 | 377 | if (count($airport_airport_array2) > 0) { |
| 378 | 378 | print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>'; |
| 379 | 379 | print '<div id="chart4" class="chart" width="100%"></div><script>'; |
| 380 | 380 | print "\n"; |
| 381 | 381 | print 'var series = ['; |
| 382 | 382 | $airport_data = ''; |
| 383 | - foreach($airport_airport_array2 as $airport_item) |
|
| 383 | + foreach ($airport_airport_array2 as $airport_item) |
|
| 384 | 384 | { |
| 385 | 385 | $airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],'; |
| 386 | 386 | } |
@@ -433,7 +433,7 @@ discard block |
||
| 433 | 433 | ?> |
| 434 | 434 | </div> |
| 435 | 435 | </div> |
| 436 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 436 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 437 | 437 | <?php |
| 438 | 438 | if ($year == '' && $month == '') { |
| 439 | 439 | ?> |
@@ -441,19 +441,19 @@ discard block |
||
| 441 | 441 | <div class="col-md-6"> |
| 442 | 442 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 443 | 443 | <?php |
| 444 | - $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 444 | + $year_array = $Stats->countAllMonthsLastYear(true, $airline_icao, $filter_name); |
|
| 445 | 445 | if (count($year_array) == 0) print _("No data available"); |
| 446 | 446 | else { |
| 447 | 447 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 448 | 448 | $year_data = ''; |
| 449 | 449 | $year_cnt = ''; |
| 450 | - foreach($year_array as $year_item) |
|
| 450 | + foreach ($year_array as $year_item) |
|
| 451 | 451 | { |
| 452 | 452 | $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
| 453 | 453 | $year_cnt .= $year_item['date_count'].','; |
| 454 | 454 | } |
| 455 | 455 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 456 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 456 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 457 | 457 | print 'c3.generate({ |
| 458 | 458 | bindto: "#chart8", |
| 459 | 459 | data: { x: "x", |
@@ -466,23 +466,23 @@ discard block |
||
| 466 | 466 | <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 467 | 467 | </div> |
| 468 | 468 | </div> |
| 469 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 469 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 470 | 470 | <div class="col-md-6"> |
| 471 | 471 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 472 | 472 | <?php |
| 473 | - $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 473 | + $month_array = $Stats->countAllDatesLastMonth($airline_icao, $filter_name); |
|
| 474 | 474 | if (count($month_array) == 0) print _("No data available"); |
| 475 | 475 | else { |
| 476 | 476 | print '<div id="chart9" class="chart" width="100%"></div><script>'; |
| 477 | 477 | $month_data = ''; |
| 478 | 478 | $month_cnt = ''; |
| 479 | - foreach($month_array as $month_item) |
|
| 479 | + foreach ($month_array as $month_item) |
|
| 480 | 480 | { |
| 481 | 481 | $month_data .= '"'.$month_item['date_name'].'",'; |
| 482 | 482 | $month_cnt .= $month_item['date_count'].','; |
| 483 | 483 | } |
| 484 | 484 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 485 | - $month_cnt = "['flights',".substr($month_cnt,0,-1)."]"; |
|
| 485 | + $month_cnt = "['flights',".substr($month_cnt, 0, -1)."]"; |
|
| 486 | 486 | print 'c3.generate({ |
| 487 | 487 | bindto: "#chart9", |
| 488 | 488 | data: { x: "x", |
@@ -496,24 +496,24 @@ discard block |
||
| 496 | 496 | <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 497 | 497 | </div> |
| 498 | 498 | </div> |
| 499 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 499 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 500 | 500 | |
| 501 | 501 | <div class="col-md-6"> |
| 502 | 502 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
| 503 | 503 | <?php |
| 504 | - $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 504 | + $date_array = $Stats->countAllDatesLast7Days($airline_icao, $filter_name); |
|
| 505 | 505 | if (empty($date_array)) print _("No data available"); |
| 506 | 506 | else { |
| 507 | 507 | print '<div id="chart5" class="chart" width="100%"></div><script>'; |
| 508 | 508 | $date_data = ''; |
| 509 | 509 | $date_cnt = ''; |
| 510 | - foreach($date_array as $date_item) |
|
| 510 | + foreach ($date_array as $date_item) |
|
| 511 | 511 | { |
| 512 | 512 | $date_data .= '"'.$date_item['date_name'].'",'; |
| 513 | 513 | $date_cnt .= $date_item['date_count'].','; |
| 514 | 514 | } |
| 515 | 515 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 516 | - $date_cnt = "['flights',".substr($date_cnt,0,-1)."]"; |
|
| 516 | + $date_cnt = "['flights',".substr($date_cnt, 0, -1)."]"; |
|
| 517 | 517 | print 'c3.generate({ |
| 518 | 518 | bindto: "#chart5", |
| 519 | 519 | data: { x: "x", |
@@ -527,23 +527,23 @@ discard block |
||
| 527 | 527 | <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 528 | 528 | </div> |
| 529 | 529 | </div> |
| 530 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 530 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 531 | 531 | <div class="col-md-6"> |
| 532 | 532 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 533 | 533 | <?php |
| 534 | - $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 534 | + $hour_array = $Stats->countAllHours('hour', true, $airline_icao, $filter_name); |
|
| 535 | 535 | if (empty($hour_array)) print _("No data available"); |
| 536 | 536 | else { |
| 537 | 537 | print '<div id="chart6" class="chart" width="100%"></div><script>'; |
| 538 | 538 | $hour_data = ''; |
| 539 | 539 | $hour_cnt = ''; |
| 540 | - foreach($hour_array as $hour_item) |
|
| 540 | + foreach ($hour_array as $hour_item) |
|
| 541 | 541 | { |
| 542 | 542 | $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
| 543 | 543 | $hour_cnt .= $hour_item['hour_count'].','; |
| 544 | 544 | } |
| 545 | 545 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 546 | - $hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
|
| 546 | + $hour_cnt = "['flights',".substr($hour_cnt, 0, -1)."]"; |
|
| 547 | 547 | print 'c3.generate({ |
| 548 | 548 | bindto: "#chart6", |
| 549 | 549 | data: { |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 558 | 558 | </div> |
| 559 | 559 | </div> |
| 560 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 560 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 561 | 561 | </div> |
| 562 | 562 | <?php |
| 563 | 563 | } |
@@ -576,13 +576,13 @@ discard block |
||
| 576 | 576 | print '<div id="chart32" class="chart" width="100%"></div><script>'; |
| 577 | 577 | $year_data = ''; |
| 578 | 578 | $year_cnt = ''; |
| 579 | - foreach($year_array as $year_item) |
|
| 579 | + foreach ($year_array as $year_item) |
|
| 580 | 580 | { |
| 581 | 581 | $year_data .= '"'.$year_item['year'].'-01-01",'; |
| 582 | 582 | $year_cnt .= $year_item['count'].','; |
| 583 | 583 | } |
| 584 | 584 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 585 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 585 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 586 | 586 | print 'c3.generate({ |
| 587 | 587 | bindto: "#chart32", |
| 588 | 588 | data: { x: "x", |
@@ -596,7 +596,7 @@ discard block |
||
| 596 | 596 | <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 597 | 597 | </div> |
| 598 | 598 | </div> |
| 599 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 599 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 600 | 600 | |
| 601 | 601 | <div class="row column"> |
| 602 | 602 | <div class="col-md-6"> |
@@ -608,13 +608,13 @@ discard block |
||
| 608 | 608 | print '<div id="chart33" class="chart" width="100%"></div><script>'; |
| 609 | 609 | $year_data = ''; |
| 610 | 610 | $year_cnt = ''; |
| 611 | - foreach($year_array as $year_item) |
|
| 611 | + foreach ($year_array as $year_item) |
|
| 612 | 612 | { |
| 613 | 613 | $year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",'; |
| 614 | 614 | $year_cnt .= $year_item['count'].','; |
| 615 | 615 | } |
| 616 | 616 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 617 | - $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
|
| 617 | + $year_cnt = "['flights',".substr($year_cnt, 0, -1)."]"; |
|
| 618 | 618 | print 'c3.generate({ |
| 619 | 619 | bindto: "#chart33", |
| 620 | 620 | data: { x: "x", |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 628 | 628 | </div> |
| 629 | 629 | </div> |
| 630 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 630 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 631 | 631 | <br/> |
| 632 | 632 | <?php |
| 633 | 633 | } |
@@ -640,9 +640,9 @@ discard block |
||
| 640 | 640 | <?php |
| 641 | 641 | //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
| 642 | 642 | if ($year == '' && $month == '') { |
| 643 | - $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d')); |
|
| 643 | + $polar = $Stats->getStatsSource('polar', date('Y'), date('m'), date('d')); |
|
| 644 | 644 | } else { |
| 645 | - $polar = $Stats->getStatsSource('polar',$year,$month); |
|
| 645 | + $polar = $Stats->getStatsSource('polar', $year, $month); |
|
| 646 | 646 | } |
| 647 | 647 | if (!empty($polar)) { |
| 648 | 648 | print '<h2>'._("Coverage pattern").'</h2>'; |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | unset($polar_data); |
| 651 | 651 | $Spotter = new Spotter(); |
| 652 | 652 | $data = json_decode($eachpolar['source_data']); |
| 653 | - foreach($data as $value => $key) { |
|
| 653 | + foreach ($data as $value => $key) { |
|
| 654 | 654 | $direction = $Spotter->parseDirection(($value*22.5)); |
| 655 | 655 | $distance = $key; |
| 656 | 656 | $unit = 'km'; |
@@ -670,7 +670,7 @@ discard block |
||
| 670 | 670 | ?> |
| 671 | 671 | <div class="col-md-6"> |
| 672 | 672 | <h4><?php print $eachpolar['source_name']; ?></h4> |
| 673 | - <div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
|
| 673 | + <div id="polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
|
| 674 | 674 | <script> |
| 675 | 675 | (function() { |
| 676 | 676 | var margin = {top: 100, right: 100, bottom: 100, left: 100}, |
@@ -694,7 +694,7 @@ discard block |
||
| 694 | 694 | color: color, |
| 695 | 695 | unit: '<?php echo $unit; ?>' |
| 696 | 696 | }; |
| 697 | - RadarChart("#polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions); |
|
| 697 | + RadarChart("#polar-<?php print str_replace(' ', '_', strtolower($eachpolar['source_name'])); ?>", data, radarChartOptions); |
|
| 698 | 698 | })(); |
| 699 | 699 | </script> |
| 700 | 700 | </div> |
@@ -708,22 +708,22 @@ discard block |
||
| 708 | 708 | <?php |
| 709 | 709 | //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg'); |
| 710 | 710 | if ($year == '' && $month == '') { |
| 711 | - $msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d')); |
|
| 711 | + $msg = $Stats->getStatsSource('msg', date('Y'), date('m'), date('d')); |
|
| 712 | 712 | } else { |
| 713 | - $msg = $Stats->getStatsSource('msg',$year,$month); |
|
| 713 | + $msg = $Stats->getStatsSource('msg', $year, $month); |
|
| 714 | 714 | } |
| 715 | 715 | if (!empty($msg)) { |
| 716 | 716 | print '<h2>'._("Messages received").'</h2>'; |
| 717 | 717 | foreach ($msg as $eachmsg) { |
| 718 | 718 | //$eachmsg = $msg[0]; |
| 719 | 719 | $data = $eachmsg['source_data']; |
| 720 | - if ($data > 500) $max = (round(($data+100)/100))*100; |
|
| 720 | + if ($data > 500) $max = (round(($data + 100)/100))*100; |
|
| 721 | 721 | else $max = 500; |
| 722 | 722 | ?> |
| 723 | - <div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
|
| 723 | + <div id="msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
|
| 724 | 724 | <script> |
| 725 | 725 | var g = new JustGage({ |
| 726 | - id: "msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>", |
|
| 726 | + id: "msg-<?php print str_replace(' ', '_', strtolower($eachmsg['source_name'])); ?>", |
|
| 727 | 727 | value: <?php echo $data; ?>, |
| 728 | 728 | min: 0, |
| 729 | 729 | max: <?php print $max; ?>, |
@@ -745,9 +745,9 @@ discard block |
||
| 745 | 745 | <?php |
| 746 | 746 | //$hist = $Stats->getStatsSource(date('Y-m-d'),'hist'); |
| 747 | 747 | if ($year == '' && $month == '') { |
| 748 | - $hist = $Stats->getStatsSource('hist',date('Y'),date('m'),date('d')); |
|
| 748 | + $hist = $Stats->getStatsSource('hist', date('Y'), date('m'), date('d')); |
|
| 749 | 749 | } else { |
| 750 | - $hist = $Stats->getStatsSource('hist',$year,$month); |
|
| 750 | + $hist = $Stats->getStatsSource('hist', $year, $month); |
|
| 751 | 751 | } |
| 752 | 752 | foreach ($hist as $hists) { |
| 753 | 753 | //$hist_data = ''; |
@@ -756,7 +756,7 @@ discard block |
||
| 756 | 756 | $source = $hists['source_name']; |
| 757 | 757 | $hist_array = json_decode($hists['source_data']); |
| 758 | 758 | $unit = 'km'; |
| 759 | - foreach($hist_array as $distance => $nb) |
|
| 759 | + foreach ($hist_array as $distance => $nb) |
|
| 760 | 760 | { |
| 761 | 761 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 762 | 762 | $distance = round($distance*0.539957); |
@@ -777,18 +777,18 @@ discard block |
||
| 777 | 777 | $nb_data = "['flights',".substr($nb_data, 0, -1)."]"; |
| 778 | 778 | ?> |
| 779 | 779 | <div class="col-md-6"> |
| 780 | - <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2> |
|
| 780 | + <h2><?php echo sprintf(_("Flights Distance for %s"), $source); ?></h2> |
|
| 781 | 781 | <?php |
| 782 | - print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 782 | + print '<div id="charthist-'.str_replace(' ', '_', strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 783 | 783 | print 'c3.generate({ |
| 784 | - bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'", |
|
| 784 | + bindto: "#charthist-'.str_replace(' ', '_', strtolower($source)).'", |
|
| 785 | 785 | data: { x: "x", |
| 786 | 786 | columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 787 | 787 | axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 788 | 788 | print '</script>'; |
| 789 | 789 | ?> |
| 790 | 790 | </div> |
| 791 | - <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
|
| 791 | + <!-- <?php print 'Time elapsed : '.(microtime(true) - $beginpage).'s' ?> --> |
|
| 792 | 792 | <?php |
| 793 | 793 | } |
| 794 | 794 | ?> |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | if (isset($globalTimezone) && $globalTimezone != '') date_default_timezone_set($globalTimezone); |
| 52 | 52 | print '<i>Last update: '.date('Y-m-d G:i:s',$lastupdate).'</i>'; |
| 53 | 53 | } |
| 54 | - ?> |
|
| 54 | + ?> |
|
| 55 | 55 | </div> |
| 56 | 56 | <?php include('statistics-sub-menu.php'); ?> |
| 57 | 57 | <p class="global-stats"> |
@@ -60,23 +60,23 @@ discard block |
||
| 60 | 60 | <span><span class="badge"><?php print number_format($Stats->countOverallArrival($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Arrivals seen"); ?></span> |
| 61 | 61 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 62 | 62 | <?php |
| 63 | - if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 63 | + if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 64 | 64 | ?> |
| 65 | 65 | <span><span class="badge"><?php print number_format($Stats->countOverallPilots($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Pilots"); ?></span> |
| 66 | 66 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 67 | 67 | <?php |
| 68 | - } else { |
|
| 69 | - ?> |
|
| 68 | + } else { |
|
| 69 | + ?> |
|
| 70 | 70 | <span><span class="badge"><?php print number_format($Stats->countOverallOwners($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Owners"); ?></span> |
| 71 | 71 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 72 | 72 | <?php |
| 73 | - } |
|
| 74 | - ?> |
|
| 73 | + } |
|
| 74 | + ?> |
|
| 75 | 75 | <span><span class="badge"><?php print number_format($Stats->countOverallAircrafts($airline_icao,$filter_name,$year,$month)); ?></span> <?php echo _("Aircrafts types"); ?></span> |
| 76 | 76 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 77 | 77 | <?php |
| 78 | - if ($airline_icao == '') { |
|
| 79 | - ?> |
|
| 78 | + if ($airline_icao == '') { |
|
| 79 | + ?> |
|
| 80 | 80 | <span><span class="badge"><?php print number_format($Stats->countOverallAirlines($filter_name,$year,$month)); ?></span> <?php echo _("Airlines"); ?></span> |
| 81 | 81 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 82 | 82 | <?php |
@@ -99,88 +99,88 @@ discard block |
||
| 99 | 99 | <div class="col-md-6"> |
| 100 | 100 | <h2><?php echo _("Top 10 Most Common Aircraft Type"); ?></h2> |
| 101 | 101 | <?php |
| 102 | - $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
| 103 | - if (count($aircraft_array) == 0) print _("No data available"); |
|
| 104 | - else { |
|
| 105 | - print '<div id="chart1" class="chart" width="100%"></div><script>'; |
|
| 106 | - $aircraft_data = ''; |
|
| 107 | - foreach($aircraft_array as $aircraft_item) |
|
| 108 | - { |
|
| 109 | - $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
| 110 | - } |
|
| 111 | - $aircraft_data = substr($aircraft_data, 0, -1); |
|
| 112 | - print 'var series = ['.$aircraft_data.'];'; |
|
| 113 | - print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 114 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);'; |
|
| 115 | - print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 116 | - print 'var aircraftype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 117 | - print 'dataset'; |
|
| 118 | - print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 119 | - print '</script>'; |
|
| 120 | - } |
|
| 121 | - ?> |
|
| 102 | + $aircraft_array = $Stats->countAllAircraftTypes(true,$airline_icao,$filter_name,$year,$month); |
|
| 103 | + if (count($aircraft_array) == 0) print _("No data available"); |
|
| 104 | + else { |
|
| 105 | + print '<div id="chart1" class="chart" width="100%"></div><script>'; |
|
| 106 | + $aircraft_data = ''; |
|
| 107 | + foreach($aircraft_array as $aircraft_item) |
|
| 108 | + { |
|
| 109 | + $aircraft_data .= '["'.$aircraft_item['aircraft_manufacturer'].' '.$aircraft_item['aircraft_name'].' ('.$aircraft_item['aircraft_icao'].')",'.$aircraft_item['aircraft_icao_count'].'],'; |
|
| 110 | + } |
|
| 111 | + $aircraft_data = substr($aircraft_data, 0, -1); |
|
| 112 | + print 'var series = ['.$aircraft_data.'];'; |
|
| 113 | + print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 114 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#e6e6f6","#1a3151"]);'; |
|
| 115 | + print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 116 | + print 'var aircraftype = new d3pie("chart1",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 117 | + print 'dataset'; |
|
| 118 | + print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 119 | + print '</script>'; |
|
| 120 | + } |
|
| 121 | + ?> |
|
| 122 | 122 | <div class="more"> |
| 123 | 123 | <?php |
| 124 | - if ($year != '' && $month != '') { |
|
| 125 | - ?> |
|
| 124 | + if ($year != '' && $month != '') { |
|
| 125 | + ?> |
|
| 126 | 126 | <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 127 | 127 | <?php |
| 128 | - } else { |
|
| 129 | - ?> |
|
| 128 | + } else { |
|
| 129 | + ?> |
|
| 130 | 130 | <a href="<?php print $globalURL; ?>/statistics/aircraft<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 131 | 131 | <?php |
| 132 | - } |
|
| 133 | - ?> |
|
| 132 | + } |
|
| 133 | + ?> |
|
| 134 | 134 | </div> |
| 135 | 135 | </div> |
| 136 | 136 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 137 | 137 | <?php |
| 138 | 138 | // echo $airline_icao; |
| 139 | - if ($airline_icao == '' || $airline_icao == 'all') { |
|
| 139 | + if ($airline_icao == '' || $airline_icao == 'all') { |
|
| 140 | 140 | $airline_array = $Stats->countAllAirlines(true,$filter_name,$year,$month); |
| 141 | 141 | if (count($airline_array) > 0) { |
| 142 | - print '<div class="col-md-6">'; |
|
| 143 | - print '<h2>'._("Top 10 Most Common Airline").'</h2>'; |
|
| 144 | - print '<div id="chart2" class="chart" width="100%"></div><script>'; |
|
| 145 | - $airline_data = ''; |
|
| 146 | - foreach($airline_array as $airline_item) |
|
| 147 | - { |
|
| 142 | + print '<div class="col-md-6">'; |
|
| 143 | + print '<h2>'._("Top 10 Most Common Airline").'</h2>'; |
|
| 144 | + print '<div id="chart2" class="chart" width="100%"></div><script>'; |
|
| 145 | + $airline_data = ''; |
|
| 146 | + foreach($airline_array as $airline_item) |
|
| 147 | + { |
|
| 148 | 148 | $airline_data .= '["'.$airline_item['airline_name'].' ('.$airline_item['airline_icao'].')",'.$airline_item['airline_count'].'],'; |
| 149 | - } |
|
| 150 | - $airline_data = substr($airline_data, 0, -1); |
|
| 151 | - print 'var series = ['.$airline_data.'];'; |
|
| 152 | - print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 153 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 154 | - print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 155 | - print 'var airlinescnt = new d3pie("chart2",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 156 | - print 'dataset'; |
|
| 157 | - print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 158 | - print '</script>'; |
|
| 159 | - if ($year != '' && $month != '') { |
|
| 149 | + } |
|
| 150 | + $airline_data = substr($airline_data, 0, -1); |
|
| 151 | + print 'var series = ['.$airline_data.'];'; |
|
| 152 | + print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 153 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 154 | + print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 155 | + print 'var airlinescnt = new d3pie("chart2",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 156 | + print 'dataset'; |
|
| 157 | + print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 158 | + print '</script>'; |
|
| 159 | + if ($year != '' && $month != '') { |
|
| 160 | 160 | print '<div class="more"><a href="'.$globalURL.'/statistics/airline'; |
| 161 | 161 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 162 | 162 | print '/'.$year.'/'.$month.'/" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 163 | - } else { |
|
| 163 | + } else { |
|
| 164 | 164 | print '<div class="more"><a href="'.$globalURL.'/statistics/airline'; |
| 165 | 165 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 166 | 166 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 167 | - } |
|
| 168 | - print '</div>'; |
|
| 167 | + } |
|
| 168 | + print '</div>'; |
|
| 169 | 169 | } |
| 170 | 170 | ?> |
| 171 | 171 | </div> |
| 172 | 172 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 173 | 173 | <?php |
| 174 | - } |
|
| 174 | + } |
|
| 175 | 175 | ?> |
| 176 | 176 | <div class="row column"> |
| 177 | 177 | <?php |
| 178 | - $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month); |
|
| 179 | - if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 178 | + $flightover_array = $Stats->countAllFlightOverCountries(false,$airline_icao,$filter_name,$year,$month); |
|
| 179 | + if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS)) { |
|
| 180 | 180 | if (empty($flightover_array)) { |
| 181 | - print '<div class="col-md-12">'; |
|
| 181 | + print '<div class="col-md-12">'; |
|
| 182 | 182 | } else { |
| 183 | - print '<div class="col-md-6">'; |
|
| 183 | + print '<div class="col-md-6">'; |
|
| 184 | 184 | } |
| 185 | 185 | ?> |
| 186 | 186 | <h2><?php echo _("Top 10 Most Common Pilots"); ?></h2> |
@@ -188,23 +188,23 @@ discard block |
||
| 188 | 188 | $pilot_array = $Stats->countAllPilots(true,$airline_icao,$filter_name,$year,$month); |
| 189 | 189 | if (count($pilot_array) == 0) print _("No data available"); |
| 190 | 190 | else { |
| 191 | - print '<div id="chart7" class="chart" width="100%"></div><script>'; |
|
| 192 | - $pilot_data = ''; |
|
| 193 | - foreach($pilot_array as $pilot_item) |
|
| 194 | - { |
|
| 191 | + print '<div id="chart7" class="chart" width="100%"></div><script>'; |
|
| 192 | + $pilot_data = ''; |
|
| 193 | + foreach($pilot_array as $pilot_item) |
|
| 194 | + { |
|
| 195 | 195 | $pilot_data .= '["'.$pilot_item['pilot_name'].' ('.$pilot_item['pilot_id'].')",'.$pilot_item['pilot_count'].'],'; |
| 196 | - } |
|
| 197 | - $pilot_data = substr($pilot_data, 0, -1); |
|
| 198 | - print 'var series = ['.$pilot_data.'];'; |
|
| 199 | - print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 200 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 201 | - print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 202 | - print 'var pilotcnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 203 | - print 'dataset'; |
|
| 204 | - print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 205 | - print '</script>'; |
|
| 206 | - } |
|
| 207 | - print '<div class="more">'; |
|
| 196 | + } |
|
| 197 | + $pilot_data = substr($pilot_data, 0, -1); |
|
| 198 | + print 'var series = ['.$pilot_data.'];'; |
|
| 199 | + print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 200 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 201 | + print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 202 | + print 'var pilotcnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 203 | + print 'dataset'; |
|
| 204 | + print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 205 | + print '</script>'; |
|
| 206 | + } |
|
| 207 | + print '<div class="more">'; |
|
| 208 | 208 | print '<a href="'.$globalURL.'/statistics/pilot'; |
| 209 | 209 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 210 | 210 | print'" class="btn btn-default btn" role="button">'._("See full statistic").'»</a>'; |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | |
| 215 | 215 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 216 | 216 | <?php |
| 217 | - } else { |
|
| 217 | + } else { |
|
| 218 | 218 | ?> |
| 219 | 219 | <div class="col-md-6"> |
| 220 | 220 | <h2><?php echo _("Top 10 Most Common Owners"); ?></h2> |
@@ -222,21 +222,21 @@ discard block |
||
| 222 | 222 | $owner_array = $Stats->countAllOwners(true,$airline_icao,$filter_name,$year,$month); |
| 223 | 223 | if (count($owner_array) == 0) print _("No data available"); |
| 224 | 224 | else { |
| 225 | - print '<div id="chart7" class="chart" width="100%"></div><script>'; |
|
| 226 | - $owner_data = ''; |
|
| 227 | - foreach($owner_array as $owner_item) |
|
| 228 | - { |
|
| 225 | + print '<div id="chart7" class="chart" width="100%"></div><script>'; |
|
| 226 | + $owner_data = ''; |
|
| 227 | + foreach($owner_array as $owner_item) |
|
| 228 | + { |
|
| 229 | 229 | $owner_data .= '["'.$owner_item['owner_name'].'",'.$owner_item['owner_count'].'],'; |
| 230 | - } |
|
| 231 | - $owner_data = substr($owner_data, 0, -1); |
|
| 232 | - print 'var series = ['.$owner_data.'];'; |
|
| 233 | - print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 234 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 235 | - print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 236 | - print 'var ownercnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 237 | - print 'dataset'; |
|
| 238 | - print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 239 | - print '</script>'; |
|
| 230 | + } |
|
| 231 | + $owner_data = substr($owner_data, 0, -1); |
|
| 232 | + print 'var series = ['.$owner_data.'];'; |
|
| 233 | + print 'var dataset = [];var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 234 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 235 | + print 'series.forEach(function(item){var lab = item[0], value = item[1]; dataset.push({"label":lab,"value":value,"color":paletteScale(value)});});'; |
|
| 236 | + print 'var ownercnt = new d3pie("chart7",{"header":{"title":{"fontSize":24,"font":"open sans"},"subtitle":{"color":"#999999","fontSize":12,"font":"open sans"},"titleSubtitlePadding":9},"footer":{"color":"#999999","fontSize":10,"font":"open sans","location":"bottom-left"},"size":{"canvasWidth":700,"pieOuterRadius":"60%"},"data":{"sortOrder":"value-desc","content":'; |
|
| 237 | + print 'dataset'; |
|
| 238 | + print '},"labels":{"outer":{"pieDistance":32},"inner":{"hideWhenLessThanPercentage":3},"mainLabel":{"fontSize":11},"percentage":{"color":"#ffffff","decimalPlaces":0},"value":{"color":"#adadad","fontSize":11},"lines":{"enabled":true},"truncation":{"enabled":true}},"effects":{"pullOutSegmentOnClick":{"effect":"linear","speed":400,"size":8}},"misc":{"gradient":{"enabled":true,"percentage":100}}});'; |
|
| 239 | + print '</script>'; |
|
| 240 | 240 | } |
| 241 | 241 | ?> |
| 242 | 242 | <div class="more"> |
@@ -246,8 +246,8 @@ discard block |
||
| 246 | 246 | |
| 247 | 247 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 248 | 248 | <?php |
| 249 | - } |
|
| 250 | - if (!empty($flightover_array)) { |
|
| 249 | + } |
|
| 250 | + if (!empty($flightover_array)) { |
|
| 251 | 251 | ?> |
| 252 | 252 | <div class="col-md-6"> |
| 253 | 253 | <h2><?php echo _("Top 20 Most Common Country a Flight was Over"); ?></h2> |
@@ -255,20 +255,20 @@ discard block |
||
| 255 | 255 | //$flightover_array = $Stats->countAllFlightOverCountries(); |
| 256 | 256 | if (count($flightover_array) == 0) print _("No data available"); |
| 257 | 257 | else { |
| 258 | - print '<div id="chart10" class="chart" width="100%"></div><script>'; |
|
| 259 | - print 'var series = ['; |
|
| 260 | - $flightover_data = ''; |
|
| 261 | - foreach($flightover_array as $flightover_item) |
|
| 262 | - { |
|
| 258 | + print '<div id="chart10" class="chart" width="100%"></div><script>'; |
|
| 259 | + print 'var series = ['; |
|
| 260 | + $flightover_data = ''; |
|
| 261 | + foreach($flightover_array as $flightover_item) |
|
| 262 | + { |
|
| 263 | 263 | $flightover_data .= '[ "'.$flightover_item['flight_country_iso3'].'",'.$flightover_item['flight_count'].'],'; |
| 264 | - } |
|
| 265 | - $flightover_data = substr($flightover_data, 0, -1); |
|
| 266 | - print $flightover_data; |
|
| 267 | - print '];'; |
|
| 268 | - print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 269 | - print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 270 | - print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});'; |
|
| 271 | - print 'new Datamap({ |
|
| 264 | + } |
|
| 265 | + $flightover_data = substr($flightover_data, 0, -1); |
|
| 266 | + print $flightover_data; |
|
| 267 | + print '];'; |
|
| 268 | + print 'var dataset = {};var onlyValues = series.map(function(obj){ return obj[1]; });var minValue = Math.min.apply(null, onlyValues), maxValue = Math.max.apply(null, onlyValues);'; |
|
| 269 | + print 'var paletteScale = d3.scale.log().domain([minValue,maxValue]).range(["#EFEFFF","#001830"]);'; |
|
| 270 | + print 'series.forEach(function(item){var iso = item[0], value = item[1]; dataset[iso] = { numberOfThings: value, fillColor: paletteScale(value) };});'; |
|
| 271 | + print 'new Datamap({ |
|
| 272 | 272 | element: document.getElementById("chart10"), |
| 273 | 273 | projection: "mercator", // big world map |
| 274 | 274 | fills: { defaultFill: "#F5F5F5" }, |
@@ -293,7 +293,7 @@ discard block |
||
| 293 | 293 | } |
| 294 | 294 | } |
| 295 | 295 | });"; |
| 296 | - print '</script>'; |
|
| 296 | + print '</script>'; |
|
| 297 | 297 | } |
| 298 | 298 | ?> |
| 299 | 299 | <div class="more"> |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | </div> |
| 302 | 302 | </div> |
| 303 | 303 | <?php |
| 304 | - } |
|
| 304 | + } |
|
| 305 | 305 | ?> |
| 306 | 306 | </div> |
| 307 | 307 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -311,13 +311,13 @@ discard block |
||
| 311 | 311 | <div class="row column"> |
| 312 | 312 | <div class="col-md-6"> |
| 313 | 313 | <?php |
| 314 | - $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 315 | - if (count($airport_airport_array) > 0) { |
|
| 314 | + $airport_airport_array = $Stats->countAllDepartureAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 315 | + if (count($airport_airport_array) > 0) { |
|
| 316 | 316 | print '<h2>'._("Top 10 Most Common Departure Airports").'</h2>'; |
| 317 | 317 | print '<div id="chart3" class="chart" width="100%"></div><script>'; |
| 318 | - print "\n"; |
|
| 319 | - print 'var series = ['; |
|
| 320 | - $airport_data = ''; |
|
| 318 | + print "\n"; |
|
| 319 | + print 'var series = ['; |
|
| 320 | + $airport_data = ''; |
|
| 321 | 321 | foreach($airport_airport_array as $airport_item) |
| 322 | 322 | { |
| 323 | 323 | $airport_data .= '[ "'.$airport_item['airport_departure_icao_count'].'", "'.$airport_item['airport_departure_icao'].'",'.$airport_item['airport_departure_latitude'].','.$airport_item['airport_departure_longitude'].'],'; |
@@ -366,20 +366,20 @@ discard block |
||
| 366 | 366 | print '<div class="more"><a href="'.$globalURL.'/statistics/airport-departure'; |
| 367 | 367 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 368 | 368 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 369 | - } |
|
| 369 | + } |
|
| 370 | 370 | ?> |
| 371 | 371 | </div> |
| 372 | 372 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 373 | 373 | |
| 374 | 374 | <div class="col-md-6"> |
| 375 | 375 | <?php |
| 376 | - $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 377 | - if (count($airport_airport_array2) > 0) { |
|
| 376 | + $airport_airport_array2 = $Stats->countAllArrivalAirports(true,$airline_icao,$filter_name,$year,$month); |
|
| 377 | + if (count($airport_airport_array2) > 0) { |
|
| 378 | 378 | print '<h2>'._("Top 10 Most Common Arrival Airports").'</h2>'; |
| 379 | 379 | print '<div id="chart4" class="chart" width="100%"></div><script>'; |
| 380 | - print "\n"; |
|
| 381 | - print 'var series = ['; |
|
| 382 | - $airport_data = ''; |
|
| 380 | + print "\n"; |
|
| 381 | + print 'var series = ['; |
|
| 382 | + $airport_data = ''; |
|
| 383 | 383 | foreach($airport_airport_array2 as $airport_item) |
| 384 | 384 | { |
| 385 | 385 | $airport_data .= '[ "'.$airport_item['airport_arrival_icao_count'].'", "'.$airport_item['airport_arrival_icao'].'",'.$airport_item['airport_arrival_latitude'].','.$airport_item['airport_arrival_longitude'].'],'; |
@@ -429,28 +429,28 @@ discard block |
||
| 429 | 429 | print '<div class="more"><a href="'.$globalURL.'/statistics/airport-arrival'; |
| 430 | 430 | if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; |
| 431 | 431 | print '" class="btn btn-default btn" role="button">'._("See full statistic").'»</a></div>'; |
| 432 | - } |
|
| 432 | + } |
|
| 433 | 433 | ?> |
| 434 | 434 | </div> |
| 435 | 435 | </div> |
| 436 | 436 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 437 | 437 | <?php |
| 438 | - if ($year == '' && $month == '') { |
|
| 438 | + if ($year == '' && $month == '') { |
|
| 439 | 439 | ?> |
| 440 | 440 | <div class="row column"> |
| 441 | 441 | <div class="col-md-6"> |
| 442 | 442 | <h2><?php echo _("Busiest Months of the last 12 Months"); ?></h2> |
| 443 | 443 | <?php |
| 444 | - $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 445 | - if (count($year_array) == 0) print _("No data available"); |
|
| 446 | - else { |
|
| 444 | + $year_array = $Stats->countAllMonthsLastYear(true,$airline_icao,$filter_name); |
|
| 445 | + if (count($year_array) == 0) print _("No data available"); |
|
| 446 | + else { |
|
| 447 | 447 | print '<div id="chart8" class="chart" width="100%"></div><script>'; |
| 448 | 448 | $year_data = ''; |
| 449 | 449 | $year_cnt = ''; |
| 450 | 450 | foreach($year_array as $year_item) |
| 451 | 451 | { |
| 452 | - $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
|
| 453 | - $year_cnt .= $year_item['date_count'].','; |
|
| 452 | + $year_data .= '"'.$year_item['year_name'].'-'.$year_item['month_name'].'-01'.'",'; |
|
| 453 | + $year_cnt .= $year_item['date_count'].','; |
|
| 454 | 454 | } |
| 455 | 455 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 456 | 456 | $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
@@ -460,8 +460,8 @@ discard block |
||
| 460 | 460 | columns: ['.$year_data.','.$year_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 461 | 461 | axis: { x: { type: "timeseries", localtime: false,tick: { format: "%Y-%m"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 462 | 462 | print '</script>'; |
| 463 | - } |
|
| 464 | - ?> |
|
| 463 | + } |
|
| 464 | + ?> |
|
| 465 | 465 | <div class="more"> |
| 466 | 466 | <a href="<?php print $globalURL; ?>/statistics/year<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 467 | 467 | </div> |
@@ -470,16 +470,16 @@ discard block |
||
| 470 | 470 | <div class="col-md-6"> |
| 471 | 471 | <h2><?php echo _("Busiest Day in the last Month"); ?></h2> |
| 472 | 472 | <?php |
| 473 | - $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 474 | - if (count($month_array) == 0) print _("No data available"); |
|
| 475 | - else { |
|
| 476 | - print '<div id="chart9" class="chart" width="100%"></div><script>'; |
|
| 477 | - $month_data = ''; |
|
| 473 | + $month_array = $Stats->countAllDatesLastMonth($airline_icao,$filter_name); |
|
| 474 | + if (count($month_array) == 0) print _("No data available"); |
|
| 475 | + else { |
|
| 476 | + print '<div id="chart9" class="chart" width="100%"></div><script>'; |
|
| 477 | + $month_data = ''; |
|
| 478 | 478 | $month_cnt = ''; |
| 479 | 479 | foreach($month_array as $month_item) |
| 480 | 480 | { |
| 481 | - $month_data .= '"'.$month_item['date_name'].'",'; |
|
| 482 | - $month_cnt .= $month_item['date_count'].','; |
|
| 481 | + $month_data .= '"'.$month_item['date_name'].'",'; |
|
| 482 | + $month_cnt .= $month_item['date_count'].','; |
|
| 483 | 483 | } |
| 484 | 484 | $month_data = "['x',".substr($month_data, 0, -1)."]"; |
| 485 | 485 | $month_cnt = "['flights',".substr($month_cnt,0,-1)."]"; |
@@ -489,9 +489,9 @@ discard block |
||
| 489 | 489 | columns: ['.$month_data.','.$month_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 490 | 490 | axis: { x: { type: "timeseries", localtime: false,tick: { format: "%Y-%m-%d"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 491 | 491 | |
| 492 | - print '</script>'; |
|
| 493 | - } |
|
| 494 | - ?> |
|
| 492 | + print '</script>'; |
|
| 493 | + } |
|
| 494 | + ?> |
|
| 495 | 495 | <div class="more"> |
| 496 | 496 | <a href="<?php print $globalURL; ?>/statistics/month<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 497 | 497 | </div> |
@@ -501,16 +501,16 @@ discard block |
||
| 501 | 501 | <div class="col-md-6"> |
| 502 | 502 | <h2><?php echo _("Busiest Day in the last 7 Days"); ?></h2> |
| 503 | 503 | <?php |
| 504 | - $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 505 | - if (empty($date_array)) print _("No data available"); |
|
| 506 | - else { |
|
| 507 | - print '<div id="chart5" class="chart" width="100%"></div><script>'; |
|
| 508 | - $date_data = ''; |
|
| 504 | + $date_array = $Stats->countAllDatesLast7Days($airline_icao,$filter_name); |
|
| 505 | + if (empty($date_array)) print _("No data available"); |
|
| 506 | + else { |
|
| 507 | + print '<div id="chart5" class="chart" width="100%"></div><script>'; |
|
| 508 | + $date_data = ''; |
|
| 509 | 509 | $date_cnt = ''; |
| 510 | 510 | foreach($date_array as $date_item) |
| 511 | 511 | { |
| 512 | - $date_data .= '"'.$date_item['date_name'].'",'; |
|
| 513 | - $date_cnt .= $date_item['date_count'].','; |
|
| 512 | + $date_data .= '"'.$date_item['date_name'].'",'; |
|
| 513 | + $date_cnt .= $date_item['date_count'].','; |
|
| 514 | 514 | } |
| 515 | 515 | $date_data = "['x',".substr($date_data, 0, -1)."]"; |
| 516 | 516 | $date_cnt = "['flights',".substr($date_cnt,0,-1)."]"; |
@@ -520,9 +520,9 @@ discard block |
||
| 520 | 520 | columns: ['.$date_data.','.$date_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 521 | 521 | axis: { x: { type: "timeseries",tick: { format: "%Y-%m-%d"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 522 | 522 | |
| 523 | - print '</script>'; |
|
| 524 | - } |
|
| 525 | - ?> |
|
| 523 | + print '</script>'; |
|
| 524 | + } |
|
| 525 | + ?> |
|
| 526 | 526 | <div class="more"> |
| 527 | 527 | <a href="<?php print $globalURL; ?>/statistics/date<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 528 | 528 | </div> |
@@ -531,16 +531,16 @@ discard block |
||
| 531 | 531 | <div class="col-md-6"> |
| 532 | 532 | <h2><?php echo _("Busiest Time of the Day"); ?></h2> |
| 533 | 533 | <?php |
| 534 | - $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 535 | - if (empty($hour_array)) print _("No data available"); |
|
| 536 | - else { |
|
| 537 | - print '<div id="chart6" class="chart" width="100%"></div><script>'; |
|
| 538 | - $hour_data = ''; |
|
| 534 | + $hour_array = $Stats->countAllHours('hour',true,$airline_icao,$filter_name); |
|
| 535 | + if (empty($hour_array)) print _("No data available"); |
|
| 536 | + else { |
|
| 537 | + print '<div id="chart6" class="chart" width="100%"></div><script>'; |
|
| 538 | + $hour_data = ''; |
|
| 539 | 539 | $hour_cnt = ''; |
| 540 | 540 | foreach($hour_array as $hour_item) |
| 541 | 541 | { |
| 542 | - $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
|
| 543 | - $hour_cnt .= $hour_item['hour_count'].','; |
|
| 542 | + $hour_data .= '"'.$hour_item['hour_name'].':00",'; |
|
| 543 | + $hour_cnt .= $hour_item['hour_count'].','; |
|
| 544 | 544 | } |
| 545 | 545 | $hour_data = "[".substr($hour_data, 0, -1)."]"; |
| 546 | 546 | $hour_cnt = "['flights',".substr($hour_cnt,0,-1)."]"; |
@@ -550,9 +550,9 @@ discard block |
||
| 550 | 550 | columns: ['.$hour_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 551 | 551 | axis: { x: { type: "category", categories: '.$hour_data.'},y: { label: "# of Flights"}},legend: { show: false }});'; |
| 552 | 552 | |
| 553 | - print '</script>'; |
|
| 554 | - } |
|
| 555 | - ?> |
|
| 553 | + print '</script>'; |
|
| 554 | + } |
|
| 555 | + ?> |
|
| 556 | 556 | <div class="more"> |
| 557 | 557 | <a href="<?php print $globalURL; ?>/statistics/time<?php if (isset($airline_icao) && $airline_icao != '' && $airline_icao != 'all') echo '/'.$airline_icao; ?>" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 558 | 558 | </div> |
@@ -560,26 +560,26 @@ discard block |
||
| 560 | 560 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 561 | 561 | </div> |
| 562 | 562 | <?php |
| 563 | - } |
|
| 563 | + } |
|
| 564 | 564 | ?> |
| 565 | 565 | |
| 566 | 566 | <?php |
| 567 | - if (($airline_icao == '' || $airline_icao == 'all') && $year == '' && $month == '' && isset($globalAccidents) && $globalAccidents) { |
|
| 567 | + if (($airline_icao == '' || $airline_icao == 'all') && $year == '' && $month == '' && isset($globalAccidents) && $globalAccidents) { |
|
| 568 | 568 | ?> |
| 569 | 569 | <div class="row column"> |
| 570 | 570 | <div class="col-md-6"> |
| 571 | 571 | <h2><?php echo _("Fatalities by Years"); ?></h2> |
| 572 | 572 | <?php |
| 573 | - $year_array = $Stats->countFatalitiesByYear(); |
|
| 574 | - if (count($year_array) == 0) print _("No data available"); |
|
| 575 | - else { |
|
| 573 | + $year_array = $Stats->countFatalitiesByYear(); |
|
| 574 | + if (count($year_array) == 0) print _("No data available"); |
|
| 575 | + else { |
|
| 576 | 576 | print '<div id="chart32" class="chart" width="100%"></div><script>'; |
| 577 | - $year_data = ''; |
|
| 577 | + $year_data = ''; |
|
| 578 | 578 | $year_cnt = ''; |
| 579 | 579 | foreach($year_array as $year_item) |
| 580 | 580 | { |
| 581 | - $year_data .= '"'.$year_item['year'].'-01-01",'; |
|
| 582 | - $year_cnt .= $year_item['count'].','; |
|
| 581 | + $year_data .= '"'.$year_item['year'].'-01-01",'; |
|
| 582 | + $year_cnt .= $year_item['count'].','; |
|
| 583 | 583 | } |
| 584 | 584 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 585 | 585 | $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
@@ -590,8 +590,8 @@ discard block |
||
| 590 | 590 | axis: { x: { type: "timeseries",tick: { format: "%Y"}}, y: { label: "# of Fatalities"}},legend: { show: false }});'; |
| 591 | 591 | |
| 592 | 592 | print '</script>'; |
| 593 | - } |
|
| 594 | - ?> |
|
| 593 | + } |
|
| 594 | + ?> |
|
| 595 | 595 | <div class="more"> |
| 596 | 596 | <a href="<?php print $globalURL; ?>/statistics/fatalities/year" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 597 | 597 | </div> |
@@ -602,16 +602,16 @@ discard block |
||
| 602 | 602 | <div class="col-md-6"> |
| 603 | 603 | <h2><?php echo _("Fatalities last 12 Months"); ?></h2> |
| 604 | 604 | <?php |
| 605 | - $year_array = $Stats->countFatalitiesLast12Months(); |
|
| 606 | - if (count($year_array) == 0) print _("No data available"); |
|
| 607 | - else { |
|
| 605 | + $year_array = $Stats->countFatalitiesLast12Months(); |
|
| 606 | + if (count($year_array) == 0) print _("No data available"); |
|
| 607 | + else { |
|
| 608 | 608 | print '<div id="chart33" class="chart" width="100%"></div><script>'; |
| 609 | - $year_data = ''; |
|
| 609 | + $year_data = ''; |
|
| 610 | 610 | $year_cnt = ''; |
| 611 | 611 | foreach($year_array as $year_item) |
| 612 | 612 | { |
| 613 | - $year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",'; |
|
| 614 | - $year_cnt .= $year_item['count'].','; |
|
| 613 | + $year_data .= '"'.$year_item['year'].'-'.$year_item['month'].'-01",'; |
|
| 614 | + $year_cnt .= $year_item['count'].','; |
|
| 615 | 615 | } |
| 616 | 616 | $year_data = "['x',".substr($year_data, 0, -1)."]"; |
| 617 | 617 | $year_cnt = "['flights',".substr($year_cnt,0,-1)."]"; |
@@ -621,8 +621,8 @@ discard block |
||
| 621 | 621 | columns: ['.$year_data.','.$year_cnt.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 622 | 622 | axis: { x: { type: "timeseries",tick: { format: "%Y-%m"}}, y: { label: "# of Fatalities"}},legend: { show: false }});'; |
| 623 | 623 | print '</script>'; |
| 624 | - } |
|
| 625 | - ?> |
|
| 624 | + } |
|
| 625 | + ?> |
|
| 626 | 626 | <div class="more"> |
| 627 | 627 | <a href="<?php print $globalURL; ?>/statistics/fatalities/month" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
| 628 | 628 | </div> |
@@ -630,30 +630,30 @@ discard block |
||
| 630 | 630 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 631 | 631 | <br/> |
| 632 | 632 | <?php |
| 633 | - } |
|
| 633 | + } |
|
| 634 | 634 | ?> |
| 635 | 635 | |
| 636 | 636 | <?php |
| 637 | - if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '' && $year == '' && $month == '') { |
|
| 637 | + if (($airline_icao == '' || $airline_icao == 'all') && $filter_name == '' && $year == '' && $month == '') { |
|
| 638 | 638 | ?> |
| 639 | 639 | <div class="row column"> |
| 640 | 640 | <?php |
| 641 | - //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
|
| 642 | - if ($year == '' && $month == '') { |
|
| 643 | - $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d')); |
|
| 644 | - } else { |
|
| 645 | - $polar = $Stats->getStatsSource('polar',$year,$month); |
|
| 646 | - } |
|
| 647 | - if (!empty($polar)) { |
|
| 648 | - print '<h2>'._("Coverage pattern").'</h2>'; |
|
| 649 | - foreach ($polar as $eachpolar) { |
|
| 650 | - unset($polar_data); |
|
| 651 | - $Spotter = new Spotter(); |
|
| 652 | - $data = json_decode($eachpolar['source_data']); |
|
| 653 | - foreach($data as $value => $key) { |
|
| 654 | - $direction = $Spotter->parseDirection(($value*22.5)); |
|
| 655 | - $distance = $key; |
|
| 656 | - $unit = 'km'; |
|
| 641 | + //$polar = $Stats->getStatsSource(date('Y-m-d'),'polar'); |
|
| 642 | + if ($year == '' && $month == '') { |
|
| 643 | + $polar = $Stats->getStatsSource('polar',date('Y'),date('m'),date('d')); |
|
| 644 | + } else { |
|
| 645 | + $polar = $Stats->getStatsSource('polar',$year,$month); |
|
| 646 | + } |
|
| 647 | + if (!empty($polar)) { |
|
| 648 | + print '<h2>'._("Coverage pattern").'</h2>'; |
|
| 649 | + foreach ($polar as $eachpolar) { |
|
| 650 | + unset($polar_data); |
|
| 651 | + $Spotter = new Spotter(); |
|
| 652 | + $data = json_decode($eachpolar['source_data']); |
|
| 653 | + foreach($data as $value => $key) { |
|
| 654 | + $direction = $Spotter->parseDirection(($value*22.5)); |
|
| 655 | + $distance = $key; |
|
| 656 | + $unit = 'km'; |
|
| 657 | 657 | if ((!isset($_COOKIE['unitdistance']) && isset($globalUnitDistance) && $globalUnitDistance == 'nm') || (isset($_COOKIE['unitdistance']) && $_COOKIE['unitdistance'] == 'nm')) { |
| 658 | 658 | $distance = round($distance*0.539957); |
| 659 | 659 | $unit = 'nm'; |
@@ -664,10 +664,10 @@ discard block |
||
| 664 | 664 | $distance = $distance; |
| 665 | 665 | $unit = 'km'; |
| 666 | 666 | } |
| 667 | - if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 668 | - else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 669 | - } |
|
| 670 | - ?> |
|
| 667 | + if (!isset($polar_data)) $polar_data = '{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 668 | + else $polar_data = $polar_data.',{axis:"'.$direction[0]['direction_shortname'].'",value:'.$key.'}'; |
|
| 669 | + } |
|
| 670 | + ?> |
|
| 671 | 671 | <div class="col-md-6"> |
| 672 | 672 | <h4><?php print $eachpolar['source_name']; ?></h4> |
| 673 | 673 | <div id="polar-<?php print str_replace(' ','_',strtolower($eachpolar['source_name'])); ?>" class="chart" width="100%"></div> |
@@ -699,27 +699,27 @@ discard block |
||
| 699 | 699 | </script> |
| 700 | 700 | </div> |
| 701 | 701 | <?php |
| 702 | - } |
|
| 703 | - } |
|
| 704 | - ?> |
|
| 702 | + } |
|
| 703 | + } |
|
| 704 | + ?> |
|
| 705 | 705 | </div> |
| 706 | 706 | <div class="row column"> |
| 707 | 707 | <div class="col-md-6"> |
| 708 | 708 | <?php |
| 709 | - //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg'); |
|
| 710 | - if ($year == '' && $month == '') { |
|
| 711 | - $msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d')); |
|
| 712 | - } else { |
|
| 713 | - $msg = $Stats->getStatsSource('msg',$year,$month); |
|
| 714 | - } |
|
| 715 | - if (!empty($msg)) { |
|
| 716 | - print '<h2>'._("Messages received").'</h2>'; |
|
| 717 | - foreach ($msg as $eachmsg) { |
|
| 718 | - //$eachmsg = $msg[0]; |
|
| 719 | - $data = $eachmsg['source_data']; |
|
| 720 | - if ($data > 500) $max = (round(($data+100)/100))*100; |
|
| 721 | - else $max = 500; |
|
| 722 | - ?> |
|
| 709 | + //$msg = $Stats->getStatsSource(date('Y-m-d'),'msg'); |
|
| 710 | + if ($year == '' && $month == '') { |
|
| 711 | + $msg = $Stats->getStatsSource('msg',date('Y'),date('m'),date('d')); |
|
| 712 | + } else { |
|
| 713 | + $msg = $Stats->getStatsSource('msg',$year,$month); |
|
| 714 | + } |
|
| 715 | + if (!empty($msg)) { |
|
| 716 | + print '<h2>'._("Messages received").'</h2>'; |
|
| 717 | + foreach ($msg as $eachmsg) { |
|
| 718 | + //$eachmsg = $msg[0]; |
|
| 719 | + $data = $eachmsg['source_data']; |
|
| 720 | + if ($data > 500) $max = (round(($data+100)/100))*100; |
|
| 721 | + else $max = 500; |
|
| 722 | + ?> |
|
| 723 | 723 | <div id="msg-<?php print str_replace(' ','_',strtolower($eachmsg['source_name'])); ?>" class="col-md-4"></div> |
| 724 | 724 | <script> |
| 725 | 725 | var g = new JustGage({ |
@@ -735,9 +735,9 @@ discard block |
||
| 735 | 735 | }); |
| 736 | 736 | </script> |
| 737 | 737 | <?php |
| 738 | - } |
|
| 739 | - } |
|
| 740 | - ?> |
|
| 738 | + } |
|
| 739 | + } |
|
| 740 | + ?> |
|
| 741 | 741 | </div> |
| 742 | 742 | </div> |
| 743 | 743 | <div class="row column"> |
@@ -775,26 +775,26 @@ discard block |
||
| 775 | 775 | //$hist_data = substr($hist_data, 0, -1); |
| 776 | 776 | $distance_data = "['x',".substr($distance_data, 0, -1)."]"; |
| 777 | 777 | $nb_data = "['flights',".substr($nb_data, 0, -1)."]"; |
| 778 | - ?> |
|
| 778 | + ?> |
|
| 779 | 779 | <div class="col-md-6"> |
| 780 | 780 | <h2><?php echo sprintf(_("Flights Distance for %s"),$source); ?></h2> |
| 781 | 781 | <?php |
| 782 | - print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 783 | - print 'c3.generate({ |
|
| 782 | + print '<div id="charthist-'.str_replace(' ','_',strtolower($source)).'" class="chart" width="100%"></div><script>'; |
|
| 783 | + print 'c3.generate({ |
|
| 784 | 784 | bindto: "#charthist-'.str_replace(' ','_',strtolower($source)).'", |
| 785 | 785 | data: { x: "x", |
| 786 | 786 | columns: ['.$distance_data.','.$nb_data.'], types: { flights: "area"}, colors: { flights: "#1a3151"}}, |
| 787 | 787 | axis: { x: {label : { text: "Distance in '.$unit.'", position: "outer-right"}}, y: { label: "# of Flights"}},legend: { show: false }});'; |
| 788 | - print '</script>'; |
|
| 789 | - ?> |
|
| 788 | + print '</script>'; |
|
| 789 | + ?> |
|
| 790 | 790 | </div> |
| 791 | 791 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
| 792 | 792 | <?php |
| 793 | - } |
|
| 794 | - ?> |
|
| 793 | + } |
|
| 794 | + ?> |
|
| 795 | 795 | </div> |
| 796 | 796 | <?php |
| 797 | - } |
|
| 797 | + } |
|
| 798 | 798 | ?> |
| 799 | 799 | </div> |
| 800 | 800 | </div> |
@@ -72,8 +72,11 @@ discard block |
||
| 72 | 72 | $globalDBSname = $globalDBname; |
| 73 | 73 | $globalDBSuser = $globalDBuser; |
| 74 | 74 | $globalDBSpass = $globalDBpass; |
| 75 | - if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306; |
|
| 76 | - else $globalDBSport = $globalDBport; |
|
| 75 | + if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') { |
|
| 76 | + $globalDBSport = 3306; |
|
| 77 | + } else { |
|
| 78 | + $globalDBSport = $globalDBport; |
|
| 79 | + } |
|
| 77 | 80 | } else { |
| 78 | 81 | $DBname = 'default'; |
| 79 | 82 | $globalDBSdriver = $globalDBdriver; |
@@ -81,8 +84,11 @@ discard block |
||
| 81 | 84 | $globalDBSname = $globalDBname; |
| 82 | 85 | $globalDBSuser = $user; |
| 83 | 86 | $globalDBSpass = $pass; |
| 84 | - if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') $globalDBSport = 3306; |
|
| 85 | - else $globalDBSport = $globalDBport; |
|
| 87 | + if (!isset($globalDBport) || $globalDBport === NULL || $globalDBport == '') { |
|
| 88 | + $globalDBSport = 3306; |
|
| 89 | + } else { |
|
| 90 | + $globalDBSport = $globalDBport; |
|
| 91 | + } |
|
| 86 | 92 | } |
| 87 | 93 | } else { |
| 88 | 94 | $globalDBSdriver = $globalDB[$DBname]['driver']; |
@@ -90,11 +96,16 @@ discard block |
||
| 90 | 96 | $globalDBSname = $globalDB[$DBname]['name']; |
| 91 | 97 | $globalDBSuser = $globalDB[$DBname]['user']; |
| 92 | 98 | $globalDBSpass = $globalDB[$DBname]['pass']; |
| 93 | - if (isset($globalDB[$DBname]['port'])) $globalDBSport = $globalDB[$DBname]['port']; |
|
| 94 | - else $globalDBSport = 3306; |
|
| 99 | + if (isset($globalDB[$DBname]['port'])) { |
|
| 100 | + $globalDBSport = $globalDB[$DBname]['port']; |
|
| 101 | + } else { |
|
| 102 | + $globalDBSport = 3306; |
|
| 103 | + } |
|
| 95 | 104 | } |
| 96 | 105 | // Set number of try to connect to DB |
| 97 | - if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) $globalDBretry = 5; |
|
| 106 | + if (!isset($globalDBretry) || $globalDBretry == '' || $globalDBretry === NULL) { |
|
| 107 | + $globalDBretry = 5; |
|
| 108 | + } |
|
| 98 | 109 | $i = 0; |
| 99 | 110 | while (true) { |
| 100 | 111 | try { |
@@ -103,10 +114,16 @@ discard block |
||
| 103 | 114 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 104 | 115 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 105 | 116 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
| 106 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500); |
|
| 107 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 108 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 109 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 117 | + if (!isset($globalDBTimeOut)) { |
|
| 118 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500); |
|
| 119 | + } else { |
|
| 120 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 121 | + } |
|
| 122 | + if (!isset($globalDBPersistent)) { |
|
| 123 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 124 | + } else { |
|
| 125 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 126 | + } |
|
| 110 | 127 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 111 | 128 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true); |
| 112 | 129 | // Workaround against "ONLY_FULL_GROUP_BY" mode |
@@ -120,23 +137,35 @@ discard block |
||
| 120 | 137 | //$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 121 | 138 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 122 | 139 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
| 123 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200); |
|
| 124 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 125 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 126 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 140 | + if (!isset($globalDBTimeOut)) { |
|
| 141 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200); |
|
| 142 | + } else { |
|
| 143 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 144 | + } |
|
| 145 | + if (!isset($globalDBPersistent)) { |
|
| 146 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 147 | + } else { |
|
| 148 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 149 | + } |
|
| 127 | 150 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 128 | 151 | $this->dbs[$DBname]->exec('SET timezone="UTC"'); |
| 129 | 152 | } |
| 130 | 153 | break; |
| 131 | 154 | } catch(PDOException $e) { |
| 132 | 155 | $i++; |
| 133 | - if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n"; |
|
| 156 | + if (isset($globalDebug) && $globalDebug) { |
|
| 157 | + echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n"; |
|
| 158 | + } |
|
| 134 | 159 | //exit; |
| 135 | - if ($i > $globalDBretry) return false; |
|
| 160 | + if ($i > $globalDBretry) { |
|
| 161 | + return false; |
|
| 162 | + } |
|
| 136 | 163 | //return false; |
| 137 | 164 | } |
| 138 | 165 | } |
| 139 | - if ($DBname === 'default') $this->db = $this->dbs['default']; |
|
| 166 | + if ($DBname === 'default') { |
|
| 167 | + $this->db = $this->dbs['default']; |
|
| 168 | + } |
|
| 140 | 169 | return true; |
| 141 | 170 | } |
| 142 | 171 | |
@@ -148,7 +177,9 @@ discard block |
||
| 148 | 177 | } else { |
| 149 | 178 | $query = "SELECT * FROM pg_catalog.pg_tables WHERE tablename = '".$table."'"; |
| 150 | 179 | } |
| 151 | - if ($this->db == NULL) return false; |
|
| 180 | + if ($this->db == NULL) { |
|
| 181 | + return false; |
|
| 182 | + } |
|
| 152 | 183 | try { |
| 153 | 184 | //$Connection = new Connection(); |
| 154 | 185 | $results = $this->db->query($query); |
@@ -157,21 +188,28 @@ discard block |
||
| 157 | 188 | } |
| 158 | 189 | if($results->rowCount()>0) { |
| 159 | 190 | return true; |
| 191 | + } else { |
|
| 192 | + return false; |
|
| 160 | 193 | } |
| 161 | - else return false; |
|
| 162 | 194 | } |
| 163 | 195 | |
| 164 | 196 | public function connectionExists() |
| 165 | 197 | { |
| 166 | 198 | global $globalDBdriver, $globalDBCheckConnection; |
| 167 | - if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) return true; |
|
| 199 | + if (isset($globalDBCheckConnection) && $globalDBCheckConnection === FALSE) { |
|
| 200 | + return true; |
|
| 201 | + } |
|
| 168 | 202 | $query = "SELECT 1 + 1"; |
| 169 | - if ($this->db === null) return false; |
|
| 203 | + if ($this->db === null) { |
|
| 204 | + return false; |
|
| 205 | + } |
|
| 170 | 206 | try { |
| 171 | 207 | $sum = @$this->db->query($query); |
| 172 | 208 | if ($sum instanceof \PDOStatement) { |
| 173 | 209 | $sum = $sum->fetchColumn(0); |
| 174 | - } else $sum = 0; |
|
| 210 | + } else { |
|
| 211 | + $sum = 0; |
|
| 212 | + } |
|
| 175 | 213 | if (intval($sum) !== 2) { |
| 176 | 214 | return false; |
| 177 | 215 | } |
@@ -206,8 +244,9 @@ discard block |
||
| 206 | 244 | $nb = $results->fetchAll(PDO::FETCH_ASSOC); |
| 207 | 245 | if($nb[0]['nb'] > 0) { |
| 208 | 246 | return true; |
| 247 | + } else { |
|
| 248 | + return false; |
|
| 209 | 249 | } |
| 210 | - else return false; |
|
| 211 | 250 | } |
| 212 | 251 | |
| 213 | 252 | /* |
@@ -257,9 +296,12 @@ discard block |
||
| 257 | 296 | } |
| 258 | 297 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
| 259 | 298 | $sth->closeCursor(); |
| 260 | - if ($result['nb'] > 0) return true; |
|
| 261 | - else return false; |
|
| 262 | -/* } else { |
|
| 299 | + if ($result['nb'] > 0) { |
|
| 300 | + return true; |
|
| 301 | + } else { |
|
| 302 | + return false; |
|
| 303 | + } |
|
| 304 | + /* } else { |
|
| 263 | 305 | $query = "SELECT * FROM ".$table." LIMIT 0"; |
| 264 | 306 | try { |
| 265 | 307 | $results = $this->db->query($query); |
@@ -298,7 +340,9 @@ discard block |
||
| 298 | 340 | $sth->closeCursor(); |
| 299 | 341 | return $result['value']; |
| 300 | 342 | } |
| 301 | - } else return $version; |
|
| 343 | + } else { |
|
| 344 | + return $version; |
|
| 345 | + } |
|
| 302 | 346 | } |
| 303 | 347 | |
| 304 | 348 | /* |
@@ -307,9 +351,14 @@ discard block |
||
| 307 | 351 | */ |
| 308 | 352 | public function latest() { |
| 309 | 353 | global $globalNoDB; |
| 310 | - if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
| 311 | - if ($this->check_schema_version() == $this->latest_schema) return true; |
|
| 312 | - else return false; |
|
| 354 | + if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
| 355 | + return true; |
|
| 356 | + } |
|
| 357 | + if ($this->check_schema_version() == $this->latest_schema) { |
|
| 358 | + return true; |
|
| 359 | + } else { |
|
| 360 | + return false; |
|
| 361 | + } |
|
| 313 | 362 | } |
| 314 | 363 | |
| 315 | 364 | } |
@@ -6,6 +6,9 @@ discard block |
||
| 6 | 6 | public $dbs = array(); |
| 7 | 7 | public $latest_schema = 38; |
| 8 | 8 | |
| 9 | + /** |
|
| 10 | + * @param string $dbname |
|
| 11 | + */ |
|
| 9 | 12 | public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) { |
| 10 | 13 | global $globalDBdriver, $globalNoDB; |
| 11 | 14 | if (isset($globalNoDB) && $globalNoDB === TRUE) { |
@@ -141,6 +144,9 @@ discard block |
||
| 141 | 144 | return true; |
| 142 | 145 | } |
| 143 | 146 | |
| 147 | + /** |
|
| 148 | + * @param string $table |
|
| 149 | + */ |
|
| 144 | 150 | public function tableExists($table) |
| 145 | 151 | { |
| 146 | 152 | global $globalDBdriver, $globalDBname; |
@@ -190,6 +196,11 @@ discard block |
||
| 190 | 196 | /* |
| 191 | 197 | * Check if index exist |
| 192 | 198 | */ |
| 199 | + |
|
| 200 | + /** |
|
| 201 | + * @param string $table |
|
| 202 | + * @param string $index |
|
| 203 | + */ |
|
| 193 | 204 | public function indexExists($table,$index) |
| 194 | 205 | { |
| 195 | 206 | global $globalDBdriver, $globalDBname; |
@@ -232,6 +243,10 @@ discard block |
||
| 232 | 243 | return $columns; |
| 233 | 244 | } |
| 234 | 245 | |
| 246 | + /** |
|
| 247 | + * @param string $table |
|
| 248 | + * @param string $column |
|
| 249 | + */ |
|
| 235 | 250 | public function getColumnType($table,$column) { |
| 236 | 251 | $select = $this->db->query('SELECT '.$column.' FROM '.$table); |
| 237 | 252 | $tomet = $select->getColumnMeta(0); |
@@ -242,6 +257,11 @@ discard block |
||
| 242 | 257 | * Check if a column name exist in a table |
| 243 | 258 | * @return Boolean column exist or not |
| 244 | 259 | */ |
| 260 | + |
|
| 261 | + /** |
|
| 262 | + * @param string $table |
|
| 263 | + * @param string $name |
|
| 264 | + */ |
|
| 245 | 265 | public function checkColumnName($table,$name) |
| 246 | 266 | { |
| 247 | 267 | global $globalDBdriver, $globalDBname; |
@@ -7,35 +7,35 @@ discard block |
||
| 7 | 7 | public $latest_schema = 38; |
| 8 | 8 | |
| 9 | 9 | public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) { |
| 10 | - global $globalDBdriver, $globalNoDB; |
|
| 11 | - if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
| 10 | + global $globalDBdriver, $globalNoDB; |
|
| 11 | + if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
| 12 | 12 | $this->db = null; |
| 13 | - } else { |
|
| 13 | + } else { |
|
| 14 | 14 | if ($dbc === null) { |
| 15 | - if ($this->db === null && $dbname === null) { |
|
| 15 | + if ($this->db === null && $dbname === null) { |
|
| 16 | 16 | if ($user === null && $pass === null) { |
| 17 | - $this->createDBConnection(); |
|
| 17 | + $this->createDBConnection(); |
|
| 18 | 18 | } else { |
| 19 | - $this->createDBConnection(null,$user,$pass); |
|
| 19 | + $this->createDBConnection(null,$user,$pass); |
|
| 20 | 20 | } |
| 21 | - } else { |
|
| 21 | + } else { |
|
| 22 | 22 | $this->createDBConnection($dbname); |
| 23 | - } |
|
| 23 | + } |
|
| 24 | 24 | } elseif ($dbname === null || $dbname === 'default') { |
| 25 | - $this->db = $dbc; |
|
| 26 | - if ($this->connectionExists() === false) { |
|
| 25 | + $this->db = $dbc; |
|
| 26 | + if ($this->connectionExists() === false) { |
|
| 27 | 27 | /* |
| 28 | 28 | echo 'Restart Connection !!!'."\n"; |
| 29 | 29 | $e = new \Exception; |
| 30 | 30 | var_dump($e->getTraceAsString()); |
| 31 | 31 | */ |
| 32 | 32 | $this->createDBConnection(); |
| 33 | - } |
|
| 33 | + } |
|
| 34 | 34 | } else { |
| 35 | - //$this->connectionExists(); |
|
| 36 | - $this->dbs[$dbname] = $dbc; |
|
| 35 | + //$this->connectionExists(); |
|
| 36 | + $this->dbs[$dbname] = $dbc; |
|
| 37 | + } |
|
| 37 | 38 | } |
| 38 | - } |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | public function db() { |
@@ -56,11 +56,11 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | /** |
| 59 | - * Creates the database connection |
|
| 60 | - * |
|
| 61 | - * @return Boolean of the database connection |
|
| 62 | - * |
|
| 63 | - */ |
|
| 59 | + * Creates the database connection |
|
| 60 | + * |
|
| 61 | + * @return Boolean of the database connection |
|
| 62 | + * |
|
| 63 | + */ |
|
| 64 | 64 | |
| 65 | 65 | public function createDBConnection($DBname = null, $user = null, $pass = null) |
| 66 | 66 | { |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | return false; |
| 158 | 158 | } |
| 159 | 159 | if($results->rowCount()>0) { |
| 160 | - return true; |
|
| 160 | + return true; |
|
| 161 | 161 | } |
| 162 | 162 | else return false; |
| 163 | 163 | } |
@@ -174,14 +174,14 @@ discard block |
||
| 174 | 174 | $sum = $sum->fetchColumn(0); |
| 175 | 175 | } else $sum = 0; |
| 176 | 176 | if (intval($sum) !== 2) { |
| 177 | - return false; |
|
| 177 | + return false; |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | } catch(PDOException $e) { |
| 181 | 181 | if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
| 182 | - throw $e; |
|
| 183 | - } |
|
| 184 | - //echo 'error ! '.$e->getMessage(); |
|
| 182 | + throw $e; |
|
| 183 | + } |
|
| 184 | + //echo 'error ! '.$e->getMessage(); |
|
| 185 | 185 | return false; |
| 186 | 186 | } |
| 187 | 187 | return true; |
@@ -285,8 +285,8 @@ discard block |
||
| 285 | 285 | $version = 0; |
| 286 | 286 | if ($this->tableExists('aircraft')) { |
| 287 | 287 | if (!$this->tableExists('config')) { |
| 288 | - $version = '1'; |
|
| 289 | - return $version; |
|
| 288 | + $version = '1'; |
|
| 289 | + return $version; |
|
| 290 | 290 | } else { |
| 291 | 291 | $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
| 292 | 292 | try { |
@@ -307,10 +307,10 @@ discard block |
||
| 307 | 307 | * @return Boolean if latest version or not |
| 308 | 308 | */ |
| 309 | 309 | public function latest() { |
| 310 | - global $globalNoDB; |
|
| 311 | - if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
| 312 | - if ($this->check_schema_version() == $this->latest_schema) return true; |
|
| 313 | - else return false; |
|
| 310 | + global $globalNoDB; |
|
| 311 | + if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
| 312 | + if ($this->check_schema_version() == $this->latest_schema) return true; |
|
| 313 | + else return false; |
|
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | } |
@@ -1,12 +1,12 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | require_once(dirname(__FILE__).'/settings.php'); |
| 3 | 3 | |
| 4 | -class Connection{ |
|
| 4 | +class Connection { |
|
| 5 | 5 | public $db = null; |
| 6 | 6 | public $dbs = array(); |
| 7 | 7 | public $latest_schema = 38; |
| 8 | 8 | |
| 9 | - public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) { |
|
| 9 | + public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) { |
|
| 10 | 10 | global $globalDBdriver, $globalNoDB; |
| 11 | 11 | if (isset($globalNoDB) && $globalNoDB === TRUE) { |
| 12 | 12 | $this->db = null; |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | if ($user === null && $pass === null) { |
| 17 | 17 | $this->createDBConnection(); |
| 18 | 18 | } else { |
| 19 | - $this->createDBConnection(null,$user,$pass); |
|
| 19 | + $this->createDBConnection(null, $user, $pass); |
|
| 20 | 20 | } |
| 21 | 21 | } else { |
| 22 | 22 | $this->createDBConnection($dbname); |
@@ -100,14 +100,14 @@ discard block |
||
| 100 | 100 | while (true) { |
| 101 | 101 | try { |
| 102 | 102 | if ($globalDBSdriver == 'mysql') { |
| 103 | - $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass); |
|
| 103 | + $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass); |
|
| 104 | 104 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 105 | 105 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 106 | - $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
|
| 107 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500); |
|
| 108 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 109 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 110 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 106 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); |
|
| 107 | + if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500); |
|
| 108 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut); |
|
| 109 | + if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true); |
|
| 110 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent); |
|
| 111 | 111 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 112 | 112 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true); |
| 113 | 113 | // Workaround against "ONLY_FULL_GROUP_BY" mode |
@@ -117,19 +117,19 @@ discard block |
||
| 117 | 117 | $this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"'); |
| 118 | 118 | //$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"'); |
| 119 | 119 | } else { |
| 120 | - $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass); |
|
| 120 | + $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass); |
|
| 121 | 121 | //$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 122 | 122 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 123 | - $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
|
| 124 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200); |
|
| 125 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 126 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 127 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 123 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); |
|
| 124 | + if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200); |
|
| 125 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut); |
|
| 126 | + if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true); |
|
| 127 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent); |
|
| 128 | 128 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 129 | 129 | $this->dbs[$DBname]->exec('SET timezone="UTC"'); |
| 130 | 130 | } |
| 131 | 131 | break; |
| 132 | - } catch(PDOException $e) { |
|
| 132 | + } catch (PDOException $e) { |
|
| 133 | 133 | $i++; |
| 134 | 134 | if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n"; |
| 135 | 135 | //exit; |
@@ -153,10 +153,10 @@ discard block |
||
| 153 | 153 | try { |
| 154 | 154 | //$Connection = new Connection(); |
| 155 | 155 | $results = $this->db->query($query); |
| 156 | - } catch(PDOException $e) { |
|
| 156 | + } catch (PDOException $e) { |
|
| 157 | 157 | return false; |
| 158 | 158 | } |
| 159 | - if($results->rowCount()>0) { |
|
| 159 | + if ($results->rowCount() > 0) { |
|
| 160 | 160 | return true; |
| 161 | 161 | } |
| 162 | 162 | else return false; |
@@ -177,8 +177,8 @@ discard block |
||
| 177 | 177 | return false; |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | - } catch(PDOException $e) { |
|
| 181 | - if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
|
| 180 | + } catch (PDOException $e) { |
|
| 181 | + if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
|
| 182 | 182 | throw $e; |
| 183 | 183 | } |
| 184 | 184 | //echo 'error ! '.$e->getMessage(); |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | /* |
| 191 | 191 | * Check if index exist |
| 192 | 192 | */ |
| 193 | - public function indexExists($table,$index) |
|
| 193 | + public function indexExists($table, $index) |
|
| 194 | 194 | { |
| 195 | 195 | global $globalDBdriver, $globalDBname; |
| 196 | 196 | if ($globalDBdriver == 'mysql') { |
@@ -201,11 +201,11 @@ discard block |
||
| 201 | 201 | try { |
| 202 | 202 | //$Connection = new Connection(); |
| 203 | 203 | $results = $this->db->query($query); |
| 204 | - } catch(PDOException $e) { |
|
| 204 | + } catch (PDOException $e) { |
|
| 205 | 205 | return false; |
| 206 | 206 | } |
| 207 | 207 | $nb = $results->fetchAll(PDO::FETCH_ASSOC); |
| 208 | - if($nb[0]['nb'] > 0) { |
|
| 208 | + if ($nb[0]['nb'] > 0) { |
|
| 209 | 209 | return true; |
| 210 | 210 | } |
| 211 | 211 | else return false; |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | $query = "SELECT * FROM ".$table." LIMIT 0"; |
| 221 | 221 | try { |
| 222 | 222 | $results = $this->db->query($query); |
| 223 | - } catch(PDOException $e) { |
|
| 223 | + } catch (PDOException $e) { |
|
| 224 | 224 | return "error : ".$e->getMessage()."\n"; |
| 225 | 225 | } |
| 226 | 226 | $columns = array(); |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | return $columns; |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | - public function getColumnType($table,$column) { |
|
| 235 | + public function getColumnType($table, $column) { |
|
| 236 | 236 | $select = $this->db->query('SELECT '.$column.' FROM '.$table); |
| 237 | 237 | $tomet = $select->getColumnMeta(0); |
| 238 | 238 | return $tomet['native_type']; |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | * Check if a column name exist in a table |
| 243 | 243 | * @return Boolean column exist or not |
| 244 | 244 | */ |
| 245 | - public function checkColumnName($table,$name) |
|
| 245 | + public function checkColumnName($table, $name) |
|
| 246 | 246 | { |
| 247 | 247 | global $globalDBdriver, $globalDBname; |
| 248 | 248 | if ($globalDBdriver == 'mysql') { |
@@ -252,8 +252,8 @@ discard block |
||
| 252 | 252 | } |
| 253 | 253 | try { |
| 254 | 254 | $sth = $this->db()->prepare($query); |
| 255 | - $sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name)); |
|
| 256 | - } catch(PDOException $e) { |
|
| 255 | + $sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name)); |
|
| 256 | + } catch (PDOException $e) { |
|
| 257 | 257 | echo "error : ".$e->getMessage()."\n"; |
| 258 | 258 | } |
| 259 | 259 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | try { |
| 293 | 293 | $sth = $this->db->prepare($query); |
| 294 | 294 | $sth->execute(); |
| 295 | - } catch(PDOException $e) { |
|
| 295 | + } catch (PDOException $e) { |
|
| 296 | 296 | return "error : ".$e->getMessage()."\n"; |
| 297 | 297 | } |
| 298 | 298 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -89,6 +89,10 @@ discard block |
||
| 89 | 89 | 'y' => 'Yagi At QTH'); |
| 90 | 90 | |
| 91 | 91 | |
| 92 | + /** |
|
| 93 | + * @param integer $n |
|
| 94 | + * @param integer $s |
|
| 95 | + */ |
|
| 92 | 96 | private function urshift($n, $s) { |
| 93 | 97 | return ($n >= 0) ? ($n >> $s) : |
| 94 | 98 | (($n & 0x7fffffff) >> $s) | |
@@ -475,6 +479,9 @@ discard block |
||
| 475 | 479 | socket_close($this->socket); |
| 476 | 480 | } |
| 477 | 481 | |
| 482 | + /** |
|
| 483 | + * @param string $data |
|
| 484 | + */ |
|
| 478 | 485 | public function send($data) { |
| 479 | 486 | if ($this->connected === false) $this->connect(); |
| 480 | 487 | $send = socket_send( $this->socket , $data , strlen($data),0); |
@@ -90,8 +90,7 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | |
| 92 | 92 | private function urshift($n, $s) { |
| 93 | - return ($n >= 0) ? ($n >> $s) : |
|
| 94 | - (($n & 0x7fffffff) >> $s) | |
|
| 93 | + return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| |
|
| 95 | 94 | (0x40000000 >> ($s - 1)); |
| 96 | 95 | } |
| 97 | 96 | |
@@ -103,7 +102,7 @@ discard block |
||
| 103 | 102 | //$split_input = str_split($input); |
| 104 | 103 | |
| 105 | 104 | /* Find the end of header checking for NULL bytes while doing it. */ |
| 106 | - $splitpos = strpos($input,':'); |
|
| 105 | + $splitpos = strpos($input, ':'); |
|
| 107 | 106 | |
| 108 | 107 | /* Check that end was found and body has at least one byte. */ |
| 109 | 108 | if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) { |
@@ -113,15 +112,15 @@ discard block |
||
| 113 | 112 | |
| 114 | 113 | if ($debug) echo 'input : '.$input."\n"; |
| 115 | 114 | /* Save header and body. */ |
| 116 | - $body = substr($input,$splitpos+1,$input_len); |
|
| 115 | + $body = substr($input, $splitpos + 1, $input_len); |
|
| 117 | 116 | $body_len = strlen($body); |
| 118 | - $header = substr($input,0,$splitpos); |
|
| 117 | + $header = substr($input, 0, $splitpos); |
|
| 119 | 118 | //$header_len = strlen($header); |
| 120 | 119 | if ($debug) echo 'header : '.$header."\n"; |
| 121 | 120 | |
| 122 | 121 | /* Parse source, target and path. */ |
| 123 | 122 | //FLRDF0A52>APRS,qAS,LSTB |
| 124 | - if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) { |
|
| 123 | + if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/', $header, $matches)) { |
|
| 125 | 124 | $ident = $matches[1]; |
| 126 | 125 | $all_elements = $matches[2]; |
| 127 | 126 | if ($ident == 'AIRCRAFT') { |
@@ -135,14 +134,14 @@ discard block |
||
| 135 | 134 | $result['ident'] = $ident; |
| 136 | 135 | } |
| 137 | 136 | } else return false; |
| 138 | - $elements = explode(',',$all_elements); |
|
| 137 | + $elements = explode(',', $all_elements); |
|
| 139 | 138 | $source = end($elements); |
| 140 | 139 | $result['source'] = $source; |
| 141 | 140 | foreach ($elements as $element) { |
| 142 | - if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) { |
|
| 141 | + if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/', $element)) { |
|
| 143 | 142 | //echo "ok"; |
| 144 | 143 | //if ($element == 'TCPIP*') return false; |
| 145 | - } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
|
| 144 | + } elseif (!preg_match('/^([0-9A-F]{32})$/', $element)) { |
|
| 146 | 145 | if ($debug) echo 'element : '.$element."\n"; |
| 147 | 146 | return false; |
| 148 | 147 | } |
@@ -155,14 +154,14 @@ discard block |
||
| 155 | 154 | */ |
| 156 | 155 | } |
| 157 | 156 | |
| 158 | - $type = substr($body,0,1); |
|
| 157 | + $type = substr($body, 0, 1); |
|
| 159 | 158 | if ($debug) echo 'type : '.$type."\n"; |
| 160 | 159 | if ($type == ';') { |
| 161 | 160 | if (isset($result['source_type']) && $result['source_type'] == 'modes') { |
| 162 | - $result['address'] = trim(substr($body,1,9)); |
|
| 161 | + $result['address'] = trim(substr($body, 1, 9)); |
|
| 163 | 162 | } elseif (isset($result['source_type']) && $result['source_type'] == 'ais') { |
| 164 | - $result['mmsi'] = trim(substr($body,1,9)); |
|
| 165 | - } else $result['ident'] = trim(substr($body,1,9)); |
|
| 163 | + $result['mmsi'] = trim(substr($body, 1, 9)); |
|
| 164 | + } else $result['ident'] = trim(substr($body, 1, 9)); |
|
| 166 | 165 | } elseif ($type == ',') { |
| 167 | 166 | // Invalid data or test data |
| 168 | 167 | return false; |
@@ -170,24 +169,24 @@ discard block |
||
| 170 | 169 | |
| 171 | 170 | // Check for Timestamp |
| 172 | 171 | $find = false; |
| 173 | - $body_parse = substr($body,1); |
|
| 172 | + $body_parse = substr($body, 1); |
|
| 174 | 173 | //echo 'Body : '.$body."\n"; |
| 175 | - if (preg_match('/^;(.){9}\*/',$body,$matches)) { |
|
| 176 | - $body_parse = substr($body_parse,10); |
|
| 174 | + if (preg_match('/^;(.){9}\*/', $body, $matches)) { |
|
| 175 | + $body_parse = substr($body_parse, 10); |
|
| 177 | 176 | $find = true; |
| 178 | 177 | //echo $body_parse."\n"; |
| 179 | 178 | } |
| 180 | - if (preg_match('/^`(.*)\//',$body,$matches)) { |
|
| 181 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 179 | + if (preg_match('/^`(.*)\//', $body, $matches)) { |
|
| 180 | + $body_parse = substr($body_parse, strlen($matches[1]) - 1); |
|
| 182 | 181 | $find = true; |
| 183 | 182 | //echo $body_parse."\n"; |
| 184 | 183 | } |
| 185 | - if (preg_match("/^'(.*)\//",$body,$matches)) { |
|
| 186 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 184 | + if (preg_match("/^'(.*)\//", $body, $matches)) { |
|
| 185 | + $body_parse = substr($body_parse, strlen($matches[1]) - 1); |
|
| 187 | 186 | $find = true; |
| 188 | 187 | //echo $body_parse."\n"; |
| 189 | 188 | } |
| 190 | - if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) { |
|
| 189 | + if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) { |
|
| 191 | 190 | $find = true; |
| 192 | 191 | //print_r($matches); |
| 193 | 192 | $timestamp = $matches[0]; |
@@ -202,19 +201,19 @@ discard block |
||
| 202 | 201 | // This work or not ? |
| 203 | 202 | $timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]); |
| 204 | 203 | } |
| 205 | - $body_parse = substr($body_parse,7); |
|
| 204 | + $body_parse = substr($body_parse, 7); |
|
| 206 | 205 | $result['timestamp'] = $timestamp; |
| 207 | 206 | //echo date('Ymd H:i:s',$timestamp); |
| 208 | 207 | } |
| 209 | - if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) { |
|
| 208 | + if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $body_parse, $matches)) { |
|
| 210 | 209 | $find = true; |
| 211 | 210 | $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]); |
| 212 | - $body_parse = substr($body_parse,8); |
|
| 211 | + $body_parse = substr($body_parse, 8); |
|
| 213 | 212 | $result['timestamp'] = $timestamp; |
| 214 | 213 | //echo date('Ymd H:i:s',$timestamp); |
| 215 | 214 | } |
| 216 | 215 | //if (strlen($body_parse) > 19) { |
| 217 | - if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) { |
|
| 216 | + if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/', $body_parse, $matches)) { |
|
| 218 | 217 | $find = true; |
| 219 | 218 | // 4658.70N/00707.78Ez |
| 220 | 219 | //print_r(str_split($body_parse)); |
@@ -240,11 +239,11 @@ discard block |
||
| 240 | 239 | */ |
| 241 | 240 | $latitude = $lat + floatval($lat_min)/60; |
| 242 | 241 | $longitude = $lon + floatval($lon_min)/60; |
| 243 | - if ($sind == 'S') $latitude = 0-$latitude; |
|
| 244 | - if ($wind == 'W') $longitude = 0-$longitude; |
|
| 242 | + if ($sind == 'S') $latitude = 0 - $latitude; |
|
| 243 | + if ($wind == 'W') $longitude = 0 - $longitude; |
|
| 245 | 244 | $result['latitude'] = $latitude; |
| 246 | 245 | $result['longitude'] = $longitude; |
| 247 | - $body_parse = substr($body_parse,18); |
|
| 246 | + $body_parse = substr($body_parse, 18); |
|
| 248 | 247 | $body_parse_len = strlen($body_parse); |
| 249 | 248 | } |
| 250 | 249 | $body_parse_len = strlen($body_parse); |
@@ -272,7 +271,7 @@ discard block |
||
| 272 | 271 | //echo $body_parse; |
| 273 | 272 | //if ($type != ';' && $type != '>') { |
| 274 | 273 | if ($type != '') { |
| 275 | - $body_parse = substr($body_parse,1); |
|
| 274 | + $body_parse = substr($body_parse, 1); |
|
| 276 | 275 | $body_parse_len = strlen($body_parse); |
| 277 | 276 | $result['symbol_code'] = $symbol_code; |
| 278 | 277 | if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code]; |
@@ -283,16 +282,16 @@ discard block |
||
| 283 | 282 | //$body_parse_len = strlen($body_parse); |
| 284 | 283 | if ($body_parse_len >= 7) { |
| 285 | 284 | |
| 286 | - if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
|
| 287 | - $course = substr($body_parse,0,3); |
|
| 285 | + if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/', $body_parse)) { |
|
| 286 | + $course = substr($body_parse, 0, 3); |
|
| 288 | 287 | $tmp_s = intval($course); |
| 289 | 288 | if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
| 290 | - $speed = substr($body_parse,4,3); |
|
| 289 | + $speed = substr($body_parse, 4, 3); |
|
| 291 | 290 | if ($speed != '...') { |
| 292 | 291 | //$result['speed'] = round($speed*1.852); |
| 293 | 292 | $result['speed'] = intval($speed); |
| 294 | 293 | } |
| 295 | - $body_parse = substr($body_parse,7); |
|
| 294 | + $body_parse = substr($body_parse, 7); |
|
| 296 | 295 | } |
| 297 | 296 | // Check PHGR, PHG, RNG |
| 298 | 297 | } |
@@ -302,12 +301,12 @@ discard block |
||
| 302 | 301 | } |
| 303 | 302 | */ |
| 304 | 303 | if (strlen($body_parse) > 0) { |
| 305 | - if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) { |
|
| 304 | + if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/', $body_parse, $matches)) { |
|
| 306 | 305 | $altitude = intval($matches[1]); |
| 307 | 306 | //$result['altitude'] = round($altitude*0.3048); |
| 308 | 307 | $result['altitude'] = $altitude; |
| 309 | 308 | //$body_parse = trim(substr($body_parse,strlen($matches[0]))); |
| 310 | - $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse)); |
|
| 309 | + $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/', '', $body_parse)); |
|
| 311 | 310 | } |
| 312 | 311 | } |
| 313 | 312 | |
@@ -319,13 +318,13 @@ discard block |
||
| 319 | 318 | */ |
| 320 | 319 | // DAO |
| 321 | 320 | |
| 322 | - if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) { |
|
| 321 | + if (preg_match('/^!([0-9A-Z]{3})/', $body_parse, $matches)) { |
|
| 323 | 322 | |
| 324 | 323 | $dao = $matches[1]; |
| 325 | - if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) { |
|
| 324 | + if (preg_match('/^([A-Z])([0-9]{2})/', $dao)) { |
|
| 326 | 325 | $dao_split = str_split($dao); |
| 327 | - $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
|
| 328 | - $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
|
| 326 | + $lat_off = (($dao_split[1]) - 48.0)*0.001/60.0; |
|
| 327 | + $lon_off = (($dao_split[2]) - 48.0)*0.001/60.0; |
|
| 329 | 328 | |
| 330 | 329 | if ($result['latitude'] < 0) $result['latitude'] -= $lat_off; |
| 331 | 330 | else $result['latitude'] += $lat_off; |
@@ -333,44 +332,44 @@ discard block |
||
| 333 | 332 | else $result['longitude'] += $lon_off; |
| 334 | 333 | } |
| 335 | 334 | |
| 336 | - $body_parse = substr($body_parse,6); |
|
| 335 | + $body_parse = substr($body_parse, 6); |
|
| 337 | 336 | } |
| 338 | 337 | |
| 339 | - if (preg_match('/CS=([0-9A-Z]*)/',$body_parse,$matches)) { |
|
| 338 | + if (preg_match('/CS=([0-9A-Z]*)/', $body_parse, $matches)) { |
|
| 340 | 339 | $result['ident'] = $matches[1]; |
| 341 | 340 | } |
| 342 | - if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) { |
|
| 341 | + if (preg_match('/SQ=([0-9]{4})/', $body_parse, $matches)) { |
|
| 343 | 342 | $result['squawk'] = $matches[1]; |
| 344 | 343 | } |
| 345 | - if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) { |
|
| 344 | + if (preg_match('/AI=([0-9A-Z]{4})/', $body_parse, $matches)) { |
|
| 346 | 345 | $result['aircraft_icao'] = $matches[1]; |
| 347 | 346 | } |
| 348 | - if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) { |
|
| 347 | + if (preg_match('/TI=([0-9]*)/', $body_parse, $matches)) { |
|
| 349 | 348 | $result['typeid'] = $matches[1]; |
| 350 | 349 | } |
| 351 | - if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) { |
|
| 350 | + if (preg_match('/IMO=([0-9]{7})/', $body_parse, $matches)) { |
|
| 352 | 351 | $result['imo'] = $matches[1]; |
| 353 | 352 | } |
| 354 | - if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) { |
|
| 353 | + if (preg_match('/AD=([0-9]*)/', $body_parse, $matches)) { |
|
| 355 | 354 | $result['arrival_date'] = $matches[1]; |
| 356 | 355 | } |
| 357 | - if (preg_match('/AC=([0-9A-Z]*)/',$body_parse,$matches)) { |
|
| 356 | + if (preg_match('/AC=([0-9A-Z]*)/', $body_parse, $matches)) { |
|
| 358 | 357 | $result['arrival_code'] = $matches[1]; |
| 359 | 358 | } |
| 360 | 359 | // OGN comment |
| 361 | 360 | // echo "Before OGN : ".$body_parse."\n"; |
| 362 | 361 | //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) { |
| 363 | - if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) { |
|
| 362 | + if (preg_match('/^id([0-9A-F]{8})/', $body_parse, $matches)) { |
|
| 364 | 363 | $id = $matches[1]; |
| 365 | 364 | //$mode = substr($id,0,2); |
| 366 | - $address = substr($id,2); |
|
| 365 | + $address = substr($id, 2); |
|
| 367 | 366 | //print_r($matches); |
| 368 | - $addressType = (intval(substr($id,0,2),16))&3; |
|
| 367 | + $addressType = (intval(substr($id, 0, 2), 16))&3; |
|
| 369 | 368 | if ($addressType == 0) $result['addresstype'] = "RANDOM"; |
| 370 | 369 | elseif ($addressType == 1) $result['addresstype'] = "ICAO"; |
| 371 | 370 | elseif ($addressType == 2) $result['addresstype'] = "FLARM"; |
| 372 | 371 | elseif ($addressType == 3) $result['addresstype'] = "OGN"; |
| 373 | - $aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2); |
|
| 372 | + $aircraftType = $this->urshift(((intval(substr($id, 0, 2), 16))&0b1111100), 2); |
|
| 374 | 373 | $result['aircrafttype_code'] = $aircraftType; |
| 375 | 374 | if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN"; |
| 376 | 375 | elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER"; |
@@ -387,7 +386,7 @@ discard block |
||
| 387 | 386 | elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP"; |
| 388 | 387 | elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV"; |
| 389 | 388 | elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT"; |
| 390 | - $stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0; |
|
| 389 | + $stealth = (intval(substr($id, 0, 2), 16)&0b10000000) != 0; |
|
| 391 | 390 | $result['stealth'] = $stealth; |
| 392 | 391 | $result['address'] = $address; |
| 393 | 392 | } |
@@ -399,77 +398,77 @@ discard block |
||
| 399 | 398 | //$body_parse = substr($body_parse,1); |
| 400 | 399 | //$body_parse_len = strlen($body_parse); |
| 401 | 400 | |
| 402 | - if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 401 | + if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 403 | 402 | $result['wind_dir'] = intval($matches[1]); |
| 404 | - $result['wind_speed'] = round(intval($matches[2])*1.60934,1); |
|
| 405 | - $result['wind_gust'] = round(intval($matches[3])*1.60934,1); |
|
| 406 | - $result['temp'] = round(5/9*((intval($matches[4]))-32),1); |
|
| 407 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 408 | - } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 403 | + $result['wind_speed'] = round(intval($matches[2])*1.60934, 1); |
|
| 404 | + $result['wind_gust'] = round(intval($matches[3])*1.60934, 1); |
|
| 405 | + $result['temp'] = round(5/9*((intval($matches[4])) - 32), 1); |
|
| 406 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 407 | + } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 409 | 408 | $result['wind_dir'] = intval($matches[1]); |
| 410 | - $result['wind_speed'] = round($matches[2]*1.60934,1); |
|
| 411 | - $result['wind_gust'] = round($matches[3]*1.60934,1); |
|
| 412 | - $result['temp'] = round(5/9*(($matches[4])-32),1); |
|
| 413 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 414 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 409 | + $result['wind_speed'] = round($matches[2]*1.60934, 1); |
|
| 410 | + $result['wind_gust'] = round($matches[3]*1.60934, 1); |
|
| 411 | + $result['temp'] = round(5/9*(($matches[4]) - 32), 1); |
|
| 412 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 413 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 415 | 414 | $result['wind_dir'] = intval($matches[1]); |
| 416 | - $result['wind_speed'] = round($matches[2]*1.60934,1); |
|
| 417 | - $result['wind_gust'] = round($matches[3]*1.60934,1); |
|
| 418 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 419 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 415 | + $result['wind_speed'] = round($matches[2]*1.60934, 1); |
|
| 416 | + $result['wind_gust'] = round($matches[3]*1.60934, 1); |
|
| 417 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 418 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 420 | 419 | $result['wind_dir'] = intval($matches[1]); |
| 421 | - $result['wind_speed'] = round($matches[2]*1.60934,1); |
|
| 422 | - $result['wind_gust'] = round($matches[3]*1.60934,1); |
|
| 423 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 420 | + $result['wind_speed'] = round($matches[2]*1.60934, 1); |
|
| 421 | + $result['wind_gust'] = round($matches[3]*1.60934, 1); |
|
| 422 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 424 | 423 | } |
| 425 | - if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) { |
|
| 426 | - $result['temp'] = round(5/9*(($matches[1])-32),1); |
|
| 424 | + if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/', $body_parse, $matches)) { |
|
| 425 | + $result['temp'] = round(5/9*(($matches[1]) - 32), 1); |
|
| 427 | 426 | } |
| 428 | 427 | } |
| 429 | 428 | } else $result['comment'] = trim($body_parse); |
| 430 | 429 | |
| 431 | 430 | } |
| 432 | 431 | //} |
| 433 | - if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4); |
|
| 434 | - if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4); |
|
| 432 | + if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'], 4); |
|
| 433 | + if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'], 4); |
|
| 435 | 434 | if ($debug) print_r($result); |
| 436 | 435 | return $result; |
| 437 | 436 | } |
| 438 | 437 | |
| 439 | 438 | public function connect() { |
| 440 | - global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport; |
|
| 439 | + global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass, $globalName, $globalServerAPRShost, $globalServerAPRSport; |
|
| 441 | 440 | $aprs_connect = 0; |
| 442 | 441 | $aprs_keep = 120; |
| 443 | 442 | $aprs_last_tx = time(); |
| 444 | 443 | if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
| 445 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 444 | + else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName); |
|
| 446 | 445 | if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid; |
| 447 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 446 | + else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8); |
|
| 448 | 447 | if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass; |
| 449 | 448 | else $aprs_pass = '-1'; |
| 450 | 449 | |
| 451 | - $aprs_filter = ''; |
|
| 450 | + $aprs_filter = ''; |
|
| 452 | 451 | $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
| 453 | 452 | $Common = new Common(); |
| 454 | - $s = $Common->create_socket($globalServerAPRShost,$globalServerAPRSport,$errno,$errstr); |
|
| 453 | + $s = $Common->create_socket($globalServerAPRShost, $globalServerAPRSport, $errno, $errstr); |
|
| 455 | 454 | if ($s !== false) { |
| 456 | 455 | echo 'Connected to APRS server! '."\n"; |
| 457 | 456 | $authstart = time(); |
| 458 | 457 | $this->socket = $s; |
| 459 | - $send = socket_send( $this->socket , $aprs_login , strlen($aprs_login) , 0 ); |
|
| 460 | - while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) { |
|
| 458 | + $send = socket_send($this->socket, $aprs_login, strlen($aprs_login), 0); |
|
| 459 | + while ($msgin = socket_read($this->socket, 1000, PHP_NORMAL_READ)) { |
|
| 461 | 460 | if (strpos($msgin, "$aprs_ssid verified") !== FALSE) { |
| 462 | 461 | echo 'APRS user verified !'."\n"; |
| 463 | 462 | $this->connected = true; |
| 464 | 463 | return true; |
| 465 | 464 | break; |
| 466 | 465 | } |
| 467 | - if (time()-$authstart > 5) { |
|
| 466 | + if (time() - $authstart > 5) { |
|
| 468 | 467 | echo 'APRS timeout'."\n"; |
| 469 | 468 | break; |
| 470 | 469 | } |
| 471 | 470 | } |
| 472 | - socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE); |
|
| 471 | + socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE); |
|
| 473 | 472 | } |
| 474 | 473 | } |
| 475 | 474 | |
@@ -479,7 +478,7 @@ discard block |
||
| 479 | 478 | |
| 480 | 479 | public function send($data) { |
| 481 | 480 | if ($this->connected === false) $this->connect(); |
| 482 | - $send = socket_send( $this->socket , $data , strlen($data),0); |
|
| 481 | + $send = socket_send($this->socket, $data, strlen($data), 0); |
|
| 483 | 482 | if ($send === FALSE) { |
| 484 | 483 | socket_close($this->socket); |
| 485 | 484 | $this->connect(); |
@@ -488,14 +487,14 @@ discard block |
||
| 488 | 487 | } |
| 489 | 488 | |
| 490 | 489 | class APRSSpotter extends APRS { |
| 491 | - public function addLiveSpotterData($id,$ident,$aircraft_icao,$departure_airport,$arrival_airport,$latitude,$longitude,$waypoints,$altitude,$altitude_real,$heading,$speed,$datetime,$departure_airport_time,$arrival_airport_time,$squawk,$route_stop,$hex,$putinarchive,$registration,$pilot_id,$pilot_name, $verticalrate, $noarchive, $ground,$format_source,$source_name,$over_country) { |
|
| 490 | + public function addLiveSpotterData($id, $ident, $aircraft_icao, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $speed, $datetime, $departure_airport_time, $arrival_airport_time, $squawk, $route_stop, $hex, $putinarchive, $registration, $pilot_id, $pilot_name, $verticalrate, $noarchive, $ground, $format_source, $source_name, $over_country) { |
|
| 492 | 491 | $Common = new Common(); |
| 493 | 492 | if ($latitude != '' && $longitude != '') { |
| 494 | - $latitude = $Common->convertDM($latitude,'latitude'); |
|
| 495 | - $longitude = $Common->convertDM($longitude,'longitude'); |
|
| 496 | - $coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW']; |
|
| 497 | - $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000)); |
|
| 498 | - $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000)); |
|
| 493 | + $latitude = $Common->convertDM($latitude, 'latitude'); |
|
| 494 | + $longitude = $Common->convertDM($longitude, 'longitude'); |
|
| 495 | + $coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW']; |
|
| 496 | + $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000)); |
|
| 497 | + $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000)); |
|
| 499 | 498 | $w = $w1.$w2; |
| 500 | 499 | //$w = '00'; |
| 501 | 500 | $custom = ''; |
@@ -512,19 +511,19 @@ discard block |
||
| 512 | 511 | $custom .= 'AI='.$aircraft_icao; |
| 513 | 512 | } |
| 514 | 513 | if ($custom != '') $custom = ' '.$custom; |
| 515 | - $this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.' *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 514 | + $this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.' *'.date('His', strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude_real, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 516 | 515 | } |
| 517 | 516 | } |
| 518 | 517 | } |
| 519 | 518 | class APRSMarine extends APRS { |
| 520 | - public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed,$datetime, $putinarchive,$mmsi,$type,$typeid,$imo,$callsign,$arrival_code,$arrival_date,$status,$noarchive,$format_source,$source_name,$over_country) { |
|
| 519 | + public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed, $datetime, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $noarchive, $format_source, $source_name, $over_country) { |
|
| 521 | 520 | $Common = new Common(); |
| 522 | 521 | if ($latitude != '' && $longitude != '') { |
| 523 | - $latitude = $Common->convertDM($latitude,'latitude'); |
|
| 524 | - $longitude = $Common->convertDM($longitude,'longitude'); |
|
| 525 | - $coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW']; |
|
| 526 | - $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000)); |
|
| 527 | - $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000)); |
|
| 522 | + $latitude = $Common->convertDM($latitude, 'latitude'); |
|
| 523 | + $longitude = $Common->convertDM($longitude, 'longitude'); |
|
| 524 | + $coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW']; |
|
| 525 | + $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000)); |
|
| 526 | + $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000)); |
|
| 528 | 527 | $w = $w1.$w2; |
| 529 | 528 | //$w = '00'; |
| 530 | 529 | $custom = ''; |
@@ -550,7 +549,7 @@ discard block |
||
| 550 | 549 | } |
| 551 | 550 | if ($custom != '') $custom = ' '.$custom; |
| 552 | 551 | $altitude = 0; |
| 553 | - $this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 552 | + $this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His', strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 554 | 553 | } |
| 555 | 554 | } |
| 556 | 555 | } |
@@ -107,17 +107,23 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | /* Check that end was found and body has at least one byte. */ |
| 109 | 109 | if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) { |
| 110 | - if ($globalDebug) echo '!!! APRS invalid : '.$input."\n"; |
|
| 110 | + if ($globalDebug) { |
|
| 111 | + echo '!!! APRS invalid : '.$input."\n"; |
|
| 112 | + } |
|
| 111 | 113 | return false; |
| 112 | 114 | } |
| 113 | 115 | |
| 114 | - if ($debug) echo 'input : '.$input."\n"; |
|
| 116 | + if ($debug) { |
|
| 117 | + echo 'input : '.$input."\n"; |
|
| 118 | + } |
|
| 115 | 119 | /* Save header and body. */ |
| 116 | 120 | $body = substr($input,$splitpos+1,$input_len); |
| 117 | 121 | $body_len = strlen($body); |
| 118 | 122 | $header = substr($input,0,$splitpos); |
| 119 | 123 | //$header_len = strlen($header); |
| 120 | - if ($debug) echo 'header : '.$header."\n"; |
|
| 124 | + if ($debug) { |
|
| 125 | + echo 'header : '.$header."\n"; |
|
| 126 | + } |
|
| 121 | 127 | |
| 122 | 128 | /* Parse source, target and path. */ |
| 123 | 129 | //FLRDF0A52>APRS,qAS,LSTB |
@@ -131,10 +137,14 @@ discard block |
||
| 131 | 137 | $result['format_source'] = 'famaprs'; |
| 132 | 138 | $result['source_type'] = 'ais'; |
| 133 | 139 | } else { |
| 134 | - if ($debug) echo 'ident : '.$ident."\n"; |
|
| 140 | + if ($debug) { |
|
| 141 | + echo 'ident : '.$ident."\n"; |
|
| 142 | + } |
|
| 135 | 143 | $result['ident'] = $ident; |
| 136 | 144 | } |
| 137 | - } else return false; |
|
| 145 | + } else { |
|
| 146 | + return false; |
|
| 147 | + } |
|
| 138 | 148 | $elements = explode(',',$all_elements); |
| 139 | 149 | $source = end($elements); |
| 140 | 150 | $result['source'] = $source; |
@@ -143,7 +153,9 @@ discard block |
||
| 143 | 153 | //echo "ok"; |
| 144 | 154 | //if ($element == 'TCPIP*') return false; |
| 145 | 155 | } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
| 146 | - if ($debug) echo 'element : '.$element."\n"; |
|
| 156 | + if ($debug) { |
|
| 157 | + echo 'element : '.$element."\n"; |
|
| 158 | + } |
|
| 147 | 159 | return false; |
| 148 | 160 | } |
| 149 | 161 | /* |
@@ -156,13 +168,17 @@ discard block |
||
| 156 | 168 | } |
| 157 | 169 | |
| 158 | 170 | $type = substr($body,0,1); |
| 159 | - if ($debug) echo 'type : '.$type."\n"; |
|
| 171 | + if ($debug) { |
|
| 172 | + echo 'type : '.$type."\n"; |
|
| 173 | + } |
|
| 160 | 174 | if ($type == ';') { |
| 161 | 175 | if (isset($result['source_type']) && $result['source_type'] == 'modes') { |
| 162 | 176 | $result['address'] = trim(substr($body,1,9)); |
| 163 | 177 | } elseif (isset($result['source_type']) && $result['source_type'] == 'ais') { |
| 164 | 178 | $result['mmsi'] = trim(substr($body,1,9)); |
| 165 | - } else $result['ident'] = trim(substr($body,1,9)); |
|
| 179 | + } else { |
|
| 180 | + $result['ident'] = trim(substr($body,1,9)); |
|
| 181 | + } |
|
| 166 | 182 | } elseif ($type == ',') { |
| 167 | 183 | // Invalid data or test data |
| 168 | 184 | return false; |
@@ -230,7 +246,9 @@ discard block |
||
| 230 | 246 | //$symbol_table = $matches[4]; |
| 231 | 247 | $lat = intval($lat_deg); |
| 232 | 248 | $lon = intval($lon_deg); |
| 233 | - if ($lat > 89 || $lon > 179) return false; |
|
| 249 | + if ($lat > 89 || $lon > 179) { |
|
| 250 | + return false; |
|
| 251 | + } |
|
| 234 | 252 | |
| 235 | 253 | /* |
| 236 | 254 | $tmp_5b = str_replace('.','',$lat_min); |
@@ -240,8 +258,12 @@ discard block |
||
| 240 | 258 | */ |
| 241 | 259 | $latitude = $lat + floatval($lat_min)/60; |
| 242 | 260 | $longitude = $lon + floatval($lon_min)/60; |
| 243 | - if ($sind == 'S') $latitude = 0-$latitude; |
|
| 244 | - if ($wind == 'W') $longitude = 0-$longitude; |
|
| 261 | + if ($sind == 'S') { |
|
| 262 | + $latitude = 0-$latitude; |
|
| 263 | + } |
|
| 264 | + if ($wind == 'W') { |
|
| 265 | + $longitude = 0-$longitude; |
|
| 266 | + } |
|
| 245 | 267 | $result['latitude'] = $latitude; |
| 246 | 268 | $result['longitude'] = $longitude; |
| 247 | 269 | $body_parse = substr($body_parse,18); |
@@ -275,7 +297,9 @@ discard block |
||
| 275 | 297 | $body_parse = substr($body_parse,1); |
| 276 | 298 | $body_parse_len = strlen($body_parse); |
| 277 | 299 | $result['symbol_code'] = $symbol_code; |
| 278 | - if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code]; |
|
| 300 | + if (isset($this->symbols[$symbol_code])) { |
|
| 301 | + $result['symbol'] = $this->symbols[$symbol_code]; |
|
| 302 | + } |
|
| 279 | 303 | if ($symbol_code != '_') { |
| 280 | 304 | } |
| 281 | 305 | //$body_parse = substr($body_parse,1); |
@@ -286,7 +310,9 @@ discard block |
||
| 286 | 310 | if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
| 287 | 311 | $course = substr($body_parse,0,3); |
| 288 | 312 | $tmp_s = intval($course); |
| 289 | - if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
|
| 313 | + if ($tmp_s >= 1 && $tmp_s <= 360) { |
|
| 314 | + $result['heading'] = intval($course); |
|
| 315 | + } |
|
| 290 | 316 | $speed = substr($body_parse,4,3); |
| 291 | 317 | if ($speed != '...') { |
| 292 | 318 | //$result['speed'] = round($speed*1.852); |
@@ -327,10 +353,16 @@ discard block |
||
| 327 | 353 | $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
| 328 | 354 | $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
| 329 | 355 | |
| 330 | - if ($result['latitude'] < 0) $result['latitude'] -= $lat_off; |
|
| 331 | - else $result['latitude'] += $lat_off; |
|
| 332 | - if ($result['longitude'] < 0) $result['longitude'] -= $lon_off; |
|
| 333 | - else $result['longitude'] += $lon_off; |
|
| 356 | + if ($result['latitude'] < 0) { |
|
| 357 | + $result['latitude'] -= $lat_off; |
|
| 358 | + } else { |
|
| 359 | + $result['latitude'] += $lat_off; |
|
| 360 | + } |
|
| 361 | + if ($result['longitude'] < 0) { |
|
| 362 | + $result['longitude'] -= $lon_off; |
|
| 363 | + } else { |
|
| 364 | + $result['longitude'] += $lon_off; |
|
| 365 | + } |
|
| 334 | 366 | } |
| 335 | 367 | |
| 336 | 368 | $body_parse = substr($body_parse,6); |
@@ -366,27 +398,48 @@ discard block |
||
| 366 | 398 | $address = substr($id,2); |
| 367 | 399 | //print_r($matches); |
| 368 | 400 | $addressType = (intval(substr($id,0,2),16))&3; |
| 369 | - if ($addressType == 0) $result['addresstype'] = "RANDOM"; |
|
| 370 | - elseif ($addressType == 1) $result['addresstype'] = "ICAO"; |
|
| 371 | - elseif ($addressType == 2) $result['addresstype'] = "FLARM"; |
|
| 372 | - elseif ($addressType == 3) $result['addresstype'] = "OGN"; |
|
| 401 | + if ($addressType == 0) { |
|
| 402 | + $result['addresstype'] = "RANDOM"; |
|
| 403 | + } elseif ($addressType == 1) { |
|
| 404 | + $result['addresstype'] = "ICAO"; |
|
| 405 | + } elseif ($addressType == 2) { |
|
| 406 | + $result['addresstype'] = "FLARM"; |
|
| 407 | + } elseif ($addressType == 3) { |
|
| 408 | + $result['addresstype'] = "OGN"; |
|
| 409 | + } |
|
| 373 | 410 | $aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2); |
| 374 | 411 | $result['aircrafttype_code'] = $aircraftType; |
| 375 | - if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN"; |
|
| 376 | - elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER"; |
|
| 377 | - elseif ($aircraftType == 2) $result['aircrafttype'] = "TOW_PLANE"; |
|
| 378 | - elseif ($aircraftType == 3) $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT"; |
|
| 379 | - elseif ($aircraftType == 4) $result['aircrafttype'] = "PARACHUTE"; |
|
| 380 | - elseif ($aircraftType == 5) $result['aircrafttype'] = "DROP_PLANE"; |
|
| 381 | - elseif ($aircraftType == 6) $result['aircrafttype'] = "HANG_GLIDER"; |
|
| 382 | - elseif ($aircraftType == 7) $result['aircrafttype'] = "PARA_GLIDER"; |
|
| 383 | - elseif ($aircraftType == 8) $result['aircrafttype'] = "POWERED_AIRCRAFT"; |
|
| 384 | - elseif ($aircraftType == 9) $result['aircrafttype'] = "JET_AIRCRAFT"; |
|
| 385 | - elseif ($aircraftType == 10) $result['aircrafttype'] = "UFO"; |
|
| 386 | - elseif ($aircraftType == 11) $result['aircrafttype'] = "BALLOON"; |
|
| 387 | - elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP"; |
|
| 388 | - elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV"; |
|
| 389 | - elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT"; |
|
| 412 | + if ($aircraftType == 0) { |
|
| 413 | + $result['aircrafttype'] = "UNKNOWN"; |
|
| 414 | + } elseif ($aircraftType == 1) { |
|
| 415 | + $result['aircrafttype'] = "GLIDER"; |
|
| 416 | + } elseif ($aircraftType == 2) { |
|
| 417 | + $result['aircrafttype'] = "TOW_PLANE"; |
|
| 418 | + } elseif ($aircraftType == 3) { |
|
| 419 | + $result['aircrafttype'] = "HELICOPTER_ROTORCRAFT"; |
|
| 420 | + } elseif ($aircraftType == 4) { |
|
| 421 | + $result['aircrafttype'] = "PARACHUTE"; |
|
| 422 | + } elseif ($aircraftType == 5) { |
|
| 423 | + $result['aircrafttype'] = "DROP_PLANE"; |
|
| 424 | + } elseif ($aircraftType == 6) { |
|
| 425 | + $result['aircrafttype'] = "HANG_GLIDER"; |
|
| 426 | + } elseif ($aircraftType == 7) { |
|
| 427 | + $result['aircrafttype'] = "PARA_GLIDER"; |
|
| 428 | + } elseif ($aircraftType == 8) { |
|
| 429 | + $result['aircrafttype'] = "POWERED_AIRCRAFT"; |
|
| 430 | + } elseif ($aircraftType == 9) { |
|
| 431 | + $result['aircrafttype'] = "JET_AIRCRAFT"; |
|
| 432 | + } elseif ($aircraftType == 10) { |
|
| 433 | + $result['aircrafttype'] = "UFO"; |
|
| 434 | + } elseif ($aircraftType == 11) { |
|
| 435 | + $result['aircrafttype'] = "BALLOON"; |
|
| 436 | + } elseif ($aircraftType == 12) { |
|
| 437 | + $result['aircrafttype'] = "AIRSHIP"; |
|
| 438 | + } elseif ($aircraftType == 13) { |
|
| 439 | + $result['aircrafttype'] = "UAV"; |
|
| 440 | + } elseif ($aircraftType == 15) { |
|
| 441 | + $result['aircrafttype'] = "STATIC_OBJECT"; |
|
| 442 | + } |
|
| 390 | 443 | $stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0; |
| 391 | 444 | $result['stealth'] = $stealth; |
| 392 | 445 | $result['address'] = $address; |
@@ -426,13 +479,21 @@ discard block |
||
| 426 | 479 | $result['temp'] = round(5/9*(($matches[1])-32),1); |
| 427 | 480 | } |
| 428 | 481 | } |
| 429 | - } else $result['comment'] = trim($body_parse); |
|
| 482 | + } else { |
|
| 483 | + $result['comment'] = trim($body_parse); |
|
| 484 | + } |
|
| 430 | 485 | |
| 431 | 486 | } |
| 432 | 487 | //} |
| 433 | - if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4); |
|
| 434 | - if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4); |
|
| 435 | - if ($debug) print_r($result); |
|
| 488 | + if (isset($result['latitude'])) { |
|
| 489 | + $result['latitude'] = round($result['latitude'],4); |
|
| 490 | + } |
|
| 491 | + if (isset($result['longitude'])) { |
|
| 492 | + $result['longitude'] = round($result['longitude'],4); |
|
| 493 | + } |
|
| 494 | + if ($debug) { |
|
| 495 | + print_r($result); |
|
| 496 | + } |
|
| 436 | 497 | return $result; |
| 437 | 498 | } |
| 438 | 499 | |
@@ -441,12 +502,21 @@ discard block |
||
| 441 | 502 | $aprs_connect = 0; |
| 442 | 503 | $aprs_keep = 120; |
| 443 | 504 | $aprs_last_tx = time(); |
| 444 | - if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
|
| 445 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 446 | - if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid; |
|
| 447 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 448 | - if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass; |
|
| 449 | - else $aprs_pass = '-1'; |
|
| 505 | + if (isset($globalAPRSversion)) { |
|
| 506 | + $aprs_version = $globalAPRSversion; |
|
| 507 | + } else { |
|
| 508 | + $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 509 | + } |
|
| 510 | + if (isset($globalServerAPRSssid)) { |
|
| 511 | + $aprs_ssid = $globalServerAPRSssid; |
|
| 512 | + } else { |
|
| 513 | + $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 514 | + } |
|
| 515 | + if (isset($globalServerAPRSpass)) { |
|
| 516 | + $aprs_pass = $globalServerAPRSpass; |
|
| 517 | + } else { |
|
| 518 | + $aprs_pass = '-1'; |
|
| 519 | + } |
|
| 450 | 520 | |
| 451 | 521 | $aprs_filter = ''; |
| 452 | 522 | $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
@@ -478,7 +548,9 @@ discard block |
||
| 478 | 548 | } |
| 479 | 549 | |
| 480 | 550 | public function send($data) { |
| 481 | - if ($this->connected === false) $this->connect(); |
|
| 551 | + if ($this->connected === false) { |
|
| 552 | + $this->connect(); |
|
| 553 | + } |
|
| 482 | 554 | $send = socket_send( $this->socket , $data , strlen($data),0); |
| 483 | 555 | if ($send === FALSE) { |
| 484 | 556 | socket_close($this->socket); |
@@ -500,18 +572,26 @@ discard block |
||
| 500 | 572 | //$w = '00'; |
| 501 | 573 | $custom = ''; |
| 502 | 574 | if ($ident != '') { |
| 503 | - if ($custom != '') $custom .= '/'; |
|
| 575 | + if ($custom != '') { |
|
| 576 | + $custom .= '/'; |
|
| 577 | + } |
|
| 504 | 578 | $custom .= 'CS='.$ident; |
| 505 | 579 | } |
| 506 | 580 | if ($squawk != '') { |
| 507 | - if ($custom != '') $custom .= '/'; |
|
| 581 | + if ($custom != '') { |
|
| 582 | + $custom .= '/'; |
|
| 583 | + } |
|
| 508 | 584 | $custom .= 'SQ='.$squawk; |
| 509 | 585 | } |
| 510 | 586 | if ($aircraft_icao != '' && $aircraft_icao != 'NA') { |
| 511 | - if ($custom != '') $custom .= '/'; |
|
| 587 | + if ($custom != '') { |
|
| 588 | + $custom .= '/'; |
|
| 589 | + } |
|
| 512 | 590 | $custom .= 'AI='.$aircraft_icao; |
| 513 | 591 | } |
| 514 | - if ($custom != '') $custom = ' '.$custom; |
|
| 592 | + if ($custom != '') { |
|
| 593 | + $custom = ' '.$custom; |
|
| 594 | + } |
|
| 515 | 595 | $this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.' *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
| 516 | 596 | } |
| 517 | 597 | } |
@@ -529,26 +609,38 @@ discard block |
||
| 529 | 609 | //$w = '00'; |
| 530 | 610 | $custom = ''; |
| 531 | 611 | if ($ident != '') { |
| 532 | - if ($custom != '') $custom .= '/'; |
|
| 612 | + if ($custom != '') { |
|
| 613 | + $custom .= '/'; |
|
| 614 | + } |
|
| 533 | 615 | $custom .= 'CS='.$ident; |
| 534 | 616 | } |
| 535 | 617 | if ($typeid != '') { |
| 536 | - if ($custom != '') $custom .= '/'; |
|
| 618 | + if ($custom != '') { |
|
| 619 | + $custom .= '/'; |
|
| 620 | + } |
|
| 537 | 621 | $custom .= 'TI='.$typeid; |
| 538 | 622 | } |
| 539 | 623 | if ($imo != '') { |
| 540 | - if ($custom != '') $custom .= '/'; |
|
| 624 | + if ($custom != '') { |
|
| 625 | + $custom .= '/'; |
|
| 626 | + } |
|
| 541 | 627 | $custom .= 'IMO='.$imo; |
| 542 | 628 | } |
| 543 | 629 | if ($arrival_date != '') { |
| 544 | - if ($custom != '') $custom .= '/'; |
|
| 630 | + if ($custom != '') { |
|
| 631 | + $custom .= '/'; |
|
| 632 | + } |
|
| 545 | 633 | $custom .= 'AD='.strtotime($arrival_date); |
| 546 | 634 | } |
| 547 | 635 | if ($arrival_code != '') { |
| 548 | - if ($custom != '') $custom .= '/'; |
|
| 636 | + if ($custom != '') { |
|
| 637 | + $custom .= '/'; |
|
| 638 | + } |
|
| 549 | 639 | $custom .= 'AC='.$arrival_code; |
| 550 | 640 | } |
| 551 | - if ($custom != '') $custom = ' '.$custom; |
|
| 641 | + if ($custom != '') { |
|
| 642 | + $custom = ' '.$custom; |
|
| 643 | + } |
|
| 552 | 644 | $altitude = 0; |
| 553 | 645 | $this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
| 554 | 646 | } |
@@ -2,10 +2,10 @@ discard block |
||
| 2 | 2 | require_once(dirname(__FILE__).'/settings.php'); |
| 3 | 3 | require_once(dirname(__FILE__).'/class.Common.php'); |
| 4 | 4 | class aprs { |
| 5 | - private $socket; |
|
| 6 | - private $connected = false; |
|
| 5 | + private $socket; |
|
| 6 | + private $connected = false; |
|
| 7 | 7 | |
| 8 | - protected $symbols = array('!' => 'Police', |
|
| 8 | + protected $symbols = array('!' => 'Police', |
|
| 9 | 9 | '#' => 'DIGI', |
| 10 | 10 | '$' => 'Phone', |
| 11 | 11 | '%' => 'DX Cluster', |
@@ -89,13 +89,13 @@ discard block |
||
| 89 | 89 | 'y' => 'Yagi At QTH'); |
| 90 | 90 | |
| 91 | 91 | |
| 92 | - private function urshift($n, $s) { |
|
| 92 | + private function urshift($n, $s) { |
|
| 93 | 93 | return ($n >= 0) ? ($n >> $s) : |
| 94 | - (($n & 0x7fffffff) >> $s) | |
|
| 94 | + (($n & 0x7fffffff) >> $s) | |
|
| 95 | 95 | (0x40000000 >> ($s - 1)); |
| 96 | - } |
|
| 96 | + } |
|
| 97 | 97 | |
| 98 | - public function parse($input) { |
|
| 98 | + public function parse($input) { |
|
| 99 | 99 | global $globalDebug; |
| 100 | 100 | $debug = false; |
| 101 | 101 | $result = array(); |
@@ -107,8 +107,8 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | /* Check that end was found and body has at least one byte. */ |
| 109 | 109 | if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) { |
| 110 | - if ($globalDebug) echo '!!! APRS invalid : '.$input."\n"; |
|
| 111 | - return false; |
|
| 110 | + if ($globalDebug) echo '!!! APRS invalid : '.$input."\n"; |
|
| 111 | + return false; |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | if ($debug) echo 'input : '.$input."\n"; |
@@ -122,31 +122,31 @@ discard block |
||
| 122 | 122 | /* Parse source, target and path. */ |
| 123 | 123 | //FLRDF0A52>APRS,qAS,LSTB |
| 124 | 124 | if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) { |
| 125 | - $ident = $matches[1]; |
|
| 126 | - $all_elements = $matches[2]; |
|
| 127 | - if ($ident == 'AIRCRAFT') { |
|
| 125 | + $ident = $matches[1]; |
|
| 126 | + $all_elements = $matches[2]; |
|
| 127 | + if ($ident == 'AIRCRAFT') { |
|
| 128 | 128 | $result['format_source'] = 'famaprs'; |
| 129 | 129 | $result['source_type'] = 'modes'; |
| 130 | - } elseif ($ident == 'MARINE') { |
|
| 130 | + } elseif ($ident == 'MARINE') { |
|
| 131 | 131 | $result['format_source'] = 'famaprs'; |
| 132 | 132 | $result['source_type'] = 'ais'; |
| 133 | - } else { |
|
| 133 | + } else { |
|
| 134 | 134 | if ($debug) echo 'ident : '.$ident."\n"; |
| 135 | 135 | $result['ident'] = $ident; |
| 136 | - } |
|
| 136 | + } |
|
| 137 | 137 | } else return false; |
| 138 | 138 | $elements = explode(',',$all_elements); |
| 139 | 139 | $source = end($elements); |
| 140 | 140 | $result['source'] = $source; |
| 141 | 141 | foreach ($elements as $element) { |
| 142 | - if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) { |
|
| 143 | - //echo "ok"; |
|
| 144 | - //if ($element == 'TCPIP*') return false; |
|
| 145 | - } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
|
| 142 | + if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) { |
|
| 143 | + //echo "ok"; |
|
| 144 | + //if ($element == 'TCPIP*') return false; |
|
| 145 | + } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
|
| 146 | 146 | if ($debug) echo 'element : '.$element."\n"; |
| 147 | 147 | return false; |
| 148 | - } |
|
| 149 | - /* |
|
| 148 | + } |
|
| 149 | + /* |
|
| 150 | 150 | } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) { |
| 151 | 151 | //echo "ok"; |
| 152 | 152 | } else { |
@@ -173,49 +173,49 @@ discard block |
||
| 173 | 173 | $body_parse = substr($body,1); |
| 174 | 174 | //echo 'Body : '.$body."\n"; |
| 175 | 175 | if (preg_match('/^;(.){9}\*/',$body,$matches)) { |
| 176 | - $body_parse = substr($body_parse,10); |
|
| 177 | - $find = true; |
|
| 178 | - //echo $body_parse."\n"; |
|
| 176 | + $body_parse = substr($body_parse,10); |
|
| 177 | + $find = true; |
|
| 178 | + //echo $body_parse."\n"; |
|
| 179 | 179 | } |
| 180 | 180 | if (preg_match('/^`(.*)\//',$body,$matches)) { |
| 181 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 182 | - $find = true; |
|
| 183 | - //echo $body_parse."\n"; |
|
| 181 | + $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 182 | + $find = true; |
|
| 183 | + //echo $body_parse."\n"; |
|
| 184 | 184 | } |
| 185 | 185 | if (preg_match("/^'(.*)\//",$body,$matches)) { |
| 186 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 187 | - $find = true; |
|
| 188 | - //echo $body_parse."\n"; |
|
| 186 | + $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 187 | + $find = true; |
|
| 188 | + //echo $body_parse."\n"; |
|
| 189 | 189 | } |
| 190 | 190 | if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) { |
| 191 | - $find = true; |
|
| 192 | - //print_r($matches); |
|
| 193 | - $timestamp = $matches[0]; |
|
| 194 | - if ($matches[4] == 'h') { |
|
| 191 | + $find = true; |
|
| 192 | + //print_r($matches); |
|
| 193 | + $timestamp = $matches[0]; |
|
| 194 | + if ($matches[4] == 'h') { |
|
| 195 | 195 | $timestamp = strtotime(date('Ymd').' '.$matches[1].':'.$matches[2].':'.$matches[3]); |
| 196 | 196 | //echo 'timestamp : '.$timestamp.' - now : '.time()."\n"; |
| 197 | 197 | /* |
| 198 | 198 | if (time() + 3900 < $timestamp) $timestamp -= 86400; |
| 199 | 199 | elseif (time() - 82500 > $timestamp) $timestamp += 86400; |
| 200 | 200 | */ |
| 201 | - } elseif ($matches[4] == 'z' || $matches[4] == '/') { |
|
| 201 | + } elseif ($matches[4] == 'z' || $matches[4] == '/') { |
|
| 202 | 202 | // This work or not ? |
| 203 | 203 | $timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]); |
| 204 | - } |
|
| 205 | - $body_parse = substr($body_parse,7); |
|
| 206 | - $result['timestamp'] = $timestamp; |
|
| 207 | - //echo date('Ymd H:i:s',$timestamp); |
|
| 204 | + } |
|
| 205 | + $body_parse = substr($body_parse,7); |
|
| 206 | + $result['timestamp'] = $timestamp; |
|
| 207 | + //echo date('Ymd H:i:s',$timestamp); |
|
| 208 | 208 | } |
| 209 | 209 | if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) { |
| 210 | - $find = true; |
|
| 211 | - $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]); |
|
| 212 | - $body_parse = substr($body_parse,8); |
|
| 213 | - $result['timestamp'] = $timestamp; |
|
| 214 | - //echo date('Ymd H:i:s',$timestamp); |
|
| 210 | + $find = true; |
|
| 211 | + $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]); |
|
| 212 | + $body_parse = substr($body_parse,8); |
|
| 213 | + $result['timestamp'] = $timestamp; |
|
| 214 | + //echo date('Ymd H:i:s',$timestamp); |
|
| 215 | 215 | } |
| 216 | 216 | //if (strlen($body_parse) > 19) { |
| 217 | - if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) { |
|
| 218 | - $find = true; |
|
| 217 | + if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) { |
|
| 218 | + $find = true; |
|
| 219 | 219 | // 4658.70N/00707.78Ez |
| 220 | 220 | //print_r(str_split($body_parse)); |
| 221 | 221 | |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | $lon = intval($lon_deg); |
| 233 | 233 | if ($lat > 89 || $lon > 179) return false; |
| 234 | 234 | |
| 235 | - /* |
|
| 235 | + /* |
|
| 236 | 236 | $tmp_5b = str_replace('.','',$lat_min); |
| 237 | 237 | if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) { |
| 238 | 238 | print_r($matches); |
@@ -246,9 +246,9 @@ discard block |
||
| 246 | 246 | $result['longitude'] = $longitude; |
| 247 | 247 | $body_parse = substr($body_parse,18); |
| 248 | 248 | $body_parse_len = strlen($body_parse); |
| 249 | - } |
|
| 250 | - $body_parse_len = strlen($body_parse); |
|
| 251 | - if ($body_parse_len > 0) { |
|
| 249 | + } |
|
| 250 | + $body_parse_len = strlen($body_parse); |
|
| 251 | + if ($body_parse_len > 0) { |
|
| 252 | 252 | /* |
| 253 | 253 | if (!isset($result['timestamp']) && !isset($result['latitude'])) { |
| 254 | 254 | $body_split = str_split($body); |
@@ -278,89 +278,89 @@ discard block |
||
| 278 | 278 | if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code]; |
| 279 | 279 | if ($symbol_code != '_') { |
| 280 | 280 | } |
| 281 | - //$body_parse = substr($body_parse,1); |
|
| 282 | - //$body_parse = trim($body_parse); |
|
| 283 | - //$body_parse_len = strlen($body_parse); |
|
| 284 | - if ($body_parse_len >= 7) { |
|
| 281 | + //$body_parse = substr($body_parse,1); |
|
| 282 | + //$body_parse = trim($body_parse); |
|
| 283 | + //$body_parse_len = strlen($body_parse); |
|
| 284 | + if ($body_parse_len >= 7) { |
|
| 285 | 285 | |
| 286 | - if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
|
| 287 | - $course = substr($body_parse,0,3); |
|
| 288 | - $tmp_s = intval($course); |
|
| 289 | - if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
|
| 290 | - $speed = substr($body_parse,4,3); |
|
| 291 | - if ($speed != '...') { |
|
| 292 | - //$result['speed'] = round($speed*1.852); |
|
| 293 | - $result['speed'] = intval($speed); |
|
| 294 | - } |
|
| 295 | - $body_parse = substr($body_parse,7); |
|
| 296 | - } |
|
| 297 | - // Check PHGR, PHG, RNG |
|
| 298 | - } |
|
| 299 | - /* |
|
| 286 | + if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
|
| 287 | + $course = substr($body_parse,0,3); |
|
| 288 | + $tmp_s = intval($course); |
|
| 289 | + if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
|
| 290 | + $speed = substr($body_parse,4,3); |
|
| 291 | + if ($speed != '...') { |
|
| 292 | + //$result['speed'] = round($speed*1.852); |
|
| 293 | + $result['speed'] = intval($speed); |
|
| 294 | + } |
|
| 295 | + $body_parse = substr($body_parse,7); |
|
| 296 | + } |
|
| 297 | + // Check PHGR, PHG, RNG |
|
| 298 | + } |
|
| 299 | + /* |
|
| 300 | 300 | else if ($body_parse_len > 0) { |
| 301 | 301 | $rest = $body_parse; |
| 302 | 302 | } |
| 303 | 303 | */ |
| 304 | - if (strlen($body_parse) > 0) { |
|
| 305 | - if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) { |
|
| 306 | - $altitude = intval($matches[1]); |
|
| 307 | - //$result['altitude'] = round($altitude*0.3048); |
|
| 308 | - $result['altitude'] = $altitude; |
|
| 309 | - //$body_parse = trim(substr($body_parse,strlen($matches[0]))); |
|
| 310 | - $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse)); |
|
| 311 | - } |
|
| 312 | - } |
|
| 304 | + if (strlen($body_parse) > 0) { |
|
| 305 | + if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) { |
|
| 306 | + $altitude = intval($matches[1]); |
|
| 307 | + //$result['altitude'] = round($altitude*0.3048); |
|
| 308 | + $result['altitude'] = $altitude; |
|
| 309 | + //$body_parse = trim(substr($body_parse,strlen($matches[0]))); |
|
| 310 | + $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse)); |
|
| 311 | + } |
|
| 312 | + } |
|
| 313 | 313 | |
| 314 | - // Telemetry |
|
| 315 | - /* |
|
| 314 | + // Telemetry |
|
| 315 | + /* |
|
| 316 | 316 | if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) { |
| 317 | 317 | // Nothing yet... |
| 318 | 318 | } |
| 319 | 319 | */ |
| 320 | - // DAO |
|
| 320 | + // DAO |
|
| 321 | 321 | |
| 322 | - if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) { |
|
| 322 | + if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) { |
|
| 323 | 323 | |
| 324 | - $dao = $matches[1]; |
|
| 325 | - if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) { |
|
| 324 | + $dao = $matches[1]; |
|
| 325 | + if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) { |
|
| 326 | 326 | $dao_split = str_split($dao); |
| 327 | - $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
|
| 328 | - $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
|
| 327 | + $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
|
| 328 | + $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
|
| 329 | 329 | |
| 330 | 330 | if ($result['latitude'] < 0) $result['latitude'] -= $lat_off; |
| 331 | 331 | else $result['latitude'] += $lat_off; |
| 332 | 332 | if ($result['longitude'] < 0) $result['longitude'] -= $lon_off; |
| 333 | 333 | else $result['longitude'] += $lon_off; |
| 334 | - } |
|
| 334 | + } |
|
| 335 | 335 | |
| 336 | - $body_parse = substr($body_parse,6); |
|
| 337 | - } |
|
| 336 | + $body_parse = substr($body_parse,6); |
|
| 337 | + } |
|
| 338 | 338 | |
| 339 | - if (preg_match('/CS=([0-9A-Z]*)/',$body_parse,$matches)) { |
|
| 339 | + if (preg_match('/CS=([0-9A-Z]*)/',$body_parse,$matches)) { |
|
| 340 | 340 | $result['ident'] = $matches[1]; |
| 341 | - } |
|
| 342 | - if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) { |
|
| 341 | + } |
|
| 342 | + if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) { |
|
| 343 | 343 | $result['squawk'] = $matches[1]; |
| 344 | - } |
|
| 345 | - if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) { |
|
| 344 | + } |
|
| 345 | + if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) { |
|
| 346 | 346 | $result['aircraft_icao'] = $matches[1]; |
| 347 | - } |
|
| 348 | - if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) { |
|
| 347 | + } |
|
| 348 | + if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) { |
|
| 349 | 349 | $result['typeid'] = $matches[1]; |
| 350 | - } |
|
| 351 | - if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) { |
|
| 350 | + } |
|
| 351 | + if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) { |
|
| 352 | 352 | $result['imo'] = $matches[1]; |
| 353 | - } |
|
| 354 | - if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) { |
|
| 353 | + } |
|
| 354 | + if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) { |
|
| 355 | 355 | $result['arrival_date'] = $matches[1]; |
| 356 | - } |
|
| 357 | - if (preg_match('/AC=([0-9A-Z]*)/',$body_parse,$matches)) { |
|
| 356 | + } |
|
| 357 | + if (preg_match('/AC=([0-9A-Z]*)/',$body_parse,$matches)) { |
|
| 358 | 358 | $result['arrival_code'] = $matches[1]; |
| 359 | - } |
|
| 360 | - // OGN comment |
|
| 359 | + } |
|
| 360 | + // OGN comment |
|
| 361 | 361 | // echo "Before OGN : ".$body_parse."\n"; |
| 362 | - //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) { |
|
| 363 | - if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) { |
|
| 362 | + //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) { |
|
| 363 | + if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) { |
|
| 364 | 364 | $id = $matches[1]; |
| 365 | 365 | //$mode = substr($id,0,2); |
| 366 | 366 | $address = substr($id,2); |
@@ -390,53 +390,53 @@ discard block |
||
| 390 | 390 | $stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0; |
| 391 | 391 | $result['stealth'] = $stealth; |
| 392 | 392 | $result['address'] = $address; |
| 393 | - } |
|
| 393 | + } |
|
| 394 | 394 | |
| 395 | - //Comment |
|
| 396 | - $result['comment'] = trim($body_parse); |
|
| 395 | + //Comment |
|
| 396 | + $result['comment'] = trim($body_parse); |
|
| 397 | 397 | } else { |
| 398 | - // parse weather |
|
| 399 | - //$body_parse = substr($body_parse,1); |
|
| 400 | - //$body_parse_len = strlen($body_parse); |
|
| 398 | + // parse weather |
|
| 399 | + //$body_parse = substr($body_parse,1); |
|
| 400 | + //$body_parse_len = strlen($body_parse); |
|
| 401 | 401 | |
| 402 | - if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 403 | - $result['wind_dir'] = intval($matches[1]); |
|
| 404 | - $result['wind_speed'] = round(intval($matches[2])*1.60934,1); |
|
| 405 | - $result['wind_gust'] = round(intval($matches[3])*1.60934,1); |
|
| 406 | - $result['temp'] = round(5/9*((intval($matches[4]))-32),1); |
|
| 407 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 408 | - } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 402 | + if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 403 | + $result['wind_dir'] = intval($matches[1]); |
|
| 404 | + $result['wind_speed'] = round(intval($matches[2])*1.60934,1); |
|
| 405 | + $result['wind_gust'] = round(intval($matches[3])*1.60934,1); |
|
| 406 | + $result['temp'] = round(5/9*((intval($matches[4]))-32),1); |
|
| 407 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 408 | + } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 409 | 409 | $result['wind_dir'] = intval($matches[1]); |
| 410 | 410 | $result['wind_speed'] = round($matches[2]*1.60934,1); |
| 411 | 411 | $result['wind_gust'] = round($matches[3]*1.60934,1); |
| 412 | 412 | $result['temp'] = round(5/9*(($matches[4])-32),1); |
| 413 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 414 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 413 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 414 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 415 | 415 | $result['wind_dir'] = intval($matches[1]); |
| 416 | 416 | $result['wind_speed'] = round($matches[2]*1.60934,1); |
| 417 | 417 | $result['wind_gust'] = round($matches[3]*1.60934,1); |
| 418 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 419 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 418 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 419 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 420 | 420 | $result['wind_dir'] = intval($matches[1]); |
| 421 | 421 | $result['wind_speed'] = round($matches[2]*1.60934,1); |
| 422 | 422 | $result['wind_gust'] = round($matches[3]*1.60934,1); |
| 423 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 424 | - } |
|
| 425 | - if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) { |
|
| 423 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 424 | + } |
|
| 425 | + if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) { |
|
| 426 | 426 | $result['temp'] = round(5/9*(($matches[1])-32),1); |
| 427 | - } |
|
| 427 | + } |
|
| 428 | 428 | } |
| 429 | 429 | } else $result['comment'] = trim($body_parse); |
| 430 | 430 | |
| 431 | - } |
|
| 431 | + } |
|
| 432 | 432 | //} |
| 433 | 433 | if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4); |
| 434 | 434 | if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4); |
| 435 | 435 | if ($debug) print_r($result); |
| 436 | 436 | return $result; |
| 437 | - } |
|
| 437 | + } |
|
| 438 | 438 | |
| 439 | - public function connect() { |
|
| 439 | + public function connect() { |
|
| 440 | 440 | global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport; |
| 441 | 441 | $aprs_connect = 0; |
| 442 | 442 | $aprs_keep = 120; |
@@ -459,32 +459,32 @@ discard block |
||
| 459 | 459 | $send = socket_send( $this->socket , $aprs_login , strlen($aprs_login) , 0 ); |
| 460 | 460 | while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) { |
| 461 | 461 | if (strpos($msgin, "$aprs_ssid verified") !== FALSE) { |
| 462 | - echo 'APRS user verified !'."\n"; |
|
| 463 | - $this->connected = true; |
|
| 464 | - return true; |
|
| 465 | - break; |
|
| 462 | + echo 'APRS user verified !'."\n"; |
|
| 463 | + $this->connected = true; |
|
| 464 | + return true; |
|
| 465 | + break; |
|
| 466 | 466 | } |
| 467 | 467 | if (time()-$authstart > 5) { |
| 468 | - echo 'APRS timeout'."\n"; |
|
| 469 | - break; |
|
| 468 | + echo 'APRS timeout'."\n"; |
|
| 469 | + break; |
|
| 470 | 470 | } |
| 471 | 471 | } |
| 472 | 472 | socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE); |
| 473 | 473 | } |
| 474 | - } |
|
| 474 | + } |
|
| 475 | 475 | |
| 476 | - public function disconnect() { |
|
| 476 | + public function disconnect() { |
|
| 477 | 477 | socket_close($this->socket); |
| 478 | - } |
|
| 478 | + } |
|
| 479 | 479 | |
| 480 | - public function send($data) { |
|
| 480 | + public function send($data) { |
|
| 481 | 481 | if ($this->connected === false) $this->connect(); |
| 482 | 482 | $send = socket_send( $this->socket , $data , strlen($data),0); |
| 483 | 483 | if ($send === FALSE) { |
| 484 | 484 | socket_close($this->socket); |
| 485 | 485 | $this->connect(); |
| 486 | 486 | } |
| 487 | - } |
|
| 487 | + } |
|
| 488 | 488 | } |
| 489 | 489 | |
| 490 | 490 | class APRSSpotter extends APRS { |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
| 3 | -$date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING); |
|
| 3 | +$date = filter_input(INPUT_POST, 'date', FILTER_SANITIZE_STRING); |
|
| 4 | 4 | if ($date == '') $date = date('Y-m-d'); |
| 5 | 5 | header('Location: '.$globalURL.'/incident/'.$date); |
| 6 | 6 | ?> |
| 7 | 7 | \ No newline at end of file |
@@ -1,6 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | require_once(dirname(__FILE__).'/require/settings.php'); |
| 3 | 3 | $date = filter_input(INPUT_POST,'date',FILTER_SANITIZE_STRING); |
| 4 | -if ($date == '') $date = date('Y-m-d'); |
|
| 4 | +if ($date == '') { |
|
| 5 | + $date = date('Y-m-d'); |
|
| 6 | +} |
|
| 5 | 7 | header('Location: '.$globalURL.'/incident/'.$date); |
| 6 | 8 | ?> |
| 7 | 9 | \ No newline at end of file |
