Ysurac /
FlightAirMap
@@ -16,8 +16,8 @@ discard block |
||
| 16 | 16 | require_once(dirname(__FILE__).'/../require/class.Common.php'); |
| 17 | 17 | if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php'); |
| 18 | 18 | if (isset($globalMarine) && $globalMarine) { |
| 19 | - require_once(dirname(__FILE__).'/../require/class.AIS.php'); |
|
| 20 | - require_once(dirname(__FILE__).'/../require/class.MarineImport.php'); |
|
| 19 | + require_once(dirname(__FILE__).'/../require/class.AIS.php'); |
|
| 20 | + require_once(dirname(__FILE__).'/../require/class.MarineImport.php'); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | if (!isset($globalDebug)) $globalDebug = FALSE; |
@@ -25,42 +25,42 @@ discard block |
||
| 25 | 25 | // Check if schema is at latest version |
| 26 | 26 | $Connection = new Connection(); |
| 27 | 27 | if ($Connection->latest() === false) { |
| 28 | - echo "You MUST update to latest schema. Run install/index.php"; |
|
| 29 | - exit(); |
|
| 28 | + echo "You MUST update to latest schema. Run install/index.php"; |
|
| 29 | + exit(); |
|
| 30 | 30 | } |
| 31 | 31 | if (PHP_SAPI != 'cli') { |
| 32 | - echo "This script MUST be called from console, not a web browser."; |
|
| 32 | + echo "This script MUST be called from console, not a web browser."; |
|
| 33 | 33 | // exit(); |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | // This is to be compatible with old version of settings.php |
| 37 | 37 | if (!isset($globalSources)) { |
| 38 | - if (isset($globalSBS1Hosts)) { |
|
| 39 | - //$hosts = $globalSBS1Hosts; |
|
| 40 | - foreach ($globalSBS1Hosts as $host) { |
|
| 41 | - $globalSources[] = array('host' => $host); |
|
| 42 | - } |
|
| 43 | - } else { |
|
| 44 | - if (!isset($globalSBS1Host)) { |
|
| 45 | - echo '$globalSources MUST be defined !'; |
|
| 46 | - die; |
|
| 38 | + if (isset($globalSBS1Hosts)) { |
|
| 39 | + //$hosts = $globalSBS1Hosts; |
|
| 40 | + foreach ($globalSBS1Hosts as $host) { |
|
| 41 | + $globalSources[] = array('host' => $host); |
|
| 42 | + } |
|
| 43 | + } else { |
|
| 44 | + if (!isset($globalSBS1Host)) { |
|
| 45 | + echo '$globalSources MUST be defined !'; |
|
| 46 | + die; |
|
| 47 | 47 | } |
| 48 | 48 | //$hosts = array($globalSBS1Host.':'.$globalSBS1Port); |
| 49 | 49 | $globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port); |
| 50 | - } |
|
| 50 | + } |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | $options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver')); |
| 54 | 54 | //if (isset($options['s'])) $hosts = array($options['s']); |
| 55 | 55 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 56 | 56 | if (isset($options['s'])) { |
| 57 | - $globalSources = array(); |
|
| 58 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 59 | - else $globalSources[] = array('host' => $options['s']); |
|
| 57 | + $globalSources = array(); |
|
| 58 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 59 | + else $globalSources[] = array('host' => $options['s']); |
|
| 60 | 60 | } elseif (isset($options['source'])) { |
| 61 | - $globalSources = array(); |
|
| 62 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 63 | - else $globalSources[] = array('host' => $options['source']); |
|
| 61 | + $globalSources = array(); |
|
| 62 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 63 | + else $globalSources[] = array('host' => $options['source']); |
|
| 64 | 64 | } |
| 65 | 65 | if (isset($options['aprsserverhost'])) { |
| 66 | 66 | $globalServerAPRS = TRUE; |
@@ -75,8 +75,8 @@ discard block |
||
| 75 | 75 | if (isset($options['idsource'])) $id_source = $options['idsource']; |
| 76 | 76 | else $id_source = 1; |
| 77 | 77 | if (isset($globalServer) && $globalServer) { |
| 78 | - if ($globalDebug) echo "Using Server Mode\n"; |
|
| 79 | - $SI=new SpotterServer(); |
|
| 78 | + if ($globalDebug) echo "Using Server Mode\n"; |
|
| 79 | + $SI=new SpotterServer(); |
|
| 80 | 80 | /* |
| 81 | 81 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 82 | 82 | $SI = new adsb2aprs(); |
@@ -85,8 +85,8 @@ discard block |
||
| 85 | 85 | } else $SI=new SpotterImport($Connection->db); |
| 86 | 86 | if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db); |
| 87 | 87 | if (isset($globalMarine) && $globalMarine) { |
| 88 | - $AIS = new AIS(); |
|
| 89 | - $MI = new MarineImport($Connection->db); |
|
| 88 | + $AIS = new AIS(); |
|
| 89 | + $MI = new MarineImport($Connection->db); |
|
| 90 | 90 | } |
| 91 | 91 | //$APRS=new APRS($Connection->db); |
| 92 | 92 | $SBS=new SBS(); |
@@ -97,12 +97,12 @@ discard block |
||
| 97 | 97 | //$servertz = system('date +%Z'); |
| 98 | 98 | // signal handler - playing nice with sockets and dump1090 |
| 99 | 99 | if (function_exists('pcntl_fork')) { |
| 100 | - pcntl_signal(SIGINT, function() { |
|
| 101 | - global $sockets; |
|
| 102 | - echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
|
| 103 | - die("Bye!\n"); |
|
| 104 | - }); |
|
| 105 | - pcntl_signal_dispatch(); |
|
| 100 | + pcntl_signal(SIGINT, function() { |
|
| 101 | + global $sockets; |
|
| 102 | + echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
|
| 103 | + die("Bye!\n"); |
|
| 104 | + }); |
|
| 105 | + pcntl_signal_dispatch(); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | // let's try and connect |
@@ -112,36 +112,36 @@ discard block |
||
| 112 | 112 | $reset = 0; |
| 113 | 113 | |
| 114 | 114 | function connect_all($hosts) { |
| 115 | - //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
|
| 116 | - global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
|
| 117 | - $reset++; |
|
| 118 | - if ($globalDebug) echo 'Connect to all...'."\n"; |
|
| 119 | - foreach ($hosts as $id => $value) { |
|
| 115 | + //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
|
| 116 | + global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
|
| 117 | + $reset++; |
|
| 118 | + if ($globalDebug) echo 'Connect to all...'."\n"; |
|
| 119 | + foreach ($hosts as $id => $value) { |
|
| 120 | 120 | $host = $value['host']; |
| 121 | 121 | $globalSources[$id]['last_exec'] = 0; |
| 122 | 122 | // Here we check type of source(s) |
| 123 | 123 | if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
| 124 | - if (preg_match('/deltadb.txt$/i',$host)) { |
|
| 125 | - //$formats[$id] = 'deltadbtxt'; |
|
| 126 | - $globalSources[$id]['format'] = 'deltadbtxt'; |
|
| 127 | - //$last_exec['deltadbtxt'] = 0; |
|
| 128 | - if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
|
| 129 | - } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
|
| 130 | - //$formats[$id] = 'vatsimtxt'; |
|
| 131 | - $globalSources[$id]['format'] = 'vatsimtxt'; |
|
| 132 | - //$last_exec['vatsimtxt'] = 0; |
|
| 133 | - if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
|
| 134 | - } else if (preg_match('/aircraftlist.json$/i',$host)) { |
|
| 135 | - //$formats[$id] = 'aircraftlistjson'; |
|
| 136 | - $globalSources[$id]['format'] = 'aircraftlistjson'; |
|
| 137 | - //$last_exec['aircraftlistjson'] = 0; |
|
| 138 | - if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
|
| 139 | - } else if (preg_match('/opensky/i',$host)) { |
|
| 140 | - //$formats[$id] = 'aircraftlistjson'; |
|
| 141 | - $globalSources[$id]['format'] = 'opensky'; |
|
| 142 | - //$last_exec['aircraftlistjson'] = 0; |
|
| 143 | - if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; |
|
| 144 | - /* |
|
| 124 | + if (preg_match('/deltadb.txt$/i',$host)) { |
|
| 125 | + //$formats[$id] = 'deltadbtxt'; |
|
| 126 | + $globalSources[$id]['format'] = 'deltadbtxt'; |
|
| 127 | + //$last_exec['deltadbtxt'] = 0; |
|
| 128 | + if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
|
| 129 | + } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
|
| 130 | + //$formats[$id] = 'vatsimtxt'; |
|
| 131 | + $globalSources[$id]['format'] = 'vatsimtxt'; |
|
| 132 | + //$last_exec['vatsimtxt'] = 0; |
|
| 133 | + if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
|
| 134 | + } else if (preg_match('/aircraftlist.json$/i',$host)) { |
|
| 135 | + //$formats[$id] = 'aircraftlistjson'; |
|
| 136 | + $globalSources[$id]['format'] = 'aircraftlistjson'; |
|
| 137 | + //$last_exec['aircraftlistjson'] = 0; |
|
| 138 | + if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
|
| 139 | + } else if (preg_match('/opensky/i',$host)) { |
|
| 140 | + //$formats[$id] = 'aircraftlistjson'; |
|
| 141 | + $globalSources[$id]['format'] = 'opensky'; |
|
| 142 | + //$last_exec['aircraftlistjson'] = 0; |
|
| 143 | + if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; |
|
| 144 | + /* |
|
| 145 | 145 | // Disabled for now, site change source format |
| 146 | 146 | } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) { |
| 147 | 147 | //$formats[$id] = 'radarvirtueljson'; |
@@ -153,118 +153,118 @@ discard block |
||
| 153 | 153 | exit(0); |
| 154 | 154 | } |
| 155 | 155 | */ |
| 156 | - } else if (preg_match('/planeUpdateFAA.php$/i',$host)) { |
|
| 157 | - //$formats[$id] = 'planeupdatefaa'; |
|
| 158 | - $globalSources[$id]['format'] = 'planeupdatefaa'; |
|
| 159 | - //$last_exec['planeupdatefaa'] = 0; |
|
| 160 | - if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; |
|
| 161 | - if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 162 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 163 | - exit(0); |
|
| 164 | - } |
|
| 165 | - } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { |
|
| 166 | - //$formats[$id] = 'phpvmacars'; |
|
| 167 | - $globalSources[$id]['format'] = 'phpvmacars'; |
|
| 168 | - //$last_exec['phpvmacars'] = 0; |
|
| 169 | - if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
|
| 170 | - } else if (preg_match('/VAM-json.php$/i',$host)) { |
|
| 171 | - //$formats[$id] = 'phpvmacars'; |
|
| 172 | - $globalSources[$id]['format'] = 'vam'; |
|
| 173 | - if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
|
| 174 | - } else if (preg_match('/whazzup/i',$host)) { |
|
| 175 | - //$formats[$id] = 'whazzup'; |
|
| 176 | - $globalSources[$id]['format'] = 'whazzup'; |
|
| 177 | - //$last_exec['whazzup'] = 0; |
|
| 178 | - if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
|
| 179 | - } else if (preg_match('/airwhere/i',$host)) { |
|
| 180 | - $globalSources[$id]['format'] = 'airwhere'; |
|
| 181 | - if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n"; |
|
| 182 | - } else if (preg_match('/recentpireps/i',$host)) { |
|
| 183 | - //$formats[$id] = 'pirepsjson'; |
|
| 184 | - $globalSources[$id]['format'] = 'pirepsjson'; |
|
| 185 | - //$last_exec['pirepsjson'] = 0; |
|
| 186 | - if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
|
| 187 | - } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
|
| 188 | - //$formats[$id] = 'fr24json'; |
|
| 189 | - $globalSources[$id]['format'] = 'fr24json'; |
|
| 190 | - //$last_exec['fr24json'] = 0; |
|
| 191 | - if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n"; |
|
| 192 | - if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 193 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 194 | - exit(0); |
|
| 195 | - } |
|
| 196 | - } else if (preg_match(':myshiptracking.com/:i',$host)) { |
|
| 197 | - //$formats[$id] = 'fr24json'; |
|
| 198 | - $globalSources[$id]['format'] = 'myshiptracking'; |
|
| 199 | - //$last_exec['fr24json'] = 0; |
|
| 200 | - if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n"; |
|
| 201 | - if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 202 | - echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 203 | - exit(0); |
|
| 204 | - } |
|
| 205 | - //} else if (preg_match('/10001/',$host)) { |
|
| 206 | - } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 207 | - //$formats[$id] = 'tsv'; |
|
| 208 | - $globalSources[$id]['format'] = 'tsv'; |
|
| 209 | - if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
|
| 210 | - } |
|
| 211 | - } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 212 | - if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
|
| 213 | - $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
|
| 214 | - if ($idf !== false) { |
|
| 215 | - $httpfeeds[$id] = $idf; |
|
| 216 | - if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 217 | - } |
|
| 218 | - elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
|
| 219 | - } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 220 | - } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 221 | - $hostport = explode(':',$host); |
|
| 222 | - if (isset($hostport[1])) { |
|
| 156 | + } else if (preg_match('/planeUpdateFAA.php$/i',$host)) { |
|
| 157 | + //$formats[$id] = 'planeupdatefaa'; |
|
| 158 | + $globalSources[$id]['format'] = 'planeupdatefaa'; |
|
| 159 | + //$last_exec['planeupdatefaa'] = 0; |
|
| 160 | + if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; |
|
| 161 | + if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 162 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 163 | + exit(0); |
|
| 164 | + } |
|
| 165 | + } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { |
|
| 166 | + //$formats[$id] = 'phpvmacars'; |
|
| 167 | + $globalSources[$id]['format'] = 'phpvmacars'; |
|
| 168 | + //$last_exec['phpvmacars'] = 0; |
|
| 169 | + if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
|
| 170 | + } else if (preg_match('/VAM-json.php$/i',$host)) { |
|
| 171 | + //$formats[$id] = 'phpvmacars'; |
|
| 172 | + $globalSources[$id]['format'] = 'vam'; |
|
| 173 | + if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
|
| 174 | + } else if (preg_match('/whazzup/i',$host)) { |
|
| 175 | + //$formats[$id] = 'whazzup'; |
|
| 176 | + $globalSources[$id]['format'] = 'whazzup'; |
|
| 177 | + //$last_exec['whazzup'] = 0; |
|
| 178 | + if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
|
| 179 | + } else if (preg_match('/airwhere/i',$host)) { |
|
| 180 | + $globalSources[$id]['format'] = 'airwhere'; |
|
| 181 | + if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n"; |
|
| 182 | + } else if (preg_match('/recentpireps/i',$host)) { |
|
| 183 | + //$formats[$id] = 'pirepsjson'; |
|
| 184 | + $globalSources[$id]['format'] = 'pirepsjson'; |
|
| 185 | + //$last_exec['pirepsjson'] = 0; |
|
| 186 | + if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
|
| 187 | + } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
|
| 188 | + //$formats[$id] = 'fr24json'; |
|
| 189 | + $globalSources[$id]['format'] = 'fr24json'; |
|
| 190 | + //$last_exec['fr24json'] = 0; |
|
| 191 | + if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n"; |
|
| 192 | + if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 193 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 194 | + exit(0); |
|
| 195 | + } |
|
| 196 | + } else if (preg_match(':myshiptracking.com/:i',$host)) { |
|
| 197 | + //$formats[$id] = 'fr24json'; |
|
| 198 | + $globalSources[$id]['format'] = 'myshiptracking'; |
|
| 199 | + //$last_exec['fr24json'] = 0; |
|
| 200 | + if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n"; |
|
| 201 | + if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
|
| 202 | + echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
|
| 203 | + exit(0); |
|
| 204 | + } |
|
| 205 | + //} else if (preg_match('/10001/',$host)) { |
|
| 206 | + } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 207 | + //$formats[$id] = 'tsv'; |
|
| 208 | + $globalSources[$id]['format'] = 'tsv'; |
|
| 209 | + if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
|
| 210 | + } |
|
| 211 | + } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 212 | + if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
|
| 213 | + $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
|
| 214 | + if ($idf !== false) { |
|
| 215 | + $httpfeeds[$id] = $idf; |
|
| 216 | + if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 217 | + } |
|
| 218 | + elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
|
| 219 | + } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 220 | + } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 221 | + $hostport = explode(':',$host); |
|
| 222 | + if (isset($hostport[1])) { |
|
| 223 | 223 | $port = $hostport[1]; |
| 224 | 224 | $hostn = $hostport[0]; |
| 225 | - } else { |
|
| 225 | + } else { |
|
| 226 | 226 | $port = $globalSources[$id]['port']; |
| 227 | 227 | $hostn = $globalSources[$id]['host']; |
| 228 | - } |
|
| 229 | - $Common = new Common(); |
|
| 230 | - if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
|
| 231 | - $s = $Common->create_socket($hostn,$port, $errno, $errstr); |
|
| 232 | - } else { |
|
| 233 | - $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 234 | - } |
|
| 235 | - if ($s) { |
|
| 236 | - $sockets[$id] = $s; |
|
| 237 | - if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
|
| 238 | - if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { |
|
| 228 | + } |
|
| 229 | + $Common = new Common(); |
|
| 230 | + if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
|
| 231 | + $s = $Common->create_socket($hostn,$port, $errno, $errstr); |
|
| 232 | + } else { |
|
| 233 | + $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 234 | + } |
|
| 235 | + if ($s) { |
|
| 236 | + $sockets[$id] = $s; |
|
| 237 | + if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
|
| 238 | + if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { |
|
| 239 | 239 | //$formats[$id] = 'aprs'; |
| 240 | 240 | $globalSources[$id]['format'] = 'aprs'; |
| 241 | 241 | //$aprs_connect = 0; |
| 242 | 242 | //$use_aprs = true; |
| 243 | - } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 243 | + } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 244 | 244 | $globalSources[$id]['format'] = 'vrstcp'; |
| 245 | - } elseif ($port == '10001') { |
|
| 246 | - //$formats[$id] = 'tsv'; |
|
| 247 | - $globalSources[$id]['format'] = 'tsv'; |
|
| 248 | - } elseif ($port == '30002') { |
|
| 249 | - //$formats[$id] = 'raw'; |
|
| 250 | - $globalSources[$id]['format'] = 'raw'; |
|
| 251 | - } elseif ($port == '5001') { |
|
| 252 | - //$formats[$id] = 'raw'; |
|
| 253 | - $globalSources[$id]['format'] = 'flightgearmp'; |
|
| 254 | - } elseif ($port == '30005') { |
|
| 245 | + } elseif ($port == '10001') { |
|
| 246 | + //$formats[$id] = 'tsv'; |
|
| 247 | + $globalSources[$id]['format'] = 'tsv'; |
|
| 248 | + } elseif ($port == '30002') { |
|
| 249 | + //$formats[$id] = 'raw'; |
|
| 250 | + $globalSources[$id]['format'] = 'raw'; |
|
| 251 | + } elseif ($port == '5001') { |
|
| 252 | + //$formats[$id] = 'raw'; |
|
| 253 | + $globalSources[$id]['format'] = 'flightgearmp'; |
|
| 254 | + } elseif ($port == '30005') { |
|
| 255 | 255 | // Not yet supported |
| 256 | - //$formats[$id] = 'beast'; |
|
| 257 | - $globalSources[$id]['format'] = 'beast'; |
|
| 258 | - //} else $formats[$id] = 'sbs'; |
|
| 259 | - } else $globalSources[$id]['format'] = 'sbs'; |
|
| 260 | - //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; |
|
| 256 | + //$formats[$id] = 'beast'; |
|
| 257 | + $globalSources[$id]['format'] = 'beast'; |
|
| 258 | + //} else $formats[$id] = 'sbs'; |
|
| 259 | + } else $globalSources[$id]['format'] = 'sbs'; |
|
| 260 | + //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; |
|
| 261 | 261 | } |
| 262 | 262 | if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; |
| 263 | - } else { |
|
| 263 | + } else { |
|
| 264 | 264 | if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n"; |
| 265 | - } |
|
| 266 | - } |
|
| 267 | - } |
|
| 265 | + } |
|
| 266 | + } |
|
| 267 | + } |
|
| 268 | 268 | } |
| 269 | 269 | if (!isset($globalMinFetch)) $globalMinFetch = 15; |
| 270 | 270 | |
@@ -287,9 +287,9 @@ discard block |
||
| 287 | 287 | //connect_all($globalSources); |
| 288 | 288 | |
| 289 | 289 | if (isset($globalProxy) && $globalProxy) { |
| 290 | - $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); |
|
| 290 | + $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); |
|
| 291 | 291 | } else { |
| 292 | - $context = stream_context_create(array('http' => array('timeout' => $timeout))); |
|
| 292 | + $context = stream_context_create(array('http' => array('timeout' => $timeout))); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | // APRS Configuration |
@@ -298,18 +298,18 @@ discard block |
||
| 298 | 298 | die; |
| 299 | 299 | } |
| 300 | 300 | foreach ($globalSources as $key => $source) { |
| 301 | - if (!isset($source['format'])) { |
|
| 302 | - $globalSources[$key]['format'] = 'auto'; |
|
| 303 | - } |
|
| 301 | + if (!isset($source['format'])) { |
|
| 302 | + $globalSources[$key]['format'] = 'auto'; |
|
| 303 | + } |
|
| 304 | 304 | } |
| 305 | 305 | connect_all($globalSources); |
| 306 | 306 | foreach ($globalSources as $key => $source) { |
| 307 | - if (isset($source['format']) && $source['format'] == 'aprs') { |
|
| 307 | + if (isset($source['format']) && $source['format'] == 'aprs') { |
|
| 308 | 308 | $aprs_connect = 0; |
| 309 | 309 | $use_aprs = true; |
| 310 | 310 | if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true; |
| 311 | 311 | break; |
| 312 | - } |
|
| 312 | + } |
|
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | if ($use_aprs) { |
@@ -350,115 +350,115 @@ discard block |
||
| 350 | 350 | |
| 351 | 351 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 352 | 352 | while ($i > 0) { |
| 353 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 354 | - // Delete old ATC |
|
| 355 | - if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
|
| 353 | + if (!$globalDaemon) $i = $endtime-time(); |
|
| 354 | + // Delete old ATC |
|
| 355 | + if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
|
| 356 | 356 | if ($globalDebug) echo 'Delete old ATC...'."\n"; |
| 357 | - $ATC->deleteOldATC(); |
|
| 358 | - } |
|
| 357 | + $ATC->deleteOldATC(); |
|
| 358 | + } |
|
| 359 | 359 | |
| 360 | - if (count($last_exec) == count($globalSources)) { |
|
| 360 | + if (count($last_exec) == count($globalSources)) { |
|
| 361 | 361 | $max = $globalMinFetch; |
| 362 | 362 | foreach ($last_exec as $last) { |
| 363 | - if ((time() - $last['last']) < $max) $max = time() - $last['last']; |
|
| 363 | + if ((time() - $last['last']) < $max) $max = time() - $last['last']; |
|
| 364 | 364 | } |
| 365 | 365 | if ($max != $globalMinFetch) { |
| 366 | - if ($globalDebug) echo 'Sleeping...'."\n"; |
|
| 367 | - sleep($globalMinFetch-$max+2); |
|
| 366 | + if ($globalDebug) echo 'Sleeping...'."\n"; |
|
| 367 | + sleep($globalMinFetch-$max+2); |
|
| 368 | + } |
|
| 368 | 369 | } |
| 369 | - } |
|
| 370 | 370 | |
| 371 | 371 | |
| 372 | - //foreach ($formats as $id => $value) { |
|
| 373 | - foreach ($globalSources as $id => $value) { |
|
| 372 | + //foreach ($formats as $id => $value) { |
|
| 373 | + foreach ($globalSources as $id => $value) { |
|
| 374 | 374 | date_default_timezone_set('UTC'); |
| 375 | 375 | if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0; |
| 376 | 376 | if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 377 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 378 | - $buffer = $Common->getData($value['host']); |
|
| 379 | - if ($buffer != '') $reset = 0; |
|
| 380 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 381 | - $buffer = explode('\n',$buffer); |
|
| 382 | - foreach ($buffer as $line) { |
|
| 383 | - if ($line != '' && count($line) > 7) { |
|
| 384 | - $line = explode(',', $line); |
|
| 385 | - $data = array(); |
|
| 386 | - $data['hex'] = $line[1]; // hex |
|
| 387 | - $data['ident'] = $line[2]; // ident |
|
| 388 | - if (isset($line[3])) $data['altitude'] = $line[3]; // altitude |
|
| 389 | - if (isset($line[4])) $data['speed'] = $line[4]; // speed |
|
| 390 | - if (isset($line[5])) $data['heading'] = $line[5]; // heading |
|
| 391 | - if (isset($line[6])) $data['latitude'] = $line[6]; // lat |
|
| 392 | - if (isset($line[7])) $data['longitude'] = $line[7]; // long |
|
| 393 | - $data['verticalrate'] = ''; // vertical rate |
|
| 394 | - //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk |
|
| 395 | - $data['emergency'] = ''; // emergency |
|
| 396 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 397 | - $data['format_source'] = 'deltadbtxt'; |
|
| 398 | - $data['id_source'] = $id_source; |
|
| 399 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 400 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 401 | - if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats']; |
|
| 402 | - $SI->add($data); |
|
| 403 | - unset($data); |
|
| 404 | - } |
|
| 405 | - } |
|
| 406 | - $last_exec[$id]['last'] = time(); |
|
| 377 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 378 | + $buffer = $Common->getData($value['host']); |
|
| 379 | + if ($buffer != '') $reset = 0; |
|
| 380 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 381 | + $buffer = explode('\n',$buffer); |
|
| 382 | + foreach ($buffer as $line) { |
|
| 383 | + if ($line != '' && count($line) > 7) { |
|
| 384 | + $line = explode(',', $line); |
|
| 385 | + $data = array(); |
|
| 386 | + $data['hex'] = $line[1]; // hex |
|
| 387 | + $data['ident'] = $line[2]; // ident |
|
| 388 | + if (isset($line[3])) $data['altitude'] = $line[3]; // altitude |
|
| 389 | + if (isset($line[4])) $data['speed'] = $line[4]; // speed |
|
| 390 | + if (isset($line[5])) $data['heading'] = $line[5]; // heading |
|
| 391 | + if (isset($line[6])) $data['latitude'] = $line[6]; // lat |
|
| 392 | + if (isset($line[7])) $data['longitude'] = $line[7]; // long |
|
| 393 | + $data['verticalrate'] = ''; // vertical rate |
|
| 394 | + //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk |
|
| 395 | + $data['emergency'] = ''; // emergency |
|
| 396 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 397 | + $data['format_source'] = 'deltadbtxt'; |
|
| 398 | + $data['id_source'] = $id_source; |
|
| 399 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 400 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 401 | + if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats']; |
|
| 402 | + $SI->add($data); |
|
| 403 | + unset($data); |
|
| 404 | + } |
|
| 405 | + } |
|
| 406 | + $last_exec[$id]['last'] = time(); |
|
| 407 | 407 | } elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 408 | - date_default_timezone_set('CET'); |
|
| 409 | - $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
|
| 410 | - date_default_timezone_set('UTC'); |
|
| 411 | - if ($buffer != '') $reset = 0; |
|
| 412 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 413 | - $buffer = explode('\n',$buffer); |
|
| 414 | - foreach ($buffer as $line) { |
|
| 408 | + date_default_timezone_set('CET'); |
|
| 409 | + $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
|
| 410 | + date_default_timezone_set('UTC'); |
|
| 411 | + if ($buffer != '') $reset = 0; |
|
| 412 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 413 | + $buffer = explode('\n',$buffer); |
|
| 414 | + foreach ($buffer as $line) { |
|
| 415 | 415 | if ($line != '') { |
| 416 | - echo "'".$line."'\n"; |
|
| 417 | - $add = false; |
|
| 418 | - $ais_data = $AIS->parse_line(trim($line)); |
|
| 419 | - $data = array(); |
|
| 420 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 421 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 422 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 423 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 424 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 425 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 426 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 427 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 428 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 429 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 430 | - if (isset($ais_data['timestamp'])) { |
|
| 416 | + echo "'".$line."'\n"; |
|
| 417 | + $add = false; |
|
| 418 | + $ais_data = $AIS->parse_line(trim($line)); |
|
| 419 | + $data = array(); |
|
| 420 | + if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 421 | + if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 422 | + if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 423 | + if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 424 | + if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 425 | + if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 426 | + if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 427 | + if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 428 | + if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 429 | + if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 430 | + if (isset($ais_data['timestamp'])) { |
|
| 431 | 431 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
| 432 | 432 | if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { |
| 433 | - $last_exec[$id]['timestamp'] = $ais_data['timestamp']; |
|
| 434 | - $add = true; |
|
| 433 | + $last_exec[$id]['timestamp'] = $ais_data['timestamp']; |
|
| 434 | + $add = true; |
|
| 435 | 435 | } |
| 436 | - } else { |
|
| 436 | + } else { |
|
| 437 | 437 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 438 | 438 | $add = true; |
| 439 | - } |
|
| 440 | - $data['format_source'] = 'aisnmeatxt'; |
|
| 441 | - $data['id_source'] = $id_source; |
|
| 442 | - //print_r($data); |
|
| 443 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 444 | - if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 445 | - unset($data); |
|
| 439 | + } |
|
| 440 | + $data['format_source'] = 'aisnmeatxt'; |
|
| 441 | + $data['id_source'] = $id_source; |
|
| 442 | + //print_r($data); |
|
| 443 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 444 | + if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 445 | + unset($data); |
|
| 446 | 446 | } |
| 447 | - } |
|
| 448 | - $last_exec[$id]['last'] = time(); |
|
| 447 | + } |
|
| 448 | + $last_exec[$id]['last'] = time(); |
|
| 449 | 449 | } elseif ($value['format'] == 'aisnmeahttp') { |
| 450 | - $arr = $httpfeeds; |
|
| 451 | - $w = $e = null; |
|
| 450 | + $arr = $httpfeeds; |
|
| 451 | + $w = $e = null; |
|
| 452 | 452 | |
| 453 | - if (isset($arr[$id])) { |
|
| 453 | + if (isset($arr[$id])) { |
|
| 454 | 454 | $nn = stream_select($arr,$w,$e,$timeout); |
| 455 | 455 | if ($nn > 0) { |
| 456 | - foreach ($httpfeeds as $feed) { |
|
| 456 | + foreach ($httpfeeds as $feed) { |
|
| 457 | 457 | $buffer = stream_get_line($feed,2000,"\n"); |
| 458 | 458 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 459 | 459 | $buffer = explode('\n',$buffer); |
| 460 | 460 | foreach ($buffer as $line) { |
| 461 | - if ($line != '') { |
|
| 461 | + if ($line != '') { |
|
| 462 | 462 | $ais_data = $AIS->parse_line(trim($line)); |
| 463 | 463 | $data = array(); |
| 464 | 464 | if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
@@ -476,96 +476,96 @@ discard block |
||
| 476 | 476 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 477 | 477 | if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
| 478 | 478 | if (isset($ais_data['timestamp'])) { |
| 479 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 479 | + $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 480 | 480 | } else { |
| 481 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 481 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 482 | 482 | } |
| 483 | 483 | $data['format_source'] = 'aisnmeahttp'; |
| 484 | 484 | $data['id_source'] = $id_source; |
| 485 | 485 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 486 | 486 | if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
| 487 | 487 | unset($data); |
| 488 | - } |
|
| 488 | + } |
|
| 489 | + } |
|
| 489 | 490 | } |
| 490 | - } |
|
| 491 | 491 | } else { |
| 492 | - $format = $value['format']; |
|
| 493 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 494 | - else $tt[$format] = 0; |
|
| 495 | - if ($tt[$format] > 30) { |
|
| 492 | + $format = $value['format']; |
|
| 493 | + if (isset($tt[$format])) $tt[$format]++; |
|
| 494 | + else $tt[$format] = 0; |
|
| 495 | + if ($tt[$format] > 30) { |
|
| 496 | 496 | if ($globalDebug) echo 'Reconnect...'."\n"; |
| 497 | 497 | sleep(2); |
| 498 | 498 | $sourceeen[] = $value; |
| 499 | 499 | connect_all($sourceeen); |
| 500 | 500 | $sourceeen = array(); |
| 501 | - } |
|
| 501 | + } |
|
| 502 | + } |
|
| 502 | 503 | } |
| 503 | - } |
|
| 504 | 504 | } elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 505 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 506 | - if ($buffer != '') { |
|
| 505 | + $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 506 | + if ($buffer != '') { |
|
| 507 | 507 | //echo $buffer; |
| 508 | 508 | $all_data = json_decode($buffer,true); |
| 509 | 509 | //print_r($all_data); |
| 510 | 510 | if (isset($all_data[0]['DATA'])) { |
| 511 | - foreach ($all_data[0]['DATA'] as $line) { |
|
| 511 | + foreach ($all_data[0]['DATA'] as $line) { |
|
| 512 | 512 | if ($line != '') { |
| 513 | - $data = array(); |
|
| 514 | - $data['ident'] = $line['NAME']; |
|
| 515 | - $data['mmsi'] = $line['MMSI']; |
|
| 516 | - $data['speed'] = $line['SOG']; |
|
| 517 | - $data['heading'] = $line['COG']; |
|
| 518 | - $data['latitude'] = $line['LAT']; |
|
| 519 | - $data['longitude'] = $line['LNG']; |
|
| 520 | - // if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 521 | - $data['imo'] = $line['IMO']; |
|
| 522 | - //$data['arrival_code'] = $ais_data['destination']; |
|
| 523 | - $data['datetime'] = date('Y-m-d H:i:s',$line['T']); |
|
| 524 | - $data['format_source'] = 'myshiptracking'; |
|
| 525 | - $data['id_source'] = $id_source; |
|
| 526 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 527 | - $MI->add($data); |
|
| 528 | - unset($data); |
|
| 513 | + $data = array(); |
|
| 514 | + $data['ident'] = $line['NAME']; |
|
| 515 | + $data['mmsi'] = $line['MMSI']; |
|
| 516 | + $data['speed'] = $line['SOG']; |
|
| 517 | + $data['heading'] = $line['COG']; |
|
| 518 | + $data['latitude'] = $line['LAT']; |
|
| 519 | + $data['longitude'] = $line['LNG']; |
|
| 520 | + // if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 521 | + $data['imo'] = $line['IMO']; |
|
| 522 | + //$data['arrival_code'] = $ais_data['destination']; |
|
| 523 | + $data['datetime'] = date('Y-m-d H:i:s',$line['T']); |
|
| 524 | + $data['format_source'] = 'myshiptracking'; |
|
| 525 | + $data['id_source'] = $id_source; |
|
| 526 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 527 | + $MI->add($data); |
|
| 528 | + unset($data); |
|
| 529 | + } |
|
| 529 | 530 | } |
| 530 | - } |
|
| 531 | 531 | } |
| 532 | - } |
|
| 533 | - $last_exec[$id]['last'] = time(); |
|
| 532 | + } |
|
| 533 | + $last_exec[$id]['last'] = time(); |
|
| 534 | 534 | } elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 535 | - $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); |
|
| 536 | - if ($buffer != '') { |
|
| 535 | + $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); |
|
| 536 | + if ($buffer != '') { |
|
| 537 | 537 | $all_data = json_decode($buffer,true); |
| 538 | 538 | if (isset($all_data[0]['mmsi'])) { |
| 539 | - foreach ($all_data as $line) { |
|
| 539 | + foreach ($all_data as $line) { |
|
| 540 | 540 | if ($line != '') { |
| 541 | - $data = array(); |
|
| 542 | - $data['ident'] = $line['shipname']; |
|
| 543 | - $data['callsign'] = $line['callsign']; |
|
| 544 | - $data['mmsi'] = $line['mmsi']; |
|
| 545 | - $data['speed'] = $line['sog']; |
|
| 546 | - if ($line['heading'] != '511') $data['heading'] = $line['heading']; |
|
| 547 | - $data['latitude'] = $line['latitude']; |
|
| 548 | - $data['longitude'] = $line['longitude']; |
|
| 549 | - $data['type_id'] = $line['shiptype']; |
|
| 550 | - $data['arrival_code'] = $line['destination']; |
|
| 551 | - $data['datetime'] = $line['time']; |
|
| 552 | - $data['format_source'] = 'boatbeaconapp'; |
|
| 553 | - $data['id_source'] = $id_source; |
|
| 554 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 555 | - $MI->add($data); |
|
| 556 | - unset($data); |
|
| 541 | + $data = array(); |
|
| 542 | + $data['ident'] = $line['shipname']; |
|
| 543 | + $data['callsign'] = $line['callsign']; |
|
| 544 | + $data['mmsi'] = $line['mmsi']; |
|
| 545 | + $data['speed'] = $line['sog']; |
|
| 546 | + if ($line['heading'] != '511') $data['heading'] = $line['heading']; |
|
| 547 | + $data['latitude'] = $line['latitude']; |
|
| 548 | + $data['longitude'] = $line['longitude']; |
|
| 549 | + $data['type_id'] = $line['shiptype']; |
|
| 550 | + $data['arrival_code'] = $line['destination']; |
|
| 551 | + $data['datetime'] = $line['time']; |
|
| 552 | + $data['format_source'] = 'boatbeaconapp'; |
|
| 553 | + $data['id_source'] = $id_source; |
|
| 554 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 555 | + $MI->add($data); |
|
| 556 | + unset($data); |
|
| 557 | + } |
|
| 557 | 558 | } |
| 558 | - } |
|
| 559 | 559 | } |
| 560 | 560 | |
| 561 | - } |
|
| 562 | - $last_exec[$id]['last'] = time(); |
|
| 561 | + } |
|
| 562 | + $last_exec[$id]['last'] = time(); |
|
| 563 | 563 | } elseif ($value['format'] == 'boatnerd' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 564 | - $buffer = $Common->getData($value['host']); |
|
| 565 | - if ($buffer != '') { |
|
| 564 | + $buffer = $Common->getData($value['host']); |
|
| 565 | + if ($buffer != '') { |
|
| 566 | 566 | $all_data = json_decode($buffer,true); |
| 567 | 567 | if (isset($all_data['features'][0]['id'])) { |
| 568 | - foreach ($all_data['features'] as $line) { |
|
| 568 | + foreach ($all_data['features'] as $line) { |
|
| 569 | 569 | $data = array(); |
| 570 | 570 | if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name']; |
| 571 | 571 | if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign']; |
@@ -584,59 +584,59 @@ discard block |
||
| 584 | 584 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 585 | 585 | if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data); |
| 586 | 586 | unset($data); |
| 587 | - } |
|
| 587 | + } |
|
| 588 | 588 | } |
| 589 | 589 | |
| 590 | - } |
|
| 591 | - $last_exec[$id]['last'] = time(); |
|
| 590 | + } |
|
| 591 | + $last_exec[$id]['last'] = time(); |
|
| 592 | 592 | } elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 593 | - echo 'download...'; |
|
| 594 | - $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
|
| 595 | - echo 'done !'."\n"; |
|
| 596 | - if ($buffer != '') $reset = 0; |
|
| 597 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 598 | - $buffer = explode('\n',$buffer); |
|
| 599 | - foreach ($buffer as $line) { |
|
| 593 | + echo 'download...'; |
|
| 594 | + $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
|
| 595 | + echo 'done !'."\n"; |
|
| 596 | + if ($buffer != '') $reset = 0; |
|
| 597 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 598 | + $buffer = explode('\n',$buffer); |
|
| 599 | + foreach ($buffer as $line) { |
|
| 600 | 600 | if ($line != '') { |
| 601 | - $data = array(); |
|
| 602 | - $data['mmsi'] = (int)substr($line,0,9); |
|
| 603 | - $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); |
|
| 604 | - //$data['status'] = substr($line,21,2); |
|
| 605 | - //$data['type'] = substr($line,24,3); |
|
| 606 | - $data['latitude'] = substr($line,29,9); |
|
| 607 | - $data['longitude'] = substr($line,41,9); |
|
| 608 | - $data['speed'] = round(substr($line,51,5)); |
|
| 609 | - //$data['course'] = substr($line,57,5); |
|
| 610 | - $data['heading'] = round(substr($line,63,3)); |
|
| 611 | - //$data['draft'] = substr($line,67,4); |
|
| 612 | - //$data['length'] = substr($line,72,3); |
|
| 613 | - //$data['beam'] = substr($line,76,2); |
|
| 614 | - $data['ident'] = trim(utf8_encode(substr($line,79,20))); |
|
| 615 | - //$data['callsign'] = trim(substr($line,100,7); |
|
| 616 | - //$data['dest'] = substr($line,108,20); |
|
| 617 | - //$data['etaDate'] = substr($line,129,5); |
|
| 618 | - //$data['etaTime'] = substr($line,135,5); |
|
| 619 | - $data['format_source'] = 'shipplotter'; |
|
| 620 | - $data['id_source'] = $id_source; |
|
| 621 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 622 | - //print_r($data); |
|
| 623 | - echo 'Add...'."\n"; |
|
| 624 | - $MI->add($data); |
|
| 625 | - unset($data); |
|
| 601 | + $data = array(); |
|
| 602 | + $data['mmsi'] = (int)substr($line,0,9); |
|
| 603 | + $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); |
|
| 604 | + //$data['status'] = substr($line,21,2); |
|
| 605 | + //$data['type'] = substr($line,24,3); |
|
| 606 | + $data['latitude'] = substr($line,29,9); |
|
| 607 | + $data['longitude'] = substr($line,41,9); |
|
| 608 | + $data['speed'] = round(substr($line,51,5)); |
|
| 609 | + //$data['course'] = substr($line,57,5); |
|
| 610 | + $data['heading'] = round(substr($line,63,3)); |
|
| 611 | + //$data['draft'] = substr($line,67,4); |
|
| 612 | + //$data['length'] = substr($line,72,3); |
|
| 613 | + //$data['beam'] = substr($line,76,2); |
|
| 614 | + $data['ident'] = trim(utf8_encode(substr($line,79,20))); |
|
| 615 | + //$data['callsign'] = trim(substr($line,100,7); |
|
| 616 | + //$data['dest'] = substr($line,108,20); |
|
| 617 | + //$data['etaDate'] = substr($line,129,5); |
|
| 618 | + //$data['etaTime'] = substr($line,135,5); |
|
| 619 | + $data['format_source'] = 'shipplotter'; |
|
| 620 | + $data['id_source'] = $id_source; |
|
| 621 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 622 | + //print_r($data); |
|
| 623 | + echo 'Add...'."\n"; |
|
| 624 | + $MI->add($data); |
|
| 625 | + unset($data); |
|
| 626 | 626 | } |
| 627 | - } |
|
| 628 | - $last_exec[$id]['last'] = time(); |
|
| 627 | + } |
|
| 628 | + $last_exec[$id]['last'] = time(); |
|
| 629 | 629 | //} elseif (($value == 'whazzup' && (time() - $last_exec['whazzup'] > $globalMinFetch)) || ($value == 'vatsimtxt' && (time() - $last_exec['vatsimtxt'] > $globalMinFetch))) { |
| 630 | 630 | } elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) { |
| 631 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 632 | - $buffer = $Common->getData($value['host']); |
|
| 633 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 634 | - $buffer = explode('\n',$buffer); |
|
| 635 | - $reset = 0; |
|
| 636 | - foreach ($buffer as $line) { |
|
| 637 | - if ($line != '') { |
|
| 638 | - $line = explode(':', $line); |
|
| 639 | - if (count($line) > 30 && $line[0] != 'callsign') { |
|
| 631 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 632 | + $buffer = $Common->getData($value['host']); |
|
| 633 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 634 | + $buffer = explode('\n',$buffer); |
|
| 635 | + $reset = 0; |
|
| 636 | + foreach ($buffer as $line) { |
|
| 637 | + if ($line != '') { |
|
| 638 | + $line = explode(':', $line); |
|
| 639 | + if (count($line) > 30 && $line[0] != 'callsign') { |
|
| 640 | 640 | $data = array(); |
| 641 | 641 | if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37]; |
| 642 | 642 | else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
@@ -649,37 +649,37 @@ discard block |
||
| 649 | 649 | if (isset($line[45])) $data['heading'] = $line[45]; // heading |
| 650 | 650 | elseif (isset($line[38])) $data['heading'] = $line[38]; // heading |
| 651 | 651 | $data['latitude'] = $line[5]; // lat |
| 652 | - $data['longitude'] = $line[6]; // long |
|
| 653 | - $data['verticalrate'] = ''; // vertical rate |
|
| 654 | - $data['squawk'] = ''; // squawk |
|
| 655 | - $data['emergency'] = ''; // emergency |
|
| 656 | - $data['waypoints'] = $line[30]; |
|
| 652 | + $data['longitude'] = $line[6]; // long |
|
| 653 | + $data['verticalrate'] = ''; // vertical rate |
|
| 654 | + $data['squawk'] = ''; // squawk |
|
| 655 | + $data['emergency'] = ''; // emergency |
|
| 656 | + $data['waypoints'] = $line[30]; |
|
| 657 | 657 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 658 | 658 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37])); |
| 659 | 659 | //if (isset($line[37])) $data['last_update'] = $line[37]; |
| 660 | - $data['departure_airport_icao'] = $line[11]; |
|
| 661 | - $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 662 | - $data['arrival_airport_icao'] = $line[13]; |
|
| 660 | + $data['departure_airport_icao'] = $line[11]; |
|
| 661 | + $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 662 | + $data['arrival_airport_icao'] = $line[13]; |
|
| 663 | 663 | $data['frequency'] = $line[4]; |
| 664 | 664 | $data['type'] = $line[18]; |
| 665 | 665 | $data['range'] = $line[19]; |
| 666 | 666 | if (isset($line[35])) $data['info'] = $line[35]; |
| 667 | - $data['id_source'] = $id_source; |
|
| 668 | - //$data['arrival_airport_time'] = ; |
|
| 669 | - if ($line[9] != '') { |
|
| 670 | - $aircraft_data = explode('/',$line[9]); |
|
| 671 | - if (isset($aircraft_data[1])) { |
|
| 672 | - $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 673 | - } |
|
| 674 | - } |
|
| 675 | - /* |
|
| 667 | + $data['id_source'] = $id_source; |
|
| 668 | + //$data['arrival_airport_time'] = ; |
|
| 669 | + if ($line[9] != '') { |
|
| 670 | + $aircraft_data = explode('/',$line[9]); |
|
| 671 | + if (isset($aircraft_data[1])) { |
|
| 672 | + $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 673 | + } |
|
| 674 | + } |
|
| 675 | + /* |
|
| 676 | 676 | if ($value == 'whazzup') $data['format_source'] = 'whazzup'; |
| 677 | 677 | elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt'; |
| 678 | 678 | */ |
| 679 | - $data['format_source'] = $value['format']; |
|
| 679 | + $data['format_source'] = $value['format']; |
|
| 680 | 680 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 681 | 681 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
| 682 | - if ($line[3] == 'PILOT') $SI->add($data); |
|
| 682 | + if ($line[3] == 'PILOT') $SI->add($data); |
|
| 683 | 683 | elseif ($line[3] == 'ATC') { |
| 684 | 684 | //print_r($data); |
| 685 | 685 | $data['info'] = str_replace('^§','<br />',$data['info']); |
@@ -700,16 +700,16 @@ discard block |
||
| 700 | 700 | else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
| 701 | 701 | } |
| 702 | 702 | } |
| 703 | - unset($data); |
|
| 704 | - } |
|
| 705 | - } |
|
| 706 | - } |
|
| 707 | - //if ($value == 'whazzup') $last_exec['whazzup'] = time(); |
|
| 708 | - //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time(); |
|
| 709 | - $last_exec[$id]['last'] = time(); |
|
| 710 | - } elseif ($value['format'] == 'airwhere' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 711 | - $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20'); |
|
| 712 | - if ($buffer != '') { |
|
| 703 | + unset($data); |
|
| 704 | + } |
|
| 705 | + } |
|
| 706 | + } |
|
| 707 | + //if ($value == 'whazzup') $last_exec['whazzup'] = time(); |
|
| 708 | + //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time(); |
|
| 709 | + $last_exec[$id]['last'] = time(); |
|
| 710 | + } elseif ($value['format'] == 'airwhere' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 711 | + $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20'); |
|
| 712 | + if ($buffer != '') { |
|
| 713 | 713 | $all_data = simplexml_load_string($buffer); |
| 714 | 714 | foreach($all_data->children() as $childdata) { |
| 715 | 715 | $data = array(); |
@@ -730,10 +730,10 @@ discard block |
||
| 730 | 730 | $SI->add($data); |
| 731 | 731 | unset($data); |
| 732 | 732 | } |
| 733 | - } |
|
| 734 | - $Source->deleteOldLocationByType('gs'); |
|
| 735 | - $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20'); |
|
| 736 | - if ($buffer != '') { |
|
| 733 | + } |
|
| 734 | + $Source->deleteOldLocationByType('gs'); |
|
| 735 | + $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20'); |
|
| 736 | + if ($buffer != '') { |
|
| 737 | 737 | $all_data = simplexml_load_string($buffer); |
| 738 | 738 | foreach($all_data->children() as $childdata) { |
| 739 | 739 | $data = array(); |
@@ -750,249 +750,249 @@ discard block |
||
| 750 | 750 | } |
| 751 | 751 | unset($data); |
| 752 | 752 | } |
| 753 | - } |
|
| 754 | - $last_exec[$id]['last'] = time(); |
|
| 753 | + } |
|
| 754 | + $last_exec[$id]['last'] = time(); |
|
| 755 | 755 | } elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 756 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 757 | - if ($buffer != '') { |
|
| 758 | - $all_data = json_decode($buffer,true); |
|
| 759 | - if (isset($all_data['acList'])) { |
|
| 756 | + $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 757 | + if ($buffer != '') { |
|
| 758 | + $all_data = json_decode($buffer,true); |
|
| 759 | + if (isset($all_data['acList'])) { |
|
| 760 | 760 | $reset = 0; |
| 761 | 761 | foreach ($all_data['acList'] as $line) { |
| 762 | - $data = array(); |
|
| 763 | - $data['hex'] = $line['Icao']; // hex |
|
| 764 | - if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
|
| 765 | - if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude |
|
| 766 | - if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed |
|
| 767 | - if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading |
|
| 768 | - if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat |
|
| 769 | - if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long |
|
| 770 | - //$data['verticalrate'] = $line['']; // verticale rate |
|
| 771 | - if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
|
| 772 | - $data['emergency'] = ''; // emergency |
|
| 773 | - if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
|
| 762 | + $data = array(); |
|
| 763 | + $data['hex'] = $line['Icao']; // hex |
|
| 764 | + if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
|
| 765 | + if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude |
|
| 766 | + if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed |
|
| 767 | + if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading |
|
| 768 | + if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat |
|
| 769 | + if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long |
|
| 770 | + //$data['verticalrate'] = $line['']; // verticale rate |
|
| 771 | + if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
|
| 772 | + $data['emergency'] = ''; // emergency |
|
| 773 | + if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
|
| 774 | 774 | |
| 775 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 776 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 775 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 776 | + else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 777 | 777 | |
| 778 | - //$data['datetime'] = date('Y-m-d H:i:s'); |
|
| 779 | - if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
|
| 780 | - $data['format_source'] = 'aircraftlistjson'; |
|
| 781 | - $data['id_source'] = $id_source; |
|
| 782 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 783 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 784 | - if (isset($data['latitude'])) $SI->add($data); |
|
| 785 | - unset($data); |
|
| 778 | + //$data['datetime'] = date('Y-m-d H:i:s'); |
|
| 779 | + if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
|
| 780 | + $data['format_source'] = 'aircraftlistjson'; |
|
| 781 | + $data['id_source'] = $id_source; |
|
| 782 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 783 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 784 | + if (isset($data['latitude'])) $SI->add($data); |
|
| 785 | + unset($data); |
|
| 786 | 786 | } |
| 787 | - } elseif (is_array($all_data)) { |
|
| 787 | + } elseif (is_array($all_data)) { |
|
| 788 | 788 | $reset = 0; |
| 789 | 789 | foreach ($all_data as $line) { |
| 790 | - $data = array(); |
|
| 791 | - $data['hex'] = $line['hex']; // hex |
|
| 792 | - $data['ident'] = $line['flight']; // ident |
|
| 793 | - $data['altitude'] = $line['altitude']; // altitude |
|
| 794 | - $data['speed'] = $line['speed']; // speed |
|
| 795 | - $data['heading'] = $line['track']; // heading |
|
| 796 | - $data['latitude'] = $line['lat']; // lat |
|
| 797 | - $data['longitude'] = $line['lon']; // long |
|
| 798 | - $data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 799 | - $data['squawk'] = $line['squawk']; // squawk |
|
| 800 | - $data['emergency'] = ''; // emergency |
|
| 801 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 802 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 803 | - $data['format_source'] = 'aircraftlistjson'; |
|
| 804 | - $data['id_source'] = $id_source; |
|
| 805 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 806 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 807 | - $SI->add($data); |
|
| 808 | - unset($data); |
|
| 790 | + $data = array(); |
|
| 791 | + $data['hex'] = $line['hex']; // hex |
|
| 792 | + $data['ident'] = $line['flight']; // ident |
|
| 793 | + $data['altitude'] = $line['altitude']; // altitude |
|
| 794 | + $data['speed'] = $line['speed']; // speed |
|
| 795 | + $data['heading'] = $line['track']; // heading |
|
| 796 | + $data['latitude'] = $line['lat']; // lat |
|
| 797 | + $data['longitude'] = $line['lon']; // long |
|
| 798 | + $data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 799 | + $data['squawk'] = $line['squawk']; // squawk |
|
| 800 | + $data['emergency'] = ''; // emergency |
|
| 801 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 802 | + else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 803 | + $data['format_source'] = 'aircraftlistjson'; |
|
| 804 | + $data['id_source'] = $id_source; |
|
| 805 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 806 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 807 | + $SI->add($data); |
|
| 808 | + unset($data); |
|
| 809 | + } |
|
| 810 | + } |
|
| 809 | 811 | } |
| 810 | - } |
|
| 811 | - } |
|
| 812 | - //$last_exec['aircraftlistjson'] = time(); |
|
| 813 | - $last_exec[$id]['last'] = time(); |
|
| 814 | - //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
|
| 815 | - } elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 816 | - $buffer = $Common->getData($value['host']); |
|
| 817 | - $all_data = json_decode($buffer,true); |
|
| 818 | - if (isset($all_data['planes'])) { |
|
| 812 | + //$last_exec['aircraftlistjson'] = time(); |
|
| 813 | + $last_exec[$id]['last'] = time(); |
|
| 814 | + //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
|
| 815 | + } elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 816 | + $buffer = $Common->getData($value['host']); |
|
| 817 | + $all_data = json_decode($buffer,true); |
|
| 818 | + if (isset($all_data['planes'])) { |
|
| 819 | 819 | $reset = 0; |
| 820 | 820 | foreach ($all_data['planes'] as $key => $line) { |
| 821 | - $data = array(); |
|
| 822 | - $data['hex'] = $key; // hex |
|
| 823 | - $data['ident'] = $line[3]; // ident |
|
| 824 | - $data['altitude'] = $line[6]; // altitude |
|
| 825 | - $data['speed'] = $line[8]; // speed |
|
| 826 | - $data['heading'] = $line[7]; // heading |
|
| 827 | - $data['latitude'] = $line[4]; // lat |
|
| 828 | - $data['longitude'] = $line[5]; // long |
|
| 829 | - //$data['verticalrate'] = $line[]; // verticale rate |
|
| 830 | - $data['squawk'] = $line[10]; // squawk |
|
| 831 | - $data['emergency'] = ''; // emergency |
|
| 832 | - $data['registration'] = $line[2]; |
|
| 833 | - $data['aircraft_icao'] = $line[0]; |
|
| 834 | - $deparr = explode('-',$line[1]); |
|
| 835 | - if (count($deparr) == 2) { |
|
| 821 | + $data = array(); |
|
| 822 | + $data['hex'] = $key; // hex |
|
| 823 | + $data['ident'] = $line[3]; // ident |
|
| 824 | + $data['altitude'] = $line[6]; // altitude |
|
| 825 | + $data['speed'] = $line[8]; // speed |
|
| 826 | + $data['heading'] = $line[7]; // heading |
|
| 827 | + $data['latitude'] = $line[4]; // lat |
|
| 828 | + $data['longitude'] = $line[5]; // long |
|
| 829 | + //$data['verticalrate'] = $line[]; // verticale rate |
|
| 830 | + $data['squawk'] = $line[10]; // squawk |
|
| 831 | + $data['emergency'] = ''; // emergency |
|
| 832 | + $data['registration'] = $line[2]; |
|
| 833 | + $data['aircraft_icao'] = $line[0]; |
|
| 834 | + $deparr = explode('-',$line[1]); |
|
| 835 | + if (count($deparr) == 2) { |
|
| 836 | 836 | $data['departure_airport_icao'] = $deparr[0]; |
| 837 | 837 | $data['arrival_airport_icao'] = $deparr[1]; |
| 838 | - } |
|
| 839 | - $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 840 | - $data['format_source'] = 'planeupdatefaa'; |
|
| 841 | - $data['id_source'] = $id_source; |
|
| 842 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 843 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 844 | - $SI->add($data); |
|
| 845 | - unset($data); |
|
| 838 | + } |
|
| 839 | + $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 840 | + $data['format_source'] = 'planeupdatefaa'; |
|
| 841 | + $data['id_source'] = $id_source; |
|
| 842 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 843 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 844 | + $SI->add($data); |
|
| 845 | + unset($data); |
|
| 846 | + } |
|
| 846 | 847 | } |
| 847 | - } |
|
| 848 | - //$last_exec['planeupdatefaa'] = time(); |
|
| 849 | - $last_exec[$id]['last'] = time(); |
|
| 850 | - } elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 851 | - $buffer = $Common->getData($value['host']); |
|
| 852 | - $all_data = json_decode($buffer,true); |
|
| 853 | - if (isset($all_data['states'])) { |
|
| 848 | + //$last_exec['planeupdatefaa'] = time(); |
|
| 849 | + $last_exec[$id]['last'] = time(); |
|
| 850 | + } elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 851 | + $buffer = $Common->getData($value['host']); |
|
| 852 | + $all_data = json_decode($buffer,true); |
|
| 853 | + if (isset($all_data['states'])) { |
|
| 854 | 854 | $reset = 0; |
| 855 | 855 | foreach ($all_data['states'] as $key => $line) { |
| 856 | - $data = array(); |
|
| 857 | - $data['hex'] = $line[0]; // hex |
|
| 858 | - $data['ident'] = trim($line[1]); // ident |
|
| 859 | - $data['altitude'] = round($line[7]*3.28084); // altitude |
|
| 860 | - $data['speed'] = round($line[9]*1.94384); // speed |
|
| 861 | - $data['heading'] = round($line[10]); // heading |
|
| 862 | - $data['latitude'] = $line[6]; // lat |
|
| 863 | - $data['longitude'] = $line[5]; // long |
|
| 864 | - $data['verticalrate'] = $line[11]; // verticale rate |
|
| 865 | - //$data['squawk'] = $line[10]; // squawk |
|
| 866 | - //$data['emergency'] = ''; // emergency |
|
| 867 | - //$data['registration'] = $line[2]; |
|
| 868 | - //$data['aircraft_icao'] = $line[0]; |
|
| 869 | - $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 870 | - $data['format_source'] = 'opensky'; |
|
| 871 | - $data['id_source'] = $id_source; |
|
| 872 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 873 | - $SI->add($data); |
|
| 874 | - unset($data); |
|
| 856 | + $data = array(); |
|
| 857 | + $data['hex'] = $line[0]; // hex |
|
| 858 | + $data['ident'] = trim($line[1]); // ident |
|
| 859 | + $data['altitude'] = round($line[7]*3.28084); // altitude |
|
| 860 | + $data['speed'] = round($line[9]*1.94384); // speed |
|
| 861 | + $data['heading'] = round($line[10]); // heading |
|
| 862 | + $data['latitude'] = $line[6]; // lat |
|
| 863 | + $data['longitude'] = $line[5]; // long |
|
| 864 | + $data['verticalrate'] = $line[11]; // verticale rate |
|
| 865 | + //$data['squawk'] = $line[10]; // squawk |
|
| 866 | + //$data['emergency'] = ''; // emergency |
|
| 867 | + //$data['registration'] = $line[2]; |
|
| 868 | + //$data['aircraft_icao'] = $line[0]; |
|
| 869 | + $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 870 | + $data['format_source'] = 'opensky'; |
|
| 871 | + $data['id_source'] = $id_source; |
|
| 872 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 873 | + $SI->add($data); |
|
| 874 | + unset($data); |
|
| 875 | 875 | } |
| 876 | - } |
|
| 877 | - //$last_exec['planeupdatefaa'] = time(); |
|
| 878 | - $last_exec[$id]['last'] = time(); |
|
| 879 | - //} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) { |
|
| 880 | - } elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 881 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 882 | - $buffer = $Common->getData($value['host']); |
|
| 883 | - $all_data = json_decode($buffer,true); |
|
| 884 | - if (!empty($all_data)) $reset = 0; |
|
| 885 | - foreach ($all_data as $key => $line) { |
|
| 876 | + } |
|
| 877 | + //$last_exec['planeupdatefaa'] = time(); |
|
| 878 | + $last_exec[$id]['last'] = time(); |
|
| 879 | + //} elseif ($value == 'fr24json' && (time() - $last_exec['fr24json'] > $globalMinFetch)) { |
|
| 880 | + } elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 881 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 882 | + $buffer = $Common->getData($value['host']); |
|
| 883 | + $all_data = json_decode($buffer,true); |
|
| 884 | + if (!empty($all_data)) $reset = 0; |
|
| 885 | + foreach ($all_data as $key => $line) { |
|
| 886 | 886 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
| 887 | - $data = array(); |
|
| 888 | - $data['hex'] = $line[0]; |
|
| 889 | - $data['ident'] = $line[16]; //$line[13] |
|
| 890 | - $data['altitude'] = $line[4]; // altitude |
|
| 891 | - $data['speed'] = $line[5]; // speed |
|
| 892 | - $data['heading'] = $line[3]; // heading |
|
| 893 | - $data['latitude'] = $line[1]; // lat |
|
| 894 | - $data['longitude'] = $line[2]; // long |
|
| 895 | - $data['verticalrate'] = $line[15]; // verticale rate |
|
| 896 | - $data['squawk'] = $line[6]; // squawk |
|
| 897 | - $data['aircraft_icao'] = $line[8]; |
|
| 898 | - $data['registration'] = $line[9]; |
|
| 899 | - $data['departure_airport_iata'] = $line[11]; |
|
| 900 | - $data['arrival_airport_iata'] = $line[12]; |
|
| 901 | - $data['emergency'] = ''; // emergency |
|
| 902 | - $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] |
|
| 903 | - $data['format_source'] = 'fr24json'; |
|
| 904 | - $data['id_source'] = $id_source; |
|
| 905 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 906 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 907 | - $SI->add($data); |
|
| 908 | - unset($data); |
|
| 887 | + $data = array(); |
|
| 888 | + $data['hex'] = $line[0]; |
|
| 889 | + $data['ident'] = $line[16]; //$line[13] |
|
| 890 | + $data['altitude'] = $line[4]; // altitude |
|
| 891 | + $data['speed'] = $line[5]; // speed |
|
| 892 | + $data['heading'] = $line[3]; // heading |
|
| 893 | + $data['latitude'] = $line[1]; // lat |
|
| 894 | + $data['longitude'] = $line[2]; // long |
|
| 895 | + $data['verticalrate'] = $line[15]; // verticale rate |
|
| 896 | + $data['squawk'] = $line[6]; // squawk |
|
| 897 | + $data['aircraft_icao'] = $line[8]; |
|
| 898 | + $data['registration'] = $line[9]; |
|
| 899 | + $data['departure_airport_iata'] = $line[11]; |
|
| 900 | + $data['arrival_airport_iata'] = $line[12]; |
|
| 901 | + $data['emergency'] = ''; // emergency |
|
| 902 | + $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] |
|
| 903 | + $data['format_source'] = 'fr24json'; |
|
| 904 | + $data['id_source'] = $id_source; |
|
| 905 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 906 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 907 | + $SI->add($data); |
|
| 908 | + unset($data); |
|
| 909 | + } |
|
| 909 | 910 | } |
| 910 | - } |
|
| 911 | - //$last_exec['fr24json'] = time(); |
|
| 912 | - $last_exec[$id]['last'] = time(); |
|
| 913 | - //} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { |
|
| 914 | - } elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 915 | - //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
|
| 916 | - $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 917 | - //echo $buffer; |
|
| 918 | - $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 919 | - $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 920 | - $all_data = json_decode($buffer,true); |
|
| 921 | - if (json_last_error() != JSON_ERROR_NONE) { |
|
| 911 | + //$last_exec['fr24json'] = time(); |
|
| 912 | + $last_exec[$id]['last'] = time(); |
|
| 913 | + //} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { |
|
| 914 | + } elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 915 | + //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
|
| 916 | + $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 917 | + //echo $buffer; |
|
| 918 | + $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 919 | + $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 920 | + $all_data = json_decode($buffer,true); |
|
| 921 | + if (json_last_error() != JSON_ERROR_NONE) { |
|
| 922 | 922 | die(json_last_error_msg()); |
| 923 | - } |
|
| 924 | - if (isset($all_data['mrkrs'])) { |
|
| 923 | + } |
|
| 924 | + if (isset($all_data['mrkrs'])) { |
|
| 925 | 925 | $reset = 0; |
| 926 | 926 | foreach ($all_data['mrkrs'] as $key => $line) { |
| 927 | - if (isset($line['inf'])) { |
|
| 927 | + if (isset($line['inf'])) { |
|
| 928 | 928 | $data = array(); |
| 929 | 929 | $data['hex'] = $line['inf']['ia']; |
| 930 | 930 | if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13] |
| 931 | - $data['altitude'] = round($line['inf']['al']*3.28084); // altitude |
|
| 932 | - if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed |
|
| 933 | - if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading |
|
| 934 | - $data['latitude'] = $line['pt'][0]; // lat |
|
| 935 | - $data['longitude'] = $line['pt'][1]; // long |
|
| 936 | - //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate |
|
| 937 | - if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk |
|
| 938 | - //$data['aircraft_icao'] = $line[8]; |
|
| 939 | - if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc']; |
|
| 931 | + $data['altitude'] = round($line['inf']['al']*3.28084); // altitude |
|
| 932 | + if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed |
|
| 933 | + if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading |
|
| 934 | + $data['latitude'] = $line['pt'][0]; // lat |
|
| 935 | + $data['longitude'] = $line['pt'][1]; // long |
|
| 936 | + //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate |
|
| 937 | + if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk |
|
| 938 | + //$data['aircraft_icao'] = $line[8]; |
|
| 939 | + if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc']; |
|
| 940 | 940 | //$data['departure_airport_iata'] = $line[11]; |
| 941 | 941 | //$data['arrival_airport_iata'] = $line[12]; |
| 942 | - //$data['emergency'] = ''; // emergency |
|
| 942 | + //$data['emergency'] = ''; // emergency |
|
| 943 | 943 | $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
| 944 | - $data['format_source'] = 'radarvirtueljson'; |
|
| 945 | - $data['id_source'] = $id_source; |
|
| 944 | + $data['format_source'] = 'radarvirtueljson'; |
|
| 945 | + $data['id_source'] = $id_source; |
|
| 946 | 946 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
| 947 | 947 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
| 948 | 948 | $SI->add($data); |
| 949 | 949 | unset($data); |
| 950 | - } |
|
| 950 | + } |
|
| 951 | 951 | } |
| 952 | - } |
|
| 953 | - //$last_exec['radarvirtueljson'] = time(); |
|
| 954 | - $last_exec[$id]['last'] = time(); |
|
| 955 | - //} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) { |
|
| 956 | - } elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 957 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 958 | - $buffer = $Common->getData($value['host'].'?'.time()); |
|
| 959 | - $all_data = json_decode(utf8_encode($buffer),true); |
|
| 952 | + } |
|
| 953 | + //$last_exec['radarvirtueljson'] = time(); |
|
| 954 | + $last_exec[$id]['last'] = time(); |
|
| 955 | + //} elseif ($value == 'pirepsjson' && (time() - $last_exec['pirepsjson'] > $globalMinFetch)) { |
|
| 956 | + } elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 957 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 958 | + $buffer = $Common->getData($value['host'].'?'.time()); |
|
| 959 | + $all_data = json_decode(utf8_encode($buffer),true); |
|
| 960 | 960 | |
| 961 | - if (isset($all_data['pireps'])) { |
|
| 961 | + if (isset($all_data['pireps'])) { |
|
| 962 | 962 | $reset = 0; |
| 963 | - foreach ($all_data['pireps'] as $line) { |
|
| 964 | - $data = array(); |
|
| 965 | - $data['id'] = $line['id']; |
|
| 966 | - $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 967 | - $data['ident'] = $line['callsign']; // ident |
|
| 968 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
|
| 969 | - if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
|
| 970 | - if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude |
|
| 971 | - if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed |
|
| 972 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading |
|
| 973 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 974 | - $data['latitude'] = $line['lat']; // lat |
|
| 975 | - $data['longitude'] = $line['lon']; // long |
|
| 976 | - //$data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 977 | - //$data['squawk'] = $line['squawk']; // squawk |
|
| 978 | - //$data['emergency'] = ''; // emergency |
|
| 979 | - if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao']; |
|
| 980 | - if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime']; |
|
| 981 | - if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao']; |
|
| 982 | - //$data['arrival_airport_time'] = $line['arrtime']; |
|
| 983 | - if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft']; |
|
| 984 | - if (isset($line['transponder'])) $data['squawk'] = $line['transponder']; |
|
| 985 | - if (isset($line['atis'])) $data['info'] = $line['atis']; |
|
| 986 | - else $data['info'] = ''; |
|
| 987 | - $data['format_source'] = 'pireps'; |
|
| 988 | - $data['id_source'] = $id_source; |
|
| 989 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 990 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 991 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 992 | - if ($line['icon'] == 'plane') { |
|
| 963 | + foreach ($all_data['pireps'] as $line) { |
|
| 964 | + $data = array(); |
|
| 965 | + $data['id'] = $line['id']; |
|
| 966 | + $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 967 | + $data['ident'] = $line['callsign']; // ident |
|
| 968 | + if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
|
| 969 | + if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
|
| 970 | + if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude |
|
| 971 | + if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed |
|
| 972 | + if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading |
|
| 973 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 974 | + $data['latitude'] = $line['lat']; // lat |
|
| 975 | + $data['longitude'] = $line['lon']; // long |
|
| 976 | + //$data['verticalrate'] = $line['vrt']; // verticale rate |
|
| 977 | + //$data['squawk'] = $line['squawk']; // squawk |
|
| 978 | + //$data['emergency'] = ''; // emergency |
|
| 979 | + if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao']; |
|
| 980 | + if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime']; |
|
| 981 | + if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao']; |
|
| 982 | + //$data['arrival_airport_time'] = $line['arrtime']; |
|
| 983 | + if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft']; |
|
| 984 | + if (isset($line['transponder'])) $data['squawk'] = $line['transponder']; |
|
| 985 | + if (isset($line['atis'])) $data['info'] = $line['atis']; |
|
| 986 | + else $data['info'] = ''; |
|
| 987 | + $data['format_source'] = 'pireps'; |
|
| 988 | + $data['id_source'] = $id_source; |
|
| 989 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 990 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 991 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 992 | + if ($line['icon'] == 'plane') { |
|
| 993 | 993 | $SI->add($data); |
| 994 | - // print_r($data); |
|
| 995 | - } elseif ($line['icon'] == 'ct') { |
|
| 994 | + // print_r($data); |
|
| 995 | + } elseif ($line['icon'] == 'ct') { |
|
| 996 | 996 | $data['info'] = str_replace('^§','<br />',$data['info']); |
| 997 | 997 | $data['info'] = str_replace('&sect;','',$data['info']); |
| 998 | 998 | $typec = substr($data['ident'],-3); |
@@ -1007,199 +1007,199 @@ discard block |
||
| 1007 | 1007 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 1008 | 1008 | else $data['type'] = 'Observer'; |
| 1009 | 1009 | if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']); |
| 1010 | - } |
|
| 1011 | - unset($data); |
|
| 1010 | + } |
|
| 1011 | + unset($data); |
|
| 1012 | 1012 | } |
| 1013 | - } |
|
| 1014 | - //$last_exec['pirepsjson'] = time(); |
|
| 1015 | - $last_exec[$id]['last'] = time(); |
|
| 1016 | - //} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) { |
|
| 1017 | - } elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 1018 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 1019 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1020 | - $buffer = $Common->getData($value['host']); |
|
| 1021 | - $all_data = json_decode($buffer,true); |
|
| 1022 | - if ($buffer != '' && is_array($all_data)) { |
|
| 1013 | + } |
|
| 1014 | + //$last_exec['pirepsjson'] = time(); |
|
| 1015 | + $last_exec[$id]['last'] = time(); |
|
| 1016 | + //} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) { |
|
| 1017 | + } elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 1018 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 1019 | + if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1020 | + $buffer = $Common->getData($value['host']); |
|
| 1021 | + $all_data = json_decode($buffer,true); |
|
| 1022 | + if ($buffer != '' && is_array($all_data)) { |
|
| 1023 | 1023 | $reset = 0; |
| 1024 | 1024 | foreach ($all_data as $line) { |
| 1025 | - $data = array(); |
|
| 1026 | - //$data['id'] = $line['id']; // id not usable |
|
| 1027 | - if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 1028 | - $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1029 | - if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
|
| 1030 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
|
| 1031 | - $data['ident'] = $line['flightnum']; // ident |
|
| 1032 | - $data['altitude'] = $line['alt']; // altitude |
|
| 1033 | - $data['speed'] = $line['gs']; // speed |
|
| 1034 | - $data['heading'] = $line['heading']; // heading |
|
| 1035 | - $data['latitude'] = $line['lat']; // lat |
|
| 1036 | - $data['longitude'] = $line['lng']; // long |
|
| 1037 | - $data['verticalrate'] = ''; // verticale rate |
|
| 1038 | - $data['squawk'] = ''; // squawk |
|
| 1039 | - $data['emergency'] = ''; // emergency |
|
| 1040 | - //$data['datetime'] = $line['lastupdate']; |
|
| 1041 | - $data['last_update'] = $line['lastupdate']; |
|
| 1042 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1043 | - $data['departure_airport_icao'] = $line['depicao']; |
|
| 1044 | - $data['departure_airport_time'] = $line['deptime']; |
|
| 1045 | - $data['arrival_airport_icao'] = $line['arricao']; |
|
| 1046 | - $data['arrival_airport_time'] = $line['arrtime']; |
|
| 1047 | - $data['registration'] = $line['aircraft']; |
|
| 1048 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1049 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1050 | - if (isset($line['aircraftname'])) { |
|
| 1025 | + $data = array(); |
|
| 1026 | + //$data['id'] = $line['id']; // id not usable |
|
| 1027 | + if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 1028 | + $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1029 | + if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
|
| 1030 | + if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
|
| 1031 | + $data['ident'] = $line['flightnum']; // ident |
|
| 1032 | + $data['altitude'] = $line['alt']; // altitude |
|
| 1033 | + $data['speed'] = $line['gs']; // speed |
|
| 1034 | + $data['heading'] = $line['heading']; // heading |
|
| 1035 | + $data['latitude'] = $line['lat']; // lat |
|
| 1036 | + $data['longitude'] = $line['lng']; // long |
|
| 1037 | + $data['verticalrate'] = ''; // verticale rate |
|
| 1038 | + $data['squawk'] = ''; // squawk |
|
| 1039 | + $data['emergency'] = ''; // emergency |
|
| 1040 | + //$data['datetime'] = $line['lastupdate']; |
|
| 1041 | + $data['last_update'] = $line['lastupdate']; |
|
| 1042 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1043 | + $data['departure_airport_icao'] = $line['depicao']; |
|
| 1044 | + $data['departure_airport_time'] = $line['deptime']; |
|
| 1045 | + $data['arrival_airport_icao'] = $line['arricao']; |
|
| 1046 | + $data['arrival_airport_time'] = $line['arrtime']; |
|
| 1047 | + $data['registration'] = $line['aircraft']; |
|
| 1048 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1049 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1050 | + if (isset($line['aircraftname'])) { |
|
| 1051 | 1051 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 1052 | 1052 | $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
| 1053 | - $aircraft_data = explode('-',$line['aircraftname']); |
|
| 1054 | - if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 1055 | - elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 1056 | - else { |
|
| 1057 | - $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 1058 | - if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 1059 | - else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1060 | - } |
|
| 1061 | - } |
|
| 1062 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; |
|
| 1063 | - $data['id_source'] = $id_source; |
|
| 1064 | - $data['format_source'] = 'phpvmacars'; |
|
| 1065 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1066 | - $SI->add($data); |
|
| 1067 | - unset($data); |
|
| 1053 | + $aircraft_data = explode('-',$line['aircraftname']); |
|
| 1054 | + if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 1055 | + elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 1056 | + else { |
|
| 1057 | + $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 1058 | + if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 1059 | + else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1060 | + } |
|
| 1061 | + } |
|
| 1062 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; |
|
| 1063 | + $data['id_source'] = $id_source; |
|
| 1064 | + $data['format_source'] = 'phpvmacars'; |
|
| 1065 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1066 | + $SI->add($data); |
|
| 1067 | + unset($data); |
|
| 1068 | 1068 | } |
| 1069 | 1069 | if ($globalDebug) echo 'No more data...'."\n"; |
| 1070 | 1070 | unset($buffer); |
| 1071 | 1071 | unset($all_data); |
| 1072 | - } |
|
| 1073 | - //$last_exec['phpvmacars'] = time(); |
|
| 1074 | - $last_exec[$id]['last'] = time(); |
|
| 1075 | - } elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 1076 | - //$buffer = $Common->getData($hosts[$id]); |
|
| 1077 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1078 | - $buffer = $Common->getData($value['host']); |
|
| 1079 | - $all_data = json_decode($buffer,true); |
|
| 1080 | - if ($buffer != '' && is_array($all_data)) { |
|
| 1072 | + } |
|
| 1073 | + //$last_exec['phpvmacars'] = time(); |
|
| 1074 | + $last_exec[$id]['last'] = time(); |
|
| 1075 | + } elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
|
| 1076 | + //$buffer = $Common->getData($hosts[$id]); |
|
| 1077 | + if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1078 | + $buffer = $Common->getData($value['host']); |
|
| 1079 | + $all_data = json_decode($buffer,true); |
|
| 1080 | + if ($buffer != '' && is_array($all_data)) { |
|
| 1081 | 1081 | $reset = 0; |
| 1082 | 1082 | foreach ($all_data as $line) { |
| 1083 | - $data = array(); |
|
| 1084 | - //$data['id'] = $line['id']; // id not usable |
|
| 1085 | - $data['id'] = trim($line['flight_id']); |
|
| 1086 | - $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1087 | - $data['pilot_name'] = $line['pilot_name']; |
|
| 1088 | - $data['pilot_id'] = $line['pilot_id']; |
|
| 1089 | - $data['ident'] = trim($line['callsign']); // ident |
|
| 1090 | - $data['altitude'] = $line['altitude']; // altitude |
|
| 1091 | - $data['speed'] = $line['gs']; // speed |
|
| 1092 | - $data['heading'] = $line['heading']; // heading |
|
| 1093 | - $data['latitude'] = $line['latitude']; // lat |
|
| 1094 | - $data['longitude'] = $line['longitude']; // long |
|
| 1095 | - $data['verticalrate'] = ''; // verticale rate |
|
| 1096 | - $data['squawk'] = ''; // squawk |
|
| 1097 | - $data['emergency'] = ''; // emergency |
|
| 1098 | - //$data['datetime'] = $line['lastupdate']; |
|
| 1099 | - $data['last_update'] = $line['last_update']; |
|
| 1100 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1101 | - $data['departure_airport_icao'] = $line['departure']; |
|
| 1102 | - //$data['departure_airport_time'] = $line['departure_time']; |
|
| 1103 | - $data['arrival_airport_icao'] = $line['arrival']; |
|
| 1104 | - //$data['arrival_airport_time'] = $line['arrival_time']; |
|
| 1105 | - //$data['registration'] = $line['aircraft']; |
|
| 1106 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1107 | - $data['aircraft_icao'] = $line['plane_type']; |
|
| 1108 | - $data['id_source'] = $id_source; |
|
| 1109 | - $data['format_source'] = 'vam'; |
|
| 1110 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1111 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1112 | - $SI->add($data); |
|
| 1113 | - unset($data); |
|
| 1083 | + $data = array(); |
|
| 1084 | + //$data['id'] = $line['id']; // id not usable |
|
| 1085 | + $data['id'] = trim($line['flight_id']); |
|
| 1086 | + $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1087 | + $data['pilot_name'] = $line['pilot_name']; |
|
| 1088 | + $data['pilot_id'] = $line['pilot_id']; |
|
| 1089 | + $data['ident'] = trim($line['callsign']); // ident |
|
| 1090 | + $data['altitude'] = $line['altitude']; // altitude |
|
| 1091 | + $data['speed'] = $line['gs']; // speed |
|
| 1092 | + $data['heading'] = $line['heading']; // heading |
|
| 1093 | + $data['latitude'] = $line['latitude']; // lat |
|
| 1094 | + $data['longitude'] = $line['longitude']; // long |
|
| 1095 | + $data['verticalrate'] = ''; // verticale rate |
|
| 1096 | + $data['squawk'] = ''; // squawk |
|
| 1097 | + $data['emergency'] = ''; // emergency |
|
| 1098 | + //$data['datetime'] = $line['lastupdate']; |
|
| 1099 | + $data['last_update'] = $line['last_update']; |
|
| 1100 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1101 | + $data['departure_airport_icao'] = $line['departure']; |
|
| 1102 | + //$data['departure_airport_time'] = $line['departure_time']; |
|
| 1103 | + $data['arrival_airport_icao'] = $line['arrival']; |
|
| 1104 | + //$data['arrival_airport_time'] = $line['arrival_time']; |
|
| 1105 | + //$data['registration'] = $line['aircraft']; |
|
| 1106 | + if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1107 | + $data['aircraft_icao'] = $line['plane_type']; |
|
| 1108 | + $data['id_source'] = $id_source; |
|
| 1109 | + $data['format_source'] = 'vam'; |
|
| 1110 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1111 | + if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1112 | + $SI->add($data); |
|
| 1113 | + unset($data); |
|
| 1114 | 1114 | } |
| 1115 | 1115 | if ($globalDebug) echo 'No more data...'."\n"; |
| 1116 | 1116 | unset($buffer); |
| 1117 | 1117 | unset($all_data); |
| 1118 | - } |
|
| 1119 | - //$last_exec['phpvmacars'] = time(); |
|
| 1120 | - $last_exec[$id]['last'] = time(); |
|
| 1118 | + } |
|
| 1119 | + //$last_exec['phpvmacars'] = time(); |
|
| 1120 | + $last_exec[$id]['last'] = time(); |
|
| 1121 | 1121 | //} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') { |
| 1122 | 1122 | } elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') { |
| 1123 | - if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1124 | - //$last_exec[$id]['last'] = time(); |
|
| 1123 | + if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1124 | + //$last_exec[$id]['last'] = time(); |
|
| 1125 | 1125 | |
| 1126 | - //$read = array( $sockets[$id] ); |
|
| 1127 | - $read = $sockets; |
|
| 1128 | - $write = NULL; |
|
| 1129 | - $e = NULL; |
|
| 1130 | - $n = socket_select($read, $write, $e, $timeout); |
|
| 1131 | - if ($e != NULL) var_dump($e); |
|
| 1132 | - if ($n > 0) { |
|
| 1126 | + //$read = array( $sockets[$id] ); |
|
| 1127 | + $read = $sockets; |
|
| 1128 | + $write = NULL; |
|
| 1129 | + $e = NULL; |
|
| 1130 | + $n = socket_select($read, $write, $e, $timeout); |
|
| 1131 | + if ($e != NULL) var_dump($e); |
|
| 1132 | + if ($n > 0) { |
|
| 1133 | 1133 | $reset = 0; |
| 1134 | 1134 | foreach ($read as $nb => $r) { |
| 1135 | - //$value = $formats[$nb]; |
|
| 1136 | - $format = $globalSources[$nb]['format']; |
|
| 1137 | - if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
|
| 1135 | + //$value = $formats[$nb]; |
|
| 1136 | + $format = $globalSources[$nb]['format']; |
|
| 1137 | + if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
|
| 1138 | 1138 | $buffer = @socket_read($r, 6000,PHP_NORMAL_READ); |
| 1139 | - } elseif ($format == 'vrstcp') { |
|
| 1139 | + } elseif ($format == 'vrstcp') { |
|
| 1140 | 1140 | $buffer = @socket_read($r, 6000); |
| 1141 | - } else { |
|
| 1141 | + } else { |
|
| 1142 | 1142 | $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port); |
| 1143 | - } |
|
| 1144 | - //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
|
| 1145 | - //echo $buffer."\n"; |
|
| 1146 | - // lets play nice and handle signals such as ctrl-c/kill properly |
|
| 1147 | - //if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1148 | - $error = false; |
|
| 1149 | - //$SI::del(); |
|
| 1150 | - if ($format == 'vrstcp') { |
|
| 1143 | + } |
|
| 1144 | + //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
|
| 1145 | + //echo $buffer."\n"; |
|
| 1146 | + // lets play nice and handle signals such as ctrl-c/kill properly |
|
| 1147 | + //if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1148 | + $error = false; |
|
| 1149 | + //$SI::del(); |
|
| 1150 | + if ($format == 'vrstcp') { |
|
| 1151 | 1151 | $buffer = explode('},{',$buffer); |
| 1152 | - } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1153 | - // SBS format is CSV format |
|
| 1154 | - if ($buffer !== FALSE && $buffer != '') { |
|
| 1152 | + } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1153 | + // SBS format is CSV format |
|
| 1154 | + if ($buffer !== FALSE && $buffer != '') { |
|
| 1155 | 1155 | $tt[$format] = 0; |
| 1156 | 1156 | if ($format == 'acarssbs3') { |
| 1157 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1158 | - $ACARS->add(trim($buffer)); |
|
| 1159 | - $ACARS->deleteLiveAcarsData(); |
|
| 1157 | + if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1158 | + $ACARS->add(trim($buffer)); |
|
| 1159 | + $ACARS->deleteLiveAcarsData(); |
|
| 1160 | 1160 | } elseif ($format == 'raw') { |
| 1161 | - // AVR format |
|
| 1162 | - $data = $SBS->parse($buffer); |
|
| 1163 | - if (is_array($data)) { |
|
| 1161 | + // AVR format |
|
| 1162 | + $data = $SBS->parse($buffer); |
|
| 1163 | + if (is_array($data)) { |
|
| 1164 | 1164 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1165 | 1165 | $data['format_source'] = 'raw'; |
| 1166 | 1166 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
| 1167 | 1167 | if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
| 1168 | 1168 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1169 | 1169 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1170 | - } |
|
| 1170 | + } |
|
| 1171 | 1171 | } elseif ($format == 'ais') { |
| 1172 | - $ais_data = $AIS->parse_line(trim($buffer)); |
|
| 1173 | - $data = array(); |
|
| 1174 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 1175 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 1176 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 1177 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 1178 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 1179 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 1180 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 1181 | - if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid']; |
|
| 1182 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 1183 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 1184 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 1185 | - if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
|
| 1186 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1187 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1188 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1189 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1172 | + $ais_data = $AIS->parse_line(trim($buffer)); |
|
| 1173 | + $data = array(); |
|
| 1174 | + if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 1175 | + if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 1176 | + if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 1177 | + if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 1178 | + if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 1179 | + if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 1180 | + if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 1181 | + if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid']; |
|
| 1182 | + if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 1183 | + if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 1184 | + if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 1185 | + if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
|
| 1186 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1187 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1188 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1189 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1190 | 1190 | |
| 1191 | - if (isset($ais_data['timestamp'])) { |
|
| 1191 | + if (isset($ais_data['timestamp'])) { |
|
| 1192 | 1192 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
| 1193 | - } else { |
|
| 1193 | + } else { |
|
| 1194 | 1194 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1195 | - } |
|
| 1196 | - $data['format_source'] = 'aisnmea'; |
|
| 1197 | - $data['id_source'] = $id_source; |
|
| 1198 | - if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 1199 | - unset($data); |
|
| 1200 | - } elseif ($format == 'flightgearsp') { |
|
| 1201 | - //echo $buffer."\n"; |
|
| 1202 | - if (strlen($buffer) > 5) { |
|
| 1195 | + } |
|
| 1196 | + $data['format_source'] = 'aisnmea'; |
|
| 1197 | + $data['id_source'] = $id_source; |
|
| 1198 | + if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 1199 | + unset($data); |
|
| 1200 | + } elseif ($format == 'flightgearsp') { |
|
| 1201 | + //echo $buffer."\n"; |
|
| 1202 | + if (strlen($buffer) > 5) { |
|
| 1203 | 1203 | $line = explode(',',$buffer); |
| 1204 | 1204 | $data = array(); |
| 1205 | 1205 | //XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p |
@@ -1216,38 +1216,38 @@ discard block |
||
| 1216 | 1216 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1217 | 1217 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1218 | 1218 | //$send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
| 1219 | - } |
|
| 1220 | - } elseif ($format == 'acars') { |
|
| 1221 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1222 | - $ACARS->add(trim($buffer)); |
|
| 1223 | - socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 1224 | - $ACARS->deleteLiveAcarsData(); |
|
| 1219 | + } |
|
| 1220 | + } elseif ($format == 'acars') { |
|
| 1221 | + if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1222 | + $ACARS->add(trim($buffer)); |
|
| 1223 | + socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 1224 | + $ACARS->deleteLiveAcarsData(); |
|
| 1225 | 1225 | } elseif ($format == 'flightgearmp') { |
| 1226 | - if (substr($buffer,0,1) != '#') { |
|
| 1226 | + if (substr($buffer,0,1) != '#') { |
|
| 1227 | 1227 | $data = array(); |
| 1228 | 1228 | //echo $buffer."\n"; |
| 1229 | 1229 | $line = explode(' ',$buffer); |
| 1230 | 1230 | if (count($line) == 11) { |
| 1231 | - $userserver = explode('@',$line[0]); |
|
| 1232 | - $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 1233 | - $data['ident'] = $userserver[0]; |
|
| 1234 | - $data['registration'] = $userserver[0]; |
|
| 1235 | - $data['latitude'] = $line[4]; |
|
| 1236 | - $data['longitude'] = $line[5]; |
|
| 1237 | - $data['altitude'] = $line[6]; |
|
| 1238 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1239 | - $aircraft_type = $line[10]; |
|
| 1240 | - $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 1241 | - $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 1242 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1243 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1231 | + $userserver = explode('@',$line[0]); |
|
| 1232 | + $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 1233 | + $data['ident'] = $userserver[0]; |
|
| 1234 | + $data['registration'] = $userserver[0]; |
|
| 1235 | + $data['latitude'] = $line[4]; |
|
| 1236 | + $data['longitude'] = $line[5]; |
|
| 1237 | + $data['altitude'] = $line[6]; |
|
| 1238 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1239 | + $aircraft_type = $line[10]; |
|
| 1240 | + $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 1241 | + $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 1242 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1243 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1244 | + } |
|
| 1244 | 1245 | } |
| 1245 | - } |
|
| 1246 | 1246 | } elseif ($format == 'beast') { |
| 1247 | - echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
|
| 1248 | - die; |
|
| 1247 | + echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
|
| 1248 | + die; |
|
| 1249 | 1249 | } elseif ($format == 'vrstcp') { |
| 1250 | - foreach($buffer as $all_data) { |
|
| 1250 | + foreach($buffer as $all_data) { |
|
| 1251 | 1251 | $line = json_decode('{'.$all_data.'}',true); |
| 1252 | 1252 | $data = array(); |
| 1253 | 1253 | if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex |
@@ -1267,125 +1267,125 @@ discard block |
||
| 1267 | 1267 | */ |
| 1268 | 1268 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1269 | 1269 | if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
| 1270 | - $data['format_source'] = 'vrstcp'; |
|
| 1270 | + $data['format_source'] = 'vrstcp'; |
|
| 1271 | 1271 | $data['id_source'] = $id_source; |
| 1272 | 1272 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1273 | 1273 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
| 1274 | 1274 | if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data); |
| 1275 | 1275 | unset($data); |
| 1276 | - } |
|
| 1276 | + } |
|
| 1277 | 1277 | } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
| 1278 | - $line = explode("\t", $buffer); |
|
| 1279 | - for($k = 0; $k < count($line); $k=$k+2) { |
|
| 1278 | + $line = explode("\t", $buffer); |
|
| 1279 | + for($k = 0; $k < count($line); $k=$k+2) { |
|
| 1280 | 1280 | $key = $line[$k]; |
| 1281 | - $lined[$key] = $line[$k+1]; |
|
| 1282 | - } |
|
| 1283 | - if (count($lined) > 3) { |
|
| 1284 | - $data['hex'] = $lined['hexid']; |
|
| 1285 | - //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
|
| 1286 | - $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 1287 | - if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
|
| 1288 | - if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
|
| 1289 | - if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
|
| 1290 | - if (isset($lined['speed'])) $data['speed'] = $lined['speed']; |
|
| 1291 | - if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk']; |
|
| 1292 | - if (isset($lined['alt'])) $data['altitude'] = $lined['alt']; |
|
| 1293 | - if (isset($lined['heading'])) $data['heading'] = $lined['heading']; |
|
| 1294 | - $data['id_source'] = $id_source; |
|
| 1295 | - $data['format_source'] = 'tsv'; |
|
| 1296 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1297 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1281 | + $lined[$key] = $line[$k+1]; |
|
| 1282 | + } |
|
| 1283 | + if (count($lined) > 3) { |
|
| 1284 | + $data['hex'] = $lined['hexid']; |
|
| 1285 | + //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
|
| 1286 | + $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 1287 | + if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
|
| 1288 | + if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
|
| 1289 | + if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
|
| 1290 | + if (isset($lined['speed'])) $data['speed'] = $lined['speed']; |
|
| 1291 | + if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk']; |
|
| 1292 | + if (isset($lined['alt'])) $data['altitude'] = $lined['alt']; |
|
| 1293 | + if (isset($lined['heading'])) $data['heading'] = $lined['heading']; |
|
| 1294 | + $data['id_source'] = $id_source; |
|
| 1295 | + $data['format_source'] = 'tsv'; |
|
| 1296 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1297 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1298 | 1298 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1299 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1300 | - unset($lined); |
|
| 1301 | - unset($data); |
|
| 1302 | - } else $error = true; |
|
| 1299 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1300 | + unset($lined); |
|
| 1301 | + unset($data); |
|
| 1302 | + } else $error = true; |
|
| 1303 | 1303 | } elseif ($format == 'aprs' && $use_aprs) { |
| 1304 | - if ($aprs_connect == 0) { |
|
| 1304 | + if ($aprs_connect == 0) { |
|
| 1305 | 1305 | $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
| 1306 | 1306 | $aprs_connect = 1; |
| 1307 | - } |
|
| 1307 | + } |
|
| 1308 | 1308 | |
| 1309 | - if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 1309 | + if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 1310 | 1310 | $aprs_last_tx = time(); |
| 1311 | 1311 | $data_aprs = "# Keep alive"; |
| 1312 | 1312 | $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
| 1313 | - } |
|
| 1313 | + } |
|
| 1314 | 1314 | |
| 1315 | - //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
|
| 1316 | - //echo 'APRS data : '.$buffer."\n"; |
|
| 1317 | - $buffer = str_replace('APRS <- ','',$buffer); |
|
| 1318 | - $buffer = str_replace('APRS -> ','',$buffer); |
|
| 1319 | - //echo $buffer."\n"; |
|
| 1320 | - if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 1315 | + //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
|
| 1316 | + //echo 'APRS data : '.$buffer."\n"; |
|
| 1317 | + $buffer = str_replace('APRS <- ','',$buffer); |
|
| 1318 | + $buffer = str_replace('APRS -> ','',$buffer); |
|
| 1319 | + //echo $buffer."\n"; |
|
| 1320 | + if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 1321 | 1321 | $line = $APRS->parse($buffer); |
| 1322 | 1322 | //if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) { |
| 1323 | 1323 | if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) { |
| 1324 | - $aprs_last_tx = time(); |
|
| 1325 | - $data = array(); |
|
| 1326 | - //print_r($line); |
|
| 1327 | - if (isset($line['address'])) $data['hex'] = $line['address']; |
|
| 1328 | - if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi']; |
|
| 1329 | - if (isset($line['imo'])) $data['imo'] = $line['imo']; |
|
| 1330 | - if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; |
|
| 1331 | - if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code']; |
|
| 1332 | - if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date']; |
|
| 1333 | - if (isset($line['type_id'])) $data['type_id'] = $line['typeid']; |
|
| 1334 | - if (isset($line['status_id'])) $data['status_id'] = $line['statusid']; |
|
| 1335 | - if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1336 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1337 | - //$data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1338 | - if (isset($line['ident'])) $data['ident'] = $line['ident']; |
|
| 1339 | - $data['latitude'] = $line['latitude']; |
|
| 1340 | - $data['longitude'] = $line['longitude']; |
|
| 1341 | - //$data['verticalrate'] = $line[16]; |
|
| 1342 | - if (isset($line['speed'])) $data['speed'] = $line['speed']; |
|
| 1343 | - else $data['speed'] = 0; |
|
| 1344 | - if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; |
|
| 1345 | - if (isset($line['comment'])) $data['comment'] = $line['comment']; |
|
| 1346 | - if (isset($line['symbol'])) $data['type'] = $line['symbol']; |
|
| 1347 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; |
|
| 1348 | - //else $data['heading'] = 0; |
|
| 1349 | - if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth']; |
|
| 1350 | - //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true; |
|
| 1351 | - if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true; |
|
| 1352 | - elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false; |
|
| 1353 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1354 | - elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false; |
|
| 1355 | - $data['id_source'] = $id_source; |
|
| 1356 | - if (isset($line['format_source'])) $data['format_source'] = $line['format_source']; |
|
| 1357 | - else $data['format_source'] = 'aprs'; |
|
| 1358 | - $data['source_name'] = $line['source']; |
|
| 1359 | - if (isset($line['source_type'])) $data['source_type'] = $line['source_type']; |
|
| 1360 | - else $data['source_type'] = 'flarm'; |
|
| 1361 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1362 | - $currentdate = date('Y-m-d H:i:s'); |
|
| 1363 | - $aprsdate = strtotime($data['datetime']); |
|
| 1364 | - // Accept data if time <= system time + 20s |
|
| 1365 | - //if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { |
|
| 1366 | - if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { |
|
| 1324 | + $aprs_last_tx = time(); |
|
| 1325 | + $data = array(); |
|
| 1326 | + //print_r($line); |
|
| 1327 | + if (isset($line['address'])) $data['hex'] = $line['address']; |
|
| 1328 | + if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi']; |
|
| 1329 | + if (isset($line['imo'])) $data['imo'] = $line['imo']; |
|
| 1330 | + if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; |
|
| 1331 | + if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code']; |
|
| 1332 | + if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date']; |
|
| 1333 | + if (isset($line['type_id'])) $data['type_id'] = $line['typeid']; |
|
| 1334 | + if (isset($line['status_id'])) $data['status_id'] = $line['statusid']; |
|
| 1335 | + if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1336 | + else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1337 | + //$data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1338 | + if (isset($line['ident'])) $data['ident'] = $line['ident']; |
|
| 1339 | + $data['latitude'] = $line['latitude']; |
|
| 1340 | + $data['longitude'] = $line['longitude']; |
|
| 1341 | + //$data['verticalrate'] = $line[16]; |
|
| 1342 | + if (isset($line['speed'])) $data['speed'] = $line['speed']; |
|
| 1343 | + else $data['speed'] = 0; |
|
| 1344 | + if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; |
|
| 1345 | + if (isset($line['comment'])) $data['comment'] = $line['comment']; |
|
| 1346 | + if (isset($line['symbol'])) $data['type'] = $line['symbol']; |
|
| 1347 | + if (isset($line['heading'])) $data['heading'] = $line['heading']; |
|
| 1348 | + //else $data['heading'] = 0; |
|
| 1349 | + if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth']; |
|
| 1350 | + //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true; |
|
| 1351 | + if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true; |
|
| 1352 | + elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false; |
|
| 1353 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1354 | + elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false; |
|
| 1355 | + $data['id_source'] = $id_source; |
|
| 1356 | + if (isset($line['format_source'])) $data['format_source'] = $line['format_source']; |
|
| 1357 | + else $data['format_source'] = 'aprs'; |
|
| 1358 | + $data['source_name'] = $line['source']; |
|
| 1359 | + if (isset($line['source_type'])) $data['source_type'] = $line['source_type']; |
|
| 1360 | + else $data['source_type'] = 'flarm'; |
|
| 1361 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1362 | + $currentdate = date('Y-m-d H:i:s'); |
|
| 1363 | + $aprsdate = strtotime($data['datetime']); |
|
| 1364 | + // Accept data if time <= system time + 20s |
|
| 1365 | + //if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { |
|
| 1366 | + if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { |
|
| 1367 | 1367 | $send = $SI->add($data); |
| 1368 | - } elseif ($data['source_type'] == 'ais') { |
|
| 1368 | + } elseif ($data['source_type'] == 'ais') { |
|
| 1369 | 1369 | if (isset($globalMarine) && $globalMarine) $send = $MI->add($data); |
| 1370 | - } elseif (isset($line['stealth'])) { |
|
| 1370 | + } elseif (isset($line['stealth'])) { |
|
| 1371 | 1371 | if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n"; |
| 1372 | 1372 | else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n"; |
| 1373 | - //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle' || $line['symbol'] == 'Police' || $line['symbol'] == 'Bike' || $line['symbol'] == 'Jogger' || $line['symbol'] == 'Bus' || $line['symbol'] == 'Jeep' || $line['symbol'] == 'Recreational Vehicle' || $line['symbol'] == 'Yacht (Sail)' || $line['symbol'] == 'Ship (Power Boat)' || $line['symbol'] == 'Firetruck' || $line['symbol'] == 'Balloon' || $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) { |
|
| 1374 | - } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { |
|
| 1373 | + //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle' || $line['symbol'] == 'Police' || $line['symbol'] == 'Bike' || $line['symbol'] == 'Jogger' || $line['symbol'] == 'Bus' || $line['symbol'] == 'Jeep' || $line['symbol'] == 'Recreational Vehicle' || $line['symbol'] == 'Yacht (Sail)' || $line['symbol'] == 'Ship (Power Boat)' || $line['symbol'] == 'Firetruck' || $line['symbol'] == 'Balloon' || $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) { |
|
| 1374 | + } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { |
|
| 1375 | 1375 | //echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n"; |
| 1376 | 1376 | if (isset($globalTracker) && $globalTracker) $send = $TI->add($data); |
| 1377 | - } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident'])) { |
|
| 1377 | + } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident'])) { |
|
| 1378 | 1378 | $Source->deleteOldLocationByType('gs'); |
| 1379 | 1379 | if (count($Source->getLocationInfoByName($data['ident'])) > 0) { |
| 1380 | 1380 | $Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']); |
| 1381 | 1381 | } else { |
| 1382 | 1382 | $Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']); |
| 1383 | 1383 | } |
| 1384 | - } else { |
|
| 1385 | - echo '/!\ Not added'."\n"; |
|
| 1386 | - print_r($data); |
|
| 1387 | - } |
|
| 1388 | - unset($data); |
|
| 1384 | + } else { |
|
| 1385 | + echo '/!\ Not added'."\n"; |
|
| 1386 | + print_r($data); |
|
| 1387 | + } |
|
| 1388 | + unset($data); |
|
| 1389 | 1389 | } |
| 1390 | 1390 | elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') { |
| 1391 | 1391 | echo '!! Weather Station not yet supported'."\n"; |
@@ -1401,12 +1401,12 @@ discard block |
||
| 1401 | 1401 | */ |
| 1402 | 1402 | elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n"; |
| 1403 | 1403 | elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n"; |
| 1404 | - } |
|
| 1404 | + } |
|
| 1405 | 1405 | } else { |
| 1406 | - $line = explode(',', $buffer); |
|
| 1407 | - if (count($line) > 20) { |
|
| 1408 | - $data['hex'] = $line[4]; |
|
| 1409 | - /* |
|
| 1406 | + $line = explode(',', $buffer); |
|
| 1407 | + if (count($line) > 20) { |
|
| 1408 | + $data['hex'] = $line[4]; |
|
| 1409 | + /* |
|
| 1410 | 1410 | $data['datetime'] = $line[6].' '.$line[7]; |
| 1411 | 1411 | date_default_timezone_set($globalTimezone); |
| 1412 | 1412 | $datetime = new DateTime($data['datetime']); |
@@ -1414,30 +1414,30 @@ discard block |
||
| 1414 | 1414 | $data['datetime'] = $datetime->format('Y-m-d H:i:s'); |
| 1415 | 1415 | date_default_timezone_set('UTC'); |
| 1416 | 1416 | */ |
| 1417 | - // Force datetime to current UTC datetime |
|
| 1418 | - date_default_timezone_set('UTC'); |
|
| 1419 | - $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1420 | - $data['ident'] = trim($line[10]); |
|
| 1421 | - $data['latitude'] = $line[14]; |
|
| 1422 | - $data['longitude'] = $line[15]; |
|
| 1423 | - $data['verticalrate'] = $line[16]; |
|
| 1424 | - $data['emergency'] = $line[20]; |
|
| 1425 | - $data['speed'] = $line[12]; |
|
| 1426 | - $data['squawk'] = $line[17]; |
|
| 1427 | - $data['altitude'] = $line[11]; |
|
| 1428 | - $data['heading'] = $line[13]; |
|
| 1429 | - $data['ground'] = $line[21]; |
|
| 1430 | - $data['emergency'] = $line[19]; |
|
| 1431 | - $data['format_source'] = 'sbs'; |
|
| 1417 | + // Force datetime to current UTC datetime |
|
| 1418 | + date_default_timezone_set('UTC'); |
|
| 1419 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1420 | + $data['ident'] = trim($line[10]); |
|
| 1421 | + $data['latitude'] = $line[14]; |
|
| 1422 | + $data['longitude'] = $line[15]; |
|
| 1423 | + $data['verticalrate'] = $line[16]; |
|
| 1424 | + $data['emergency'] = $line[20]; |
|
| 1425 | + $data['speed'] = $line[12]; |
|
| 1426 | + $data['squawk'] = $line[17]; |
|
| 1427 | + $data['altitude'] = $line[11]; |
|
| 1428 | + $data['heading'] = $line[13]; |
|
| 1429 | + $data['ground'] = $line[21]; |
|
| 1430 | + $data['emergency'] = $line[19]; |
|
| 1431 | + $data['format_source'] = 'sbs'; |
|
| 1432 | 1432 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
| 1433 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1433 | + if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1434 | 1434 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1435 | - $data['id_source'] = $id_source; |
|
| 1436 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data); |
|
| 1437 | - else $error = true; |
|
| 1438 | - unset($data); |
|
| 1439 | - } else $error = true; |
|
| 1440 | - if ($error) { |
|
| 1435 | + $data['id_source'] = $id_source; |
|
| 1436 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data); |
|
| 1437 | + else $error = true; |
|
| 1438 | + unset($data); |
|
| 1439 | + } else $error = true; |
|
| 1440 | + if ($error) { |
|
| 1441 | 1441 | if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { |
| 1442 | 1442 | if ($globalDebug) echo "Not a message. Ignoring... \n"; |
| 1443 | 1443 | } else { |
@@ -1453,13 +1453,13 @@ discard block |
||
| 1453 | 1453 | connect_all($sourceer); |
| 1454 | 1454 | $sourceer = array(); |
| 1455 | 1455 | } |
| 1456 | - } |
|
| 1456 | + } |
|
| 1457 | 1457 | } |
| 1458 | 1458 | // Sleep for xxx microseconds |
| 1459 | 1459 | if (isset($globalSBSSleep)) usleep($globalSBSSleep); |
| 1460 | - } else { |
|
| 1460 | + } else { |
|
| 1461 | 1461 | if ($format == 'flightgearmp') { |
| 1462 | - if ($globalDebug) echo "Reconnect FlightGear MP..."; |
|
| 1462 | + if ($globalDebug) echo "Reconnect FlightGear MP..."; |
|
| 1463 | 1463 | //@socket_close($r); |
| 1464 | 1464 | sleep($globalMinFetch); |
| 1465 | 1465 | $sourcefg[$nb] = $globalSources[$nb]; |
@@ -1468,9 +1468,9 @@ discard block |
||
| 1468 | 1468 | break; |
| 1469 | 1469 | |
| 1470 | 1470 | } elseif ($format != 'acars' && $format != 'flightgearsp') { |
| 1471 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 1472 | - else $tt[$format] = 0; |
|
| 1473 | - if ($tt[$format] > 30) { |
|
| 1471 | + if (isset($tt[$format])) $tt[$format]++; |
|
| 1472 | + else $tt[$format] = 0; |
|
| 1473 | + if ($tt[$format] > 30) { |
|
| 1474 | 1474 | if ($globalDebug) echo "ERROR : Reconnect ".$format."..."; |
| 1475 | 1475 | //@socket_close($r); |
| 1476 | 1476 | sleep(2); |
@@ -1481,23 +1481,23 @@ discard block |
||
| 1481 | 1481 | //connect_all($globalSources); |
| 1482 | 1482 | $tt[$format]=0; |
| 1483 | 1483 | break; |
| 1484 | - } |
|
| 1484 | + } |
|
| 1485 | + } |
|
| 1485 | 1486 | } |
| 1486 | - } |
|
| 1487 | 1487 | } |
| 1488 | - } else { |
|
| 1488 | + } else { |
|
| 1489 | 1489 | $error = socket_strerror(socket_last_error()); |
| 1490 | 1490 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { |
| 1491 | 1491 | if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
| 1492 | 1492 | if (isset($globalDebug)) echo "Restarting...\n"; |
| 1493 | 1493 | // Restart the script if possible |
| 1494 | 1494 | if (is_array($sockets)) { |
| 1495 | - if ($globalDebug) echo "Shutdown all sockets..."; |
|
| 1495 | + if ($globalDebug) echo "Shutdown all sockets..."; |
|
| 1496 | 1496 | |
| 1497 | - foreach ($sockets as $sock) { |
|
| 1497 | + foreach ($sockets as $sock) { |
|
| 1498 | 1498 | @socket_shutdown($sock,2); |
| 1499 | 1499 | @socket_close($sock); |
| 1500 | - } |
|
| 1500 | + } |
|
| 1501 | 1501 | |
| 1502 | 1502 | } |
| 1503 | 1503 | if ($globalDebug) echo "Waiting..."; |
@@ -1512,13 +1512,13 @@ discard block |
||
| 1512 | 1512 | if ($globalDebug) echo "Restart all connections..."; |
| 1513 | 1513 | connect_all($globalSources); |
| 1514 | 1514 | } |
| 1515 | - } |
|
| 1515 | + } |
|
| 1516 | 1516 | } |
| 1517 | 1517 | if ($globalDaemon === false) { |
| 1518 | - if ($globalDebug) echo 'Check all...'."\n"; |
|
| 1519 | - $SI->checkAll(); |
|
| 1518 | + if ($globalDebug) echo 'Check all...'."\n"; |
|
| 1519 | + $SI->checkAll(); |
|
| 1520 | + } |
|
| 1520 | 1521 | } |
| 1521 | - } |
|
| 1522 | 1522 | } |
| 1523 | 1523 | |
| 1524 | 1524 | ?> |
@@ -14,13 +14,17 @@ discard block |
||
| 14 | 14 | require_once(dirname(__FILE__).'/../require/class.Source.php'); |
| 15 | 15 | require_once(dirname(__FILE__).'/../require/class.Connection.php'); |
| 16 | 16 | require_once(dirname(__FILE__).'/../require/class.Common.php'); |
| 17 | -if (isset($globalTracker) && $globalTracker) require_once(dirname(__FILE__).'/../require/class.TrackerImport.php'); |
|
| 17 | +if (isset($globalTracker) && $globalTracker) { |
|
| 18 | + require_once(dirname(__FILE__).'/../require/class.TrackerImport.php'); |
|
| 19 | +} |
|
| 18 | 20 | if (isset($globalMarine) && $globalMarine) { |
| 19 | 21 | require_once(dirname(__FILE__).'/../require/class.AIS.php'); |
| 20 | 22 | require_once(dirname(__FILE__).'/../require/class.MarineImport.php'); |
| 21 | 23 | } |
| 22 | 24 | |
| 23 | -if (!isset($globalDebug)) $globalDebug = FALSE; |
|
| 25 | +if (!isset($globalDebug)) { |
|
| 26 | + $globalDebug = FALSE; |
|
| 27 | +} |
|
| 24 | 28 | |
| 25 | 29 | // Check if schema is at latest version |
| 26 | 30 | $Connection = new Connection(); |
@@ -55,35 +59,62 @@ discard block |
||
| 55 | 59 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 56 | 60 | if (isset($options['s'])) { |
| 57 | 61 | $globalSources = array(); |
| 58 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 59 | - else $globalSources[] = array('host' => $options['s']); |
|
| 60 | -} elseif (isset($options['source'])) { |
|
| 62 | + if (isset($options['format'])) { |
|
| 63 | + $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 64 | + } else { |
|
| 65 | + $globalSources[] = array('host' => $options['s']); |
|
| 66 | + } |
|
| 67 | + } elseif (isset($options['source'])) { |
|
| 61 | 68 | $globalSources = array(); |
| 62 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 63 | - else $globalSources[] = array('host' => $options['source']); |
|
| 64 | -} |
|
| 69 | + if (isset($options['format'])) { |
|
| 70 | + $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 71 | + } else { |
|
| 72 | + $globalSources[] = array('host' => $options['source']); |
|
| 73 | + } |
|
| 74 | + } |
|
| 65 | 75 | if (isset($options['aprsserverhost'])) { |
| 66 | 76 | $globalServerAPRS = TRUE; |
| 67 | 77 | $globalServerAPRShost = $options['aprsserverhost']; |
| 68 | 78 | } |
| 69 | -if (isset($options['aprsserverport'])) $globalServerAPRSport = $options['aprsserverport']; |
|
| 70 | -if (isset($options['aprsserverssid'])) $globalServerAPRSssid = $options['aprsserverssid']; |
|
| 71 | -if (isset($options['aprsserverpass'])) $globalServerAPRSpass = $options['aprsserverpass']; |
|
| 72 | -if (isset($options['noaprsserver'])) $globalServerAPRS = FALSE; |
|
| 73 | -if (isset($options['nodaemon'])) $globalDaemon = FALSE; |
|
| 74 | -if (isset($options['server'])) $globalServer = TRUE; |
|
| 75 | -if (isset($options['idsource'])) $id_source = $options['idsource']; |
|
| 76 | -else $id_source = 1; |
|
| 79 | +if (isset($options['aprsserverport'])) { |
|
| 80 | + $globalServerAPRSport = $options['aprsserverport']; |
|
| 81 | +} |
|
| 82 | +if (isset($options['aprsserverssid'])) { |
|
| 83 | + $globalServerAPRSssid = $options['aprsserverssid']; |
|
| 84 | +} |
|
| 85 | +if (isset($options['aprsserverpass'])) { |
|
| 86 | + $globalServerAPRSpass = $options['aprsserverpass']; |
|
| 87 | +} |
|
| 88 | +if (isset($options['noaprsserver'])) { |
|
| 89 | + $globalServerAPRS = FALSE; |
|
| 90 | +} |
|
| 91 | +if (isset($options['nodaemon'])) { |
|
| 92 | + $globalDaemon = FALSE; |
|
| 93 | +} |
|
| 94 | +if (isset($options['server'])) { |
|
| 95 | + $globalServer = TRUE; |
|
| 96 | +} |
|
| 97 | +if (isset($options['idsource'])) { |
|
| 98 | + $id_source = $options['idsource']; |
|
| 99 | +} else { |
|
| 100 | + $id_source = 1; |
|
| 101 | +} |
|
| 77 | 102 | if (isset($globalServer) && $globalServer) { |
| 78 | - if ($globalDebug) echo "Using Server Mode\n"; |
|
| 103 | + if ($globalDebug) { |
|
| 104 | + echo "Using Server Mode\n"; |
|
| 105 | + } |
|
| 79 | 106 | $SI=new SpotterServer(); |
| 80 | 107 | /* |
| 81 | 108 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 82 | 109 | $SI = new adsb2aprs(); |
| 83 | 110 | $SI->connect(); |
| 84 | 111 | */ |
| 85 | -} else $SI=new SpotterImport($Connection->db); |
|
| 86 | -if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db); |
|
| 112 | +} else { |
|
| 113 | + $SI=new SpotterImport($Connection->db); |
|
| 114 | +} |
|
| 115 | +if (isset($globalTracker) && $globalTracker) { |
|
| 116 | + $TI = new TrackerImport($Connection->db); |
|
| 117 | +} |
|
| 87 | 118 | if (isset($globalMarine) && $globalMarine) { |
| 88 | 119 | $AIS = new AIS(); |
| 89 | 120 | $MI = new MarineImport($Connection->db); |
@@ -106,7 +137,9 @@ discard block |
||
| 106 | 137 | } |
| 107 | 138 | |
| 108 | 139 | // let's try and connect |
| 109 | -if ($globalDebug) echo "Connecting...\n"; |
|
| 140 | +if ($globalDebug) { |
|
| 141 | + echo "Connecting...\n"; |
|
| 142 | +} |
|
| 110 | 143 | $use_aprs = false; |
| 111 | 144 | $aprs_full = false; |
| 112 | 145 | $reset = 0; |
@@ -115,7 +148,9 @@ discard block |
||
| 115 | 148 | //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
| 116 | 149 | global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
| 117 | 150 | $reset++; |
| 118 | - if ($globalDebug) echo 'Connect to all...'."\n"; |
|
| 151 | + if ($globalDebug) { |
|
| 152 | + echo 'Connect to all...'."\n"; |
|
| 153 | + } |
|
| 119 | 154 | foreach ($hosts as $id => $value) { |
| 120 | 155 | $host = $value['host']; |
| 121 | 156 | $globalSources[$id]['last_exec'] = 0; |
@@ -125,22 +160,30 @@ discard block |
||
| 125 | 160 | //$formats[$id] = 'deltadbtxt'; |
| 126 | 161 | $globalSources[$id]['format'] = 'deltadbtxt'; |
| 127 | 162 | //$last_exec['deltadbtxt'] = 0; |
| 128 | - if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
|
| 163 | + if ($globalDebug) { |
|
| 164 | + echo "Connect to deltadb source (".$host.")...\n"; |
|
| 165 | + } |
|
| 129 | 166 | } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
| 130 | 167 | //$formats[$id] = 'vatsimtxt'; |
| 131 | 168 | $globalSources[$id]['format'] = 'vatsimtxt'; |
| 132 | 169 | //$last_exec['vatsimtxt'] = 0; |
| 133 | - if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
|
| 170 | + if ($globalDebug) { |
|
| 171 | + echo "Connect to vatsim source (".$host.")...\n"; |
|
| 172 | + } |
|
| 134 | 173 | } else if (preg_match('/aircraftlist.json$/i',$host)) { |
| 135 | 174 | //$formats[$id] = 'aircraftlistjson'; |
| 136 | 175 | $globalSources[$id]['format'] = 'aircraftlistjson'; |
| 137 | 176 | //$last_exec['aircraftlistjson'] = 0; |
| 138 | - if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
|
| 177 | + if ($globalDebug) { |
|
| 178 | + echo "Connect to aircraftlist.json source (".$host.")...\n"; |
|
| 179 | + } |
|
| 139 | 180 | } else if (preg_match('/opensky/i',$host)) { |
| 140 | 181 | //$formats[$id] = 'aircraftlistjson'; |
| 141 | 182 | $globalSources[$id]['format'] = 'opensky'; |
| 142 | 183 | //$last_exec['aircraftlistjson'] = 0; |
| 143 | - if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; |
|
| 184 | + if ($globalDebug) { |
|
| 185 | + echo "Connect to opensky source (".$host.")...\n"; |
|
| 186 | + } |
|
| 144 | 187 | /* |
| 145 | 188 | // Disabled for now, site change source format |
| 146 | 189 | } else if (preg_match('/radarvirtuel.com\/list_aircrafts$/i',$host)) { |
@@ -157,7 +200,9 @@ discard block |
||
| 157 | 200 | //$formats[$id] = 'planeupdatefaa'; |
| 158 | 201 | $globalSources[$id]['format'] = 'planeupdatefaa'; |
| 159 | 202 | //$last_exec['planeupdatefaa'] = 0; |
| 160 | - if ($globalDebug) echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; |
|
| 203 | + if ($globalDebug) { |
|
| 204 | + echo "Connect to planeUpdateFAA.php source (".$host.")...\n"; |
|
| 205 | + } |
|
| 161 | 206 | if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
| 162 | 207 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 163 | 208 | exit(0); |
@@ -166,29 +211,41 @@ discard block |
||
| 166 | 211 | //$formats[$id] = 'phpvmacars'; |
| 167 | 212 | $globalSources[$id]['format'] = 'phpvmacars'; |
| 168 | 213 | //$last_exec['phpvmacars'] = 0; |
| 169 | - if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
|
| 214 | + if ($globalDebug) { |
|
| 215 | + echo "Connect to phpvmacars source (".$host.")...\n"; |
|
| 216 | + } |
|
| 170 | 217 | } else if (preg_match('/VAM-json.php$/i',$host)) { |
| 171 | 218 | //$formats[$id] = 'phpvmacars'; |
| 172 | 219 | $globalSources[$id]['format'] = 'vam'; |
| 173 | - if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
|
| 220 | + if ($globalDebug) { |
|
| 221 | + echo "Connect to Vam source (".$host.")...\n"; |
|
| 222 | + } |
|
| 174 | 223 | } else if (preg_match('/whazzup/i',$host)) { |
| 175 | 224 | //$formats[$id] = 'whazzup'; |
| 176 | 225 | $globalSources[$id]['format'] = 'whazzup'; |
| 177 | 226 | //$last_exec['whazzup'] = 0; |
| 178 | - if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
|
| 227 | + if ($globalDebug) { |
|
| 228 | + echo "Connect to whazzup source (".$host.")...\n"; |
|
| 229 | + } |
|
| 179 | 230 | } else if (preg_match('/airwhere/i',$host)) { |
| 180 | 231 | $globalSources[$id]['format'] = 'airwhere'; |
| 181 | - if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n"; |
|
| 232 | + if ($globalDebug) { |
|
| 233 | + echo "Connect to airwhere source (".$host.")...\n"; |
|
| 234 | + } |
|
| 182 | 235 | } else if (preg_match('/recentpireps/i',$host)) { |
| 183 | 236 | //$formats[$id] = 'pirepsjson'; |
| 184 | 237 | $globalSources[$id]['format'] = 'pirepsjson'; |
| 185 | 238 | //$last_exec['pirepsjson'] = 0; |
| 186 | - if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
|
| 239 | + if ($globalDebug) { |
|
| 240 | + echo "Connect to pirepsjson source (".$host.")...\n"; |
|
| 241 | + } |
|
| 187 | 242 | } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
| 188 | 243 | //$formats[$id] = 'fr24json'; |
| 189 | 244 | $globalSources[$id]['format'] = 'fr24json'; |
| 190 | 245 | //$last_exec['fr24json'] = 0; |
| 191 | - if ($globalDebug) echo "Connect to fr24 source (".$host.")...\n"; |
|
| 246 | + if ($globalDebug) { |
|
| 247 | + echo "Connect to fr24 source (".$host.")...\n"; |
|
| 248 | + } |
|
| 192 | 249 | if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
| 193 | 250 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 194 | 251 | exit(0); |
@@ -197,7 +254,9 @@ discard block |
||
| 197 | 254 | //$formats[$id] = 'fr24json'; |
| 198 | 255 | $globalSources[$id]['format'] = 'myshiptracking'; |
| 199 | 256 | //$last_exec['fr24json'] = 0; |
| 200 | - if ($globalDebug) echo "Connect to myshiptracking source (".$host.")...\n"; |
|
| 257 | + if ($globalDebug) { |
|
| 258 | + echo "Connect to myshiptracking source (".$host.")...\n"; |
|
| 259 | + } |
|
| 201 | 260 | if (!isset($globalSourcesRights) || (isset($globalSourcesRights) && !$globalSourcesRights)) { |
| 202 | 261 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 203 | 262 | exit(0); |
@@ -206,17 +265,24 @@ discard block |
||
| 206 | 265 | } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
| 207 | 266 | //$formats[$id] = 'tsv'; |
| 208 | 267 | $globalSources[$id]['format'] = 'tsv'; |
| 209 | - if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
|
| 268 | + if ($globalDebug) { |
|
| 269 | + echo "Connect to tsv source (".$host.")...\n"; |
|
| 270 | + } |
|
| 210 | 271 | } |
| 211 | 272 | } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
| 212 | 273 | if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
| 213 | 274 | $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
| 214 | 275 | if ($idf !== false) { |
| 215 | 276 | $httpfeeds[$id] = $idf; |
| 216 | - if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 277 | + if ($globalDebug) { |
|
| 278 | + echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 279 | + } |
|
| 280 | + } elseif ($globalDebug) { |
|
| 281 | + echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
|
| 217 | 282 | } |
| 218 | - elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
|
| 219 | - } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 283 | + } elseif ($globalDebug) { |
|
| 284 | + echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
|
| 285 | + } |
|
| 220 | 286 | } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
| 221 | 287 | $hostport = explode(':',$host); |
| 222 | 288 | if (isset($hostport[1])) { |
@@ -256,17 +322,25 @@ discard block |
||
| 256 | 322 | //$formats[$id] = 'beast'; |
| 257 | 323 | $globalSources[$id]['format'] = 'beast'; |
| 258 | 324 | //} else $formats[$id] = 'sbs'; |
| 259 | - } else $globalSources[$id]['format'] = 'sbs'; |
|
| 325 | + } else { |
|
| 326 | + $globalSources[$id]['format'] = 'sbs'; |
|
| 327 | + } |
|
| 260 | 328 | //if ($globalDebug) echo 'Connection in progress to '.$host.'('.$formats[$id].')....'."\n"; |
| 261 | 329 | } |
| 262 | - if ($globalDebug) echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; |
|
| 330 | + if ($globalDebug) { |
|
| 331 | + echo 'Connection in progress to '.$hostn.':'.$port.' ('.$globalSources[$id]['format'].')....'."\n"; |
|
| 332 | + } |
|
| 263 | 333 | } else { |
| 264 | - if ($globalDebug) echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n"; |
|
| 334 | + if ($globalDebug) { |
|
| 335 | + echo 'Connection failed to '.$hostn.':'.$port.' : '.$errno.' '.$errstr."\n"; |
|
| 336 | + } |
|
| 265 | 337 | } |
| 266 | 338 | } |
| 267 | 339 | } |
| 268 | 340 | } |
| 269 | -if (!isset($globalMinFetch)) $globalMinFetch = 15; |
|
| 341 | +if (!isset($globalMinFetch)) { |
|
| 342 | + $globalMinFetch = 15; |
|
| 343 | +} |
|
| 270 | 344 | |
| 271 | 345 | // Initialize all |
| 272 | 346 | $status = array(); |
@@ -275,13 +349,19 @@ discard block |
||
| 275 | 349 | $formats = array(); |
| 276 | 350 | $last_exec = array(); |
| 277 | 351 | $time = time(); |
| 278 | -if (isset($globalSourcesTimeout)) $timeout = $globalSourcesTimeOut; |
|
| 279 | -else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut; |
|
| 280 | -else $timeout = 20; |
|
| 352 | +if (isset($globalSourcesTimeout)) { |
|
| 353 | + $timeout = $globalSourcesTimeOut; |
|
| 354 | +} else if (isset($globalSBS1TimeOut)) { |
|
| 355 | + $timeout = $globalSBS1TimeOut; |
|
| 356 | +} else { |
|
| 357 | + $timeout = 20; |
|
| 358 | +} |
|
| 281 | 359 | $errno = ''; |
| 282 | 360 | $errstr=''; |
| 283 | 361 | |
| 284 | -if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 362 | +if (!isset($globalDaemon)) { |
|
| 363 | + $globalDaemon = TRUE; |
|
| 364 | +} |
|
| 285 | 365 | /* Initiate connections to all the hosts simultaneously */ |
| 286 | 366 | //connect_all($hosts); |
| 287 | 367 | //connect_all($globalSources); |
@@ -307,7 +387,9 @@ discard block |
||
| 307 | 387 | if (isset($source['format']) && $source['format'] == 'aprs') { |
| 308 | 388 | $aprs_connect = 0; |
| 309 | 389 | $use_aprs = true; |
| 310 | - if (isset($source['port']) && $source['port'] == '10152') $aprs_full = true; |
|
| 390 | + if (isset($source['port']) && $source['port'] == '10152') { |
|
| 391 | + $aprs_full = true; |
|
| 392 | + } |
|
| 311 | 393 | break; |
| 312 | 394 | } |
| 313 | 395 | } |
@@ -318,25 +400,48 @@ discard block |
||
| 318 | 400 | $aprs_connect = 0; |
| 319 | 401 | $aprs_keep = 120; |
| 320 | 402 | $aprs_last_tx = time(); |
| 321 | - if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
|
| 322 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 323 | - if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid; |
|
| 324 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 325 | - if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter; |
|
| 326 | - else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 327 | - if ($aprs_full) $aprs_filter = ''; |
|
| 328 | - if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass; |
|
| 329 | - else $aprs_pass = '-1'; |
|
| 403 | + if (isset($globalAPRSversion)) { |
|
| 404 | + $aprs_version = $globalAPRSversion; |
|
| 405 | + } else { |
|
| 406 | + $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 407 | + } |
|
| 408 | + if (isset($globalAPRSssid)) { |
|
| 409 | + $aprs_ssid = $globalAPRSssid; |
|
| 410 | + } else { |
|
| 411 | + $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 412 | + } |
|
| 413 | + if (isset($globalAPRSfilter)) { |
|
| 414 | + $aprs_filter = $globalAPRSfilter; |
|
| 415 | + } else { |
|
| 416 | + $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 417 | + } |
|
| 418 | + if ($aprs_full) { |
|
| 419 | + $aprs_filter = ''; |
|
| 420 | + } |
|
| 421 | + if (isset($globalAPRSpass)) { |
|
| 422 | + $aprs_pass = $globalAPRSpass; |
|
| 423 | + } else { |
|
| 424 | + $aprs_pass = '-1'; |
|
| 425 | + } |
|
| 330 | 426 | |
| 331 | - if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n"; |
|
| 332 | - else $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
|
| 333 | -} |
|
| 427 | + if ($aprs_filter != '') { |
|
| 428 | + $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version} filter {$aprs_filter}\n"; |
|
| 429 | + } else { |
|
| 430 | + $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
|
| 431 | + } |
|
| 432 | + } |
|
| 334 | 433 | |
| 335 | 434 | // connected - lets do some work |
| 336 | -if ($globalDebug) echo "Connected!\n"; |
|
| 435 | +if ($globalDebug) { |
|
| 436 | + echo "Connected!\n"; |
|
| 437 | +} |
|
| 337 | 438 | sleep(1); |
| 338 | -if ($globalDebug) echo "SCAN MODE \n\n"; |
|
| 339 | -if (!isset($globalCronEnd)) $globalCronEnd = 60; |
|
| 439 | +if ($globalDebug) { |
|
| 440 | + echo "SCAN MODE \n\n"; |
|
| 441 | +} |
|
| 442 | +if (!isset($globalCronEnd)) { |
|
| 443 | + $globalCronEnd = 60; |
|
| 444 | +} |
|
| 340 | 445 | $endtime = time()+$globalCronEnd; |
| 341 | 446 | $i = 1; |
| 342 | 447 | $tt = array(); |
@@ -350,20 +455,28 @@ discard block |
||
| 350 | 455 | |
| 351 | 456 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 352 | 457 | while ($i > 0) { |
| 353 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 458 | + if (!$globalDaemon) { |
|
| 459 | + $i = $endtime-time(); |
|
| 460 | + } |
|
| 354 | 461 | // Delete old ATC |
| 355 | 462 | if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 356 | - if ($globalDebug) echo 'Delete old ATC...'."\n"; |
|
| 463 | + if ($globalDebug) { |
|
| 464 | + echo 'Delete old ATC...'."\n"; |
|
| 465 | + } |
|
| 357 | 466 | $ATC->deleteOldATC(); |
| 358 | 467 | } |
| 359 | 468 | |
| 360 | 469 | if (count($last_exec) == count($globalSources)) { |
| 361 | 470 | $max = $globalMinFetch; |
| 362 | 471 | foreach ($last_exec as $last) { |
| 363 | - if ((time() - $last['last']) < $max) $max = time() - $last['last']; |
|
| 472 | + if ((time() - $last['last']) < $max) { |
|
| 473 | + $max = time() - $last['last']; |
|
| 474 | + } |
|
| 364 | 475 | } |
| 365 | 476 | if ($max != $globalMinFetch) { |
| 366 | - if ($globalDebug) echo 'Sleeping...'."\n"; |
|
| 477 | + if ($globalDebug) { |
|
| 478 | + echo 'Sleeping...'."\n"; |
|
| 479 | + } |
|
| 367 | 480 | sleep($globalMinFetch-$max+2); |
| 368 | 481 | } |
| 369 | 482 | } |
@@ -372,11 +485,15 @@ discard block |
||
| 372 | 485 | //foreach ($formats as $id => $value) { |
| 373 | 486 | foreach ($globalSources as $id => $value) { |
| 374 | 487 | date_default_timezone_set('UTC'); |
| 375 | - if (!isset($last_exec[$id]['last'])) $last_exec[$id]['last'] = 0; |
|
| 488 | + if (!isset($last_exec[$id]['last'])) { |
|
| 489 | + $last_exec[$id]['last'] = 0; |
|
| 490 | + } |
|
| 376 | 491 | if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 377 | 492 | //$buffer = $Common->getData($hosts[$id]); |
| 378 | 493 | $buffer = $Common->getData($value['host']); |
| 379 | - if ($buffer != '') $reset = 0; |
|
| 494 | + if ($buffer != '') { |
|
| 495 | + $reset = 0; |
|
| 496 | + } |
|
| 380 | 497 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 381 | 498 | $buffer = explode('\n',$buffer); |
| 382 | 499 | foreach ($buffer as $line) { |
@@ -385,20 +502,41 @@ discard block |
||
| 385 | 502 | $data = array(); |
| 386 | 503 | $data['hex'] = $line[1]; // hex |
| 387 | 504 | $data['ident'] = $line[2]; // ident |
| 388 | - if (isset($line[3])) $data['altitude'] = $line[3]; // altitude |
|
| 389 | - if (isset($line[4])) $data['speed'] = $line[4]; // speed |
|
| 390 | - if (isset($line[5])) $data['heading'] = $line[5]; // heading |
|
| 391 | - if (isset($line[6])) $data['latitude'] = $line[6]; // lat |
|
| 392 | - if (isset($line[7])) $data['longitude'] = $line[7]; // long |
|
| 505 | + if (isset($line[3])) { |
|
| 506 | + $data['altitude'] = $line[3]; |
|
| 507 | + } |
|
| 508 | + // altitude |
|
| 509 | + if (isset($line[4])) { |
|
| 510 | + $data['speed'] = $line[4]; |
|
| 511 | + } |
|
| 512 | + // speed |
|
| 513 | + if (isset($line[5])) { |
|
| 514 | + $data['heading'] = $line[5]; |
|
| 515 | + } |
|
| 516 | + // heading |
|
| 517 | + if (isset($line[6])) { |
|
| 518 | + $data['latitude'] = $line[6]; |
|
| 519 | + } |
|
| 520 | + // lat |
|
| 521 | + if (isset($line[7])) { |
|
| 522 | + $data['longitude'] = $line[7]; |
|
| 523 | + } |
|
| 524 | + // long |
|
| 393 | 525 | $data['verticalrate'] = ''; // vertical rate |
| 394 | 526 | //if (isset($line[9])) $data['squawk'] = $line[9]; // squawk |
| 395 | 527 | $data['emergency'] = ''; // emergency |
| 396 | 528 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 397 | 529 | $data['format_source'] = 'deltadbtxt'; |
| 398 | 530 | $data['id_source'] = $id_source; |
| 399 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 400 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 401 | - if (isset($value['sourcestats'])) $data['sourcestats'] = $value['sourcestats']; |
|
| 531 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 532 | + $data['source_name'] = $value['name']; |
|
| 533 | + } |
|
| 534 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 535 | + $data['noarchive'] = true; |
|
| 536 | + } |
|
| 537 | + if (isset($value['sourcestats'])) { |
|
| 538 | + $data['sourcestats'] = $value['sourcestats']; |
|
| 539 | + } |
|
| 402 | 540 | $SI->add($data); |
| 403 | 541 | unset($data); |
| 404 | 542 | } |
@@ -408,7 +546,9 @@ discard block |
||
| 408 | 546 | date_default_timezone_set('CET'); |
| 409 | 547 | $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
| 410 | 548 | date_default_timezone_set('UTC'); |
| 411 | - if ($buffer != '') $reset = 0; |
|
| 549 | + if ($buffer != '') { |
|
| 550 | + $reset = 0; |
|
| 551 | + } |
|
| 412 | 552 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 413 | 553 | $buffer = explode('\n',$buffer); |
| 414 | 554 | foreach ($buffer as $line) { |
@@ -417,16 +557,36 @@ discard block |
||
| 417 | 557 | $add = false; |
| 418 | 558 | $ais_data = $AIS->parse_line(trim($line)); |
| 419 | 559 | $data = array(); |
| 420 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 421 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 422 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 423 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 424 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 425 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 426 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 427 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 428 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 429 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 560 | + if (isset($ais_data['ident'])) { |
|
| 561 | + $data['ident'] = $ais_data['ident']; |
|
| 562 | + } |
|
| 563 | + if (isset($ais_data['mmsi'])) { |
|
| 564 | + $data['mmsi'] = $ais_data['mmsi']; |
|
| 565 | + } |
|
| 566 | + if (isset($ais_data['speed'])) { |
|
| 567 | + $data['speed'] = $ais_data['speed']; |
|
| 568 | + } |
|
| 569 | + if (isset($ais_data['heading'])) { |
|
| 570 | + $data['heading'] = $ais_data['heading']; |
|
| 571 | + } |
|
| 572 | + if (isset($ais_data['latitude'])) { |
|
| 573 | + $data['latitude'] = $ais_data['latitude']; |
|
| 574 | + } |
|
| 575 | + if (isset($ais_data['longitude'])) { |
|
| 576 | + $data['longitude'] = $ais_data['longitude']; |
|
| 577 | + } |
|
| 578 | + if (isset($ais_data['status'])) { |
|
| 579 | + $data['status'] = $ais_data['status']; |
|
| 580 | + } |
|
| 581 | + if (isset($ais_data['type'])) { |
|
| 582 | + $data['type'] = $ais_data['type']; |
|
| 583 | + } |
|
| 584 | + if (isset($ais_data['imo'])) { |
|
| 585 | + $data['imo'] = $ais_data['imo']; |
|
| 586 | + } |
|
| 587 | + if (isset($ais_data['callsign'])) { |
|
| 588 | + $data['callsign'] = $ais_data['callsign']; |
|
| 589 | + } |
|
| 430 | 590 | if (isset($ais_data['timestamp'])) { |
| 431 | 591 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
| 432 | 592 | if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { |
@@ -440,8 +600,12 @@ discard block |
||
| 440 | 600 | $data['format_source'] = 'aisnmeatxt'; |
| 441 | 601 | $data['id_source'] = $id_source; |
| 442 | 602 | //print_r($data); |
| 443 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 444 | - if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 603 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 604 | + $data['noarchive'] = true; |
|
| 605 | + } |
|
| 606 | + if ($add && isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') { |
|
| 607 | + $MI->add($data); |
|
| 608 | + } |
|
| 445 | 609 | unset($data); |
| 446 | 610 | } |
| 447 | 611 | } |
@@ -461,20 +625,48 @@ discard block |
||
| 461 | 625 | if ($line != '') { |
| 462 | 626 | $ais_data = $AIS->parse_line(trim($line)); |
| 463 | 627 | $data = array(); |
| 464 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 465 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 466 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 467 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 468 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 469 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 470 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 471 | - if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid']; |
|
| 472 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 473 | - if (isset($ais_data['typeid'])) $data['type_id'] = $ais_data['typeid']; |
|
| 474 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 475 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 476 | - if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
|
| 477 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 628 | + if (isset($ais_data['ident'])) { |
|
| 629 | + $data['ident'] = $ais_data['ident']; |
|
| 630 | + } |
|
| 631 | + if (isset($ais_data['mmsi'])) { |
|
| 632 | + $data['mmsi'] = $ais_data['mmsi']; |
|
| 633 | + } |
|
| 634 | + if (isset($ais_data['speed'])) { |
|
| 635 | + $data['speed'] = $ais_data['speed']; |
|
| 636 | + } |
|
| 637 | + if (isset($ais_data['heading'])) { |
|
| 638 | + $data['heading'] = $ais_data['heading']; |
|
| 639 | + } |
|
| 640 | + if (isset($ais_data['latitude'])) { |
|
| 641 | + $data['latitude'] = $ais_data['latitude']; |
|
| 642 | + } |
|
| 643 | + if (isset($ais_data['longitude'])) { |
|
| 644 | + $data['longitude'] = $ais_data['longitude']; |
|
| 645 | + } |
|
| 646 | + if (isset($ais_data['status'])) { |
|
| 647 | + $data['status'] = $ais_data['status']; |
|
| 648 | + } |
|
| 649 | + if (isset($ais_data['statusid'])) { |
|
| 650 | + $data['status_id'] = $ais_data['statusid']; |
|
| 651 | + } |
|
| 652 | + if (isset($ais_data['type'])) { |
|
| 653 | + $data['type'] = $ais_data['type']; |
|
| 654 | + } |
|
| 655 | + if (isset($ais_data['typeid'])) { |
|
| 656 | + $data['type_id'] = $ais_data['typeid']; |
|
| 657 | + } |
|
| 658 | + if (isset($ais_data['imo'])) { |
|
| 659 | + $data['imo'] = $ais_data['imo']; |
|
| 660 | + } |
|
| 661 | + if (isset($ais_data['callsign'])) { |
|
| 662 | + $data['callsign'] = $ais_data['callsign']; |
|
| 663 | + } |
|
| 664 | + if (isset($ais_data['destination'])) { |
|
| 665 | + $data['arrival_code'] = $ais_data['destination']; |
|
| 666 | + } |
|
| 667 | + if (isset($ais_data['eta_ts'])) { |
|
| 668 | + $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 669 | + } |
|
| 478 | 670 | if (isset($ais_data['timestamp'])) { |
| 479 | 671 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
| 480 | 672 | } else { |
@@ -482,18 +674,27 @@ discard block |
||
| 482 | 674 | } |
| 483 | 675 | $data['format_source'] = 'aisnmeahttp'; |
| 484 | 676 | $data['id_source'] = $id_source; |
| 485 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 486 | - if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 677 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 678 | + $data['noarchive'] = true; |
|
| 679 | + } |
|
| 680 | + if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') { |
|
| 681 | + $MI->add($data); |
|
| 682 | + } |
|
| 487 | 683 | unset($data); |
| 488 | 684 | } |
| 489 | 685 | } |
| 490 | 686 | } |
| 491 | 687 | } else { |
| 492 | 688 | $format = $value['format']; |
| 493 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 494 | - else $tt[$format] = 0; |
|
| 689 | + if (isset($tt[$format])) { |
|
| 690 | + $tt[$format]++; |
|
| 691 | + } else { |
|
| 692 | + $tt[$format] = 0; |
|
| 693 | + } |
|
| 495 | 694 | if ($tt[$format] > 30) { |
| 496 | - if ($globalDebug) echo 'Reconnect...'."\n"; |
|
| 695 | + if ($globalDebug) { |
|
| 696 | + echo 'Reconnect...'."\n"; |
|
| 697 | + } |
|
| 497 | 698 | sleep(2); |
| 498 | 699 | $sourceeen[] = $value; |
| 499 | 700 | connect_all($sourceeen); |
@@ -523,7 +724,9 @@ discard block |
||
| 523 | 724 | $data['datetime'] = date('Y-m-d H:i:s',$line['T']); |
| 524 | 725 | $data['format_source'] = 'myshiptracking'; |
| 525 | 726 | $data['id_source'] = $id_source; |
| 526 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 727 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 728 | + $data['noarchive'] = true; |
|
| 729 | + } |
|
| 527 | 730 | $MI->add($data); |
| 528 | 731 | unset($data); |
| 529 | 732 | } |
@@ -543,7 +746,9 @@ discard block |
||
| 543 | 746 | $data['callsign'] = $line['callsign']; |
| 544 | 747 | $data['mmsi'] = $line['mmsi']; |
| 545 | 748 | $data['speed'] = $line['sog']; |
| 546 | - if ($line['heading'] != '511') $data['heading'] = $line['heading']; |
|
| 749 | + if ($line['heading'] != '511') { |
|
| 750 | + $data['heading'] = $line['heading']; |
|
| 751 | + } |
|
| 547 | 752 | $data['latitude'] = $line['latitude']; |
| 548 | 753 | $data['longitude'] = $line['longitude']; |
| 549 | 754 | $data['type_id'] = $line['shiptype']; |
@@ -551,7 +756,9 @@ discard block |
||
| 551 | 756 | $data['datetime'] = $line['time']; |
| 552 | 757 | $data['format_source'] = 'boatbeaconapp'; |
| 553 | 758 | $data['id_source'] = $id_source; |
| 554 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 759 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 760 | + $data['noarchive'] = true; |
|
| 761 | + } |
|
| 555 | 762 | $MI->add($data); |
| 556 | 763 | unset($data); |
| 557 | 764 | } |
@@ -567,22 +774,44 @@ discard block |
||
| 567 | 774 | if (isset($all_data['features'][0]['id'])) { |
| 568 | 775 | foreach ($all_data['features'] as $line) { |
| 569 | 776 | $data = array(); |
| 570 | - if (isset($line['properties']['name'])) $data['ident'] = $line['properties']['name']; |
|
| 571 | - if (isset($line['properties']['callsign'])) $data['callsign'] = $line['properties']['callsign']; |
|
| 572 | - if (isset($line['properties']['mmsi'])) $data['mmsi'] = $line['properties']['mmsi']; |
|
| 573 | - if (isset($line['properties']['imo'])) $data['mmsi'] = $line['properties']['imo']; |
|
| 574 | - if (isset($line['properties']['speed'])) $data['speed'] = $line['properties']['speed']; |
|
| 575 | - if (isset($line['properties']['heading'])) $data['heading'] = $line['properties']['heading']; |
|
| 777 | + if (isset($line['properties']['name'])) { |
|
| 778 | + $data['ident'] = $line['properties']['name']; |
|
| 779 | + } |
|
| 780 | + if (isset($line['properties']['callsign'])) { |
|
| 781 | + $data['callsign'] = $line['properties']['callsign']; |
|
| 782 | + } |
|
| 783 | + if (isset($line['properties']['mmsi'])) { |
|
| 784 | + $data['mmsi'] = $line['properties']['mmsi']; |
|
| 785 | + } |
|
| 786 | + if (isset($line['properties']['imo'])) { |
|
| 787 | + $data['mmsi'] = $line['properties']['imo']; |
|
| 788 | + } |
|
| 789 | + if (isset($line['properties']['speed'])) { |
|
| 790 | + $data['speed'] = $line['properties']['speed']; |
|
| 791 | + } |
|
| 792 | + if (isset($line['properties']['heading'])) { |
|
| 793 | + $data['heading'] = $line['properties']['heading']; |
|
| 794 | + } |
|
| 576 | 795 | $data['latitude'] = $line['geometry']['coordinates'][1]; |
| 577 | 796 | $data['longitude'] = $line['geometry']['coordinates'][0]; |
| 578 | - if (isset($line['properties']['vesselType'])) $data['type'] = $line['properties']['vesselType']; |
|
| 579 | - if (isset($line['properties']['destination'])) $data['arrival_code'] = $line['properties']['destination']; |
|
| 580 | - if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') $data['arrival_date'] = $line['properties']['eta']; |
|
| 797 | + if (isset($line['properties']['vesselType'])) { |
|
| 798 | + $data['type'] = $line['properties']['vesselType']; |
|
| 799 | + } |
|
| 800 | + if (isset($line['properties']['destination'])) { |
|
| 801 | + $data['arrival_code'] = $line['properties']['destination']; |
|
| 802 | + } |
|
| 803 | + if (isset($line['properties']['eta']) && $line['properties']['eta'] != '') { |
|
| 804 | + $data['arrival_date'] = $line['properties']['eta']; |
|
| 805 | + } |
|
| 581 | 806 | $data['format_source'] = 'boatnerd'; |
| 582 | 807 | $data['id_source'] = $id_source; |
| 583 | 808 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 584 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 585 | - if ($line['properties']['vesselType'] != 'Navigation Aid') $MI->add($data); |
|
| 809 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 810 | + $data['noarchive'] = true; |
|
| 811 | + } |
|
| 812 | + if ($line['properties']['vesselType'] != 'Navigation Aid') { |
|
| 813 | + $MI->add($data); |
|
| 814 | + } |
|
| 586 | 815 | unset($data); |
| 587 | 816 | } |
| 588 | 817 | } |
@@ -593,7 +822,9 @@ discard block |
||
| 593 | 822 | echo 'download...'; |
| 594 | 823 | $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
| 595 | 824 | echo 'done !'."\n"; |
| 596 | - if ($buffer != '') $reset = 0; |
|
| 825 | + if ($buffer != '') { |
|
| 826 | + $reset = 0; |
|
| 827 | + } |
|
| 597 | 828 | $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
| 598 | 829 | $buffer = explode('\n',$buffer); |
| 599 | 830 | foreach ($buffer as $line) { |
@@ -618,7 +849,9 @@ discard block |
||
| 618 | 849 | //$data['etaTime'] = substr($line,135,5); |
| 619 | 850 | $data['format_source'] = 'shipplotter'; |
| 620 | 851 | $data['id_source'] = $id_source; |
| 621 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 852 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 853 | + $data['noarchive'] = true; |
|
| 854 | + } |
|
| 622 | 855 | //print_r($data); |
| 623 | 856 | echo 'Add...'."\n"; |
| 624 | 857 | $MI->add($data); |
@@ -638,16 +871,28 @@ discard block |
||
| 638 | 871 | $line = explode(':', $line); |
| 639 | 872 | if (count($line) > 30 && $line[0] != 'callsign') { |
| 640 | 873 | $data = array(); |
| 641 | - if (isset($line[37]) && $line[37] != '') $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37]; |
|
| 642 | - else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
|
| 874 | + if (isset($line[37]) && $line[37] != '') { |
|
| 875 | + $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0].'-'.$line[37]; |
|
| 876 | + } else { |
|
| 877 | + $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
|
| 878 | + } |
|
| 643 | 879 | $data['pilot_id'] = $line[1]; |
| 644 | 880 | $data['pilot_name'] = $line[2]; |
| 645 | 881 | $data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT); |
| 646 | 882 | $data['ident'] = $line[0]; // ident |
| 647 | - if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude |
|
| 883 | + if ($line[7] != '' && $line[7] != 0) { |
|
| 884 | + $data['altitude'] = $line[7]; |
|
| 885 | + } |
|
| 886 | + // altitude |
|
| 648 | 887 | $data['speed'] = $line[8]; // speed |
| 649 | - if (isset($line[45])) $data['heading'] = $line[45]; // heading |
|
| 650 | - elseif (isset($line[38])) $data['heading'] = $line[38]; // heading |
|
| 888 | + if (isset($line[45])) { |
|
| 889 | + $data['heading'] = $line[45]; |
|
| 890 | + } |
|
| 891 | + // heading |
|
| 892 | + elseif (isset($line[38])) { |
|
| 893 | + $data['heading'] = $line[38]; |
|
| 894 | + } |
|
| 895 | + // heading |
|
| 651 | 896 | $data['latitude'] = $line[5]; // lat |
| 652 | 897 | $data['longitude'] = $line[6]; // long |
| 653 | 898 | $data['verticalrate'] = ''; // vertical rate |
@@ -663,7 +908,9 @@ discard block |
||
| 663 | 908 | $data['frequency'] = $line[4]; |
| 664 | 909 | $data['type'] = $line[18]; |
| 665 | 910 | $data['range'] = $line[19]; |
| 666 | - if (isset($line[35])) $data['info'] = $line[35]; |
|
| 911 | + if (isset($line[35])) { |
|
| 912 | + $data['info'] = $line[35]; |
|
| 913 | + } |
|
| 667 | 914 | $data['id_source'] = $id_source; |
| 668 | 915 | //$data['arrival_airport_time'] = ; |
| 669 | 916 | if ($line[9] != '') { |
@@ -677,27 +924,47 @@ discard block |
||
| 677 | 924 | elseif ($value == 'vatsimtxt') $data['format_source'] = 'vatsimtxt'; |
| 678 | 925 | */ |
| 679 | 926 | $data['format_source'] = $value['format']; |
| 680 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 681 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 682 | - if ($line[3] == 'PILOT') $SI->add($data); |
|
| 683 | - elseif ($line[3] == 'ATC') { |
|
| 927 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 928 | + $data['noarchive'] = true; |
|
| 929 | + } |
|
| 930 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 931 | + $data['source_name'] = $value['name']; |
|
| 932 | + } |
|
| 933 | + if ($line[3] == 'PILOT') { |
|
| 934 | + $SI->add($data); |
|
| 935 | + } elseif ($line[3] == 'ATC') { |
|
| 684 | 936 | //print_r($data); |
| 685 | 937 | $data['info'] = str_replace('^§','<br />',$data['info']); |
| 686 | 938 | $data['info'] = str_replace('&sect;','',$data['info']); |
| 687 | 939 | $typec = substr($data['ident'],-3); |
| 688 | - if ($typec == 'APP') $data['type'] = 'Approach'; |
|
| 689 | - elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
|
| 690 | - elseif ($typec == 'OBS') $data['type'] = 'Observer'; |
|
| 691 | - elseif ($typec == 'GND') $data['type'] = 'Ground'; |
|
| 692 | - elseif ($typec == 'DEL') $data['type'] = 'Delivery'; |
|
| 693 | - elseif ($typec == 'DEP') $data['type'] = 'Departure'; |
|
| 694 | - elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station'; |
|
| 695 | - elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
|
| 696 | - elseif ($data['type'] == '') $data['type'] = 'Observer'; |
|
| 697 | - if (!isset($data['source_name'])) $data['source_name'] = ''; |
|
| 940 | + if ($typec == 'APP') { |
|
| 941 | + $data['type'] = 'Approach'; |
|
| 942 | + } elseif ($typec == 'TWR') { |
|
| 943 | + $data['type'] = 'Tower'; |
|
| 944 | + } elseif ($typec == 'OBS') { |
|
| 945 | + $data['type'] = 'Observer'; |
|
| 946 | + } elseif ($typec == 'GND') { |
|
| 947 | + $data['type'] = 'Ground'; |
|
| 948 | + } elseif ($typec == 'DEL') { |
|
| 949 | + $data['type'] = 'Delivery'; |
|
| 950 | + } elseif ($typec == 'DEP') { |
|
| 951 | + $data['type'] = 'Departure'; |
|
| 952 | + } elseif ($typec == 'FSS') { |
|
| 953 | + $data['type'] = 'Flight Service Station'; |
|
| 954 | + } elseif ($typec == 'CTR') { |
|
| 955 | + $data['type'] = 'Control Radar or Centre'; |
|
| 956 | + } elseif ($data['type'] == '') { |
|
| 957 | + $data['type'] = 'Observer'; |
|
| 958 | + } |
|
| 959 | + if (!isset($data['source_name'])) { |
|
| 960 | + $data['source_name'] = ''; |
|
| 961 | + } |
|
| 698 | 962 | if (isset($ATC)) { |
| 699 | - if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 700 | - else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 963 | + if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) { |
|
| 964 | + echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 965 | + } else { |
|
| 966 | + echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 967 | + } |
|
| 701 | 968 | } |
| 702 | 969 | } |
| 703 | 970 | unset($data); |
@@ -719,13 +986,19 @@ discard block |
||
| 719 | 986 | $data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST')); |
| 720 | 987 | $data['latitude'] = (float)$line['pktLatitude']; |
| 721 | 988 | $data['longitude'] = (float)$line['pktLongitude']; |
| 722 | - if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack']; |
|
| 723 | - if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed']; |
|
| 989 | + if ((float)$line['pktTrack'] != 0) { |
|
| 990 | + $data['heading'] = (float)$line['pktTrack']; |
|
| 991 | + } |
|
| 992 | + if ((int)$line['pktSpeed'] != 0) { |
|
| 993 | + $data['speed'] = (int)$line['pktSpeed']; |
|
| 994 | + } |
|
| 724 | 995 | $data['altitude'] = round((int)$line['pktAltitude']*3.28084); |
| 725 | 996 | $data['pilot_id'] = (int)$line['pktPilotID']; |
| 726 | 997 | $data['aircraft_icao'] = 'PARAGLIDER'; |
| 727 | 998 | $pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id'])); |
| 728 | - if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4]; |
|
| 999 | + if (isset($pilot_data[4])) { |
|
| 1000 | + $data['pilot_name'] = $pilot_data[4]; |
|
| 1001 | + } |
|
| 729 | 1002 | $data['format_source'] = $value['format']; |
| 730 | 1003 | $SI->add($data); |
| 731 | 1004 | unset($data); |
@@ -761,27 +1034,61 @@ discard block |
||
| 761 | 1034 | foreach ($all_data['acList'] as $line) { |
| 762 | 1035 | $data = array(); |
| 763 | 1036 | $data['hex'] = $line['Icao']; // hex |
| 764 | - if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
|
| 765 | - if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude |
|
| 766 | - if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed |
|
| 767 | - if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading |
|
| 768 | - if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat |
|
| 769 | - if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long |
|
| 1037 | + if (isset($line['Call'])) { |
|
| 1038 | + $data['ident'] = $line['Call']; |
|
| 1039 | + } |
|
| 1040 | + // ident |
|
| 1041 | + if (isset($line['Alt'])) { |
|
| 1042 | + $data['altitude'] = $line['Alt']; |
|
| 1043 | + } |
|
| 1044 | + // altitude |
|
| 1045 | + if (isset($line['Spd'])) { |
|
| 1046 | + $data['speed'] = $line['Spd']; |
|
| 1047 | + } |
|
| 1048 | + // speed |
|
| 1049 | + if (isset($line['Trak'])) { |
|
| 1050 | + $data['heading'] = $line['Trak']; |
|
| 1051 | + } |
|
| 1052 | + // heading |
|
| 1053 | + if (isset($line['Lat'])) { |
|
| 1054 | + $data['latitude'] = $line['Lat']; |
|
| 1055 | + } |
|
| 1056 | + // lat |
|
| 1057 | + if (isset($line['Long'])) { |
|
| 1058 | + $data['longitude'] = $line['Long']; |
|
| 1059 | + } |
|
| 1060 | + // long |
|
| 770 | 1061 | //$data['verticalrate'] = $line['']; // verticale rate |
| 771 | - if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
|
| 1062 | + if (isset($line['Sqk'])) { |
|
| 1063 | + $data['squawk'] = $line['Sqk']; |
|
| 1064 | + } |
|
| 1065 | + // squawk |
|
| 772 | 1066 | $data['emergency'] = ''; // emergency |
| 773 | - if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
|
| 1067 | + if (isset($line['Reg'])) { |
|
| 1068 | + $data['registration'] = $line['Reg']; |
|
| 1069 | + } |
|
| 774 | 1070 | |
| 775 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 776 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1071 | + if (isset($line['PosTime'])) { |
|
| 1072 | + $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 1073 | + } else { |
|
| 1074 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1075 | + } |
|
| 777 | 1076 | |
| 778 | 1077 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 779 | - if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
|
| 1078 | + if (isset($line['Type'])) { |
|
| 1079 | + $data['aircraft_icao'] = $line['Type']; |
|
| 1080 | + } |
|
| 780 | 1081 | $data['format_source'] = 'aircraftlistjson'; |
| 781 | 1082 | $data['id_source'] = $id_source; |
| 782 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 783 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 784 | - if (isset($data['latitude'])) $SI->add($data); |
|
| 1083 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1084 | + $data['source_name'] = $value['name']; |
|
| 1085 | + } |
|
| 1086 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1087 | + $data['noarchive'] = true; |
|
| 1088 | + } |
|
| 1089 | + if (isset($data['latitude'])) { |
|
| 1090 | + $SI->add($data); |
|
| 1091 | + } |
|
| 785 | 1092 | unset($data); |
| 786 | 1093 | } |
| 787 | 1094 | } elseif (is_array($all_data)) { |
@@ -798,12 +1105,19 @@ discard block |
||
| 798 | 1105 | $data['verticalrate'] = $line['vrt']; // verticale rate |
| 799 | 1106 | $data['squawk'] = $line['squawk']; // squawk |
| 800 | 1107 | $data['emergency'] = ''; // emergency |
| 801 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 802 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1108 | + if (isset($line['PosTime'])) { |
|
| 1109 | + $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 1110 | + } else { |
|
| 1111 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1112 | + } |
|
| 803 | 1113 | $data['format_source'] = 'aircraftlistjson'; |
| 804 | 1114 | $data['id_source'] = $id_source; |
| 805 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 806 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1115 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1116 | + $data['noarchive'] = true; |
|
| 1117 | + } |
|
| 1118 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1119 | + $data['source_name'] = $value['name']; |
|
| 1120 | + } |
|
| 807 | 1121 | $SI->add($data); |
| 808 | 1122 | unset($data); |
| 809 | 1123 | } |
@@ -839,8 +1153,12 @@ discard block |
||
| 839 | 1153 | $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
| 840 | 1154 | $data['format_source'] = 'planeupdatefaa'; |
| 841 | 1155 | $data['id_source'] = $id_source; |
| 842 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 843 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1156 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1157 | + $data['noarchive'] = true; |
|
| 1158 | + } |
|
| 1159 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1160 | + $data['source_name'] = $value['name']; |
|
| 1161 | + } |
|
| 844 | 1162 | $SI->add($data); |
| 845 | 1163 | unset($data); |
| 846 | 1164 | } |
@@ -869,7 +1187,9 @@ discard block |
||
| 869 | 1187 | $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
| 870 | 1188 | $data['format_source'] = 'opensky'; |
| 871 | 1189 | $data['id_source'] = $id_source; |
| 872 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1190 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1191 | + $data['noarchive'] = true; |
|
| 1192 | + } |
|
| 873 | 1193 | $SI->add($data); |
| 874 | 1194 | unset($data); |
| 875 | 1195 | } |
@@ -881,7 +1201,9 @@ discard block |
||
| 881 | 1201 | //$buffer = $Common->getData($hosts[$id]); |
| 882 | 1202 | $buffer = $Common->getData($value['host']); |
| 883 | 1203 | $all_data = json_decode($buffer,true); |
| 884 | - if (!empty($all_data)) $reset = 0; |
|
| 1204 | + if (!empty($all_data)) { |
|
| 1205 | + $reset = 0; |
|
| 1206 | + } |
|
| 885 | 1207 | foreach ($all_data as $key => $line) { |
| 886 | 1208 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
| 887 | 1209 | $data = array(); |
@@ -902,8 +1224,12 @@ discard block |
||
| 902 | 1224 | $data['datetime'] = date('Y-m-d H:i:s'); //$line[10] |
| 903 | 1225 | $data['format_source'] = 'fr24json'; |
| 904 | 1226 | $data['id_source'] = $id_source; |
| 905 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 906 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1227 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1228 | + $data['noarchive'] = true; |
|
| 1229 | + } |
|
| 1230 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1231 | + $data['source_name'] = $value['name']; |
|
| 1232 | + } |
|
| 907 | 1233 | $SI->add($data); |
| 908 | 1234 | unset($data); |
| 909 | 1235 | } |
@@ -927,24 +1253,42 @@ discard block |
||
| 927 | 1253 | if (isset($line['inf'])) { |
| 928 | 1254 | $data = array(); |
| 929 | 1255 | $data['hex'] = $line['inf']['ia']; |
| 930 | - if (isset($line['inf']['cs'])) $data['ident'] = $line['inf']['cs']; //$line[13] |
|
| 1256 | + if (isset($line['inf']['cs'])) { |
|
| 1257 | + $data['ident'] = $line['inf']['cs']; |
|
| 1258 | + } |
|
| 1259 | + //$line[13] |
|
| 931 | 1260 | $data['altitude'] = round($line['inf']['al']*3.28084); // altitude |
| 932 | - if (isset($line['inf']['gs'])) $data['speed'] = round($line['inf']['gs']*0.539957); // speed |
|
| 933 | - if (isset($line['inf']['tr'])) $data['heading'] = $line['inf']['tr']; // heading |
|
| 1261 | + if (isset($line['inf']['gs'])) { |
|
| 1262 | + $data['speed'] = round($line['inf']['gs']*0.539957); |
|
| 1263 | + } |
|
| 1264 | + // speed |
|
| 1265 | + if (isset($line['inf']['tr'])) { |
|
| 1266 | + $data['heading'] = $line['inf']['tr']; |
|
| 1267 | + } |
|
| 1268 | + // heading |
|
| 934 | 1269 | $data['latitude'] = $line['pt'][0]; // lat |
| 935 | 1270 | $data['longitude'] = $line['pt'][1]; // long |
| 936 | 1271 | //if (isset($line['inf']['vs'])) $data['verticalrate'] = $line['inf']['vs']; // verticale rate |
| 937 | - if (isset($line['inf']['sq'])) $data['squawk'] = $line['inf']['sq']; // squawk |
|
| 1272 | + if (isset($line['inf']['sq'])) { |
|
| 1273 | + $data['squawk'] = $line['inf']['sq']; |
|
| 1274 | + } |
|
| 1275 | + // squawk |
|
| 938 | 1276 | //$data['aircraft_icao'] = $line[8]; |
| 939 | - if (isset($line['inf']['rc'])) $data['registration'] = $line['inf']['rc']; |
|
| 1277 | + if (isset($line['inf']['rc'])) { |
|
| 1278 | + $data['registration'] = $line['inf']['rc']; |
|
| 1279 | + } |
|
| 940 | 1280 | //$data['departure_airport_iata'] = $line[11]; |
| 941 | 1281 | //$data['arrival_airport_iata'] = $line[12]; |
| 942 | 1282 | //$data['emergency'] = ''; // emergency |
| 943 | 1283 | $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
| 944 | 1284 | $data['format_source'] = 'radarvirtueljson'; |
| 945 | 1285 | $data['id_source'] = $id_source; |
| 946 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 947 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1286 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1287 | + $data['noarchive'] = true; |
|
| 1288 | + } |
|
| 1289 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1290 | + $data['source_name'] = $value['name']; |
|
| 1291 | + } |
|
| 948 | 1292 | $SI->add($data); |
| 949 | 1293 | unset($data); |
| 950 | 1294 | } |
@@ -965,30 +1309,65 @@ discard block |
||
| 965 | 1309 | $data['id'] = $line['id']; |
| 966 | 1310 | $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
| 967 | 1311 | $data['ident'] = $line['callsign']; // ident |
| 968 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
|
| 969 | - if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
|
| 970 | - if (isset($line['alt'])) $data['altitude'] = $line['alt']; // altitude |
|
| 971 | - if (isset($line['gs'])) $data['speed'] = $line['gs']; // speed |
|
| 972 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; // heading |
|
| 973 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1312 | + if (isset($line['pilotid'])) { |
|
| 1313 | + $data['pilot_id'] = $line['pilotid']; |
|
| 1314 | + } |
|
| 1315 | + // pilot id |
|
| 1316 | + if (isset($line['name'])) { |
|
| 1317 | + $data['pilot_name'] = $line['name']; |
|
| 1318 | + } |
|
| 1319 | + // pilot name |
|
| 1320 | + if (isset($line['alt'])) { |
|
| 1321 | + $data['altitude'] = $line['alt']; |
|
| 1322 | + } |
|
| 1323 | + // altitude |
|
| 1324 | + if (isset($line['gs'])) { |
|
| 1325 | + $data['speed'] = $line['gs']; |
|
| 1326 | + } |
|
| 1327 | + // speed |
|
| 1328 | + if (isset($line['heading'])) { |
|
| 1329 | + $data['heading'] = $line['heading']; |
|
| 1330 | + } |
|
| 1331 | + // heading |
|
| 1332 | + if (isset($line['route'])) { |
|
| 1333 | + $data['waypoints'] = $line['route']; |
|
| 1334 | + } |
|
| 1335 | + // route |
|
| 974 | 1336 | $data['latitude'] = $line['lat']; // lat |
| 975 | 1337 | $data['longitude'] = $line['lon']; // long |
| 976 | 1338 | //$data['verticalrate'] = $line['vrt']; // verticale rate |
| 977 | 1339 | //$data['squawk'] = $line['squawk']; // squawk |
| 978 | 1340 | //$data['emergency'] = ''; // emergency |
| 979 | - if (isset($line['depicao'])) $data['departure_airport_icao'] = $line['depicao']; |
|
| 980 | - if (isset($line['deptime'])) $data['departure_airport_time'] = $line['deptime']; |
|
| 981 | - if (isset($line['arricao'])) $data['arrival_airport_icao'] = $line['arricao']; |
|
| 1341 | + if (isset($line['depicao'])) { |
|
| 1342 | + $data['departure_airport_icao'] = $line['depicao']; |
|
| 1343 | + } |
|
| 1344 | + if (isset($line['deptime'])) { |
|
| 1345 | + $data['departure_airport_time'] = $line['deptime']; |
|
| 1346 | + } |
|
| 1347 | + if (isset($line['arricao'])) { |
|
| 1348 | + $data['arrival_airport_icao'] = $line['arricao']; |
|
| 1349 | + } |
|
| 982 | 1350 | //$data['arrival_airport_time'] = $line['arrtime']; |
| 983 | - if (isset($line['aircraft'])) $data['aircraft_icao'] = $line['aircraft']; |
|
| 984 | - if (isset($line['transponder'])) $data['squawk'] = $line['transponder']; |
|
| 985 | - if (isset($line['atis'])) $data['info'] = $line['atis']; |
|
| 986 | - else $data['info'] = ''; |
|
| 1351 | + if (isset($line['aircraft'])) { |
|
| 1352 | + $data['aircraft_icao'] = $line['aircraft']; |
|
| 1353 | + } |
|
| 1354 | + if (isset($line['transponder'])) { |
|
| 1355 | + $data['squawk'] = $line['transponder']; |
|
| 1356 | + } |
|
| 1357 | + if (isset($line['atis'])) { |
|
| 1358 | + $data['info'] = $line['atis']; |
|
| 1359 | + } else { |
|
| 1360 | + $data['info'] = ''; |
|
| 1361 | + } |
|
| 987 | 1362 | $data['format_source'] = 'pireps'; |
| 988 | 1363 | $data['id_source'] = $id_source; |
| 989 | 1364 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 990 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 991 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1365 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1366 | + $data['noarchive'] = true; |
|
| 1367 | + } |
|
| 1368 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1369 | + $data['source_name'] = $value['name']; |
|
| 1370 | + } |
|
| 992 | 1371 | if ($line['icon'] == 'plane') { |
| 993 | 1372 | $SI->add($data); |
| 994 | 1373 | // print_r($data); |
@@ -997,16 +1376,28 @@ discard block |
||
| 997 | 1376 | $data['info'] = str_replace('&sect;','',$data['info']); |
| 998 | 1377 | $typec = substr($data['ident'],-3); |
| 999 | 1378 | $data['type'] = ''; |
| 1000 | - if ($typec == 'APP') $data['type'] = 'Approach'; |
|
| 1001 | - elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
|
| 1002 | - elseif ($typec == 'OBS') $data['type'] = 'Observer'; |
|
| 1003 | - elseif ($typec == 'GND') $data['type'] = 'Ground'; |
|
| 1004 | - elseif ($typec == 'DEL') $data['type'] = 'Delivery'; |
|
| 1005 | - elseif ($typec == 'DEP') $data['type'] = 'Departure'; |
|
| 1006 | - elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station'; |
|
| 1007 | - elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
|
| 1008 | - else $data['type'] = 'Observer'; |
|
| 1009 | - if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']); |
|
| 1379 | + if ($typec == 'APP') { |
|
| 1380 | + $data['type'] = 'Approach'; |
|
| 1381 | + } elseif ($typec == 'TWR') { |
|
| 1382 | + $data['type'] = 'Tower'; |
|
| 1383 | + } elseif ($typec == 'OBS') { |
|
| 1384 | + $data['type'] = 'Observer'; |
|
| 1385 | + } elseif ($typec == 'GND') { |
|
| 1386 | + $data['type'] = 'Ground'; |
|
| 1387 | + } elseif ($typec == 'DEL') { |
|
| 1388 | + $data['type'] = 'Delivery'; |
|
| 1389 | + } elseif ($typec == 'DEP') { |
|
| 1390 | + $data['type'] = 'Departure'; |
|
| 1391 | + } elseif ($typec == 'FSS') { |
|
| 1392 | + $data['type'] = 'Flight Service Station'; |
|
| 1393 | + } elseif ($typec == 'CTR') { |
|
| 1394 | + $data['type'] = 'Control Radar or Centre'; |
|
| 1395 | + } else { |
|
| 1396 | + $data['type'] = 'Observer'; |
|
| 1397 | + } |
|
| 1398 | + if (isset($ATC)) { |
|
| 1399 | + echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']); |
|
| 1400 | + } |
|
| 1010 | 1401 | } |
| 1011 | 1402 | unset($data); |
| 1012 | 1403 | } |
@@ -1016,7 +1407,9 @@ discard block |
||
| 1016 | 1407 | //} elseif ($value == 'phpvmacars' && (time() - $last_exec['phpvmacars'] > $globalMinFetch)) { |
| 1017 | 1408 | } elseif ($value['format'] == 'phpvmacars' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 1018 | 1409 | //$buffer = $Common->getData($hosts[$id]); |
| 1019 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1410 | + if ($globalDebug) { |
|
| 1411 | + echo 'Get Data...'."\n"; |
|
| 1412 | + } |
|
| 1020 | 1413 | $buffer = $Common->getData($value['host']); |
| 1021 | 1414 | $all_data = json_decode($buffer,true); |
| 1022 | 1415 | if ($buffer != '' && is_array($all_data)) { |
@@ -1024,10 +1417,16 @@ discard block |
||
| 1024 | 1417 | foreach ($all_data as $line) { |
| 1025 | 1418 | $data = array(); |
| 1026 | 1419 | //$data['id'] = $line['id']; // id not usable |
| 1027 | - if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 1420 | + if (isset($line['pilotid'])) { |
|
| 1421 | + $data['id'] = $line['pilotid'].$line['flightnum']; |
|
| 1422 | + } |
|
| 1028 | 1423 | $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
| 1029 | - if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
|
| 1030 | - if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
|
| 1424 | + if (isset($line['pilotname'])) { |
|
| 1425 | + $data['pilot_name'] = $line['pilotname']; |
|
| 1426 | + } |
|
| 1427 | + if (isset($line['pilotid'])) { |
|
| 1428 | + $data['pilot_id'] = $line['pilotid']; |
|
| 1429 | + } |
|
| 1031 | 1430 | $data['ident'] = $line['flightnum']; // ident |
| 1032 | 1431 | $data['altitude'] = $line['alt']; // altitude |
| 1033 | 1432 | $data['speed'] = $line['gs']; // speed |
@@ -1045,28 +1444,44 @@ discard block |
||
| 1045 | 1444 | $data['arrival_airport_icao'] = $line['arricao']; |
| 1046 | 1445 | $data['arrival_airport_time'] = $line['arrtime']; |
| 1047 | 1446 | $data['registration'] = $line['aircraft']; |
| 1048 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1049 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1447 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1448 | + $data['noarchive'] = true; |
|
| 1449 | + } |
|
| 1450 | + if (isset($line['route'])) { |
|
| 1451 | + $data['waypoints'] = $line['route']; |
|
| 1452 | + } |
|
| 1453 | + // route |
|
| 1050 | 1454 | if (isset($line['aircraftname'])) { |
| 1051 | 1455 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 1052 | 1456 | $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
| 1053 | 1457 | $aircraft_data = explode('-',$line['aircraftname']); |
| 1054 | - if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 1055 | - elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 1056 | - else { |
|
| 1458 | + if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) { |
|
| 1459 | + $data['aircraft_icao'] = $aircraft_data[0]; |
|
| 1460 | + } elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) { |
|
| 1461 | + $data['aircraft_icao'] = $aircraft_data[1]; |
|
| 1462 | + } else { |
|
| 1057 | 1463 | $aircraft_data = explode(' ',$line['aircraftname']); |
| 1058 | - if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 1059 | - else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1464 | + if (isset($aircraft_data[1])) { |
|
| 1465 | + $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 1466 | + } else { |
|
| 1467 | + $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1468 | + } |
|
| 1060 | 1469 | } |
| 1061 | 1470 | } |
| 1062 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; |
|
| 1471 | + if (isset($line['route'])) { |
|
| 1472 | + $data['waypoints'] = $line['route']; |
|
| 1473 | + } |
|
| 1063 | 1474 | $data['id_source'] = $id_source; |
| 1064 | 1475 | $data['format_source'] = 'phpvmacars'; |
| 1065 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1476 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1477 | + $data['source_name'] = $value['name']; |
|
| 1478 | + } |
|
| 1066 | 1479 | $SI->add($data); |
| 1067 | 1480 | unset($data); |
| 1068 | 1481 | } |
| 1069 | - if ($globalDebug) echo 'No more data...'."\n"; |
|
| 1482 | + if ($globalDebug) { |
|
| 1483 | + echo 'No more data...'."\n"; |
|
| 1484 | + } |
|
| 1070 | 1485 | unset($buffer); |
| 1071 | 1486 | unset($all_data); |
| 1072 | 1487 | } |
@@ -1074,7 +1489,9 @@ discard block |
||
| 1074 | 1489 | $last_exec[$id]['last'] = time(); |
| 1075 | 1490 | } elseif ($value['format'] == 'vam' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 1076 | 1491 | //$buffer = $Common->getData($hosts[$id]); |
| 1077 | - if ($globalDebug) echo 'Get Data...'."\n"; |
|
| 1492 | + if ($globalDebug) { |
|
| 1493 | + echo 'Get Data...'."\n"; |
|
| 1494 | + } |
|
| 1078 | 1495 | $buffer = $Common->getData($value['host']); |
| 1079 | 1496 | $all_data = json_decode($buffer,true); |
| 1080 | 1497 | if ($buffer != '' && is_array($all_data)) { |
@@ -1103,16 +1520,25 @@ discard block |
||
| 1103 | 1520 | $data['arrival_airport_icao'] = $line['arrival']; |
| 1104 | 1521 | //$data['arrival_airport_time'] = $line['arrival_time']; |
| 1105 | 1522 | //$data['registration'] = $line['aircraft']; |
| 1106 | - if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
|
| 1523 | + if (isset($line['route'])) { |
|
| 1524 | + $data['waypoints'] = $line['route']; |
|
| 1525 | + } |
|
| 1526 | + // route |
|
| 1107 | 1527 | $data['aircraft_icao'] = $line['plane_type']; |
| 1108 | 1528 | $data['id_source'] = $id_source; |
| 1109 | 1529 | $data['format_source'] = 'vam'; |
| 1110 | - if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1111 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1530 | + if (isset($value['noarchive']) && $value['noarchive'] === TRUE) { |
|
| 1531 | + $data['noarchive'] = true; |
|
| 1532 | + } |
|
| 1533 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1534 | + $data['source_name'] = $value['name']; |
|
| 1535 | + } |
|
| 1112 | 1536 | $SI->add($data); |
| 1113 | 1537 | unset($data); |
| 1114 | 1538 | } |
| 1115 | - if ($globalDebug) echo 'No more data...'."\n"; |
|
| 1539 | + if ($globalDebug) { |
|
| 1540 | + echo 'No more data...'."\n"; |
|
| 1541 | + } |
|
| 1116 | 1542 | unset($buffer); |
| 1117 | 1543 | unset($all_data); |
| 1118 | 1544 | } |
@@ -1120,7 +1546,9 @@ discard block |
||
| 1120 | 1546 | $last_exec[$id]['last'] = time(); |
| 1121 | 1547 | //} elseif ($value == 'sbs' || $value == 'tsv' || $value == 'raw' || $value == 'aprs' || $value == 'beast') { |
| 1122 | 1548 | } elseif ($value['format'] == 'sbs' || $value['format'] == 'tsv' || $value['format'] == 'raw' || $value['format'] == 'aprs' || $value['format'] == 'famaprs' || $value['format'] == 'beast' || $value['format'] == 'flightgearmp' || $value['format'] == 'flightgearsp' || $value['format'] == 'acars' || $value['format'] == 'acarssbs3' || $value['format'] == 'ais' || $value['format'] == 'vrstcp') { |
| 1123 | - if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
|
| 1549 | + if (function_exists('pcntl_fork')) { |
|
| 1550 | + pcntl_signal_dispatch(); |
|
| 1551 | + } |
|
| 1124 | 1552 | //$last_exec[$id]['last'] = time(); |
| 1125 | 1553 | |
| 1126 | 1554 | //$read = array( $sockets[$id] ); |
@@ -1128,7 +1556,9 @@ discard block |
||
| 1128 | 1556 | $write = NULL; |
| 1129 | 1557 | $e = NULL; |
| 1130 | 1558 | $n = socket_select($read, $write, $e, $timeout); |
| 1131 | - if ($e != NULL) var_dump($e); |
|
| 1559 | + if ($e != NULL) { |
|
| 1560 | + var_dump($e); |
|
| 1561 | + } |
|
| 1132 | 1562 | if ($n > 0) { |
| 1133 | 1563 | $reset = 0; |
| 1134 | 1564 | foreach ($read as $nb => $r) { |
@@ -1149,12 +1579,16 @@ discard block |
||
| 1149 | 1579 | //$SI::del(); |
| 1150 | 1580 | if ($format == 'vrstcp') { |
| 1151 | 1581 | $buffer = explode('},{',$buffer); |
| 1152 | - } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1582 | + } else { |
|
| 1583 | + $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1584 | + } |
|
| 1153 | 1585 | // SBS format is CSV format |
| 1154 | 1586 | if ($buffer !== FALSE && $buffer != '') { |
| 1155 | 1587 | $tt[$format] = 0; |
| 1156 | 1588 | if ($format == 'acarssbs3') { |
| 1157 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1589 | + if ($globalDebug) { |
|
| 1590 | + echo 'ACARS : '.$buffer."\n"; |
|
| 1591 | + } |
|
| 1158 | 1592 | $ACARS->add(trim($buffer)); |
| 1159 | 1593 | $ACARS->deleteLiveAcarsData(); |
| 1160 | 1594 | } elseif ($format == 'raw') { |
@@ -1163,30 +1597,70 @@ discard block |
||
| 1163 | 1597 | if (is_array($data)) { |
| 1164 | 1598 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1165 | 1599 | $data['format_source'] = 'raw'; |
| 1166 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1167 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1168 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1169 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1600 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { |
|
| 1601 | + $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1602 | + } |
|
| 1603 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 1604 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1605 | + } |
|
| 1606 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1607 | + $data['noarchive'] = true; |
|
| 1608 | + } |
|
| 1609 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1610 | + $SI->add($data); |
|
| 1611 | + } |
|
| 1170 | 1612 | } |
| 1171 | 1613 | } elseif ($format == 'ais') { |
| 1172 | 1614 | $ais_data = $AIS->parse_line(trim($buffer)); |
| 1173 | 1615 | $data = array(); |
| 1174 | - if (isset($ais_data['ident'])) $data['ident'] = $ais_data['ident']; |
|
| 1175 | - if (isset($ais_data['mmsi'])) $data['mmsi'] = $ais_data['mmsi']; |
|
| 1176 | - if (isset($ais_data['speed'])) $data['speed'] = $ais_data['speed']; |
|
| 1177 | - if (isset($ais_data['heading'])) $data['heading'] = $ais_data['heading']; |
|
| 1178 | - if (isset($ais_data['latitude'])) $data['latitude'] = $ais_data['latitude']; |
|
| 1179 | - if (isset($ais_data['longitude'])) $data['longitude'] = $ais_data['longitude']; |
|
| 1180 | - if (isset($ais_data['status'])) $data['status'] = $ais_data['status']; |
|
| 1181 | - if (isset($ais_data['statusid'])) $data['status_id'] = $ais_data['statusid']; |
|
| 1182 | - if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
|
| 1183 | - if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
|
| 1184 | - if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
|
| 1185 | - if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
|
| 1186 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1187 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1188 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1189 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1616 | + if (isset($ais_data['ident'])) { |
|
| 1617 | + $data['ident'] = $ais_data['ident']; |
|
| 1618 | + } |
|
| 1619 | + if (isset($ais_data['mmsi'])) { |
|
| 1620 | + $data['mmsi'] = $ais_data['mmsi']; |
|
| 1621 | + } |
|
| 1622 | + if (isset($ais_data['speed'])) { |
|
| 1623 | + $data['speed'] = $ais_data['speed']; |
|
| 1624 | + } |
|
| 1625 | + if (isset($ais_data['heading'])) { |
|
| 1626 | + $data['heading'] = $ais_data['heading']; |
|
| 1627 | + } |
|
| 1628 | + if (isset($ais_data['latitude'])) { |
|
| 1629 | + $data['latitude'] = $ais_data['latitude']; |
|
| 1630 | + } |
|
| 1631 | + if (isset($ais_data['longitude'])) { |
|
| 1632 | + $data['longitude'] = $ais_data['longitude']; |
|
| 1633 | + } |
|
| 1634 | + if (isset($ais_data['status'])) { |
|
| 1635 | + $data['status'] = $ais_data['status']; |
|
| 1636 | + } |
|
| 1637 | + if (isset($ais_data['statusid'])) { |
|
| 1638 | + $data['status_id'] = $ais_data['statusid']; |
|
| 1639 | + } |
|
| 1640 | + if (isset($ais_data['type'])) { |
|
| 1641 | + $data['type'] = $ais_data['type']; |
|
| 1642 | + } |
|
| 1643 | + if (isset($ais_data['imo'])) { |
|
| 1644 | + $data['imo'] = $ais_data['imo']; |
|
| 1645 | + } |
|
| 1646 | + if (isset($ais_data['callsign'])) { |
|
| 1647 | + $data['callsign'] = $ais_data['callsign']; |
|
| 1648 | + } |
|
| 1649 | + if (isset($ais_data['destination'])) { |
|
| 1650 | + $data['arrival_code'] = $ais_data['destination']; |
|
| 1651 | + } |
|
| 1652 | + if (isset($ais_data['eta_ts'])) { |
|
| 1653 | + $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1654 | + } |
|
| 1655 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1656 | + $data['noarchive'] = true; |
|
| 1657 | + } |
|
| 1658 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { |
|
| 1659 | + $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1660 | + } |
|
| 1661 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 1662 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1663 | + } |
|
| 1190 | 1664 | |
| 1191 | 1665 | if (isset($ais_data['timestamp'])) { |
| 1192 | 1666 | $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
@@ -1195,7 +1669,9 @@ discard block |
||
| 1195 | 1669 | } |
| 1196 | 1670 | $data['format_source'] = 'aisnmea'; |
| 1197 | 1671 | $data['id_source'] = $id_source; |
| 1198 | - if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') $MI->add($data); |
|
| 1672 | + if (isset($ais_data['mmsi_type']) && $ais_data['mmsi_type'] == 'Ship') { |
|
| 1673 | + $MI->add($data); |
|
| 1674 | + } |
|
| 1199 | 1675 | unset($data); |
| 1200 | 1676 | } elseif ($format == 'flightgearsp') { |
| 1201 | 1677 | //echo $buffer."\n"; |
@@ -1213,12 +1689,18 @@ discard block |
||
| 1213 | 1689 | $data['speed'] = round($line[5]*1.94384); |
| 1214 | 1690 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1215 | 1691 | $data['format_source'] = 'flightgearsp'; |
| 1216 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1217 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1692 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1693 | + $data['noarchive'] = true; |
|
| 1694 | + } |
|
| 1695 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1696 | + $SI->add($data); |
|
| 1697 | + } |
|
| 1218 | 1698 | //$send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
| 1219 | 1699 | } |
| 1220 | 1700 | } elseif ($format == 'acars') { |
| 1221 | - if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
|
| 1701 | + if ($globalDebug) { |
|
| 1702 | + echo 'ACARS : '.$buffer."\n"; |
|
| 1703 | + } |
|
| 1222 | 1704 | $ACARS->add(trim($buffer)); |
| 1223 | 1705 | socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
| 1224 | 1706 | $ACARS->deleteLiveAcarsData(); |
@@ -1239,8 +1721,12 @@ discard block |
||
| 1239 | 1721 | $aircraft_type = $line[10]; |
| 1240 | 1722 | $aircraft_type = preg_split(':/:',$aircraft_type); |
| 1241 | 1723 | $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
| 1242 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1243 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1724 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1725 | + $data['noarchive'] = true; |
|
| 1726 | + } |
|
| 1727 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1728 | + $SI->add($data); |
|
| 1729 | + } |
|
| 1244 | 1730 | } |
| 1245 | 1731 | } |
| 1246 | 1732 | } elseif ($format == 'beast') { |
@@ -1250,28 +1736,62 @@ discard block |
||
| 1250 | 1736 | foreach($buffer as $all_data) { |
| 1251 | 1737 | $line = json_decode('{'.$all_data.'}',true); |
| 1252 | 1738 | $data = array(); |
| 1253 | - if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex |
|
| 1254 | - if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
|
| 1255 | - if (isset($line['Alt'])) $data['altitude'] = $line['Alt']; // altitude |
|
| 1256 | - if (isset($line['Spd'])) $data['speed'] = $line['Spd']; // speed |
|
| 1257 | - if (isset($line['Trak'])) $data['heading'] = $line['Trak']; // heading |
|
| 1258 | - if (isset($line['Lat'])) $data['latitude'] = $line['Lat']; // lat |
|
| 1259 | - if (isset($line['Long'])) $data['longitude'] = $line['Long']; // long |
|
| 1739 | + if (isset($line['Icao'])) { |
|
| 1740 | + $data['hex'] = $line['Icao']; |
|
| 1741 | + } |
|
| 1742 | + // hex |
|
| 1743 | + if (isset($line['Call'])) { |
|
| 1744 | + $data['ident'] = $line['Call']; |
|
| 1745 | + } |
|
| 1746 | + // ident |
|
| 1747 | + if (isset($line['Alt'])) { |
|
| 1748 | + $data['altitude'] = $line['Alt']; |
|
| 1749 | + } |
|
| 1750 | + // altitude |
|
| 1751 | + if (isset($line['Spd'])) { |
|
| 1752 | + $data['speed'] = $line['Spd']; |
|
| 1753 | + } |
|
| 1754 | + // speed |
|
| 1755 | + if (isset($line['Trak'])) { |
|
| 1756 | + $data['heading'] = $line['Trak']; |
|
| 1757 | + } |
|
| 1758 | + // heading |
|
| 1759 | + if (isset($line['Lat'])) { |
|
| 1760 | + $data['latitude'] = $line['Lat']; |
|
| 1761 | + } |
|
| 1762 | + // lat |
|
| 1763 | + if (isset($line['Long'])) { |
|
| 1764 | + $data['longitude'] = $line['Long']; |
|
| 1765 | + } |
|
| 1766 | + // long |
|
| 1260 | 1767 | //$data['verticalrate'] = $line['']; // verticale rate |
| 1261 | - if (isset($line['Sqk'])) $data['squawk'] = $line['Sqk']; // squawk |
|
| 1768 | + if (isset($line['Sqk'])) { |
|
| 1769 | + $data['squawk'] = $line['Sqk']; |
|
| 1770 | + } |
|
| 1771 | + // squawk |
|
| 1262 | 1772 | $data['emergency'] = ''; // emergency |
| 1263 | - if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
|
| 1773 | + if (isset($line['Reg'])) { |
|
| 1774 | + $data['registration'] = $line['Reg']; |
|
| 1775 | + } |
|
| 1264 | 1776 | /* |
| 1265 | 1777 | if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',$line['PosTime']/1000); |
| 1266 | 1778 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 1267 | 1779 | */ |
| 1268 | 1780 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1269 | - if (isset($line['Type'])) $data['aircraft_icao'] = $line['Type']; |
|
| 1781 | + if (isset($line['Type'])) { |
|
| 1782 | + $data['aircraft_icao'] = $line['Type']; |
|
| 1783 | + } |
|
| 1270 | 1784 | $data['format_source'] = 'vrstcp'; |
| 1271 | 1785 | $data['id_source'] = $id_source; |
| 1272 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1273 | - if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
|
| 1274 | - if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data); |
|
| 1786 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1787 | + $data['noarchive'] = true; |
|
| 1788 | + } |
|
| 1789 | + if (isset($value['name']) && $value['name'] != '') { |
|
| 1790 | + $data['source_name'] = $value['name']; |
|
| 1791 | + } |
|
| 1792 | + if (isset($data['latitude']) && isset($data['hex'])) { |
|
| 1793 | + $SI->add($data); |
|
| 1794 | + } |
|
| 1275 | 1795 | unset($data); |
| 1276 | 1796 | } |
| 1277 | 1797 | } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
@@ -1284,22 +1804,46 @@ discard block |
||
| 1284 | 1804 | $data['hex'] = $lined['hexid']; |
| 1285 | 1805 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
| 1286 | 1806 | $data['datetime'] = date('Y-m-d H:i:s');; |
| 1287 | - if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
|
| 1288 | - if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
|
| 1289 | - if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
|
| 1290 | - if (isset($lined['speed'])) $data['speed'] = $lined['speed']; |
|
| 1291 | - if (isset($lined['squawk'])) $data['squawk'] = $lined['squawk']; |
|
| 1292 | - if (isset($lined['alt'])) $data['altitude'] = $lined['alt']; |
|
| 1293 | - if (isset($lined['heading'])) $data['heading'] = $lined['heading']; |
|
| 1807 | + if (isset($lined['ident'])) { |
|
| 1808 | + $data['ident'] = $lined['ident']; |
|
| 1809 | + } |
|
| 1810 | + if (isset($lined['lat'])) { |
|
| 1811 | + $data['latitude'] = $lined['lat']; |
|
| 1812 | + } |
|
| 1813 | + if (isset($lined['lon'])) { |
|
| 1814 | + $data['longitude'] = $lined['lon']; |
|
| 1815 | + } |
|
| 1816 | + if (isset($lined['speed'])) { |
|
| 1817 | + $data['speed'] = $lined['speed']; |
|
| 1818 | + } |
|
| 1819 | + if (isset($lined['squawk'])) { |
|
| 1820 | + $data['squawk'] = $lined['squawk']; |
|
| 1821 | + } |
|
| 1822 | + if (isset($lined['alt'])) { |
|
| 1823 | + $data['altitude'] = $lined['alt']; |
|
| 1824 | + } |
|
| 1825 | + if (isset($lined['heading'])) { |
|
| 1826 | + $data['heading'] = $lined['heading']; |
|
| 1827 | + } |
|
| 1294 | 1828 | $data['id_source'] = $id_source; |
| 1295 | 1829 | $data['format_source'] = 'tsv'; |
| 1296 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1297 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1298 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1299 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
|
| 1830 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { |
|
| 1831 | + $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1832 | + } |
|
| 1833 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 1834 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1835 | + } |
|
| 1836 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1837 | + $data['noarchive'] = true; |
|
| 1838 | + } |
|
| 1839 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 1840 | + $SI->add($data); |
|
| 1841 | + } |
|
| 1300 | 1842 | unset($lined); |
| 1301 | 1843 | unset($data); |
| 1302 | - } else $error = true; |
|
| 1844 | + } else { |
|
| 1845 | + $error = true; |
|
| 1846 | + } |
|
| 1303 | 1847 | } elseif ($format == 'aprs' && $use_aprs) { |
| 1304 | 1848 | if ($aprs_connect == 0) { |
| 1305 | 1849 | $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
@@ -1324,41 +1868,89 @@ discard block |
||
| 1324 | 1868 | $aprs_last_tx = time(); |
| 1325 | 1869 | $data = array(); |
| 1326 | 1870 | //print_r($line); |
| 1327 | - if (isset($line['address'])) $data['hex'] = $line['address']; |
|
| 1328 | - if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi']; |
|
| 1329 | - if (isset($line['imo'])) $data['imo'] = $line['imo']; |
|
| 1330 | - if (isset($line['squawk'])) $data['squawk'] = $line['squawk']; |
|
| 1331 | - if (isset($line['arrival_code'])) $data['arrical_code'] = $line['arrival_code']; |
|
| 1332 | - if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date']; |
|
| 1333 | - if (isset($line['type_id'])) $data['type_id'] = $line['typeid']; |
|
| 1334 | - if (isset($line['status_id'])) $data['status_id'] = $line['statusid']; |
|
| 1335 | - if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1336 | - else $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1871 | + if (isset($line['address'])) { |
|
| 1872 | + $data['hex'] = $line['address']; |
|
| 1873 | + } |
|
| 1874 | + if (isset($line['mmsi'])) { |
|
| 1875 | + $data['mmsi'] = $line['mmsi']; |
|
| 1876 | + } |
|
| 1877 | + if (isset($line['imo'])) { |
|
| 1878 | + $data['imo'] = $line['imo']; |
|
| 1879 | + } |
|
| 1880 | + if (isset($line['squawk'])) { |
|
| 1881 | + $data['squawk'] = $line['squawk']; |
|
| 1882 | + } |
|
| 1883 | + if (isset($line['arrival_code'])) { |
|
| 1884 | + $data['arrical_code'] = $line['arrival_code']; |
|
| 1885 | + } |
|
| 1886 | + if (isset($line['arrival_date'])) { |
|
| 1887 | + $data['arrical_date'] = $line['arrival_date']; |
|
| 1888 | + } |
|
| 1889 | + if (isset($line['type_id'])) { |
|
| 1890 | + $data['type_id'] = $line['typeid']; |
|
| 1891 | + } |
|
| 1892 | + if (isset($line['status_id'])) { |
|
| 1893 | + $data['status_id'] = $line['statusid']; |
|
| 1894 | + } |
|
| 1895 | + if (isset($line['timestamp'])) { |
|
| 1896 | + $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1897 | + } else { |
|
| 1898 | + $data['datetime'] = date('Y-m-d H:i:s'); |
|
| 1899 | + } |
|
| 1337 | 1900 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 1338 | - if (isset($line['ident'])) $data['ident'] = $line['ident']; |
|
| 1901 | + if (isset($line['ident'])) { |
|
| 1902 | + $data['ident'] = $line['ident']; |
|
| 1903 | + } |
|
| 1339 | 1904 | $data['latitude'] = $line['latitude']; |
| 1340 | 1905 | $data['longitude'] = $line['longitude']; |
| 1341 | 1906 | //$data['verticalrate'] = $line[16]; |
| 1342 | - if (isset($line['speed'])) $data['speed'] = $line['speed']; |
|
| 1343 | - else $data['speed'] = 0; |
|
| 1344 | - if (isset($line['altitude'])) $data['altitude'] = $line['altitude']; |
|
| 1345 | - if (isset($line['comment'])) $data['comment'] = $line['comment']; |
|
| 1346 | - if (isset($line['symbol'])) $data['type'] = $line['symbol']; |
|
| 1347 | - if (isset($line['heading'])) $data['heading'] = $line['heading']; |
|
| 1907 | + if (isset($line['speed'])) { |
|
| 1908 | + $data['speed'] = $line['speed']; |
|
| 1909 | + } else { |
|
| 1910 | + $data['speed'] = 0; |
|
| 1911 | + } |
|
| 1912 | + if (isset($line['altitude'])) { |
|
| 1913 | + $data['altitude'] = $line['altitude']; |
|
| 1914 | + } |
|
| 1915 | + if (isset($line['comment'])) { |
|
| 1916 | + $data['comment'] = $line['comment']; |
|
| 1917 | + } |
|
| 1918 | + if (isset($line['symbol'])) { |
|
| 1919 | + $data['type'] = $line['symbol']; |
|
| 1920 | + } |
|
| 1921 | + if (isset($line['heading'])) { |
|
| 1922 | + $data['heading'] = $line['heading']; |
|
| 1923 | + } |
|
| 1348 | 1924 | //else $data['heading'] = 0; |
| 1349 | - if (isset($line['stealth'])) $data['aircraft_type'] = $line['stealth']; |
|
| 1925 | + if (isset($line['stealth'])) { |
|
| 1926 | + $data['aircraft_type'] = $line['stealth']; |
|
| 1927 | + } |
|
| 1350 | 1928 | //if (!isset($line['source_type']) && (!isset($globalAPRSarchive) || (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE))) $data['noarchive'] = true; |
| 1351 | - if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) $data['noarchive'] = true; |
|
| 1352 | - elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) $data['noarchive'] = false; |
|
| 1353 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 1354 | - elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) $data['noarchive'] = false; |
|
| 1929 | + if (isset($globalAPRSarchive) && $globalAPRSarchive === FALSE) { |
|
| 1930 | + $data['noarchive'] = true; |
|
| 1931 | + } elseif (isset($globalAPRSarchive) && $globalAPRSarchive === TRUE) { |
|
| 1932 | + $data['noarchive'] = false; |
|
| 1933 | + } |
|
| 1934 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 1935 | + $data['noarchive'] = true; |
|
| 1936 | + } elseif (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === FALSE) { |
|
| 1937 | + $data['noarchive'] = false; |
|
| 1938 | + } |
|
| 1355 | 1939 | $data['id_source'] = $id_source; |
| 1356 | - if (isset($line['format_source'])) $data['format_source'] = $line['format_source']; |
|
| 1357 | - else $data['format_source'] = 'aprs'; |
|
| 1940 | + if (isset($line['format_source'])) { |
|
| 1941 | + $data['format_source'] = $line['format_source']; |
|
| 1942 | + } else { |
|
| 1943 | + $data['format_source'] = 'aprs'; |
|
| 1944 | + } |
|
| 1358 | 1945 | $data['source_name'] = $line['source']; |
| 1359 | - if (isset($line['source_type'])) $data['source_type'] = $line['source_type']; |
|
| 1360 | - else $data['source_type'] = 'flarm'; |
|
| 1361 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1946 | + if (isset($line['source_type'])) { |
|
| 1947 | + $data['source_type'] = $line['source_type']; |
|
| 1948 | + } else { |
|
| 1949 | + $data['source_type'] = 'flarm'; |
|
| 1950 | + } |
|
| 1951 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 1952 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1953 | + } |
|
| 1362 | 1954 | $currentdate = date('Y-m-d H:i:s'); |
| 1363 | 1955 | $aprsdate = strtotime($data['datetime']); |
| 1364 | 1956 | // Accept data if time <= system time + 20s |
@@ -1366,14 +1958,21 @@ discard block |
||
| 1366 | 1958 | if (($data['source_type'] == 'modes') || isset($line['stealth']) && ($line['stealth'] == 0 || $line['stealth'] == '') && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) { |
| 1367 | 1959 | $send = $SI->add($data); |
| 1368 | 1960 | } elseif ($data['source_type'] == 'ais') { |
| 1369 | - if (isset($globalMarine) && $globalMarine) $send = $MI->add($data); |
|
| 1961 | + if (isset($globalMarine) && $globalMarine) { |
|
| 1962 | + $send = $MI->add($data); |
|
| 1963 | + } |
|
| 1370 | 1964 | } elseif (isset($line['stealth'])) { |
| 1371 | - if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n"; |
|
| 1372 | - else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n"; |
|
| 1965 | + if ($line['stealth'] != 0) { |
|
| 1966 | + echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n"; |
|
| 1967 | + } else { |
|
| 1968 | + echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n"; |
|
| 1969 | + } |
|
| 1373 | 1970 | //} elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle' || $line['symbol'] == 'Police' || $line['symbol'] == 'Bike' || $line['symbol'] == 'Jogger' || $line['symbol'] == 'Bus' || $line['symbol'] == 'Jeep' || $line['symbol'] == 'Recreational Vehicle' || $line['symbol'] == 'Yacht (Sail)' || $line['symbol'] == 'Ship (Power Boat)' || $line['symbol'] == 'Firetruck' || $line['symbol'] == 'Balloon' || $line['symbol'] == 'Aircraft (small)' || $line['symbol'] == 'Helicopter')) { |
| 1374 | 1971 | } elseif (isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && isset($line['speed']) && $line['symbol'] != 'Weather Station' && $line['symbol'] != 'House QTH (VHF)' && $line['symbol'] != 'Dot' && $line['symbol'] != 'TCP-IP' && $line['symbol'] != 'xAPRS (UNIX)' && $line['symbol'] != 'Antenna' && $line['symbol'] != 'Cloudy' && $line['symbol'] != 'HF Gateway' && $line['symbol'] != 'Yagi At QTH' && $line['symbol'] != 'Digi' && $line['symbol'] != '8' && $line['symbol'] != 'MacAPRS') { |
| 1375 | 1972 | //echo '!!!!!!!!!!!!!!!! SEND !!!!!!!!!!!!!!!!!!!!'."\n"; |
| 1376 | - if (isset($globalTracker) && $globalTracker) $send = $TI->add($data); |
|
| 1973 | + if (isset($globalTracker) && $globalTracker) { |
|
| 1974 | + $send = $TI->add($data); |
|
| 1975 | + } |
|
| 1377 | 1976 | } elseif (!isset($line['stealth']) && is_numeric($data['latitude']) && is_numeric($data['longitude']) && isset($data['ident'])) { |
| 1378 | 1977 | $Source->deleteOldLocationByType('gs'); |
| 1379 | 1978 | if (count($Source->getLocationInfoByName($data['ident'])) > 0) { |
@@ -1386,12 +1985,9 @@ discard block |
||
| 1386 | 1985 | print_r($data); |
| 1387 | 1986 | } |
| 1388 | 1987 | unset($data); |
| 1389 | - } |
|
| 1390 | - elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') { |
|
| 1988 | + } elseif (is_array($line) && $globalDebug && isset($line['symbol']) && $line['symbol'] == 'Weather Station') { |
|
| 1391 | 1989 | echo '!! Weather Station not yet supported'."\n"; |
| 1392 | - } |
|
| 1393 | - |
|
| 1394 | - elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') { |
|
| 1990 | + } elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') { |
|
| 1395 | 1991 | $Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']); |
| 1396 | 1992 | } |
| 1397 | 1993 | /* |
@@ -1399,8 +1995,11 @@ discard block |
||
| 1399 | 1995 | echo '!! Car & Trucks not yet supported'."\n"; |
| 1400 | 1996 | } |
| 1401 | 1997 | */ |
| 1402 | - elseif ($line == false && $globalDebug) echo 'Ignored ('.$buffer.")\n"; |
|
| 1403 | - elseif ($line == true && $globalDebug) echo '!! Failed : '.$buffer."!!\n"; |
|
| 1998 | + elseif ($line == false && $globalDebug) { |
|
| 1999 | + echo 'Ignored ('.$buffer.")\n"; |
|
| 2000 | + } elseif ($line == true && $globalDebug) { |
|
| 2001 | + echo '!! Failed : '.$buffer."!!\n"; |
|
| 2002 | + } |
|
| 1404 | 2003 | } |
| 1405 | 2004 | } else { |
| 1406 | 2005 | $line = explode(',', $buffer); |
@@ -1429,26 +2028,45 @@ discard block |
||
| 1429 | 2028 | $data['ground'] = $line[21]; |
| 1430 | 2029 | $data['emergency'] = $line[19]; |
| 1431 | 2030 | $data['format_source'] = 'sbs'; |
| 1432 | - if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
|
| 1433 | - if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 1434 | - if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
|
| 2031 | + if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') { |
|
| 2032 | + $data['source_name'] = $globalSources[$nb]['name']; |
|
| 2033 | + } |
|
| 2034 | + if (isset($globalSources[$nb]['sourcestats'])) { |
|
| 2035 | + $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
|
| 2036 | + } |
|
| 2037 | + if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) { |
|
| 2038 | + $data['noarchive'] = true; |
|
| 2039 | + } |
|
| 1435 | 2040 | $data['id_source'] = $id_source; |
| 1436 | - if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $send = $SI->add($data); |
|
| 1437 | - else $error = true; |
|
| 2041 | + if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) { |
|
| 2042 | + $send = $SI->add($data); |
|
| 2043 | + } else { |
|
| 2044 | + $error = true; |
|
| 2045 | + } |
|
| 1438 | 2046 | unset($data); |
| 1439 | - } else $error = true; |
|
| 2047 | + } else { |
|
| 2048 | + $error = true; |
|
| 2049 | + } |
|
| 1440 | 2050 | if ($error) { |
| 1441 | 2051 | if (count($line) > 1 && ($line[0] == 'STA' || $line[0] == 'AIR' || $line[0] == 'SEL' || $line[0] == 'ID' || $line[0] == 'CLK')) { |
| 1442 | - if ($globalDebug) echo "Not a message. Ignoring... \n"; |
|
| 2052 | + if ($globalDebug) { |
|
| 2053 | + echo "Not a message. Ignoring... \n"; |
|
| 2054 | + } |
|
| 1443 | 2055 | } else { |
| 1444 | - if ($globalDebug) echo "Wrong line format. Ignoring... \n"; |
|
| 2056 | + if ($globalDebug) { |
|
| 2057 | + echo "Wrong line format. Ignoring... \n"; |
|
| 2058 | + } |
|
| 1445 | 2059 | if ($globalDebug) { |
| 1446 | 2060 | echo $buffer; |
| 1447 | 2061 | //print_r($line); |
| 1448 | 2062 | } |
| 1449 | 2063 | //socket_close($r); |
| 1450 | - if ($globalDebug) echo "Reconnect after an error...\n"; |
|
| 1451 | - if ($format == 'aprs') $aprs_connect = 0; |
|
| 2064 | + if ($globalDebug) { |
|
| 2065 | + echo "Reconnect after an error...\n"; |
|
| 2066 | + } |
|
| 2067 | + if ($format == 'aprs') { |
|
| 2068 | + $aprs_connect = 0; |
|
| 2069 | + } |
|
| 1452 | 2070 | $sourceer[$nb] = $globalSources[$nb]; |
| 1453 | 2071 | connect_all($sourceer); |
| 1454 | 2072 | $sourceer = array(); |
@@ -1456,10 +2074,14 @@ discard block |
||
| 1456 | 2074 | } |
| 1457 | 2075 | } |
| 1458 | 2076 | // Sleep for xxx microseconds |
| 1459 | - if (isset($globalSBSSleep)) usleep($globalSBSSleep); |
|
| 2077 | + if (isset($globalSBSSleep)) { |
|
| 2078 | + usleep($globalSBSSleep); |
|
| 2079 | + } |
|
| 1460 | 2080 | } else { |
| 1461 | 2081 | if ($format == 'flightgearmp') { |
| 1462 | - if ($globalDebug) echo "Reconnect FlightGear MP..."; |
|
| 2082 | + if ($globalDebug) { |
|
| 2083 | + echo "Reconnect FlightGear MP..."; |
|
| 2084 | + } |
|
| 1463 | 2085 | //@socket_close($r); |
| 1464 | 2086 | sleep($globalMinFetch); |
| 1465 | 2087 | $sourcefg[$nb] = $globalSources[$nb]; |
@@ -1468,10 +2090,15 @@ discard block |
||
| 1468 | 2090 | break; |
| 1469 | 2091 | |
| 1470 | 2092 | } elseif ($format != 'acars' && $format != 'flightgearsp') { |
| 1471 | - if (isset($tt[$format])) $tt[$format]++; |
|
| 1472 | - else $tt[$format] = 0; |
|
| 2093 | + if (isset($tt[$format])) { |
|
| 2094 | + $tt[$format]++; |
|
| 2095 | + } else { |
|
| 2096 | + $tt[$format] = 0; |
|
| 2097 | + } |
|
| 1473 | 2098 | if ($tt[$format] > 30) { |
| 1474 | - if ($globalDebug) echo "ERROR : Reconnect ".$format."..."; |
|
| 2099 | + if ($globalDebug) { |
|
| 2100 | + echo "ERROR : Reconnect ".$format."..."; |
|
| 2101 | + } |
|
| 1475 | 2102 | //@socket_close($r); |
| 1476 | 2103 | sleep(2); |
| 1477 | 2104 | $aprs_connect = 0; |
@@ -1488,11 +2115,17 @@ discard block |
||
| 1488 | 2115 | } else { |
| 1489 | 2116 | $error = socket_strerror(socket_last_error()); |
| 1490 | 2117 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { |
| 1491 | - if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
|
| 1492 | - if (isset($globalDebug)) echo "Restarting...\n"; |
|
| 2118 | + if ($globalDebug) { |
|
| 2119 | + echo "ERROR : socket_select give this error ".$error . "\n"; |
|
| 2120 | + } |
|
| 2121 | + if (isset($globalDebug)) { |
|
| 2122 | + echo "Restarting...\n"; |
|
| 2123 | + } |
|
| 1493 | 2124 | // Restart the script if possible |
| 1494 | 2125 | if (is_array($sockets)) { |
| 1495 | - if ($globalDebug) echo "Shutdown all sockets..."; |
|
| 2126 | + if ($globalDebug) { |
|
| 2127 | + echo "Shutdown all sockets..."; |
|
| 2128 | + } |
|
| 1496 | 2129 | |
| 1497 | 2130 | foreach ($sockets as $sock) { |
| 1498 | 2131 | @socket_shutdown($sock,2); |
@@ -1500,22 +2133,36 @@ discard block |
||
| 1500 | 2133 | } |
| 1501 | 2134 | |
| 1502 | 2135 | } |
| 1503 | - if ($globalDebug) echo "Waiting..."; |
|
| 2136 | + if ($globalDebug) { |
|
| 2137 | + echo "Waiting..."; |
|
| 2138 | + } |
|
| 1504 | 2139 | sleep(2); |
| 1505 | 2140 | $time = time(); |
| 1506 | 2141 | //connect_all($hosts); |
| 1507 | 2142 | $aprs_connect = 0; |
| 1508 | - if ($reset%5 == 0) sleep(20); |
|
| 1509 | - if ($reset%10 == 0) sleep(100); |
|
| 1510 | - if ($reset%20 == 0) sleep(200); |
|
| 1511 | - if ($reset > 100) exit('Too many attempts...'); |
|
| 1512 | - if ($globalDebug) echo "Restart all connections..."; |
|
| 2143 | + if ($reset%5 == 0) { |
|
| 2144 | + sleep(20); |
|
| 2145 | + } |
|
| 2146 | + if ($reset%10 == 0) { |
|
| 2147 | + sleep(100); |
|
| 2148 | + } |
|
| 2149 | + if ($reset%20 == 0) { |
|
| 2150 | + sleep(200); |
|
| 2151 | + } |
|
| 2152 | + if ($reset > 100) { |
|
| 2153 | + exit('Too many attempts...'); |
|
| 2154 | + } |
|
| 2155 | + if ($globalDebug) { |
|
| 2156 | + echo "Restart all connections..."; |
|
| 2157 | + } |
|
| 1513 | 2158 | connect_all($globalSources); |
| 1514 | 2159 | } |
| 1515 | 2160 | } |
| 1516 | 2161 | } |
| 1517 | 2162 | if ($globalDaemon === false) { |
| 1518 | - if ($globalDebug) echo 'Check all...'."\n"; |
|
| 2163 | + if ($globalDebug) { |
|
| 2164 | + echo 'Check all...'."\n"; |
|
| 2165 | + } |
|
| 1519 | 2166 | $SI->checkAll(); |
| 1520 | 2167 | } |
| 1521 | 2168 | } |
@@ -29,20 +29,20 @@ discard block |
||
| 29 | 29 | * @param String $date get data for a date |
| 30 | 30 | * @return Array Return Accidents data in array |
| 31 | 31 | */ |
| 32 | - public function getAccidentData($limit = '',$type = '',$date = '') { |
|
| 32 | + public function getAccidentData($limit = '', $type = '', $date = '') { |
|
| 33 | 33 | global $globalURL, $globalDBdriver; |
| 34 | 34 | $Image = new Image($this->db); |
| 35 | 35 | $Spotter = new Spotter($this->db); |
| 36 | 36 | $Translation = new Translation($this->db); |
| 37 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 37 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 38 | 38 | date_default_timezone_set('UTC'); |
| 39 | 39 | $result = array(); |
| 40 | 40 | $limit_query = ''; |
| 41 | 41 | if ($limit != "") |
| 42 | 42 | { |
| 43 | 43 | $limit_array = explode(",", $limit); |
| 44 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 45 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 44 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 45 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 46 | 46 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 47 | 47 | { |
| 48 | 48 | $limit_query = " LIMIT ".$limit_array[1]." OFFSET ".$limit_array[0]; |
@@ -51,29 +51,29 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | if ($type != '') { |
| 53 | 53 | if ($date != '') { |
| 54 | - if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) { |
|
| 54 | + if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) { |
|
| 55 | 55 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 56 | 56 | //$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 57 | - $query_values = array(':type' => $type,':date' => $date); |
|
| 58 | - } elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/",$date)) { |
|
| 57 | + $query_values = array(':type' => $type, ':date' => $date); |
|
| 58 | + } elseif (preg_match("/^[0-9]{4}-[0-9]{2}$/", $date)) { |
|
| 59 | 59 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND date BETWEEN :dated AND :datef GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 60 | - $query_values = array(':type' => $type,':dated' => $date.'-01', ':datef' => $date.'-31'); |
|
| 61 | - } elseif (preg_match("/^[0-9]{4}$/",$date)) { |
|
| 60 | + $query_values = array(':type' => $type, ':dated' => $date.'-01', ':datef' => $date.'-31'); |
|
| 61 | + } elseif (preg_match("/^[0-9]{4}$/", $date)) { |
|
| 62 | 62 | if ($globalDBdriver == 'mysql') { |
| 63 | 63 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND YEAR(date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 64 | 64 | } else { |
| 65 | 65 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND EXTRACT(YEAR FROM date) = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 66 | 66 | } |
| 67 | - $query_values = array(':type' => $type,':date' => $date); |
|
| 67 | + $query_values = array(':type' => $type, ':date' => $date); |
|
| 68 | 68 | } else { |
| 69 | 69 | $date = $date.'%'; |
| 70 | 70 | if ($globalDBdriver == 'mysql') { |
| 71 | 71 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND DATE_FORMAT(date,'%Y-%m-%d') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 72 | - $query_values = array(':type' => $type,':date' => $date); |
|
| 72 | + $query_values = array(':type' => $type, ':date' => $date); |
|
| 73 | 73 | } else { |
| 74 | 74 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 75 | 75 | //$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE type = :type AND to_char(date,'YYYY-MM-DD') LIKE :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 76 | - $query_values = array(':type' => $type,':date' => $date); |
|
| 76 | + $query_values = array(':type' => $type, ':date' => $date); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | } else { |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | } else { |
| 85 | 85 | if ($date != '') { |
| 86 | - if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/",$date)) { |
|
| 86 | + if (preg_match("/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/", $date)) { |
|
| 87 | 87 | $query = "SELECT * FROM accidents WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 88 | 88 | //$query = "SELECT accidents.registration, accidents.ident, accidents.date, accidents.url, accidents.country, accidents.place, accidents.title, accidents.fatalities, accidents.type, accidents.ident, accidents.aircraft_manufacturer, accidents.aircraft_name, accidents.airline_name, accidents.airline_icao, spotter_output.flightaware_id FROM accidents LEFT OUTER JOIN spotter_output ON accidents.registration = spotter_output.registration WHERE accidents_id IN (SELECT max(accidents_id) FROM accidents WHERE date = :date GROUP BY registration) ORDER BY accidents.date DESC".$limit_query; |
| 89 | 89 | } else { |
@@ -102,19 +102,19 @@ discard block |
||
| 102 | 102 | try { |
| 103 | 103 | $sth = $this->db->prepare($query); |
| 104 | 104 | $sth->execute($query_values); |
| 105 | - } catch(PDOException $e) { |
|
| 105 | + } catch (PDOException $e) { |
|
| 106 | 106 | echo "error : ".$e->getMessage(); |
| 107 | 107 | } |
| 108 | 108 | $i = 0; |
| 109 | 109 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 110 | 110 | //print_r($row); |
| 111 | 111 | //echo $row['flightaware_id']; |
| 112 | - if (preg_match('/^[\w\-]+$/',$row['registration'])) { |
|
| 112 | + if (preg_match('/^[\w\-]+$/', $row['registration'])) { |
|
| 113 | 113 | $data = array(); |
| 114 | 114 | if ($row['registration'] != '') { |
| 115 | 115 | $image_array = $Image->getSpotterImage($row['registration']); |
| 116 | - if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 117 | - else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 116 | + if (count($image_array) > 0) $data = array_merge($data, array('image' => $image_array[0]['image'], 'image_thumbnail' => $image_array[0]['image_thumbnail'], 'image_copyright' => $image_array[0]['image_copyright'], 'image_source' => $image_array[0]['image_source'], 'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 117 | + else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 118 | 118 | $aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']); |
| 119 | 119 | $aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type); |
| 120 | 120 | if (!empty($aircraft_info)) { |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | $data['aircraft_name'] = $aircraft_info[0]['type']; |
| 123 | 123 | $data['aircraft_manufacturer'] = $aircraft_info[0]['manufacturer']; |
| 124 | 124 | } else { |
| 125 | - $data = array_merge($data,array('aircraft_type' => 'NA')); |
|
| 125 | + $data = array_merge($data, array('aircraft_type' => 'NA')); |
|
| 126 | 126 | } |
| 127 | 127 | $owner_data = $Spotter->getAircraftOwnerByRegistration($row['registration']); |
| 128 | 128 | if (!empty($owner_data)) { |
@@ -130,18 +130,18 @@ discard block |
||
| 130 | 130 | $data['aircraft_base'] = $owner_data['base']; |
| 131 | 131 | $data['aircraft_date_first_reg'] = $owner_data['date_first_reg']; |
| 132 | 132 | } |
| 133 | - } else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 133 | + } else $data = array_merge($data, array('image' => '', 'image_thumbnail' => '', 'image_copyright' => '', 'image_source' => '', 'image_source_website' => '')); |
|
| 134 | 134 | if ($row['registration'] == '') $row['registration'] = 'NA'; |
| 135 | 135 | if ($row['ident'] == '') $row['ident'] = 'NA'; |
| 136 | - $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3)); |
|
| 136 | + $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'], 0, 3)); |
|
| 137 | 137 | if (isset($identicao[0])) { |
| 138 | - if (substr($row['ident'],0,2) == 'AF') { |
|
| 139 | - if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 140 | - else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0'); |
|
| 141 | - } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0'); |
|
| 142 | - $data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name'])); |
|
| 138 | + if (substr($row['ident'], 0, 2) == 'AF') { |
|
| 139 | + if (filter_var(substr($row['ident'], 2), FILTER_VALIDATE_INT, array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 140 | + else $icao = 'AFR'.ltrim(substr($row['ident'], 2), '0'); |
|
| 141 | + } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'], 2), '0'); |
|
| 142 | + $data = array_merge($data, array('airline_icao' => $identicao[0]['icao'], 'airline_name' => $identicao[0]['name'])); |
|
| 143 | 143 | } else $icao = $row['ident']; |
| 144 | - $icao = $Translation->checkTranslation($icao,false); |
|
| 144 | + $icao = $Translation->checkTranslation($icao, false); |
|
| 145 | 145 | //$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url'])); |
| 146 | 146 | if ($row['airline_name'] != '' && !isset($data['airline_name'])) { |
| 147 | 147 | //echo 'Check airline info... for '.$row['airline_name'].' '; |
@@ -150,11 +150,11 @@ discard block |
||
| 150 | 150 | if (!empty($airline_info)) { |
| 151 | 151 | //echo 'data found !'."\n"; |
| 152 | 152 | //print_r($airline_info); |
| 153 | - $data = array_merge($data,$airline_info); |
|
| 153 | + $data = array_merge($data, $airline_info); |
|
| 154 | 154 | } |
| 155 | 155 | //else echo 'No data...'."\n"; |
| 156 | 156 | } |
| 157 | - $data = array_merge($row,$data); |
|
| 157 | + $data = array_merge($row, $data); |
|
| 158 | 158 | if ($data['ident'] == null) $data['ident'] = $icao; |
| 159 | 159 | if ($data['title'] == null) { |
| 160 | 160 | $data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country']; |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | try { |
| 191 | 191 | $sth = $this->db->prepare($query); |
| 192 | 192 | $sth->execute(); |
| 193 | - } catch(PDOException $e) { |
|
| 193 | + } catch (PDOException $e) { |
|
| 194 | 194 | echo "Error : ".$e->getMessage(); |
| 195 | 195 | } |
| 196 | 196 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | try { |
| 211 | 211 | $sth = $this->db->prepare($query); |
| 212 | 212 | $sth->execute(); |
| 213 | - } catch(PDOException $e) { |
|
| 213 | + } catch (PDOException $e) { |
|
| 214 | 214 | echo "Error : ".$e->getMessage(); |
| 215 | 215 | } |
| 216 | 216 | return $sth->fetchAll(PDO::FETCH_ASSOC); |
@@ -225,15 +225,15 @@ discard block |
||
| 225 | 225 | if ($globalDebug) echo 'Import '.$file."\n"; |
| 226 | 226 | $result = array(); |
| 227 | 227 | if (file_exists($file)) { |
| 228 | - if (($handle = fopen($file,'r')) !== FALSE) { |
|
| 229 | - while (($data = fgetcsv($handle,2000,",")) !== FALSE) { |
|
| 228 | + if (($handle = fopen($file, 'r')) !== FALSE) { |
|
| 229 | + while (($data = fgetcsv($handle, 2000, ",")) !== FALSE) { |
|
| 230 | 230 | if (isset($data[1]) && $data[1] != '0000-00-00 00:00:00') { |
| 231 | - $result[] = array('registration' => $data[0],'date' => strtotime($data[1]),'url' => $data[2],'country' => $data[3],'place' => $data[4],'title' => $data[5],'fatalities' => $data[6],'latitude' => $data[7],'longitude' => $data[8],'type' => $data[9],'ident' => $data[10],'aircraft_manufacturer' => $data[11],'aircraft_name' => $data[12],'operator' => $data[13],'source' => 'website_fam'); |
|
| 231 | + $result[] = array('registration' => $data[0], 'date' => strtotime($data[1]), 'url' => $data[2], 'country' => $data[3], 'place' => $data[4], 'title' => $data[5], 'fatalities' => $data[6], 'latitude' => $data[7], 'longitude' => $data[8], 'type' => $data[9], 'ident' => $data[10], 'aircraft_manufacturer' => $data[11], 'aircraft_name' => $data[12], 'operator' => $data[13], 'source' => 'website_fam'); |
|
| 232 | 232 | } |
| 233 | 233 | } |
| 234 | 234 | fclose($handle); |
| 235 | 235 | } |
| 236 | - if (!empty($result)) $this->add($result,true); |
|
| 236 | + if (!empty($result)) $this->add($result, true); |
|
| 237 | 237 | elseif ($globalDebug) echo 'Nothing to import'; |
| 238 | 238 | } |
| 239 | 239 | } |
@@ -249,8 +249,8 @@ discard block |
||
| 249 | 249 | $all_md5_new = array(); |
| 250 | 250 | if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) { |
| 251 | 251 | if ($this->check_accidents_nb() > 0) { |
| 252 | - if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) { |
|
| 253 | - while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) { |
|
| 252 | + if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) { |
|
| 253 | + while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) { |
|
| 254 | 254 | if (isset($data[1])) { |
| 255 | 255 | $year = $data[0]; |
| 256 | 256 | $all_md5[$year] = $data[1]; |
@@ -260,10 +260,10 @@ discard block |
||
| 260 | 260 | } |
| 261 | 261 | } |
| 262 | 262 | } |
| 263 | - $Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5',dirname(__FILE__).'/../install/tmp/cr-all.md5'); |
|
| 263 | + $Common->download('http://data.flightairmap.fr/data/cr/cr-all.md5', dirname(__FILE__).'/../install/tmp/cr-all.md5'); |
|
| 264 | 264 | if (file_exists(dirname(__FILE__).'/../install/tmp/cr-all.md5')) { |
| 265 | - if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5','r')) !== FALSE) { |
|
| 266 | - while (($data = fgetcsv($handle,2000,"\t")) !== FALSE) { |
|
| 265 | + if (($handle = fopen(dirname(__FILE__).'/../install/tmp/cr-all.md5', 'r')) !== FALSE) { |
|
| 266 | + while (($data = fgetcsv($handle, 2000, "\t")) !== FALSE) { |
|
| 267 | 267 | if (isset($data[1])) { |
| 268 | 268 | $year = $data[0]; |
| 269 | 269 | $all_md5_new[$year] = $data[1]; |
@@ -272,10 +272,10 @@ discard block |
||
| 272 | 272 | fclose($handle); |
| 273 | 273 | } elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5'; |
| 274 | 274 | } elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.'; |
| 275 | - $result = $Common->arr_diff($all_md5_new,$all_md5); |
|
| 275 | + $result = $Common->arr_diff($all_md5_new, $all_md5); |
|
| 276 | 276 | if (empty($result) && $globalDebug) echo 'Nothing to update'; |
| 277 | 277 | foreach ($result as $file => $md5) { |
| 278 | - $Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file); |
|
| 278 | + $Common->download('http://data.flightairmap.fr/data/cr/'.$file, dirname(__FILE__).'/../install/tmp/'.$file); |
|
| 279 | 279 | if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file); |
| 280 | 280 | elseif ($globalDebug) echo 'Download '.$file.' failed'; |
| 281 | 281 | } |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | * Add data to DB |
| 286 | 286 | * @param Array $crash An array with accidents/incidents data |
| 287 | 287 | */ |
| 288 | - public function add($crash,$new = false) { |
|
| 288 | + public function add($crash, $new = false) { |
|
| 289 | 289 | global $globalTransaction, $globalDebug; |
| 290 | 290 | require_once('class.Connection.php'); |
| 291 | 291 | require_once('class.Image.php'); |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | $sthd->execute(array(':source' => $crash[0]['source'])); |
| 302 | 302 | } |
| 303 | 303 | if ($globalTransaction) $Connection->db->beginTransaction(); |
| 304 | - $initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null); |
|
| 304 | + $initial_array = array('ident' => null, 'type' => 'accident', 'url' => null, 'registration' => null, 'date' => null, 'place' => null, 'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '', 'source' => '', 'aircraft_manufacturer' => null, 'aircraft_name' => null, 'operator' => null); |
|
| 305 | 305 | $query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source'; |
| 306 | 306 | $sth_check = $Connection->db->prepare($query_check); |
| 307 | 307 | $query = 'INSERT INTO accidents (aircraft_manufacturer,aircraft_name,ident,registration,date,url,country,place,title,fatalities,latitude,longitude,type,airline_name,source) VALUES (:aircraft_manufacturer,:aircraft_name,:ident,:registration,:date,:url,:country,:place,:title,:fatalities,:latitude,:longitude,:type,:airline_name,:source)'; |
@@ -314,15 +314,15 @@ discard block |
||
| 314 | 314 | $cr = array_map(function($value) { |
| 315 | 315 | return $value === "" ? NULL : $value; |
| 316 | 316 | }, $cr); |
| 317 | - if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) { |
|
| 318 | - if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']); |
|
| 319 | - $query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']); |
|
| 317 | + if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/', $cr['registration'])) { |
|
| 318 | + if (strpos($cr['registration'], '-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']); |
|
| 319 | + $query_check_values = array(':registration' => $cr['registration'], ':date' => date('Y-m-d', $cr['date']), ':type' => $cr['type'], ':source' => $cr['source']); |
|
| 320 | 320 | $sth_check->execute($query_check_values); |
| 321 | 321 | $result_check = $sth_check->fetch(PDO::FETCH_ASSOC); |
| 322 | 322 | if ($result_check['nb'] == 0) { |
| 323 | - $query_values = array(':registration' => trim($cr['registration']),':date' => date('Y-m-d',$cr['date']),':url' => $cr['url'],':country' => $cr['country'],':place' => $cr['place'],':title' => $cr['title'],':fatalities' => $cr['fatalities'],':latitude' => $cr['latitude'],':longitude' => $cr['longitude'],':type' => $cr['type'],':source' => $cr['source'],':ident' => $cr['ident'],':aircraft_manufacturer' => $cr['aircraft_manufacturer'],':aircraft_name' => $cr['aircraft_name'],':airline_name' => $cr['operator']); |
|
| 323 | + $query_values = array(':registration' => trim($cr['registration']), ':date' => date('Y-m-d', $cr['date']), ':url' => $cr['url'], ':country' => $cr['country'], ':place' => $cr['place'], ':title' => $cr['title'], ':fatalities' => $cr['fatalities'], ':latitude' => $cr['latitude'], ':longitude' => $cr['longitude'], ':type' => $cr['type'], ':source' => $cr['source'], ':ident' => $cr['ident'], ':aircraft_manufacturer' => $cr['aircraft_manufacturer'], ':aircraft_name' => $cr['aircraft_name'], ':airline_name' => $cr['operator']); |
|
| 324 | 324 | $sth->execute($query_values); |
| 325 | - if ($cr['date'] > time()-(30*86400)) { |
|
| 325 | + if ($cr['date'] > time() - (30*86400)) { |
|
| 326 | 326 | if (empty($Image->getSpotterImage($cr['registration']))) { |
| 327 | 327 | if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...'; |
| 328 | 328 | $Image->addSpotterImage($cr['registration']); |
@@ -330,16 +330,16 @@ discard block |
||
| 330 | 330 | } |
| 331 | 331 | // elseif ($globalDebug) echo 'Image already in DB'."\n"; |
| 332 | 332 | } |
| 333 | - $Spotter->setHighlightFlightByRegistration($cr['registration'],$cr['title'],date('Y-m-d',$cr['date'])); |
|
| 333 | + $Spotter->setHighlightFlightByRegistration($cr['registration'], $cr['title'], date('Y-m-d', $cr['date'])); |
|
| 334 | 334 | } |
| 335 | 335 | } |
| 336 | - if ($globalTransaction && $j % 1000 == 0) { |
|
| 336 | + if ($globalTransaction && $j%1000 == 0) { |
|
| 337 | 337 | $Connection->db->commit(); |
| 338 | 338 | $Connection->db->beginTransaction(); |
| 339 | 339 | } |
| 340 | 340 | } |
| 341 | 341 | if ($globalTransaction) $Connection->db->commit(); |
| 342 | - } catch(PDOException $e) { |
|
| 342 | + } catch (PDOException $e) { |
|
| 343 | 343 | if ($globalTransaction) $Connection->db->rollBack(); |
| 344 | 344 | echo $e->getMessage(); |
| 345 | 345 | } |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | $Connection = new Connection(); |
| 358 | 358 | $sth = $Connection->db->prepare($query); |
| 359 | 359 | $sth->execute(); |
| 360 | - } catch(PDOException $e) { |
|
| 360 | + } catch (PDOException $e) { |
|
| 361 | 361 | return "error : ".$e->getMessage(); |
| 362 | 362 | } |
| 363 | 363 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | $Connection = new Connection(); |
| 376 | 376 | $sth = $Connection->db->prepare($query); |
| 377 | 377 | $sth->execute(); |
| 378 | - } catch(PDOException $e) { |
|
| 378 | + } catch (PDOException $e) { |
|
| 379 | 379 | return "error : ".$e->getMessage(); |
| 380 | 380 | } |
| 381 | 381 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -390,7 +390,7 @@ discard block |
||
| 390 | 390 | $Connection = new Connection(); |
| 391 | 391 | $sth = $Connection->db->prepare($query); |
| 392 | 392 | $sth->execute(); |
| 393 | - } catch(PDOException $e) { |
|
| 393 | + } catch (PDOException $e) { |
|
| 394 | 394 | return "error : ".$e->getMessage(); |
| 395 | 395 | } |
| 396 | 396 | } |
@@ -113,8 +113,11 @@ discard block |
||
| 113 | 113 | $data = array(); |
| 114 | 114 | if ($row['registration'] != '') { |
| 115 | 115 | $image_array = $Image->getSpotterImage($row['registration']); |
| 116 | - if (count($image_array) > 0) $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 117 | - else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 116 | + if (count($image_array) > 0) { |
|
| 117 | + $data = array_merge($data,array('image' => $image_array[0]['image'],'image_thumbnail' => $image_array[0]['image_thumbnail'],'image_copyright' => $image_array[0]['image_copyright'],'image_source' => $image_array[0]['image_source'],'image_source_website' => $image_array[0]['image_source_website'])); |
|
| 118 | + } else { |
|
| 119 | + $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 120 | + } |
|
| 118 | 121 | $aircraft_type = $Spotter->getAllAircraftTypeByRegistration($row['registration']); |
| 119 | 122 | $aircraft_info = $Spotter->getAllAircraftInfo($aircraft_type); |
| 120 | 123 | if (!empty($aircraft_info)) { |
@@ -130,17 +133,30 @@ discard block |
||
| 130 | 133 | $data['aircraft_base'] = $owner_data['base']; |
| 131 | 134 | $data['aircraft_date_first_reg'] = $owner_data['date_first_reg']; |
| 132 | 135 | } |
| 133 | - } else $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 134 | - if ($row['registration'] == '') $row['registration'] = 'NA'; |
|
| 135 | - if ($row['ident'] == '') $row['ident'] = 'NA'; |
|
| 136 | + } else { |
|
| 137 | + $data = array_merge($data,array('image' => '','image_thumbnail' => '','image_copyright' => '','image_source' => '','image_source_website' => '')); |
|
| 138 | + } |
|
| 139 | + if ($row['registration'] == '') { |
|
| 140 | + $row['registration'] = 'NA'; |
|
| 141 | + } |
|
| 142 | + if ($row['ident'] == '') { |
|
| 143 | + $row['ident'] = 'NA'; |
|
| 144 | + } |
|
| 136 | 145 | $identicao = $Spotter->getAllAirlineInfo(substr($row['ident'],0,3)); |
| 137 | 146 | if (isset($identicao[0])) { |
| 138 | 147 | if (substr($row['ident'],0,2) == 'AF') { |
| 139 | - if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $row['ident']; |
|
| 140 | - else $icao = 'AFR'.ltrim(substr($row['ident'],2),'0'); |
|
| 141 | - } else $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0'); |
|
| 148 | + if (filter_var(substr($row['ident'],2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) { |
|
| 149 | + $icao = $row['ident']; |
|
| 150 | + } else { |
|
| 151 | + $icao = 'AFR'.ltrim(substr($row['ident'],2),'0'); |
|
| 152 | + } |
|
| 153 | + } else { |
|
| 154 | + $icao = $identicao[0]['icao'].ltrim(substr($row['ident'],2),'0'); |
|
| 155 | + } |
|
| 142 | 156 | $data = array_merge($data,array('airline_icao' => $identicao[0]['icao'],'airline_name' => $identicao[0]['name'])); |
| 143 | - } else $icao = $row['ident']; |
|
| 157 | + } else { |
|
| 158 | + $icao = $row['ident']; |
|
| 159 | + } |
|
| 144 | 160 | $icao = $Translation->checkTranslation($icao,false); |
| 145 | 161 | //$data = array_merge($data,array('registration' => $row['registration'], 'date' => $row['date'], 'ident' => $icao,'url' => $row['url'])); |
| 146 | 162 | if ($row['airline_name'] != '' && !isset($data['airline_name'])) { |
@@ -155,10 +171,14 @@ discard block |
||
| 155 | 171 | //else echo 'No data...'."\n"; |
| 156 | 172 | } |
| 157 | 173 | $data = array_merge($row,$data); |
| 158 | - if ($data['ident'] == null) $data['ident'] = $icao; |
|
| 174 | + if ($data['ident'] == null) { |
|
| 175 | + $data['ident'] = $icao; |
|
| 176 | + } |
|
| 159 | 177 | if ($data['title'] == null) { |
| 160 | 178 | $data['message'] = $row['type'].' of '.$row['registration'].' at '.$row['place'].','.$row['country']; |
| 161 | - } else $data['message'] = strtolower($data['title']); |
|
| 179 | + } else { |
|
| 180 | + $data['message'] = strtolower($data['title']); |
|
| 181 | + } |
|
| 162 | 182 | $ids = $Spotter->getAllIDByRegistration($data['registration']); |
| 163 | 183 | $date = $data['date']; |
| 164 | 184 | if (isset($ids[$date])) { |
@@ -177,8 +197,9 @@ discard block |
||
| 177 | 197 | if (isset($result)) { |
| 178 | 198 | $result[0]['query_number_rows'] = $i; |
| 179 | 199 | return $result; |
| 200 | + } else { |
|
| 201 | + return array(); |
|
| 180 | 202 | } |
| 181 | - else return array(); |
|
| 182 | 203 | } |
| 183 | 204 | |
| 184 | 205 | /* |
@@ -222,7 +243,9 @@ discard block |
||
| 222 | 243 | */ |
| 223 | 244 | public function import($file) { |
| 224 | 245 | global $globalTransaction, $globalDebug; |
| 225 | - if ($globalDebug) echo 'Import '.$file."\n"; |
|
| 246 | + if ($globalDebug) { |
|
| 247 | + echo 'Import '.$file."\n"; |
|
| 248 | + } |
|
| 226 | 249 | $result = array(); |
| 227 | 250 | if (file_exists($file)) { |
| 228 | 251 | if (($handle = fopen($file,'r')) !== FALSE) { |
@@ -233,8 +256,11 @@ discard block |
||
| 233 | 256 | } |
| 234 | 257 | fclose($handle); |
| 235 | 258 | } |
| 236 | - if (!empty($result)) $this->add($result,true); |
|
| 237 | - elseif ($globalDebug) echo 'Nothing to import'; |
|
| 259 | + if (!empty($result)) { |
|
| 260 | + $this->add($result,true); |
|
| 261 | + } elseif ($globalDebug) { |
|
| 262 | + echo 'Nothing to import'; |
|
| 263 | + } |
|
| 238 | 264 | } |
| 239 | 265 | } |
| 240 | 266 | |
@@ -270,14 +296,23 @@ discard block |
||
| 270 | 296 | } |
| 271 | 297 | } |
| 272 | 298 | fclose($handle); |
| 273 | - } elseif ($globalDebug) echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5'; |
|
| 274 | - } elseif ($globalDebug) echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.'; |
|
| 299 | + } elseif ($globalDebug) { |
|
| 300 | + echo "Can't open ".dirname(__FILE__).'/../install/tmp/cr-all.md5'; |
|
| 301 | + } |
|
| 302 | + } elseif ($globalDebug) { |
|
| 303 | + echo 'Download cr-all.md5 failed. '.dirname(__FILE__).'/../install/tmp/cr-all.md5 not here.'; |
|
| 304 | + } |
|
| 275 | 305 | $result = $Common->arr_diff($all_md5_new,$all_md5); |
| 276 | - if (empty($result) && $globalDebug) echo 'Nothing to update'; |
|
| 306 | + if (empty($result) && $globalDebug) { |
|
| 307 | + echo 'Nothing to update'; |
|
| 308 | + } |
|
| 277 | 309 | foreach ($result as $file => $md5) { |
| 278 | 310 | $Common->download('http://data.flightairmap.fr/data/cr/'.$file,dirname(__FILE__).'/../install/tmp/'.$file); |
| 279 | - if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) $this->import(dirname(__FILE__).'/../install/tmp/'.$file); |
|
| 280 | - elseif ($globalDebug) echo 'Download '.$file.' failed'; |
|
| 311 | + if (file_exists(dirname(__FILE__).'/../install/tmp/'.$file)) { |
|
| 312 | + $this->import(dirname(__FILE__).'/../install/tmp/'.$file); |
|
| 313 | + } elseif ($globalDebug) { |
|
| 314 | + echo 'Download '.$file.' failed'; |
|
| 315 | + } |
|
| 281 | 316 | } |
| 282 | 317 | } |
| 283 | 318 | |
@@ -294,13 +329,17 @@ discard block |
||
| 294 | 329 | $Image = new Image(); |
| 295 | 330 | $Spotter = new Spotter(); |
| 296 | 331 | |
| 297 | - if (empty($crash)) return false; |
|
| 332 | + if (empty($crash)) { |
|
| 333 | + return false; |
|
| 334 | + } |
|
| 298 | 335 | if (!$new) { |
| 299 | 336 | $query_delete = 'DELETE FROM accidents WHERE source = :source'; |
| 300 | 337 | $sthd = $Connection->db->prepare($query_delete); |
| 301 | 338 | $sthd->execute(array(':source' => $crash[0]['source'])); |
| 302 | 339 | } |
| 303 | - if ($globalTransaction) $Connection->db->beginTransaction(); |
|
| 340 | + if ($globalTransaction) { |
|
| 341 | + $Connection->db->beginTransaction(); |
|
| 342 | + } |
|
| 304 | 343 | $initial_array = array('ident' => null,'type' => 'accident','url' => null,'registration' => null, 'date' => null, 'place' => null,'country' => null, 'latitude' => null, 'longitude' => null, 'fatalities' => null, 'title' => '','source' => '','aircraft_manufacturer' => null,'aircraft_name' => null,'operator' => null); |
| 305 | 344 | $query_check = 'SELECT COUNT(*) as nb FROM accidents WHERE registration = :registration AND date = :date AND type = :type AND source = :source'; |
| 306 | 345 | $sth_check = $Connection->db->prepare($query_check); |
@@ -315,7 +354,9 @@ discard block |
||
| 315 | 354 | return $value === "" ? NULL : $value; |
| 316 | 355 | }, $cr); |
| 317 | 356 | if ($cr['date'] != '' && $cr['registration'] != null && $cr['registration'] != '' && $cr['registration'] != '?' && $cr['registration'] != '-' && strtolower($cr['registration']) != 'unknown' && $cr['date'] < time() && !preg_match('/\s/',$cr['registration'])) { |
| 318 | - if (strpos($cr['registration'],'-') === FALSE) $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']); |
|
| 357 | + if (strpos($cr['registration'],'-') === FALSE) { |
|
| 358 | + $cr['registration'] = $Spotter->convertAircraftRegistration($cr['registration']); |
|
| 359 | + } |
|
| 319 | 360 | $query_check_values = array(':registration' => $cr['registration'],':date' => date('Y-m-d',$cr['date']),':type' => $cr['type'],':source' => $cr['source']); |
| 320 | 361 | $sth_check->execute($query_check_values); |
| 321 | 362 | $result_check = $sth_check->fetch(PDO::FETCH_ASSOC); |
@@ -324,9 +365,13 @@ discard block |
||
| 324 | 365 | $sth->execute($query_values); |
| 325 | 366 | if ($cr['date'] > time()-(30*86400)) { |
| 326 | 367 | if (empty($Image->getSpotterImage($cr['registration']))) { |
| 327 | - if ($globalDebug) echo "\t".'Get image for '.$cr['registration'].'...'; |
|
| 368 | + if ($globalDebug) { |
|
| 369 | + echo "\t".'Get image for '.$cr['registration'].'...'; |
|
| 370 | + } |
|
| 328 | 371 | $Image->addSpotterImage($cr['registration']); |
| 329 | - if ($globalDebug) echo "\t".'Done'."\n"; |
|
| 372 | + if ($globalDebug) { |
|
| 373 | + echo "\t".'Done'."\n"; |
|
| 374 | + } |
|
| 330 | 375 | } |
| 331 | 376 | // elseif ($globalDebug) echo 'Image already in DB'."\n"; |
| 332 | 377 | } |
@@ -338,9 +383,13 @@ discard block |
||
| 338 | 383 | $Connection->db->beginTransaction(); |
| 339 | 384 | } |
| 340 | 385 | } |
| 341 | - if ($globalTransaction) $Connection->db->commit(); |
|
| 386 | + if ($globalTransaction) { |
|
| 387 | + $Connection->db->commit(); |
|
| 388 | + } |
|
| 342 | 389 | } catch(PDOException $e) { |
| 343 | - if ($globalTransaction) $Connection->db->rollBack(); |
|
| 390 | + if ($globalTransaction) { |
|
| 391 | + $Connection->db->rollBack(); |
|
| 392 | + } |
|
| 344 | 393 | echo $e->getMessage(); |
| 345 | 394 | } |
| 346 | 395 | $sth_check->closeCursor(); |
@@ -379,8 +428,11 @@ discard block |
||
| 379 | 428 | return "error : ".$e->getMessage(); |
| 380 | 429 | } |
| 381 | 430 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
| 382 | - if ($row['nb'] > 0) return false; |
|
| 383 | - else return true; |
|
| 431 | + if ($row['nb'] > 0) { |
|
| 432 | + return false; |
|
| 433 | + } else { |
|
| 434 | + return true; |
|
| 435 | + } |
|
| 384 | 436 | } |
| 385 | 437 | |
| 386 | 438 | public static function insert_last_accidents_update() { |
@@ -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,78 +120,78 @@ 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'])) { |
|
| 186 | + if (isset($flight['lastupdate'])) { |
|
| 187 | 187 | if ($flight['lastupdate'] < (time()-5900)) { |
| 188 | - $this->delKey($key); |
|
| 188 | + $this->delKey($key); |
|
| 189 | + } |
|
| 189 | 190 | } |
| 190 | - } |
|
| 191 | 191 | } |
| 192 | - } |
|
| 192 | + } |
|
| 193 | 193 | |
| 194 | - public function delKey($key) { |
|
| 194 | + public function delKey($key) { |
|
| 195 | 195 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 196 | 196 | // Delete old infos |
| 197 | 197 | if (isset($this->all_flights[$key]['id'])) { |
@@ -206,9 +206,9 @@ discard block |
||
| 206 | 206 | } |
| 207 | 207 | } |
| 208 | 208 | unset($this->all_flights[$key]); |
| 209 | - } |
|
| 209 | + } |
|
| 210 | 210 | |
| 211 | - public function add($line) { |
|
| 211 | + public function add($line) { |
|
| 212 | 212 | global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA, $globalAircraftMaxUpdate, $globalAircraftMinUpdate; |
| 213 | 213 | //if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE; |
| 214 | 214 | if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
@@ -234,20 +234,20 @@ 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['hex'])) $line['hex'] = strtoupper($line['hex']); |
|
| 239 | - 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['hex'])) $line['hex'] = strtoupper($line['hex']); |
|
| 239 | + 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)) { |
|
| 240 | 240 | |
| 241 | 241 | // Increment message number |
| 242 | 242 | if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) { |
| 243 | - $current_date = date('Y-m-d'); |
|
| 244 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 245 | - else $source = ''; |
|
| 246 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 247 | - if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 248 | - $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 249 | - $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 250 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 243 | + $current_date = date('Y-m-d'); |
|
| 244 | + if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 245 | + else $source = ''; |
|
| 246 | + if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 247 | + if (!isset($this->stats[$current_date][$source]['msg'])) { |
|
| 248 | + $this->stats[$current_date][$source]['msg']['date'] = time(); |
|
| 249 | + $this->stats[$current_date][$source]['msg']['nb'] = 1; |
|
| 250 | + } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | /* |
@@ -263,53 +263,53 @@ discard block |
||
| 263 | 263 | //$this->db = $dbc; |
| 264 | 264 | |
| 265 | 265 | //$hex = trim($line['hex']); |
| 266 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 267 | - else $id = trim($line['id']); |
|
| 266 | + if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 267 | + else $id = trim($line['id']); |
|
| 268 | 268 | |
| 269 | 269 | if (!isset($this->all_flights[$id])) { |
| 270 | - $this->all_flights[$id] = array(); |
|
| 271 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 272 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 273 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 274 | - if (!isset($line['id'])) { |
|
| 270 | + $this->all_flights[$id] = array(); |
|
| 271 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 272 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 273 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 274 | + if (!isset($line['id'])) { |
|
| 275 | 275 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 276 | 276 | // 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'))); |
| 277 | 277 | // 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'))); |
| 278 | 278 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 279 | - //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 280 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 281 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 279 | + //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 280 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 281 | + if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 282 | 282 | } |
| 283 | 283 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 284 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 284 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | //print_r($this->all_flights); |
| 288 | 288 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 289 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 290 | - //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 289 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 290 | + //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
|
| 291 | 291 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 292 | - //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 293 | - 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 | + //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 293 | + 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') { |
|
| 294 | 294 | $timeelapsed = microtime(true); |
| 295 | 295 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 296 | - $Spotter = new Spotter($this->db); |
|
| 297 | - if (isset($this->all_flights[$id]['source_type'])) { |
|
| 296 | + $Spotter = new Spotter($this->db); |
|
| 297 | + if (isset($this->all_flights[$id]['source_type'])) { |
|
| 298 | 298 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
| 299 | - } else { |
|
| 299 | + } else { |
|
| 300 | 300 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 301 | - } |
|
| 302 | - $Spotter->db = null; |
|
| 303 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 304 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 301 | + } |
|
| 302 | + $Spotter->db = null; |
|
| 303 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 304 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 305 | 305 | } |
| 306 | - } |
|
| 307 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 308 | - if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 306 | + } |
|
| 307 | + if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 308 | + if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 309 | 309 | } |
| 310 | - if (isset($line['id']) && !isset($line['hex'])) { |
|
| 311 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
|
| 312 | - } |
|
| 310 | + if (isset($line['id']) && !isset($line['hex'])) { |
|
| 311 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
|
| 312 | + } |
|
| 313 | 313 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 314 | 314 | $icao = $line['aircraft_icao']; |
| 315 | 315 | $Spotter = new Spotter($this->db); |
@@ -338,9 +338,9 @@ discard block |
||
| 338 | 338 | } |
| 339 | 339 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 340 | 340 | if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
| 341 | - if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
| 341 | + if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
|
| 342 | 342 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 343 | - } else { |
|
| 343 | + } else { |
|
| 344 | 344 | 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"; |
| 345 | 345 | 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"; |
| 346 | 346 | /* |
@@ -349,7 +349,7 @@ discard block |
||
| 349 | 349 | print_r($line); |
| 350 | 350 | */ |
| 351 | 351 | return ''; |
| 352 | - } |
|
| 352 | + } |
|
| 353 | 353 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 354 | 354 | if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n"; |
| 355 | 355 | return ''; |
@@ -366,21 +366,21 @@ discard block |
||
| 366 | 366 | } |
| 367 | 367 | |
| 368 | 368 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 369 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 369 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 370 | 370 | } |
| 371 | 371 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 372 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 372 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 373 | 373 | } |
| 374 | 374 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 375 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 375 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 376 | 376 | } |
| 377 | 377 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 378 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 378 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 379 | 379 | } |
| 380 | 380 | |
| 381 | 381 | 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'])) { |
| 382 | 382 | |
| 383 | - if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 383 | + if ($this->all_flights[$id]['addedSpotter'] == 1) { |
|
| 384 | 384 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 385 | 385 | if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
| 386 | 386 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
@@ -389,23 +389,23 @@ discard block |
||
| 389 | 389 | elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 390 | 390 | 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'])); |
| 391 | 391 | } else { |
| 392 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 393 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 392 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 393 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 394 | 394 | $timeelapsed = microtime(true); |
| 395 | - $Spotter = new Spotter($this->db); |
|
| 396 | - $fromsource = NULL; |
|
| 397 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 398 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 395 | + $Spotter = new Spotter($this->db); |
|
| 396 | + $fromsource = NULL; |
|
| 397 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 398 | + elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 399 | 399 | elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
| 400 | 400 | elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
| 401 | 401 | elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
| 402 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 402 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 403 | 403 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 404 | 404 | $Spotter->db = null; |
| 405 | 405 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 406 | - } |
|
| 406 | + } |
|
| 407 | 407 | } |
| 408 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 408 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 409 | 409 | |
| 410 | 410 | /* |
| 411 | 411 | if (!isset($line['id'])) { |
@@ -415,102 +415,102 @@ discard block |
||
| 415 | 415 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 416 | 416 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 417 | 417 | */ |
| 418 | - 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'])); |
|
| 418 | + 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'])); |
|
| 419 | 419 | |
| 420 | - //$putinarchive = true; |
|
| 421 | - if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
| 420 | + //$putinarchive = true; |
|
| 421 | + if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
|
| 422 | 422 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
| 423 | - } |
|
| 424 | - if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
| 423 | + } |
|
| 424 | + if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
|
| 425 | 425 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
| 426 | - } |
|
| 427 | - if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
| 428 | - $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' => '')); |
|
| 429 | - } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
| 426 | + } |
|
| 427 | + if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
|
| 428 | + $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' => '')); |
|
| 429 | + } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
|
| 430 | 430 | $timeelapsed = microtime(true); |
| 431 | 431 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 432 | 432 | $Spotter = new Spotter($this->db); |
| 433 | 433 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 434 | 434 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 435 | - $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' => '')); |
|
| 435 | + $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' => '')); |
|
| 436 | 436 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 437 | - } |
|
| 438 | - } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
| 437 | + } |
|
| 438 | + } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
|
| 439 | 439 | $timeelapsed = microtime(true); |
| 440 | 440 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 441 | - $Spotter = new Spotter($this->db); |
|
| 442 | - $route = $Spotter->getRouteInfo(trim($line['ident'])); |
|
| 443 | - if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) { |
|
| 441 | + $Spotter = new Spotter($this->db); |
|
| 442 | + $route = $Spotter->getRouteInfo(trim($line['ident'])); |
|
| 443 | + if (!isset($route['fromairport_icao']) && !isset($route['toairport_icao'])) { |
|
| 444 | 444 | $Translation = new Translation($this->db); |
| 445 | 445 | $ident = $Translation->checkTranslation(trim($line['ident'])); |
| 446 | 446 | $route = $Spotter->getRouteInfo($ident); |
| 447 | 447 | $Translation->db = null; |
| 448 | - } |
|
| 449 | - $Spotter->db = null; |
|
| 450 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 451 | - } |
|
| 448 | + } |
|
| 449 | + $Spotter->db = null; |
|
| 450 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 451 | + } |
|
| 452 | 452 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 453 | - //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
| 454 | - if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
| 453 | + //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
|
| 454 | + if ($route['fromairport_icao'] != $route['toairport_icao']) { |
|
| 455 | 455 | // $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'])); |
| 456 | - $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'])); |
|
| 457 | - } |
|
| 456 | + $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'])); |
|
| 457 | + } |
|
| 458 | 458 | } |
| 459 | 459 | if (!isset($globalFork)) $globalFork = TRUE; |
| 460 | 460 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 461 | 461 | if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
| 462 | 462 | } |
| 463 | - } |
|
| 463 | + } |
|
| 464 | 464 | } |
| 465 | 465 | |
| 466 | 466 | if (isset($line['speed']) && $line['speed'] != '') { |
| 467 | 467 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 468 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 469 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 470 | - //$dataFound = true; |
|
| 468 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 469 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 470 | + //$dataFound = true; |
|
| 471 | 471 | } 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'])) { |
| 472 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 473 | - if ($distance > 1000 && $distance < 10000) { |
|
| 474 | - // use datetime |
|
| 472 | + $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 473 | + if ($distance > 1000 && $distance < 10000) { |
|
| 474 | + // use datetime |
|
| 475 | 475 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 476 | 476 | $speed = $speed*3.6; |
| 477 | 477 | if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
| 478 | 478 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 479 | - } |
|
| 480 | - } |
|
| 481 | - |
|
| 482 | - |
|
| 483 | - |
|
| 484 | - if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) { |
|
| 485 | - if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) { |
|
| 486 | - if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
| 487 | - return false; |
|
| 488 | - } |
|
| 489 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 490 | - else unset($timediff); |
|
| 491 | - if ($this->tmd > 5 |
|
| 492 | - || (isset($line['format_source']) |
|
| 493 | - && $line['format_source'] == 'airwhere' |
|
| 494 | - && ((!isset($this->all_flights[$id]['latitude']) |
|
| 495 | - || !isset($this->all_flights[$id]['longitude'])) |
|
| 496 | - || (isset($this->all_flights[$id]['latitude']) |
|
| 497 | - && isset($this->all_flights[$id]['longitude']) |
|
| 498 | - && $this->all_flights[$id]['latitude'] != $line['latitude'] |
|
| 499 | - && $this->all_flights[$id]['longitude'] != $line['longitude']))) |
|
| 500 | - || (isset($globalVA) && $globalVA) |
|
| 501 | - || (isset($globalIVAO) && $globalIVAO) |
|
| 502 | - || (isset($globalVATSIM) && $globalVATSIM) |
|
| 503 | - || (isset($globalphpVMS) && $globalphpVMS) |
|
| 504 | - || (isset($globalVAM) && $globalVAM) |
|
| 505 | - || !isset($timediff) |
|
| 506 | - || $timediff > 2000 |
|
| 507 | - || ($timediff > 30 |
|
| 508 | - && isset($this->all_flights[$id]['latitude']) |
|
| 509 | - && isset($this->all_flights[$id]['longitude']) |
|
| 510 | - && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
|
| 479 | + } |
|
| 480 | + } |
|
| 481 | + |
|
| 482 | + |
|
| 483 | + |
|
| 484 | + if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) { |
|
| 485 | + if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) { |
|
| 486 | + if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
| 487 | + return false; |
|
| 488 | + } |
|
| 489 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 490 | + else unset($timediff); |
|
| 491 | + if ($this->tmd > 5 |
|
| 492 | + || (isset($line['format_source']) |
|
| 493 | + && $line['format_source'] == 'airwhere' |
|
| 494 | + && ((!isset($this->all_flights[$id]['latitude']) |
|
| 495 | + || !isset($this->all_flights[$id]['longitude'])) |
|
| 496 | + || (isset($this->all_flights[$id]['latitude']) |
|
| 497 | + && isset($this->all_flights[$id]['longitude']) |
|
| 498 | + && $this->all_flights[$id]['latitude'] != $line['latitude'] |
|
| 499 | + && $this->all_flights[$id]['longitude'] != $line['longitude']))) |
|
| 500 | + || (isset($globalVA) && $globalVA) |
|
| 501 | + || (isset($globalIVAO) && $globalIVAO) |
|
| 502 | + || (isset($globalVATSIM) && $globalVATSIM) |
|
| 503 | + || (isset($globalphpVMS) && $globalphpVMS) |
|
| 504 | + || (isset($globalVAM) && $globalVAM) |
|
| 505 | + || !isset($timediff) |
|
| 506 | + || $timediff > 2000 |
|
| 507 | + || ($timediff > 30 |
|
| 508 | + && isset($this->all_flights[$id]['latitude']) |
|
| 509 | + && isset($this->all_flights[$id]['longitude']) |
|
| 510 | + && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
|
| 511 | 511 | |
| 512 | 512 | 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'])) { |
| 513 | - if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) |
|
| 513 | + if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) |
|
| 514 | 514 | || (isset($line['format_source']) && $line['format_source'] == 'airwhere') |
| 515 | 515 | || !$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'])) { |
| 516 | 516 | |
@@ -519,9 +519,9 @@ discard block |
||
| 519 | 519 | $this->all_flights[$id]['putinarchive'] = true; |
| 520 | 520 | $this->tmd = 0; |
| 521 | 521 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 522 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 523 | - $timeelapsed = microtime(true); |
|
| 524 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 522 | + if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 523 | + $timeelapsed = microtime(true); |
|
| 524 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 525 | 525 | $Spotter = new Spotter($this->db); |
| 526 | 526 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 527 | 527 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
@@ -529,18 +529,18 @@ discard block |
||
| 529 | 529 | $Spotter->db = null; |
| 530 | 530 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 531 | 531 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 532 | - } |
|
| 532 | + } |
|
| 533 | + } |
|
| 533 | 534 | } |
| 534 | - } |
|
| 535 | 535 | } |
| 536 | 536 | |
| 537 | 537 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 538 | - //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) { |
|
| 538 | + //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) { |
|
| 539 | 539 | if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 540 | 540 | if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001) { |
| 541 | - $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
| 542 | - $dataFound = true; |
|
| 543 | - $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 541 | + $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
|
| 542 | + $dataFound = true; |
|
| 543 | + $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 544 | 544 | } |
| 545 | 545 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 546 | 546 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
@@ -551,20 +551,20 @@ discard block |
||
| 551 | 551 | //$putinarchive = true; |
| 552 | 552 | } |
| 553 | 553 | */ |
| 554 | - /* |
|
| 554 | + /* |
|
| 555 | 555 | } elseif (isset($this->all_flights[$id]['latitude'])) { |
| 556 | 556 | 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"; |
| 557 | 557 | } |
| 558 | 558 | */ |
| 559 | 559 | } |
| 560 | 560 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 561 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 562 | - //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) { |
|
| 561 | + if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 562 | + //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) { |
|
| 563 | 563 | if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 564 | 564 | if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001) { |
| 565 | - $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
| 566 | - $dataFound = true; |
|
| 567 | - $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 565 | + $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
|
| 566 | + $dataFound = true; |
|
| 567 | + $this->all_flights[$id]['time_last_coord'] = time(); |
|
| 568 | 568 | } |
| 569 | 569 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 570 | 570 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
@@ -582,77 +582,77 @@ discard block |
||
| 582 | 582 | */ |
| 583 | 583 | } |
| 584 | 584 | |
| 585 | - } else if ($globalDebug && $timediff > 30) { |
|
| 585 | + } else if ($globalDebug && $timediff > 30) { |
|
| 586 | 586 | $this->tmd = $this->tmd + 1; |
| 587 | 587 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 588 | 588 | echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
| 589 | 589 | echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
| 590 | 590 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 591 | - } |
|
| 591 | + } |
|
| 592 | 592 | } |
| 593 | 593 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 594 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 595 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 594 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 595 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 596 | 596 | } |
| 597 | 597 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 598 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 599 | - //$dataFound = true; |
|
| 598 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 599 | + //$dataFound = true; |
|
| 600 | 600 | } |
| 601 | 601 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 602 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 602 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 603 | 603 | } |
| 604 | 604 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 605 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 605 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 606 | 606 | } |
| 607 | 607 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 608 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 609 | - //$dataFound = true; |
|
| 608 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 609 | + //$dataFound = true; |
|
| 610 | 610 | } |
| 611 | 611 | if (isset($line['ground']) && $line['ground'] != '') { |
| 612 | - if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
| 612 | + if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
|
| 613 | 613 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 614 | 614 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 615 | 615 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 616 | 616 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
| 617 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 617 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 618 | 618 | 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'])); |
| 619 | - } |
|
| 620 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 621 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 622 | - //$dataFound = true; |
|
| 619 | + } |
|
| 620 | + if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 621 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 622 | + //$dataFound = true; |
|
| 623 | 623 | } |
| 624 | 624 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 625 | - 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'])) { |
|
| 626 | - if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 627 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 628 | - $highlight = ''; |
|
| 629 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 630 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 631 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 632 | - if ($highlight != '') { |
|
| 625 | + 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'])) { |
|
| 626 | + if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 627 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 628 | + $highlight = ''; |
|
| 629 | + if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 630 | + if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 631 | + if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 632 | + if ($highlight != '') { |
|
| 633 | 633 | $timeelapsed = microtime(true); |
| 634 | 634 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 635 | - $Spotter = new Spotter($this->db); |
|
| 636 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 637 | - $Spotter->db = null; |
|
| 638 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 635 | + $Spotter = new Spotter($this->db); |
|
| 636 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 637 | + $Spotter->db = null; |
|
| 638 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 639 | 639 | } |
| 640 | 640 | //$putinarchive = true; |
| 641 | 641 | //$highlight = ''; |
| 642 | - } |
|
| 642 | + } |
|
| 643 | 643 | |
| 644 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 645 | - //$dataFound = true; |
|
| 644 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 645 | + //$dataFound = true; |
|
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 649 | - //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 649 | + //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
|
| 650 | 650 | 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; |
| 651 | 651 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
| 652 | 652 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
| 653 | 653 | //$dataFound = true; |
| 654 | - //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 655 | - if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
|
| 654 | + //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
|
| 655 | + if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
|
| 656 | 656 | if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 657 | 657 | if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
| 658 | 658 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
@@ -661,27 +661,27 @@ discard block |
||
| 661 | 661 | elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 662 | 662 | 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'])); |
| 663 | 663 | } |
| 664 | - } |
|
| 665 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
| 664 | + } |
|
| 665 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
| 666 | 666 | } |
| 667 | 667 | |
| 668 | 668 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 669 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 669 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 670 | 670 | } |
| 671 | 671 | |
| 672 | 672 | if (isset($line['heading']) && $line['heading'] != '') { |
| 673 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 674 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 675 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 676 | - //$dataFound = true; |
|
| 673 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 674 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 675 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 676 | + //$dataFound = true; |
|
| 677 | 677 | } 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']) { |
| 678 | - $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']); |
|
| 679 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 680 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 681 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
|
| 678 | + $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']); |
|
| 679 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 680 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 681 | + if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
|
| 682 | 682 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 683 | - // If not enough messages and ACARS set heading to 0 |
|
| 684 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 683 | + // If not enough messages and ACARS set heading to 0 |
|
| 684 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 685 | 685 | } |
| 686 | 686 | if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
| 687 | 687 | elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
@@ -694,125 +694,125 @@ discard block |
||
| 694 | 694 | //if ($dataFound === true && isset($this->all_flights[$id]['hex']) && $this->all_flights[$id]['heading'] != '' && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 695 | 695 | //if ($dataFound === true && isset($this->all_flights[$id]['hex'])) { |
| 696 | 696 | if ($dataFound === true && isset($this->all_flights[$id]['id'])) { |
| 697 | - $this->all_flights[$id]['lastupdate'] = time(); |
|
| 698 | - if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
| 699 | - 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'])) { |
|
| 700 | - //print_r($this->all_flights); |
|
| 701 | - //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
| 702 | - //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
| 703 | - if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
|
| 697 | + $this->all_flights[$id]['lastupdate'] = time(); |
|
| 698 | + if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
|
| 699 | + 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'])) { |
|
| 700 | + //print_r($this->all_flights); |
|
| 701 | + //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
|
| 702 | + //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
|
| 703 | + if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
|
| 704 | 704 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 705 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 706 | - $timeelapsed = microtime(true); |
|
| 707 | - $SpotterLive = new SpotterLive($this->db); |
|
| 708 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 705 | + if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 706 | + $timeelapsed = microtime(true); |
|
| 707 | + $SpotterLive = new SpotterLive($this->db); |
|
| 708 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 709 | 709 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 710 | 710 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 711 | - } elseif (isset($line['id'])) { |
|
| 711 | + } elseif (isset($line['id'])) { |
|
| 712 | 712 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 713 | 713 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 714 | - } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
| 714 | + } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
|
| 715 | 715 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 716 | 716 | if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
| 717 | - } else $recent_ident = ''; |
|
| 718 | - $SpotterLive->db=null; |
|
| 719 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 720 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 717 | + } else $recent_ident = ''; |
|
| 718 | + $SpotterLive->db=null; |
|
| 719 | + if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 720 | + elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 721 | 721 | } else $recent_ident = ''; |
| 722 | - } else { |
|
| 722 | + } else { |
|
| 723 | 723 | $recent_ident = ''; |
| 724 | 724 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
| 725 | - } |
|
| 726 | - //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 727 | - if($recent_ident == "") |
|
| 728 | - { |
|
| 725 | + } |
|
| 726 | + //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
|
| 727 | + if($recent_ident == "") |
|
| 728 | + { |
|
| 729 | 729 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 730 | 730 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 731 | 731 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 732 | 732 | //adds the spotter data for the archive |
| 733 | 733 | $ignoreImport = false; |
| 734 | 734 | foreach($globalAirportIgnore as $airportIgnore) { |
| 735 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 735 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 736 | 736 | $ignoreImport = true; |
| 737 | - } |
|
| 737 | + } |
|
| 738 | 738 | } |
| 739 | 739 | if (count($globalAirportAccept) > 0) { |
| 740 | - $ignoreImport = true; |
|
| 741 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 740 | + $ignoreImport = true; |
|
| 741 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 742 | 742 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 743 | - $ignoreImport = false; |
|
| 743 | + $ignoreImport = false; |
|
| 744 | + } |
|
| 744 | 745 | } |
| 745 | - } |
|
| 746 | 746 | } |
| 747 | 747 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 748 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 748 | + foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 749 | 749 | 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)) { |
| 750 | - $ignoreImport = true; |
|
| 750 | + $ignoreImport = true; |
|
| 751 | + } |
|
| 751 | 752 | } |
| 752 | - } |
|
| 753 | 753 | } |
| 754 | 754 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 755 | - $ignoreImport = true; |
|
| 756 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 755 | + $ignoreImport = true; |
|
| 756 | + foreach($globalAirlineAccept as $airlineAccept) { |
|
| 757 | 757 | 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)) { |
| 758 | - $ignoreImport = false; |
|
| 758 | + $ignoreImport = false; |
|
| 759 | + } |
|
| 759 | 760 | } |
| 760 | - } |
|
| 761 | 761 | } |
| 762 | 762 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 763 | - $ignoreImport = true; |
|
| 764 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 763 | + $ignoreImport = true; |
|
| 764 | + foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 765 | 765 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 766 | - $ignoreImport = false; |
|
| 766 | + $ignoreImport = false; |
|
| 767 | + } |
|
| 767 | 768 | } |
| 768 | - } |
|
| 769 | 769 | } |
| 770 | 770 | |
| 771 | 771 | if (!$ignoreImport) { |
| 772 | - $highlight = ''; |
|
| 773 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 774 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 775 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 776 | - 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'))); |
|
| 777 | - $timeelapsed = microtime(true); |
|
| 778 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 772 | + $highlight = ''; |
|
| 773 | + if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 774 | + if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 775 | + if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 776 | + 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'))); |
|
| 777 | + $timeelapsed = microtime(true); |
|
| 778 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 779 | 779 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 780 | - $Spotter = new Spotter($this->db); |
|
| 781 | - $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']); |
|
| 782 | - $Spotter->db = null; |
|
| 783 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 780 | + $Spotter = new Spotter($this->db); |
|
| 781 | + $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']); |
|
| 782 | + $Spotter->db = null; |
|
| 783 | + if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 784 | 784 | } |
| 785 | - } |
|
| 786 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 787 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 785 | + } |
|
| 786 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 787 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 788 | 788 | |
| 789 | - // Add source stat in DB |
|
| 790 | - $Stats = new Stats($this->db); |
|
| 791 | - if (!empty($this->stats)) { |
|
| 789 | + // Add source stat in DB |
|
| 790 | + $Stats = new Stats($this->db); |
|
| 791 | + if (!empty($this->stats)) { |
|
| 792 | 792 | if ($globalDebug) echo 'Add source stats : '; |
| 793 | - foreach($this->stats as $date => $data) { |
|
| 794 | - foreach($data as $source => $sourced) { |
|
| 795 | - //print_r($sourced); |
|
| 796 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 797 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 798 | - if (isset($sourced['msg'])) { |
|
| 799 | - if (time() - $sourced['msg']['date'] > 10) { |
|
| 800 | - $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 801 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 802 | - unset($this->stats[$date][$source]['msg']); |
|
| 803 | - } |
|
| 804 | - } |
|
| 805 | - } |
|
| 806 | - if ($date != date('Y-m-d')) { |
|
| 807 | - unset($this->stats[$date]); |
|
| 808 | - } |
|
| 809 | - } |
|
| 810 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 811 | - |
|
| 812 | - } |
|
| 813 | - $Stats->db = null; |
|
| 814 | - } |
|
| 815 | - $this->del(); |
|
| 793 | + foreach($this->stats as $date => $data) { |
|
| 794 | + foreach($data as $source => $sourced) { |
|
| 795 | + //print_r($sourced); |
|
| 796 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 797 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 798 | + if (isset($sourced['msg'])) { |
|
| 799 | + if (time() - $sourced['msg']['date'] > 10) { |
|
| 800 | + $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
|
| 801 | + echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 802 | + unset($this->stats[$date][$source]['msg']); |
|
| 803 | + } |
|
| 804 | + } |
|
| 805 | + } |
|
| 806 | + if ($date != date('Y-m-d')) { |
|
| 807 | + unset($this->stats[$date]); |
|
| 808 | + } |
|
| 809 | + } |
|
| 810 | + if ($globalDebug) echo 'Done'."\n"; |
|
| 811 | + |
|
| 812 | + } |
|
| 813 | + $Stats->db = null; |
|
| 814 | + } |
|
| 815 | + $this->del(); |
|
| 816 | 816 | } elseif ($globalDebug) echo 'Ignore data'."\n"; |
| 817 | 817 | //$ignoreImport = false; |
| 818 | 818 | $this->all_flights[$id]['addedSpotter'] = 1; |
@@ -830,41 +830,41 @@ discard block |
||
| 830 | 830 | */ |
| 831 | 831 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
| 832 | 832 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 833 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 834 | - //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
|
| 835 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 833 | + if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 834 | + //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
|
| 835 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 836 | 836 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 837 | - $SpotterLive = new SpotterLive($this->db); |
|
| 838 | - $SpotterLive->deleteLiveSpotterData(); |
|
| 839 | - $SpotterLive->db=null; |
|
| 837 | + $SpotterLive = new SpotterLive($this->db); |
|
| 838 | + $SpotterLive->deleteLiveSpotterData(); |
|
| 839 | + $SpotterLive->db=null; |
|
| 840 | 840 | } |
| 841 | - } |
|
| 842 | - if ($globalDebug) echo " Done\n"; |
|
| 843 | - $this->last_delete = time(); |
|
| 841 | + } |
|
| 842 | + if ($globalDebug) echo " Done\n"; |
|
| 843 | + $this->last_delete = time(); |
|
| 844 | 844 | } |
| 845 | - } else { |
|
| 845 | + } else { |
|
| 846 | 846 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) { |
| 847 | - $this->all_flights[$id]['id'] = $recent_ident; |
|
| 848 | - $this->all_flights[$id]['addedSpotter'] = 1; |
|
| 847 | + $this->all_flights[$id]['id'] = $recent_ident; |
|
| 848 | + $this->all_flights[$id]['addedSpotter'] = 1; |
|
| 849 | 849 | } |
| 850 | 850 | if (isset($globalDaemon) && !$globalDaemon) { |
| 851 | - if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 851 | + if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
|
| 852 | 852 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 853 | - $Spotter = new Spotter($this->db); |
|
| 854 | - $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']); |
|
| 855 | - $Spotter->db = null; |
|
| 853 | + $Spotter = new Spotter($this->db); |
|
| 854 | + $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']); |
|
| 855 | + $Spotter->db = null; |
|
| 856 | + } |
|
| 856 | 857 | } |
| 857 | - } |
|
| 858 | 858 | } |
| 859 | 859 | |
| 860 | - } |
|
| 860 | + } |
|
| 861 | 861 | } |
| 862 | - } |
|
| 863 | - //adds the spotter LIVE data |
|
| 864 | - //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
|
| 865 | - //echo "\nAdd in Live !! \n"; |
|
| 866 | - //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"; |
|
| 867 | - if ($globalDebug) { |
|
| 862 | + } |
|
| 863 | + //adds the spotter LIVE data |
|
| 864 | + //SpotterLive->addLiveSpotterData($flightaware_id, $ident, $aircraft_type, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $heading, $groundspeed); |
|
| 865 | + //echo "\nAdd in Live !! \n"; |
|
| 866 | + //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"; |
|
| 867 | + if ($globalDebug) { |
|
| 868 | 868 | if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
| 869 | 869 | 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"; |
| 870 | 870 | 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"; |
@@ -872,60 +872,60 @@ discard block |
||
| 872 | 872 | 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"; |
| 873 | 873 | 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"; |
| 874 | 874 | } |
| 875 | - } |
|
| 876 | - $ignoreImport = false; |
|
| 877 | - if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
| 878 | - if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
| 875 | + } |
|
| 876 | + $ignoreImport = false; |
|
| 877 | + if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
|
| 878 | + if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
|
| 879 | 879 | |
| 880 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 881 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 882 | - $ignoreImport = true; |
|
| 880 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 881 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 882 | + $ignoreImport = true; |
|
| 883 | + } |
|
| 883 | 884 | } |
| 884 | - } |
|
| 885 | - if (count($globalAirportAccept) > 0) { |
|
| 886 | - $ignoreImport = true; |
|
| 887 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 888 | - if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 885 | + if (count($globalAirportAccept) > 0) { |
|
| 886 | + $ignoreImport = true; |
|
| 887 | + foreach($globalAirportIgnore as $airportIgnore) { |
|
| 888 | + if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
|
| 889 | 889 | $ignoreImport = false; |
| 890 | - } |
|
| 890 | + } |
|
| 891 | 891 | } |
| 892 | - } |
|
| 893 | - if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
| 892 | + } |
|
| 893 | + if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
|
| 894 | 894 | foreach($globalAirlineIgnore as $airlineIgnore) { |
| 895 | - 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)) { |
|
| 895 | + 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)) { |
|
| 896 | 896 | $ignoreImport = true; |
| 897 | - } |
|
| 897 | + } |
|
| 898 | + } |
|
| 898 | 899 | } |
| 899 | - } |
|
| 900 | - if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
| 900 | + if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
|
| 901 | 901 | $ignoreImport = true; |
| 902 | 902 | foreach($globalAirlineAccept as $airlineAccept) { |
| 903 | - 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)) { |
|
| 903 | + 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)) { |
|
| 904 | 904 | $ignoreImport = false; |
| 905 | - } |
|
| 905 | + } |
|
| 906 | 906 | } |
| 907 | - } |
|
| 908 | - if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
| 907 | + } |
|
| 908 | + if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
|
| 909 | 909 | $ignoreImport = true; |
| 910 | 910 | foreach($globalPilotIdAccept as $pilotIdAccept) { |
| 911 | - if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
| 912 | - $ignoreImport = false; |
|
| 913 | - } |
|
| 911 | + if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
|
| 912 | + $ignoreImport = false; |
|
| 913 | + } |
|
| 914 | + } |
|
| 914 | 915 | } |
| 915 | - } |
|
| 916 | 916 | |
| 917 | - if (!$ignoreImport) { |
|
| 917 | + if (!$ignoreImport) { |
|
| 918 | 918 | 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'])) { |
| 919 | 919 | 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'))); |
| 920 | 920 | $timeelapsed = microtime(true); |
| 921 | 921 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 922 | - if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 922 | + if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
|
| 923 | 923 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 924 | 924 | $SpotterLive = new SpotterLive($this->db); |
| 925 | 925 | $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']); |
| 926 | 926 | $SpotterLive->db = null; |
| 927 | 927 | if ($globalDebug) echo $result."\n"; |
| 928 | - } |
|
| 928 | + } |
|
| 929 | 929 | } |
| 930 | 930 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 931 | 931 | $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']); |
@@ -937,7 +937,7 @@ discard block |
||
| 937 | 937 | //if ($line['format_source'] != 'aprs') { |
| 938 | 938 | //if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt')) { |
| 939 | 939 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 940 | - if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 940 | + if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
|
| 941 | 941 | $source = $this->all_flights[$id]['source_name']; |
| 942 | 942 | if ($source == '') $source = $this->all_flights[$id]['format_source']; |
| 943 | 943 | if (!isset($this->source_location[$source])) { |
@@ -963,7 +963,7 @@ discard block |
||
| 963 | 963 | if ($stats_heading == 16) $stats_heading = 0; |
| 964 | 964 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 965 | 965 | for ($i=0;$i<=15;$i++) { |
| 966 | - $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 966 | + $this->stats[$current_date][$source]['polar'][$i] = 0; |
|
| 967 | 967 | } |
| 968 | 968 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
| 969 | 969 | } else { |
@@ -976,17 +976,17 @@ discard block |
||
| 976 | 976 | //var_dump($this->stats); |
| 977 | 977 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 978 | 978 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 979 | - end($this->stats[$current_date][$source]['hist']); |
|
| 980 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 979 | + end($this->stats[$current_date][$source]['hist']); |
|
| 980 | + $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 981 | 981 | } else $mini = 0; |
| 982 | 982 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 983 | - $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 983 | + $this->stats[$current_date][$source]['hist'][$i] = 0; |
|
| 984 | 984 | } |
| 985 | 985 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
| 986 | 986 | } else { |
| 987 | 987 | $this->stats[$current_date][$source]['hist'][$distance] += 1; |
| 988 | 988 | } |
| 989 | - } |
|
| 989 | + } |
|
| 990 | 990 | } |
| 991 | 991 | |
| 992 | 992 | $this->all_flights[$id]['lastupdate'] = time(); |
@@ -996,7 +996,7 @@ discard block |
||
| 996 | 996 | //$this->del(); |
| 997 | 997 | |
| 998 | 998 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 999 | - if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 999 | + if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
|
| 1000 | 1000 | if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
| 1001 | 1001 | $SpotterLive = new SpotterLive($this->db); |
| 1002 | 1002 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
@@ -1004,19 +1004,19 @@ discard block |
||
| 1004 | 1004 | //SpotterLive->deleteLiveSpotterData(); |
| 1005 | 1005 | if ($globalDebug) echo " Done\n"; |
| 1006 | 1006 | $this->last_delete_hourly = time(); |
| 1007 | - } else { |
|
| 1007 | + } else { |
|
| 1008 | 1008 | $this->del(); |
| 1009 | 1009 | $this->last_delete_hourly = time(); |
| 1010 | - } |
|
| 1010 | + } |
|
| 1011 | 1011 | } |
| 1012 | 1012 | |
| 1013 | - } |
|
| 1014 | - //$ignoreImport = false; |
|
| 1013 | + } |
|
| 1014 | + //$ignoreImport = false; |
|
| 1015 | 1015 | } |
| 1016 | 1016 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 1017 | 1017 | if ($send) return $this->all_flights[$id]; |
| 1018 | - } |
|
| 1018 | + } |
|
| 1019 | + } |
|
| 1019 | 1020 | } |
| 1020 | - } |
|
| 1021 | 1021 | } |
| 1022 | 1022 | ?> |
@@ -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()-5900)) { |
|
| 187 | + if ($flight['lastupdate'] < (time() - 5900)) { |
|
| 188 | 188 | $this->delKey($key); |
| 189 | 189 | } |
| 190 | 190 | } |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | $real_arrival = $this->arrival($key); |
| 201 | 201 | $Spotter = new Spotter($this->db); |
| 202 | 202 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 203 | - $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']); |
|
| 203 | + $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']); |
|
| 204 | 204 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 205 | 205 | } |
| 206 | 206 | } |
@@ -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['hex'])) $line['hex'] = strtoupper($line['hex']); |
| 239 | 239 | 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)) { |
@@ -268,25 +268,25 @@ discard block |
||
| 268 | 268 | |
| 269 | 269 | if (!isset($this->all_flights[$id])) { |
| 270 | 270 | $this->all_flights[$id] = array(); |
| 271 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 272 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 273 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 271 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 272 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'altitude_previous' => '', 'heading' => '', 'departure_airport_time' => '', 'arrival_airport_time' => '', 'squawk' => '', 'route_stop' => '', 'registration' => '', 'pilot_id' => '', 'pilot_name' => '', 'waypoints' => '', 'ground' => '0', 'format_source' => '', 'source_name' => '', 'over_country' => '', 'verticalrate' => '', 'noarchive' => false, 'putinarchive' => true, 'source_type' => '')); |
|
| 273 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time())); |
|
| 274 | 274 | if (!isset($line['id'])) { |
| 275 | 275 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 276 | 276 | // 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'))); |
| 277 | 277 | // 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'))); |
| 278 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 278 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 279 | 279 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 280 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 280 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 281 | 281 | if ($globalAllFlights !== FALSE) $dataFound = true; |
| 282 | 282 | } |
| 283 | 283 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 284 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 284 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type'])); |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | //print_r($this->all_flights); |
| 288 | 288 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 289 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 289 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex']))); |
|
| 290 | 290 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 291 | 291 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 292 | 292 | //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
@@ -295,27 +295,27 @@ discard block |
||
| 295 | 295 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 296 | 296 | $Spotter = new Spotter($this->db); |
| 297 | 297 | if (isset($this->all_flights[$id]['source_type'])) { |
| 298 | - $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
|
| 298 | + $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']); |
|
| 299 | 299 | } else { |
| 300 | 300 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 301 | 301 | } |
| 302 | 302 | $Spotter->db = null; |
| 303 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 304 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 303 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 304 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 305 | 305 | } |
| 306 | 306 | } |
| 307 | 307 | if ($globalAllFlights !== FALSE) $dataFound = true; |
| 308 | 308 | if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
| 309 | 309 | } |
| 310 | 310 | if (isset($line['id']) && !isset($line['hex'])) { |
| 311 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
|
| 311 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => '')); |
|
| 312 | 312 | } |
| 313 | 313 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 314 | 314 | $icao = $line['aircraft_icao']; |
| 315 | 315 | $Spotter = new Spotter($this->db); |
| 316 | 316 | if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
| 317 | 317 | $Spotter->db = null; |
| 318 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
|
| 318 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao)); |
|
| 319 | 319 | } |
| 320 | 320 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) { |
| 321 | 321 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | $Spotter = new Spotter($this->db); |
| 324 | 324 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 325 | 325 | $Spotter->db = null; |
| 326 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 326 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 327 | 327 | } |
| 328 | 328 | } |
| 329 | 329 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
@@ -331,15 +331,15 @@ discard block |
||
| 331 | 331 | elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
| 332 | 332 | elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
| 333 | 333 | elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
| 334 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 334 | + if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 335 | 335 | } |
| 336 | 336 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
| 337 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
|
| 337 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA')); |
|
| 338 | 338 | } |
| 339 | 339 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 340 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 340 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 341 | 341 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 342 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
|
| 342 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime'])); |
|
| 343 | 343 | } else { |
| 344 | 344 | 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"; |
| 345 | 345 | 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"; |
@@ -350,32 +350,32 @@ discard block |
||
| 350 | 350 | */ |
| 351 | 351 | return ''; |
| 352 | 352 | } |
| 353 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 353 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 354 | 354 | if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n"; |
| 355 | 355 | return ''; |
| 356 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 356 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 357 | 357 | if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n |
| 358 | 358 | "; |
| 359 | 359 | return ''; |
| 360 | 360 | } elseif (!isset($line['datetime'])) { |
| 361 | 361 | date_default_timezone_set('UTC'); |
| 362 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 362 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 363 | 363 | } else { |
| 364 | 364 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 365 | 365 | return ''; |
| 366 | 366 | } |
| 367 | 367 | |
| 368 | 368 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 369 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 369 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration'])); |
|
| 370 | 370 | } |
| 371 | 371 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 372 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 372 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints'])); |
|
| 373 | 373 | } |
| 374 | 374 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 375 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => trim($line['pilot_id']))); |
|
| 375 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => trim($line['pilot_id']))); |
|
| 376 | 376 | } |
| 377 | 377 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 378 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => trim($line['pilot_name']))); |
|
| 378 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => trim($line['pilot_name']))); |
|
| 379 | 379 | } |
| 380 | 380 | |
| 381 | 381 | 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'])) { |
@@ -383,13 +383,13 @@ discard block |
||
| 383 | 383 | if ($this->all_flights[$id]['addedSpotter'] == 1) { |
| 384 | 384 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 385 | 385 | if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
| 386 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 387 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 388 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 389 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 390 | - 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'])); |
|
| 386 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 387 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 388 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 389 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 390 | + 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'])); |
|
| 391 | 391 | } else { |
| 392 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 392 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
| 393 | 393 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 394 | 394 | $timeelapsed = microtime(true); |
| 395 | 395 | $Spotter = new Spotter($this->db); |
@@ -399,13 +399,13 @@ discard block |
||
| 399 | 399 | elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
| 400 | 400 | elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
| 401 | 401 | elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
| 402 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 402 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource); |
|
| 403 | 403 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 404 | 404 | $Spotter->db = null; |
| 405 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 405 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 406 | 406 | } |
| 407 | 407 | } |
| 408 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 408 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
| 409 | 409 | |
| 410 | 410 | /* |
| 411 | 411 | if (!isset($line['id'])) { |
@@ -415,25 +415,25 @@ discard block |
||
| 415 | 415 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 416 | 416 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 417 | 417 | */ |
| 418 | - 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'])); |
|
| 418 | + 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'])); |
|
| 419 | 419 | |
| 420 | 420 | //$putinarchive = true; |
| 421 | 421 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
| 422 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 422 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 423 | 423 | } |
| 424 | 424 | if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
| 425 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 425 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 426 | 426 | } |
| 427 | 427 | if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
| 428 | - $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' => '')); |
|
| 428 | + $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' => '')); |
|
| 429 | 429 | } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
| 430 | 430 | $timeelapsed = microtime(true); |
| 431 | 431 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 432 | 432 | $Spotter = new Spotter($this->db); |
| 433 | 433 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 434 | 434 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 435 | - $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' => '')); |
|
| 436 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 435 | + $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' => '')); |
|
| 436 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 437 | 437 | } |
| 438 | 438 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 439 | 439 | $timeelapsed = microtime(true); |
@@ -447,34 +447,34 @@ discard block |
||
| 447 | 447 | $Translation->db = null; |
| 448 | 448 | } |
| 449 | 449 | $Spotter->db = null; |
| 450 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 450 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 451 | 451 | } |
| 452 | 452 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 453 | 453 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
| 454 | 454 | if ($route['fromairport_icao'] != $route['toairport_icao']) { |
| 455 | 455 | // $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'])); |
| 456 | - $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'])); |
|
| 456 | + $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'])); |
|
| 457 | 457 | } |
| 458 | 458 | } |
| 459 | 459 | if (!isset($globalFork)) $globalFork = TRUE; |
| 460 | 460 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 461 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 461 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident'])); |
|
| 462 | 462 | } |
| 463 | 463 | } |
| 464 | 464 | } |
| 465 | 465 | |
| 466 | 466 | if (isset($line['speed']) && $line['speed'] != '') { |
| 467 | 467 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 468 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 469 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 468 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed']))); |
|
| 469 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true)); |
|
| 470 | 470 | //$dataFound = true; |
| 471 | 471 | } 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'])) { |
| 472 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 472 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'); |
|
| 473 | 473 | if ($distance > 1000 && $distance < 10000) { |
| 474 | 474 | // use datetime |
| 475 | 475 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 476 | 476 | $speed = $speed*3.6; |
| 477 | - if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 477 | + if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed))); |
|
| 478 | 478 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 479 | 479 | } |
| 480 | 480 | } |
@@ -486,7 +486,7 @@ discard block |
||
| 486 | 486 | if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
| 487 | 487 | return false; |
| 488 | 488 | } |
| 489 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 489 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']); |
|
| 490 | 490 | else unset($timediff); |
| 491 | 491 | if ($this->tmd > 5 |
| 492 | 492 | || (isset($line['format_source']) |
@@ -507,12 +507,12 @@ discard block |
||
| 507 | 507 | || ($timediff > 30 |
| 508 | 508 | && isset($this->all_flights[$id]['latitude']) |
| 509 | 509 | && isset($this->all_flights[$id]['longitude']) |
| 510 | - && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
|
| 510 | + && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')))) { |
|
| 511 | 511 | |
| 512 | 512 | 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'])) { |
| 513 | 513 | if ((isset($timediff) && $timediff > $globalAircraftMaxUpdate) |
| 514 | 514 | || (isset($line['format_source']) && $line['format_source'] == 'airwhere') |
| 515 | - || !$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'])) { |
|
| 515 | + || !$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'])) { |
|
| 516 | 516 | |
| 517 | 517 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 518 | 518 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
@@ -523,11 +523,11 @@ discard block |
||
| 523 | 523 | $timeelapsed = microtime(true); |
| 524 | 524 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 525 | 525 | $Spotter = new Spotter($this->db); |
| 526 | - $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 526 | + $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 527 | 527 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
| 528 | 528 | else $this->all_flights[$id]['over_country'] = ''; |
| 529 | 529 | $Spotter->db = null; |
| 530 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 530 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 531 | 531 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 532 | 532 | } |
| 533 | 533 | } |
@@ -537,13 +537,13 @@ discard block |
||
| 537 | 537 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 538 | 538 | //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) { |
| 539 | 539 | if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 540 | - if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001) { |
|
| 540 | + if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > 0.0001) { |
|
| 541 | 541 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 542 | 542 | $dataFound = true; |
| 543 | 543 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 544 | 544 | } |
| 545 | 545 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 546 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
|
| 546 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude'])); |
|
| 547 | 547 | /* |
| 548 | 548 | if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) { |
| 549 | 549 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
@@ -561,13 +561,13 @@ discard block |
||
| 561 | 561 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 562 | 562 | //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) { |
| 563 | 563 | if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 564 | - if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001) { |
|
| 564 | + if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > 0.0001) { |
|
| 565 | 565 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 566 | 566 | $dataFound = true; |
| 567 | 567 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 568 | 568 | } |
| 569 | 569 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 570 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
|
| 570 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude'])); |
|
| 571 | 571 | /* |
| 572 | 572 | if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) { |
| 573 | 573 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
@@ -585,46 +585,46 @@ discard block |
||
| 585 | 585 | } else if ($globalDebug && $timediff > 30) { |
| 586 | 586 | $this->tmd = $this->tmd + 1; |
| 587 | 587 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 588 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
|
| 589 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 588 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -"; |
|
| 589 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 590 | 590 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 591 | 591 | } |
| 592 | 592 | } |
| 593 | 593 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 594 | 594 | if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 595 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 595 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update'])); |
|
| 596 | 596 | } |
| 597 | 597 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 598 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 598 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate'])); |
|
| 599 | 599 | //$dataFound = true; |
| 600 | 600 | } |
| 601 | 601 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 602 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 602 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source'])); |
|
| 603 | 603 | } |
| 604 | 604 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 605 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 605 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name'])); |
|
| 606 | 606 | } |
| 607 | 607 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 608 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 608 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency'])); |
|
| 609 | 609 | //$dataFound = true; |
| 610 | 610 | } |
| 611 | 611 | if (isset($line['ground']) && $line['ground'] != '') { |
| 612 | 612 | if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
| 613 | 613 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 614 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 615 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 616 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 617 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 618 | - 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'])); |
|
| 614 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 615 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 616 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 617 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 618 | + 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'])); |
|
| 619 | 619 | } |
| 620 | 620 | if ($line['ground'] != 1) $line['ground'] = 0; |
| 621 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 621 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground'])); |
|
| 622 | 622 | //$dataFound = true; |
| 623 | 623 | } |
| 624 | 624 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 625 | 625 | 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'])) { |
| 626 | 626 | if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
| 627 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 627 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 628 | 628 | $highlight = ''; |
| 629 | 629 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
| 630 | 630 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
@@ -633,59 +633,59 @@ discard block |
||
| 633 | 633 | $timeelapsed = microtime(true); |
| 634 | 634 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 635 | 635 | $Spotter = new Spotter($this->db); |
| 636 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 636 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight); |
|
| 637 | 637 | $Spotter->db = null; |
| 638 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 638 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 639 | 639 | } |
| 640 | 640 | //$putinarchive = true; |
| 641 | 641 | //$highlight = ''; |
| 642 | 642 | } |
| 643 | 643 | |
| 644 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 644 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 645 | 645 | //$dataFound = true; |
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 649 | 649 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 650 | - 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; |
|
| 651 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
|
| 652 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
|
| 650 | + 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; |
|
| 651 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100))); |
|
| 652 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude'])); |
|
| 653 | 653 | //$dataFound = true; |
| 654 | 654 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 655 | 655 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
| 656 | 656 | if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 657 | 657 | if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
| 658 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 659 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 660 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 661 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 662 | - 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'])); |
|
| 658 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 659 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 660 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 661 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 662 | + 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'])); |
|
| 663 | 663 | } |
| 664 | 664 | } |
| 665 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
|
| 665 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_previous' => $line['altitude'])); |
|
| 666 | 666 | } |
| 667 | 667 | |
| 668 | 668 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 669 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 669 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true)); |
|
| 670 | 670 | } |
| 671 | 671 | |
| 672 | 672 | if (isset($line['heading']) && $line['heading'] != '') { |
| 673 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 674 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 675 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 673 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 674 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading']))); |
|
| 675 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true)); |
|
| 676 | 676 | //$dataFound = true; |
| 677 | 677 | } 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']) { |
| 678 | - $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']); |
|
| 679 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 680 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 678 | + $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']); |
|
| 679 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading))); |
|
| 680 | + if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 681 | 681 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
| 682 | 682 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 683 | 683 | // If not enough messages and ACARS set heading to 0 |
| 684 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 684 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0)); |
|
| 685 | 685 | } |
| 686 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 687 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 688 | - elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalMinupdate) $dataFound = false; |
|
| 686 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 687 | + elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 688 | + elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalMinupdate) $dataFound = false; |
|
| 689 | 689 | |
| 690 | 690 | // print_r($this->all_flights[$id]); |
| 691 | 691 | //gets the callsign from the last hour |
@@ -696,7 +696,7 @@ discard block |
||
| 696 | 696 | if ($dataFound === true && isset($this->all_flights[$id]['id'])) { |
| 697 | 697 | $this->all_flights[$id]['lastupdate'] = time(); |
| 698 | 698 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
| 699 | - 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'])) { |
|
| 699 | + 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'])) { |
|
| 700 | 700 | //print_r($this->all_flights); |
| 701 | 701 | //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
| 702 | 702 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
@@ -707,61 +707,61 @@ discard block |
||
| 707 | 707 | $SpotterLive = new SpotterLive($this->db); |
| 708 | 708 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
| 709 | 709 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 710 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 710 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 711 | 711 | } elseif (isset($line['id'])) { |
| 712 | 712 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 713 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 713 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 714 | 714 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 715 | 715 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 716 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 716 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 717 | 717 | } else $recent_ident = ''; |
| 718 | - $SpotterLive->db=null; |
|
| 718 | + $SpotterLive->db = null; |
|
| 719 | 719 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 720 | 720 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 721 | 721 | } else $recent_ident = ''; |
| 722 | 722 | } else { |
| 723 | 723 | $recent_ident = ''; |
| 724 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
|
| 724 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0)); |
|
| 725 | 725 | } |
| 726 | 726 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 727 | - if($recent_ident == "") |
|
| 727 | + if ($recent_ident == "") |
|
| 728 | 728 | { |
| 729 | 729 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 730 | 730 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 731 | 731 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 732 | 732 | //adds the spotter data for the archive |
| 733 | 733 | $ignoreImport = false; |
| 734 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 734 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 735 | 735 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 736 | 736 | $ignoreImport = true; |
| 737 | 737 | } |
| 738 | 738 | } |
| 739 | 739 | if (count($globalAirportAccept) > 0) { |
| 740 | 740 | $ignoreImport = true; |
| 741 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 741 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 742 | 742 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 743 | 743 | $ignoreImport = false; |
| 744 | 744 | } |
| 745 | 745 | } |
| 746 | 746 | } |
| 747 | 747 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 748 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 749 | - 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)) { |
|
| 748 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 749 | + 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)) { |
|
| 750 | 750 | $ignoreImport = true; |
| 751 | 751 | } |
| 752 | 752 | } |
| 753 | 753 | } |
| 754 | 754 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 755 | 755 | $ignoreImport = true; |
| 756 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 757 | - 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)) { |
|
| 756 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 757 | + 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)) { |
|
| 758 | 758 | $ignoreImport = false; |
| 759 | 759 | } |
| 760 | 760 | } |
| 761 | 761 | } |
| 762 | 762 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 763 | 763 | $ignoreImport = true; |
| 764 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 764 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 765 | 765 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 766 | 766 | $ignoreImport = false; |
| 767 | 767 | } |
@@ -773,32 +773,32 @@ discard block |
||
| 773 | 773 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
| 774 | 774 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
| 775 | 775 | if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
| 776 | - 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'))); |
|
| 776 | + 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'))); |
|
| 777 | 777 | $timeelapsed = microtime(true); |
| 778 | 778 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 779 | 779 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 780 | 780 | $Spotter = new Spotter($this->db); |
| 781 | - $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']); |
|
| 781 | + $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']); |
|
| 782 | 782 | $Spotter->db = null; |
| 783 | 783 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 784 | 784 | } |
| 785 | 785 | } |
| 786 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 786 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 787 | 787 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 788 | 788 | |
| 789 | 789 | // Add source stat in DB |
| 790 | 790 | $Stats = new Stats($this->db); |
| 791 | 791 | if (!empty($this->stats)) { |
| 792 | 792 | if ($globalDebug) echo 'Add source stats : '; |
| 793 | - foreach($this->stats as $date => $data) { |
|
| 794 | - foreach($data as $source => $sourced) { |
|
| 793 | + foreach ($this->stats as $date => $data) { |
|
| 794 | + foreach ($data as $source => $sourced) { |
|
| 795 | 795 | //print_r($sourced); |
| 796 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 797 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 796 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date); |
|
| 797 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date); |
|
| 798 | 798 | if (isset($sourced['msg'])) { |
| 799 | 799 | if (time() - $sourced['msg']['date'] > 10) { |
| 800 | 800 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 801 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 801 | + echo $Stats->addStatSource($nbmsg, $source, 'msg', $date); |
|
| 802 | 802 | unset($this->stats[$date][$source]['msg']); |
| 803 | 803 | } |
| 804 | 804 | } |
@@ -836,14 +836,14 @@ discard block |
||
| 836 | 836 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 837 | 837 | $SpotterLive = new SpotterLive($this->db); |
| 838 | 838 | $SpotterLive->deleteLiveSpotterData(); |
| 839 | - $SpotterLive->db=null; |
|
| 839 | + $SpotterLive->db = null; |
|
| 840 | 840 | } |
| 841 | 841 | } |
| 842 | 842 | if ($globalDebug) echo " Done\n"; |
| 843 | 843 | $this->last_delete = time(); |
| 844 | 844 | } |
| 845 | 845 | } else { |
| 846 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) { |
|
| 846 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs' || $line['format_source'] === 'airwhere')) { |
|
| 847 | 847 | $this->all_flights[$id]['id'] = $recent_ident; |
| 848 | 848 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 849 | 849 | } |
@@ -851,7 +851,7 @@ discard block |
||
| 851 | 851 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 852 | 852 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 853 | 853 | $Spotter = new Spotter($this->db); |
| 854 | - $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']); |
|
| 854 | + $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']); |
|
| 855 | 855 | $Spotter->db = null; |
| 856 | 856 | } |
| 857 | 857 | } |
@@ -877,37 +877,37 @@ discard block |
||
| 877 | 877 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 878 | 878 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 879 | 879 | |
| 880 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 880 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 881 | 881 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 882 | 882 | $ignoreImport = true; |
| 883 | 883 | } |
| 884 | 884 | } |
| 885 | 885 | if (count($globalAirportAccept) > 0) { |
| 886 | 886 | $ignoreImport = true; |
| 887 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 887 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 888 | 888 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 889 | 889 | $ignoreImport = false; |
| 890 | 890 | } |
| 891 | 891 | } |
| 892 | 892 | } |
| 893 | 893 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 894 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 895 | - 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)) { |
|
| 894 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 895 | + 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)) { |
|
| 896 | 896 | $ignoreImport = true; |
| 897 | 897 | } |
| 898 | 898 | } |
| 899 | 899 | } |
| 900 | 900 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 901 | 901 | $ignoreImport = true; |
| 902 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 903 | - 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)) { |
|
| 902 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 903 | + 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)) { |
|
| 904 | 904 | $ignoreImport = false; |
| 905 | 905 | } |
| 906 | 906 | } |
| 907 | 907 | } |
| 908 | 908 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 909 | 909 | $ignoreImport = true; |
| 910 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 910 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 911 | 911 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 912 | 912 | $ignoreImport = false; |
| 913 | 913 | } |
@@ -915,23 +915,23 @@ discard block |
||
| 915 | 915 | } |
| 916 | 916 | |
| 917 | 917 | if (!$ignoreImport) { |
| 918 | - 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'])) { |
|
| 919 | - 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'))); |
|
| 918 | + 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'])) { |
|
| 919 | + 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'))); |
|
| 920 | 920 | $timeelapsed = microtime(true); |
| 921 | 921 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 922 | 922 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 923 | 923 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 924 | 924 | $SpotterLive = new SpotterLive($this->db); |
| 925 | - $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']); |
|
| 925 | + $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']); |
|
| 926 | 926 | $SpotterLive->db = null; |
| 927 | 927 | if ($globalDebug) echo $result."\n"; |
| 928 | 928 | } |
| 929 | 929 | } |
| 930 | 930 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 931 | - $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']); |
|
| 931 | + $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']); |
|
| 932 | 932 | } |
| 933 | 933 | $this->all_flights[$id]['putinarchive'] = false; |
| 934 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 934 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 935 | 935 | |
| 936 | 936 | // Put statistics in $this->stats variable |
| 937 | 937 | //if ($line['format_source'] != 'aprs') { |
@@ -950,19 +950,19 @@ discard block |
||
| 950 | 950 | $latitude = $globalCenterLatitude; |
| 951 | 951 | $longitude = $globalCenterLongitude; |
| 952 | 952 | } |
| 953 | - $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 953 | + $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 954 | 954 | } else { |
| 955 | 955 | $latitude = $this->source_location[$source]['latitude']; |
| 956 | 956 | $longitude = $this->source_location[$source]['longitude']; |
| 957 | 957 | } |
| 958 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 958 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 959 | 959 | //$stats_heading = $stats_heading%22.5; |
| 960 | 960 | $stats_heading = round($stats_heading/22.5); |
| 961 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 961 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 962 | 962 | $current_date = date('Y-m-d'); |
| 963 | 963 | if ($stats_heading == 16) $stats_heading = 0; |
| 964 | 964 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 965 | - for ($i=0;$i<=15;$i++) { |
|
| 965 | + for ($i = 0; $i <= 15; $i++) { |
|
| 966 | 966 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 967 | 967 | } |
| 968 | 968 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -977,9 +977,9 @@ discard block |
||
| 977 | 977 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 978 | 978 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 979 | 979 | end($this->stats[$current_date][$source]['hist']); |
| 980 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 980 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 981 | 981 | } else $mini = 0; |
| 982 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 982 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 983 | 983 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 984 | 984 | } |
| 985 | 985 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -992,7 +992,7 @@ discard block |
||
| 992 | 992 | $this->all_flights[$id]['lastupdate'] = time(); |
| 993 | 993 | if ($this->all_flights[$id]['putinarchive']) $send = true; |
| 994 | 994 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 995 | - } 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"; |
|
| 995 | + } 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"; |
|
| 996 | 996 | //$this->del(); |
| 997 | 997 | |
| 998 | 998 | 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,7 +213,9 @@ 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()-5900)) { |
@@ -195,13 +229,17 @@ discard block |
||
| 195 | 229 | global $globalDebug, $globalNoImport, $globalNoDB; |
| 196 | 230 | // Delete old infos |
| 197 | 231 | if (isset($this->all_flights[$key]['id'])) { |
| 198 | - if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 232 | + if ($globalDebug) { |
|
| 233 | + echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
|
| 234 | + } |
|
| 199 | 235 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 200 | 236 | $real_arrival = $this->arrival($key); |
| 201 | 237 | $Spotter = new Spotter($this->db); |
| 202 | 238 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 203 | 239 | $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']); |
| 204 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 240 | + if ($globalDebug && $result != 'success') { |
|
| 241 | + echo '!!! ERROR : '.$result."\n"; |
|
| 242 | + } |
|
| 205 | 243 | } |
| 206 | 244 | } |
| 207 | 245 | } |
@@ -211,9 +249,13 @@ discard block |
||
| 211 | 249 | public function add($line) { |
| 212 | 250 | global $globalPilotIdAccept, $globalAirportAccept, $globalAirlineAccept, $globalAirlineIgnore, $globalAirportIgnore, $globalFork, $globalDistanceIgnore, $globalDaemon, $globalSBS1update, $globalDebug, $globalIVAO, $globalVATSIM, $globalphpVMS, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAirlinesSource, $globalVAM, $globalAllFlights, $globalServerAPRS, $APRSSpotter, $globalNoImport, $globalNoDB, $globalVA, $globalAircraftMaxUpdate, $globalAircraftMinUpdate; |
| 213 | 251 | //if (!isset($globalDebugTimeElapsed) || $globalDebugTimeElapsed == '') $globalDebugTimeElapsed = FALSE; |
| 214 | - if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
|
| 215 | - if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') $globalAircraftMaxUpdate = 2300; |
|
| 216 | -/* |
|
| 252 | + if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') { |
|
| 253 | + $globalCoordMinChange = '0.02'; |
|
| 254 | + } |
|
| 255 | + if (!isset($globalAircraftMaxUpdate) || $globalAircraftMaxUpdate == '') { |
|
| 256 | + $globalAircraftMaxUpdate = 2300; |
|
| 257 | + } |
|
| 258 | + /* |
|
| 217 | 259 | $Spotter = new Spotter(); |
| 218 | 260 | $dbc = $Spotter->db; |
| 219 | 261 | $SpotterLive = new SpotterLive($dbc); |
@@ -235,19 +277,28 @@ discard block |
||
| 235 | 277 | // SBS format is CSV format |
| 236 | 278 | if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
| 237 | 279 | //print_r($line); |
| 238 | - if (isset($line['hex'])) $line['hex'] = strtoupper($line['hex']); |
|
| 280 | + if (isset($line['hex'])) { |
|
| 281 | + $line['hex'] = strtoupper($line['hex']); |
|
| 282 | + } |
|
| 239 | 283 | 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)) { |
| 240 | 284 | |
| 241 | 285 | // Increment message number |
| 242 | 286 | if (isset($line['sourcestats']) && $line['sourcestats'] === TRUE) { |
| 243 | 287 | $current_date = date('Y-m-d'); |
| 244 | - if (isset($line['source_name'])) $source = $line['source_name']; |
|
| 245 | - else $source = ''; |
|
| 246 | - if ($source == '' || $line['format_source'] == 'aprs') $source = $line['format_source']; |
|
| 288 | + if (isset($line['source_name'])) { |
|
| 289 | + $source = $line['source_name']; |
|
| 290 | + } else { |
|
| 291 | + $source = ''; |
|
| 292 | + } |
|
| 293 | + if ($source == '' || $line['format_source'] == 'aprs') { |
|
| 294 | + $source = $line['format_source']; |
|
| 295 | + } |
|
| 247 | 296 | if (!isset($this->stats[$current_date][$source]['msg'])) { |
| 248 | 297 | $this->stats[$current_date][$source]['msg']['date'] = time(); |
| 249 | 298 | $this->stats[$current_date][$source]['msg']['nb'] = 1; |
| 250 | - } else $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 299 | + } else { |
|
| 300 | + $this->stats[$current_date][$source]['msg']['nb'] += 1; |
|
| 301 | + } |
|
| 251 | 302 | } |
| 252 | 303 | |
| 253 | 304 | /* |
@@ -263,22 +314,35 @@ discard block |
||
| 263 | 314 | //$this->db = $dbc; |
| 264 | 315 | |
| 265 | 316 | //$hex = trim($line['hex']); |
| 266 | - if (!isset($line['id'])) $id = trim($line['hex']); |
|
| 267 | - else $id = trim($line['id']); |
|
| 317 | + if (!isset($line['id'])) { |
|
| 318 | + $id = trim($line['hex']); |
|
| 319 | + } else { |
|
| 320 | + $id = trim($line['id']); |
|
| 321 | + } |
|
| 268 | 322 | |
| 269 | 323 | if (!isset($this->all_flights[$id])) { |
| 270 | 324 | $this->all_flights[$id] = array(); |
| 271 | 325 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 272 | 326 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '','altitude_previous' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
| 273 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 327 | + if (isset($globalDaemon) && $globalDaemon === FALSE) { |
|
| 328 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 329 | + } |
|
| 274 | 330 | if (!isset($line['id'])) { |
| 275 | - if (!isset($globalDaemon)) $globalDaemon = TRUE; |
|
| 276 | -// 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'))); |
|
| 331 | + if (!isset($globalDaemon)) { |
|
| 332 | + $globalDaemon = TRUE; |
|
| 333 | + } |
|
| 334 | + // 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'))); |
|
| 277 | 335 | // 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'))); |
| 278 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 336 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 337 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 338 | + } |
|
| 279 | 339 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 280 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 281 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 340 | + } else { |
|
| 341 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 342 | + } |
|
| 343 | + if ($globalAllFlights !== FALSE) { |
|
| 344 | + $dataFound = true; |
|
| 345 | + } |
|
| 282 | 346 | } |
| 283 | 347 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 284 | 348 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
@@ -300,12 +364,20 @@ discard block |
||
| 300 | 364 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 301 | 365 | } |
| 302 | 366 | $Spotter->db = null; |
| 303 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 304 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 367 | + if ($globalDebugTimeElapsed) { |
|
| 368 | + echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 369 | + } |
|
| 370 | + if ($aircraft_icao != '') { |
|
| 371 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 372 | + } |
|
| 305 | 373 | } |
| 306 | 374 | } |
| 307 | - if ($globalAllFlights !== FALSE) $dataFound = true; |
|
| 308 | - if ($globalDebug) echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 375 | + if ($globalAllFlights !== FALSE) { |
|
| 376 | + $dataFound = true; |
|
| 377 | + } |
|
| 378 | + if ($globalDebug) { |
|
| 379 | + echo "*********** New aircraft hex : ".$line['hex']." ***********\n"; |
|
| 380 | + } |
|
| 309 | 381 | } |
| 310 | 382 | if (isset($line['id']) && !isset($line['hex'])) { |
| 311 | 383 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => '')); |
@@ -313,7 +385,9 @@ discard block |
||
| 313 | 385 | if (isset($line['aircraft_icao']) && $line['aircraft_icao'] != '') { |
| 314 | 386 | $icao = $line['aircraft_icao']; |
| 315 | 387 | $Spotter = new Spotter($this->db); |
| 316 | - if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
|
| 388 | + if (isset($Spotter->aircraft_correct_icaotype[$icao])) { |
|
| 389 | + $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
|
| 390 | + } |
|
| 317 | 391 | $Spotter->db = null; |
| 318 | 392 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
| 319 | 393 | } |
@@ -323,15 +397,24 @@ discard block |
||
| 323 | 397 | $Spotter = new Spotter($this->db); |
| 324 | 398 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 325 | 399 | $Spotter->db = null; |
| 326 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 400 | + if ($aircraft_icao != '') { |
|
| 401 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 402 | + } |
|
| 327 | 403 | } |
| 328 | 404 | } |
| 329 | 405 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
| 330 | - if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID'; |
|
| 331 | - elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
|
| 332 | - elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
|
| 333 | - elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
|
| 334 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 406 | + if ($line['aircraft_type'] == 'PARA_GLIDER') { |
|
| 407 | + $aircraft_icao = 'GLID'; |
|
| 408 | + } elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') { |
|
| 409 | + $aircraft_icao = 'UHEL'; |
|
| 410 | + } elseif ($line['aircraft_type'] == 'TOW_PLANE') { |
|
| 411 | + $aircraft_icao = 'TOWPLANE'; |
|
| 412 | + } elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') { |
|
| 413 | + $aircraft_icao = 'POWAIRC'; |
|
| 414 | + } |
|
| 415 | + if (isset($aircraft_icao)) { |
|
| 416 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 417 | + } |
|
| 335 | 418 | } |
| 336 | 419 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
| 337 | 420 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
@@ -341,8 +424,11 @@ discard block |
||
| 341 | 424 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 342 | 425 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 343 | 426 | } else { |
| 344 | - 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"; |
|
| 345 | - 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"; |
|
| 427 | + if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
| 428 | + echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 429 | + } elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) { |
|
| 430 | + echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
|
| 431 | + } |
|
| 346 | 432 | /* |
| 347 | 433 | echo strtotime($line['datetime']).' > '.strtotime($this->all_flights[$id]['datetime']); |
| 348 | 434 | print_r($this->all_flights[$id]); |
@@ -351,17 +437,23 @@ discard block |
||
| 351 | 437 | return ''; |
| 352 | 438 | } |
| 353 | 439 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
| 354 | - if ($globalDebug) echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n"; |
|
| 440 | + if ($globalDebug) { |
|
| 441 | + echo "!!! Date is too old ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n"; |
|
| 442 | + } |
|
| 355 | 443 | return ''; |
| 356 | 444 | } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
| 357 | - if ($globalDebug) echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n |
|
| 445 | + if ($globalDebug) { |
|
| 446 | + echo "!!! Date is in the future ".$line['datetime']." for ".$this->all_flights[$id]['id']." - format : ".$line['format_source']."!!!\n |
|
| 358 | 447 | "; |
| 448 | + } |
|
| 359 | 449 | return ''; |
| 360 | 450 | } elseif (!isset($line['datetime'])) { |
| 361 | 451 | date_default_timezone_set('UTC'); |
| 362 | 452 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
| 363 | 453 | } else { |
| 364 | - if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 454 | + if ($globalDebug) { |
|
| 455 | + echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
|
| 456 | + } |
|
| 365 | 457 | return ''; |
| 366 | 458 | } |
| 367 | 459 | |
@@ -382,30 +474,48 @@ discard block |
||
| 382 | 474 | |
| 383 | 475 | if ($this->all_flights[$id]['addedSpotter'] == 1) { |
| 384 | 476 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 385 | - if ($globalDebug) echo '---!!!! New ident, reset aircraft data...'."\n"; |
|
| 477 | + if ($globalDebug) { |
|
| 478 | + echo '---!!!! New ident, reset aircraft data...'."\n"; |
|
| 479 | + } |
|
| 386 | 480 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 387 | 481 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 388 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 389 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 390 | - 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'])); |
|
| 482 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 483 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 484 | + } elseif (isset($line['id'])) { |
|
| 485 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 486 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 487 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 488 | + } |
|
| 391 | 489 | } else { |
| 392 | 490 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
| 393 | 491 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 394 | 492 | $timeelapsed = microtime(true); |
| 395 | 493 | $Spotter = new Spotter($this->db); |
| 396 | 494 | $fromsource = NULL; |
| 397 | - if (isset($globalAirlinesSource) && $globalAirlinesSource != '') $fromsource = $globalAirlinesSource; |
|
| 398 | - elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') $fromsource = 'vatsim'; |
|
| 399 | - elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
|
| 400 | - elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
|
| 401 | - elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
|
| 495 | + if (isset($globalAirlinesSource) && $globalAirlinesSource != '') { |
|
| 496 | + $fromsource = $globalAirlinesSource; |
|
| 497 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'vatsimtxt') { |
|
| 498 | + $fromsource = 'vatsim'; |
|
| 499 | + } elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') { |
|
| 500 | + $fromsource = 'ivao'; |
|
| 501 | + } elseif (isset($globalVATSIM) && $globalVATSIM) { |
|
| 502 | + $fromsource = 'vatsim'; |
|
| 503 | + } elseif (isset($globalIVAO) && $globalIVAO) { |
|
| 504 | + $fromsource = 'ivao'; |
|
| 505 | + } |
|
| 402 | 506 | $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
| 403 | - if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
|
| 507 | + if ($globalDebug && $result != 'success') { |
|
| 508 | + echo '!!! ERROR : '.$result."\n"; |
|
| 509 | + } |
|
| 404 | 510 | $Spotter->db = null; |
| 405 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 511 | + if ($globalDebugTimeElapsed) { |
|
| 512 | + echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 513 | + } |
|
| 406 | 514 | } |
| 407 | 515 | } |
| 408 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 516 | + } else { |
|
| 517 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 518 | + } |
|
| 409 | 519 | |
| 410 | 520 | /* |
| 411 | 521 | if (!isset($line['id'])) { |
@@ -415,7 +525,9 @@ discard block |
||
| 415 | 525 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 416 | 526 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 417 | 527 | */ |
| 418 | - 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'])); |
|
| 528 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 529 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 530 | + } |
|
| 419 | 531 | |
| 420 | 532 | //$putinarchive = true; |
| 421 | 533 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
@@ -433,7 +545,9 @@ discard block |
||
| 433 | 545 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 434 | 546 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 435 | 547 | $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' => '')); |
| 436 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 548 | + if ($globalDebugTimeElapsed) { |
|
| 549 | + echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 550 | + } |
|
| 437 | 551 | } |
| 438 | 552 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 439 | 553 | $timeelapsed = microtime(true); |
@@ -447,7 +561,9 @@ discard block |
||
| 447 | 561 | $Translation->db = null; |
| 448 | 562 | } |
| 449 | 563 | $Spotter->db = null; |
| 450 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 564 | + if ($globalDebugTimeElapsed) { |
|
| 565 | + echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 566 | + } |
|
| 451 | 567 | } |
| 452 | 568 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 453 | 569 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
@@ -456,9 +572,13 @@ discard block |
||
| 456 | 572 | $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'])); |
| 457 | 573 | } |
| 458 | 574 | } |
| 459 | - if (!isset($globalFork)) $globalFork = TRUE; |
|
| 575 | + if (!isset($globalFork)) { |
|
| 576 | + $globalFork = TRUE; |
|
| 577 | + } |
|
| 460 | 578 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 461 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 579 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) { |
|
| 580 | + $this->get_Schedule($id,trim($line['ident'])); |
|
| 581 | + } |
|
| 462 | 582 | } |
| 463 | 583 | } |
| 464 | 584 | } |
@@ -474,8 +594,12 @@ discard block |
||
| 474 | 594 | // use datetime |
| 475 | 595 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 476 | 596 | $speed = $speed*3.6; |
| 477 | - if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 478 | - if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
| 597 | + if ($speed < 1000) { |
|
| 598 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 599 | + } |
|
| 600 | + if ($globalDebug) { |
|
| 601 | + echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
|
| 602 | + } |
|
| 479 | 603 | } |
| 480 | 604 | } |
| 481 | 605 | |
@@ -483,11 +607,16 @@ discard block |
||
| 483 | 607 | |
| 484 | 608 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude']) && !is_int($line['latitude']) && !is_int($line['longitude'])) { |
| 485 | 609 | if (ctype_digit(strval($line['latitude'])) || ctype_digit(strval($line['longitude']))) { |
| 486 | - if ($globalDebug) echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
| 610 | + if ($globalDebug) { |
|
| 611 | + echo "/!\ Invalid latitude or/and longitude data : lat: ".$line['latitude']." - lng: ".$line['longitude']."\n"; |
|
| 612 | + } |
|
| 487 | 613 | return false; |
| 488 | 614 | } |
| 489 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 490 | - else unset($timediff); |
|
| 615 | + if (isset($this->all_flights[$id]['time_last_coord'])) { |
|
| 616 | + $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 617 | + } else { |
|
| 618 | + unset($timediff); |
|
| 619 | + } |
|
| 491 | 620 | if ($this->tmd > 5 |
| 492 | 621 | || (isset($line['format_source']) |
| 493 | 622 | && $line['format_source'] == 'airwhere' |
@@ -519,16 +648,25 @@ discard block |
||
| 519 | 648 | $this->all_flights[$id]['putinarchive'] = true; |
| 520 | 649 | $this->tmd = 0; |
| 521 | 650 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 522 | - if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 651 | + if ($globalDebug) { |
|
| 652 | + echo "\n".' ------- Check Country for '.$this->all_flights[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
|
| 653 | + } |
|
| 523 | 654 | $timeelapsed = microtime(true); |
| 524 | 655 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 525 | 656 | $Spotter = new Spotter($this->db); |
| 526 | 657 | $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
| 527 | - if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
| 528 | - else $this->all_flights[$id]['over_country'] = ''; |
|
| 658 | + if (!empty($all_country)) { |
|
| 659 | + $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
|
| 660 | + } else { |
|
| 661 | + $this->all_flights[$id]['over_country'] = ''; |
|
| 662 | + } |
|
| 529 | 663 | $Spotter->db = null; |
| 530 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 531 | - if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
| 664 | + if ($globalDebugTimeElapsed) { |
|
| 665 | + echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 666 | + } |
|
| 667 | + if ($globalDebug) { |
|
| 668 | + echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
|
| 669 | + } |
|
| 532 | 670 | } |
| 533 | 671 | } |
| 534 | 672 | } |
@@ -536,7 +674,9 @@ discard block |
||
| 536 | 674 | |
| 537 | 675 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 538 | 676 | //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) { |
| 539 | - if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
| 677 | + if (!isset($this->all_flights[$id]['archive_latitude'])) { |
|
| 678 | + $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
|
| 679 | + } |
|
| 540 | 680 | if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > 0.0001) { |
| 541 | 681 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 542 | 682 | $dataFound = true; |
@@ -558,9 +698,13 @@ discard block |
||
| 558 | 698 | */ |
| 559 | 699 | } |
| 560 | 700 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 561 | - if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
|
| 701 | + if ($line['longitude'] > 180) { |
|
| 702 | + $line['longitude'] = $line['longitude'] - 360; |
|
| 703 | + } |
|
| 562 | 704 | //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) { |
| 563 | - if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
| 705 | + if (!isset($this->all_flights[$id]['archive_longitude'])) { |
|
| 706 | + $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
|
| 707 | + } |
|
| 564 | 708 | if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs' || $this->all_flights[$id]['format_source'] == 'airwhere' && abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > 0.0001) { |
| 565 | 709 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 566 | 710 | $dataFound = true; |
@@ -591,7 +735,9 @@ discard block |
||
| 591 | 735 | } |
| 592 | 736 | } |
| 593 | 737 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 594 | - if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
|
| 738 | + if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) { |
|
| 739 | + $dataFound = true; |
|
| 740 | + } |
|
| 595 | 741 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
| 596 | 742 | } |
| 597 | 743 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
@@ -613,53 +759,79 @@ discard block |
||
| 613 | 759 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 614 | 760 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 615 | 761 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 616 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 617 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 618 | - 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'])); |
|
| 762 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 763 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 764 | + } elseif (isset($line['id'])) { |
|
| 765 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 766 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 767 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 768 | + } |
|
| 769 | + } |
|
| 770 | + if ($line['ground'] != 1) { |
|
| 771 | + $line['ground'] = 0; |
|
| 619 | 772 | } |
| 620 | - if ($line['ground'] != 1) $line['ground'] = 0; |
|
| 621 | 773 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
| 622 | 774 | //$dataFound = true; |
| 623 | 775 | } |
| 624 | 776 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 625 | 777 | 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'])) { |
| 626 | - if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
|
| 778 | + if ($this->all_flights[$id]['squawk'] != $line['squawk']) { |
|
| 779 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 780 | + } |
|
| 627 | 781 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
| 628 | 782 | $highlight = ''; |
| 629 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 630 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 631 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 783 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
| 784 | + $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
|
| 785 | + } |
|
| 786 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
| 787 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
|
| 788 | + } |
|
| 789 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
| 790 | + $highlight = 'Squawk 7700 : Emergency at '.date('Y-m-d G:i').' UTC'; |
|
| 791 | + } |
|
| 632 | 792 | if ($highlight != '') { |
| 633 | 793 | $timeelapsed = microtime(true); |
| 634 | 794 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 635 | 795 | $Spotter = new Spotter($this->db); |
| 636 | 796 | $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
| 637 | 797 | $Spotter->db = null; |
| 638 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 798 | + if ($globalDebugTimeElapsed) { |
|
| 799 | + echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 800 | + } |
|
| 639 | 801 | } |
| 640 | 802 | //$putinarchive = true; |
| 641 | 803 | //$highlight = ''; |
| 642 | 804 | } |
| 643 | 805 | |
| 644 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 806 | + } else { |
|
| 807 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 808 | + } |
|
| 645 | 809 | //$dataFound = true; |
| 646 | 810 | } |
| 647 | 811 | |
| 648 | 812 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 649 | 813 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 650 | - 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; |
|
| 814 | + if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) { |
|
| 815 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 816 | + } |
|
| 651 | 817 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
| 652 | 818 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
| 653 | 819 | //$dataFound = true; |
| 654 | 820 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 655 | 821 | if ($globalVA !== TRUE && $globalIVAO !== TRUE && $globalVATSIM !== TRUE && $globalphpVMS !== TRUE && $globalVAM !== TRUE) { |
| 656 | 822 | if (isset($this->all_flights[$id]['over_country']) && $this->all_flights[$id]['over_country'] != '' && isset($this->all_flights[$id]['altitude_previous']) && $this->all_flights[$id]['altitude_previous'] != '' && $this->all_flights[$id]['altitude_previous'] < $this->all_flights[$id]['altitude_real'] && isset($this->all_flights[$id]['lastupdate']) && $this->all_flights[$id]['lastupdate'] < time() - 1600) { |
| 657 | - if ($globalDebug) echo '--- Reset because of altitude'."\n"; |
|
| 823 | + if ($globalDebug) { |
|
| 824 | + echo '--- Reset because of altitude'."\n"; |
|
| 825 | + } |
|
| 658 | 826 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
| 659 | 827 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
| 660 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 661 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 662 | - 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'])); |
|
| 828 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
|
| 829 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 830 | + } elseif (isset($line['id'])) { |
|
| 831 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 832 | + } elseif (isset($this->all_flights[$id]['ident'])) { |
|
| 833 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 834 | + } |
|
| 663 | 835 | } |
| 664 | 836 | } |
| 665 | 837 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_previous' => $line['altitude'])); |
@@ -670,22 +842,32 @@ discard block |
||
| 670 | 842 | } |
| 671 | 843 | |
| 672 | 844 | if (isset($line['heading']) && $line['heading'] != '') { |
| 673 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 845 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) { |
|
| 846 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 847 | + } |
|
| 674 | 848 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
| 675 | 849 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
| 676 | 850 | //$dataFound = true; |
| 677 | 851 | } 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']) { |
| 678 | 852 | $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']); |
| 679 | 853 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
| 680 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 681 | - if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
|
| 854 | + if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) { |
|
| 855 | + $this->all_flights[$id]['putinarchive'] = true; |
|
| 856 | + } |
|
| 857 | + if ($globalDebug) { |
|
| 858 | + echo "ø Calculated Heading for ".$this->all_flights[$id]['id']." : ".$heading."\n"; |
|
| 859 | + } |
|
| 682 | 860 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 683 | 861 | // If not enough messages and ACARS set heading to 0 |
| 684 | 862 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
| 685 | 863 | } |
| 686 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 687 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 688 | - elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalMinupdate) $dataFound = false; |
|
| 864 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) { |
|
| 865 | + $dataFound = false; |
|
| 866 | + } elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) { |
|
| 867 | + $dataFound = false; |
|
| 868 | + } elseif ($globalDaemon === TRUE && isset($globalAircraftMinUpdate) && $globalAircraftMinUpdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalMinupdate) { |
|
| 869 | + $dataFound = false; |
|
| 870 | + } |
|
| 689 | 871 | |
| 690 | 872 | // print_r($this->all_flights[$id]); |
| 691 | 873 | //gets the callsign from the last hour |
@@ -702,23 +884,38 @@ discard block |
||
| 702 | 884 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
| 703 | 885 | if (!isset($this->all_flights[$id]['forcenew']) || $this->all_flights[$id]['forcenew'] == 0) { |
| 704 | 886 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 705 | - if ($globalDebug) echo "Check if aircraft is already in DB..."; |
|
| 887 | + if ($globalDebug) { |
|
| 888 | + echo "Check if aircraft is already in DB..."; |
|
| 889 | + } |
|
| 706 | 890 | $timeelapsed = microtime(true); |
| 707 | 891 | $SpotterLive = new SpotterLive($this->db); |
| 708 | 892 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
| 709 | 893 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 710 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 894 | + if ($globalDebugTimeElapsed) { |
|
| 895 | + echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 896 | + } |
|
| 711 | 897 | } elseif (isset($line['id'])) { |
| 712 | 898 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 713 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 899 | + if ($globalDebugTimeElapsed) { |
|
| 900 | + echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 901 | + } |
|
| 714 | 902 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 715 | 903 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 716 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 717 | - } else $recent_ident = ''; |
|
| 904 | + if ($globalDebugTimeElapsed) { |
|
| 905 | + echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 906 | + } |
|
| 907 | + } else { |
|
| 908 | + $recent_ident = ''; |
|
| 909 | + } |
|
| 718 | 910 | $SpotterLive->db=null; |
| 719 | - if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
|
| 720 | - elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
|
| 721 | - } else $recent_ident = ''; |
|
| 911 | + if ($globalDebug && $recent_ident == '') { |
|
| 912 | + echo " Not in DB.\n"; |
|
| 913 | + } elseif ($globalDebug && $recent_ident != '') { |
|
| 914 | + echo " Already in DB.\n"; |
|
| 915 | + } |
|
| 916 | + } else { |
|
| 917 | + $recent_ident = ''; |
|
| 918 | + } |
|
| 722 | 919 | } else { |
| 723 | 920 | $recent_ident = ''; |
| 724 | 921 | $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
@@ -726,7 +923,9 @@ discard block |
||
| 726 | 923 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 727 | 924 | if($recent_ident == "") |
| 728 | 925 | { |
| 729 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
| 926 | + if ($globalDebug) { |
|
| 927 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
|
| 928 | + } |
|
| 730 | 929 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 731 | 930 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 732 | 931 | //adds the spotter data for the archive |
@@ -770,31 +969,49 @@ discard block |
||
| 770 | 969 | |
| 771 | 970 | if (!$ignoreImport) { |
| 772 | 971 | $highlight = ''; |
| 773 | - if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
|
| 774 | - if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 775 | - if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
|
| 776 | - 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'))); |
|
| 972 | + if ($this->all_flights[$id]['squawk'] == '7500') { |
|
| 973 | + $highlight = 'Squawk 7500 : Hijack'; |
|
| 974 | + } |
|
| 975 | + if ($this->all_flights[$id]['squawk'] == '7600') { |
|
| 976 | + $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
|
| 977 | + } |
|
| 978 | + if ($this->all_flights[$id]['squawk'] == '7700') { |
|
| 979 | + $highlight = 'Squawk 7700 : Emergency'; |
|
| 980 | + } |
|
| 981 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 982 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 983 | + } |
|
| 777 | 984 | $timeelapsed = microtime(true); |
| 778 | 985 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 779 | 986 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 780 | 987 | $Spotter = new Spotter($this->db); |
| 781 | 988 | $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']); |
| 782 | 989 | $Spotter->db = null; |
| 783 | - if ($globalDebug && isset($result)) echo $result."\n"; |
|
| 990 | + if ($globalDebug && isset($result)) { |
|
| 991 | + echo $result."\n"; |
|
| 992 | + } |
|
| 784 | 993 | } |
| 785 | 994 | } |
| 786 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 995 | + if ($globalDebugTimeElapsed) { |
|
| 996 | + echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 997 | + } |
|
| 787 | 998 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 788 | 999 | |
| 789 | 1000 | // Add source stat in DB |
| 790 | 1001 | $Stats = new Stats($this->db); |
| 791 | 1002 | if (!empty($this->stats)) { |
| 792 | - if ($globalDebug) echo 'Add source stats : '; |
|
| 1003 | + if ($globalDebug) { |
|
| 1004 | + echo 'Add source stats : '; |
|
| 1005 | + } |
|
| 793 | 1006 | foreach($this->stats as $date => $data) { |
| 794 | 1007 | foreach($data as $source => $sourced) { |
| 795 | 1008 | //print_r($sourced); |
| 796 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 797 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 1009 | + if (isset($sourced['polar'])) { |
|
| 1010 | + echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 1011 | + } |
|
| 1012 | + if (isset($sourced['hist'])) { |
|
| 1013 | + echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 1014 | + } |
|
| 798 | 1015 | if (isset($sourced['msg'])) { |
| 799 | 1016 | if (time() - $sourced['msg']['date'] > 10) { |
| 800 | 1017 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
@@ -807,13 +1024,17 @@ discard block |
||
| 807 | 1024 | unset($this->stats[$date]); |
| 808 | 1025 | } |
| 809 | 1026 | } |
| 810 | - if ($globalDebug) echo 'Done'."\n"; |
|
| 1027 | + if ($globalDebug) { |
|
| 1028 | + echo 'Done'."\n"; |
|
| 1029 | + } |
|
| 811 | 1030 | |
| 812 | 1031 | } |
| 813 | 1032 | $Stats->db = null; |
| 814 | 1033 | } |
| 815 | 1034 | $this->del(); |
| 816 | - } elseif ($globalDebug) echo 'Ignore data'."\n"; |
|
| 1035 | + } elseif ($globalDebug) { |
|
| 1036 | + echo 'Ignore data'."\n"; |
|
| 1037 | + } |
|
| 817 | 1038 | //$ignoreImport = false; |
| 818 | 1039 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 819 | 1040 | //print_r($this->all_flights[$id]); |
@@ -830,7 +1051,9 @@ discard block |
||
| 830 | 1051 | */ |
| 831 | 1052 | //SpotterLive->deleteLiveSpotterDataByIdent($this->all_flights[$id]['ident']); |
| 832 | 1053 | if ($this->last_delete == 0 || time() - $this->last_delete > 1800) { |
| 833 | - if ($globalDebug) echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 1054 | + if ($globalDebug) { |
|
| 1055 | + echo "---- Deleting Live Spotter data older than 9 hours..."; |
|
| 1056 | + } |
|
| 834 | 1057 | //SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 835 | 1058 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 836 | 1059 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -839,7 +1062,9 @@ discard block |
||
| 839 | 1062 | $SpotterLive->db=null; |
| 840 | 1063 | } |
| 841 | 1064 | } |
| 842 | - if ($globalDebug) echo " Done\n"; |
|
| 1065 | + if ($globalDebug) { |
|
| 1066 | + echo " Done\n"; |
|
| 1067 | + } |
|
| 843 | 1068 | $this->last_delete = time(); |
| 844 | 1069 | } |
| 845 | 1070 | } else { |
@@ -866,11 +1091,17 @@ discard block |
||
| 866 | 1091 | //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"; |
| 867 | 1092 | if ($globalDebug) { |
| 868 | 1093 | if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM)) { |
| 869 | - 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"; |
|
| 870 | - 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"; |
|
| 1094 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
| 1095 | + 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"; |
|
| 1096 | + } else { |
|
| 1097 | + 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"; |
|
| 1098 | + } |
|
| 871 | 1099 | } else { |
| 872 | - 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"; |
|
| 873 | - 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"; |
|
| 1100 | + if (isset($this->all_flights[$id]['source_name'])) { |
|
| 1101 | + 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"; |
|
| 1102 | + } else { |
|
| 1103 | + 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"; |
|
| 1104 | + } |
|
| 874 | 1105 | } |
| 875 | 1106 | } |
| 876 | 1107 | $ignoreImport = false; |
@@ -916,22 +1147,30 @@ discard block |
||
| 916 | 1147 | |
| 917 | 1148 | if (!$ignoreImport) { |
| 918 | 1149 | 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'])) { |
| 919 | - 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'))); |
|
| 1150 | + if (!isset($this->all_flights[$id]['id'])) { |
|
| 1151 | + $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 1152 | + } |
|
| 920 | 1153 | $timeelapsed = microtime(true); |
| 921 | 1154 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 922 | 1155 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 923 | - if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
| 1156 | + if ($globalDebug) { |
|
| 1157 | + echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
|
| 1158 | + } |
|
| 924 | 1159 | $SpotterLive = new SpotterLive($this->db); |
| 925 | 1160 | $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']); |
| 926 | 1161 | $SpotterLive->db = null; |
| 927 | - if ($globalDebug) echo $result."\n"; |
|
| 1162 | + if ($globalDebug) { |
|
| 1163 | + echo $result."\n"; |
|
| 1164 | + } |
|
| 928 | 1165 | } |
| 929 | 1166 | } |
| 930 | 1167 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 931 | 1168 | $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']); |
| 932 | 1169 | } |
| 933 | 1170 | $this->all_flights[$id]['putinarchive'] = false; |
| 934 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1171 | + if ($globalDebugTimeElapsed) { |
|
| 1172 | + echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 1173 | + } |
|
| 935 | 1174 | |
| 936 | 1175 | // Put statistics in $this->stats variable |
| 937 | 1176 | //if ($line['format_source'] != 'aprs') { |
@@ -939,7 +1178,9 @@ discard block |
||
| 939 | 1178 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 940 | 1179 | if (isset($line['sourcestats']) && $line['sourcestats'] == TRUE && $this->all_flights[$id]['latitude'] != '' && $this->all_flights[$id]['longitude'] != '') { |
| 941 | 1180 | $source = $this->all_flights[$id]['source_name']; |
| 942 | - if ($source == '') $source = $this->all_flights[$id]['format_source']; |
|
| 1181 | + if ($source == '') { |
|
| 1182 | + $source = $this->all_flights[$id]['format_source']; |
|
| 1183 | + } |
|
| 943 | 1184 | if (!isset($this->source_location[$source])) { |
| 944 | 1185 | $Location = new Source(); |
| 945 | 1186 | $coord = $Location->getLocationInfobySourceName($source); |
@@ -960,7 +1201,9 @@ discard block |
||
| 960 | 1201 | $stats_heading = round($stats_heading/22.5); |
| 961 | 1202 | $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
| 962 | 1203 | $current_date = date('Y-m-d'); |
| 963 | - if ($stats_heading == 16) $stats_heading = 0; |
|
| 1204 | + if ($stats_heading == 16) { |
|
| 1205 | + $stats_heading = 0; |
|
| 1206 | + } |
|
| 964 | 1207 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 965 | 1208 | for ($i=0;$i<=15;$i++) { |
| 966 | 1209 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
@@ -978,7 +1221,9 @@ discard block |
||
| 978 | 1221 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 979 | 1222 | end($this->stats[$current_date][$source]['hist']); |
| 980 | 1223 | $mini = key($this->stats[$current_date][$source]['hist'])+10; |
| 981 | - } else $mini = 0; |
|
| 1224 | + } else { |
|
| 1225 | + $mini = 0; |
|
| 1226 | + } |
|
| 982 | 1227 | for ($i=$mini;$i<=$distance;$i+=10) { |
| 983 | 1228 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 984 | 1229 | } |
@@ -990,19 +1235,27 @@ discard block |
||
| 990 | 1235 | } |
| 991 | 1236 | |
| 992 | 1237 | $this->all_flights[$id]['lastupdate'] = time(); |
| 993 | - if ($this->all_flights[$id]['putinarchive']) $send = true; |
|
| 1238 | + if ($this->all_flights[$id]['putinarchive']) { |
|
| 1239 | + $send = true; |
|
| 1240 | + } |
|
| 994 | 1241 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 995 | - } 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"; |
|
| 1242 | + } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) { |
|
| 1243 | + echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 1244 | + } |
|
| 996 | 1245 | //$this->del(); |
| 997 | 1246 | |
| 998 | 1247 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
| 999 | 1248 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 1000 | - if ($globalDebug) echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
| 1249 | + if ($globalDebug) { |
|
| 1250 | + echo "---- Deleting Live Spotter data Not updated since 2 hour..."; |
|
| 1251 | + } |
|
| 1001 | 1252 | $SpotterLive = new SpotterLive($this->db); |
| 1002 | 1253 | $SpotterLive->deleteLiveSpotterDataNotUpdated(); |
| 1003 | 1254 | $SpotterLive->db = null; |
| 1004 | 1255 | //SpotterLive->deleteLiveSpotterData(); |
| 1005 | - if ($globalDebug) echo " Done\n"; |
|
| 1256 | + if ($globalDebug) { |
|
| 1257 | + echo " Done\n"; |
|
| 1258 | + } |
|
| 1006 | 1259 | $this->last_delete_hourly = time(); |
| 1007 | 1260 | } else { |
| 1008 | 1261 | $this->del(); |
@@ -1014,7 +1267,9 @@ discard block |
||
| 1014 | 1267 | //$ignoreImport = false; |
| 1015 | 1268 | } |
| 1016 | 1269 | //if (function_exists('pcntl_fork') && $globalFork) pcntl_signal(SIGCHLD, SIG_IGN); |
| 1017 | - if ($send) return $this->all_flights[$id]; |
|
| 1270 | + if ($send) { |
|
| 1271 | + return $this->all_flights[$id]; |
|
| 1272 | + } |
|
| 1018 | 1273 | } |
| 1019 | 1274 | } |
| 1020 | 1275 | } |
@@ -12,10 +12,10 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | - * Get SQL query part for filter used |
|
| 16 | - * @param Array $filter the filter |
|
| 17 | - * @return Array the SQL part |
|
| 18 | - */ |
|
| 15 | + * Get SQL query part for filter used |
|
| 16 | + * @param Array $filter the filter |
|
| 17 | + * @return Array the SQL part |
|
| 18 | + */ |
|
| 19 | 19 | public function getFilter($filter = array(),$where = false,$and = false) { |
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 21 | 21 | $filters = array(); |
@@ -128,11 +128,11 @@ discard block |
||
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /** |
| 131 | - * Gets all the spotter information based on the latest data entry |
|
| 132 | - * |
|
| 133 | - * @return Array the spotter information |
|
| 134 | - * |
|
| 135 | - */ |
|
| 131 | + * Gets all the spotter information based on the latest data entry |
|
| 132 | + * |
|
| 133 | + * @return Array the spotter information |
|
| 134 | + * |
|
| 135 | + */ |
|
| 136 | 136 | public function getLiveSpotterData($limit = '', $sort = '', $filter = array()) |
| 137 | 137 | { |
| 138 | 138 | global $globalDBdriver, $globalLiveInterval; |
@@ -175,11 +175,11 @@ discard block |
||
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | /** |
| 178 | - * Gets Minimal Live Spotter data |
|
| 179 | - * |
|
| 180 | - * @return Array the spotter information |
|
| 181 | - * |
|
| 182 | - */ |
|
| 178 | + * Gets Minimal Live Spotter data |
|
| 179 | + * |
|
| 180 | + * @return Array the spotter information |
|
| 181 | + * |
|
| 182 | + */ |
|
| 183 | 183 | public function getMinLiveSpotterData($filter = array()) |
| 184 | 184 | { |
| 185 | 185 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
@@ -216,11 +216,11 @@ discard block |
||
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | /** |
| 219 | - * Gets Minimal Live Spotter data since xx seconds |
|
| 220 | - * |
|
| 221 | - * @return Array the spotter information |
|
| 222 | - * |
|
| 223 | - */ |
|
| 219 | + * Gets Minimal Live Spotter data since xx seconds |
|
| 220 | + * |
|
| 221 | + * @return Array the spotter information |
|
| 222 | + * |
|
| 223 | + */ |
|
| 224 | 224 | public function getMinLastLiveSpotterData($filter = array()) |
| 225 | 225 | { |
| 226 | 226 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 240 | 240 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 241 | 241 | } |
| 242 | - } else { |
|
| 242 | + } else { |
|
| 243 | 243 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 244 | 244 | $query = "SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source |
| 245 | 245 | FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 253 | 253 | } |
| 254 | 254 | } |
| 255 | - try { |
|
| 255 | + try { |
|
| 256 | 256 | $sth = $this->db->prepare($query); |
| 257 | 257 | $sth->execute(); |
| 258 | 258 | } catch(PDOException $e) { |
@@ -264,11 +264,11 @@ discard block |
||
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | /** |
| 267 | - * Gets number of latest data entry |
|
| 268 | - * |
|
| 269 | - * @return String number of entry |
|
| 270 | - * |
|
| 271 | - */ |
|
| 267 | + * Gets number of latest data entry |
|
| 268 | + * |
|
| 269 | + * @return String number of entry |
|
| 270 | + * |
|
| 271 | + */ |
|
| 272 | 272 | public function getLiveSpotterCount($filter = array()) |
| 273 | 273 | { |
| 274 | 274 | global $globalDBdriver, $globalLiveInterval; |
@@ -295,11 +295,11 @@ discard block |
||
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | /** |
| 298 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 299 | - * |
|
| 300 | - * @return Array the spotter information |
|
| 301 | - * |
|
| 302 | - */ |
|
| 298 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 299 | + * |
|
| 300 | + * @return Array the spotter information |
|
| 301 | + * |
|
| 302 | + */ |
|
| 303 | 303 | public function getLiveSpotterDatabyCoord($coord, $filter = array()) |
| 304 | 304 | { |
| 305 | 305 | global $globalDBdriver, $globalLiveInterval; |
@@ -324,11 +324,11 @@ discard block |
||
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | /** |
| 327 | - * Gets all the spotter information based on the latest data entry and coord |
|
| 328 | - * |
|
| 329 | - * @return Array the spotter information |
|
| 330 | - * |
|
| 331 | - */ |
|
| 327 | + * Gets all the spotter information based on the latest data entry and coord |
|
| 328 | + * |
|
| 329 | + * @return Array the spotter information |
|
| 330 | + * |
|
| 331 | + */ |
|
| 332 | 332 | public function getMinLiveSpotterDatabyCoord($coord, $filter = array()) |
| 333 | 333 | { |
| 334 | 334 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
@@ -393,11 +393,11 @@ discard block |
||
| 393 | 393 | } |
| 394 | 394 | |
| 395 | 395 | /** |
| 396 | - * Gets all the spotter information based on a user's latitude and longitude |
|
| 397 | - * |
|
| 398 | - * @return Array the spotter information |
|
| 399 | - * |
|
| 400 | - */ |
|
| 396 | + * Gets all the spotter information based on a user's latitude and longitude |
|
| 397 | + * |
|
| 398 | + * @return Array the spotter information |
|
| 399 | + * |
|
| 400 | + */ |
|
| 401 | 401 | public function getLatestSpotterForLayar($lat, $lng, $radius, $interval) |
| 402 | 402 | { |
| 403 | 403 | $Spotter = new Spotter($this->db); |
@@ -407,117 +407,117 @@ discard block |
||
| 407 | 407 | return false; |
| 408 | 408 | } |
| 409 | 409 | } |
| 410 | - if ($lng != '') |
|
| 411 | - { |
|
| 412 | - if (!is_numeric($lng)) |
|
| 413 | - { |
|
| 414 | - return false; |
|
| 415 | - } |
|
| 416 | - } |
|
| 417 | - |
|
| 418 | - if ($radius != '') |
|
| 419 | - { |
|
| 420 | - if (!is_numeric($radius)) |
|
| 421 | - { |
|
| 422 | - return false; |
|
| 423 | - } |
|
| 424 | - } |
|
| 410 | + if ($lng != '') |
|
| 411 | + { |
|
| 412 | + if (!is_numeric($lng)) |
|
| 413 | + { |
|
| 414 | + return false; |
|
| 415 | + } |
|
| 416 | + } |
|
| 417 | + |
|
| 418 | + if ($radius != '') |
|
| 419 | + { |
|
| 420 | + if (!is_numeric($radius)) |
|
| 421 | + { |
|
| 422 | + return false; |
|
| 423 | + } |
|
| 424 | + } |
|
| 425 | 425 | $additional_query = ''; |
| 426 | - if ($interval != '') |
|
| 427 | - { |
|
| 428 | - if (!is_string($interval)) |
|
| 429 | - { |
|
| 430 | - //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 431 | - return false; |
|
| 432 | - } else { |
|
| 433 | - if ($interval == '1m') |
|
| 434 | - { |
|
| 435 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 436 | - } else if ($interval == '15m'){ |
|
| 437 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
|
| 438 | - } |
|
| 439 | - } |
|
| 440 | - } else { |
|
| 441 | - $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 442 | - } |
|
| 443 | - |
|
| 444 | - $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 426 | + if ($interval != '') |
|
| 427 | + { |
|
| 428 | + if (!is_string($interval)) |
|
| 429 | + { |
|
| 430 | + //$additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 431 | + return false; |
|
| 432 | + } else { |
|
| 433 | + if ($interval == '1m') |
|
| 434 | + { |
|
| 435 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 436 | + } else if ($interval == '15m'){ |
|
| 437 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
|
| 438 | + } |
|
| 439 | + } |
|
| 440 | + } else { |
|
| 441 | + $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
|
| 442 | + } |
|
| 443 | + |
|
| 444 | + $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 445 | 445 | WHERE spotter_live.latitude <> '' |
| 446 | 446 | AND spotter_live.longitude <> '' |
| 447 | 447 | ".$additional_query." |
| 448 | 448 | HAVING distance < :radius |
| 449 | 449 | ORDER BY distance"; |
| 450 | 450 | |
| 451 | - $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 451 | + $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 452 | 452 | |
| 453 | - return $spotter_array; |
|
| 454 | - } |
|
| 453 | + return $spotter_array; |
|
| 454 | + } |
|
| 455 | 455 | |
| 456 | 456 | |
| 457 | - /** |
|
| 458 | - * Gets all the spotter information based on a particular callsign |
|
| 459 | - * |
|
| 460 | - * @return Array the spotter information |
|
| 461 | - * |
|
| 462 | - */ |
|
| 457 | + /** |
|
| 458 | + * Gets all the spotter information based on a particular callsign |
|
| 459 | + * |
|
| 460 | + * @return Array the spotter information |
|
| 461 | + * |
|
| 462 | + */ |
|
| 463 | 463 | public function getLastLiveSpotterDataByIdent($ident) |
| 464 | 464 | { |
| 465 | 465 | $Spotter = new Spotter($this->db); |
| 466 | 466 | date_default_timezone_set('UTC'); |
| 467 | 467 | |
| 468 | 468 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 469 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 469 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 470 | 470 | |
| 471 | 471 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true); |
| 472 | 472 | |
| 473 | 473 | return $spotter_array; |
| 474 | 474 | } |
| 475 | 475 | |
| 476 | - /** |
|
| 477 | - * Gets all the spotter information based on a particular callsign |
|
| 478 | - * |
|
| 479 | - * @return Array the spotter information |
|
| 480 | - * |
|
| 481 | - */ |
|
| 476 | + /** |
|
| 477 | + * Gets all the spotter information based on a particular callsign |
|
| 478 | + * |
|
| 479 | + * @return Array the spotter information |
|
| 480 | + * |
|
| 481 | + */ |
|
| 482 | 482 | public function getDateLiveSpotterDataByIdent($ident,$date) |
| 483 | 483 | { |
| 484 | 484 | $Spotter = new Spotter($this->db); |
| 485 | 485 | date_default_timezone_set('UTC'); |
| 486 | 486 | |
| 487 | 487 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 488 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 488 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 489 | 489 | |
| 490 | - $date = date('c',$date); |
|
| 490 | + $date = date('c',$date); |
|
| 491 | 491 | $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
| 492 | 492 | |
| 493 | 493 | return $spotter_array; |
| 494 | 494 | } |
| 495 | 495 | |
| 496 | - /** |
|
| 497 | - * Gets last spotter information based on a particular callsign |
|
| 498 | - * |
|
| 499 | - * @return Array the spotter information |
|
| 500 | - * |
|
| 501 | - */ |
|
| 496 | + /** |
|
| 497 | + * Gets last spotter information based on a particular callsign |
|
| 498 | + * |
|
| 499 | + * @return Array the spotter information |
|
| 500 | + * |
|
| 501 | + */ |
|
| 502 | 502 | public function getLastLiveSpotterDataById($id) |
| 503 | 503 | { |
| 504 | 504 | $Spotter = new Spotter($this->db); |
| 505 | 505 | date_default_timezone_set('UTC'); |
| 506 | 506 | |
| 507 | 507 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 508 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 508 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 509 | 509 | |
| 510 | 510 | $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true); |
| 511 | 511 | |
| 512 | 512 | return $spotter_array; |
| 513 | 513 | } |
| 514 | 514 | |
| 515 | - /** |
|
| 516 | - * Gets last spotter information based on a particular callsign |
|
| 517 | - * |
|
| 518 | - * @return Array the spotter information |
|
| 519 | - * |
|
| 520 | - */ |
|
| 515 | + /** |
|
| 516 | + * Gets last spotter information based on a particular callsign |
|
| 517 | + * |
|
| 518 | + * @return Array the spotter information |
|
| 519 | + * |
|
| 520 | + */ |
|
| 521 | 521 | public function getDateLiveSpotterDataById($id,$date) |
| 522 | 522 | { |
| 523 | 523 | $Spotter = new Spotter($this->db); |
@@ -530,21 +530,21 @@ discard block |
||
| 530 | 530 | return $spotter_array; |
| 531 | 531 | } |
| 532 | 532 | |
| 533 | - /** |
|
| 534 | - * Gets altitude information based on a particular callsign |
|
| 535 | - * |
|
| 536 | - * @return Array the spotter information |
|
| 537 | - * |
|
| 538 | - */ |
|
| 533 | + /** |
|
| 534 | + * Gets altitude information based on a particular callsign |
|
| 535 | + * |
|
| 536 | + * @return Array the spotter information |
|
| 537 | + * |
|
| 538 | + */ |
|
| 539 | 539 | public function getAltitudeLiveSpotterDataByIdent($ident) |
| 540 | 540 | { |
| 541 | 541 | |
| 542 | 542 | date_default_timezone_set('UTC'); |
| 543 | 543 | |
| 544 | 544 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 545 | - $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 545 | + $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 546 | 546 | |
| 547 | - try { |
|
| 547 | + try { |
|
| 548 | 548 | |
| 549 | 549 | $sth = $this->db->prepare($query); |
| 550 | 550 | $sth->execute(array(':ident' => $ident)); |
@@ -557,12 +557,12 @@ discard block |
||
| 557 | 557 | return $spotter_array; |
| 558 | 558 | } |
| 559 | 559 | |
| 560 | - /** |
|
| 561 | - * Gets all the spotter information based on a particular id |
|
| 562 | - * |
|
| 563 | - * @return Array the spotter information |
|
| 564 | - * |
|
| 565 | - */ |
|
| 560 | + /** |
|
| 561 | + * Gets all the spotter information based on a particular id |
|
| 562 | + * |
|
| 563 | + * @return Array the spotter information |
|
| 564 | + * |
|
| 565 | + */ |
|
| 566 | 566 | public function getAllLiveSpotterDataById($id,$liveinterval = false) |
| 567 | 567 | { |
| 568 | 568 | global $globalDBdriver, $globalLiveInterval; |
@@ -590,18 +590,18 @@ discard block |
||
| 590 | 590 | return $spotter_array; |
| 591 | 591 | } |
| 592 | 592 | |
| 593 | - /** |
|
| 594 | - * Gets all the spotter information based on a particular ident |
|
| 595 | - * |
|
| 596 | - * @return Array the spotter information |
|
| 597 | - * |
|
| 598 | - */ |
|
| 593 | + /** |
|
| 594 | + * Gets all the spotter information based on a particular ident |
|
| 595 | + * |
|
| 596 | + * @return Array the spotter information |
|
| 597 | + * |
|
| 598 | + */ |
|
| 599 | 599 | public function getAllLiveSpotterDataByIdent($ident) |
| 600 | 600 | { |
| 601 | 601 | date_default_timezone_set('UTC'); |
| 602 | 602 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 603 | 603 | $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
| 604 | - try { |
|
| 604 | + try { |
|
| 605 | 605 | |
| 606 | 606 | $sth = $this->db->prepare($query); |
| 607 | 607 | $sth->execute(array(':ident' => $ident)); |
@@ -615,23 +615,23 @@ discard block |
||
| 615 | 615 | |
| 616 | 616 | |
| 617 | 617 | /** |
| 618 | - * Deletes all info in the table |
|
| 619 | - * |
|
| 620 | - * @return String success or false |
|
| 621 | - * |
|
| 622 | - */ |
|
| 618 | + * Deletes all info in the table |
|
| 619 | + * |
|
| 620 | + * @return String success or false |
|
| 621 | + * |
|
| 622 | + */ |
|
| 623 | 623 | public function deleteLiveSpotterData() |
| 624 | 624 | { |
| 625 | 625 | global $globalDBdriver; |
| 626 | 626 | if ($globalDBdriver == 'mysql') { |
| 627 | 627 | //$query = "DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE) >= spotter_live.date"; |
| 628 | 628 | $query = 'DELETE FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 9 HOUR) >= spotter_live.date'; |
| 629 | - //$query = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)"; |
|
| 629 | + //$query = "DELETE FROM spotter_live WHERE spotter_live.id IN (SELECT spotter_live.id FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) >= spotter_live.date)"; |
|
| 630 | 630 | } else { |
| 631 | 631 | $query = "DELETE FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date"; |
| 632 | 632 | } |
| 633 | 633 | |
| 634 | - try { |
|
| 634 | + try { |
|
| 635 | 635 | |
| 636 | 636 | $sth = $this->db->prepare($query); |
| 637 | 637 | $sth->execute(); |
@@ -643,18 +643,18 @@ discard block |
||
| 643 | 643 | } |
| 644 | 644 | |
| 645 | 645 | /** |
| 646 | - * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 647 | - * |
|
| 648 | - * @return String success or false |
|
| 649 | - * |
|
| 650 | - */ |
|
| 646 | + * Deletes all info in the table for aircraft not seen since 2 HOUR |
|
| 647 | + * |
|
| 648 | + * @return String success or false |
|
| 649 | + * |
|
| 650 | + */ |
|
| 651 | 651 | public function deleteLiveSpotterDataNotUpdated() |
| 652 | 652 | { |
| 653 | 653 | global $globalDBdriver, $globalDebug; |
| 654 | 654 | if ($globalDBdriver == 'mysql') { |
| 655 | 655 | //$query = 'SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE DATE_SUB(UTC_TIMESTAMP(), INTERVAL 1 HOUR) < spotter_live.date) LIMIT 800 OFFSET 0'; |
| 656 | - $query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0"; |
|
| 657 | - try { |
|
| 656 | + $query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND DATE_SUB(UTC_TIMESTAMP(), INTERVAL 2 HOUR) >= s.max_date LIMIT 2000 OFFSET 0"; |
|
| 657 | + try { |
|
| 658 | 658 | |
| 659 | 659 | $sth = $this->db->prepare($query); |
| 660 | 660 | $sth->execute(); |
@@ -662,8 +662,8 @@ discard block |
||
| 662 | 662 | return "error"; |
| 663 | 663 | } |
| 664 | 664 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
| 665 | - $i = 0; |
|
| 666 | - $j =0; |
|
| 665 | + $i = 0; |
|
| 666 | + $j =0; |
|
| 667 | 667 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 668 | 668 | foreach($all as $row) |
| 669 | 669 | { |
@@ -671,20 +671,20 @@ discard block |
||
| 671 | 671 | $j++; |
| 672 | 672 | if ($j == 30) { |
| 673 | 673 | if ($globalDebug) echo "."; |
| 674 | - try { |
|
| 674 | + try { |
|
| 675 | 675 | |
| 676 | 676 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 677 | 677 | $sth->execute(); |
| 678 | 678 | } catch(PDOException $e) { |
| 679 | 679 | return "error"; |
| 680 | 680 | } |
| 681 | - $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
|
| 682 | - $j = 0; |
|
| 681 | + $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
|
| 682 | + $j = 0; |
|
| 683 | 683 | } |
| 684 | 684 | $query_delete .= "'".$row['flightaware_id']."',"; |
| 685 | 685 | } |
| 686 | 686 | if ($i > 0) { |
| 687 | - try { |
|
| 687 | + try { |
|
| 688 | 688 | |
| 689 | 689 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
| 690 | 690 | $sth->execute(); |
@@ -695,9 +695,9 @@ discard block |
||
| 695 | 695 | return "success"; |
| 696 | 696 | } elseif ($globalDBdriver == 'pgsql') { |
| 697 | 697 | //$query = "SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' >= spotter_live.date AND spotter_live.flightaware_id NOT IN (SELECT flightaware_id FROM spotter_live WHERE NOW() AT TIME ZONE 'UTC' - INTERVAL '9 HOURS' < spotter_live.date) LIMIT 800 OFFSET 0"; |
| 698 | - //$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
| 699 | - $query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)"; |
|
| 700 | - try { |
|
| 698 | + //$query = "SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 800 OFFSET 0"; |
|
| 699 | + $query = "DELETE FROM spotter_live WHERE flightaware_id IN (SELECT spotter_live.flightaware_id FROM spotter_live INNER JOIN (SELECT flightaware_id,MAX(date) as max_date FROM spotter_live GROUP BY flightaware_id) s ON s.flightaware_id = spotter_live.flightaware_id AND NOW() AT TIME ZONE 'UTC' - INTERVAL '2 HOURS' >= s.max_date LIMIT 2000 OFFSET 0)"; |
|
| 700 | + try { |
|
| 701 | 701 | |
| 702 | 702 | $sth = $this->db->prepare($query); |
| 703 | 703 | $sth->execute(); |
@@ -741,17 +741,17 @@ discard block |
||
| 741 | 741 | } |
| 742 | 742 | |
| 743 | 743 | /** |
| 744 | - * Deletes all info in the table for an ident |
|
| 745 | - * |
|
| 746 | - * @return String success or false |
|
| 747 | - * |
|
| 748 | - */ |
|
| 744 | + * Deletes all info in the table for an ident |
|
| 745 | + * |
|
| 746 | + * @return String success or false |
|
| 747 | + * |
|
| 748 | + */ |
|
| 749 | 749 | public function deleteLiveSpotterDataByIdent($ident) |
| 750 | 750 | { |
| 751 | 751 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 752 | 752 | $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
| 753 | 753 | |
| 754 | - try { |
|
| 754 | + try { |
|
| 755 | 755 | |
| 756 | 756 | $sth = $this->db->prepare($query); |
| 757 | 757 | $sth->execute(array(':ident' => $ident)); |
@@ -763,17 +763,17 @@ discard block |
||
| 763 | 763 | } |
| 764 | 764 | |
| 765 | 765 | /** |
| 766 | - * Deletes all info in the table for an id |
|
| 767 | - * |
|
| 768 | - * @return String success or false |
|
| 769 | - * |
|
| 770 | - */ |
|
| 766 | + * Deletes all info in the table for an id |
|
| 767 | + * |
|
| 768 | + * @return String success or false |
|
| 769 | + * |
|
| 770 | + */ |
|
| 771 | 771 | public function deleteLiveSpotterDataById($id) |
| 772 | 772 | { |
| 773 | 773 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 774 | 774 | $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
| 775 | 775 | |
| 776 | - try { |
|
| 776 | + try { |
|
| 777 | 777 | |
| 778 | 778 | $sth = $this->db->prepare($query); |
| 779 | 779 | $sth->execute(array(':id' => $id)); |
@@ -786,11 +786,11 @@ discard block |
||
| 786 | 786 | |
| 787 | 787 | |
| 788 | 788 | /** |
| 789 | - * Gets the aircraft ident within the last hour |
|
| 790 | - * |
|
| 791 | - * @return String the ident |
|
| 792 | - * |
|
| 793 | - */ |
|
| 789 | + * Gets the aircraft ident within the last hour |
|
| 790 | + * |
|
| 791 | + * @return String the ident |
|
| 792 | + * |
|
| 793 | + */ |
|
| 794 | 794 | public function getIdentFromLastHour($ident) |
| 795 | 795 | { |
| 796 | 796 | global $globalDBdriver, $globalTimezone; |
@@ -816,14 +816,14 @@ discard block |
||
| 816 | 816 | $ident_result = $row['ident']; |
| 817 | 817 | } |
| 818 | 818 | return $ident_result; |
| 819 | - } |
|
| 819 | + } |
|
| 820 | 820 | |
| 821 | 821 | /** |
| 822 | - * Check recent aircraft |
|
| 823 | - * |
|
| 824 | - * @return String the ident |
|
| 825 | - * |
|
| 826 | - */ |
|
| 822 | + * Check recent aircraft |
|
| 823 | + * |
|
| 824 | + * @return String the ident |
|
| 825 | + * |
|
| 826 | + */ |
|
| 827 | 827 | public function checkIdentRecent($ident) |
| 828 | 828 | { |
| 829 | 829 | global $globalDBdriver, $globalTimezone; |
@@ -849,14 +849,14 @@ discard block |
||
| 849 | 849 | $ident_result = $row['flightaware_id']; |
| 850 | 850 | } |
| 851 | 851 | return $ident_result; |
| 852 | - } |
|
| 852 | + } |
|
| 853 | 853 | |
| 854 | 854 | /** |
| 855 | - * Check recent aircraft by id |
|
| 856 | - * |
|
| 857 | - * @return String the ident |
|
| 858 | - * |
|
| 859 | - */ |
|
| 855 | + * Check recent aircraft by id |
|
| 856 | + * |
|
| 857 | + * @return String the ident |
|
| 858 | + * |
|
| 859 | + */ |
|
| 860 | 860 | public function checkIdRecent($id) |
| 861 | 861 | { |
| 862 | 862 | global $globalDBdriver, $globalTimezone; |
@@ -882,14 +882,14 @@ discard block |
||
| 882 | 882 | $ident_result = $row['flightaware_id']; |
| 883 | 883 | } |
| 884 | 884 | return $ident_result; |
| 885 | - } |
|
| 885 | + } |
|
| 886 | 886 | |
| 887 | 887 | /** |
| 888 | - * Check recent aircraft by ModeS |
|
| 889 | - * |
|
| 890 | - * @return String the ModeS |
|
| 891 | - * |
|
| 892 | - */ |
|
| 888 | + * Check recent aircraft by ModeS |
|
| 889 | + * |
|
| 890 | + * @return String the ModeS |
|
| 891 | + * |
|
| 892 | + */ |
|
| 893 | 893 | public function checkModeSRecent($modes) |
| 894 | 894 | { |
| 895 | 895 | global $globalDBdriver, $globalTimezone; |
@@ -916,19 +916,19 @@ discard block |
||
| 916 | 916 | $ident_result = $row['flightaware_id']; |
| 917 | 917 | } |
| 918 | 918 | return $ident_result; |
| 919 | - } |
|
| 919 | + } |
|
| 920 | 920 | |
| 921 | 921 | /** |
| 922 | - * Adds a new spotter data |
|
| 923 | - * |
|
| 924 | - * @param String $flightaware_id the ID from flightaware |
|
| 925 | - * @param String $ident the flight ident |
|
| 926 | - * @param String $aircraft_icao the aircraft type |
|
| 927 | - * @param String $departure_airport_icao the departure airport |
|
| 928 | - * @param String $arrival_airport_icao the arrival airport |
|
| 929 | - * @return String success or false |
|
| 930 | - * |
|
| 931 | - */ |
|
| 922 | + * Adds a new spotter data |
|
| 923 | + * |
|
| 924 | + * @param String $flightaware_id the ID from flightaware |
|
| 925 | + * @param String $ident the flight ident |
|
| 926 | + * @param String $aircraft_icao the aircraft type |
|
| 927 | + * @param String $departure_airport_icao the departure airport |
|
| 928 | + * @param String $arrival_airport_icao the arrival airport |
|
| 929 | + * @return String success or false |
|
| 930 | + * |
|
| 931 | + */ |
|
| 932 | 932 | public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '') |
| 933 | 933 | { |
| 934 | 934 | global $globalURL, $globalArchive, $globalDebug; |
@@ -1071,10 +1071,10 @@ discard block |
||
| 1071 | 1071 | $arrival_airport_country = ''; |
| 1072 | 1072 | |
| 1073 | 1073 | |
| 1074 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1075 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1076 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1077 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1074 | + if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1075 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1076 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1077 | + if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1078 | 1078 | |
| 1079 | 1079 | $query = ''; |
| 1080 | 1080 | if ($globalArchive) { |
@@ -1095,10 +1095,10 @@ discard block |
||
| 1095 | 1095 | return "error : ".$e->getMessage(); |
| 1096 | 1096 | } |
| 1097 | 1097 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1098 | - if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 1099 | - $SpotterArchive = new SpotterArchive($this->db); |
|
| 1100 | - $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1101 | - if ($globalDebug) echo $result.')'; |
|
| 1098 | + if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 1099 | + $SpotterArchive = new SpotterArchive($this->db); |
|
| 1100 | + $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1101 | + if ($globalDebug) echo $result.')'; |
|
| 1102 | 1102 | } elseif ($globalDebug && $putinarchive !== true) { |
| 1103 | 1103 | echo '(Not adding to archive)'; |
| 1104 | 1104 | } elseif ($globalDebug && $noarchive === true) { |
@@ -16,62 +16,62 @@ discard block |
||
| 16 | 16 | * @param Array $filter the filter |
| 17 | 17 | * @return Array the SQL part |
| 18 | 18 | */ |
| 19 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 19 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 20 | 20 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 21 | 21 | $filters = array(); |
| 22 | 22 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 23 | 23 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 24 | 24 | $filters = $globalStatsFilters[$globalFilterName]; |
| 25 | 25 | } else { |
| 26 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 26 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | if (isset($filter[0]['source'])) { |
| 30 | - $filters = array_merge($filters,$filter); |
|
| 30 | + $filters = array_merge($filters, $filter); |
|
| 31 | 31 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 33 | 33 | $filter_query_join = ''; |
| 34 | 34 | $filter_query_where = ''; |
| 35 | - foreach($filters as $flt) { |
|
| 35 | + foreach ($filters as $flt) { |
|
| 36 | 36 | if (isset($flt['airlines']) && !empty($flt['airlines'])) { |
| 37 | 37 | if ($flt['airlines'][0] != '') { |
| 38 | 38 | if (isset($flt['source'])) { |
| 39 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 39 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 40 | 40 | } else { |
| 41 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 41 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $flt['airlines'])."')) saf ON saf.flightaware_id = spotter_live.flightaware_id"; |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | if (isset($flt['pilots_id']) && !empty($flt['pilots_id'])) { |
| 46 | 46 | if (isset($flt['source'])) { |
| 47 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 47 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 48 | 48 | } else { |
| 49 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 49 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $flt['pilots_id'])."')) spi ON spi.flightaware_id = spotter_live.flightaware_id"; |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 53 | 53 | if (isset($flt['source'])) { |
| 54 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 54 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 55 | 55 | } else { |
| 56 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 56 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.flightaware_id = spotter_live.flightaware_id"; |
|
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | if (isset($flt['registrations']) && !empty($flt['registrations'])) { |
| 60 | 60 | if (isset($flt['source'])) { |
| 61 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 61 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 62 | 62 | } else { |
| 63 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','",$flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 63 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.registration IN ('".implode("','", $flt['registrations'])."')) sre ON sre.flightaware_id = spotter_live.flightaware_id"; |
|
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | if ((isset($flt['airlines']) && empty($flt['airlines']) && isset($flt['pilots_id']) && empty($flt['pilots_id']) && isset($flt['idents']) && empty($flt['idents'])) || (!isset($flt['airlines']) && !isset($flt['pilots_id']) && !isset($flt['idents']) && !isset($flt['registrations']))) { |
| 67 | 67 | if (isset($flt['source'])) { |
| 68 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','",$flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id"; |
|
| 68 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.format_source IN ('".implode("','", $flt['source'])."')) ssf ON ssf.flightaware_id = spotter_live.flightaware_id"; |
|
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 73 | 73 | if ($filter['airlines'][0] != '') { |
| 74 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id"; |
|
| 74 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) sai ON sai.flightaware_id = spotter_live.flightaware_id"; |
|
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | if (isset($filter['alliance']) && !empty($filter['alliance'])) { |
@@ -81,10 +81,10 @@ discard block |
||
| 81 | 81 | $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.flightaware_id = spotter_live.flightaware_id "; |
| 82 | 82 | } |
| 83 | 83 | if (isset($filter['pilots_id']) && !empty($filter['pilots_id'])) { |
| 84 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','",$filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id"; |
|
| 84 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output WHERE spotter_output.pilot_id IN ('".implode("','", $filter['pilots_id'])."')) sp ON sp.flightaware_id = spotter_live.flightaware_id"; |
|
| 85 | 85 | } |
| 86 | 86 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 87 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 87 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 88 | 88 | } |
| 89 | 89 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 90 | 90 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -113,15 +113,15 @@ discard block |
||
| 113 | 113 | $filter_query_date .= " AND EXTRACT(DAY FROM spotter_output.date) = '".$filter['day']."'"; |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | - $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id"; |
|
| 116 | + $filter_query_join .= " INNER JOIN (SELECT flightaware_id FROM spotter_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.flightaware_id = spotter_live.flightaware_id"; |
|
| 117 | 117 | } |
| 118 | 118 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 119 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 119 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 120 | 120 | } |
| 121 | 121 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 122 | 122 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 123 | 123 | if ($filter_query_where != '') { |
| 124 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 124 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 125 | 125 | } |
| 126 | 126 | $filter_query = $filter_query_join.$filter_query_where; |
| 127 | 127 | return $filter_query; |
@@ -144,8 +144,8 @@ discard block |
||
| 144 | 144 | if ($limit != '') |
| 145 | 145 | { |
| 146 | 146 | $limit_array = explode(',', $limit); |
| 147 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 148 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 147 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 148 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 149 | 149 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 150 | 150 | { |
| 151 | 151 | $limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0]; |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | } else { |
| 170 | 170 | $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate".$filter_query.$orderby_query; |
| 171 | 171 | } |
| 172 | - $spotter_array = $Spotter->getDataFromDB($query.$limit_query,array(),'',true); |
|
| 172 | + $spotter_array = $Spotter->getDataFromDB($query.$limit_query, array(), '', true); |
|
| 173 | 173 | |
| 174 | 174 | return $spotter_array; |
| 175 | 175 | } |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | { |
| 185 | 185 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 186 | 186 | date_default_timezone_set('UTC'); |
| 187 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 187 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 188 | 188 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 189 | 189 | if ($globalDBdriver == 'mysql') { |
| 190 | 190 | if (isset($globalArchive) && $globalArchive === TRUE) { |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | try { |
| 208 | 208 | $sth = $this->db->prepare($query); |
| 209 | 209 | $sth->execute(); |
| 210 | - } catch(PDOException $e) { |
|
| 210 | + } catch (PDOException $e) { |
|
| 211 | 211 | echo $e->getMessage(); |
| 212 | 212 | die; |
| 213 | 213 | } |
@@ -226,28 +226,28 @@ discard block |
||
| 226 | 226 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 227 | 227 | date_default_timezone_set('UTC'); |
| 228 | 228 | |
| 229 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 229 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 230 | 230 | |
| 231 | 231 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 232 | 232 | if ($globalDBdriver == 'mysql') { |
| 233 | 233 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 234 | - $query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source |
|
| 234 | + $query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source |
|
| 235 | 235 | FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id AND spotter_archive.latitude <> '0' AND spotter_archive.longitude <> '0' |
| 236 | 236 | ORDER BY spotter_archive.flightaware_id, spotter_archive.date"; |
| 237 | 237 | } else { |
| 238 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 238 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 239 | 239 | FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 240 | 240 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 241 | 241 | } |
| 242 | 242 | } else { |
| 243 | 243 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 244 | - $query = "SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source |
|
| 244 | + $query = "SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source |
|
| 245 | 245 | FROM spotter_archive INNER JOIN (SELECT flightaware_id FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date) l ON l.flightaware_id = spotter_archive.flightaware_id |
| 246 | 246 | WHERE spotter_archive.latitude <> '0' AND spotter_archive.longitude <> '0' |
| 247 | 247 | ORDER BY spotter_archive.flightaware_id, spotter_archive.date"; |
| 248 | 248 | //AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".round($globalLiveInterval*1000)." SECONDS' <= spotter_archive.date |
| 249 | 249 | } else { |
| 250 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 250 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 251 | 251 | FROM spotter_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0' |
| 252 | 252 | ORDER BY spotter_live.flightaware_id, spotter_live.date"; |
| 253 | 253 | } |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | try { |
| 256 | 256 | $sth = $this->db->prepare($query); |
| 257 | 257 | $sth->execute(); |
| 258 | - } catch(PDOException $e) { |
|
| 258 | + } catch (PDOException $e) { |
|
| 259 | 259 | echo $e->getMessage(); |
| 260 | 260 | die; |
| 261 | 261 | } |
@@ -272,7 +272,7 @@ discard block |
||
| 272 | 272 | public function getLiveSpotterCount($filter = array()) |
| 273 | 273 | { |
| 274 | 274 | global $globalDBdriver, $globalLiveInterval; |
| 275 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 275 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 276 | 276 | |
| 277 | 277 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 278 | 278 | if ($globalDBdriver == 'mysql') { |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | try { |
| 286 | 286 | $sth = $this->db->prepare($query); |
| 287 | 287 | $sth->execute(); |
| 288 | - } catch(PDOException $e) { |
|
| 288 | + } catch (PDOException $e) { |
|
| 289 | 289 | echo $e->getMessage(); |
| 290 | 290 | die; |
| 291 | 291 | } |
@@ -308,10 +308,10 @@ discard block |
||
| 308 | 308 | $filter_query = $this->getFilter($filter); |
| 309 | 309 | |
| 310 | 310 | if (is_array($coord)) { |
| 311 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 312 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 313 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 314 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 311 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 312 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 313 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 314 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 315 | 315 | } else return array(); |
| 316 | 316 | if ($globalDBdriver == 'mysql') { |
| 317 | 317 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query; |
@@ -334,23 +334,23 @@ discard block |
||
| 334 | 334 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 335 | 335 | $Spotter = new Spotter($this->db); |
| 336 | 336 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 337 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 337 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 338 | 338 | |
| 339 | 339 | if (is_array($coord)) { |
| 340 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 341 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 342 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 343 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 340 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 341 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 342 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 343 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 344 | 344 | } else return array(); |
| 345 | 345 | if ($globalDBdriver == 'mysql') { |
| 346 | 346 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 347 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 347 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 348 | 348 | FROM spotter_live |
| 349 | 349 | '.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= spotter_live.date |
| 350 | 350 | AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' |
| 351 | 351 | AND spotter_live.latitude <> 0 AND spotter_live.longitude <> 0'; |
| 352 | 352 | } else { |
| 353 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 353 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 354 | 354 | FROM spotter_live |
| 355 | 355 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate |
| 356 | 356 | FROM spotter_live l |
@@ -362,14 +362,14 @@ discard block |
||
| 362 | 362 | } |
| 363 | 363 | } else { |
| 364 | 364 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 365 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 365 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 366 | 366 | FROM spotter_live |
| 367 | 367 | ".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= spotter_live.date |
| 368 | 368 | AND spotter_live.latitude BETWEEN ".$minlat." AND ".$maxlat." |
| 369 | 369 | AND spotter_live.longitude BETWEEN ".$minlong." AND ".$maxlong." |
| 370 | 370 | AND spotter_live.latitude <> '0' AND spotter_live.longitude <> '0'"; |
| 371 | 371 | } else { |
| 372 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 372 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
|
| 373 | 373 | FROM spotter_live |
| 374 | 374 | INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate |
| 375 | 375 | FROM spotter_live l |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | try { |
| 385 | 385 | $sth = $this->db->prepare($query); |
| 386 | 386 | $sth->execute(); |
| 387 | - } catch(PDOException $e) { |
|
| 387 | + } catch (PDOException $e) { |
|
| 388 | 388 | echo $e->getMessage(); |
| 389 | 389 | die; |
| 390 | 390 | } |
@@ -433,7 +433,7 @@ discard block |
||
| 433 | 433 | if ($interval == '1m') |
| 434 | 434 | { |
| 435 | 435 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 436 | - } else if ($interval == '15m'){ |
|
| 436 | + } else if ($interval == '15m') { |
|
| 437 | 437 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= spotter_live.date '; |
| 438 | 438 | } |
| 439 | 439 | } |
@@ -441,14 +441,14 @@ discard block |
||
| 441 | 441 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= spotter_live.date '; |
| 442 | 442 | } |
| 443 | 443 | |
| 444 | - $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 444 | + $query = "SELECT spotter_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM spotter_live |
|
| 445 | 445 | WHERE spotter_live.latitude <> '' |
| 446 | 446 | AND spotter_live.longitude <> '' |
| 447 | 447 | ".$additional_query." |
| 448 | 448 | HAVING distance < :radius |
| 449 | 449 | ORDER BY distance"; |
| 450 | 450 | |
| 451 | - $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 451 | + $spotter_array = $Spotter->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius)); |
|
| 452 | 452 | |
| 453 | 453 | return $spotter_array; |
| 454 | 454 | } |
@@ -466,9 +466,9 @@ discard block |
||
| 466 | 466 | date_default_timezone_set('UTC'); |
| 467 | 467 | |
| 468 | 468 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 469 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 469 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 470 | 470 | |
| 471 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident),'',true); |
|
| 471 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident), '', true); |
|
| 472 | 472 | |
| 473 | 473 | return $spotter_array; |
| 474 | 474 | } |
@@ -479,16 +479,16 @@ discard block |
||
| 479 | 479 | * @return Array the spotter information |
| 480 | 480 | * |
| 481 | 481 | */ |
| 482 | - public function getDateLiveSpotterDataByIdent($ident,$date) |
|
| 482 | + public function getDateLiveSpotterDataByIdent($ident, $date) |
|
| 483 | 483 | { |
| 484 | 484 | $Spotter = new Spotter($this->db); |
| 485 | 485 | date_default_timezone_set('UTC'); |
| 486 | 486 | |
| 487 | 487 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 488 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 488 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 489 | 489 | |
| 490 | - $date = date('c',$date); |
|
| 491 | - $spotter_array = $Spotter->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 490 | + $date = date('c', $date); |
|
| 491 | + $spotter_array = $Spotter->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 492 | 492 | |
| 493 | 493 | return $spotter_array; |
| 494 | 494 | } |
@@ -505,9 +505,9 @@ discard block |
||
| 505 | 505 | date_default_timezone_set('UTC'); |
| 506 | 506 | |
| 507 | 507 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 508 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 508 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 509 | 509 | |
| 510 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id),'',true); |
|
| 510 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id), '', true); |
|
| 511 | 511 | |
| 512 | 512 | return $spotter_array; |
| 513 | 513 | } |
@@ -518,15 +518,15 @@ discard block |
||
| 518 | 518 | * @return Array the spotter information |
| 519 | 519 | * |
| 520 | 520 | */ |
| 521 | - public function getDateLiveSpotterDataById($id,$date) |
|
| 521 | + public function getDateLiveSpotterDataById($id, $date) |
|
| 522 | 522 | { |
| 523 | 523 | $Spotter = new Spotter($this->db); |
| 524 | 524 | date_default_timezone_set('UTC'); |
| 525 | 525 | |
| 526 | 526 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 527 | - $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 528 | - $date = date('c',$date); |
|
| 529 | - $spotter_array = $Spotter->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
|
| 527 | + $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE l.flightaware_id = :id AND l.date <= :date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate ORDER BY spotter_live.date DESC'; |
|
| 528 | + $date = date('c', $date); |
|
| 529 | + $spotter_array = $Spotter->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true); |
|
| 530 | 530 | return $spotter_array; |
| 531 | 531 | } |
| 532 | 532 | |
@@ -542,13 +542,13 @@ discard block |
||
| 542 | 542 | date_default_timezone_set('UTC'); |
| 543 | 543 | |
| 544 | 544 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 545 | - $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 545 | + $query = 'SELECT spotter_live.altitude, spotter_live.date FROM spotter_live WHERE spotter_live.ident = :ident'; |
|
| 546 | 546 | |
| 547 | 547 | try { |
| 548 | 548 | |
| 549 | 549 | $sth = $this->db->prepare($query); |
| 550 | 550 | $sth->execute(array(':ident' => $ident)); |
| 551 | - } catch(PDOException $e) { |
|
| 551 | + } catch (PDOException $e) { |
|
| 552 | 552 | echo $e->getMessage(); |
| 553 | 553 | die; |
| 554 | 554 | } |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | * @return Array the spotter information |
| 564 | 564 | * |
| 565 | 565 | */ |
| 566 | - public function getAllLiveSpotterDataById($id,$liveinterval = false) |
|
| 566 | + public function getAllLiveSpotterDataById($id, $liveinterval = false) |
|
| 567 | 567 | { |
| 568 | 568 | global $globalDBdriver, $globalLiveInterval; |
| 569 | 569 | date_default_timezone_set('UTC'); |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | try { |
| 583 | 583 | $sth = $this->db->prepare($query); |
| 584 | 584 | $sth->execute(array(':id' => $id)); |
| 585 | - } catch(PDOException $e) { |
|
| 585 | + } catch (PDOException $e) { |
|
| 586 | 586 | echo $e->getMessage(); |
| 587 | 587 | die; |
| 588 | 588 | } |
@@ -600,12 +600,12 @@ discard block |
||
| 600 | 600 | { |
| 601 | 601 | date_default_timezone_set('UTC'); |
| 602 | 602 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 603 | - $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 603 | + $query = self::$global_query.' WHERE spotter_live.ident = :ident'; |
|
| 604 | 604 | try { |
| 605 | 605 | |
| 606 | 606 | $sth = $this->db->prepare($query); |
| 607 | 607 | $sth->execute(array(':ident' => $ident)); |
| 608 | - } catch(PDOException $e) { |
|
| 608 | + } catch (PDOException $e) { |
|
| 609 | 609 | echo $e->getMessage(); |
| 610 | 610 | die; |
| 611 | 611 | } |
@@ -635,7 +635,7 @@ discard block |
||
| 635 | 635 | |
| 636 | 636 | $sth = $this->db->prepare($query); |
| 637 | 637 | $sth->execute(); |
| 638 | - } catch(PDOException $e) { |
|
| 638 | + } catch (PDOException $e) { |
|
| 639 | 639 | return "error"; |
| 640 | 640 | } |
| 641 | 641 | |
@@ -658,14 +658,14 @@ discard block |
||
| 658 | 658 | |
| 659 | 659 | $sth = $this->db->prepare($query); |
| 660 | 660 | $sth->execute(); |
| 661 | - } catch(PDOException $e) { |
|
| 661 | + } catch (PDOException $e) { |
|
| 662 | 662 | return "error"; |
| 663 | 663 | } |
| 664 | 664 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
| 665 | 665 | $i = 0; |
| 666 | - $j =0; |
|
| 666 | + $j = 0; |
|
| 667 | 667 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 668 | - foreach($all as $row) |
|
| 668 | + foreach ($all as $row) |
|
| 669 | 669 | { |
| 670 | 670 | $i++; |
| 671 | 671 | $j++; |
@@ -673,9 +673,9 @@ discard block |
||
| 673 | 673 | if ($globalDebug) echo "."; |
| 674 | 674 | try { |
| 675 | 675 | |
| 676 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 676 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 677 | 677 | $sth->execute(); |
| 678 | - } catch(PDOException $e) { |
|
| 678 | + } catch (PDOException $e) { |
|
| 679 | 679 | return "error"; |
| 680 | 680 | } |
| 681 | 681 | $query_delete = 'DELETE FROM spotter_live WHERE flightaware_id IN ('; |
@@ -686,9 +686,9 @@ discard block |
||
| 686 | 686 | if ($i > 0) { |
| 687 | 687 | try { |
| 688 | 688 | |
| 689 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 689 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 690 | 690 | $sth->execute(); |
| 691 | - } catch(PDOException $e) { |
|
| 691 | + } catch (PDOException $e) { |
|
| 692 | 692 | return "error"; |
| 693 | 693 | } |
| 694 | 694 | } |
@@ -701,7 +701,7 @@ discard block |
||
| 701 | 701 | |
| 702 | 702 | $sth = $this->db->prepare($query); |
| 703 | 703 | $sth->execute(); |
| 704 | - } catch(PDOException $e) { |
|
| 704 | + } catch (PDOException $e) { |
|
| 705 | 705 | return "error"; |
| 706 | 706 | } |
| 707 | 707 | /* $query_delete = "DELETE FROM spotter_live WHERE flightaware_id IN ("; |
@@ -749,13 +749,13 @@ discard block |
||
| 749 | 749 | public function deleteLiveSpotterDataByIdent($ident) |
| 750 | 750 | { |
| 751 | 751 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 752 | - $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 752 | + $query = 'DELETE FROM spotter_live WHERE ident = :ident'; |
|
| 753 | 753 | |
| 754 | 754 | try { |
| 755 | 755 | |
| 756 | 756 | $sth = $this->db->prepare($query); |
| 757 | 757 | $sth->execute(array(':ident' => $ident)); |
| 758 | - } catch(PDOException $e) { |
|
| 758 | + } catch (PDOException $e) { |
|
| 759 | 759 | return "error"; |
| 760 | 760 | } |
| 761 | 761 | |
@@ -771,13 +771,13 @@ discard block |
||
| 771 | 771 | public function deleteLiveSpotterDataById($id) |
| 772 | 772 | { |
| 773 | 773 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 774 | - $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 774 | + $query = 'DELETE FROM spotter_live WHERE flightaware_id = :id'; |
|
| 775 | 775 | |
| 776 | 776 | try { |
| 777 | 777 | |
| 778 | 778 | $sth = $this->db->prepare($query); |
| 779 | 779 | $sth->execute(array(':id' => $id)); |
| 780 | - } catch(PDOException $e) { |
|
| 780 | + } catch (PDOException $e) { |
|
| 781 | 781 | return "error"; |
| 782 | 782 | } |
| 783 | 783 | |
@@ -795,13 +795,13 @@ discard block |
||
| 795 | 795 | { |
| 796 | 796 | global $globalDBdriver, $globalTimezone; |
| 797 | 797 | if ($globalDBdriver == 'mysql') { |
| 798 | - $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 798 | + $query = 'SELECT spotter_live.ident FROM spotter_live |
|
| 799 | 799 | WHERE spotter_live.ident = :ident |
| 800 | 800 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 801 | 801 | AND spotter_live.date < UTC_TIMESTAMP()'; |
| 802 | 802 | $query_data = array(':ident' => $ident); |
| 803 | 803 | } else { |
| 804 | - $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 804 | + $query = "SELECT spotter_live.ident FROM spotter_live |
|
| 805 | 805 | WHERE spotter_live.ident = :ident |
| 806 | 806 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 807 | 807 | AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -810,8 +810,8 @@ discard block |
||
| 810 | 810 | |
| 811 | 811 | $sth = $this->db->prepare($query); |
| 812 | 812 | $sth->execute($query_data); |
| 813 | - $ident_result=''; |
|
| 814 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 813 | + $ident_result = ''; |
|
| 814 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 815 | 815 | { |
| 816 | 816 | $ident_result = $row['ident']; |
| 817 | 817 | } |
@@ -828,13 +828,13 @@ discard block |
||
| 828 | 828 | { |
| 829 | 829 | global $globalDBdriver, $globalTimezone; |
| 830 | 830 | if ($globalDBdriver == 'mysql') { |
| 831 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 831 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 832 | 832 | WHERE spotter_live.ident = :ident |
| 833 | 833 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 834 | 834 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 835 | 835 | $query_data = array(':ident' => $ident); |
| 836 | 836 | } else { |
| 837 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 837 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 838 | 838 | WHERE spotter_live.ident = :ident |
| 839 | 839 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'"; |
| 840 | 840 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -843,8 +843,8 @@ discard block |
||
| 843 | 843 | |
| 844 | 844 | $sth = $this->db->prepare($query); |
| 845 | 845 | $sth->execute($query_data); |
| 846 | - $ident_result=''; |
|
| 847 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 846 | + $ident_result = ''; |
|
| 847 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 848 | 848 | { |
| 849 | 849 | $ident_result = $row['flightaware_id']; |
| 850 | 850 | } |
@@ -861,13 +861,13 @@ discard block |
||
| 861 | 861 | { |
| 862 | 862 | global $globalDBdriver, $globalTimezone; |
| 863 | 863 | if ($globalDBdriver == 'mysql') { |
| 864 | - $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 864 | + $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 865 | 865 | WHERE spotter_live.flightaware_id = :id |
| 866 | 866 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 867 | 867 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 868 | 868 | $query_data = array(':id' => $id); |
| 869 | 869 | } else { |
| 870 | - $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 870 | + $query = "SELECT spotter_live.ident, spotter_live.flightaware_id FROM spotter_live |
|
| 871 | 871 | WHERE spotter_live.flightaware_id = :id |
| 872 | 872 | AND spotter_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 873 | 873 | // AND spotter_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -876,8 +876,8 @@ discard block |
||
| 876 | 876 | |
| 877 | 877 | $sth = $this->db->prepare($query); |
| 878 | 878 | $sth->execute($query_data); |
| 879 | - $ident_result=''; |
|
| 880 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 879 | + $ident_result = ''; |
|
| 880 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 881 | 881 | { |
| 882 | 882 | $ident_result = $row['flightaware_id']; |
| 883 | 883 | } |
@@ -894,13 +894,13 @@ discard block |
||
| 894 | 894 | { |
| 895 | 895 | global $globalDBdriver, $globalTimezone; |
| 896 | 896 | if ($globalDBdriver == 'mysql') { |
| 897 | - $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 897 | + $query = 'SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 898 | 898 | WHERE spotter_live.ModeS = :modes |
| 899 | 899 | AND spotter_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 900 | 900 | // AND spotter_live.date < UTC_TIMESTAMP()"; |
| 901 | 901 | $query_data = array(':modes' => $modes); |
| 902 | 902 | } else { |
| 903 | - $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 903 | + $query = "SELECT spotter_live.ModeS, spotter_live.flightaware_id FROM spotter_live |
|
| 904 | 904 | WHERE spotter_live.ModeS = :modes |
| 905 | 905 | AND spotter_live.date >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '30 MINUTE'"; |
| 906 | 906 | // // AND spotter_live.date < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
@@ -909,8 +909,8 @@ discard block |
||
| 909 | 909 | |
| 910 | 910 | $sth = $this->db->prepare($query); |
| 911 | 911 | $sth->execute($query_data); |
| 912 | - $ident_result=''; |
|
| 913 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 912 | + $ident_result = ''; |
|
| 913 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 914 | 914 | { |
| 915 | 915 | //$ident_result = $row['spotter_live_id']; |
| 916 | 916 | $ident_result = $row['flightaware_id']; |
@@ -929,7 +929,7 @@ discard block |
||
| 929 | 929 | * @return String success or false |
| 930 | 930 | * |
| 931 | 931 | */ |
| 932 | - public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '',$heading = '', $groundspeed = '', $date = '',$departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false,$registration = '',$pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false,$format_source = '', $source_name = '', $over_country = '') |
|
| 932 | + public function addLiveSpotterData($flightaware_id = '', $ident = '', $aircraft_icao = '', $departure_airport_icao = '', $arrival_airport_icao = '', $latitude = '', $longitude = '', $waypoints = '', $altitude = '', $altitude_real = '', $heading = '', $groundspeed = '', $date = '', $departure_airport_time = '', $arrival_airport_time = '', $squawk = '', $route_stop = '', $ModeS = '', $putinarchive = false, $registration = '', $pilot_id = '', $pilot_name = '', $verticalrate = '', $noarchive = false, $ground = false, $format_source = '', $source_name = '', $over_country = '') |
|
| 933 | 933 | { |
| 934 | 934 | global $globalURL, $globalArchive, $globalDebug; |
| 935 | 935 | $Common = new Common(); |
@@ -1029,27 +1029,27 @@ discard block |
||
| 1029 | 1029 | if ($date == '') $date = date("Y-m-d H:i:s", time()); |
| 1030 | 1030 | |
| 1031 | 1031 | |
| 1032 | - $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
|
| 1033 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1034 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 1035 | - $departure_airport_icao = filter_var($departure_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1036 | - $arrival_airport_icao = filter_var($arrival_airport_icao,FILTER_SANITIZE_STRING); |
|
| 1037 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1038 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1039 | - $waypoints = filter_var($waypoints,FILTER_SANITIZE_STRING); |
|
| 1040 | - $altitude = filter_var($altitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1041 | - $altitude_real = filter_var($altitude_real,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1042 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 1043 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1044 | - $squawk = filter_var($squawk,FILTER_SANITIZE_NUMBER_INT); |
|
| 1045 | - $route_stop = filter_var($route_stop,FILTER_SANITIZE_STRING); |
|
| 1046 | - $ModeS = filter_var($ModeS,FILTER_SANITIZE_STRING); |
|
| 1047 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_STRING); |
|
| 1048 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 1049 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 1050 | - $source_name = filter_var($source_name,FILTER_SANITIZE_STRING); |
|
| 1051 | - $over_country = filter_var($over_country,FILTER_SANITIZE_STRING); |
|
| 1052 | - $verticalrate = filter_var($verticalrate,FILTER_SANITIZE_NUMBER_INT); |
|
| 1032 | + $flightaware_id = filter_var($flightaware_id, FILTER_SANITIZE_STRING); |
|
| 1033 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1034 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 1035 | + $departure_airport_icao = filter_var($departure_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1036 | + $arrival_airport_icao = filter_var($arrival_airport_icao, FILTER_SANITIZE_STRING); |
|
| 1037 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1038 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1039 | + $waypoints = filter_var($waypoints, FILTER_SANITIZE_STRING); |
|
| 1040 | + $altitude = filter_var($altitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1041 | + $altitude_real = filter_var($altitude_real, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1042 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 1043 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1044 | + $squawk = filter_var($squawk, FILTER_SANITIZE_NUMBER_INT); |
|
| 1045 | + $route_stop = filter_var($route_stop, FILTER_SANITIZE_STRING); |
|
| 1046 | + $ModeS = filter_var($ModeS, FILTER_SANITIZE_STRING); |
|
| 1047 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_STRING); |
|
| 1048 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 1049 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 1050 | + $source_name = filter_var($source_name, FILTER_SANITIZE_STRING); |
|
| 1051 | + $over_country = filter_var($over_country, FILTER_SANITIZE_STRING); |
|
| 1052 | + $verticalrate = filter_var($verticalrate, FILTER_SANITIZE_NUMBER_INT); |
|
| 1053 | 1053 | |
| 1054 | 1054 | $airline_name = ''; |
| 1055 | 1055 | $airline_icao = ''; |
@@ -1071,10 +1071,10 @@ discard block |
||
| 1071 | 1071 | $arrival_airport_country = ''; |
| 1072 | 1072 | |
| 1073 | 1073 | |
| 1074 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1075 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1076 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1077 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1074 | + if ($squawk == '' || $Common->isInteger($squawk) === false) $squawk = NULL; |
|
| 1075 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false) $verticalrate = NULL; |
|
| 1076 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 1077 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 1078 | 1078 | |
| 1079 | 1079 | $query = ''; |
| 1080 | 1080 | if ($globalArchive) { |
@@ -1085,19 +1085,19 @@ discard block |
||
| 1085 | 1085 | $query .= 'INSERT INTO spotter_live (flightaware_id, ident, registration, airline_name, airline_icao, airline_country, airline_type, aircraft_icao, aircraft_shadow, aircraft_name, aircraft_manufacturer, departure_airport_icao, departure_airport_name, departure_airport_city, departure_airport_country, arrival_airport_icao, arrival_airport_name, arrival_airport_city, arrival_airport_country, latitude, longitude, waypoints, altitude, heading, ground_speed, date, departure_airport_time, arrival_airport_time, squawk, route_stop, ModeS, pilot_id, pilot_name, verticalrate, ground, format_source, source_name, over_country, real_altitude) |
| 1086 | 1086 | VALUES (:flightaware_id,:ident,:registration,:airline_name,:airline_icao,:airline_country,:airline_type,:aircraft_icao,:aircraft_shadow,:aircraft_type,:aircraft_manufacturer,:departure_airport_icao,:departure_airport_name, :departure_airport_city, :departure_airport_country, :arrival_airport_icao, :arrival_airport_name, :arrival_airport_city, :arrival_airport_country, :latitude,:longitude,:waypoints,:altitude,:heading,:groundspeed,:date,:departure_airport_time,:arrival_airport_time,:squawk,:route_stop,:ModeS, :pilot_id, :pilot_name, :verticalrate, :ground, :format_source, :source_name, :over_country, :real_altitude)'; |
| 1087 | 1087 | |
| 1088 | - $query_values = array(':flightaware_id' => $flightaware_id,':ident' => $ident, ':registration' => $registration,':airline_name' => $airline_name,':airline_icao' => $airline_icao,':airline_country' => $airline_country,':airline_type' => $airline_type,':aircraft_icao' => $aircraft_icao,':aircraft_shadow' => $aircraft_shadow,':aircraft_type' => $aircraft_type,':aircraft_manufacturer' => $aircraft_manufacturer,':departure_airport_icao' => $departure_airport_icao,':departure_airport_name' => $departure_airport_name,':departure_airport_city' => $departure_airport_city,':departure_airport_country' => $departure_airport_country,':arrival_airport_icao' => $arrival_airport_icao,':arrival_airport_name' => $arrival_airport_name,':arrival_airport_city' => $arrival_airport_city,':arrival_airport_country' => $arrival_airport_country,':latitude' => $latitude,':longitude' => $longitude, ':waypoints' => $waypoints,':altitude' => $altitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':departure_airport_time' => $departure_airport_time,':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk,':route_stop' => $route_stop,':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source,':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country,':real_altitude' => $altitude_real); |
|
| 1088 | + $query_values = array(':flightaware_id' => $flightaware_id, ':ident' => $ident, ':registration' => $registration, ':airline_name' => $airline_name, ':airline_icao' => $airline_icao, ':airline_country' => $airline_country, ':airline_type' => $airline_type, ':aircraft_icao' => $aircraft_icao, ':aircraft_shadow' => $aircraft_shadow, ':aircraft_type' => $aircraft_type, ':aircraft_manufacturer' => $aircraft_manufacturer, ':departure_airport_icao' => $departure_airport_icao, ':departure_airport_name' => $departure_airport_name, ':departure_airport_city' => $departure_airport_city, ':departure_airport_country' => $departure_airport_country, ':arrival_airport_icao' => $arrival_airport_icao, ':arrival_airport_name' => $arrival_airport_name, ':arrival_airport_city' => $arrival_airport_city, ':arrival_airport_country' => $arrival_airport_country, ':latitude' => $latitude, ':longitude' => $longitude, ':waypoints' => $waypoints, ':altitude' => $altitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':departure_airport_time' => $departure_airport_time, ':arrival_airport_time' => $arrival_airport_time, ':squawk' => $squawk, ':route_stop' => $route_stop, ':ModeS' => $ModeS, ':pilot_id' => $pilot_id, ':pilot_name' => $pilot_name, ':verticalrate' => $verticalrate, ':format_source' => $format_source, ':ground' => $ground, ':source_name' => $source_name, ':over_country' => $over_country, ':real_altitude' => $altitude_real); |
|
| 1089 | 1089 | try { |
| 1090 | 1090 | |
| 1091 | 1091 | $sth = $this->db->prepare($query); |
| 1092 | 1092 | $sth->execute($query_values); |
| 1093 | 1093 | $sth->closeCursor(); |
| 1094 | - } catch(PDOException $e) { |
|
| 1094 | + } catch (PDOException $e) { |
|
| 1095 | 1095 | return "error : ".$e->getMessage(); |
| 1096 | 1096 | } |
| 1097 | 1097 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1098 | 1098 | if ($globalDebug) echo '(Add to SBS archive : '; |
| 1099 | 1099 | $SpotterArchive = new SpotterArchive($this->db); |
| 1100 | - $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
|
| 1100 | + $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time, $arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name, $verticalrate, $format_source, $source_name, $over_country); |
|
| 1101 | 1101 | if ($globalDebug) echo $result.')'; |
| 1102 | 1102 | } elseif ($globalDebug && $putinarchive !== true) { |
| 1103 | 1103 | echo '(Not adding to archive)'; |
@@ -1110,7 +1110,7 @@ discard block |
||
| 1110 | 1110 | |
| 1111 | 1111 | public function getOrderBy() |
| 1112 | 1112 | { |
| 1113 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC")); |
|
| 1113 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY spotter_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY spotter_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY spotter_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY spotter_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY spotter_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY spotter_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY spotter_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY spotter_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY spotter_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY spotter_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY spotter_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY spotter_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY spotter_live.date DESC")); |
|
| 1114 | 1114 | return $orderby; |
| 1115 | 1115 | } |
| 1116 | 1116 | |
@@ -29,7 +29,9 @@ discard block |
||
| 29 | 29 | if (isset($filter[0]['source'])) { |
| 30 | 30 | $filters = array_merge($filters,$filter); |
| 31 | 31 | } |
| 32 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 32 | + if (is_array($globalFilter)) { |
|
| 33 | + $filter = array_merge($filter,$globalFilter); |
|
| 34 | + } |
|
| 33 | 35 | $filter_query_join = ''; |
| 34 | 36 | $filter_query_where = ''; |
| 35 | 37 | foreach($filters as $flt) { |
@@ -118,8 +120,11 @@ discard block |
||
| 118 | 120 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 119 | 121 | $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
| 120 | 122 | } |
| 121 | - if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
|
| 122 | - elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
|
| 123 | + if ($filter_query_where == '' && $where) { |
|
| 124 | + $filter_query_where = ' WHERE'; |
|
| 125 | + } elseif ($filter_query_where != '' && $and) { |
|
| 126 | + $filter_query_where .= ' AND'; |
|
| 127 | + } |
|
| 123 | 128 | if ($filter_query_where != '') { |
| 124 | 129 | $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
| 125 | 130 | } |
@@ -160,9 +165,13 @@ discard block |
||
| 160 | 165 | $orderby_query = ' '.$search_orderby_array[$sort]['sql']; |
| 161 | 166 | } |
| 162 | 167 | } |
| 163 | - if ($orderby_query == '') $orderby_query = ' ORDER BY date DESC'; |
|
| 168 | + if ($orderby_query == '') { |
|
| 169 | + $orderby_query = ' ORDER BY date DESC'; |
|
| 170 | + } |
|
| 164 | 171 | |
| 165 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 172 | + if (!isset($globalLiveInterval)) { |
|
| 173 | + $globalLiveInterval = '200'; |
|
| 174 | + } |
|
| 166 | 175 | if ($globalDBdriver == 'mysql') { |
| 167 | 176 | //$query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate"; |
| 168 | 177 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query.$orderby_query; |
@@ -185,7 +194,9 @@ discard block |
||
| 185 | 194 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 186 | 195 | date_default_timezone_set('UTC'); |
| 187 | 196 | $filter_query = $this->getFilter($filter,true,true); |
| 188 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 197 | + if (!isset($globalLiveInterval)) { |
|
| 198 | + $globalLiveInterval = '200'; |
|
| 199 | + } |
|
| 189 | 200 | if ($globalDBdriver == 'mysql') { |
| 190 | 201 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 191 | 202 | $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
@@ -228,7 +239,9 @@ discard block |
||
| 228 | 239 | |
| 229 | 240 | $filter_query = $this->getFilter($filter,true,true); |
| 230 | 241 | |
| 231 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 242 | + if (!isset($globalLiveInterval)) { |
|
| 243 | + $globalLiveInterval = '200'; |
|
| 244 | + } |
|
| 232 | 245 | if ($globalDBdriver == 'mysql') { |
| 233 | 246 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 234 | 247 | $query = 'SELECT spotter_archive.ident, spotter_archive.flightaware_id, spotter_archive.aircraft_icao, spotter_archive.departure_airport_icao as departure_airport, spotter_archive.arrival_airport_icao as arrival_airport, spotter_archive.latitude, spotter_archive.longitude, spotter_archive.altitude, spotter_archive.heading, spotter_archive.ground_speed, spotter_archive.squawk, spotter_archive.date, spotter_archive.format_source |
@@ -274,7 +287,9 @@ discard block |
||
| 274 | 287 | global $globalDBdriver, $globalLiveInterval; |
| 275 | 288 | $filter_query = $this->getFilter($filter,true,true); |
| 276 | 289 | |
| 277 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 290 | + if (!isset($globalLiveInterval)) { |
|
| 291 | + $globalLiveInterval = '200'; |
|
| 292 | + } |
|
| 278 | 293 | if ($globalDBdriver == 'mysql') { |
| 279 | 294 | //$query = 'SELECT COUNT(*) as nb FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate'.$filter_query; |
| 280 | 295 | $query = 'SELECT COUNT(DISTINCT spotter_live.flightaware_id) as nb FROM spotter_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
@@ -304,7 +319,9 @@ discard block |
||
| 304 | 319 | { |
| 305 | 320 | global $globalDBdriver, $globalLiveInterval; |
| 306 | 321 | $Spotter = new Spotter($this->db); |
| 307 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 322 | + if (!isset($globalLiveInterval)) { |
|
| 323 | + $globalLiveInterval = '200'; |
|
| 324 | + } |
|
| 308 | 325 | $filter_query = $this->getFilter($filter); |
| 309 | 326 | |
| 310 | 327 | if (is_array($coord)) { |
@@ -312,7 +329,9 @@ discard block |
||
| 312 | 329 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 313 | 330 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 314 | 331 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 315 | - } else return array(); |
|
| 332 | + } else { |
|
| 333 | + return array(); |
|
| 334 | + } |
|
| 316 | 335 | if ($globalDBdriver == 'mysql') { |
| 317 | 336 | $query = 'SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.flightaware_id, max(l.date) as maxdate FROM spotter_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.flightaware_id) s on spotter_live.flightaware_id = s.flightaware_id AND spotter_live.date = s.maxdate AND spotter_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND spotter_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY spotter_live.flightaware_id'.$filter_query; |
| 318 | 337 | } else { |
@@ -333,7 +352,9 @@ discard block |
||
| 333 | 352 | { |
| 334 | 353 | global $globalDBdriver, $globalLiveInterval, $globalArchive; |
| 335 | 354 | $Spotter = new Spotter($this->db); |
| 336 | - if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
|
| 355 | + if (!isset($globalLiveInterval)) { |
|
| 356 | + $globalLiveInterval = '200'; |
|
| 357 | + } |
|
| 337 | 358 | $filter_query = $this->getFilter($filter,true,true); |
| 338 | 359 | |
| 339 | 360 | if (is_array($coord)) { |
@@ -341,7 +362,9 @@ discard block |
||
| 341 | 362 | $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 342 | 363 | $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 343 | 364 | $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
| 344 | - } else return array(); |
|
| 365 | + } else { |
|
| 366 | + return array(); |
|
| 367 | + } |
|
| 345 | 368 | if ($globalDBdriver == 'mysql') { |
| 346 | 369 | if (isset($globalArchive) && $globalArchive === TRUE) { |
| 347 | 370 | $query = 'SELECT spotter_live.ident, spotter_live.flightaware_id, spotter_live.aircraft_icao, spotter_live.departure_airport_icao as departure_airport, spotter_live.arrival_airport_icao as arrival_airport, spotter_live.latitude, spotter_live.longitude, spotter_live.altitude, spotter_live.heading, spotter_live.ground_speed, spotter_live.squawk, spotter_live.date, spotter_live.format_source |
@@ -571,11 +594,15 @@ discard block |
||
| 571 | 594 | //$query = self::$global_query.' WHERE spotter_live.flightaware_id = :id ORDER BY date'; |
| 572 | 595 | if ($globalDBdriver == 'mysql') { |
| 573 | 596 | $query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id'; |
| 574 | - if ($liveinterval) $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 597 | + if ($liveinterval) { |
|
| 598 | + $query .= ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= date'; |
|
| 599 | + } |
|
| 575 | 600 | $query .= ' ORDER BY date'; |
| 576 | 601 | } else { |
| 577 | 602 | $query = 'SELECT spotter_live.* FROM spotter_live WHERE spotter_live.flightaware_id = :id'; |
| 578 | - if ($liveinterval) $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 603 | + if ($liveinterval) { |
|
| 604 | + $query .= " AND CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= date"; |
|
| 605 | + } |
|
| 579 | 606 | $query .= ' ORDER BY date'; |
| 580 | 607 | } |
| 581 | 608 | |
@@ -670,7 +697,9 @@ discard block |
||
| 670 | 697 | $i++; |
| 671 | 698 | $j++; |
| 672 | 699 | if ($j == 30) { |
| 673 | - if ($globalDebug) echo "."; |
|
| 700 | + if ($globalDebug) { |
|
| 701 | + echo "."; |
|
| 702 | + } |
|
| 674 | 703 | try { |
| 675 | 704 | |
| 676 | 705 | $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
@@ -977,7 +1006,9 @@ discard block |
||
| 977 | 1006 | { |
| 978 | 1007 | return false; |
| 979 | 1008 | } |
| 980 | - } else return ''; |
|
| 1009 | + } else { |
|
| 1010 | + return ''; |
|
| 1011 | + } |
|
| 981 | 1012 | |
| 982 | 1013 | if ($longitude != '') |
| 983 | 1014 | { |
@@ -985,7 +1016,9 @@ discard block |
||
| 985 | 1016 | { |
| 986 | 1017 | return false; |
| 987 | 1018 | } |
| 988 | - } else return ''; |
|
| 1019 | + } else { |
|
| 1020 | + return ''; |
|
| 1021 | + } |
|
| 989 | 1022 | |
| 990 | 1023 | if ($waypoints != '') |
| 991 | 1024 | { |
@@ -1001,14 +1034,18 @@ discard block |
||
| 1001 | 1034 | { |
| 1002 | 1035 | return false; |
| 1003 | 1036 | } |
| 1004 | - } else $altitude = 0; |
|
| 1037 | + } else { |
|
| 1038 | + $altitude = 0; |
|
| 1039 | + } |
|
| 1005 | 1040 | if ($altitude_real != '') |
| 1006 | 1041 | { |
| 1007 | 1042 | if (!is_numeric($altitude_real)) |
| 1008 | 1043 | { |
| 1009 | 1044 | return false; |
| 1010 | 1045 | } |
| 1011 | - } else $altitude_real = 0; |
|
| 1046 | + } else { |
|
| 1047 | + $altitude_real = 0; |
|
| 1048 | + } |
|
| 1012 | 1049 | |
| 1013 | 1050 | if ($heading != '') |
| 1014 | 1051 | { |
@@ -1016,7 +1053,9 @@ discard block |
||
| 1016 | 1053 | { |
| 1017 | 1054 | return false; |
| 1018 | 1055 | } |
| 1019 | - } else $heading = 0; |
|
| 1056 | + } else { |
|
| 1057 | + $heading = 0; |
|
| 1058 | + } |
|
| 1020 | 1059 | |
| 1021 | 1060 | if ($groundspeed != '') |
| 1022 | 1061 | { |
@@ -1024,9 +1063,13 @@ discard block |
||
| 1024 | 1063 | { |
| 1025 | 1064 | return false; |
| 1026 | 1065 | } |
| 1027 | - } else $groundspeed = 0; |
|
| 1066 | + } else { |
|
| 1067 | + $groundspeed = 0; |
|
| 1068 | + } |
|
| 1028 | 1069 | date_default_timezone_set('UTC'); |
| 1029 | - if ($date == '') $date = date("Y-m-d H:i:s", time()); |
|
| 1070 | + if ($date == '') { |
|
| 1071 | + $date = date("Y-m-d H:i:s", time()); |
|
| 1072 | + } |
|
| 1030 | 1073 | |
| 1031 | 1074 | |
| 1032 | 1075 | $flightaware_id = filter_var($flightaware_id,FILTER_SANITIZE_STRING); |
@@ -1071,14 +1114,24 @@ discard block |
||
| 1071 | 1114 | $arrival_airport_country = ''; |
| 1072 | 1115 | |
| 1073 | 1116 | |
| 1074 | - if ($squawk == '' || $Common->isInteger($squawk) === false ) $squawk = NULL; |
|
| 1075 | - if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) $verticalrate = NULL; |
|
| 1076 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 1077 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 1117 | + if ($squawk == '' || $Common->isInteger($squawk) === false ) { |
|
| 1118 | + $squawk = NULL; |
|
| 1119 | + } |
|
| 1120 | + if ($verticalrate == '' || $Common->isInteger($verticalrate) === false ) { |
|
| 1121 | + $verticalrate = NULL; |
|
| 1122 | + } |
|
| 1123 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) { |
|
| 1124 | + $groundspeed = 0; |
|
| 1125 | + } |
|
| 1126 | + if ($heading == '' || $Common->isInteger($heading) === false ) { |
|
| 1127 | + $heading = 0; |
|
| 1128 | + } |
|
| 1078 | 1129 | |
| 1079 | 1130 | $query = ''; |
| 1080 | 1131 | if ($globalArchive) { |
| 1081 | - if ($globalDebug) echo '-- Delete previous data -- '; |
|
| 1132 | + if ($globalDebug) { |
|
| 1133 | + echo '-- Delete previous data -- '; |
|
| 1134 | + } |
|
| 1082 | 1135 | $query .= 'DELETE FROM spotter_live WHERE flightaware_id = :flightaware_id;'; |
| 1083 | 1136 | } |
| 1084 | 1137 | |
@@ -1095,10 +1148,14 @@ discard block |
||
| 1095 | 1148 | return "error : ".$e->getMessage(); |
| 1096 | 1149 | } |
| 1097 | 1150 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 1098 | - if ($globalDebug) echo '(Add to SBS archive : '; |
|
| 1151 | + if ($globalDebug) { |
|
| 1152 | + echo '(Add to SBS archive : '; |
|
| 1153 | + } |
|
| 1099 | 1154 | $SpotterArchive = new SpotterArchive($this->db); |
| 1100 | 1155 | $result = $SpotterArchive->addSpotterArchiveData($flightaware_id, $ident, $registration, $airline_name, $airline_icao, $airline_country, $airline_type, $aircraft_icao, $aircraft_shadow, $aircraft_name, $aircraft_manufacturer, $departure_airport_icao, $departure_airport_name, $departure_airport_city, $departure_airport_country, $departure_airport_time,$arrival_airport_icao, $arrival_airport_name, $arrival_airport_city, $arrival_airport_country, $arrival_airport_time, $route_stop, $date,$latitude, $longitude, $waypoints, $altitude, $altitude_real,$heading, $groundspeed, $squawk, $ModeS, $pilot_id, $pilot_name,$verticalrate,$format_source,$source_name, $over_country); |
| 1101 | - if ($globalDebug) echo $result.')'; |
|
| 1156 | + if ($globalDebug) { |
|
| 1157 | + echo $result.')'; |
|
| 1158 | + } |
|
| 1102 | 1159 | } elseif ($globalDebug && $putinarchive !== true) { |
| 1103 | 1160 | echo '(Not adding to archive)'; |
| 1104 | 1161 | } elseif ($globalDebug && $noarchive === true) { |
