Ysurac /
FlightAirMap
@@ -45,20 +45,20 @@ discard block |
||
| 45 | 45 | die; |
| 46 | 46 | } |
| 47 | 47 | //$hosts = array($globalSBS1Host.':'.$globalSBS1Port); |
| 48 | - $globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port); |
|
| 48 | + $globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port); |
|
| 49 | 49 | } |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | -$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver')); |
|
| 52 | +$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver')); |
|
| 53 | 53 | //if (isset($options['s'])) $hosts = array($options['s']); |
| 54 | 54 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 55 | 55 | if (isset($options['s'])) { |
| 56 | 56 | $globalSources = array(); |
| 57 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 57 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']); |
|
| 58 | 58 | else $globalSources[] = array('host' => $options['s']); |
| 59 | 59 | } elseif (isset($options['source'])) { |
| 60 | 60 | $globalSources = array(); |
| 61 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 61 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']); |
|
| 62 | 62 | else $globalSources[] = array('host' => $options['source']); |
| 63 | 63 | } |
| 64 | 64 | if (isset($options['aprsserverhost'])) { |
@@ -75,27 +75,27 @@ discard block |
||
| 75 | 75 | else $id_source = 1; |
| 76 | 76 | if (isset($globalServer) && $globalServer) { |
| 77 | 77 | if ($globalDebug) echo "Using Server Mode\n"; |
| 78 | - $SI=new SpotterServer(); |
|
| 78 | + $SI = new SpotterServer(); |
|
| 79 | 79 | /* |
| 80 | 80 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 81 | 81 | $SI = new adsb2aprs(); |
| 82 | 82 | $SI->connect(); |
| 83 | 83 | */ |
| 84 | -} else $SI=new SpotterImport($Connection->db); |
|
| 84 | +} else $SI = new SpotterImport($Connection->db); |
|
| 85 | 85 | if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db); |
| 86 | 86 | if (isset($globalMarine) && $globalMarine) { |
| 87 | 87 | $AIS = new AIS(); |
| 88 | 88 | $MI = new MarineImport($Connection->db); |
| 89 | 89 | } |
| 90 | 90 | //$APRS=new APRS($Connection->db); |
| 91 | -$SBS=new SBS(); |
|
| 92 | -$ACARS=new ACARS($Connection->db); |
|
| 93 | -$Common=new Common(); |
|
| 91 | +$SBS = new SBS(); |
|
| 92 | +$ACARS = new ACARS($Connection->db); |
|
| 93 | +$Common = new Common(); |
|
| 94 | 94 | date_default_timezone_set('UTC'); |
| 95 | 95 | //$servertz = system('date +%Z'); |
| 96 | 96 | // signal handler - playing nice with sockets and dump1090 |
| 97 | 97 | if (function_exists('pcntl_fork')) { |
| 98 | - pcntl_signal(SIGINT, function() { |
|
| 98 | + pcntl_signal(SIGINT, function() { |
|
| 99 | 99 | global $sockets; |
| 100 | 100 | echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
| 101 | 101 | die("Bye!\n"); |
@@ -111,35 +111,35 @@ discard block |
||
| 111 | 111 | |
| 112 | 112 | function connect_all($hosts) { |
| 113 | 113 | //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
| 114 | - global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
|
| 114 | + global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context; |
|
| 115 | 115 | $reset++; |
| 116 | 116 | if ($globalDebug) echo 'Connect to all...'."\n"; |
| 117 | 117 | foreach ($hosts as $id => $value) { |
| 118 | 118 | $host = $value['host']; |
| 119 | 119 | $globalSources[$id]['last_exec'] = 0; |
| 120 | 120 | // Here we check type of source(s) |
| 121 | - if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
|
| 122 | - if (preg_match('/deltadb.txt$/i',$host)) { |
|
| 121 | + if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
|
| 122 | + if (preg_match('/deltadb.txt$/i', $host)) { |
|
| 123 | 123 | //$formats[$id] = 'deltadbtxt'; |
| 124 | 124 | $globalSources[$id]['format'] = 'deltadbtxt'; |
| 125 | 125 | //$last_exec['deltadbtxt'] = 0; |
| 126 | 126 | if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
| 127 | - } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
|
| 127 | + } else if (preg_match('/vatsim-data.txt$/i', $host)) { |
|
| 128 | 128 | //$formats[$id] = 'vatsimtxt'; |
| 129 | 129 | $globalSources[$id]['format'] = 'vatsimtxt'; |
| 130 | 130 | //$last_exec['vatsimtxt'] = 0; |
| 131 | 131 | if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
| 132 | - } else if (preg_match('/aircraftlist.json$/i',$host)) { |
|
| 132 | + } else if (preg_match('/aircraftlist.json$/i', $host)) { |
|
| 133 | 133 | //$formats[$id] = 'aircraftlistjson'; |
| 134 | 134 | $globalSources[$id]['format'] = 'aircraftlistjson'; |
| 135 | 135 | //$last_exec['aircraftlistjson'] = 0; |
| 136 | 136 | if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
| 137 | - } else if (preg_match('/opensky/i',$host)) { |
|
| 137 | + } else if (preg_match('/opensky/i', $host)) { |
|
| 138 | 138 | //$formats[$id] = 'aircraftlistjson'; |
| 139 | 139 | $globalSources[$id]['format'] = 'opensky'; |
| 140 | 140 | //$last_exec['aircraftlistjson'] = 0; |
| 141 | 141 | if ($globalDebug) echo "Connect to opensky source (".$host.")...\n"; |
| 142 | - } else if (preg_match('/radarvirtuel.com\/file.json$/i',$host)) { |
|
| 142 | + } else if (preg_match('/radarvirtuel.com\/file.json$/i', $host)) { |
|
| 143 | 143 | //$formats[$id] = 'radarvirtueljson'; |
| 144 | 144 | $globalSources[$id]['format'] = 'radarvirtueljson'; |
| 145 | 145 | //$last_exec['radarvirtueljson'] = 0; |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 149 | 149 | exit(0); |
| 150 | 150 | } |
| 151 | - } else if (preg_match('/planeUpdateFAA.php$/i',$host)) { |
|
| 151 | + } else if (preg_match('/planeUpdateFAA.php$/i', $host)) { |
|
| 152 | 152 | //$formats[$id] = 'planeupdatefaa'; |
| 153 | 153 | $globalSources[$id]['format'] = 'planeupdatefaa'; |
| 154 | 154 | //$last_exec['planeupdatefaa'] = 0; |
@@ -157,26 +157,26 @@ discard block |
||
| 157 | 157 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 158 | 158 | exit(0); |
| 159 | 159 | } |
| 160 | - } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { |
|
| 160 | + } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) { |
|
| 161 | 161 | //$formats[$id] = 'phpvmacars'; |
| 162 | 162 | $globalSources[$id]['format'] = 'phpvmacars'; |
| 163 | 163 | //$last_exec['phpvmacars'] = 0; |
| 164 | 164 | if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
| 165 | - } else if (preg_match('/VAM-json.php$/i',$host)) { |
|
| 165 | + } else if (preg_match('/VAM-json.php$/i', $host)) { |
|
| 166 | 166 | //$formats[$id] = 'phpvmacars'; |
| 167 | 167 | $globalSources[$id]['format'] = 'vam'; |
| 168 | 168 | if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
| 169 | - } else if (preg_match('/whazzup/i',$host)) { |
|
| 169 | + } else if (preg_match('/whazzup/i', $host)) { |
|
| 170 | 170 | //$formats[$id] = 'whazzup'; |
| 171 | 171 | $globalSources[$id]['format'] = 'whazzup'; |
| 172 | 172 | //$last_exec['whazzup'] = 0; |
| 173 | 173 | if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
| 174 | - } else if (preg_match('/recentpireps/i',$host)) { |
|
| 174 | + } else if (preg_match('/recentpireps/i', $host)) { |
|
| 175 | 175 | //$formats[$id] = 'pirepsjson'; |
| 176 | 176 | $globalSources[$id]['format'] = 'pirepsjson'; |
| 177 | 177 | //$last_exec['pirepsjson'] = 0; |
| 178 | 178 | if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
| 179 | - } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
|
| 179 | + } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) { |
|
| 180 | 180 | //$formats[$id] = 'fr24json'; |
| 181 | 181 | $globalSources[$id]['format'] = 'fr24json'; |
| 182 | 182 | //$last_exec['fr24json'] = 0; |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 186 | 186 | exit(0); |
| 187 | 187 | } |
| 188 | - } else if (preg_match(':myshiptracking.com/:i',$host)) { |
|
| 188 | + } else if (preg_match(':myshiptracking.com/:i', $host)) { |
|
| 189 | 189 | //$formats[$id] = 'fr24json'; |
| 190 | 190 | $globalSources[$id]['format'] = 'myshiptracking'; |
| 191 | 191 | //$last_exec['fr24json'] = 0; |
@@ -195,22 +195,22 @@ discard block |
||
| 195 | 195 | exit(0); |
| 196 | 196 | } |
| 197 | 197 | //} else if (preg_match('/10001/',$host)) { |
| 198 | - } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 198 | + } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 199 | 199 | //$formats[$id] = 'tsv'; |
| 200 | 200 | $globalSources[$id]['format'] = 'tsv'; |
| 201 | 201 | if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
| 202 | 202 | } |
| 203 | - } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 203 | + } elseif (filter_var($host, FILTER_VALIDATE_URL)) { |
|
| 204 | 204 | if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
| 205 | - $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
|
| 205 | + $idf = fopen($globalSources[$id]['host'], 'r', false, $context); |
|
| 206 | 206 | if ($idf !== false) { |
| 207 | 207 | $httpfeeds[$id] = $idf; |
| 208 | 208 | if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
| 209 | 209 | } |
| 210 | 210 | elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
| 211 | 211 | } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
| 212 | - } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 213 | - $hostport = explode(':',$host); |
|
| 212 | + } elseif (!filter_var($host, FILTER_VALIDATE_URL)) { |
|
| 213 | + $hostport = explode(':', $host); |
|
| 214 | 214 | if (isset($hostport[1])) { |
| 215 | 215 | $port = $hostport[1]; |
| 216 | 216 | $hostn = $hostport[0]; |
@@ -220,19 +220,19 @@ discard block |
||
| 220 | 220 | } |
| 221 | 221 | $Common = new Common(); |
| 222 | 222 | if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
| 223 | - $s = $Common->create_socket($hostn,$port, $errno, $errstr); |
|
| 223 | + $s = $Common->create_socket($hostn, $port, $errno, $errstr); |
|
| 224 | 224 | } else { |
| 225 | - $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 225 | + $s = $Common->create_socket_udp($hostn, $port, $errno, $errstr); |
|
| 226 | 226 | } |
| 227 | 227 | if ($s) { |
| 228 | 228 | $sockets[$id] = $s; |
| 229 | 229 | if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
| 230 | - if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { |
|
| 230 | + if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') { |
|
| 231 | 231 | //$formats[$id] = 'aprs'; |
| 232 | 232 | $globalSources[$id]['format'] = 'aprs'; |
| 233 | 233 | //$aprs_connect = 0; |
| 234 | 234 | //$use_aprs = true; |
| 235 | - } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 235 | + } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 236 | 236 | $globalSources[$id]['format'] = 'vrstcp'; |
| 237 | 237 | } elseif ($port == '10001') { |
| 238 | 238 | //$formats[$id] = 'tsv'; |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut; |
| 272 | 272 | else $timeout = 20; |
| 273 | 273 | $errno = ''; |
| 274 | -$errstr=''; |
|
| 274 | +$errstr = ''; |
|
| 275 | 275 | |
| 276 | 276 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 277 | 277 | /* Initiate connections to all the hosts simultaneously */ |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | //connect_all($globalSources); |
| 280 | 280 | |
| 281 | 281 | if (isset($globalProxy) && $globalProxy) { |
| 282 | - $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); |
|
| 282 | + $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true))); |
|
| 283 | 283 | } else { |
| 284 | 284 | $context = stream_context_create(array('http' => array('timeout' => $timeout))); |
| 285 | 285 | } |
@@ -306,16 +306,16 @@ discard block |
||
| 306 | 306 | |
| 307 | 307 | if ($use_aprs) { |
| 308 | 308 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 309 | - $APRS=new APRS(); |
|
| 309 | + $APRS = new APRS(); |
|
| 310 | 310 | $aprs_connect = 0; |
| 311 | 311 | $aprs_keep = 120; |
| 312 | 312 | $aprs_last_tx = time(); |
| 313 | 313 | if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
| 314 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 314 | + else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName); |
|
| 315 | 315 | if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid; |
| 316 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 316 | + else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8); |
|
| 317 | 317 | if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter; |
| 318 | - else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 318 | + else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 319 | 319 | if ($aprs_full) $aprs_filter = ''; |
| 320 | 320 | if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass; |
| 321 | 321 | else $aprs_pass = '-1'; |
@@ -329,12 +329,12 @@ discard block |
||
| 329 | 329 | sleep(1); |
| 330 | 330 | if ($globalDebug) echo "SCAN MODE \n\n"; |
| 331 | 331 | if (!isset($globalCronEnd)) $globalCronEnd = 60; |
| 332 | -$endtime = time()+$globalCronEnd; |
|
| 332 | +$endtime = time() + $globalCronEnd; |
|
| 333 | 333 | $i = 1; |
| 334 | 334 | $tt = array(); |
| 335 | 335 | // Delete all ATC |
| 336 | 336 | if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) { |
| 337 | - $ATC=new ATC($Connection->db); |
|
| 337 | + $ATC = new ATC($Connection->db); |
|
| 338 | 338 | } |
| 339 | 339 | if (!$globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 340 | 340 | $ATC->deleteAll(); |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | |
| 343 | 343 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 344 | 344 | while ($i > 0) { |
| 345 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 345 | + if (!$globalDaemon) $i = $endtime - time(); |
|
| 346 | 346 | // Delete old ATC |
| 347 | 347 | if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 348 | 348 | if ($globalDebug) echo 'Delete old ATC...'."\n"; |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | } |
| 358 | 358 | if ($max != $globalMinFetch) { |
| 359 | 359 | if ($globalDebug) echo 'Sleeping...'."\n"; |
| 360 | - sleep($globalMinFetch-$max+2); |
|
| 360 | + sleep($globalMinFetch - $max + 2); |
|
| 361 | 361 | } |
| 362 | 362 | } |
| 363 | 363 | |
@@ -370,8 +370,8 @@ discard block |
||
| 370 | 370 | //$buffer = $Common->getData($hosts[$id]); |
| 371 | 371 | $buffer = $Common->getData($value['host']); |
| 372 | 372 | if ($buffer != '') $reset = 0; |
| 373 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 374 | - $buffer = explode('\n',$buffer); |
|
| 373 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 374 | + $buffer = explode('\n', $buffer); |
|
| 375 | 375 | foreach ($buffer as $line) { |
| 376 | 376 | if ($line != '' && count($line) > 7) { |
| 377 | 377 | $line = explode(',', $line); |
@@ -399,11 +399,11 @@ discard block |
||
| 399 | 399 | $last_exec[$id]['last'] = time(); |
| 400 | 400 | } elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 401 | 401 | date_default_timezone_set('CET'); |
| 402 | - $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
|
| 402 | + $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host'])); |
|
| 403 | 403 | date_default_timezone_set('UTC'); |
| 404 | 404 | if ($buffer != '') $reset = 0; |
| 405 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 406 | - $buffer = explode('\n',$buffer); |
|
| 405 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 406 | + $buffer = explode('\n', $buffer); |
|
| 407 | 407 | foreach ($buffer as $line) { |
| 408 | 408 | if ($line != '') { |
| 409 | 409 | echo "'".$line."'\n"; |
@@ -421,7 +421,7 @@ discard block |
||
| 421 | 421 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 422 | 422 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 423 | 423 | if (isset($ais_data['timestamp'])) { |
| 424 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 424 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 425 | 425 | if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { |
| 426 | 426 | $last_exec[$id]['timestamp'] = $ais_data['timestamp']; |
| 427 | 427 | $add = true; |
@@ -445,12 +445,12 @@ discard block |
||
| 445 | 445 | $w = $e = null; |
| 446 | 446 | |
| 447 | 447 | if (isset($arr[$id])) { |
| 448 | - $nn = stream_select($arr,$w,$e,$timeout); |
|
| 448 | + $nn = stream_select($arr, $w, $e, $timeout); |
|
| 449 | 449 | if ($nn > 0) { |
| 450 | 450 | foreach ($httpfeeds as $feed) { |
| 451 | - $buffer = stream_get_line($feed,2000,"\n"); |
|
| 452 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 453 | - $buffer = explode('\n',$buffer); |
|
| 451 | + $buffer = stream_get_line($feed, 2000, "\n"); |
|
| 452 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 453 | + $buffer = explode('\n', $buffer); |
|
| 454 | 454 | foreach ($buffer as $line) { |
| 455 | 455 | if ($line != '') { |
| 456 | 456 | $ais_data = $AIS->parse_line(trim($line)); |
@@ -467,9 +467,9 @@ discard block |
||
| 467 | 467 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 468 | 468 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 469 | 469 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 470 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 470 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']); |
|
| 471 | 471 | if (isset($ais_data['timestamp'])) { |
| 472 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 472 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 473 | 473 | } else { |
| 474 | 474 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 475 | 475 | } |
@@ -494,10 +494,10 @@ discard block |
||
| 494 | 494 | } |
| 495 | 495 | } |
| 496 | 496 | } elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 497 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 497 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20'); |
|
| 498 | 498 | if ($buffer != '') { |
| 499 | 499 | //echo $buffer; |
| 500 | - $all_data = json_decode($buffer,true); |
|
| 500 | + $all_data = json_decode($buffer, true); |
|
| 501 | 501 | //print_r($all_data); |
| 502 | 502 | if (isset($all_data[0]['DATA'])) { |
| 503 | 503 | foreach ($all_data[0]['DATA'] as $line) { |
@@ -512,7 +512,7 @@ discard block |
||
| 512 | 512 | // if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
| 513 | 513 | $data['imo'] = $line['IMO']; |
| 514 | 514 | //$data['arrival_code'] = $ais_data['destination']; |
| 515 | - $data['datetime'] = date('Y-m-d H:i:s',$line['T']); |
|
| 515 | + $data['datetime'] = date('Y-m-d H:i:s', $line['T']); |
|
| 516 | 516 | $data['format_source'] = 'myshiptracking'; |
| 517 | 517 | $data['id_source'] = $id_source; |
| 518 | 518 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -525,9 +525,9 @@ discard block |
||
| 525 | 525 | } |
| 526 | 526 | $last_exec[$id]['last'] = time(); |
| 527 | 527 | } elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 528 | - $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); |
|
| 528 | + $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host'])); |
|
| 529 | 529 | if ($buffer != '') { |
| 530 | - $all_data = json_decode($buffer,true); |
|
| 530 | + $all_data = json_decode($buffer, true); |
|
| 531 | 531 | if (isset($all_data[0]['mmsi'])) { |
| 532 | 532 | foreach ($all_data as $line) { |
| 533 | 533 | if ($line != '') { |
@@ -555,27 +555,27 @@ discard block |
||
| 555 | 555 | $last_exec[$id]['last'] = time(); |
| 556 | 556 | } elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 557 | 557 | echo 'download...'; |
| 558 | - $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
|
| 558 | + $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter'); |
|
| 559 | 559 | echo 'done !'."\n"; |
| 560 | 560 | if ($buffer != '') $reset = 0; |
| 561 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 562 | - $buffer = explode('\n',$buffer); |
|
| 561 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 562 | + $buffer = explode('\n', $buffer); |
|
| 563 | 563 | foreach ($buffer as $line) { |
| 564 | 564 | if ($line != '') { |
| 565 | 565 | $data = array(); |
| 566 | - $data['mmsi'] = (int)substr($line,0,9); |
|
| 567 | - $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); |
|
| 566 | + $data['mmsi'] = (int) substr($line, 0, 9); |
|
| 567 | + $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10)); |
|
| 568 | 568 | //$data['status'] = substr($line,21,2); |
| 569 | 569 | //$data['type'] = substr($line,24,3); |
| 570 | - $data['latitude'] = substr($line,29,9); |
|
| 571 | - $data['longitude'] = substr($line,41,9); |
|
| 572 | - $data['speed'] = round(substr($line,51,5)); |
|
| 570 | + $data['latitude'] = substr($line, 29, 9); |
|
| 571 | + $data['longitude'] = substr($line, 41, 9); |
|
| 572 | + $data['speed'] = round(substr($line, 51, 5)); |
|
| 573 | 573 | //$data['course'] = substr($line,57,5); |
| 574 | - $data['heading'] = round(substr($line,63,3)); |
|
| 574 | + $data['heading'] = round(substr($line, 63, 3)); |
|
| 575 | 575 | //$data['draft'] = substr($line,67,4); |
| 576 | 576 | //$data['length'] = substr($line,72,3); |
| 577 | 577 | //$data['beam'] = substr($line,76,2); |
| 578 | - $data['ident'] = trim(utf8_encode(substr($line,79,20))); |
|
| 578 | + $data['ident'] = trim(utf8_encode(substr($line, 79, 20))); |
|
| 579 | 579 | //$data['callsign'] = trim(substr($line,100,7); |
| 580 | 580 | //$data['dest'] = substr($line,108,20); |
| 581 | 581 | //$data['etaDate'] = substr($line,129,5); |
@@ -594,8 +594,8 @@ discard block |
||
| 594 | 594 | } elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) { |
| 595 | 595 | //$buffer = $Common->getData($hosts[$id]); |
| 596 | 596 | $buffer = $Common->getData($value['host']); |
| 597 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 598 | - $buffer = explode('\n',$buffer); |
|
| 597 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 598 | + $buffer = explode('\n', $buffer); |
|
| 599 | 599 | $reset = 0; |
| 600 | 600 | foreach ($buffer as $line) { |
| 601 | 601 | if ($line != '') { |
@@ -606,7 +606,7 @@ discard block |
||
| 606 | 606 | else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
| 607 | 607 | $data['pilot_id'] = $line[1]; |
| 608 | 608 | $data['pilot_name'] = $line[2]; |
| 609 | - $data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT); |
|
| 609 | + $data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT); |
|
| 610 | 610 | $data['ident'] = $line[0]; // ident |
| 611 | 611 | if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude |
| 612 | 612 | $data['speed'] = $line[8]; // speed |
@@ -622,7 +622,7 @@ discard block |
||
| 622 | 622 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37])); |
| 623 | 623 | //if (isset($line[37])) $data['last_update'] = $line[37]; |
| 624 | 624 | $data['departure_airport_icao'] = $line[11]; |
| 625 | - $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 625 | + $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':'); |
|
| 626 | 626 | $data['arrival_airport_icao'] = $line[13]; |
| 627 | 627 | $data['frequency'] = $line[4]; |
| 628 | 628 | $data['type'] = $line[18]; |
@@ -631,7 +631,7 @@ discard block |
||
| 631 | 631 | $data['id_source'] = $id_source; |
| 632 | 632 | //$data['arrival_airport_time'] = ; |
| 633 | 633 | if ($line[9] != '') { |
| 634 | - $aircraft_data = explode('/',$line[9]); |
|
| 634 | + $aircraft_data = explode('/', $line[9]); |
|
| 635 | 635 | if (isset($aircraft_data[1])) { |
| 636 | 636 | $data['aircraft_icao'] = $aircraft_data[1]; |
| 637 | 637 | } |
@@ -646,9 +646,9 @@ discard block |
||
| 646 | 646 | if ($line[3] == 'PILOT') $SI->add($data); |
| 647 | 647 | elseif ($line[3] == 'ATC') { |
| 648 | 648 | //print_r($data); |
| 649 | - $data['info'] = str_replace('^§','<br />',$data['info']); |
|
| 650 | - $data['info'] = str_replace('&sect;','',$data['info']); |
|
| 651 | - $typec = substr($data['ident'],-3); |
|
| 649 | + $data['info'] = str_replace('^§', '<br />', $data['info']); |
|
| 650 | + $data['info'] = str_replace('&sect;', '', $data['info']); |
|
| 651 | + $typec = substr($data['ident'], -3); |
|
| 652 | 652 | if ($typec == 'APP') $data['type'] = 'Approach'; |
| 653 | 653 | elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
| 654 | 654 | elseif ($typec == 'OBS') $data['type'] = 'Observer'; |
@@ -659,7 +659,7 @@ discard block |
||
| 659 | 659 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 660 | 660 | elseif ($data['type'] == '') $data['type'] = 'Observer'; |
| 661 | 661 | if (!isset($data['source_name'])) $data['source_name'] = ''; |
| 662 | - if (isset($ATC)) 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']); |
|
| 662 | + if (isset($ATC)) 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']); |
|
| 663 | 663 | } |
| 664 | 664 | unset($data); |
| 665 | 665 | } |
@@ -670,9 +670,9 @@ discard block |
||
| 670 | 670 | $last_exec[$id]['last'] = time(); |
| 671 | 671 | //} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) { |
| 672 | 672 | } elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 673 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 673 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20'); |
|
| 674 | 674 | if ($buffer != '') { |
| 675 | - $all_data = json_decode($buffer,true); |
|
| 675 | + $all_data = json_decode($buffer, true); |
|
| 676 | 676 | if (isset($all_data['acList'])) { |
| 677 | 677 | $reset = 0; |
| 678 | 678 | foreach ($all_data['acList'] as $line) { |
@@ -689,7 +689,7 @@ discard block |
||
| 689 | 689 | $data['emergency'] = ''; // emergency |
| 690 | 690 | if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
| 691 | 691 | |
| 692 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 692 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000)); |
|
| 693 | 693 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 694 | 694 | |
| 695 | 695 | //$data['datetime'] = date('Y-m-d H:i:s'); |
@@ -715,7 +715,7 @@ discard block |
||
| 715 | 715 | $data['verticalrate'] = $line['vrt']; // verticale rate |
| 716 | 716 | $data['squawk'] = $line['squawk']; // squawk |
| 717 | 717 | $data['emergency'] = ''; // emergency |
| 718 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 718 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000)); |
|
| 719 | 719 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 720 | 720 | $data['format_source'] = 'aircraftlistjson'; |
| 721 | 721 | $data['id_source'] = $id_source; |
@@ -731,7 +731,7 @@ discard block |
||
| 731 | 731 | //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
| 732 | 732 | } elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 733 | 733 | $buffer = $Common->getData($value['host']); |
| 734 | - $all_data = json_decode($buffer,true); |
|
| 734 | + $all_data = json_decode($buffer, true); |
|
| 735 | 735 | if (isset($all_data['planes'])) { |
| 736 | 736 | $reset = 0; |
| 737 | 737 | foreach ($all_data['planes'] as $key => $line) { |
@@ -748,12 +748,12 @@ discard block |
||
| 748 | 748 | $data['emergency'] = ''; // emergency |
| 749 | 749 | $data['registration'] = $line[2]; |
| 750 | 750 | $data['aircraft_icao'] = $line[0]; |
| 751 | - $deparr = explode('-',$line[1]); |
|
| 751 | + $deparr = explode('-', $line[1]); |
|
| 752 | 752 | if (count($deparr) == 2) { |
| 753 | 753 | $data['departure_airport_icao'] = $deparr[0]; |
| 754 | 754 | $data['arrival_airport_icao'] = $deparr[1]; |
| 755 | 755 | } |
| 756 | - $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 756 | + $data['datetime'] = date('Y-m-d H:i:s', $line[9]); |
|
| 757 | 757 | $data['format_source'] = 'planeupdatefaa'; |
| 758 | 758 | $data['id_source'] = $id_source; |
| 759 | 759 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -766,7 +766,7 @@ discard block |
||
| 766 | 766 | $last_exec[$id]['last'] = time(); |
| 767 | 767 | } elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 768 | 768 | $buffer = $Common->getData($value['host']); |
| 769 | - $all_data = json_decode($buffer,true); |
|
| 769 | + $all_data = json_decode($buffer, true); |
|
| 770 | 770 | if (isset($all_data['states'])) { |
| 771 | 771 | $reset = 0; |
| 772 | 772 | foreach ($all_data['states'] as $key => $line) { |
@@ -783,7 +783,7 @@ discard block |
||
| 783 | 783 | //$data['emergency'] = ''; // emergency |
| 784 | 784 | //$data['registration'] = $line[2]; |
| 785 | 785 | //$data['aircraft_icao'] = $line[0]; |
| 786 | - $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 786 | + $data['datetime'] = date('Y-m-d H:i:s', $line[3]); |
|
| 787 | 787 | $data['format_source'] = 'opensky'; |
| 788 | 788 | $data['id_source'] = $id_source; |
| 789 | 789 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -797,7 +797,7 @@ discard block |
||
| 797 | 797 | } elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 798 | 798 | //$buffer = $Common->getData($hosts[$id]); |
| 799 | 799 | $buffer = $Common->getData($value['host']); |
| 800 | - $all_data = json_decode($buffer,true); |
|
| 800 | + $all_data = json_decode($buffer, true); |
|
| 801 | 801 | if (!empty($all_data)) $reset = 0; |
| 802 | 802 | foreach ($all_data as $key => $line) { |
| 803 | 803 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
@@ -830,11 +830,11 @@ discard block |
||
| 830 | 830 | //} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { |
| 831 | 831 | } elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 832 | 832 | //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
| 833 | - $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 833 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150'); |
|
| 834 | 834 | //echo $buffer; |
| 835 | - $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 836 | - $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 837 | - $all_data = json_decode($buffer,true); |
|
| 835 | + $buffer = str_replace(array("\n", "\r"), "", $buffer); |
|
| 836 | + $buffer = preg_replace('/,"num":(.+)/', '}', $buffer); |
|
| 837 | + $all_data = json_decode($buffer, true); |
|
| 838 | 838 | if (json_last_error() != JSON_ERROR_NONE) { |
| 839 | 839 | die(json_last_error_msg()); |
| 840 | 840 | } |
@@ -857,7 +857,7 @@ discard block |
||
| 857 | 857 | //$data['departure_airport_iata'] = $line[11]; |
| 858 | 858 | //$data['arrival_airport_iata'] = $line[12]; |
| 859 | 859 | //$data['emergency'] = ''; // emergency |
| 860 | - $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
|
| 860 | + $data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10] |
|
| 861 | 861 | $data['format_source'] = 'radarvirtueljson'; |
| 862 | 862 | $data['id_source'] = $id_source; |
| 863 | 863 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -873,14 +873,14 @@ discard block |
||
| 873 | 873 | } elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 874 | 874 | //$buffer = $Common->getData($hosts[$id]); |
| 875 | 875 | $buffer = $Common->getData($value['host'].'?'.time()); |
| 876 | - $all_data = json_decode(utf8_encode($buffer),true); |
|
| 876 | + $all_data = json_decode(utf8_encode($buffer), true); |
|
| 877 | 877 | |
| 878 | 878 | if (isset($all_data['pireps'])) { |
| 879 | 879 | $reset = 0; |
| 880 | 880 | foreach ($all_data['pireps'] as $line) { |
| 881 | 881 | $data = array(); |
| 882 | 882 | $data['id'] = $line['id']; |
| 883 | - $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 883 | + $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6); |
|
| 884 | 884 | $data['ident'] = $line['callsign']; // ident |
| 885 | 885 | if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
| 886 | 886 | if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
@@ -910,9 +910,9 @@ discard block |
||
| 910 | 910 | $SI->add($data); |
| 911 | 911 | // print_r($data); |
| 912 | 912 | } elseif ($line['icon'] == 'ct') { |
| 913 | - $data['info'] = str_replace('^§','<br />',$data['info']); |
|
| 914 | - $data['info'] = str_replace('&sect;','',$data['info']); |
|
| 915 | - $typec = substr($data['ident'],-3); |
|
| 913 | + $data['info'] = str_replace('^§', '<br />', $data['info']); |
|
| 914 | + $data['info'] = str_replace('&sect;', '', $data['info']); |
|
| 915 | + $typec = substr($data['ident'], -3); |
|
| 916 | 916 | $data['type'] = ''; |
| 917 | 917 | if ($typec == 'APP') $data['type'] = 'Approach'; |
| 918 | 918 | elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
@@ -923,7 +923,7 @@ discard block |
||
| 923 | 923 | elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station'; |
| 924 | 924 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 925 | 925 | else $data['type'] = 'Observer'; |
| 926 | - 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']); |
|
| 926 | + 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']); |
|
| 927 | 927 | } |
| 928 | 928 | unset($data); |
| 929 | 929 | } |
@@ -935,14 +935,14 @@ discard block |
||
| 935 | 935 | //$buffer = $Common->getData($hosts[$id]); |
| 936 | 936 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 937 | 937 | $buffer = $Common->getData($value['host']); |
| 938 | - $all_data = json_decode($buffer,true); |
|
| 938 | + $all_data = json_decode($buffer, true); |
|
| 939 | 939 | if ($buffer != '' && is_array($all_data)) { |
| 940 | 940 | $reset = 0; |
| 941 | 941 | foreach ($all_data as $line) { |
| 942 | 942 | $data = array(); |
| 943 | 943 | //$data['id'] = $line['id']; // id not usable |
| 944 | 944 | if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
| 945 | - $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 945 | + $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex |
|
| 946 | 946 | if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
| 947 | 947 | if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
| 948 | 948 | $data['ident'] = $line['flightnum']; // ident |
@@ -966,14 +966,14 @@ discard block |
||
| 966 | 966 | if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
| 967 | 967 | if (isset($line['aircraftname'])) { |
| 968 | 968 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 969 | - $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
|
| 970 | - $aircraft_data = explode('-',$line['aircraftname']); |
|
| 969 | + $line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']); |
|
| 970 | + $aircraft_data = explode('-', $line['aircraftname']); |
|
| 971 | 971 | if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
| 972 | 972 | elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
| 973 | 973 | else { |
| 974 | - $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 975 | - if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 976 | - else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 974 | + $aircraft_data = explode(' ', $line['aircraftname']); |
|
| 975 | + if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]); |
|
| 976 | + else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']); |
|
| 977 | 977 | } |
| 978 | 978 | } |
| 979 | 979 | if (isset($line['route'])) $data['waypoints'] = $line['route']; |
@@ -993,14 +993,14 @@ discard block |
||
| 993 | 993 | //$buffer = $Common->getData($hosts[$id]); |
| 994 | 994 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 995 | 995 | $buffer = $Common->getData($value['host']); |
| 996 | - $all_data = json_decode($buffer,true); |
|
| 996 | + $all_data = json_decode($buffer, true); |
|
| 997 | 997 | if ($buffer != '' && is_array($all_data)) { |
| 998 | 998 | $reset = 0; |
| 999 | 999 | foreach ($all_data as $line) { |
| 1000 | 1000 | $data = array(); |
| 1001 | 1001 | //$data['id'] = $line['id']; // id not usable |
| 1002 | 1002 | $data['id'] = trim($line['flight_id']); |
| 1003 | - $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1003 | + $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex |
|
| 1004 | 1004 | $data['pilot_name'] = $line['pilot_name']; |
| 1005 | 1005 | $data['pilot_id'] = $line['pilot_id']; |
| 1006 | 1006 | $data['ident'] = trim($line['callsign']); // ident |
@@ -1052,11 +1052,11 @@ discard block |
||
| 1052 | 1052 | //$value = $formats[$nb]; |
| 1053 | 1053 | $format = $globalSources[$nb]['format']; |
| 1054 | 1054 | if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
| 1055 | - $buffer = @socket_read($r, 6000,PHP_NORMAL_READ); |
|
| 1055 | + $buffer = @socket_read($r, 6000, PHP_NORMAL_READ); |
|
| 1056 | 1056 | } elseif ($format == 'vrstcp') { |
| 1057 | 1057 | $buffer = @socket_read($r, 6000); |
| 1058 | 1058 | } else { |
| 1059 | - $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port); |
|
| 1059 | + $az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port); |
|
| 1060 | 1060 | } |
| 1061 | 1061 | //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
| 1062 | 1062 | //echo $buffer."\n"; |
@@ -1065,8 +1065,8 @@ discard block |
||
| 1065 | 1065 | $error = false; |
| 1066 | 1066 | //$SI::del(); |
| 1067 | 1067 | if ($format == 'vrstcp') { |
| 1068 | - $buffer = explode('},{',$buffer); |
|
| 1069 | - } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1068 | + $buffer = explode('},{', $buffer); |
|
| 1069 | + } else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer)); |
|
| 1070 | 1070 | // SBS format is CSV format |
| 1071 | 1071 | if ($buffer !== FALSE && $buffer != '') { |
| 1072 | 1072 | $tt[$format] = 0; |
@@ -1100,11 +1100,11 @@ discard block |
||
| 1100 | 1100 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 1101 | 1101 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 1102 | 1102 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 1103 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1103 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']); |
|
| 1104 | 1104 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1105 | 1105 | |
| 1106 | 1106 | if (isset($ais_data['timestamp'])) { |
| 1107 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 1107 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 1108 | 1108 | } else { |
| 1109 | 1109 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1110 | 1110 | } |
@@ -1115,10 +1115,10 @@ discard block |
||
| 1115 | 1115 | } elseif ($format == 'flightgearsp') { |
| 1116 | 1116 | //echo $buffer."\n"; |
| 1117 | 1117 | if (strlen($buffer) > 5) { |
| 1118 | - $line = explode(',',$buffer); |
|
| 1118 | + $line = explode(',', $buffer); |
|
| 1119 | 1119 | $data = array(); |
| 1120 | 1120 | //XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p |
| 1121 | - $data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6); |
|
| 1121 | + $data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6); |
|
| 1122 | 1122 | $data['ident'] = $line[6]; |
| 1123 | 1123 | $data['aircraft_name'] = $line[7]; |
| 1124 | 1124 | $data['longitude'] = $line[1]; |
@@ -1130,21 +1130,21 @@ discard block |
||
| 1130 | 1130 | $data['format_source'] = 'flightgearsp'; |
| 1131 | 1131 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1132 | 1132 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1133 | - $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
|
| 1133 | + $send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0); |
|
| 1134 | 1134 | } |
| 1135 | 1135 | } elseif ($format == 'acars') { |
| 1136 | 1136 | if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
| 1137 | 1137 | $ACARS->add(trim($buffer)); |
| 1138 | - socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 1138 | + socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port); |
|
| 1139 | 1139 | $ACARS->deleteLiveAcarsData(); |
| 1140 | 1140 | } elseif ($format == 'flightgearmp') { |
| 1141 | - if (substr($buffer,0,1) != '#') { |
|
| 1141 | + if (substr($buffer, 0, 1) != '#') { |
|
| 1142 | 1142 | $data = array(); |
| 1143 | 1143 | //echo $buffer."\n"; |
| 1144 | - $line = explode(' ',$buffer); |
|
| 1144 | + $line = explode(' ', $buffer); |
|
| 1145 | 1145 | if (count($line) == 11) { |
| 1146 | - $userserver = explode('@',$line[0]); |
|
| 1147 | - $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 1146 | + $userserver = explode('@', $line[0]); |
|
| 1147 | + $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex |
|
| 1148 | 1148 | $data['ident'] = $userserver[0]; |
| 1149 | 1149 | $data['registration'] = $userserver[0]; |
| 1150 | 1150 | $data['latitude'] = $line[4]; |
@@ -1152,8 +1152,8 @@ discard block |
||
| 1152 | 1152 | $data['altitude'] = $line[6]; |
| 1153 | 1153 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1154 | 1154 | $aircraft_type = $line[10]; |
| 1155 | - $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 1156 | - $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 1155 | + $aircraft_type = preg_split(':/:', $aircraft_type); |
|
| 1156 | + $data['aircraft_name'] = substr(end($aircraft_type), 0, -4); |
|
| 1157 | 1157 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1158 | 1158 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1159 | 1159 | } |
@@ -1162,8 +1162,8 @@ discard block |
||
| 1162 | 1162 | echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
| 1163 | 1163 | die; |
| 1164 | 1164 | } elseif ($format == 'vrstcp') { |
| 1165 | - foreach($buffer as $all_data) { |
|
| 1166 | - $line = json_decode('{'.$all_data.'}',true); |
|
| 1165 | + foreach ($buffer as $all_data) { |
|
| 1166 | + $line = json_decode('{'.$all_data.'}', true); |
|
| 1167 | 1167 | $data = array(); |
| 1168 | 1168 | if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex |
| 1169 | 1169 | if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
@@ -1189,16 +1189,16 @@ discard block |
||
| 1189 | 1189 | if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data); |
| 1190 | 1190 | unset($data); |
| 1191 | 1191 | } |
| 1192 | - } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
|
| 1192 | + } elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') { |
|
| 1193 | 1193 | $line = explode("\t", $buffer); |
| 1194 | - for($k = 0; $k < count($line); $k=$k+2) { |
|
| 1194 | + for ($k = 0; $k < count($line); $k = $k + 2) { |
|
| 1195 | 1195 | $key = $line[$k]; |
| 1196 | - $lined[$key] = $line[$k+1]; |
|
| 1196 | + $lined[$key] = $line[$k + 1]; |
|
| 1197 | 1197 | } |
| 1198 | 1198 | if (count($lined) > 3) { |
| 1199 | 1199 | $data['hex'] = $lined['hexid']; |
| 1200 | 1200 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
| 1201 | - $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 1201 | + $data['datetime'] = date('Y-m-d H:i:s'); ; |
|
| 1202 | 1202 | if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
| 1203 | 1203 | if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
| 1204 | 1204 | if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
@@ -1217,22 +1217,22 @@ discard block |
||
| 1217 | 1217 | } else $error = true; |
| 1218 | 1218 | } elseif ($format == 'aprs' && $use_aprs) { |
| 1219 | 1219 | if ($aprs_connect == 0) { |
| 1220 | - $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
|
| 1220 | + $send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0); |
|
| 1221 | 1221 | $aprs_connect = 1; |
| 1222 | 1222 | } |
| 1223 | 1223 | |
| 1224 | - if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 1224 | + if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) { |
|
| 1225 | 1225 | $aprs_last_tx = time(); |
| 1226 | 1226 | $data_aprs = "# Keep alive"; |
| 1227 | - $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
|
| 1227 | + $send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0); |
|
| 1228 | 1228 | } |
| 1229 | 1229 | |
| 1230 | 1230 | //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
| 1231 | 1231 | //echo 'APRS data : '.$buffer."\n"; |
| 1232 | - $buffer = str_replace('APRS <- ','',$buffer); |
|
| 1233 | - $buffer = str_replace('APRS -> ','',$buffer); |
|
| 1232 | + $buffer = str_replace('APRS <- ', '', $buffer); |
|
| 1233 | + $buffer = str_replace('APRS -> ', '', $buffer); |
|
| 1234 | 1234 | //echo $buffer."\n"; |
| 1235 | - if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 1235 | + if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') { |
|
| 1236 | 1236 | $line = $APRS->parse($buffer); |
| 1237 | 1237 | //if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) { |
| 1238 | 1238 | if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) { |
@@ -1243,7 +1243,7 @@ discard block |
||
| 1243 | 1243 | if (isset($line['mmsi'])) $data['mmsi'] = $line['mmsi']; |
| 1244 | 1244 | if (isset($line['type_id'])) $data['type_id'] = $line['typeid']; |
| 1245 | 1245 | if (isset($line['status_id'])) $data['status_id'] = $line['statusid']; |
| 1246 | - if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1246 | + if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']); |
|
| 1247 | 1247 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 1248 | 1248 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 1249 | 1249 | if (isset($line['ident'])) $data['ident'] = $line['ident']; |
@@ -1372,7 +1372,7 @@ discard block |
||
| 1372 | 1372 | connect_all($sourceee); |
| 1373 | 1373 | $sourceee = array(); |
| 1374 | 1374 | //connect_all($globalSources); |
| 1375 | - $tt[$format]=0; |
|
| 1375 | + $tt[$format] = 0; |
|
| 1376 | 1376 | break; |
| 1377 | 1377 | } |
| 1378 | 1378 | } |
@@ -1381,14 +1381,14 @@ discard block |
||
| 1381 | 1381 | } else { |
| 1382 | 1382 | $error = socket_strerror(socket_last_error()); |
| 1383 | 1383 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { |
| 1384 | - if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
|
| 1384 | + if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n"; |
|
| 1385 | 1385 | if (isset($globalDebug)) echo "Restarting...\n"; |
| 1386 | 1386 | // Restart the script if possible |
| 1387 | 1387 | if (is_array($sockets)) { |
| 1388 | 1388 | if ($globalDebug) echo "Shutdown all sockets..."; |
| 1389 | 1389 | |
| 1390 | 1390 | foreach ($sockets as $sock) { |
| 1391 | - @socket_shutdown($sock,2); |
|
| 1391 | + @socket_shutdown($sock, 2); |
|
| 1392 | 1392 | @socket_close($sock); |
| 1393 | 1393 | } |
| 1394 | 1394 | |
@@ -14,11 +14,11 @@ discard block |
||
| 14 | 14 | try { |
| 15 | 15 | $sth = $Connection->db->prepare($query); |
| 16 | 16 | $sth->execute(); |
| 17 | - } catch(PDOException $e) { |
|
| 17 | + } catch (PDOException $e) { |
|
| 18 | 18 | return "error : ".$e->getMessage()."\n"; |
| 19 | 19 | } |
| 20 | 20 | while ($row = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 21 | - $Schedule->addSchedule($row['ident'],$row['departure_airport_icao'],$row['departure_airport_time'],$row['arrival_airport_icao'],$row['arrival_airport_time']); |
|
| 21 | + $Schedule->addSchedule($row['ident'], $row['departure_airport_icao'], $row['departure_airport_time'], $row['arrival_airport_icao'], $row['arrival_airport_time']); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | try { |
| 51 | 51 | $sth = $Connection->db->prepare($query); |
| 52 | 52 | $sth->execute(); |
| 53 | - } catch(PDOException $e) { |
|
| 53 | + } catch (PDOException $e) { |
|
| 54 | 54 | return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
| 55 | 55 | } |
| 56 | 56 | // Copy schedules data to routes table |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | try { |
| 61 | 61 | $sth = $Connection->db->prepare($query); |
| 62 | 62 | $sth->execute(); |
| 63 | - } catch(PDOException $e) { |
|
| 63 | + } catch (PDOException $e) { |
|
| 64 | 64 | return "error (delete schedule table) : ".$e->getMessage()."\n"; |
| 65 | 65 | } |
| 66 | 66 | // Add source column |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | try { |
| 69 | 69 | $sth = $Connection->db->prepare($query); |
| 70 | 70 | $sth->execute(); |
| 71 | - } catch(PDOException $e) { |
|
| 71 | + } catch (PDOException $e) { |
|
| 72 | 72 | return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n"; |
| 73 | 73 | } |
| 74 | 74 | // Delete unused column |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | try { |
| 77 | 77 | $sth = $Connection->db->prepare($query); |
| 78 | 78 | $sth->execute(); |
| 79 | - } catch(PDOException $e) { |
|
| 79 | + } catch (PDOException $e) { |
|
| 80 | 80 | return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n"; |
| 81 | 81 | } |
| 82 | 82 | // Add ModeS column |
@@ -84,14 +84,14 @@ discard block |
||
| 84 | 84 | try { |
| 85 | 85 | $sth = $Connection->db->prepare($query); |
| 86 | 86 | $sth->execute(); |
| 87 | - } catch(PDOException $e) { |
|
| 87 | + } catch (PDOException $e) { |
|
| 88 | 88 | return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n"; |
| 89 | 89 | } |
| 90 | 90 | $query = "ALTER TABLE `spotter_live` ADD `ModeS` VARCHAR(255)"; |
| 91 | 91 | try { |
| 92 | 92 | $sth = $Connection->db->prepare($query); |
| 93 | 93 | $sth->execute(); |
| 94 | - } catch(PDOException $e) { |
|
| 94 | + } catch (PDOException $e) { |
|
| 95 | 95 | return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n"; |
| 96 | 96 | } |
| 97 | 97 | // Add auto_increment for aircraft_modes |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | try { |
| 100 | 100 | $sth = $Connection->db->prepare($query); |
| 101 | 101 | $sth->execute(); |
| 102 | - } catch(PDOException $e) { |
|
| 102 | + } catch (PDOException $e) { |
|
| 103 | 103 | return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n"; |
| 104 | 104 | } |
| 105 | 105 | $error = ''; |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | try { |
| 111 | 111 | $sth = $Connection->db->prepare($query); |
| 112 | 112 | $sth->execute(); |
| 113 | - } catch(PDOException $e) { |
|
| 113 | + } catch (PDOException $e) { |
|
| 114 | 114 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 115 | 115 | } |
| 116 | 116 | return $error; |
@@ -123,7 +123,7 @@ discard block |
||
| 123 | 123 | try { |
| 124 | 124 | $sth = $Connection->db->prepare($query); |
| 125 | 125 | $sth->execute(); |
| 126 | - } catch(PDOException $e) { |
|
| 126 | + } catch (PDOException $e) { |
|
| 127 | 127 | return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
| 128 | 128 | } |
| 129 | 129 | $error = ''; |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | try { |
| 135 | 135 | $sth = $Connection->db->prepare($query); |
| 136 | 136 | $sth->execute(); |
| 137 | - } catch(PDOException $e) { |
|
| 137 | + } catch (PDOException $e) { |
|
| 138 | 138 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 139 | 139 | } |
| 140 | 140 | return $error; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | try { |
| 148 | 148 | $sth = $Connection->db->prepare($query); |
| 149 | 149 | $sth->execute(); |
| 150 | - } catch(PDOException $e) { |
|
| 150 | + } catch (PDOException $e) { |
|
| 151 | 151 | return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n"; |
| 152 | 152 | } |
| 153 | 153 | // Add image_source_website column to spotter_image |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | try { |
| 156 | 156 | $sth = $Connection->db->prepare($query); |
| 157 | 157 | $sth->execute(); |
| 158 | - } catch(PDOException $e) { |
|
| 158 | + } catch (PDOException $e) { |
|
| 159 | 159 | return "error (add new columns to spotter_image) : ".$e->getMessage()."\n"; |
| 160 | 160 | } |
| 161 | 161 | $error = ''; |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | try { |
| 165 | 165 | $sth = $Connection->db->prepare($query); |
| 166 | 166 | $sth->execute(); |
| 167 | - } catch(PDOException $e) { |
|
| 167 | + } catch (PDOException $e) { |
|
| 168 | 168 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 169 | 169 | } |
| 170 | 170 | return $error; |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | try { |
| 183 | 183 | $sth = $Connection->db->prepare($query); |
| 184 | 184 | $sth->execute(); |
| 185 | - } catch(PDOException $e) { |
|
| 185 | + } catch (PDOException $e) { |
|
| 186 | 186 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 187 | 187 | } |
| 188 | 188 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | try { |
| 197 | 197 | $sth = $Connection->db->prepare($query); |
| 198 | 198 | $sth->execute(); |
| 199 | - } catch(PDOException $e) { |
|
| 199 | + } catch (PDOException $e) { |
|
| 200 | 200 | return "error (add new columns to translation) : ".$e->getMessage()."\n"; |
| 201 | 201 | } |
| 202 | 202 | // Add aircraft_shadow column to aircraft |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | try { |
| 205 | 205 | $sth = $Connection->db->prepare($query); |
| 206 | 206 | $sth->execute(); |
| 207 | - } catch(PDOException $e) { |
|
| 207 | + } catch (PDOException $e) { |
|
| 208 | 208 | return "error (add new column to aircraft) : ".$e->getMessage()."\n"; |
| 209 | 209 | } |
| 210 | 210 | // Add aircraft_shadow column to spotter_live |
@@ -212,7 +212,7 @@ discard block |
||
| 212 | 212 | try { |
| 213 | 213 | $sth = $Connection->db->prepare($query); |
| 214 | 214 | $sth->execute(); |
| 215 | - } catch(PDOException $e) { |
|
| 215 | + } catch (PDOException $e) { |
|
| 216 | 216 | return "error (add new column to spotter_live) : ".$e->getMessage()."\n"; |
| 217 | 217 | } |
| 218 | 218 | $error = ''; |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | try { |
| 226 | 226 | $sth = $Connection->db->prepare($query); |
| 227 | 227 | $sth->execute(); |
| 228 | - } catch(PDOException $e) { |
|
| 228 | + } catch (PDOException $e) { |
|
| 229 | 229 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 230 | 230 | } |
| 231 | 231 | return $error; |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | |
| 234 | 234 | private static function update_from_6() { |
| 235 | 235 | $Connection = new Connection(); |
| 236 | - if (!$Connection->indexExists('spotter_output','flightaware_id')) { |
|
| 236 | + if (!$Connection->indexExists('spotter_output', 'flightaware_id')) { |
|
| 237 | 237 | $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id); |
| 238 | 238 | ALTER TABLE spotter_output ADD INDEX(date); |
| 239 | 239 | ALTER TABLE spotter_output ADD INDEX(ident); |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | try { |
| 251 | 251 | $sth = $Connection->db->prepare($query); |
| 252 | 252 | $sth->execute(); |
| 253 | - } catch(PDOException $e) { |
|
| 253 | + } catch (PDOException $e) { |
|
| 254 | 254 | return "error (add some indexes) : ".$e->getMessage()."\n"; |
| 255 | 255 | } |
| 256 | 256 | } |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | try { |
| 266 | 266 | $sth = $Connection->db->prepare($query); |
| 267 | 267 | $sth->execute(); |
| 268 | - } catch(PDOException $e) { |
|
| 268 | + } catch (PDOException $e) { |
|
| 269 | 269 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 270 | 270 | } |
| 271 | 271 | return $error; |
@@ -274,12 +274,12 @@ discard block |
||
| 274 | 274 | private static function update_from_7() { |
| 275 | 275 | global $globalDBname, $globalDBdriver; |
| 276 | 276 | $Connection = new Connection(); |
| 277 | - $query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 277 | + $query = "ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 278 | 278 | ALTER TABLE spotter_output ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL;"; |
| 279 | 279 | try { |
| 280 | 280 | $sth = $Connection->db->prepare($query); |
| 281 | 281 | $sth->execute(); |
| 282 | - } catch(PDOException $e) { |
|
| 282 | + } catch (PDOException $e) { |
|
| 283 | 283 | return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
| 284 | 284 | } |
| 285 | 285 | if ($globalDBdriver == 'mysql') { |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | try { |
| 288 | 288 | $sth = $Connection->db->prepare($query); |
| 289 | 289 | $sth->execute(); |
| 290 | - } catch(PDOException $e) { |
|
| 290 | + } catch (PDOException $e) { |
|
| 291 | 291 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 292 | 292 | } |
| 293 | 293 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -299,15 +299,15 @@ discard block |
||
| 299 | 299 | DROP TABLE spotter_archive; |
| 300 | 300 | RENAME TABLE copy TO spotter_archive;"; |
| 301 | 301 | } else { |
| 302 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 302 | + $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 303 | 303 | } |
| 304 | 304 | } else { |
| 305 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 305 | + $query = "ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 306 | 306 | } |
| 307 | 307 | try { |
| 308 | 308 | $sth = $Connection->db->prepare($query); |
| 309 | 309 | $sth->execute(); |
| 310 | - } catch(PDOException $e) { |
|
| 310 | + } catch (PDOException $e) { |
|
| 311 | 311 | return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n"; |
| 312 | 312 | } |
| 313 | 313 | |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | try { |
| 321 | 321 | $sth = $Connection->db->prepare($query); |
| 322 | 322 | $sth->execute(); |
| 323 | - } catch(PDOException $e) { |
|
| 323 | + } catch (PDOException $e) { |
|
| 324 | 324 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 325 | 325 | } |
| 326 | 326 | return $error; |
@@ -339,14 +339,14 @@ discard block |
||
| 339 | 339 | try { |
| 340 | 340 | $sth = $Connection->db->prepare($query); |
| 341 | 341 | $sth->execute(); |
| 342 | - } catch(PDOException $e) { |
|
| 342 | + } catch (PDOException $e) { |
|
| 343 | 343 | return "error (insert last_update values) : ".$e->getMessage()."\n"; |
| 344 | 344 | } |
| 345 | 345 | $query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'"; |
| 346 | 346 | try { |
| 347 | 347 | $sth = $Connection->db->prepare($query); |
| 348 | 348 | $sth->execute(); |
| 349 | - } catch(PDOException $e) { |
|
| 349 | + } catch (PDOException $e) { |
|
| 350 | 350 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 351 | 351 | } |
| 352 | 352 | return $error; |
@@ -354,12 +354,12 @@ discard block |
||
| 354 | 354 | |
| 355 | 355 | private static function update_from_9() { |
| 356 | 356 | $Connection = new Connection(); |
| 357 | - $query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 357 | + $query = "ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 358 | 358 | ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;"; |
| 359 | 359 | try { |
| 360 | 360 | $sth = $Connection->db->prepare($query); |
| 361 | 361 | $sth->execute(); |
| 362 | - } catch(PDOException $e) { |
|
| 362 | + } catch (PDOException $e) { |
|
| 363 | 363 | return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
| 364 | 364 | } |
| 365 | 365 | $error = ''; |
@@ -371,7 +371,7 @@ discard block |
||
| 371 | 371 | try { |
| 372 | 372 | $sth = $Connection->db->prepare($query); |
| 373 | 373 | $sth->execute(); |
| 374 | - } catch(PDOException $e) { |
|
| 374 | + } catch (PDOException $e) { |
|
| 375 | 375 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 376 | 376 | } |
| 377 | 377 | return $error; |
@@ -379,11 +379,11 @@ discard block |
||
| 379 | 379 | |
| 380 | 380 | private static function update_from_10() { |
| 381 | 381 | $Connection = new Connection(); |
| 382 | - $query="ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL"; |
|
| 382 | + $query = "ALTER TABLE atc CHANGE `type` `type` ENUM('Observer','Flight Information','Delivery','Tower','Approach','ACC','Departure','Ground','Flight Service Station','Control Radar or Centre') CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL"; |
|
| 383 | 383 | try { |
| 384 | 384 | $sth = $Connection->db->prepare($query); |
| 385 | 385 | $sth->execute(); |
| 386 | - } catch(PDOException $e) { |
|
| 386 | + } catch (PDOException $e) { |
|
| 387 | 387 | return "error (add new enum to ATC table) : ".$e->getMessage()."\n"; |
| 388 | 388 | } |
| 389 | 389 | $error = ''; |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | try { |
| 402 | 402 | $sth = $Connection->db->prepare($query); |
| 403 | 403 | $sth->execute(); |
| 404 | - } catch(PDOException $e) { |
|
| 404 | + } catch (PDOException $e) { |
|
| 405 | 405 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 406 | 406 | } |
| 407 | 407 | return $error; |
@@ -410,18 +410,18 @@ discard block |
||
| 410 | 410 | private static function update_from_11() { |
| 411 | 411 | global $globalDBdriver, $globalDBname; |
| 412 | 412 | $Connection = new Connection(); |
| 413 | - $query="ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 413 | + $query = "ALTER TABLE spotter_output ADD owner_name VARCHAR(255) NULL DEFAULT NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_ground BOOLEAN NOT NULL DEFAULT FALSE, ADD last_seen DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP, ADD last_latitude FLOAT NULL, ADD last_longitude FLOAT NULL, ADD last_altitude INT(11) NULL, ADD last_ground_speed INT(11), ADD real_arrival_airport_icao VARCHAR(999), ADD real_arrival_airport_time VARCHAR(20),ADD real_departure_airport_icao VARCHAR(999), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 414 | 414 | try { |
| 415 | 415 | $sth = $Connection->db->prepare($query); |
| 416 | 416 | $sth->execute(); |
| 417 | - } catch(PDOException $e) { |
|
| 417 | + } catch (PDOException $e) { |
|
| 418 | 418 | return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n"; |
| 419 | 419 | } |
| 420 | - $query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 420 | + $query = "ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 421 | 421 | try { |
| 422 | 422 | $sth = $Connection->db->prepare($query); |
| 423 | 423 | $sth->execute(); |
| 424 | - } catch(PDOException $e) { |
|
| 424 | + } catch (PDOException $e) { |
|
| 425 | 425 | return "error (format_source column to spotter_live) : ".$e->getMessage()."\n"; |
| 426 | 426 | } |
| 427 | 427 | if ($globalDBdriver == 'mysql') { |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | try { |
| 430 | 430 | $sth = $Connection->db->prepare($query); |
| 431 | 431 | $sth->execute(); |
| 432 | - } catch(PDOException $e) { |
|
| 432 | + } catch (PDOException $e) { |
|
| 433 | 433 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 434 | 434 | } |
| 435 | 435 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -441,15 +441,15 @@ discard block |
||
| 441 | 441 | DROP TABLE spotter_archive; |
| 442 | 442 | RENAME TABLE copy TO spotter_archive;"; |
| 443 | 443 | } else { |
| 444 | - $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 444 | + $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 445 | 445 | } |
| 446 | 446 | } else { |
| 447 | - $query="ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 447 | + $query = "ALTER TABLE spotter_archive ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 448 | 448 | } |
| 449 | 449 | try { |
| 450 | 450 | $sth = $Connection->db->prepare($query); |
| 451 | 451 | $sth->execute(); |
| 452 | - } catch(PDOException $e) { |
|
| 452 | + } catch (PDOException $e) { |
|
| 453 | 453 | return "error (add columns to spotter_archive) : ".$e->getMessage()."\n"; |
| 454 | 454 | } |
| 455 | 455 | |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | try { |
| 460 | 460 | $sth = $Connection->db->prepare($query); |
| 461 | 461 | $sth->execute(); |
| 462 | - } catch(PDOException $e) { |
|
| 462 | + } catch (PDOException $e) { |
|
| 463 | 463 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 464 | 464 | } |
| 465 | 465 | return $error; |
@@ -487,7 +487,7 @@ discard block |
||
| 487 | 487 | try { |
| 488 | 488 | $sth = $Connection->db->prepare($query); |
| 489 | 489 | $sth->execute(); |
| 490 | - } catch(PDOException $e) { |
|
| 490 | + } catch (PDOException $e) { |
|
| 491 | 491 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 492 | 492 | } |
| 493 | 493 | return $error; |
@@ -495,12 +495,12 @@ discard block |
||
| 495 | 495 | |
| 496 | 496 | private static function update_from_13() { |
| 497 | 497 | $Connection = new Connection(); |
| 498 | - if (!$Connection->checkColumnName('spotter_archive_output','real_departure_airport_icao')) { |
|
| 499 | - $query="ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 498 | + if (!$Connection->checkColumnName('spotter_archive_output', 'real_departure_airport_icao')) { |
|
| 499 | + $query = "ALTER TABLE spotter_archive_output ADD real_departure_airport_icao VARCHAR(20), ADD real_departure_airport_time VARCHAR(20)"; |
|
| 500 | 500 | try { |
| 501 | 501 | $sth = $Connection->db->prepare($query); |
| 502 | 502 | $sth->execute(); |
| 503 | - } catch(PDOException $e) { |
|
| 503 | + } catch (PDOException $e) { |
|
| 504 | 504 | return "error (update spotter_archive_output) : ".$e->getMessage()."\n"; |
| 505 | 505 | } |
| 506 | 506 | } |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | try { |
| 510 | 510 | $sth = $Connection->db->prepare($query); |
| 511 | 511 | $sth->execute(); |
| 512 | - } catch(PDOException $e) { |
|
| 512 | + } catch (PDOException $e) { |
|
| 513 | 513 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 514 | 514 | } |
| 515 | 515 | return $error; |
@@ -527,7 +527,7 @@ discard block |
||
| 527 | 527 | try { |
| 528 | 528 | $sth = $Connection->db->prepare($query); |
| 529 | 529 | $sth->execute(); |
| 530 | - } catch(PDOException $e) { |
|
| 530 | + } catch (PDOException $e) { |
|
| 531 | 531 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 532 | 532 | } |
| 533 | 533 | return $error; |
@@ -538,11 +538,11 @@ discard block |
||
| 538 | 538 | $Connection = new Connection(); |
| 539 | 539 | $error = ''; |
| 540 | 540 | // Add tables |
| 541 | - $query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 541 | + $query = "ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 542 | 542 | try { |
| 543 | 543 | $sth = $Connection->db->prepare($query); |
| 544 | 544 | $sth->execute(); |
| 545 | - } catch(PDOException $e) { |
|
| 545 | + } catch (PDOException $e) { |
|
| 546 | 546 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 547 | 547 | } |
| 548 | 548 | if ($error != '') return $error; |
@@ -550,7 +550,7 @@ discard block |
||
| 550 | 550 | try { |
| 551 | 551 | $sth = $Connection->db->prepare($query); |
| 552 | 552 | $sth->execute(); |
| 553 | - } catch(PDOException $e) { |
|
| 553 | + } catch (PDOException $e) { |
|
| 554 | 554 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 555 | 555 | } |
| 556 | 556 | return $error; |
@@ -571,7 +571,7 @@ discard block |
||
| 571 | 571 | try { |
| 572 | 572 | $sth = $Connection->db->prepare($query); |
| 573 | 573 | $sth->execute(); |
| 574 | - } catch(PDOException $e) { |
|
| 574 | + } catch (PDOException $e) { |
|
| 575 | 575 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 576 | 576 | } |
| 577 | 577 | return $error; |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | try { |
| 590 | 590 | $sth = $Connection->db->prepare($query); |
| 591 | 591 | $sth->execute(); |
| 592 | - } catch(PDOException $e) { |
|
| 592 | + } catch (PDOException $e) { |
|
| 593 | 593 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 594 | 594 | } |
| 595 | 595 | return $error; |
@@ -598,12 +598,12 @@ discard block |
||
| 598 | 598 | $Connection = new Connection(); |
| 599 | 599 | $error = ''; |
| 600 | 600 | // Modify stats_airport table |
| 601 | - if (!$Connection->checkColumnName('stats_airport','airport_name')) { |
|
| 601 | + if (!$Connection->checkColumnName('stats_airport', 'airport_name')) { |
|
| 602 | 602 | $query = "ALTER TABLE `stats_airport` ADD `stats_type` VARCHAR(50) NOT NULL DEFAULT 'yearly', ADD `airport_name` VARCHAR(255) NOT NULL, ADD `date` DATE NULL DEFAULT NULL, DROP INDEX `airport_icao`, ADD UNIQUE `airport_icao` (`airport_icao`, `type`, `date`)"; |
| 603 | 603 | try { |
| 604 | 604 | $sth = $Connection->db->prepare($query); |
| 605 | 605 | $sth->execute(); |
| 606 | - } catch(PDOException $e) { |
|
| 606 | + } catch (PDOException $e) { |
|
| 607 | 607 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 608 | 608 | } |
| 609 | 609 | } |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | try { |
| 613 | 613 | $sth = $Connection->db->prepare($query); |
| 614 | 614 | $sth->execute(); |
| 615 | - } catch(PDOException $e) { |
|
| 615 | + } catch (PDOException $e) { |
|
| 616 | 616 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 617 | 617 | } |
| 618 | 618 | return $error; |
@@ -629,73 +629,73 @@ discard block |
||
| 629 | 629 | try { |
| 630 | 630 | $sth = $Connection->db->prepare($query); |
| 631 | 631 | $sth->execute(); |
| 632 | - } catch(PDOException $e) { |
|
| 632 | + } catch (PDOException $e) { |
|
| 633 | 633 | return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n"; |
| 634 | 634 | } |
| 635 | 635 | $query = "alter table spotter_archive add spotter_archive_id INT(11)"; |
| 636 | 636 | try { |
| 637 | 637 | $sth = $Connection->db->prepare($query); |
| 638 | 638 | $sth->execute(); |
| 639 | - } catch(PDOException $e) { |
|
| 639 | + } catch (PDOException $e) { |
|
| 640 | 640 | return "error (add id again on spotter_archive) : ".$e->getMessage()."\n"; |
| 641 | 641 | } |
| 642 | - if (!$Connection->checkColumnName('spotter_archive','over_country')) { |
|
| 642 | + if (!$Connection->checkColumnName('spotter_archive', 'over_country')) { |
|
| 643 | 643 | // Add column over_country |
| 644 | 644 | $query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
| 645 | 645 | try { |
| 646 | 646 | $sth = $Connection->db->prepare($query); |
| 647 | 647 | $sth->execute(); |
| 648 | - } catch(PDOException $e) { |
|
| 648 | + } catch (PDOException $e) { |
|
| 649 | 649 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 650 | 650 | } |
| 651 | 651 | } |
| 652 | - if (!$Connection->checkColumnName('spotter_live','over_country')) { |
|
| 652 | + if (!$Connection->checkColumnName('spotter_live', 'over_country')) { |
|
| 653 | 653 | // Add column over_country |
| 654 | 654 | $query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
| 655 | 655 | try { |
| 656 | 656 | $sth = $Connection->db->prepare($query); |
| 657 | 657 | $sth->execute(); |
| 658 | - } catch(PDOException $e) { |
|
| 658 | + } catch (PDOException $e) { |
|
| 659 | 659 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 660 | 660 | } |
| 661 | 661 | } |
| 662 | - if (!$Connection->checkColumnName('spotter_output','source_name')) { |
|
| 662 | + if (!$Connection->checkColumnName('spotter_output', 'source_name')) { |
|
| 663 | 663 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 664 | 664 | $query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 665 | 665 | try { |
| 666 | 666 | $sth = $Connection->db->prepare($query); |
| 667 | 667 | $sth->execute(); |
| 668 | - } catch(PDOException $e) { |
|
| 668 | + } catch (PDOException $e) { |
|
| 669 | 669 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 670 | 670 | } |
| 671 | 671 | } |
| 672 | - if (!$Connection->checkColumnName('spotter_live','source_name')) { |
|
| 672 | + if (!$Connection->checkColumnName('spotter_live', 'source_name')) { |
|
| 673 | 673 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 674 | 674 | $query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 675 | 675 | try { |
| 676 | 676 | $sth = $Connection->db->prepare($query); |
| 677 | 677 | $sth->execute(); |
| 678 | - } catch(PDOException $e) { |
|
| 678 | + } catch (PDOException $e) { |
|
| 679 | 679 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 680 | 680 | } |
| 681 | 681 | } |
| 682 | - if (!$Connection->checkColumnName('spotter_archive_output','source_name')) { |
|
| 682 | + if (!$Connection->checkColumnName('spotter_archive_output', 'source_name')) { |
|
| 683 | 683 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 684 | 684 | $query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
| 685 | 685 | try { |
| 686 | 686 | $sth = $Connection->db->prepare($query); |
| 687 | 687 | $sth->execute(); |
| 688 | - } catch(PDOException $e) { |
|
| 688 | + } catch (PDOException $e) { |
|
| 689 | 689 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 690 | 690 | } |
| 691 | 691 | } |
| 692 | - if (!$Connection->checkColumnName('spotter_archive','source_name')) { |
|
| 692 | + if (!$Connection->checkColumnName('spotter_archive', 'source_name')) { |
|
| 693 | 693 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 694 | 694 | $query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;"; |
| 695 | 695 | try { |
| 696 | 696 | $sth = $Connection->db->prepare($query); |
| 697 | 697 | $sth->execute(); |
| 698 | - } catch(PDOException $e) { |
|
| 698 | + } catch (PDOException $e) { |
|
| 699 | 699 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 700 | 700 | } |
| 701 | 701 | } |
@@ -704,7 +704,7 @@ discard block |
||
| 704 | 704 | try { |
| 705 | 705 | $sth = $Connection->db->prepare($query); |
| 706 | 706 | $sth->execute(); |
| 707 | - } catch(PDOException $e) { |
|
| 707 | + } catch (PDOException $e) { |
|
| 708 | 708 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 709 | 709 | } |
| 710 | 710 | return $error; |
@@ -719,13 +719,13 @@ discard block |
||
| 719 | 719 | $error .= create_db::import_file('../db/airlines.sql'); |
| 720 | 720 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 721 | 721 | } |
| 722 | - if (!$Connection->checkColumnName('aircraft_modes','type_flight')) { |
|
| 722 | + if (!$Connection->checkColumnName('aircraft_modes', 'type_flight')) { |
|
| 723 | 723 | // Add column over_country |
| 724 | 724 | $query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;"; |
| 725 | 725 | try { |
| 726 | 726 | $sth = $Connection->db->prepare($query); |
| 727 | 727 | $sth->execute(); |
| 728 | - } catch(PDOException $e) { |
|
| 728 | + } catch (PDOException $e) { |
|
| 729 | 729 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 730 | 730 | } |
| 731 | 731 | } |
@@ -741,7 +741,7 @@ discard block |
||
| 741 | 741 | try { |
| 742 | 742 | $sth = $Connection->db->prepare($query); |
| 743 | 743 | $sth->execute(); |
| 744 | - } catch(PDOException $e) { |
|
| 744 | + } catch (PDOException $e) { |
|
| 745 | 745 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 746 | 746 | } |
| 747 | 747 | return $error; |
@@ -750,13 +750,13 @@ discard block |
||
| 750 | 750 | private static function update_from_21() { |
| 751 | 751 | $Connection = new Connection(); |
| 752 | 752 | $error = ''; |
| 753 | - if (!$Connection->checkColumnName('stats_airport','stats_type')) { |
|
| 753 | + if (!$Connection->checkColumnName('stats_airport', 'stats_type')) { |
|
| 754 | 754 | // Rename type to stats_type |
| 755 | 755 | $query = "ALTER TABLE `stats_airport` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats` CHANGE `type` `stats_type` VARCHAR(50);ALTER TABLE `stats_flight` CHANGE `type` `stats_type` VARCHAR(50);"; |
| 756 | 756 | try { |
| 757 | 757 | $sth = $Connection->db->prepare($query); |
| 758 | 758 | $sth->execute(); |
| 759 | - } catch(PDOException $e) { |
|
| 759 | + } catch (PDOException $e) { |
|
| 760 | 760 | return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n"; |
| 761 | 761 | } |
| 762 | 762 | if ($error != '') return $error; |
@@ -765,7 +765,7 @@ discard block |
||
| 765 | 765 | try { |
| 766 | 766 | $sth = $Connection->db->prepare($query); |
| 767 | 767 | $sth->execute(); |
| 768 | - } catch(PDOException $e) { |
|
| 768 | + } catch (PDOException $e) { |
|
| 769 | 769 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 770 | 770 | } |
| 771 | 771 | return $error; |
@@ -788,7 +788,7 @@ discard block |
||
| 788 | 788 | try { |
| 789 | 789 | $sth = $Connection->db->prepare($query); |
| 790 | 790 | $sth->execute(); |
| 791 | - } catch(PDOException $e) { |
|
| 791 | + } catch (PDOException $e) { |
|
| 792 | 792 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 793 | 793 | } |
| 794 | 794 | return $error; |
@@ -815,17 +815,17 @@ discard block |
||
| 815 | 815 | try { |
| 816 | 816 | $sth = $Connection->db->prepare($query); |
| 817 | 817 | $sth->execute(); |
| 818 | - } catch(PDOException $e) { |
|
| 818 | + } catch (PDOException $e) { |
|
| 819 | 819 | return "error (create index on spotter_archive) : ".$e->getMessage()."\n"; |
| 820 | 820 | } |
| 821 | 821 | } |
| 822 | - if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) { |
|
| 822 | + if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) { |
|
| 823 | 823 | // Add aircraft_manufacturer to stats_aircraft |
| 824 | 824 | $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; |
| 825 | 825 | try { |
| 826 | 826 | $sth = $Connection->db->prepare($query); |
| 827 | 827 | $sth->execute(); |
| 828 | - } catch(PDOException $e) { |
|
| 828 | + } catch (PDOException $e) { |
|
| 829 | 829 | return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n"; |
| 830 | 830 | } |
| 831 | 831 | } |
@@ -834,7 +834,7 @@ discard block |
||
| 834 | 834 | try { |
| 835 | 835 | $sth = $Connection->db->prepare($query); |
| 836 | 836 | $sth->execute(); |
| 837 | - } catch(PDOException $e) { |
|
| 837 | + } catch (PDOException $e) { |
|
| 838 | 838 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 839 | 839 | } |
| 840 | 840 | return $error; |
@@ -850,23 +850,23 @@ discard block |
||
| 850 | 850 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 851 | 851 | } |
| 852 | 852 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 853 | - if (!$Connection->checkColumnName('airlines','forsource')) { |
|
| 853 | + if (!$Connection->checkColumnName('airlines', 'forsource')) { |
|
| 854 | 854 | // Add forsource to airlines |
| 855 | 855 | $query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL"; |
| 856 | 856 | try { |
| 857 | 857 | $sth = $Connection->db->prepare($query); |
| 858 | 858 | $sth->execute(); |
| 859 | - } catch(PDOException $e) { |
|
| 859 | + } catch (PDOException $e) { |
|
| 860 | 860 | return "error (add forsource column) : ".$e->getMessage()."\n"; |
| 861 | 861 | } |
| 862 | 862 | } |
| 863 | - if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) { |
|
| 863 | + if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) { |
|
| 864 | 864 | // Add forsource to airlines |
| 865 | 865 | $query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 866 | 866 | try { |
| 867 | 867 | $sth = $Connection->db->prepare($query); |
| 868 | 868 | $sth->execute(); |
| 869 | - } catch(PDOException $e) { |
|
| 869 | + } catch (PDOException $e) { |
|
| 870 | 870 | return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n"; |
| 871 | 871 | } |
| 872 | 872 | // Add unique key |
@@ -878,17 +878,17 @@ discard block |
||
| 878 | 878 | try { |
| 879 | 879 | $sth = $Connection->db->prepare($query); |
| 880 | 880 | $sth->execute(); |
| 881 | - } catch(PDOException $e) { |
|
| 881 | + } catch (PDOException $e) { |
|
| 882 | 882 | return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n"; |
| 883 | 883 | } |
| 884 | 884 | } |
| 885 | - if (!$Connection->checkColumnName('stats_airport','stats_airline')) { |
|
| 885 | + if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) { |
|
| 886 | 886 | // Add forsource to airlines |
| 887 | 887 | $query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 888 | 888 | try { |
| 889 | 889 | $sth = $Connection->db->prepare($query); |
| 890 | 890 | $sth->execute(); |
| 891 | - } catch(PDOException $e) { |
|
| 891 | + } catch (PDOException $e) { |
|
| 892 | 892 | return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n"; |
| 893 | 893 | } |
| 894 | 894 | // Add unique key |
@@ -900,17 +900,17 @@ discard block |
||
| 900 | 900 | try { |
| 901 | 901 | $sth = $Connection->db->prepare($query); |
| 902 | 902 | $sth->execute(); |
| 903 | - } catch(PDOException $e) { |
|
| 903 | + } catch (PDOException $e) { |
|
| 904 | 904 | return "error (add unique key in stats_airport) : ".$e->getMessage()."\n"; |
| 905 | 905 | } |
| 906 | 906 | } |
| 907 | - if (!$Connection->checkColumnName('stats_country','stats_airline')) { |
|
| 907 | + if (!$Connection->checkColumnName('stats_country', 'stats_airline')) { |
|
| 908 | 908 | // Add forsource to airlines |
| 909 | 909 | $query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 910 | 910 | try { |
| 911 | 911 | $sth = $Connection->db->prepare($query); |
| 912 | 912 | $sth->execute(); |
| 913 | - } catch(PDOException $e) { |
|
| 913 | + } catch (PDOException $e) { |
|
| 914 | 914 | return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n"; |
| 915 | 915 | } |
| 916 | 916 | // Add unique key |
@@ -922,36 +922,36 @@ discard block |
||
| 922 | 922 | try { |
| 923 | 923 | $sth = $Connection->db->prepare($query); |
| 924 | 924 | $sth->execute(); |
| 925 | - } catch(PDOException $e) { |
|
| 925 | + } catch (PDOException $e) { |
|
| 926 | 926 | return "error (add unique key in stats_airline) : ".$e->getMessage()."\n"; |
| 927 | 927 | } |
| 928 | 928 | } |
| 929 | - if (!$Connection->checkColumnName('stats_flight','stats_airline')) { |
|
| 929 | + if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) { |
|
| 930 | 930 | // Add forsource to airlines |
| 931 | 931 | $query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 932 | 932 | try { |
| 933 | 933 | $sth = $Connection->db->prepare($query); |
| 934 | 934 | $sth->execute(); |
| 935 | - } catch(PDOException $e) { |
|
| 935 | + } catch (PDOException $e) { |
|
| 936 | 936 | return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n"; |
| 937 | 937 | } |
| 938 | 938 | } |
| 939 | - if (!$Connection->checkColumnName('stats','stats_airline')) { |
|
| 939 | + if (!$Connection->checkColumnName('stats', 'stats_airline')) { |
|
| 940 | 940 | // Add forsource to airlines |
| 941 | 941 | $query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 942 | 942 | try { |
| 943 | 943 | $sth = $Connection->db->prepare($query); |
| 944 | 944 | $sth->execute(); |
| 945 | - } catch(PDOException $e) { |
|
| 945 | + } catch (PDOException $e) { |
|
| 946 | 946 | return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n"; |
| 947 | 947 | } |
| 948 | - if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) { |
|
| 948 | + if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) { |
|
| 949 | 949 | // Add unique key |
| 950 | 950 | $query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);"; |
| 951 | 951 | try { |
| 952 | 952 | $sth = $Connection->db->prepare($query); |
| 953 | 953 | $sth->execute(); |
| 954 | - } catch(PDOException $e) { |
|
| 954 | + } catch (PDOException $e) { |
|
| 955 | 955 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; |
| 956 | 956 | } |
| 957 | 957 | } else { |
@@ -964,18 +964,18 @@ discard block |
||
| 964 | 964 | try { |
| 965 | 965 | $sth = $Connection->db->prepare($query); |
| 966 | 966 | $sth->execute(); |
| 967 | - } catch(PDOException $e) { |
|
| 967 | + } catch (PDOException $e) { |
|
| 968 | 968 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; |
| 969 | 969 | } |
| 970 | 970 | } |
| 971 | 971 | } |
| 972 | - if (!$Connection->checkColumnName('stats_registration','stats_airline')) { |
|
| 972 | + if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) { |
|
| 973 | 973 | // Add forsource to airlines |
| 974 | 974 | $query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 975 | 975 | try { |
| 976 | 976 | $sth = $Connection->db->prepare($query); |
| 977 | 977 | $sth->execute(); |
| 978 | - } catch(PDOException $e) { |
|
| 978 | + } catch (PDOException $e) { |
|
| 979 | 979 | return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n"; |
| 980 | 980 | } |
| 981 | 981 | // Add unique key |
@@ -987,17 +987,17 @@ discard block |
||
| 987 | 987 | try { |
| 988 | 988 | $sth = $Connection->db->prepare($query); |
| 989 | 989 | $sth->execute(); |
| 990 | - } catch(PDOException $e) { |
|
| 990 | + } catch (PDOException $e) { |
|
| 991 | 991 | return "error (add unique key in stats_registration) : ".$e->getMessage()."\n"; |
| 992 | 992 | } |
| 993 | 993 | } |
| 994 | - if (!$Connection->checkColumnName('stats_callsign','filter_name')) { |
|
| 994 | + if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) { |
|
| 995 | 995 | // Add forsource to airlines |
| 996 | 996 | $query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 997 | 997 | try { |
| 998 | 998 | $sth = $Connection->db->prepare($query); |
| 999 | 999 | $sth->execute(); |
| 1000 | - } catch(PDOException $e) { |
|
| 1000 | + } catch (PDOException $e) { |
|
| 1001 | 1001 | return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n"; |
| 1002 | 1002 | } |
| 1003 | 1003 | // Add unique key |
@@ -1009,17 +1009,17 @@ discard block |
||
| 1009 | 1009 | try { |
| 1010 | 1010 | $sth = $Connection->db->prepare($query); |
| 1011 | 1011 | $sth->execute(); |
| 1012 | - } catch(PDOException $e) { |
|
| 1012 | + } catch (PDOException $e) { |
|
| 1013 | 1013 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; |
| 1014 | 1014 | } |
| 1015 | 1015 | } |
| 1016 | - if (!$Connection->checkColumnName('stats_airline','filter_name')) { |
|
| 1016 | + if (!$Connection->checkColumnName('stats_airline', 'filter_name')) { |
|
| 1017 | 1017 | // Add forsource to airlines |
| 1018 | 1018 | $query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1019 | 1019 | try { |
| 1020 | 1020 | $sth = $Connection->db->prepare($query); |
| 1021 | 1021 | $sth->execute(); |
| 1022 | - } catch(PDOException $e) { |
|
| 1022 | + } catch (PDOException $e) { |
|
| 1023 | 1023 | return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n"; |
| 1024 | 1024 | } |
| 1025 | 1025 | // Add unique key |
@@ -1031,7 +1031,7 @@ discard block |
||
| 1031 | 1031 | try { |
| 1032 | 1032 | $sth = $Connection->db->prepare($query); |
| 1033 | 1033 | $sth->execute(); |
| 1034 | - } catch(PDOException $e) { |
|
| 1034 | + } catch (PDOException $e) { |
|
| 1035 | 1035 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; |
| 1036 | 1036 | } |
| 1037 | 1037 | } |
@@ -1040,7 +1040,7 @@ discard block |
||
| 1040 | 1040 | try { |
| 1041 | 1041 | $sth = $Connection->db->prepare($query); |
| 1042 | 1042 | $sth->execute(); |
| 1043 | - } catch(PDOException $e) { |
|
| 1043 | + } catch (PDOException $e) { |
|
| 1044 | 1044 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1045 | 1045 | } |
| 1046 | 1046 | return $error; |
@@ -1050,13 +1050,13 @@ discard block |
||
| 1050 | 1050 | global $globalDBdriver; |
| 1051 | 1051 | $Connection = new Connection(); |
| 1052 | 1052 | $error = ''; |
| 1053 | - if (!$Connection->checkColumnName('stats_owner','stats_airline')) { |
|
| 1053 | + if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) { |
|
| 1054 | 1054 | // Add forsource to airlines |
| 1055 | 1055 | $query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1056 | 1056 | try { |
| 1057 | 1057 | $sth = $Connection->db->prepare($query); |
| 1058 | 1058 | $sth->execute(); |
| 1059 | - } catch(PDOException $e) { |
|
| 1059 | + } catch (PDOException $e) { |
|
| 1060 | 1060 | return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n"; |
| 1061 | 1061 | } |
| 1062 | 1062 | // Add unique key |
@@ -1068,17 +1068,17 @@ discard block |
||
| 1068 | 1068 | try { |
| 1069 | 1069 | $sth = $Connection->db->prepare($query); |
| 1070 | 1070 | $sth->execute(); |
| 1071 | - } catch(PDOException $e) { |
|
| 1071 | + } catch (PDOException $e) { |
|
| 1072 | 1072 | return "error (add unique key in stats_owner) : ".$e->getMessage()."\n"; |
| 1073 | 1073 | } |
| 1074 | 1074 | } |
| 1075 | - if (!$Connection->checkColumnName('stats_pilot','stats_airline')) { |
|
| 1075 | + if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) { |
|
| 1076 | 1076 | // Add forsource to airlines |
| 1077 | 1077 | $query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1078 | 1078 | try { |
| 1079 | 1079 | $sth = $Connection->db->prepare($query); |
| 1080 | 1080 | $sth->execute(); |
| 1081 | - } catch(PDOException $e) { |
|
| 1081 | + } catch (PDOException $e) { |
|
| 1082 | 1082 | return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n"; |
| 1083 | 1083 | } |
| 1084 | 1084 | // Add unique key |
@@ -1090,7 +1090,7 @@ discard block |
||
| 1090 | 1090 | try { |
| 1091 | 1091 | $sth = $Connection->db->prepare($query); |
| 1092 | 1092 | $sth->execute(); |
| 1093 | - } catch(PDOException $e) { |
|
| 1093 | + } catch (PDOException $e) { |
|
| 1094 | 1094 | return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n"; |
| 1095 | 1095 | } |
| 1096 | 1096 | } |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | try { |
| 1099 | 1099 | $sth = $Connection->db->prepare($query); |
| 1100 | 1100 | $sth->execute(); |
| 1101 | - } catch(PDOException $e) { |
|
| 1101 | + } catch (PDOException $e) { |
|
| 1102 | 1102 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1103 | 1103 | } |
| 1104 | 1104 | return $error; |
@@ -1108,12 +1108,12 @@ discard block |
||
| 1108 | 1108 | global $globalDBdriver; |
| 1109 | 1109 | $Connection = new Connection(); |
| 1110 | 1110 | $error = ''; |
| 1111 | - if (!$Connection->checkColumnName('atc','format_source')) { |
|
| 1111 | + if (!$Connection->checkColumnName('atc', 'format_source')) { |
|
| 1112 | 1112 | $query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL"; |
| 1113 | 1113 | try { |
| 1114 | 1114 | $sth = $Connection->db->prepare($query); |
| 1115 | 1115 | $sth->execute(); |
| 1116 | - } catch(PDOException $e) { |
|
| 1116 | + } catch (PDOException $e) { |
|
| 1117 | 1117 | return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n"; |
| 1118 | 1118 | } |
| 1119 | 1119 | } |
@@ -1121,7 +1121,7 @@ discard block |
||
| 1121 | 1121 | try { |
| 1122 | 1122 | $sth = $Connection->db->prepare($query); |
| 1123 | 1123 | $sth->execute(); |
| 1124 | - } catch(PDOException $e) { |
|
| 1124 | + } catch (PDOException $e) { |
|
| 1125 | 1125 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1126 | 1126 | } |
| 1127 | 1127 | return $error; |
@@ -1131,13 +1131,13 @@ discard block |
||
| 1131 | 1131 | global $globalDBdriver; |
| 1132 | 1132 | $Connection = new Connection(); |
| 1133 | 1133 | $error = ''; |
| 1134 | - if (!$Connection->checkColumnName('stats_pilot','format_source')) { |
|
| 1134 | + if (!$Connection->checkColumnName('stats_pilot', 'format_source')) { |
|
| 1135 | 1135 | // Add forsource to airlines |
| 1136 | 1136 | $query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''"; |
| 1137 | 1137 | try { |
| 1138 | 1138 | $sth = $Connection->db->prepare($query); |
| 1139 | 1139 | $sth->execute(); |
| 1140 | - } catch(PDOException $e) { |
|
| 1140 | + } catch (PDOException $e) { |
|
| 1141 | 1141 | return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n"; |
| 1142 | 1142 | } |
| 1143 | 1143 | // Add unique key |
@@ -1149,7 +1149,7 @@ discard block |
||
| 1149 | 1149 | try { |
| 1150 | 1150 | $sth = $Connection->db->prepare($query); |
| 1151 | 1151 | $sth->execute(); |
| 1152 | - } catch(PDOException $e) { |
|
| 1152 | + } catch (PDOException $e) { |
|
| 1153 | 1153 | return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n"; |
| 1154 | 1154 | } |
| 1155 | 1155 | } |
@@ -1157,7 +1157,7 @@ discard block |
||
| 1157 | 1157 | try { |
| 1158 | 1158 | $sth = $Connection->db->prepare($query); |
| 1159 | 1159 | $sth->execute(); |
| 1160 | - } catch(PDOException $e) { |
|
| 1160 | + } catch (PDOException $e) { |
|
| 1161 | 1161 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1162 | 1162 | } |
| 1163 | 1163 | return $error; |
@@ -1167,23 +1167,23 @@ discard block |
||
| 1167 | 1167 | global $globalDBdriver; |
| 1168 | 1168 | $Connection = new Connection(); |
| 1169 | 1169 | $error = ''; |
| 1170 | - if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) { |
|
| 1170 | + if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) { |
|
| 1171 | 1171 | // Add unique key |
| 1172 | 1172 | $query = "alter table spotter_live add index(latitude,longitude)"; |
| 1173 | 1173 | try { |
| 1174 | 1174 | $sth = $Connection->db->prepare($query); |
| 1175 | 1175 | $sth->execute(); |
| 1176 | - } catch(PDOException $e) { |
|
| 1176 | + } catch (PDOException $e) { |
|
| 1177 | 1177 | return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n"; |
| 1178 | 1178 | } |
| 1179 | 1179 | } |
| 1180 | - if (!$Connection->checkColumnName('aircraft','mfr')) { |
|
| 1180 | + if (!$Connection->checkColumnName('aircraft', 'mfr')) { |
|
| 1181 | 1181 | // Add mfr to aircraft |
| 1182 | 1182 | $query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL"; |
| 1183 | 1183 | try { |
| 1184 | 1184 | $sth = $Connection->db->prepare($query); |
| 1185 | 1185 | $sth->execute(); |
| 1186 | - } catch(PDOException $e) { |
|
| 1186 | + } catch (PDOException $e) { |
|
| 1187 | 1187 | return "error (add mfr column in aircraft) : ".$e->getMessage()."\n"; |
| 1188 | 1188 | } |
| 1189 | 1189 | } |
@@ -1199,7 +1199,7 @@ discard block |
||
| 1199 | 1199 | try { |
| 1200 | 1200 | $sth = $Connection->db->prepare($query); |
| 1201 | 1201 | $sth->execute(); |
| 1202 | - } catch(PDOException $e) { |
|
| 1202 | + } catch (PDOException $e) { |
|
| 1203 | 1203 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1204 | 1204 | } |
| 1205 | 1205 | return $error; |
@@ -1209,13 +1209,13 @@ discard block |
||
| 1209 | 1209 | global $globalDBdriver; |
| 1210 | 1210 | $Connection = new Connection(); |
| 1211 | 1211 | $error = ''; |
| 1212 | - if ($Connection->checkColumnName('aircraft','mfr')) { |
|
| 1212 | + if ($Connection->checkColumnName('aircraft', 'mfr')) { |
|
| 1213 | 1213 | // drop mfr to aircraft |
| 1214 | 1214 | $query = "ALTER TABLE aircraft DROP COLUMN mfr"; |
| 1215 | 1215 | try { |
| 1216 | 1216 | $sth = $Connection->db->prepare($query); |
| 1217 | 1217 | $sth->execute(); |
| 1218 | - } catch(PDOException $e) { |
|
| 1218 | + } catch (PDOException $e) { |
|
| 1219 | 1219 | return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n"; |
| 1220 | 1220 | } |
| 1221 | 1221 | } |
@@ -1231,7 +1231,7 @@ discard block |
||
| 1231 | 1231 | try { |
| 1232 | 1232 | $sth = $Connection->db->prepare($query); |
| 1233 | 1233 | $sth->execute(); |
| 1234 | - } catch(PDOException $e) { |
|
| 1234 | + } catch (PDOException $e) { |
|
| 1235 | 1235 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1236 | 1236 | } |
| 1237 | 1237 | return $error; |
@@ -1241,33 +1241,33 @@ discard block |
||
| 1241 | 1241 | global $globalDBdriver; |
| 1242 | 1242 | $Connection = new Connection(); |
| 1243 | 1243 | $error = ''; |
| 1244 | - if (!$Connection->indexExists('notam','ref_idx')) { |
|
| 1244 | + if (!$Connection->indexExists('notam', 'ref_idx')) { |
|
| 1245 | 1245 | // Add index key |
| 1246 | 1246 | $query = "create index ref_idx on notam (ref)"; |
| 1247 | 1247 | try { |
| 1248 | 1248 | $sth = $Connection->db->prepare($query); |
| 1249 | 1249 | $sth->execute(); |
| 1250 | - } catch(PDOException $e) { |
|
| 1250 | + } catch (PDOException $e) { |
|
| 1251 | 1251 | return "error (add index ref on notam) : ".$e->getMessage()."\n"; |
| 1252 | 1252 | } |
| 1253 | 1253 | } |
| 1254 | - if (!$Connection->indexExists('accidents','registration_idx')) { |
|
| 1254 | + if (!$Connection->indexExists('accidents', 'registration_idx')) { |
|
| 1255 | 1255 | // Add index key |
| 1256 | 1256 | $query = "create index registration_idx on accidents (registration)"; |
| 1257 | 1257 | try { |
| 1258 | 1258 | $sth = $Connection->db->prepare($query); |
| 1259 | 1259 | $sth->execute(); |
| 1260 | - } catch(PDOException $e) { |
|
| 1260 | + } catch (PDOException $e) { |
|
| 1261 | 1261 | return "error (add index registration on accidents) : ".$e->getMessage()."\n"; |
| 1262 | 1262 | } |
| 1263 | 1263 | } |
| 1264 | - if (!$Connection->indexExists('accidents','rdts')) { |
|
| 1264 | + if (!$Connection->indexExists('accidents', 'rdts')) { |
|
| 1265 | 1265 | // Add index key |
| 1266 | 1266 | $query = "create index rdts on accidents (registration,date,type,source)"; |
| 1267 | 1267 | try { |
| 1268 | 1268 | $sth = $Connection->db->prepare($query); |
| 1269 | 1269 | $sth->execute(); |
| 1270 | - } catch(PDOException $e) { |
|
| 1270 | + } catch (PDOException $e) { |
|
| 1271 | 1271 | return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n"; |
| 1272 | 1272 | } |
| 1273 | 1273 | } |
@@ -1276,7 +1276,7 @@ discard block |
||
| 1276 | 1276 | try { |
| 1277 | 1277 | $sth = $Connection->db->prepare($query); |
| 1278 | 1278 | $sth->execute(); |
| 1279 | - } catch(PDOException $e) { |
|
| 1279 | + } catch (PDOException $e) { |
|
| 1280 | 1280 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1281 | 1281 | } |
| 1282 | 1282 | return $error; |
@@ -1286,23 +1286,23 @@ discard block |
||
| 1286 | 1286 | global $globalDBdriver; |
| 1287 | 1287 | $Connection = new Connection(); |
| 1288 | 1288 | $error = ''; |
| 1289 | - if (!$Connection->checkColumnName('accidents','airline_name')) { |
|
| 1289 | + if (!$Connection->checkColumnName('accidents', 'airline_name')) { |
|
| 1290 | 1290 | // Add airline_name to accidents |
| 1291 | 1291 | $query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL"; |
| 1292 | 1292 | try { |
| 1293 | 1293 | $sth = $Connection->db->prepare($query); |
| 1294 | 1294 | $sth->execute(); |
| 1295 | - } catch(PDOException $e) { |
|
| 1295 | + } catch (PDOException $e) { |
|
| 1296 | 1296 | return "error (add airline_name column in accidents) : ".$e->getMessage()."\n"; |
| 1297 | 1297 | } |
| 1298 | 1298 | } |
| 1299 | - if (!$Connection->checkColumnName('accidents','airline_icao')) { |
|
| 1299 | + if (!$Connection->checkColumnName('accidents', 'airline_icao')) { |
|
| 1300 | 1300 | // Add airline_icao to accidents |
| 1301 | 1301 | $query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL"; |
| 1302 | 1302 | try { |
| 1303 | 1303 | $sth = $Connection->db->prepare($query); |
| 1304 | 1304 | $sth->execute(); |
| 1305 | - } catch(PDOException $e) { |
|
| 1305 | + } catch (PDOException $e) { |
|
| 1306 | 1306 | return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n"; |
| 1307 | 1307 | } |
| 1308 | 1308 | } |
@@ -1310,7 +1310,7 @@ discard block |
||
| 1310 | 1310 | try { |
| 1311 | 1311 | $sth = $Connection->db->prepare($query); |
| 1312 | 1312 | $sth->execute(); |
| 1313 | - } catch(PDOException $e) { |
|
| 1313 | + } catch (PDOException $e) { |
|
| 1314 | 1314 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1315 | 1315 | } |
| 1316 | 1316 | return $error; |
@@ -1320,13 +1320,13 @@ discard block |
||
| 1320 | 1320 | global $globalDBdriver, $globalVATSIM, $globalIVAO; |
| 1321 | 1321 | $Connection = new Connection(); |
| 1322 | 1322 | $error = ''; |
| 1323 | - if (!$Connection->checkColumnName('airlines','alliance')) { |
|
| 1323 | + if (!$Connection->checkColumnName('airlines', 'alliance')) { |
|
| 1324 | 1324 | // Add alliance to airlines |
| 1325 | 1325 | $query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL"; |
| 1326 | 1326 | try { |
| 1327 | 1327 | $sth = $Connection->db->prepare($query); |
| 1328 | 1328 | $sth->execute(); |
| 1329 | - } catch(PDOException $e) { |
|
| 1329 | + } catch (PDOException $e) { |
|
| 1330 | 1330 | return "error (add alliance column in airlines) : ".$e->getMessage()."\n"; |
| 1331 | 1331 | } |
| 1332 | 1332 | } |
@@ -1353,7 +1353,7 @@ discard block |
||
| 1353 | 1353 | try { |
| 1354 | 1354 | $sth = $Connection->db->prepare($query); |
| 1355 | 1355 | $sth->execute(); |
| 1356 | - } catch(PDOException $e) { |
|
| 1356 | + } catch (PDOException $e) { |
|
| 1357 | 1357 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1358 | 1358 | } |
| 1359 | 1359 | return $error; |
@@ -1363,13 +1363,13 @@ discard block |
||
| 1363 | 1363 | global $globalDBdriver, $globalVATSIM, $globalIVAO; |
| 1364 | 1364 | $Connection = new Connection(); |
| 1365 | 1365 | $error = ''; |
| 1366 | - if (!$Connection->checkColumnName('airlines','ban_eu')) { |
|
| 1366 | + if (!$Connection->checkColumnName('airlines', 'ban_eu')) { |
|
| 1367 | 1367 | // Add ban_eu to airlines |
| 1368 | 1368 | $query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'"; |
| 1369 | 1369 | try { |
| 1370 | 1370 | $sth = $Connection->db->prepare($query); |
| 1371 | 1371 | $sth->execute(); |
| 1372 | - } catch(PDOException $e) { |
|
| 1372 | + } catch (PDOException $e) { |
|
| 1373 | 1373 | return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n"; |
| 1374 | 1374 | } |
| 1375 | 1375 | } |
@@ -1377,7 +1377,7 @@ discard block |
||
| 1377 | 1377 | try { |
| 1378 | 1378 | $sth = $Connection->db->prepare($query); |
| 1379 | 1379 | $sth->execute(); |
| 1380 | - } catch(PDOException $e) { |
|
| 1380 | + } catch (PDOException $e) { |
|
| 1381 | 1381 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1382 | 1382 | } |
| 1383 | 1383 | return $error; |
@@ -1388,19 +1388,19 @@ discard block |
||
| 1388 | 1388 | $Connection = new Connection(); |
| 1389 | 1389 | $error = ''; |
| 1390 | 1390 | if ($globalDBdriver == 'mysql') { |
| 1391 | - if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') { |
|
| 1391 | + if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') { |
|
| 1392 | 1392 | $query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL"; |
| 1393 | 1393 | try { |
| 1394 | 1394 | $sth = $Connection->db->prepare($query); |
| 1395 | 1395 | $sth->execute(); |
| 1396 | - } catch(PDOException $e) { |
|
| 1396 | + } catch (PDOException $e) { |
|
| 1397 | 1397 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; |
| 1398 | 1398 | } |
| 1399 | 1399 | $query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()"; |
| 1400 | 1400 | try { |
| 1401 | 1401 | $sth = $Connection->db->prepare($query); |
| 1402 | 1402 | $sth->execute(); |
| 1403 | - } catch(PDOException $e) { |
|
| 1403 | + } catch (PDOException $e) { |
|
| 1404 | 1404 | return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n"; |
| 1405 | 1405 | } |
| 1406 | 1406 | |
@@ -1408,7 +1408,7 @@ discard block |
||
| 1408 | 1408 | try { |
| 1409 | 1409 | $sth = $Connection->db->prepare($query); |
| 1410 | 1410 | $sth->execute(); |
| 1411 | - } catch(PDOException $e) { |
|
| 1411 | + } catch (PDOException $e) { |
|
| 1412 | 1412 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; |
| 1413 | 1413 | } |
| 1414 | 1414 | /*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150"; |
@@ -1459,7 +1459,7 @@ discard block |
||
| 1459 | 1459 | try { |
| 1460 | 1460 | $sth = $Connection->db->prepare($query); |
| 1461 | 1461 | $sth->execute(); |
| 1462 | - } catch(PDOException $e) { |
|
| 1462 | + } catch (PDOException $e) { |
|
| 1463 | 1463 | return "error (fix date) : ".$e->getMessage()."\n"; |
| 1464 | 1464 | } |
| 1465 | 1465 | } |
@@ -1544,7 +1544,7 @@ discard block |
||
| 1544 | 1544 | try { |
| 1545 | 1545 | $sth = $Connection->db->prepare($query); |
| 1546 | 1546 | $sth->execute(); |
| 1547 | - } catch(PDOException $e) { |
|
| 1547 | + } catch (PDOException $e) { |
|
| 1548 | 1548 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1549 | 1549 | } |
| 1550 | 1550 | return $error; |
@@ -1553,13 +1553,13 @@ discard block |
||
| 1553 | 1553 | global $globalDBdriver; |
| 1554 | 1554 | $Connection = new Connection(); |
| 1555 | 1555 | $error = ''; |
| 1556 | - if (!$Connection->indexExists('accidents','type')) { |
|
| 1556 | + if (!$Connection->indexExists('accidents', 'type')) { |
|
| 1557 | 1557 | // Add index key |
| 1558 | 1558 | $query = "create index type on accidents (type,date)"; |
| 1559 | 1559 | try { |
| 1560 | 1560 | $sth = $Connection->db->prepare($query); |
| 1561 | 1561 | $sth->execute(); |
| 1562 | - } catch(PDOException $e) { |
|
| 1562 | + } catch (PDOException $e) { |
|
| 1563 | 1563 | return "error (add index type on accidents) : ".$e->getMessage()."\n"; |
| 1564 | 1564 | } |
| 1565 | 1565 | } |
@@ -1567,7 +1567,7 @@ discard block |
||
| 1567 | 1567 | try { |
| 1568 | 1568 | $sth = $Connection->db->prepare($query); |
| 1569 | 1569 | $sth->execute(); |
| 1570 | - } catch(PDOException $e) { |
|
| 1570 | + } catch (PDOException $e) { |
|
| 1571 | 1571 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1572 | 1572 | } |
| 1573 | 1573 | return $error; |
@@ -1577,12 +1577,12 @@ discard block |
||
| 1577 | 1577 | global $globalDBdriver; |
| 1578 | 1578 | $Connection = new Connection(); |
| 1579 | 1579 | $error = ''; |
| 1580 | - if (!$Connection->checkColumnName('aircraft_modes','source_type')) { |
|
| 1580 | + if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) { |
|
| 1581 | 1581 | $query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'"; |
| 1582 | 1582 | try { |
| 1583 | 1583 | $sth = $Connection->db->prepare($query); |
| 1584 | 1584 | $sth->execute(); |
| 1585 | - } catch(PDOException $e) { |
|
| 1585 | + } catch (PDOException $e) { |
|
| 1586 | 1586 | return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n"; |
| 1587 | 1587 | } |
| 1588 | 1588 | } |
@@ -1648,7 +1648,7 @@ discard block |
||
| 1648 | 1648 | try { |
| 1649 | 1649 | $sth = $Connection->db->prepare($query); |
| 1650 | 1650 | $sth->execute(); |
| 1651 | - } catch(PDOException $e) { |
|
| 1651 | + } catch (PDOException $e) { |
|
| 1652 | 1652 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1653 | 1653 | } |
| 1654 | 1654 | return $error; |
@@ -1691,13 +1691,13 @@ discard block |
||
| 1691 | 1691 | $error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql'); |
| 1692 | 1692 | if ($error != '') return $error; |
| 1693 | 1693 | } |
| 1694 | - if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) { |
|
| 1694 | + if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) { |
|
| 1695 | 1695 | // Add index key |
| 1696 | 1696 | $query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)"; |
| 1697 | 1697 | try { |
| 1698 | 1698 | $sth = $Connection->db->prepare($query); |
| 1699 | 1699 | $sth->execute(); |
| 1700 | - } catch(PDOException $e) { |
|
| 1700 | + } catch (PDOException $e) { |
|
| 1701 | 1701 | return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n"; |
| 1702 | 1702 | } |
| 1703 | 1703 | } |
@@ -1705,7 +1705,7 @@ discard block |
||
| 1705 | 1705 | try { |
| 1706 | 1706 | $sth = $Connection->db->prepare($query); |
| 1707 | 1707 | $sth->execute(); |
| 1708 | - } catch(PDOException $e) { |
|
| 1708 | + } catch (PDOException $e) { |
|
| 1709 | 1709 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1710 | 1710 | } |
| 1711 | 1711 | return $error; |
@@ -1716,148 +1716,148 @@ discard block |
||
| 1716 | 1716 | $Connection = new Connection(); |
| 1717 | 1717 | $error = ''; |
| 1718 | 1718 | if ($globalDBdriver == 'mysql') { |
| 1719 | - if (!$Connection->checkColumnName('marine_output','type_id')) { |
|
| 1719 | + if (!$Connection->checkColumnName('marine_output', 'type_id')) { |
|
| 1720 | 1720 | $query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1721 | 1721 | try { |
| 1722 | 1722 | $sth = $Connection->db->prepare($query); |
| 1723 | 1723 | $sth->execute(); |
| 1724 | - } catch(PDOException $e) { |
|
| 1724 | + } catch (PDOException $e) { |
|
| 1725 | 1725 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; |
| 1726 | 1726 | } |
| 1727 | 1727 | } |
| 1728 | - if (!$Connection->checkColumnName('marine_live','type_id')) { |
|
| 1728 | + if (!$Connection->checkColumnName('marine_live', 'type_id')) { |
|
| 1729 | 1729 | $query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1730 | 1730 | try { |
| 1731 | 1731 | $sth = $Connection->db->prepare($query); |
| 1732 | 1732 | $sth->execute(); |
| 1733 | - } catch(PDOException $e) { |
|
| 1733 | + } catch (PDOException $e) { |
|
| 1734 | 1734 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; |
| 1735 | 1735 | } |
| 1736 | 1736 | } |
| 1737 | - if (!$Connection->checkColumnName('marine_archive','type_id')) { |
|
| 1737 | + if (!$Connection->checkColumnName('marine_archive', 'type_id')) { |
|
| 1738 | 1738 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1739 | 1739 | try { |
| 1740 | 1740 | $sth = $Connection->db->prepare($query); |
| 1741 | 1741 | $sth->execute(); |
| 1742 | - } catch(PDOException $e) { |
|
| 1742 | + } catch (PDOException $e) { |
|
| 1743 | 1743 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1744 | 1744 | } |
| 1745 | 1745 | } |
| 1746 | - if (!$Connection->checkColumnName('marine_archive_output','type_id')) { |
|
| 1746 | + if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { |
|
| 1747 | 1747 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1748 | 1748 | try { |
| 1749 | 1749 | $sth = $Connection->db->prepare($query); |
| 1750 | 1750 | $sth->execute(); |
| 1751 | - } catch(PDOException $e) { |
|
| 1751 | + } catch (PDOException $e) { |
|
| 1752 | 1752 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1753 | 1753 | } |
| 1754 | 1754 | } |
| 1755 | - if (!$Connection->checkColumnName('marine_output','status_id')) { |
|
| 1755 | + if (!$Connection->checkColumnName('marine_output', 'status_id')) { |
|
| 1756 | 1756 | $query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1757 | 1757 | try { |
| 1758 | 1758 | $sth = $Connection->db->prepare($query); |
| 1759 | 1759 | $sth->execute(); |
| 1760 | - } catch(PDOException $e) { |
|
| 1760 | + } catch (PDOException $e) { |
|
| 1761 | 1761 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; |
| 1762 | 1762 | } |
| 1763 | 1763 | } |
| 1764 | - if (!$Connection->checkColumnName('marine_live','status_id')) { |
|
| 1764 | + if (!$Connection->checkColumnName('marine_live', 'status_id')) { |
|
| 1765 | 1765 | $query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1766 | 1766 | try { |
| 1767 | 1767 | $sth = $Connection->db->prepare($query); |
| 1768 | 1768 | $sth->execute(); |
| 1769 | - } catch(PDOException $e) { |
|
| 1769 | + } catch (PDOException $e) { |
|
| 1770 | 1770 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; |
| 1771 | 1771 | } |
| 1772 | 1772 | } |
| 1773 | - if (!$Connection->checkColumnName('marine_archive','status_id')) { |
|
| 1773 | + if (!$Connection->checkColumnName('marine_archive', 'status_id')) { |
|
| 1774 | 1774 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1775 | 1775 | try { |
| 1776 | 1776 | $sth = $Connection->db->prepare($query); |
| 1777 | 1777 | $sth->execute(); |
| 1778 | - } catch(PDOException $e) { |
|
| 1778 | + } catch (PDOException $e) { |
|
| 1779 | 1779 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1780 | 1780 | } |
| 1781 | 1781 | } |
| 1782 | - if (!$Connection->checkColumnName('marine_archive_output','status_id')) { |
|
| 1782 | + if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { |
|
| 1783 | 1783 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1784 | 1784 | try { |
| 1785 | 1785 | $sth = $Connection->db->prepare($query); |
| 1786 | 1786 | $sth->execute(); |
| 1787 | - } catch(PDOException $e) { |
|
| 1787 | + } catch (PDOException $e) { |
|
| 1788 | 1788 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1789 | 1789 | } |
| 1790 | 1790 | } |
| 1791 | 1791 | } else { |
| 1792 | - if (!$Connection->checkColumnName('marine_output','type_id')) { |
|
| 1792 | + if (!$Connection->checkColumnName('marine_output', 'type_id')) { |
|
| 1793 | 1793 | $query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL"; |
| 1794 | 1794 | try { |
| 1795 | 1795 | $sth = $Connection->db->prepare($query); |
| 1796 | 1796 | $sth->execute(); |
| 1797 | - } catch(PDOException $e) { |
|
| 1797 | + } catch (PDOException $e) { |
|
| 1798 | 1798 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; |
| 1799 | 1799 | } |
| 1800 | 1800 | } |
| 1801 | - if (!$Connection->checkColumnName('marine_live','type_id')) { |
|
| 1801 | + if (!$Connection->checkColumnName('marine_live', 'type_id')) { |
|
| 1802 | 1802 | $query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL"; |
| 1803 | 1803 | try { |
| 1804 | 1804 | $sth = $Connection->db->prepare($query); |
| 1805 | 1805 | $sth->execute(); |
| 1806 | - } catch(PDOException $e) { |
|
| 1806 | + } catch (PDOException $e) { |
|
| 1807 | 1807 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; |
| 1808 | 1808 | } |
| 1809 | 1809 | } |
| 1810 | - if (!$Connection->checkColumnName('marine_archive','type_id')) { |
|
| 1810 | + if (!$Connection->checkColumnName('marine_archive', 'type_id')) { |
|
| 1811 | 1811 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL"; |
| 1812 | 1812 | try { |
| 1813 | 1813 | $sth = $Connection->db->prepare($query); |
| 1814 | 1814 | $sth->execute(); |
| 1815 | - } catch(PDOException $e) { |
|
| 1815 | + } catch (PDOException $e) { |
|
| 1816 | 1816 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1817 | 1817 | } |
| 1818 | 1818 | } |
| 1819 | - if (!$Connection->checkColumnName('marine_archive_output','type_id')) { |
|
| 1819 | + if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { |
|
| 1820 | 1820 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL"; |
| 1821 | 1821 | try { |
| 1822 | 1822 | $sth = $Connection->db->prepare($query); |
| 1823 | 1823 | $sth->execute(); |
| 1824 | - } catch(PDOException $e) { |
|
| 1824 | + } catch (PDOException $e) { |
|
| 1825 | 1825 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1826 | 1826 | } |
| 1827 | 1827 | } |
| 1828 | - if (!$Connection->checkColumnName('marine_output','status_id')) { |
|
| 1828 | + if (!$Connection->checkColumnName('marine_output', 'status_id')) { |
|
| 1829 | 1829 | $query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL"; |
| 1830 | 1830 | try { |
| 1831 | 1831 | $sth = $Connection->db->prepare($query); |
| 1832 | 1832 | $sth->execute(); |
| 1833 | - } catch(PDOException $e) { |
|
| 1833 | + } catch (PDOException $e) { |
|
| 1834 | 1834 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; |
| 1835 | 1835 | } |
| 1836 | 1836 | } |
| 1837 | - if (!$Connection->checkColumnName('marine_live','status_id')) { |
|
| 1837 | + if (!$Connection->checkColumnName('marine_live', 'status_id')) { |
|
| 1838 | 1838 | $query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL"; |
| 1839 | 1839 | try { |
| 1840 | 1840 | $sth = $Connection->db->prepare($query); |
| 1841 | 1841 | $sth->execute(); |
| 1842 | - } catch(PDOException $e) { |
|
| 1842 | + } catch (PDOException $e) { |
|
| 1843 | 1843 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; |
| 1844 | 1844 | } |
| 1845 | 1845 | } |
| 1846 | - if (!$Connection->checkColumnName('marine_archive','status_id')) { |
|
| 1846 | + if (!$Connection->checkColumnName('marine_archive', 'status_id')) { |
|
| 1847 | 1847 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL"; |
| 1848 | 1848 | try { |
| 1849 | 1849 | $sth = $Connection->db->prepare($query); |
| 1850 | 1850 | $sth->execute(); |
| 1851 | - } catch(PDOException $e) { |
|
| 1851 | + } catch (PDOException $e) { |
|
| 1852 | 1852 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1853 | 1853 | } |
| 1854 | 1854 | } |
| 1855 | - if (!$Connection->checkColumnName('marine_archive_output','status_id')) { |
|
| 1855 | + if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { |
|
| 1856 | 1856 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL"; |
| 1857 | 1857 | try { |
| 1858 | 1858 | $sth = $Connection->db->prepare($query); |
| 1859 | 1859 | $sth->execute(); |
| 1860 | - } catch(PDOException $e) { |
|
| 1860 | + } catch (PDOException $e) { |
|
| 1861 | 1861 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1862 | 1862 | } |
| 1863 | 1863 | } |
@@ -1866,7 +1866,7 @@ discard block |
||
| 1866 | 1866 | try { |
| 1867 | 1867 | $sth = $Connection->db->prepare($query); |
| 1868 | 1868 | $sth->execute(); |
| 1869 | - } catch(PDOException $e) { |
|
| 1869 | + } catch (PDOException $e) { |
|
| 1870 | 1870 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1871 | 1871 | } |
| 1872 | 1872 | return $error; |
@@ -1888,7 +1888,7 @@ discard block |
||
| 1888 | 1888 | try { |
| 1889 | 1889 | $sth = $Connection->db->prepare($query); |
| 1890 | 1890 | $sth->execute(); |
| 1891 | - } catch(PDOException $e) { |
|
| 1891 | + } catch (PDOException $e) { |
|
| 1892 | 1892 | return "error : ".$e->getMessage()."\n"; |
| 1893 | 1893 | } |
| 1894 | 1894 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -1,12 +1,12 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | require_once(dirname(__FILE__).'/settings.php'); |
| 3 | 3 | |
| 4 | -class Connection{ |
|
| 4 | +class Connection { |
|
| 5 | 5 | public $db = null; |
| 6 | 6 | public $dbs = array(); |
| 7 | 7 | public $latest_schema = 39; |
| 8 | 8 | |
| 9 | - public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) { |
|
| 9 | + public function __construct($dbc = null, $dbname = null, $user = null, $pass = null) { |
|
| 10 | 10 | global $globalDBdriver, $globalNoDB; |
| 11 | 11 | if (isset($globalNoDB) && $globalNoDB === TRUE) { |
| 12 | 12 | $this->db = null; |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | if ($user === null && $pass === null) { |
| 17 | 17 | $this->createDBConnection(); |
| 18 | 18 | } else { |
| 19 | - $this->createDBConnection(null,$user,$pass); |
|
| 19 | + $this->createDBConnection(null, $user, $pass); |
|
| 20 | 20 | } |
| 21 | 21 | } else { |
| 22 | 22 | $this->createDBConnection($dbname); |
@@ -100,14 +100,14 @@ discard block |
||
| 100 | 100 | while (true) { |
| 101 | 101 | try { |
| 102 | 102 | if ($globalDBSdriver == 'mysql') { |
| 103 | - $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass); |
|
| 103 | + $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;charset=utf8", $globalDBSuser, $globalDBSpass); |
|
| 104 | 104 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 105 | 105 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 106 | - $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
|
| 107 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,500); |
|
| 108 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 109 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 110 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 106 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); |
|
| 107 | + if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 500); |
|
| 108 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut); |
|
| 109 | + if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true); |
|
| 110 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent); |
|
| 111 | 111 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 112 | 112 | $this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true); |
| 113 | 113 | // Workaround against "ONLY_FULL_GROUP_BY" mode |
@@ -117,19 +117,19 @@ discard block |
||
| 117 | 117 | $this->dbs[$DBname]->exec('SET SESSION time_zone = "+00:00"'); |
| 118 | 118 | //$this->dbs[$DBname]->exec('SET @@session.time_zone = "+00:00"'); |
| 119 | 119 | } else { |
| 120 | - $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass); |
|
| 120 | + $this->dbs[$DBname] = new PDO("$globalDBSdriver:host=$globalDBShost;port=$globalDBSport;dbname=$globalDBSname;options='--client_encoding=utf8'", $globalDBSuser, $globalDBSpass); |
|
| 121 | 121 | //$this->dbs[$DBname]->setAttribute(PDO::MYSQL_ATTR_INIT_COMMAND, "SET NAMES 'utf8'"); |
| 122 | 122 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 123 | - $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE,PDO::CASE_LOWER); |
|
| 124 | - if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,200); |
|
| 125 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT,$globalDBTimeOut); |
|
| 126 | - if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,true); |
|
| 127 | - else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT,$globalDBPersistent); |
|
| 123 | + $this->dbs[$DBname]->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER); |
|
| 124 | + if (!isset($globalDBTimeOut)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, 200); |
|
| 125 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_TIMEOUT, $globalDBTimeOut); |
|
| 126 | + if (!isset($globalDBPersistent)) $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, true); |
|
| 127 | + else $this->dbs[$DBname]->setAttribute(PDO::ATTR_PERSISTENT, $globalDBPersistent); |
|
| 128 | 128 | $this->dbs[$DBname]->setAttribute(PDO::ATTR_EMULATE_PREPARES, true); |
| 129 | 129 | $this->dbs[$DBname]->exec('SET timezone="UTC"'); |
| 130 | 130 | } |
| 131 | 131 | break; |
| 132 | - } catch(PDOException $e) { |
|
| 132 | + } catch (PDOException $e) { |
|
| 133 | 133 | $i++; |
| 134 | 134 | if (isset($globalDebug) && $globalDebug) echo 'Error connecting to DB: '.$globalDBSname.' - Error: '.$e->getMessage()."\n"; |
| 135 | 135 | //exit; |
@@ -153,10 +153,10 @@ discard block |
||
| 153 | 153 | try { |
| 154 | 154 | //$Connection = new Connection(); |
| 155 | 155 | $results = $this->db->query($query); |
| 156 | - } catch(PDOException $e) { |
|
| 156 | + } catch (PDOException $e) { |
|
| 157 | 157 | return false; |
| 158 | 158 | } |
| 159 | - if($results->rowCount()>0) { |
|
| 159 | + if ($results->rowCount() > 0) { |
|
| 160 | 160 | return true; |
| 161 | 161 | } |
| 162 | 162 | else return false; |
@@ -177,8 +177,8 @@ discard block |
||
| 177 | 177 | return false; |
| 178 | 178 | } |
| 179 | 179 | |
| 180 | - } catch(PDOException $e) { |
|
| 181 | - if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
|
| 180 | + } catch (PDOException $e) { |
|
| 181 | + if ($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
|
| 182 | 182 | throw $e; |
| 183 | 183 | } |
| 184 | 184 | //echo 'error ! '.$e->getMessage(); |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | /* |
| 191 | 191 | * Check if index exist |
| 192 | 192 | */ |
| 193 | - public function indexExists($table,$index) |
|
| 193 | + public function indexExists($table, $index) |
|
| 194 | 194 | { |
| 195 | 195 | global $globalDBdriver, $globalDBname; |
| 196 | 196 | if ($globalDBdriver == 'mysql') { |
@@ -201,11 +201,11 @@ discard block |
||
| 201 | 201 | try { |
| 202 | 202 | //$Connection = new Connection(); |
| 203 | 203 | $results = $this->db->query($query); |
| 204 | - } catch(PDOException $e) { |
|
| 204 | + } catch (PDOException $e) { |
|
| 205 | 205 | return false; |
| 206 | 206 | } |
| 207 | 207 | $nb = $results->fetchAll(PDO::FETCH_ASSOC); |
| 208 | - if($nb[0]['nb'] > 0) { |
|
| 208 | + if ($nb[0]['nb'] > 0) { |
|
| 209 | 209 | return true; |
| 210 | 210 | } |
| 211 | 211 | else return false; |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | $query = "SELECT * FROM ".$table." LIMIT 0"; |
| 221 | 221 | try { |
| 222 | 222 | $results = $this->db->query($query); |
| 223 | - } catch(PDOException $e) { |
|
| 223 | + } catch (PDOException $e) { |
|
| 224 | 224 | return "error : ".$e->getMessage()."\n"; |
| 225 | 225 | } |
| 226 | 226 | $columns = array(); |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | return $columns; |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | - public function getColumnType($table,$column) { |
|
| 235 | + public function getColumnType($table, $column) { |
|
| 236 | 236 | $select = $this->db->query('SELECT '.$column.' FROM '.$table); |
| 237 | 237 | $tomet = $select->getColumnMeta(0); |
| 238 | 238 | return $tomet['native_type']; |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | * Check if a column name exist in a table |
| 243 | 243 | * @return Boolean column exist or not |
| 244 | 244 | */ |
| 245 | - public function checkColumnName($table,$name) |
|
| 245 | + public function checkColumnName($table, $name) |
|
| 246 | 246 | { |
| 247 | 247 | global $globalDBdriver, $globalDBname; |
| 248 | 248 | if ($globalDBdriver == 'mysql') { |
@@ -252,8 +252,8 @@ discard block |
||
| 252 | 252 | } |
| 253 | 253 | try { |
| 254 | 254 | $sth = $this->db()->prepare($query); |
| 255 | - $sth->execute(array(':database' => $globalDBname,':table' => $table,':name' => $name)); |
|
| 256 | - } catch(PDOException $e) { |
|
| 255 | + $sth->execute(array(':database' => $globalDBname, ':table' => $table, ':name' => $name)); |
|
| 256 | + } catch (PDOException $e) { |
|
| 257 | 257 | echo "error : ".$e->getMessage()."\n"; |
| 258 | 258 | } |
| 259 | 259 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | try { |
| 293 | 293 | $sth = $this->db->prepare($query); |
| 294 | 294 | $sth->execute(); |
| 295 | - } catch(PDOException $e) { |
|
| 295 | + } catch (PDOException $e) { |
|
| 296 | 296 | return "error : ".$e->getMessage()."\n"; |
| 297 | 297 | } |
| 298 | 298 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -16,33 +16,33 @@ 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['idents']) && !empty($flt['idents'])) { |
| 37 | 37 | if (isset($flt['source'])) { |
| 38 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND marine_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id"; |
|
| 38 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND marine_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id"; |
|
| 39 | 39 | } else { |
| 40 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id"; |
|
| 40 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.fammarine_id = marine_live.fammarine_id"; |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 45 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 45 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 46 | 46 | } |
| 47 | 47 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 48 | 48 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -71,15 +71,15 @@ discard block |
||
| 71 | 71 | $filter_query_date .= " AND EXTRACT(DAY FROM marine_output.date) = '".$filter['day']."'"; |
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.fammarine_id = marine_live.fammarine_id"; |
|
| 74 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.fammarine_id = marine_live.fammarine_id"; |
|
| 75 | 75 | } |
| 76 | 76 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 77 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 77 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 78 | 78 | } |
| 79 | 79 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 80 | 80 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 81 | 81 | if ($filter_query_where != '') { |
| 82 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 82 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 83 | 83 | } |
| 84 | 84 | $filter_query = $filter_query_join.$filter_query_where; |
| 85 | 85 | return $filter_query; |
@@ -102,8 +102,8 @@ discard block |
||
| 102 | 102 | if ($limit != '') |
| 103 | 103 | { |
| 104 | 104 | $limit_array = explode(',', $limit); |
| 105 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 106 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 105 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 106 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 107 | 107 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 108 | 108 | { |
| 109 | 109 | $limit_query = ' LIMIT '.$limit_array[1].' OFFSET '.$limit_array[0]; |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | } else { |
| 127 | 127 | $query = "SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate".$filter_query.$orderby_query; |
| 128 | 128 | } |
| 129 | - $spotter_array = $Marine->getDataFromDB($query.$limit_query,array(),'',true); |
|
| 129 | + $spotter_array = $Marine->getDataFromDB($query.$limit_query, array(), '', true); |
|
| 130 | 130 | |
| 131 | 131 | return $spotter_array; |
| 132 | 132 | } |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | global $globalDBdriver, $globalLiveInterval; |
| 143 | 143 | date_default_timezone_set('UTC'); |
| 144 | 144 | |
| 145 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 145 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 146 | 146 | |
| 147 | 147 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 148 | 148 | if ($globalDBdriver == 'mysql') { |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | try { |
| 157 | 157 | $sth = $this->db->prepare($query); |
| 158 | 158 | $sth->execute(); |
| 159 | - } catch(PDOException $e) { |
|
| 159 | + } catch (PDOException $e) { |
|
| 160 | 160 | echo $e->getMessage(); |
| 161 | 161 | die; |
| 162 | 162 | } |
@@ -176,15 +176,15 @@ discard block |
||
| 176 | 176 | global $globalDBdriver, $globalLiveInterval; |
| 177 | 177 | date_default_timezone_set('UTC'); |
| 178 | 178 | |
| 179 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 179 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 180 | 180 | |
| 181 | 181 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 182 | 182 | if ($globalDBdriver == 'mysql') { |
| 183 | - $query = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
|
| 183 | + $query = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
|
| 184 | 184 | FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' |
| 185 | 185 | ORDER BY marine_live.fammarine_id, marine_live.date"; |
| 186 | 186 | } else { |
| 187 | - $query = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
|
| 187 | + $query = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
|
| 188 | 188 | FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' |
| 189 | 189 | ORDER BY marine_live.fammarine_id, marine_live.date"; |
| 190 | 190 | } |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | try { |
| 193 | 193 | $sth = $this->db->prepare($query); |
| 194 | 194 | $sth->execute(); |
| 195 | - } catch(PDOException $e) { |
|
| 195 | + } catch (PDOException $e) { |
|
| 196 | 196 | echo $e->getMessage(); |
| 197 | 197 | die; |
| 198 | 198 | } |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | public function getLiveMarineCount($filter = array()) |
| 210 | 210 | { |
| 211 | 211 | global $globalDBdriver, $globalLiveInterval; |
| 212 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 212 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 213 | 213 | |
| 214 | 214 | if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
| 215 | 215 | if ($globalDBdriver == 'mysql') { |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | try { |
| 221 | 221 | $sth = $this->db->prepare($query); |
| 222 | 222 | $sth->execute(); |
| 223 | - } catch(PDOException $e) { |
|
| 223 | + } catch (PDOException $e) { |
|
| 224 | 224 | echo $e->getMessage(); |
| 225 | 225 | die; |
| 226 | 226 | } |
@@ -243,10 +243,10 @@ discard block |
||
| 243 | 243 | $filter_query = $this->getFilter($filter); |
| 244 | 244 | |
| 245 | 245 | if (is_array($coord)) { |
| 246 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 247 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 248 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 249 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 246 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 247 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 248 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 249 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 250 | 250 | } else return array(); |
| 251 | 251 | if ($globalDBdriver == 'mysql') { |
| 252 | 252 | $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate AND marine_live.latitude BETWEEN '.$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong.' GROUP BY marine_live.fammarine_id'.$filter_query; |
@@ -271,17 +271,17 @@ discard block |
||
| 271 | 271 | $filter_query = $this->getFilter($filter); |
| 272 | 272 | |
| 273 | 273 | if (is_array($coord)) { |
| 274 | - $minlong = filter_var($coord[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 275 | - $minlat = filter_var($coord[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 276 | - $maxlong = filter_var($coord[2],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 277 | - $maxlat = filter_var($coord[3],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 274 | + $minlong = filter_var($coord[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 275 | + $minlat = filter_var($coord[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 276 | + $maxlong = filter_var($coord[2], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 277 | + $maxlat = filter_var($coord[3], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 278 | 278 | } else return array(); |
| 279 | 279 | if ($globalDBdriver == 'mysql') { |
| 280 | 280 | $query = 'SELECT marine_live.ident, marine_live.fammarine_id,marine_live.type, marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
| 281 | 281 | FROM marine_live'.$filter_query.' DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval." SECOND) <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' AND marine_live.latitude BETWEEN ".$minlat.' AND '.$maxlat.' AND marine_live.longitude BETWEEN '.$minlong.' AND '.$maxlong." |
| 282 | 282 | ORDER BY marine_live.fammarine_id, marine_live.date"; |
| 283 | 283 | } else { |
| 284 | - $query = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
|
| 284 | + $query = "SELECT marine_live.ident, marine_live.fammarine_id, marine_live.type,marine_live.latitude, marine_live.longitude, marine_live.heading, marine_live.ground_speed, marine_live.date, marine_live.format_source |
|
| 285 | 285 | FROM marine_live".$filter_query." CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '".$globalLiveInterval." SECONDS' <= marine_live.date AND marine_live.latitude <> '0' AND marine_live.longitude <> '0' AND marine_live.latitude BETWEEN ".$minlat." AND ".$maxlat." AND marine_live.longitude BETWEEN ".$minlong." AND ".$maxlong." |
| 286 | 286 | ORDER BY marine_live.fammarine_id, marine_live.date"; |
| 287 | 287 | } |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | if ($interval == '1m') |
| 331 | 331 | { |
| 332 | 332 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
| 333 | - } else if ($interval == '15m'){ |
|
| 333 | + } else if ($interval == '15m') { |
|
| 334 | 334 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 15 MINUTE) <= marine_live.date '; |
| 335 | 335 | } |
| 336 | 336 | } |
@@ -338,14 +338,14 @@ discard block |
||
| 338 | 338 | $additional_query = ' AND DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MINUTE) <= marine_live.date '; |
| 339 | 339 | } |
| 340 | 340 | |
| 341 | - $query = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live |
|
| 341 | + $query = "SELECT marine_live.*, ( 6371 * acos( cos( radians(:lat) ) * cos( radians( latitude ) ) * cos( radians( longitude ) - radians(:lng) ) + sin( radians(:lat) ) * sin( radians( latitude ) ) ) ) AS distance FROM marine_live |
|
| 342 | 342 | WHERE marine_live.latitude <> '' |
| 343 | 343 | AND marine_live.longitude <> '' |
| 344 | 344 | ".$additional_query." |
| 345 | 345 | HAVING distance < :radius |
| 346 | 346 | ORDER BY distance"; |
| 347 | 347 | |
| 348 | - $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng,':radius' => $radius)); |
|
| 348 | + $spotter_array = $Marine->getDataFromDB($query, array(':lat' => $lat, ':lng' => $lng, ':radius' => $radius)); |
|
| 349 | 349 | |
| 350 | 350 | return $spotter_array; |
| 351 | 351 | } |
@@ -363,9 +363,9 @@ discard block |
||
| 363 | 363 | date_default_timezone_set('UTC'); |
| 364 | 364 | |
| 365 | 365 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 366 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 366 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 367 | 367 | |
| 368 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident),'',true); |
|
| 368 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident), '', true); |
|
| 369 | 369 | |
| 370 | 370 | return $spotter_array; |
| 371 | 371 | } |
@@ -376,16 +376,16 @@ discard block |
||
| 376 | 376 | * @return Array the spotter information |
| 377 | 377 | * |
| 378 | 378 | */ |
| 379 | - public function getDateLiveMarineDataByIdent($ident,$date) |
|
| 379 | + public function getDateLiveMarineDataByIdent($ident, $date) |
|
| 380 | 380 | { |
| 381 | 381 | $Marine = new Marine($this->db); |
| 382 | 382 | date_default_timezone_set('UTC'); |
| 383 | 383 | |
| 384 | 384 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 385 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 385 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 386 | 386 | |
| 387 | - $date = date('c',$date); |
|
| 388 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 387 | + $date = date('c', $date); |
|
| 388 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 389 | 389 | |
| 390 | 390 | return $spotter_array; |
| 391 | 391 | } |
@@ -402,9 +402,9 @@ discard block |
||
| 402 | 402 | date_default_timezone_set('UTC'); |
| 403 | 403 | |
| 404 | 404 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 405 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 405 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 406 | 406 | |
| 407 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id),'',true); |
|
| 407 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id), '', true); |
|
| 408 | 408 | |
| 409 | 409 | return $spotter_array; |
| 410 | 410 | } |
@@ -415,15 +415,15 @@ discard block |
||
| 415 | 415 | * @return Array the spotter information |
| 416 | 416 | * |
| 417 | 417 | */ |
| 418 | - public function getDateLiveMarineDataById($id,$date) |
|
| 418 | + public function getDateLiveMarineDataById($id, $date) |
|
| 419 | 419 | { |
| 420 | 420 | $Marine = new Marine($this->db); |
| 421 | 421 | date_default_timezone_set('UTC'); |
| 422 | 422 | |
| 423 | 423 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 424 | - $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 425 | - $date = date('c',$date); |
|
| 426 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date),'',true); |
|
| 424 | + $query = 'SELECT marine_live.* FROM marine_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_live l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_live.fammarine_id = s.fammarine_id AND marine_live.date = s.maxdate ORDER BY marine_live.date DESC'; |
|
| 425 | + $date = date('c', $date); |
|
| 426 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id, ':date' => $date), '', true); |
|
| 427 | 427 | |
| 428 | 428 | return $spotter_array; |
| 429 | 429 | } |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | * @return Array the spotter information |
| 436 | 436 | * |
| 437 | 437 | */ |
| 438 | - public function getAllLiveMarineDataById($id,$liveinterval = false) |
|
| 438 | + public function getAllLiveMarineDataById($id, $liveinterval = false) |
|
| 439 | 439 | { |
| 440 | 440 | global $globalDBdriver, $globalLiveInterval; |
| 441 | 441 | date_default_timezone_set('UTC'); |
@@ -454,7 +454,7 @@ discard block |
||
| 454 | 454 | try { |
| 455 | 455 | $sth = $this->db->prepare($query); |
| 456 | 456 | $sth->execute(array(':id' => $id)); |
| 457 | - } catch(PDOException $e) { |
|
| 457 | + } catch (PDOException $e) { |
|
| 458 | 458 | echo $e->getMessage(); |
| 459 | 459 | die; |
| 460 | 460 | } |
@@ -472,12 +472,12 @@ discard block |
||
| 472 | 472 | { |
| 473 | 473 | date_default_timezone_set('UTC'); |
| 474 | 474 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 475 | - $query = self::$global_query.' WHERE marine_live.ident = :ident'; |
|
| 475 | + $query = self::$global_query.' WHERE marine_live.ident = :ident'; |
|
| 476 | 476 | try { |
| 477 | 477 | |
| 478 | 478 | $sth = $this->db->prepare($query); |
| 479 | 479 | $sth->execute(array(':ident' => $ident)); |
| 480 | - } catch(PDOException $e) { |
|
| 480 | + } catch (PDOException $e) { |
|
| 481 | 481 | echo $e->getMessage(); |
| 482 | 482 | die; |
| 483 | 483 | } |
@@ -507,7 +507,7 @@ discard block |
||
| 507 | 507 | |
| 508 | 508 | $sth = $this->db->prepare($query); |
| 509 | 509 | $sth->execute(); |
| 510 | - } catch(PDOException $e) { |
|
| 510 | + } catch (PDOException $e) { |
|
| 511 | 511 | return "error"; |
| 512 | 512 | } |
| 513 | 513 | |
@@ -530,14 +530,14 @@ discard block |
||
| 530 | 530 | |
| 531 | 531 | $sth = $this->db->prepare($query); |
| 532 | 532 | $sth->execute(); |
| 533 | - } catch(PDOException $e) { |
|
| 533 | + } catch (PDOException $e) { |
|
| 534 | 534 | return "error"; |
| 535 | 535 | } |
| 536 | 536 | $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
| 537 | 537 | $i = 0; |
| 538 | - $j =0; |
|
| 538 | + $j = 0; |
|
| 539 | 539 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 540 | - foreach($all as $row) |
|
| 540 | + foreach ($all as $row) |
|
| 541 | 541 | { |
| 542 | 542 | $i++; |
| 543 | 543 | $j++; |
@@ -545,9 +545,9 @@ discard block |
||
| 545 | 545 | if ($globalDebug) echo "."; |
| 546 | 546 | try { |
| 547 | 547 | |
| 548 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 548 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 549 | 549 | $sth->execute(); |
| 550 | - } catch(PDOException $e) { |
|
| 550 | + } catch (PDOException $e) { |
|
| 551 | 551 | return "error"; |
| 552 | 552 | } |
| 553 | 553 | $query_delete = 'DELETE FROM marine_live WHERE fammarine_id IN ('; |
@@ -558,9 +558,9 @@ discard block |
||
| 558 | 558 | if ($i > 0) { |
| 559 | 559 | try { |
| 560 | 560 | |
| 561 | - $sth = $this->db->prepare(substr($query_delete,0,-1).")"); |
|
| 561 | + $sth = $this->db->prepare(substr($query_delete, 0, -1).")"); |
|
| 562 | 562 | $sth->execute(); |
| 563 | - } catch(PDOException $e) { |
|
| 563 | + } catch (PDOException $e) { |
|
| 564 | 564 | return "error"; |
| 565 | 565 | } |
| 566 | 566 | } |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | |
| 574 | 574 | $sth = $this->db->prepare($query); |
| 575 | 575 | $sth->execute(); |
| 576 | - } catch(PDOException $e) { |
|
| 576 | + } catch (PDOException $e) { |
|
| 577 | 577 | return "error"; |
| 578 | 578 | } |
| 579 | 579 | /* $query_delete = "DELETE FROM marine_live WHERE fammarine_id IN ("; |
@@ -621,13 +621,13 @@ discard block |
||
| 621 | 621 | public function deleteLiveMarineDataByIdent($ident) |
| 622 | 622 | { |
| 623 | 623 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 624 | - $query = 'DELETE FROM marine_live WHERE ident = :ident'; |
|
| 624 | + $query = 'DELETE FROM marine_live WHERE ident = :ident'; |
|
| 625 | 625 | |
| 626 | 626 | try { |
| 627 | 627 | |
| 628 | 628 | $sth = $this->db->prepare($query); |
| 629 | 629 | $sth->execute(array(':ident' => $ident)); |
| 630 | - } catch(PDOException $e) { |
|
| 630 | + } catch (PDOException $e) { |
|
| 631 | 631 | return "error"; |
| 632 | 632 | } |
| 633 | 633 | |
@@ -643,13 +643,13 @@ discard block |
||
| 643 | 643 | public function deleteLiveMarineDataById($id) |
| 644 | 644 | { |
| 645 | 645 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 646 | - $query = 'DELETE FROM marine_live WHERE fammarine_id = :id'; |
|
| 646 | + $query = 'DELETE FROM marine_live WHERE fammarine_id = :id'; |
|
| 647 | 647 | |
| 648 | 648 | try { |
| 649 | 649 | |
| 650 | 650 | $sth = $this->db->prepare($query); |
| 651 | 651 | $sth->execute(array(':id' => $id)); |
| 652 | - } catch(PDOException $e) { |
|
| 652 | + } catch (PDOException $e) { |
|
| 653 | 653 | return "error"; |
| 654 | 654 | } |
| 655 | 655 | |
@@ -667,13 +667,13 @@ discard block |
||
| 667 | 667 | { |
| 668 | 668 | global $globalDBdriver, $globalTimezone; |
| 669 | 669 | if ($globalDBdriver == 'mysql') { |
| 670 | - $query = 'SELECT marine_live.ident FROM marine_live |
|
| 670 | + $query = 'SELECT marine_live.ident FROM marine_live |
|
| 671 | 671 | WHERE marine_live.ident = :ident |
| 672 | 672 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 673 | 673 | AND marine_live.date < UTC_TIMESTAMP()'; |
| 674 | 674 | $query_data = array(':ident' => $ident); |
| 675 | 675 | } else { |
| 676 | - $query = "SELECT marine_live.ident FROM marine_live |
|
| 676 | + $query = "SELECT marine_live.ident FROM marine_live |
|
| 677 | 677 | WHERE marine_live.ident = :ident |
| 678 | 678 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 679 | 679 | AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -682,8 +682,8 @@ discard block |
||
| 682 | 682 | |
| 683 | 683 | $sth = $this->db->prepare($query); |
| 684 | 684 | $sth->execute($query_data); |
| 685 | - $ident_result=''; |
|
| 686 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 685 | + $ident_result = ''; |
|
| 686 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 687 | 687 | { |
| 688 | 688 | $ident_result = $row['ident']; |
| 689 | 689 | } |
@@ -700,13 +700,13 @@ discard block |
||
| 700 | 700 | { |
| 701 | 701 | global $globalDBdriver, $globalTimezone; |
| 702 | 702 | if ($globalDBdriver == 'mysql') { |
| 703 | - $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 703 | + $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 704 | 704 | WHERE marine_live.ident = :ident |
| 705 | 705 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 30 MINUTE)'; |
| 706 | 706 | // AND marine_live.date < UTC_TIMESTAMP()"; |
| 707 | 707 | $query_data = array(':ident' => $ident); |
| 708 | 708 | } else { |
| 709 | - $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 709 | + $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 710 | 710 | WHERE marine_live.ident = :ident |
| 711 | 711 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '30 MINUTES'"; |
| 712 | 712 | // AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -715,8 +715,8 @@ discard block |
||
| 715 | 715 | |
| 716 | 716 | $sth = $this->db->prepare($query); |
| 717 | 717 | $sth->execute($query_data); |
| 718 | - $ident_result=''; |
|
| 719 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 718 | + $ident_result = ''; |
|
| 719 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 720 | 720 | { |
| 721 | 721 | $ident_result = $row['fammarine_id']; |
| 722 | 722 | } |
@@ -733,13 +733,13 @@ discard block |
||
| 733 | 733 | { |
| 734 | 734 | global $globalDBdriver, $globalTimezone; |
| 735 | 735 | if ($globalDBdriver == 'mysql') { |
| 736 | - $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 736 | + $query = 'SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 737 | 737 | WHERE marine_live.fammarine_id = :id |
| 738 | 738 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 739 | 739 | // AND marine_live.date < UTC_TIMESTAMP()"; |
| 740 | 740 | $query_data = array(':id' => $id); |
| 741 | 741 | } else { |
| 742 | - $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 742 | + $query = "SELECT marine_live.ident, marine_live.fammarine_id FROM marine_live |
|
| 743 | 743 | WHERE marine_live.fammarine_id = :id |
| 744 | 744 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 745 | 745 | // AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -748,8 +748,8 @@ discard block |
||
| 748 | 748 | |
| 749 | 749 | $sth = $this->db->prepare($query); |
| 750 | 750 | $sth->execute($query_data); |
| 751 | - $ident_result=''; |
|
| 752 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 751 | + $ident_result = ''; |
|
| 752 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 753 | 753 | { |
| 754 | 754 | $ident_result = $row['fammarine_id']; |
| 755 | 755 | } |
@@ -766,13 +766,13 @@ discard block |
||
| 766 | 766 | { |
| 767 | 767 | global $globalDBdriver, $globalTimezone; |
| 768 | 768 | if ($globalDBdriver == 'mysql') { |
| 769 | - $query = 'SELECT marine_live.fammarine_id FROM marine_live |
|
| 769 | + $query = 'SELECT marine_live.fammarine_id FROM marine_live |
|
| 770 | 770 | WHERE marine_live.mmsi = :mmsi |
| 771 | 771 | AND marine_live.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 10 HOUR)'; |
| 772 | 772 | // AND marine_live.date < UTC_TIMESTAMP()"; |
| 773 | 773 | $query_data = array(':mmsi' => $mmsi); |
| 774 | 774 | } else { |
| 775 | - $query = "SELECT marine_live.fammarine_id FROM marine_live |
|
| 775 | + $query = "SELECT marine_live.fammarine_id FROM marine_live |
|
| 776 | 776 | WHERE marine_live.mmsi = :mmsi |
| 777 | 777 | AND marine_live.date >= now() AT TIME ZONE 'UTC' - INTERVAL '10 HOUR'"; |
| 778 | 778 | // AND marine_live.date < now() AT TIME ZONE 'UTC'"; |
@@ -781,8 +781,8 @@ discard block |
||
| 781 | 781 | |
| 782 | 782 | $sth = $this->db->prepare($query); |
| 783 | 783 | $sth->execute($query_data); |
| 784 | - $ident_result=''; |
|
| 785 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 784 | + $ident_result = ''; |
|
| 785 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 786 | 786 | { |
| 787 | 787 | $ident_result = $row['fammarine_id']; |
| 788 | 788 | } |
@@ -800,7 +800,7 @@ discard block |
||
| 800 | 800 | * @return String success or false |
| 801 | 801 | * |
| 802 | 802 | */ |
| 803 | - public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') |
|
| 803 | + public function addLiveMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') |
|
| 804 | 804 | { |
| 805 | 805 | global $globalURL, $globalArchive, $globalDebug; |
| 806 | 806 | $Common = new Common(); |
@@ -852,26 +852,26 @@ discard block |
||
| 852 | 852 | if ($date == '') $date = date("Y-m-d H:i:s", time()); |
| 853 | 853 | |
| 854 | 854 | |
| 855 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
| 856 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 857 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 858 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 859 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 860 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 861 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 862 | - $source_name = filter_var($source_name,FILTER_SANITIZE_STRING); |
|
| 863 | - $over_country = filter_var($over_country,FILTER_SANITIZE_STRING); |
|
| 864 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 865 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
|
| 866 | - $status = filter_var($status,FILTER_SANITIZE_STRING); |
|
| 867 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
| 868 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 869 | - $arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING); |
|
| 870 | - $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
|
| 855 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
| 856 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 857 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 858 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 859 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 860 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 861 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 862 | + $source_name = filter_var($source_name, FILTER_SANITIZE_STRING); |
|
| 863 | + $over_country = filter_var($over_country, FILTER_SANITIZE_STRING); |
|
| 864 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 865 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT); |
|
| 866 | + $status = filter_var($status, FILTER_SANITIZE_STRING); |
|
| 867 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
| 868 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 869 | + $arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING); |
|
| 870 | + $arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING); |
|
| 871 | 871 | |
| 872 | 872 | |
| 873 | - if ($groundspeed == '' || $Common->isInteger($groundspeed) === false ) $groundspeed = 0; |
|
| 874 | - if ($heading == '' || $Common->isInteger($heading) === false ) $heading = 0; |
|
| 873 | + if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
|
| 874 | + if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
|
| 875 | 875 | if ($arrival_date == '') $arrival_date = NULL; |
| 876 | 876 | $query = ''; |
| 877 | 877 | if ($globalArchive) { |
@@ -881,18 +881,18 @@ discard block |
||
| 881 | 881 | $query .= 'INSERT INTO marine_live (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) |
| 882 | 882 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)'; |
| 883 | 883 | |
| 884 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date); |
|
| 884 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date); |
|
| 885 | 885 | try { |
| 886 | 886 | $sth = $this->db->prepare($query); |
| 887 | 887 | $sth->execute($query_values); |
| 888 | - } catch(PDOException $e) { |
|
| 888 | + } catch (PDOException $e) { |
|
| 889 | 889 | return "error : ".$e->getMessage(); |
| 890 | 890 | } |
| 891 | 891 | |
| 892 | 892 | if (isset($globalArchive) && $globalArchive && $putinarchive && $noarchive !== true) { |
| 893 | 893 | if ($globalDebug) echo '(Add to Marine archive : '; |
| 894 | 894 | $MarineArchive = new MarineArchive($this->db); |
| 895 | - $result = $MarineArchive->addMarineArchiveData($fammarine_id, $ident, $latitude, $longitude, $heading, $groundspeed, $date, $putinarchive, $mmsi,$type,$typeid,$imo, $callsign,$arrival_code,$arrival_date,$status,$noarchive,$format_source, $source_name, $over_country); |
|
| 895 | + $result = $MarineArchive->addMarineArchiveData($fammarine_id, $ident, $latitude, $longitude, $heading, $groundspeed, $date, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $noarchive, $format_source, $source_name, $over_country); |
|
| 896 | 896 | if ($globalDebug) echo $result.')'; |
| 897 | 897 | } |
| 898 | 898 | return "success"; |
@@ -900,7 +900,7 @@ discard block |
||
| 900 | 900 | |
| 901 | 901 | public function getOrderBy() |
| 902 | 902 | { |
| 903 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_live.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_live.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_live.date DESC")); |
|
| 903 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_live.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_live.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_live.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_live.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_live.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_live.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_live.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_live.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_live.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_live.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_live.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_live.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_live.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_live.date DESC")); |
|
| 904 | 904 | return $orderby; |
| 905 | 905 | } |
| 906 | 906 | |
@@ -90,8 +90,7 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | |
| 92 | 92 | private function urshift($n, $s) { |
| 93 | - return ($n >= 0) ? ($n >> $s) : |
|
| 94 | - (($n & 0x7fffffff) >> $s) | |
|
| 93 | + return ($n >= 0) ? ($n >> $s) : (($n&0x7fffffff) >> $s)| |
|
| 95 | 94 | (0x40000000 >> ($s - 1)); |
| 96 | 95 | } |
| 97 | 96 | |
@@ -103,7 +102,7 @@ discard block |
||
| 103 | 102 | //$split_input = str_split($input); |
| 104 | 103 | |
| 105 | 104 | /* Find the end of header checking for NULL bytes while doing it. */ |
| 106 | - $splitpos = strpos($input,':'); |
|
| 105 | + $splitpos = strpos($input, ':'); |
|
| 107 | 106 | |
| 108 | 107 | /* Check that end was found and body has at least one byte. */ |
| 109 | 108 | if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) { |
@@ -113,15 +112,15 @@ discard block |
||
| 113 | 112 | |
| 114 | 113 | if ($debug) echo 'input : '.$input."\n"; |
| 115 | 114 | /* Save header and body. */ |
| 116 | - $body = substr($input,$splitpos+1,$input_len); |
|
| 115 | + $body = substr($input, $splitpos + 1, $input_len); |
|
| 117 | 116 | $body_len = strlen($body); |
| 118 | - $header = substr($input,0,$splitpos); |
|
| 117 | + $header = substr($input, 0, $splitpos); |
|
| 119 | 118 | //$header_len = strlen($header); |
| 120 | 119 | if ($debug) echo 'header : '.$header."\n"; |
| 121 | 120 | |
| 122 | 121 | /* Parse source, target and path. */ |
| 123 | 122 | //FLRDF0A52>APRS,qAS,LSTB |
| 124 | - if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) { |
|
| 123 | + if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/', $header, $matches)) { |
|
| 125 | 124 | $ident = $matches[1]; |
| 126 | 125 | $all_elements = $matches[2]; |
| 127 | 126 | if ($ident == 'AIRCRAFT') { |
@@ -135,14 +134,14 @@ discard block |
||
| 135 | 134 | $result['ident'] = $ident; |
| 136 | 135 | } |
| 137 | 136 | } else return false; |
| 138 | - $elements = explode(',',$all_elements); |
|
| 137 | + $elements = explode(',', $all_elements); |
|
| 139 | 138 | $source = end($elements); |
| 140 | 139 | $result['source'] = $source; |
| 141 | 140 | foreach ($elements as $element) { |
| 142 | - if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) { |
|
| 141 | + if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/', $element)) { |
|
| 143 | 142 | //echo "ok"; |
| 144 | 143 | //if ($element == 'TCPIP*') return false; |
| 145 | - } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
|
| 144 | + } elseif (!preg_match('/^([0-9A-F]{32})$/', $element)) { |
|
| 146 | 145 | if ($debug) echo 'element : '.$element."\n"; |
| 147 | 146 | return false; |
| 148 | 147 | } |
@@ -155,14 +154,14 @@ discard block |
||
| 155 | 154 | */ |
| 156 | 155 | } |
| 157 | 156 | |
| 158 | - $type = substr($body,0,1); |
|
| 157 | + $type = substr($body, 0, 1); |
|
| 159 | 158 | if ($debug) echo 'type : '.$type."\n"; |
| 160 | 159 | if ($type == ';') { |
| 161 | 160 | if (isset($result['source_type']) && $result['source_type'] == 'modes') { |
| 162 | - $result['address'] = trim(substr($body,1,9)); |
|
| 161 | + $result['address'] = trim(substr($body, 1, 9)); |
|
| 163 | 162 | } elseif (isset($result['source_type']) && $result['source_type'] == 'ais') { |
| 164 | - $result['mmsi'] = trim(substr($body,1,9)); |
|
| 165 | - } else $result['ident'] = trim(substr($body,1,9)); |
|
| 163 | + $result['mmsi'] = trim(substr($body, 1, 9)); |
|
| 164 | + } else $result['ident'] = trim(substr($body, 1, 9)); |
|
| 166 | 165 | } elseif ($type == ',') { |
| 167 | 166 | // Invalid data or test data |
| 168 | 167 | return false; |
@@ -170,24 +169,24 @@ discard block |
||
| 170 | 169 | |
| 171 | 170 | // Check for Timestamp |
| 172 | 171 | $find = false; |
| 173 | - $body_parse = substr($body,1); |
|
| 172 | + $body_parse = substr($body, 1); |
|
| 174 | 173 | //echo 'Body : '.$body."\n"; |
| 175 | - if (preg_match('/^;(.){9}\*/',$body,$matches)) { |
|
| 176 | - $body_parse = substr($body_parse,10); |
|
| 174 | + if (preg_match('/^;(.){9}\*/', $body, $matches)) { |
|
| 175 | + $body_parse = substr($body_parse, 10); |
|
| 177 | 176 | $find = true; |
| 178 | 177 | //echo $body_parse."\n"; |
| 179 | 178 | } |
| 180 | - if (preg_match('/^`(.*)\//',$body,$matches)) { |
|
| 181 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 179 | + if (preg_match('/^`(.*)\//', $body, $matches)) { |
|
| 180 | + $body_parse = substr($body_parse, strlen($matches[1]) - 1); |
|
| 182 | 181 | $find = true; |
| 183 | 182 | //echo $body_parse."\n"; |
| 184 | 183 | } |
| 185 | - if (preg_match("/^'(.*)\//",$body,$matches)) { |
|
| 186 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
| 184 | + if (preg_match("/^'(.*)\//", $body, $matches)) { |
|
| 185 | + $body_parse = substr($body_parse, strlen($matches[1]) - 1); |
|
| 187 | 186 | $find = true; |
| 188 | 187 | //echo $body_parse."\n"; |
| 189 | 188 | } |
| 190 | - if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) { |
|
| 189 | + if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/', $body_parse, $matches)) { |
|
| 191 | 190 | $find = true; |
| 192 | 191 | //print_r($matches); |
| 193 | 192 | $timestamp = $matches[0]; |
@@ -202,19 +201,19 @@ discard block |
||
| 202 | 201 | // This work or not ? |
| 203 | 202 | $timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]); |
| 204 | 203 | } |
| 205 | - $body_parse = substr($body_parse,7); |
|
| 204 | + $body_parse = substr($body_parse, 7); |
|
| 206 | 205 | $result['timestamp'] = $timestamp; |
| 207 | 206 | //echo date('Ymd H:i:s',$timestamp); |
| 208 | 207 | } |
| 209 | - if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) { |
|
| 208 | + if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/', $body_parse, $matches)) { |
|
| 210 | 209 | $find = true; |
| 211 | 210 | $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]); |
| 212 | - $body_parse = substr($body_parse,8); |
|
| 211 | + $body_parse = substr($body_parse, 8); |
|
| 213 | 212 | $result['timestamp'] = $timestamp; |
| 214 | 213 | //echo date('Ymd H:i:s',$timestamp); |
| 215 | 214 | } |
| 216 | 215 | //if (strlen($body_parse) > 19) { |
| 217 | - if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) { |
|
| 216 | + if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/', $body_parse, $matches)) { |
|
| 218 | 217 | $find = true; |
| 219 | 218 | // 4658.70N/00707.78Ez |
| 220 | 219 | //print_r(str_split($body_parse)); |
@@ -240,11 +239,11 @@ discard block |
||
| 240 | 239 | */ |
| 241 | 240 | $latitude = $lat + floatval($lat_min)/60; |
| 242 | 241 | $longitude = $lon + floatval($lon_min)/60; |
| 243 | - if ($sind == 'S') $latitude = 0-$latitude; |
|
| 244 | - if ($wind == 'W') $longitude = 0-$longitude; |
|
| 242 | + if ($sind == 'S') $latitude = 0 - $latitude; |
|
| 243 | + if ($wind == 'W') $longitude = 0 - $longitude; |
|
| 245 | 244 | $result['latitude'] = $latitude; |
| 246 | 245 | $result['longitude'] = $longitude; |
| 247 | - $body_parse = substr($body_parse,18); |
|
| 246 | + $body_parse = substr($body_parse, 18); |
|
| 248 | 247 | $body_parse_len = strlen($body_parse); |
| 249 | 248 | } |
| 250 | 249 | $body_parse_len = strlen($body_parse); |
@@ -272,7 +271,7 @@ discard block |
||
| 272 | 271 | //echo $body_parse; |
| 273 | 272 | //if ($type != ';' && $type != '>') { |
| 274 | 273 | if ($type != '') { |
| 275 | - $body_parse = substr($body_parse,1); |
|
| 274 | + $body_parse = substr($body_parse, 1); |
|
| 276 | 275 | $body_parse_len = strlen($body_parse); |
| 277 | 276 | $result['symbol_code'] = $symbol_code; |
| 278 | 277 | if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code]; |
@@ -283,16 +282,16 @@ discard block |
||
| 283 | 282 | //$body_parse_len = strlen($body_parse); |
| 284 | 283 | if ($body_parse_len >= 7) { |
| 285 | 284 | |
| 286 | - if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
|
| 287 | - $course = substr($body_parse,0,3); |
|
| 285 | + if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/', $body_parse)) { |
|
| 286 | + $course = substr($body_parse, 0, 3); |
|
| 288 | 287 | $tmp_s = intval($course); |
| 289 | 288 | if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
| 290 | - $speed = substr($body_parse,4,3); |
|
| 289 | + $speed = substr($body_parse, 4, 3); |
|
| 291 | 290 | if ($speed != '...') { |
| 292 | 291 | //$result['speed'] = round($speed*1.852); |
| 293 | 292 | $result['speed'] = intval($speed); |
| 294 | 293 | } |
| 295 | - $body_parse = substr($body_parse,7); |
|
| 294 | + $body_parse = substr($body_parse, 7); |
|
| 296 | 295 | } |
| 297 | 296 | // Check PHGR, PHG, RNG |
| 298 | 297 | } |
@@ -302,12 +301,12 @@ discard block |
||
| 302 | 301 | } |
| 303 | 302 | */ |
| 304 | 303 | if (strlen($body_parse) > 0) { |
| 305 | - if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) { |
|
| 304 | + if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/', $body_parse, $matches)) { |
|
| 306 | 305 | $altitude = intval($matches[1]); |
| 307 | 306 | //$result['altitude'] = round($altitude*0.3048); |
| 308 | 307 | $result['altitude'] = $altitude; |
| 309 | 308 | //$body_parse = trim(substr($body_parse,strlen($matches[0]))); |
| 310 | - $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse)); |
|
| 309 | + $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/', '', $body_parse)); |
|
| 311 | 310 | } |
| 312 | 311 | } |
| 313 | 312 | |
@@ -319,13 +318,13 @@ discard block |
||
| 319 | 318 | */ |
| 320 | 319 | // DAO |
| 321 | 320 | |
| 322 | - if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) { |
|
| 321 | + if (preg_match('/^!([0-9A-Z]{3})/', $body_parse, $matches)) { |
|
| 323 | 322 | |
| 324 | 323 | $dao = $matches[1]; |
| 325 | - if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) { |
|
| 324 | + if (preg_match('/^([A-Z])([0-9]{2})/', $dao)) { |
|
| 326 | 325 | $dao_split = str_split($dao); |
| 327 | - $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
|
| 328 | - $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
|
| 326 | + $lat_off = (($dao_split[1]) - 48.0)*0.001/60.0; |
|
| 327 | + $lon_off = (($dao_split[2]) - 48.0)*0.001/60.0; |
|
| 329 | 328 | |
| 330 | 329 | if ($result['latitude'] < 0) $result['latitude'] -= $lat_off; |
| 331 | 330 | else $result['latitude'] += $lat_off; |
@@ -333,47 +332,47 @@ discard block |
||
| 333 | 332 | else $result['longitude'] += $lon_off; |
| 334 | 333 | } |
| 335 | 334 | |
| 336 | - $body_parse = substr($body_parse,6); |
|
| 335 | + $body_parse = substr($body_parse, 6); |
|
| 337 | 336 | } |
| 338 | 337 | |
| 339 | - if (preg_match('/CS=([0-9A-Z]*)/',$body_parse,$matches)) { |
|
| 338 | + if (preg_match('/CS=([0-9A-Z]*)/', $body_parse, $matches)) { |
|
| 340 | 339 | $result['ident'] = $matches[1]; |
| 341 | 340 | } |
| 342 | - if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) { |
|
| 341 | + if (preg_match('/SQ=([0-9]{4})/', $body_parse, $matches)) { |
|
| 343 | 342 | $result['squawk'] = $matches[1]; |
| 344 | 343 | } |
| 345 | - if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) { |
|
| 344 | + if (preg_match('/AI=([0-9A-Z]{4})/', $body_parse, $matches)) { |
|
| 346 | 345 | $result['aircraft_icao'] = $matches[1]; |
| 347 | 346 | } |
| 348 | - if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) { |
|
| 347 | + if (preg_match('/TI=([0-9]*)/', $body_parse, $matches)) { |
|
| 349 | 348 | $result['typeid'] = $matches[1]; |
| 350 | 349 | } |
| 351 | - if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) { |
|
| 350 | + if (preg_match('/SI=([0-9]*)/', $body_parse, $matches)) { |
|
| 352 | 351 | $result['statusid'] = $matches[1]; |
| 353 | 352 | } |
| 354 | - if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) { |
|
| 353 | + if (preg_match('/IMO=([0-9]{7})/', $body_parse, $matches)) { |
|
| 355 | 354 | $result['imo'] = $matches[1]; |
| 356 | 355 | } |
| 357 | - if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) { |
|
| 356 | + if (preg_match('/AD=([0-9]*)/', $body_parse, $matches)) { |
|
| 358 | 357 | $result['arrival_date'] = $matches[1]; |
| 359 | 358 | } |
| 360 | - if (preg_match('/AC=([0-9A-Z]*)/',$body_parse,$matches)) { |
|
| 359 | + if (preg_match('/AC=([0-9A-Z]*)/', $body_parse, $matches)) { |
|
| 361 | 360 | $result['arrival_code'] = $matches[1]; |
| 362 | 361 | } |
| 363 | 362 | // OGN comment |
| 364 | 363 | // echo "Before OGN : ".$body_parse."\n"; |
| 365 | 364 | //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) { |
| 366 | - if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) { |
|
| 365 | + if (preg_match('/^id([0-9A-F]{8})/', $body_parse, $matches)) { |
|
| 367 | 366 | $id = $matches[1]; |
| 368 | 367 | //$mode = substr($id,0,2); |
| 369 | - $address = substr($id,2); |
|
| 368 | + $address = substr($id, 2); |
|
| 370 | 369 | //print_r($matches); |
| 371 | - $addressType = (intval(substr($id,0,2),16))&3; |
|
| 370 | + $addressType = (intval(substr($id, 0, 2), 16))&3; |
|
| 372 | 371 | if ($addressType == 0) $result['addresstype'] = "RANDOM"; |
| 373 | 372 | elseif ($addressType == 1) $result['addresstype'] = "ICAO"; |
| 374 | 373 | elseif ($addressType == 2) $result['addresstype'] = "FLARM"; |
| 375 | 374 | elseif ($addressType == 3) $result['addresstype'] = "OGN"; |
| 376 | - $aircraftType = $this->urshift(((intval(substr($id,0,2),16)) & 0b1111100),2); |
|
| 375 | + $aircraftType = $this->urshift(((intval(substr($id, 0, 2), 16))&0b1111100), 2); |
|
| 377 | 376 | $result['aircrafttype_code'] = $aircraftType; |
| 378 | 377 | if ($aircraftType == 0) $result['aircrafttype'] = "UNKNOWN"; |
| 379 | 378 | elseif ($aircraftType == 1) $result['aircrafttype'] = "GLIDER"; |
@@ -390,7 +389,7 @@ discard block |
||
| 390 | 389 | elseif ($aircraftType == 12) $result['aircrafttype'] = "AIRSHIP"; |
| 391 | 390 | elseif ($aircraftType == 13) $result['aircrafttype'] = "UAV"; |
| 392 | 391 | elseif ($aircraftType == 15) $result['aircrafttype'] = "STATIC_OBJECT"; |
| 393 | - $stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0; |
|
| 392 | + $stealth = (intval(substr($id, 0, 2), 16)&0b10000000) != 0; |
|
| 394 | 393 | $result['stealth'] = $stealth; |
| 395 | 394 | $result['address'] = $address; |
| 396 | 395 | } |
@@ -402,77 +401,77 @@ discard block |
||
| 402 | 401 | //$body_parse = substr($body_parse,1); |
| 403 | 402 | //$body_parse_len = strlen($body_parse); |
| 404 | 403 | |
| 405 | - if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 404 | + if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 406 | 405 | $result['wind_dir'] = intval($matches[1]); |
| 407 | - $result['wind_speed'] = round(intval($matches[2])*1.60934,1); |
|
| 408 | - $result['wind_gust'] = round(intval($matches[3])*1.60934,1); |
|
| 409 | - $result['temp'] = round(5/9*((intval($matches[4]))-32),1); |
|
| 410 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 411 | - } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 406 | + $result['wind_speed'] = round(intval($matches[2])*1.60934, 1); |
|
| 407 | + $result['wind_gust'] = round(intval($matches[3])*1.60934, 1); |
|
| 408 | + $result['temp'] = round(5/9*((intval($matches[4])) - 32), 1); |
|
| 409 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 410 | + } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 412 | 411 | $result['wind_dir'] = intval($matches[1]); |
| 413 | - $result['wind_speed'] = round($matches[2]*1.60934,1); |
|
| 414 | - $result['wind_gust'] = round($matches[3]*1.60934,1); |
|
| 415 | - $result['temp'] = round(5/9*(($matches[4])-32),1); |
|
| 416 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 417 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 412 | + $result['wind_speed'] = round($matches[2]*1.60934, 1); |
|
| 413 | + $result['wind_gust'] = round($matches[3]*1.60934, 1); |
|
| 414 | + $result['temp'] = round(5/9*(($matches[4]) - 32), 1); |
|
| 415 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 416 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 418 | 417 | $result['wind_dir'] = intval($matches[1]); |
| 419 | - $result['wind_speed'] = round($matches[2]*1.60934,1); |
|
| 420 | - $result['wind_gust'] = round($matches[3]*1.60934,1); |
|
| 421 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 422 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) { |
|
| 418 | + $result['wind_speed'] = round($matches[2]*1.60934, 1); |
|
| 419 | + $result['wind_gust'] = round($matches[3]*1.60934, 1); |
|
| 420 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 421 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/', $body_parse, $matches)) { |
|
| 423 | 422 | $result['wind_dir'] = intval($matches[1]); |
| 424 | - $result['wind_speed'] = round($matches[2]*1.60934,1); |
|
| 425 | - $result['wind_gust'] = round($matches[3]*1.60934,1); |
|
| 426 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
| 423 | + $result['wind_speed'] = round($matches[2]*1.60934, 1); |
|
| 424 | + $result['wind_gust'] = round($matches[3]*1.60934, 1); |
|
| 425 | + $body_parse = substr($body_parse, strlen($matches[0]) + 1); |
|
| 427 | 426 | } |
| 428 | - if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) { |
|
| 429 | - $result['temp'] = round(5/9*(($matches[1])-32),1); |
|
| 427 | + if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/', $body_parse, $matches)) { |
|
| 428 | + $result['temp'] = round(5/9*(($matches[1]) - 32), 1); |
|
| 430 | 429 | } |
| 431 | 430 | } |
| 432 | 431 | } else $result['comment'] = trim($body_parse); |
| 433 | 432 | |
| 434 | 433 | } |
| 435 | 434 | //} |
| 436 | - if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4); |
|
| 437 | - if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4); |
|
| 435 | + if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'], 4); |
|
| 436 | + if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'], 4); |
|
| 438 | 437 | if ($debug) print_r($result); |
| 439 | 438 | return $result; |
| 440 | 439 | } |
| 441 | 440 | |
| 442 | 441 | public function connect() { |
| 443 | - global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport; |
|
| 442 | + global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass, $globalName, $globalServerAPRShost, $globalServerAPRSport; |
|
| 444 | 443 | $aprs_connect = 0; |
| 445 | 444 | $aprs_keep = 120; |
| 446 | 445 | $aprs_last_tx = time(); |
| 447 | 446 | if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
| 448 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 447 | + else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName); |
|
| 449 | 448 | if (isset($globalServerAPRSssid)) $aprs_ssid = $globalServerAPRSssid; |
| 450 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 449 | + else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8); |
|
| 451 | 450 | if (isset($globalServerAPRSpass)) $aprs_pass = $globalServerAPRSpass; |
| 452 | 451 | else $aprs_pass = '-1'; |
| 453 | 452 | |
| 454 | - $aprs_filter = ''; |
|
| 453 | + $aprs_filter = ''; |
|
| 455 | 454 | $aprs_login = "user {$aprs_ssid} pass {$aprs_pass} vers {$aprs_version}\n"; |
| 456 | 455 | $Common = new Common(); |
| 457 | - $s = $Common->create_socket($globalServerAPRShost,$globalServerAPRSport,$errno,$errstr); |
|
| 456 | + $s = $Common->create_socket($globalServerAPRShost, $globalServerAPRSport, $errno, $errstr); |
|
| 458 | 457 | if ($s !== false) { |
| 459 | 458 | echo 'Connected to APRS server! '."\n"; |
| 460 | 459 | $authstart = time(); |
| 461 | 460 | $this->socket = $s; |
| 462 | - $send = socket_send( $this->socket , $aprs_login , strlen($aprs_login) , 0 ); |
|
| 463 | - while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) { |
|
| 461 | + $send = socket_send($this->socket, $aprs_login, strlen($aprs_login), 0); |
|
| 462 | + while ($msgin = socket_read($this->socket, 1000, PHP_NORMAL_READ)) { |
|
| 464 | 463 | if (strpos($msgin, "$aprs_ssid verified") !== FALSE) { |
| 465 | 464 | echo 'APRS user verified !'."\n"; |
| 466 | 465 | $this->connected = true; |
| 467 | 466 | return true; |
| 468 | 467 | break; |
| 469 | 468 | } |
| 470 | - if (time()-$authstart > 5) { |
|
| 469 | + if (time() - $authstart > 5) { |
|
| 471 | 470 | echo 'APRS timeout'."\n"; |
| 472 | 471 | break; |
| 473 | 472 | } |
| 474 | 473 | } |
| 475 | - socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE); |
|
| 474 | + socket_set_option($this->socket, SOL_SOCKET, SO_KEEPALIVE); |
|
| 476 | 475 | } |
| 477 | 476 | } |
| 478 | 477 | |
@@ -482,7 +481,7 @@ discard block |
||
| 482 | 481 | |
| 483 | 482 | public function send($data) { |
| 484 | 483 | if ($this->connected === false) $this->connect(); |
| 485 | - $send = socket_send( $this->socket , $data , strlen($data),0); |
|
| 484 | + $send = socket_send($this->socket, $data, strlen($data), 0); |
|
| 486 | 485 | if ($send === FALSE) { |
| 487 | 486 | socket_close($this->socket); |
| 488 | 487 | $this->connect(); |
@@ -491,14 +490,14 @@ discard block |
||
| 491 | 490 | } |
| 492 | 491 | |
| 493 | 492 | class APRSSpotter extends APRS { |
| 494 | - public function addLiveSpotterData($id,$ident,$aircraft_icao,$departure_airport,$arrival_airport,$latitude,$longitude,$waypoints,$altitude,$altitude_real,$heading,$speed,$datetime,$departure_airport_time,$arrival_airport_time,$squawk,$route_stop,$hex,$putinarchive,$registration,$pilot_id,$pilot_name, $verticalrate, $noarchive, $ground,$format_source,$source_name,$over_country) { |
|
| 493 | + public function addLiveSpotterData($id, $ident, $aircraft_icao, $departure_airport, $arrival_airport, $latitude, $longitude, $waypoints, $altitude, $altitude_real, $heading, $speed, $datetime, $departure_airport_time, $arrival_airport_time, $squawk, $route_stop, $hex, $putinarchive, $registration, $pilot_id, $pilot_name, $verticalrate, $noarchive, $ground, $format_source, $source_name, $over_country) { |
|
| 495 | 494 | $Common = new Common(); |
| 496 | 495 | if ($latitude != '' && $longitude != '') { |
| 497 | - $latitude = $Common->convertDM($latitude,'latitude'); |
|
| 498 | - $longitude = $Common->convertDM($longitude,'longitude'); |
|
| 499 | - $coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW']; |
|
| 500 | - $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000)); |
|
| 501 | - $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000)); |
|
| 496 | + $latitude = $Common->convertDM($latitude, 'latitude'); |
|
| 497 | + $longitude = $Common->convertDM($longitude, 'longitude'); |
|
| 498 | + $coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW']; |
|
| 499 | + $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000)); |
|
| 500 | + $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000)); |
|
| 502 | 501 | $w = $w1.$w2; |
| 503 | 502 | //$w = '00'; |
| 504 | 503 | $custom = ''; |
@@ -515,19 +514,19 @@ discard block |
||
| 515 | 514 | $custom .= 'AI='.$aircraft_icao; |
| 516 | 515 | } |
| 517 | 516 | if ($custom != '') $custom = ' '.$custom; |
| 518 | - $this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.' *'.date('His',strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude_real,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 517 | + $this->send('AIRCRAFT>APRS,TCPIP*:;'.$hex.' *'.date('His', strtotime($datetime)).'h'.$coordinate.'^'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude_real, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 519 | 518 | } |
| 520 | 519 | } |
| 521 | 520 | } |
| 522 | 521 | class APRSMarine extends APRS { |
| 523 | - public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed,$datetime, $putinarchive,$mmsi,$type,$typeid,$imo,$callsign,$arrival_code,$arrival_date,$status,$statusid,$noarchive,$format_source,$source_name,$over_country) { |
|
| 522 | + public function addLiveMarineData($id, $ident, $latitude, $longitude, $heading, $speed, $datetime, $putinarchive, $mmsi, $type, $typeid, $imo, $callsign, $arrival_code, $arrival_date, $status, $statusid, $noarchive, $format_source, $source_name, $over_country) { |
|
| 524 | 523 | $Common = new Common(); |
| 525 | 524 | if ($latitude != '' && $longitude != '') { |
| 526 | - $latitude = $Common->convertDM($latitude,'latitude'); |
|
| 527 | - $longitude = $Common->convertDM($longitude,'longitude'); |
|
| 528 | - $coordinate = sprintf("%02d",$latitude['deg']).str_pad(number_format($latitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d",$longitude['deg']).str_pad(number_format($longitude['min'],2,'.',''),5,'0',STR_PAD_LEFT).$longitude['NSEW']; |
|
| 529 | - $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'],2,'.',''))*1000)); |
|
| 530 | - $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'],2,'.',''))*1000)); |
|
| 525 | + $latitude = $Common->convertDM($latitude, 'latitude'); |
|
| 526 | + $longitude = $Common->convertDM($longitude, 'longitude'); |
|
| 527 | + $coordinate = sprintf("%02d", $latitude['deg']).str_pad(number_format($latitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$latitude['NSEW'].'/'.sprintf("%03d", $longitude['deg']).str_pad(number_format($longitude['min'], 2, '.', ''), 5, '0', STR_PAD_LEFT).$longitude['NSEW']; |
|
| 528 | + $w1 = abs(ceil(($latitude['min'] - number_format($latitude['min'], 2, '.', ''))*1000)); |
|
| 529 | + $w2 = abs(ceil(($longitude['min'] - number_format($longitude['min'], 2, '.', ''))*1000)); |
|
| 531 | 530 | $w = $w1.$w2; |
| 532 | 531 | //$w = '00'; |
| 533 | 532 | $custom = ''; |
@@ -557,7 +556,7 @@ discard block |
||
| 557 | 556 | } |
| 558 | 557 | if ($custom != '') $custom = ' '.$custom; |
| 559 | 558 | $altitude = 0; |
| 560 | - $this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His',strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading,3,'0',STR_PAD_LEFT).'/'.str_pad($speed,3,'0',STR_PAD_LEFT).'/A='.str_pad($altitude,6,'0',STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 559 | + $this->send('MARINE>APRS,TCPIP*:;'.$mmsi.'*'.date('His', strtotime($datetime)).'h'.$coordinate.'s'.str_pad($heading, 3, '0', STR_PAD_LEFT).'/'.str_pad($speed, 3, '0', STR_PAD_LEFT).'/A='.str_pad($altitude, 6, '0', STR_PAD_LEFT).' !W'.$w.'!'.$custom."\n"); |
|
| 561 | 560 | } |
| 562 | 561 | } |
| 563 | 562 | } |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | if (isset($this->all_tracked[$key]['id'])) { |
| 59 | 59 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 60 | 60 | $Marine = new Marine($this->db); |
| 61 | - $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 61 | + $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']); |
|
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | } |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 70 | 70 | foreach ($this->all_tracked as $key => $flight) { |
| 71 | 71 | if (isset($flight['lastupdate'])) { |
| 72 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 72 | + if ($flight['lastupdate'] < (time() - 3000)) { |
|
| 73 | 73 | if ((!isset($globalNoImport) || $globalNoImport !== TRUE) && (!isset($globalNoDB) || $globalNoDB !== TRUE)) { |
| 74 | 74 | if (isset($this->all_tracked[$key]['id'])) { |
| 75 | 75 | if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | //$real_arrival = $this->arrival($key); |
| 82 | 82 | $Marine = new Marine($this->db); |
| 83 | 83 | if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
| 84 | - $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 84 | + $result = $Marine->updateLatestMarineData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']); |
|
| 85 | 85 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 86 | 86 | } |
| 87 | 87 | // Put in archive |
@@ -95,14 +95,14 @@ discard block |
||
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | public function add($line) { |
| 98 | - global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS,$APRSMarine; |
|
| 98 | + global $globalFork, $globalDistanceIgnore, $globalDaemon, $globalDebug, $globalCoordMinChange, $globalDebugTimeElapsed, $globalCenterLatitude, $globalCenterLongitude, $globalBeta, $globalSourcesupdate, $globalAllTracked, $globalNoImport, $globalNoDB, $globalServerAPRS, $APRSMarine; |
|
| 99 | 99 | if (!isset($globalCoordMinChange) || $globalCoordMinChange == '') $globalCoordMinChange = '0.02'; |
| 100 | 100 | date_default_timezone_set('UTC'); |
| 101 | 101 | $dataFound = false; |
| 102 | 102 | $send = false; |
| 103 | 103 | |
| 104 | 104 | // SBS format is CSV format |
| 105 | - if(is_array($line) && isset($line['mmsi'])) { |
|
| 105 | + if (is_array($line) && isset($line['mmsi'])) { |
|
| 106 | 106 | //print_r($line); |
| 107 | 107 | if (isset($line['mmsi'])) { |
| 108 | 108 | |
@@ -126,18 +126,18 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | if (!isset($this->all_tracked[$id])) { |
| 128 | 128 | $this->all_tracked[$id] = array(); |
| 129 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedMarine' => 0)); |
|
| 130 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','typeid' => '','noarchive' => false,'putinarchive' => true,'over_country' => '','mmsi' => '','status' => '','status_id' => '','imo' => '','callsign' => '','arrival_code' => '','arrival_date' => '','mmsi_type' => '')); |
|
| 131 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 129 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedMarine' => 0)); |
|
| 130 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '0', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'typeid' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => '', 'mmsi' => '', 'status' => '', 'status_id' => '', 'imo' => '', 'callsign' => '', 'arrival_code' => '', 'arrival_date' => '', 'mmsi_type' => '')); |
|
| 131 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time())); |
|
| 132 | 132 | if (!isset($line['id'])) { |
| 133 | 133 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 134 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 135 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 134 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 135 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id'])); |
|
| 136 | 136 | if ($globalAllTracked !== FALSE) $dataFound = true; |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | if (isset($line['mmsi']) && $line['mmsi'] != '' && $line['mmsi'] != $this->all_tracked[$id]['mmsi']) { |
| 140 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi' => $line['mmsi'])); |
|
| 140 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi' => $line['mmsi'])); |
|
| 141 | 141 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 142 | 142 | $Marine = new Marine($this->db); |
| 143 | 143 | $identity = $Marine->getIdentity($line['mmsi']); |
@@ -151,64 +151,64 @@ discard block |
||
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | if (isset($line['type_id']) && $line['type_id'] != '') { |
| 154 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $AIS->getShipType($line['type_id']))); |
|
| 154 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $AIS->getShipType($line['type_id']))); |
|
| 155 | 155 | } |
| 156 | 156 | if (isset($line['type']) && $line['type'] != '') { |
| 157 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 157 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type'])); |
|
| 158 | 158 | } |
| 159 | 159 | if (isset($line['mmsi_type']) && $line['mmsi_type'] != '') { |
| 160 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('mmsi_type' => $line['mmsi_type'])); |
|
| 160 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('mmsi_type' => $line['mmsi_type'])); |
|
| 161 | 161 | } |
| 162 | 162 | if (isset($line['imo']) && $line['imo'] != '') { |
| 163 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('imo' => $line['imo'])); |
|
| 163 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('imo' => $line['imo'])); |
|
| 164 | 164 | } |
| 165 | 165 | if (isset($line['callsign']) && $line['callsign'] != '') { |
| 166 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('callsign' => $line['callsign'])); |
|
| 166 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('callsign' => $line['callsign'])); |
|
| 167 | 167 | } |
| 168 | 168 | if (isset($line['arrival_code']) && $line['arrival_code'] != '') { |
| 169 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_code' => $line['arrival_code'])); |
|
| 169 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_code' => $line['arrival_code'])); |
|
| 170 | 170 | } |
| 171 | 171 | if (isset($line['arrival_date']) && $line['arrival_date'] != '') { |
| 172 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('arrival_date' => $line['arrival_date'])); |
|
| 172 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('arrival_date' => $line['arrival_date'])); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | |
| 176 | 176 | //if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9-]+$/', $line['ident'])) { |
| 177 | 177 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) { |
| 178 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 178 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident']))); |
|
| 179 | 179 | if ($this->all_tracked[$id]['addedMarine'] == 1) { |
| 180 | 180 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 181 | 181 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 182 | 182 | $timeelapsed = microtime(true); |
| 183 | 183 | $Marine = new Marine($this->db); |
| 184 | 184 | $fromsource = NULL; |
| 185 | - $result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 185 | + $result = $Marine->updateIdentMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource); |
|
| 186 | 186 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 187 | 187 | $Marine->db = null; |
| 188 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 188 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | } |
| 192 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 192 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'])); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 195 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 196 | 196 | if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime'])) { |
| 197 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
|
| 197 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime'])); |
|
| 198 | 198 | } else { |
| 199 | 199 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['mmsi']."\n"; |
| 200 | 200 | elseif (strtotime($line['datetime']) > strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_tracked[$id]['datetime'].") !!! for ".$this->all_tracked[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 201 | 201 | return ''; |
| 202 | 202 | } |
| 203 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 203 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 204 | 204 | if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
| 205 | 205 | return ''; |
| 206 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 206 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 207 | 207 | if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
| 208 | 208 | return ''; |
| 209 | 209 | } elseif (!isset($line['datetime'])) { |
| 210 | 210 | date_default_timezone_set('UTC'); |
| 211 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 211 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 212 | 212 | } else { |
| 213 | 213 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['mmsi']." - format : ".$line['format_source']."!!!"; |
| 214 | 214 | return ''; |
@@ -216,24 +216,24 @@ discard block |
||
| 216 | 216 | |
| 217 | 217 | |
| 218 | 218 | if (isset($line['speed']) && $line['speed'] != '') { |
| 219 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 220 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 219 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed']))); |
|
| 220 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true)); |
|
| 221 | 221 | } else if (!isset($this->all_tracked[$id]['speed_fromsrc']) && isset($this->all_tracked[$id]['time_last_coord']) && $this->all_tracked[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 222 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 222 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm'); |
|
| 223 | 223 | if ($distance > 1000 && $distance < 10000) { |
| 224 | 224 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 225 | 225 | $speed = $speed*3.6; |
| 226 | - if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 226 | + if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed))); |
|
| 227 | 227 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['hex']." : ".$speed." - distance : ".$distance."\n"; |
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 232 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 232 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']); |
|
| 233 | 233 | else unset($timediff); |
| 234 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')))) { |
|
| 234 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_tracked[$id]['latitude']) && isset($this->all_tracked[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')))) { |
|
| 235 | 235 | if (isset($this->all_tracked[$id]['archive_latitude']) && isset($this->all_tracked[$id]['archive_longitude']) && isset($this->all_tracked[$id]['livedb_latitude']) && isset($this->all_tracked[$id]['livedb_longitude'])) { |
| 236 | - if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['livedb_latitude'],$this->all_tracked[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 236 | + if (!$Common->checkLine($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['livedb_latitude'], $this->all_tracked[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) { |
|
| 237 | 237 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 238 | 238 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 239 | 239 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -242,10 +242,10 @@ discard block |
||
| 242 | 242 | $timeelapsed = microtime(true); |
| 243 | 243 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 244 | 244 | $Marine = new Marine($this->db); |
| 245 | - $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 245 | + $all_country = $Marine->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 246 | 246 | if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
| 247 | 247 | $Marine->db = null; |
| 248 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 248 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 249 | 249 | } |
| 250 | 250 | $this->tmd = 0; |
| 251 | 251 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
@@ -254,62 +254,62 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 256 | 256 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 257 | - if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 257 | + if (!isset($this->all_tracked[$id]['livedb_latitude']) || abs($this->all_tracked[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 258 | 258 | $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
| 259 | 259 | $dataFound = true; |
| 260 | 260 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 261 | 261 | } |
| 262 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
|
| 262 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude'])); |
|
| 263 | 263 | } |
| 264 | 264 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 265 | 265 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 266 | 266 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 267 | - if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 267 | + if (!isset($this->all_tracked[$id]['livedb_longitude']) || abs($this->all_tracked[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_tracked[$id]['format_source'] == 'aprs') { |
|
| 268 | 268 | $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
| 269 | 269 | $dataFound = true; |
| 270 | 270 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 271 | 271 | } |
| 272 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
|
| 272 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude'])); |
|
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | } else if ($globalDebug && $timediff > 20) { |
| 276 | 276 | $this->tmd = $this->tmd + 1; |
| 277 | 277 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
| 278 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -"; |
|
| 279 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 278 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -"; |
|
| 279 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 280 | 280 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 281 | 281 | } |
| 282 | 282 | } |
| 283 | 283 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 284 | 284 | if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 285 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 285 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update'])); |
|
| 286 | 286 | } |
| 287 | 287 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 288 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 288 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source'])); |
|
| 289 | 289 | } |
| 290 | 290 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 291 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 291 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name'])); |
|
| 292 | 292 | } |
| 293 | 293 | if (isset($line['status']) && $line['status'] != '') { |
| 294 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status' => $line['status'])); |
|
| 294 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('status' => $line['status'])); |
|
| 295 | 295 | } |
| 296 | 296 | if (isset($line['status_id']) && $line['status_id'] != '') { |
| 297 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('status_id' => $line['status_id'])); |
|
| 297 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('status_id' => $line['status_id'])); |
|
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 301 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 301 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true)); |
|
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | if (isset($line['heading']) && $line['heading'] != '') { |
| 305 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 306 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 307 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 305 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 306 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading']))); |
|
| 307 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true)); |
|
| 308 | 308 | //$dataFound = true; |
| 309 | 309 | } elseif (!isset($this->all_tracked[$id]['heading_fromsrc']) && isset($this->all_tracked[$id]['archive_latitude']) && $this->all_tracked[$id]['archive_latitude'] != $this->all_tracked[$id]['latitude'] && isset($this->all_tracked[$id]['archive_longitude']) && $this->all_tracked[$id]['archive_longitude'] != $this->all_tracked[$id]['longitude']) { |
| 310 | - $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'],$this->all_tracked[$id]['archive_longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 311 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 312 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 310 | + $heading = $Common->getHeading($this->all_tracked[$id]['archive_latitude'], $this->all_tracked[$id]['archive_longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 311 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading))); |
|
| 312 | + if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 313 | 313 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
| 314 | 314 | } |
| 315 | 315 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
@@ -319,7 +319,7 @@ discard block |
||
| 319 | 319 | if ($dataFound === true && isset($this->all_tracked[$id]['mmsi'])) { |
| 320 | 320 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 321 | 321 | if ($this->all_tracked[$id]['addedMarine'] == 0) { |
| 322 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 322 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_tracked[$id]['longitude'] == '' || $this->all_tracked[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 323 | 323 | if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
| 324 | 324 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 325 | 325 | if ($globalDebug) echo "Check if aircraft is already in DB..."; |
@@ -327,37 +327,37 @@ discard block |
||
| 327 | 327 | $MarineLive = new MarineLive($this->db); |
| 328 | 328 | if (isset($line['id'])) { |
| 329 | 329 | $recent_ident = $MarineLive->checkIdRecent($line['id']); |
| 330 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 330 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 331 | 331 | } elseif (isset($this->all_tracked[$id]['mmsi']) && $this->all_tracked[$id]['mmsi'] != '') { |
| 332 | 332 | $recent_ident = $MarineLive->checkMMSIRecent($this->all_tracked[$id]['mmsi']); |
| 333 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 333 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 334 | 334 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 335 | 335 | $recent_ident = $MarineLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 336 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 336 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 337 | 337 | } else $recent_ident = ''; |
| 338 | - $MarineLive->db=null; |
|
| 338 | + $MarineLive->db = null; |
|
| 339 | 339 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 340 | 340 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 341 | 341 | } else $recent_ident = ''; |
| 342 | 342 | } else { |
| 343 | 343 | $recent_ident = ''; |
| 344 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
|
| 344 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0)); |
|
| 345 | 345 | } |
| 346 | 346 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 347 | - if($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 347 | + if ($recent_ident == "" && $this->all_tracked[$id]['latitude'] != '' && $this->all_tracked[$id]['longitude'] != '') |
|
| 348 | 348 | { |
| 349 | 349 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['mmsi']." in archive DB : "; |
| 350 | 350 | //adds the spotter data for the archive |
| 351 | 351 | $highlight = ''; |
| 352 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 352 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['mmsi'].'-'.date('YmdHi'))); |
|
| 353 | 353 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 354 | 354 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 355 | 355 | $timeelapsed = microtime(true); |
| 356 | 356 | $Marine = new Marine($this->db); |
| 357 | - $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 357 | + $result = $Marine->addMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']); |
|
| 358 | 358 | $Marine->db = null; |
| 359 | 359 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 360 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 360 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 361 | 361 | } |
| 362 | 362 | } |
| 363 | 363 | /* |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 398 | 398 | $MarineLive = new MarineLive($this->db); |
| 399 | 399 | $MarineLive->deleteLiveMarineData(); |
| 400 | - $MarineLive->db=null; |
|
| 400 | + $MarineLive->db = null; |
|
| 401 | 401 | if ($globalDebug) echo " Done\n"; |
| 402 | 402 | } |
| 403 | 403 | $this->last_delete = time(); |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 409 | 409 | if (isset($globalDaemon) && !$globalDaemon) { |
| 410 | 410 | $Marine = new Marine($this->db); |
| 411 | - $Marine->updateLatestMarineData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']); |
|
| 411 | + $Marine->updateLatestMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime']); |
|
| 412 | 412 | $Marine->db = null; |
| 413 | 413 | } |
| 414 | 414 | } |
@@ -423,20 +423,20 @@ discard block |
||
| 423 | 423 | $ignoreImport = false; |
| 424 | 424 | |
| 425 | 425 | if (!$ignoreImport) { |
| 426 | - if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 426 | + if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 427 | 427 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 428 | 428 | if (!isset($globalNoImport) || $globalNoImport !== TRUE) { |
| 429 | 429 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 430 | 430 | $timeelapsed = microtime(true); |
| 431 | 431 | $MarineLive = new MarineLive($this->db); |
| 432 | - $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['status_id'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 432 | + $result = $MarineLive->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['status_id'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']); |
|
| 433 | 433 | $MarineLive->db = null; |
| 434 | 434 | if ($globalDebug) echo $result."\n"; |
| 435 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 435 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 436 | 436 | } |
| 437 | 437 | } |
| 438 | 438 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_tracked[$id]['putinarchive']) { |
| 439 | - $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['mmsi'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['typeid'],$this->all_tracked[$id]['imo'],$this->all_tracked[$id]['callsign'],$this->all_tracked[$id]['arrival_code'],$this->all_tracked[$id]['arrival_date'],$this->all_tracked[$id]['status'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 439 | + $APRSMarine->addLiveMarineData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['mmsi'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['typeid'], $this->all_tracked[$id]['imo'], $this->all_tracked[$id]['callsign'], $this->all_tracked[$id]['arrival_code'], $this->all_tracked[$id]['arrival_date'], $this->all_tracked[$id]['status'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']); |
|
| 440 | 440 | } |
| 441 | 441 | $this->all_tracked[$id]['putinarchive'] = false; |
| 442 | 442 | |
@@ -496,7 +496,7 @@ discard block |
||
| 496 | 496 | |
| 497 | 497 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 498 | 498 | if ($this->all_tracked[$id]['putinarchive']) $send = true; |
| 499 | - } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 499 | + } elseif (isset($this->all_tracked[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n"; |
|
| 500 | 500 | //$this->del(); |
| 501 | 501 | |
| 502 | 502 | |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | require_once(dirname(__FILE__).'/class.Image.php'); |
| 3 | 3 | $global_query = "SELECT marine_output.* FROM marine_output"; |
| 4 | 4 | |
| 5 | -class Marine{ |
|
| 5 | +class Marine { |
|
| 6 | 6 | public $db; |
| 7 | 7 | |
| 8 | 8 | public function __construct($dbc = null) { |
@@ -16,33 +16,33 @@ discard block |
||
| 16 | 16 | * @return Array the SQL part |
| 17 | 17 | */ |
| 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['idents']) && !empty($flt['idents'])) { |
| 37 | 37 | if (isset($flt['source'])) { |
| 38 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."') AND spotter_output.format_source IN ('".implode("','",$flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 38 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."') AND spotter_output.format_source IN ('".implode("','", $flt['source'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 39 | 39 | } else { |
| 40 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','",$flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 40 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_output WHERE marine_output.ident IN ('".implode("','", $flt['idents'])."')) spfi ON spfi.fammarine_id = marine_output.fammarine_id"; |
|
| 41 | 41 | } |
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 45 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 45 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 46 | 46 | } |
| 47 | 47 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 48 | 48 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 72 | 72 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 73 | 73 | if ($filter_query_where != '') { |
| 74 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 74 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 75 | 75 | } |
| 76 | 76 | $filter_query = $filter_query_join.$filter_query_where; |
| 77 | 77 | return $filter_query; |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | * @return Array the spotter information |
| 87 | 87 | * |
| 88 | 88 | */ |
| 89 | - public function getDataFromDB($query, $params = array(), $limitQuery = '',$schedules = false) |
|
| 89 | + public function getDataFromDB($query, $params = array(), $limitQuery = '', $schedules = false) |
|
| 90 | 90 | { |
| 91 | 91 | date_default_timezone_set('UTC'); |
| 92 | 92 | if (!is_string($query)) |
@@ -106,13 +106,13 @@ discard block |
||
| 106 | 106 | $sth = $this->db->prepare($query.$limitQuery); |
| 107 | 107 | $sth->execute($params); |
| 108 | 108 | } catch (PDOException $e) { |
| 109 | - printf("Invalid query : %s\nWhole query: %s\n",$e->getMessage(), $query.$limitQuery); |
|
| 109 | + printf("Invalid query : %s\nWhole query: %s\n", $e->getMessage(), $query.$limitQuery); |
|
| 110 | 110 | exit(); |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | $num_rows = 0; |
| 114 | 114 | $spotter_array = array(); |
| 115 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 115 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 116 | 116 | { |
| 117 | 117 | $num_rows++; |
| 118 | 118 | $temp_array = array(); |
@@ -144,10 +144,10 @@ discard block |
||
| 144 | 144 | } |
| 145 | 145 | if (isset($row['ground_speed'])) $temp_array['ground_speed'] = $row['ground_speed']; |
| 146 | 146 | |
| 147 | - if($temp_array['mmsi'] != "" && isset($globalMarineImageFetch) && $globalMarineImageFetch === TRUE) |
|
| 147 | + if ($temp_array['mmsi'] != "" && isset($globalMarineImageFetch) && $globalMarineImageFetch === TRUE) |
|
| 148 | 148 | { |
| 149 | 149 | $Image = new Image($this->db); |
| 150 | - if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'],'',$temp_array['ident']); |
|
| 150 | + if (isset($temp_array['ident']) && $temp_array['ident'] != '') $image_array = $Image->getMarineImage($temp_array['mmsi'], '', $temp_array['ident']); |
|
| 151 | 151 | else $image_array = $Image->getMarineImage($temp_array['mmsi']); |
| 152 | 152 | unset($Image); |
| 153 | 153 | if (count($image_array) > 0) { |
@@ -183,17 +183,17 @@ discard block |
||
| 183 | 183 | { |
| 184 | 184 | $temp_array['date'] = "about ".$dateArray['hours']." hours ago"; |
| 185 | 185 | } else { |
| 186 | - $temp_array['date'] = date("M j Y, g:i a",strtotime($row['date']." UTC")); |
|
| 186 | + $temp_array['date'] = date("M j Y, g:i a", strtotime($row['date']." UTC")); |
|
| 187 | 187 | } |
| 188 | 188 | $temp_array['date_minutes_past'] = $dateArray['minutes']; |
| 189 | - $temp_array['date_iso_8601'] = date("c",strtotime($row['date']." UTC")); |
|
| 190 | - $temp_array['date_rfc_2822'] = date("r",strtotime($row['date']." UTC")); |
|
| 189 | + $temp_array['date_iso_8601'] = date("c", strtotime($row['date']." UTC")); |
|
| 190 | + $temp_array['date_rfc_2822'] = date("r", strtotime($row['date']." UTC")); |
|
| 191 | 191 | $temp_array['date_unix'] = strtotime($row['date']." UTC"); |
| 192 | 192 | if (isset($row['last_seen']) && $row['last_seen'] != '') { |
| 193 | 193 | if (strtotime($row['last_seen']) > strtotime($row['date'])) { |
| 194 | 194 | $temp_array['duration'] = strtotime($row['last_seen']) - strtotime($row['date']); |
| 195 | - $temp_array['last_seen_date_iso_8601'] = date("c",strtotime($row['last_seen']." UTC")); |
|
| 196 | - $temp_array['last_seen_date_rfc_2822'] = date("r",strtotime($row['last_seen']." UTC")); |
|
| 195 | + $temp_array['last_seen_date_iso_8601'] = date("c", strtotime($row['last_seen']." UTC")); |
|
| 196 | + $temp_array['last_seen_date_rfc_2822'] = date("r", strtotime($row['last_seen']." UTC")); |
|
| 197 | 197 | $temp_array['last_seen_date_unix'] = strtotime($row['last_seen']." UTC"); |
| 198 | 198 | } |
| 199 | 199 | } |
@@ -230,8 +230,8 @@ discard block |
||
| 230 | 230 | { |
| 231 | 231 | $limit_array = explode(",", $limit); |
| 232 | 232 | |
| 233 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 234 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 233 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 234 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 235 | 235 | |
| 236 | 236 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 237 | 237 | { |
@@ -248,9 +248,9 @@ discard block |
||
| 248 | 248 | $orderby_query = " ORDER BY marine_output.date DESC"; |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | - $query = $global_query.$filter_query." ".$orderby_query; |
|
| 251 | + $query = $global_query.$filter_query." ".$orderby_query; |
|
| 252 | 252 | |
| 253 | - $spotter_array = $this->getDataFromDB($query, array(),$limit_query,true); |
|
| 253 | + $spotter_array = $this->getDataFromDB($query, array(), $limit_query, true); |
|
| 254 | 254 | |
| 255 | 255 | return $spotter_array; |
| 256 | 256 | } |
@@ -269,8 +269,8 @@ discard block |
||
| 269 | 269 | if ($id == '') return array(); |
| 270 | 270 | $additional_query = "marine_output.fammarine_id = :id"; |
| 271 | 271 | $query_values = array(':id' => $id); |
| 272 | - $query = $global_query." WHERE ".$additional_query." "; |
|
| 273 | - $spotter_array = $this->getDataFromDB($query,$query_values); |
|
| 272 | + $query = $global_query." WHERE ".$additional_query." "; |
|
| 273 | + $spotter_array = $this->getDataFromDB($query, $query_values); |
|
| 274 | 274 | return $spotter_array; |
| 275 | 275 | } |
| 276 | 276 | |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | $query_values = array(); |
| 290 | 290 | $limit_query = ''; |
| 291 | 291 | $additional_query = ''; |
| 292 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 292 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 293 | 293 | if ($ident != "") |
| 294 | 294 | { |
| 295 | 295 | if (!is_string($ident)) |
@@ -305,8 +305,8 @@ discard block |
||
| 305 | 305 | { |
| 306 | 306 | $limit_array = explode(",", $limit); |
| 307 | 307 | |
| 308 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 309 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 308 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 309 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 310 | 310 | |
| 311 | 311 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 312 | 312 | { |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | return $spotter_array; |
| 331 | 331 | } |
| 332 | 332 | |
| 333 | - public function getMarineDataByDate($date = '', $limit = '', $sort = '',$filter = array()) |
|
| 333 | + public function getMarineDataByDate($date = '', $limit = '', $sort = '', $filter = array()) |
|
| 334 | 334 | { |
| 335 | 335 | global $global_query, $globalTimezone, $globalDBdriver; |
| 336 | 336 | |
@@ -338,7 +338,7 @@ discard block |
||
| 338 | 338 | $limit_query = ''; |
| 339 | 339 | $additional_query = ''; |
| 340 | 340 | |
| 341 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 341 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 342 | 342 | |
| 343 | 343 | if ($date != "") |
| 344 | 344 | { |
@@ -364,8 +364,8 @@ discard block |
||
| 364 | 364 | { |
| 365 | 365 | $limit_array = explode(",", $limit); |
| 366 | 366 | |
| 367 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 368 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 367 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 368 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 369 | 369 | |
| 370 | 370 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 371 | 371 | { |
@@ -396,11 +396,11 @@ discard block |
||
| 396 | 396 | * @return Array list of source name |
| 397 | 397 | * |
| 398 | 398 | */ |
| 399 | - public function getAllSourceName($type = '',$filters = array()) |
|
| 399 | + public function getAllSourceName($type = '', $filters = array()) |
|
| 400 | 400 | { |
| 401 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 401 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 402 | 402 | $query_values = array(); |
| 403 | - $query = "SELECT DISTINCT marine_output.source_name |
|
| 403 | + $query = "SELECT DISTINCT marine_output.source_name |
|
| 404 | 404 | FROM marine_output".$filter_query." marine_output.source_name <> ''"; |
| 405 | 405 | if ($type != '') { |
| 406 | 406 | $query_values = array(':type' => $type); |
@@ -415,7 +415,7 @@ discard block |
||
| 415 | 415 | $source_array = array(); |
| 416 | 416 | $temp_array = array(); |
| 417 | 417 | |
| 418 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 418 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 419 | 419 | { |
| 420 | 420 | $temp_array['source_name'] = $row['source_name']; |
| 421 | 421 | $source_array[] = $temp_array; |
@@ -432,8 +432,8 @@ discard block |
||
| 432 | 432 | */ |
| 433 | 433 | public function getAllIdents($filters = array()) |
| 434 | 434 | { |
| 435 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 436 | - $query = "SELECT DISTINCT marine_output.ident |
|
| 435 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 436 | + $query = "SELECT DISTINCT marine_output.ident |
|
| 437 | 437 | FROM marine_output".$filter_query." marine_output.ident <> '' |
| 438 | 438 | ORDER BY marine_output.date ASC LIMIT 700 OFFSET 0"; |
| 439 | 439 | |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | $ident_array = array(); |
| 444 | 444 | $temp_array = array(); |
| 445 | 445 | |
| 446 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 446 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 447 | 447 | { |
| 448 | 448 | $temp_array['ident'] = $row['ident']; |
| 449 | 449 | $ident_array[] = $temp_array; |
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | */ |
| 461 | 461 | public function getIdentity($mmsi) |
| 462 | 462 | { |
| 463 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_NUMBER_INT); |
|
| 463 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_NUMBER_INT); |
|
| 464 | 464 | $query = "SELECT * FROM marine_identity WHERE mmsi = :mmsi LIMIT 1"; |
| 465 | 465 | $sth = $this->db->prepare($query); |
| 466 | 466 | $sth->execute(array(':mmsi' => $mmsi)); |
@@ -485,12 +485,12 @@ discard block |
||
| 485 | 485 | } else $offset = '+00:00'; |
| 486 | 486 | |
| 487 | 487 | if ($globalDBdriver == 'mysql') { |
| 488 | - $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
|
| 488 | + $query = "SELECT DISTINCT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) as date |
|
| 489 | 489 | FROM marine_output |
| 490 | 490 | WHERE marine_output.date <> '' |
| 491 | 491 | ORDER BY marine_output.date ASC LIMIT 0,200"; |
| 492 | 492 | } else { |
| 493 | - $query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 493 | + $query = "SELECT DISTINCT to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') as date |
|
| 494 | 494 | FROM marine_output |
| 495 | 495 | WHERE marine_output.date <> '' |
| 496 | 496 | ORDER BY marine_output.date ASC LIMIT 0,200"; |
@@ -502,7 +502,7 @@ discard block |
||
| 502 | 502 | $date_array = array(); |
| 503 | 503 | $temp_array = array(); |
| 504 | 504 | |
| 505 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 505 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 506 | 506 | { |
| 507 | 507 | $temp_array['date'] = $row['date']; |
| 508 | 508 | |
@@ -521,11 +521,11 @@ discard block |
||
| 521 | 521 | * @return String success or false |
| 522 | 522 | * |
| 523 | 523 | */ |
| 524 | - public function updateIdentMarineData($fammarine_id = '', $ident = '',$fromsource = NULL) |
|
| 524 | + public function updateIdentMarineData($fammarine_id = '', $ident = '', $fromsource = NULL) |
|
| 525 | 525 | { |
| 526 | 526 | |
| 527 | 527 | $query = 'UPDATE marine_output SET ident = :ident WHERE fammarine_id = :fammarine_id'; |
| 528 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident); |
|
| 528 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident); |
|
| 529 | 529 | |
| 530 | 530 | try { |
| 531 | 531 | $sth = $this->db->prepare($query); |
@@ -548,7 +548,7 @@ discard block |
||
| 548 | 548 | public function updateLatestMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $groundspeed = NULL, $date = '') |
| 549 | 549 | { |
| 550 | 550 | $query = 'UPDATE marine_output SET ident = :ident, last_latitude = :last_latitude, last_longitude = :last_longitude, last_seen = :last_seen, last_ground_speed = :last_ground_speed WHERE fammarine_id = :fammarine_id'; |
| 551 | - $query_values = array(':fammarine_id' => $fammarine_id,':last_latitude' => $latitude,':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed,':last_seen' => $date,':ident' => $ident); |
|
| 551 | + $query_values = array(':fammarine_id' => $fammarine_id, ':last_latitude' => $latitude, ':last_longitude' => $longitude, ':last_ground_speed' => $groundspeed, ':last_seen' => $date, ':ident' => $ident); |
|
| 552 | 552 | |
| 553 | 553 | try { |
| 554 | 554 | $sth = $this->db->prepare($query); |
@@ -586,7 +586,7 @@ discard block |
||
| 586 | 586 | * @param String $verticalrate vertival rate of flight |
| 587 | 587 | * @return String success or false |
| 588 | 588 | */ |
| 589 | - public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '',$type = '',$typeid = '',$imo = '',$callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$format_source = '', $source_name = '') |
|
| 589 | + public function addMarineData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $format_source = '', $source_name = '') |
|
| 590 | 590 | { |
| 591 | 591 | global $globalURL, $globalMarineImageFetch; |
| 592 | 592 | |
@@ -653,31 +653,31 @@ discard block |
||
| 653 | 653 | } |
| 654 | 654 | |
| 655 | 655 | |
| 656 | - if ($date == "" || strtotime($date) < time()-20*60) |
|
| 656 | + if ($date == "" || strtotime($date) < time() - 20*60) |
|
| 657 | 657 | { |
| 658 | 658 | $date = date("Y-m-d H:i:s", time()); |
| 659 | 659 | } |
| 660 | 660 | |
| 661 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
| 662 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 663 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 664 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 665 | - $heading = filter_var($heading,FILTER_SANITIZE_NUMBER_INT); |
|
| 666 | - $groundspeed = filter_var($groundspeed,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 667 | - $format_source = filter_var($format_source,FILTER_SANITIZE_STRING); |
|
| 668 | - $mmsi = filter_var($mmsi,FILTER_SANITIZE_STRING); |
|
| 669 | - $type = filter_var($type,FILTER_SANITIZE_STRING); |
|
| 670 | - $status = filter_var($status,FILTER_SANITIZE_STRING); |
|
| 671 | - $imo = filter_var($imo,FILTER_SANITIZE_STRING); |
|
| 672 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 673 | - $arrival_code = filter_var($arrival_code,FILTER_SANITIZE_STRING); |
|
| 674 | - $arrival_date = filter_var($arrival_date,FILTER_SANITIZE_STRING); |
|
| 661 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
| 662 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 663 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 664 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 665 | + $heading = filter_var($heading, FILTER_SANITIZE_NUMBER_INT); |
|
| 666 | + $groundspeed = filter_var($groundspeed, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 667 | + $format_source = filter_var($format_source, FILTER_SANITIZE_STRING); |
|
| 668 | + $mmsi = filter_var($mmsi, FILTER_SANITIZE_STRING); |
|
| 669 | + $type = filter_var($type, FILTER_SANITIZE_STRING); |
|
| 670 | + $status = filter_var($status, FILTER_SANITIZE_STRING); |
|
| 671 | + $imo = filter_var($imo, FILTER_SANITIZE_STRING); |
|
| 672 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 673 | + $arrival_code = filter_var($arrival_code, FILTER_SANITIZE_STRING); |
|
| 674 | + $arrival_date = filter_var($arrival_date, FILTER_SANITIZE_STRING); |
|
| 675 | 675 | |
| 676 | 676 | if (isset($globalMarineImageFetch) && $globalMarineImageFetch === TRUE) { |
| 677 | 677 | $Image = new Image($this->db); |
| 678 | - $image_array = $Image->getMarineImage($mmsi,$imo,$ident); |
|
| 678 | + $image_array = $Image->getMarineImage($mmsi, $imo, $ident); |
|
| 679 | 679 | if (!isset($image_array[0]['mmsi'])) { |
| 680 | - $Image->addMarineImage($mmsi,$imo,$ident); |
|
| 680 | + $Image->addMarineImage($mmsi, $imo, $ident); |
|
| 681 | 681 | } |
| 682 | 682 | unset($Image); |
| 683 | 683 | } |
@@ -689,10 +689,10 @@ discard block |
||
| 689 | 689 | if ($heading == '' || $Common->isInteger($heading) === false) $heading = 0; |
| 690 | 690 | if ($groundspeed == '' || $Common->isInteger($groundspeed) === false) $groundspeed = 0; |
| 691 | 691 | if ($arrival_date == '') $arrival_date = NULL; |
| 692 | - $query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date) |
|
| 692 | + $query = "INSERT INTO marine_output (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, mmsi, type, status,imo,arrival_port_name,arrival_port_date) |
|
| 693 | 693 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:speed,:date,:format_source, :source_name,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)"; |
| 694 | 694 | |
| 695 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':speed' => $groundspeed,':date' => $date,':format_source' => $format_source, ':source_name' => $source_name,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date); |
|
| 695 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':speed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date); |
|
| 696 | 696 | try { |
| 697 | 697 | |
| 698 | 698 | $sth = $this->db->prepare($query); |
@@ -717,13 +717,13 @@ discard block |
||
| 717 | 717 | { |
| 718 | 718 | global $globalDBdriver, $globalTimezone; |
| 719 | 719 | if ($globalDBdriver == 'mysql') { |
| 720 | - $query = "SELECT marine_output.ident FROM marine_output |
|
| 720 | + $query = "SELECT marine_output.ident FROM marine_output |
|
| 721 | 721 | WHERE marine_output.ident = :ident |
| 722 | 722 | AND marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 HOUR) |
| 723 | 723 | AND marine_output.date < UTC_TIMESTAMP()"; |
| 724 | 724 | $query_data = array(':ident' => $ident); |
| 725 | 725 | } else { |
| 726 | - $query = "SELECT marine_output.ident FROM marine_output |
|
| 726 | + $query = "SELECT marine_output.ident FROM marine_output |
|
| 727 | 727 | WHERE marine_output.ident = :ident |
| 728 | 728 | AND marine_output.date >= now() AT TIME ZONE 'UTC' - INTERVAL '1 HOURS' |
| 729 | 729 | AND marine_output.date < now() AT TIME ZONE 'UTC'"; |
@@ -732,8 +732,8 @@ discard block |
||
| 732 | 732 | |
| 733 | 733 | $sth = $this->db->prepare($query); |
| 734 | 734 | $sth->execute($query_data); |
| 735 | - $ident_result=''; |
|
| 736 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 735 | + $ident_result = ''; |
|
| 736 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 737 | 737 | { |
| 738 | 738 | $ident_result = $row['ident']; |
| 739 | 739 | } |
@@ -759,8 +759,8 @@ discard block |
||
| 759 | 759 | return false; |
| 760 | 760 | } else { |
| 761 | 761 | $q_array = explode(" ", $q); |
| 762 | - foreach ($q_array as $q_item){ |
|
| 763 | - $q_item = filter_var($q_item,FILTER_SANITIZE_STRING); |
|
| 762 | + foreach ($q_array as $q_item) { |
|
| 763 | + $q_item = filter_var($q_item, FILTER_SANITIZE_STRING); |
|
| 764 | 764 | $additional_query .= " AND ("; |
| 765 | 765 | $additional_query .= "(marine_output.ident like '%".$q_item."%')"; |
| 766 | 766 | $additional_query .= ")"; |
@@ -768,11 +768,11 @@ discard block |
||
| 768 | 768 | } |
| 769 | 769 | } |
| 770 | 770 | if ($globalDBdriver == 'mysql') { |
| 771 | - $query = "SELECT marine_output.* FROM marine_output |
|
| 771 | + $query = "SELECT marine_output.* FROM marine_output |
|
| 772 | 772 | WHERE marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 20 SECOND) ".$additional_query." |
| 773 | 773 | AND marine_output.date < UTC_TIMESTAMP()"; |
| 774 | 774 | } else { |
| 775 | - $query = "SELECT marine_output.* FROM marine_output |
|
| 775 | + $query = "SELECT marine_output.* FROM marine_output |
|
| 776 | 776 | WHERE marine_output.date::timestamp >= CURRENT_TIMESTAMP AT TIME ZONE 'UTC' - INTERVAL '20 SECONDS' ".$additional_query." |
| 777 | 777 | AND marine_output.date::timestamp < CURRENT_TIMESTAMP AT TIME ZONE 'UTC'"; |
| 778 | 778 | } |
@@ -845,11 +845,11 @@ discard block |
||
| 845 | 845 | * @return Array the callsign list |
| 846 | 846 | * |
| 847 | 847 | */ |
| 848 | - public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '',$filters = array(),$year = '', $month = '', $day = '') |
|
| 848 | + public function countAllCallsigns($limit = true, $olderthanmonths = 0, $sincedate = '', $filters = array(), $year = '', $month = '', $day = '') |
|
| 849 | 849 | { |
| 850 | 850 | global $globalDBdriver; |
| 851 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 852 | - $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
|
| 851 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 852 | + $query = "SELECT DISTINCT marine_output.ident, COUNT(marine_output.ident) AS callsign_icao_count |
|
| 853 | 853 | FROM marine_output".$filter_query." marine_output.ident <> ''"; |
| 854 | 854 | if ($olderthanmonths > 0) { |
| 855 | 855 | if ($globalDBdriver == 'mysql') $query .= ' AND date < DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$olderthanmonths.' MONTH)'; |
@@ -863,28 +863,28 @@ discard block |
||
| 863 | 863 | if ($year != '') { |
| 864 | 864 | if ($globalDBdriver == 'mysql') { |
| 865 | 865 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 866 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 866 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 867 | 867 | } else { |
| 868 | 868 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 869 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 869 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 870 | 870 | } |
| 871 | 871 | } |
| 872 | 872 | if ($month != '') { |
| 873 | 873 | if ($globalDBdriver == 'mysql') { |
| 874 | 874 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 875 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 875 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 876 | 876 | } else { |
| 877 | 877 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 878 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 878 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 879 | 879 | } |
| 880 | 880 | } |
| 881 | 881 | if ($day != '') { |
| 882 | 882 | if ($globalDBdriver == 'mysql') { |
| 883 | 883 | $query .= " AND DAY(marine_output.date) = :day"; |
| 884 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 884 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 885 | 885 | } else { |
| 886 | 886 | $query .= " AND EXTRACT(DAY FROM marine_output.date) = :day"; |
| 887 | - $query_values = array_merge($query_values,array(':day' => $day)); |
|
| 887 | + $query_values = array_merge($query_values, array(':day' => $day)); |
|
| 888 | 888 | } |
| 889 | 889 | } |
| 890 | 890 | $query .= " GROUP BY marine_output.ident ORDER BY callsign_icao_count DESC"; |
@@ -896,7 +896,7 @@ discard block |
||
| 896 | 896 | $callsign_array = array(); |
| 897 | 897 | $temp_array = array(); |
| 898 | 898 | |
| 899 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 899 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 900 | 900 | { |
| 901 | 901 | $temp_array['callsign_icao'] = $row['ident']; |
| 902 | 902 | $temp_array['airline_name'] = $row['airline_name']; |
@@ -948,7 +948,7 @@ discard block |
||
| 948 | 948 | $date_array = array(); |
| 949 | 949 | $temp_array = array(); |
| 950 | 950 | |
| 951 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 951 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 952 | 952 | { |
| 953 | 953 | $temp_array['date_name'] = $row['date_name']; |
| 954 | 954 | $temp_array['date_count'] = $row['date_count']; |
@@ -974,7 +974,7 @@ discard block |
||
| 974 | 974 | $datetime = new DateTime(); |
| 975 | 975 | $offset = $datetime->format('P'); |
| 976 | 976 | } else $offset = '+00:00'; |
| 977 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 977 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 978 | 978 | if ($globalDBdriver == 'mysql') { |
| 979 | 979 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 980 | 980 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 7 DAY)"; |
@@ -995,7 +995,7 @@ discard block |
||
| 995 | 995 | $date_array = array(); |
| 996 | 996 | $temp_array = array(); |
| 997 | 997 | |
| 998 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 998 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 999 | 999 | { |
| 1000 | 1000 | $temp_array['date_name'] = $row['date_name']; |
| 1001 | 1001 | $temp_array['date_count'] = $row['date_count']; |
@@ -1020,7 +1020,7 @@ discard block |
||
| 1020 | 1020 | $datetime = new DateTime(); |
| 1021 | 1021 | $offset = $datetime->format('P'); |
| 1022 | 1022 | } else $offset = '+00:00'; |
| 1023 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1023 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1024 | 1024 | if ($globalDBdriver == 'mysql') { |
| 1025 | 1025 | $query = "SELECT DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS date_name, count(*) as date_count |
| 1026 | 1026 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 MONTH)"; |
@@ -1041,7 +1041,7 @@ discard block |
||
| 1041 | 1041 | $date_array = array(); |
| 1042 | 1042 | $temp_array = array(); |
| 1043 | 1043 | |
| 1044 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1044 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1045 | 1045 | { |
| 1046 | 1046 | $temp_array['date_name'] = $row['date_name']; |
| 1047 | 1047 | $temp_array['date_count'] = $row['date_count']; |
@@ -1088,7 +1088,7 @@ discard block |
||
| 1088 | 1088 | $date_array = array(); |
| 1089 | 1089 | $temp_array = array(); |
| 1090 | 1090 | |
| 1091 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1091 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1092 | 1092 | { |
| 1093 | 1093 | $temp_array['month_name'] = $row['month_name']; |
| 1094 | 1094 | $temp_array['year_name'] = $row['year_name']; |
@@ -1117,7 +1117,7 @@ discard block |
||
| 1117 | 1117 | $datetime = new DateTime(); |
| 1118 | 1118 | $offset = $datetime->format('P'); |
| 1119 | 1119 | } else $offset = '+00:00'; |
| 1120 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1120 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1121 | 1121 | if ($globalDBdriver == 'mysql') { |
| 1122 | 1122 | $query = "SELECT MONTH(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS month_name, YEAR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS year_name, count(*) as date_count |
| 1123 | 1123 | FROM marine_output".$filter_query." marine_output.date >= DATE_SUB(UTC_TIMESTAMP(),INTERVAL 1 YEAR)"; |
@@ -1138,7 +1138,7 @@ discard block |
||
| 1138 | 1138 | $date_array = array(); |
| 1139 | 1139 | $temp_array = array(); |
| 1140 | 1140 | |
| 1141 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1141 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1142 | 1142 | { |
| 1143 | 1143 | $temp_array['year_name'] = $row['year_name']; |
| 1144 | 1144 | $temp_array['month_name'] = $row['month_name']; |
@@ -1158,7 +1158,7 @@ discard block |
||
| 1158 | 1158 | * @return Array the hour list |
| 1159 | 1159 | * |
| 1160 | 1160 | */ |
| 1161 | - public function countAllHours($orderby,$filters = array()) |
|
| 1161 | + public function countAllHours($orderby, $filters = array()) |
|
| 1162 | 1162 | { |
| 1163 | 1163 | global $globalTimezone, $globalDBdriver; |
| 1164 | 1164 | if ($globalTimezone != '') { |
@@ -1206,7 +1206,7 @@ discard block |
||
| 1206 | 1206 | $hour_array = array(); |
| 1207 | 1207 | $temp_array = array(); |
| 1208 | 1208 | |
| 1209 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1209 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1210 | 1210 | { |
| 1211 | 1211 | $temp_array['hour_name'] = $row['hour_name']; |
| 1212 | 1212 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1228,8 +1228,8 @@ discard block |
||
| 1228 | 1228 | public function countAllHoursByDate($date, $filters = array()) |
| 1229 | 1229 | { |
| 1230 | 1230 | global $globalTimezone, $globalDBdriver; |
| 1231 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1232 | - $date = filter_var($date,FILTER_SANITIZE_STRING); |
|
| 1231 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1232 | + $date = filter_var($date, FILTER_SANITIZE_STRING); |
|
| 1233 | 1233 | if ($globalTimezone != '') { |
| 1234 | 1234 | date_default_timezone_set($globalTimezone); |
| 1235 | 1235 | $datetime = new DateTime($date); |
@@ -1237,12 +1237,12 @@ discard block |
||
| 1237 | 1237 | } else $offset = '+00:00'; |
| 1238 | 1238 | |
| 1239 | 1239 | if ($globalDBdriver == 'mysql') { |
| 1240 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1240 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1241 | 1241 | FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = :date |
| 1242 | 1242 | GROUP BY hour_name |
| 1243 | 1243 | ORDER BY hour_name ASC"; |
| 1244 | 1244 | } else { |
| 1245 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1245 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1246 | 1246 | FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset, 'YYYY-mm-dd') = :date |
| 1247 | 1247 | GROUP BY hour_name |
| 1248 | 1248 | ORDER BY hour_name ASC"; |
@@ -1254,7 +1254,7 @@ discard block |
||
| 1254 | 1254 | $hour_array = array(); |
| 1255 | 1255 | $temp_array = array(); |
| 1256 | 1256 | |
| 1257 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1257 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1258 | 1258 | { |
| 1259 | 1259 | $temp_array['hour_name'] = $row['hour_name']; |
| 1260 | 1260 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1276,8 +1276,8 @@ discard block |
||
| 1276 | 1276 | public function countAllHoursByIdent($ident, $filters = array()) |
| 1277 | 1277 | { |
| 1278 | 1278 | global $globalTimezone, $globalDBdriver; |
| 1279 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1280 | - $ident = filter_var($ident,FILTER_SANITIZE_STRING); |
|
| 1279 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1280 | + $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
|
| 1281 | 1281 | if ($globalTimezone != '') { |
| 1282 | 1282 | date_default_timezone_set($globalTimezone); |
| 1283 | 1283 | $datetime = new DateTime(); |
@@ -1285,12 +1285,12 @@ discard block |
||
| 1285 | 1285 | } else $offset = '+00:00'; |
| 1286 | 1286 | |
| 1287 | 1287 | if ($globalDBdriver == 'mysql') { |
| 1288 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1288 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1289 | 1289 | FROM marine_output".$filter_query." marine_output.ident = :ident |
| 1290 | 1290 | GROUP BY hour_name |
| 1291 | 1291 | ORDER BY hour_name ASC"; |
| 1292 | 1292 | } else { |
| 1293 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1293 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1294 | 1294 | FROM marine_output".$filter_query." marine_output.ident = :ident |
| 1295 | 1295 | GROUP BY hour_name |
| 1296 | 1296 | ORDER BY hour_name ASC"; |
@@ -1298,12 +1298,12 @@ discard block |
||
| 1298 | 1298 | |
| 1299 | 1299 | |
| 1300 | 1300 | $sth = $this->db->prepare($query); |
| 1301 | - $sth->execute(array(':ident' => $ident,':offset' => $offset)); |
|
| 1301 | + $sth->execute(array(':ident' => $ident, ':offset' => $offset)); |
|
| 1302 | 1302 | |
| 1303 | 1303 | $hour_array = array(); |
| 1304 | 1304 | $temp_array = array(); |
| 1305 | 1305 | |
| 1306 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1306 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1307 | 1307 | { |
| 1308 | 1308 | $temp_array['hour_name'] = $row['hour_name']; |
| 1309 | 1309 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1322,32 +1322,32 @@ discard block |
||
| 1322 | 1322 | * @return Integer the number of flights |
| 1323 | 1323 | * |
| 1324 | 1324 | */ |
| 1325 | - public function countOverallTracked($filters = array(),$year = '',$month = '') |
|
| 1325 | + public function countOverallTracked($filters = array(), $year = '', $month = '') |
|
| 1326 | 1326 | { |
| 1327 | 1327 | global $globalDBdriver; |
| 1328 | - $queryi = "SELECT COUNT(marine_output.marine_id) AS flight_count FROM marine_output"; |
|
| 1328 | + $queryi = "SELECT COUNT(marine_output.marine_id) AS flight_count FROM marine_output"; |
|
| 1329 | 1329 | $query_values = array(); |
| 1330 | 1330 | $query = ''; |
| 1331 | 1331 | if ($year != '') { |
| 1332 | 1332 | if ($globalDBdriver == 'mysql') { |
| 1333 | 1333 | $query .= " AND YEAR(marine_output.date) = :year"; |
| 1334 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1334 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1335 | 1335 | } else { |
| 1336 | 1336 | $query .= " AND EXTRACT(YEAR FROM marine_output.date) = :year"; |
| 1337 | - $query_values = array_merge($query_values,array(':year' => $year)); |
|
| 1337 | + $query_values = array_merge($query_values, array(':year' => $year)); |
|
| 1338 | 1338 | } |
| 1339 | 1339 | } |
| 1340 | 1340 | if ($month != '') { |
| 1341 | 1341 | if ($globalDBdriver == 'mysql') { |
| 1342 | 1342 | $query .= " AND MONTH(marine_output.date) = :month"; |
| 1343 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1343 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1344 | 1344 | } else { |
| 1345 | 1345 | $query .= " AND EXTRACT(MONTH FROM marine_output.date) = :month"; |
| 1346 | - $query_values = array_merge($query_values,array(':month' => $month)); |
|
| 1346 | + $query_values = array_merge($query_values, array(':month' => $month)); |
|
| 1347 | 1347 | } |
| 1348 | 1348 | } |
| 1349 | 1349 | if (empty($query_values)) $queryi .= $this->getFilter($filters); |
| 1350 | - else $queryi .= $this->getFilter($filters,true,true).substr($query,4); |
|
| 1350 | + else $queryi .= $this->getFilter($filters, true, true).substr($query, 4); |
|
| 1351 | 1351 | |
| 1352 | 1352 | $sth = $this->db->prepare($queryi); |
| 1353 | 1353 | $sth->execute($query_values); |
@@ -1364,7 +1364,7 @@ discard block |
||
| 1364 | 1364 | public function countAllHoursFromToday($filters = array()) |
| 1365 | 1365 | { |
| 1366 | 1366 | global $globalTimezone, $globalDBdriver; |
| 1367 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1367 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1368 | 1368 | if ($globalTimezone != '') { |
| 1369 | 1369 | date_default_timezone_set($globalTimezone); |
| 1370 | 1370 | $datetime = new DateTime(); |
@@ -1372,12 +1372,12 @@ discard block |
||
| 1372 | 1372 | } else $offset = '+00:00'; |
| 1373 | 1373 | |
| 1374 | 1374 | if ($globalDBdriver == 'mysql') { |
| 1375 | - $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1375 | + $query = "SELECT HOUR(CONVERT_TZ(marine_output.date,'+00:00', :offset)) AS hour_name, count(*) as hour_count |
|
| 1376 | 1376 | FROM marine_output".$filter_query." DATE(CONVERT_TZ(marine_output.date,'+00:00', :offset)) = CURDATE() |
| 1377 | 1377 | GROUP BY hour_name |
| 1378 | 1378 | ORDER BY hour_name ASC"; |
| 1379 | 1379 | } else { |
| 1380 | - $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1380 | + $query = "SELECT EXTRACT(HOUR FROM marine_output.date AT TIME ZONE INTERVAL :offset) AS hour_name, count(*) as hour_count |
|
| 1381 | 1381 | FROM marine_output".$filter_query." to_char(marine_output.date AT TIME ZONE INTERVAL :offset,'YYYY-mm-dd') = CAST(NOW() AS date) |
| 1382 | 1382 | GROUP BY hour_name |
| 1383 | 1383 | ORDER BY hour_name ASC"; |
@@ -1389,7 +1389,7 @@ discard block |
||
| 1389 | 1389 | $hour_array = array(); |
| 1390 | 1390 | $temp_array = array(); |
| 1391 | 1391 | |
| 1392 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1392 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1393 | 1393 | { |
| 1394 | 1394 | $temp_array['hour_name'] = $row['hour_name']; |
| 1395 | 1395 | $temp_array['hour_count'] = $row['hour_count']; |
@@ -1408,9 +1408,9 @@ discard block |
||
| 1408 | 1408 | */ |
| 1409 | 1409 | public function getMarineIDBasedOnFamMarineID($fammarine_id) |
| 1410 | 1410 | { |
| 1411 | - $fammarine_id = filter_var($fammarine_id,FILTER_SANITIZE_STRING); |
|
| 1411 | + $fammarine_id = filter_var($fammarine_id, FILTER_SANITIZE_STRING); |
|
| 1412 | 1412 | |
| 1413 | - $query = "SELECT marine_output.marine_id |
|
| 1413 | + $query = "SELECT marine_output.marine_id |
|
| 1414 | 1414 | FROM marine_output |
| 1415 | 1415 | WHERE marine_output.fammarine_id = '".$fammarine_id."'"; |
| 1416 | 1416 | |
@@ -1418,7 +1418,7 @@ discard block |
||
| 1418 | 1418 | $sth = $this->db->prepare($query); |
| 1419 | 1419 | $sth->execute(); |
| 1420 | 1420 | |
| 1421 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1421 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1422 | 1422 | { |
| 1423 | 1423 | return $row['marine_id']; |
| 1424 | 1424 | } |
@@ -1443,23 +1443,23 @@ discard block |
||
| 1443 | 1443 | } |
| 1444 | 1444 | |
| 1445 | 1445 | $current_date = date("Y-m-d H:i:s"); |
| 1446 | - $date = date("Y-m-d H:i:s",strtotime($dateString." UTC")); |
|
| 1446 | + $date = date("Y-m-d H:i:s", strtotime($dateString." UTC")); |
|
| 1447 | 1447 | |
| 1448 | 1448 | $diff = abs(strtotime($current_date) - strtotime($date)); |
| 1449 | 1449 | |
| 1450 | - $time_array['years'] = floor($diff / (365*60*60*24)); |
|
| 1450 | + $time_array['years'] = floor($diff/(365*60*60*24)); |
|
| 1451 | 1451 | $years = $time_array['years']; |
| 1452 | 1452 | |
| 1453 | - $time_array['months'] = floor(($diff - $years * 365*60*60*24) / (30*60*60*24)); |
|
| 1453 | + $time_array['months'] = floor(($diff - $years*365*60*60*24)/(30*60*60*24)); |
|
| 1454 | 1454 | $months = $time_array['months']; |
| 1455 | 1455 | |
| 1456 | - $time_array['days'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24)/ (60*60*24)); |
|
| 1456 | + $time_array['days'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24)/(60*60*24)); |
|
| 1457 | 1457 | $days = $time_array['days']; |
| 1458 | - $time_array['hours'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/ (60*60)); |
|
| 1458 | + $time_array['hours'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24)/(60*60)); |
|
| 1459 | 1459 | $hours = $time_array['hours']; |
| 1460 | - $time_array['minutes'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/ 60); |
|
| 1460 | + $time_array['minutes'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60)/60); |
|
| 1461 | 1461 | $minutes = $time_array['minutes']; |
| 1462 | - $time_array['seconds'] = floor(($diff - $years * 365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1462 | + $time_array['seconds'] = floor(($diff - $years*365*60*60*24 - $months*30*60*60*24 - $days*60*60*24 - $hours*60*60 - $minutes*60)); |
|
| 1463 | 1463 | |
| 1464 | 1464 | return $time_array; |
| 1465 | 1465 | } |
@@ -1482,63 +1482,63 @@ discard block |
||
| 1482 | 1482 | $temp_array['direction_degree'] = $direction; |
| 1483 | 1483 | $temp_array['direction_shortname'] = "N"; |
| 1484 | 1484 | $temp_array['direction_fullname'] = "North"; |
| 1485 | - } elseif ($direction >= 22.5 && $direction < 45){ |
|
| 1485 | + } elseif ($direction >= 22.5 && $direction < 45) { |
|
| 1486 | 1486 | $temp_array['direction_degree'] = $direction; |
| 1487 | 1487 | $temp_array['direction_shortname'] = "NNE"; |
| 1488 | 1488 | $temp_array['direction_fullname'] = "North-Northeast"; |
| 1489 | - } elseif ($direction >= 45 && $direction < 67.5){ |
|
| 1489 | + } elseif ($direction >= 45 && $direction < 67.5) { |
|
| 1490 | 1490 | $temp_array['direction_degree'] = $direction; |
| 1491 | 1491 | $temp_array['direction_shortname'] = "NE"; |
| 1492 | 1492 | $temp_array['direction_fullname'] = "Northeast"; |
| 1493 | - } elseif ($direction >= 67.5 && $direction < 90){ |
|
| 1493 | + } elseif ($direction >= 67.5 && $direction < 90) { |
|
| 1494 | 1494 | $temp_array['direction_degree'] = $direction; |
| 1495 | 1495 | $temp_array['direction_shortname'] = "ENE"; |
| 1496 | 1496 | $temp_array['direction_fullname'] = "East-Northeast"; |
| 1497 | - } elseif ($direction >= 90 && $direction < 112.5){ |
|
| 1497 | + } elseif ($direction >= 90 && $direction < 112.5) { |
|
| 1498 | 1498 | $temp_array['direction_degree'] = $direction; |
| 1499 | 1499 | $temp_array['direction_shortname'] = "E"; |
| 1500 | 1500 | $temp_array['direction_fullname'] = "East"; |
| 1501 | - } elseif ($direction >= 112.5 && $direction < 135){ |
|
| 1501 | + } elseif ($direction >= 112.5 && $direction < 135) { |
|
| 1502 | 1502 | $temp_array['direction_degree'] = $direction; |
| 1503 | 1503 | $temp_array['direction_shortname'] = "ESE"; |
| 1504 | 1504 | $temp_array['direction_fullname'] = "East-Southeast"; |
| 1505 | - } elseif ($direction >= 135 && $direction < 157.5){ |
|
| 1505 | + } elseif ($direction >= 135 && $direction < 157.5) { |
|
| 1506 | 1506 | $temp_array['direction_degree'] = $direction; |
| 1507 | 1507 | $temp_array['direction_shortname'] = "SE"; |
| 1508 | 1508 | $temp_array['direction_fullname'] = "Southeast"; |
| 1509 | - } elseif ($direction >= 157.5 && $direction < 180){ |
|
| 1509 | + } elseif ($direction >= 157.5 && $direction < 180) { |
|
| 1510 | 1510 | $temp_array['direction_degree'] = $direction; |
| 1511 | 1511 | $temp_array['direction_shortname'] = "SSE"; |
| 1512 | 1512 | $temp_array['direction_fullname'] = "South-Southeast"; |
| 1513 | - } elseif ($direction >= 180 && $direction < 202.5){ |
|
| 1513 | + } elseif ($direction >= 180 && $direction < 202.5) { |
|
| 1514 | 1514 | $temp_array['direction_degree'] = $direction; |
| 1515 | 1515 | $temp_array['direction_shortname'] = "S"; |
| 1516 | 1516 | $temp_array['direction_fullname'] = "South"; |
| 1517 | - } elseif ($direction >= 202.5 && $direction < 225){ |
|
| 1517 | + } elseif ($direction >= 202.5 && $direction < 225) { |
|
| 1518 | 1518 | $temp_array['direction_degree'] = $direction; |
| 1519 | 1519 | $temp_array['direction_shortname'] = "SSW"; |
| 1520 | 1520 | $temp_array['direction_fullname'] = "South-Southwest"; |
| 1521 | - } elseif ($direction >= 225 && $direction < 247.5){ |
|
| 1521 | + } elseif ($direction >= 225 && $direction < 247.5) { |
|
| 1522 | 1522 | $temp_array['direction_degree'] = $direction; |
| 1523 | 1523 | $temp_array['direction_shortname'] = "SW"; |
| 1524 | 1524 | $temp_array['direction_fullname'] = "Southwest"; |
| 1525 | - } elseif ($direction >= 247.5 && $direction < 270){ |
|
| 1525 | + } elseif ($direction >= 247.5 && $direction < 270) { |
|
| 1526 | 1526 | $temp_array['direction_degree'] = $direction; |
| 1527 | 1527 | $temp_array['direction_shortname'] = "WSW"; |
| 1528 | 1528 | $temp_array['direction_fullname'] = "West-Southwest"; |
| 1529 | - } elseif ($direction >= 270 && $direction < 292.5){ |
|
| 1529 | + } elseif ($direction >= 270 && $direction < 292.5) { |
|
| 1530 | 1530 | $temp_array['direction_degree'] = $direction; |
| 1531 | 1531 | $temp_array['direction_shortname'] = "W"; |
| 1532 | 1532 | $temp_array['direction_fullname'] = "West"; |
| 1533 | - } elseif ($direction >= 292.5 && $direction < 315){ |
|
| 1533 | + } elseif ($direction >= 292.5 && $direction < 315) { |
|
| 1534 | 1534 | $temp_array['direction_degree'] = $direction; |
| 1535 | 1535 | $temp_array['direction_shortname'] = "WNW"; |
| 1536 | 1536 | $temp_array['direction_fullname'] = "West-Northwest"; |
| 1537 | - } elseif ($direction >= 315 && $direction < 337.5){ |
|
| 1537 | + } elseif ($direction >= 315 && $direction < 337.5) { |
|
| 1538 | 1538 | $temp_array['direction_degree'] = $direction; |
| 1539 | 1539 | $temp_array['direction_shortname'] = "NW"; |
| 1540 | 1540 | $temp_array['direction_fullname'] = "Northwest"; |
| 1541 | - } elseif ($direction >= 337.5 && $direction < 360){ |
|
| 1541 | + } elseif ($direction >= 337.5 && $direction < 360) { |
|
| 1542 | 1542 | $temp_array['direction_degree'] = $direction; |
| 1543 | 1543 | $temp_array['direction_shortname'] = "NNW"; |
| 1544 | 1544 | $temp_array['direction_fullname'] = "North-Northwest"; |
@@ -1555,11 +1555,11 @@ discard block |
||
| 1555 | 1555 | * @param Float $longitude longitute of the flight |
| 1556 | 1556 | * @return String the countrie |
| 1557 | 1557 | */ |
| 1558 | - public function getCountryFromLatitudeLongitude($latitude,$longitude) |
|
| 1558 | + public function getCountryFromLatitudeLongitude($latitude, $longitude) |
|
| 1559 | 1559 | { |
| 1560 | 1560 | global $globalDBdriver, $globalDebug; |
| 1561 | - $latitude = filter_var($latitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1562 | - $longitude = filter_var($longitude,FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 1561 | + $latitude = filter_var($latitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1562 | + $longitude = filter_var($longitude, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 1563 | 1563 | |
| 1564 | 1564 | $Connection = new Connection($this->db); |
| 1565 | 1565 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1599,7 +1599,7 @@ discard block |
||
| 1599 | 1599 | public function getCountryFromISO2($iso2) |
| 1600 | 1600 | { |
| 1601 | 1601 | global $globalDBdriver, $globalDebug; |
| 1602 | - $iso2 = filter_var($iso2,FILTER_SANITIZE_STRING); |
|
| 1602 | + $iso2 = filter_var($iso2, FILTER_SANITIZE_STRING); |
|
| 1603 | 1603 | |
| 1604 | 1604 | $Connection = new Connection($this->db); |
| 1605 | 1605 | if (!$Connection->tableExists('countries')) return ''; |
@@ -1647,7 +1647,7 @@ discard block |
||
| 1647 | 1647 | |
| 1648 | 1648 | $bitly_data = json_decode($bitly_data); |
| 1649 | 1649 | $bitly_url = ''; |
| 1650 | - if ($bitly_data->status_txt = "OK"){ |
|
| 1650 | + if ($bitly_data->status_txt = "OK") { |
|
| 1651 | 1651 | $bitly_url = $bitly_data->data->url; |
| 1652 | 1652 | } |
| 1653 | 1653 | |
@@ -1657,7 +1657,7 @@ discard block |
||
| 1657 | 1657 | |
| 1658 | 1658 | public function getOrderBy() |
| 1659 | 1659 | { |
| 1660 | - $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_output.aircraft_icao DESC"),"manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"),"airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"),"distance_asc" => array("key" => "distance_asc","value" => "Distance - ASC","sql" => "ORDER BY distance ASC"),"distance_desc" => array("key" => "distance_desc","value" => "Distance - DESC","sql" => "ORDER BY distance DESC")); |
|
| 1660 | + $orderby = array("aircraft_asc" => array("key" => "aircraft_asc", "value" => "Aircraft Type - ASC", "sql" => "ORDER BY marine_output.aircraft_icao ASC"), "aircraft_desc" => array("key" => "aircraft_desc", "value" => "Aircraft Type - DESC", "sql" => "ORDER BY marine_output.aircraft_icao DESC"), "manufacturer_asc" => array("key" => "manufacturer_asc", "value" => "Aircraft Manufacturer - ASC", "sql" => "ORDER BY marine_output.aircraft_manufacturer ASC"), "manufacturer_desc" => array("key" => "manufacturer_desc", "value" => "Aircraft Manufacturer - DESC", "sql" => "ORDER BY marine_output.aircraft_manufacturer DESC"), "airline_name_asc" => array("key" => "airline_name_asc", "value" => "Airline Name - ASC", "sql" => "ORDER BY marine_output.airline_name ASC"), "airline_name_desc" => array("key" => "airline_name_desc", "value" => "Airline Name - DESC", "sql" => "ORDER BY marine_output.airline_name DESC"), "ident_asc" => array("key" => "ident_asc", "value" => "Ident - ASC", "sql" => "ORDER BY marine_output.ident ASC"), "ident_desc" => array("key" => "ident_desc", "value" => "Ident - DESC", "sql" => "ORDER BY marine_output.ident DESC"), "airport_departure_asc" => array("key" => "airport_departure_asc", "value" => "Departure Airport - ASC", "sql" => "ORDER BY marine_output.departure_airport_city ASC"), "airport_departure_desc" => array("key" => "airport_departure_desc", "value" => "Departure Airport - DESC", "sql" => "ORDER BY marine_output.departure_airport_city DESC"), "airport_arrival_asc" => array("key" => "airport_arrival_asc", "value" => "Arrival Airport - ASC", "sql" => "ORDER BY marine_output.arrival_airport_city ASC"), "airport_arrival_desc" => array("key" => "airport_arrival_desc", "value" => "Arrival Airport - DESC", "sql" => "ORDER BY marine_output.arrival_airport_city DESC"), "date_asc" => array("key" => "date_asc", "value" => "Date - ASC", "sql" => "ORDER BY marine_output.date ASC"), "date_desc" => array("key" => "date_desc", "value" => "Date - DESC", "sql" => "ORDER BY marine_output.date DESC"), "distance_asc" => array("key" => "distance_asc", "value" => "Distance - ASC", "sql" => "ORDER BY distance ASC"), "distance_desc" => array("key" => "distance_desc", "value" => "Distance - DESC", "sql" => "ORDER BY distance DESC")); |
|
| 1661 | 1661 | |
| 1662 | 1662 | return $orderby; |
| 1663 | 1663 | |
@@ -13,33 +13,33 @@ discard block |
||
| 13 | 13 | * @param Array $filter the filter |
| 14 | 14 | * @return Array the SQL part |
| 15 | 15 | */ |
| 16 | - public function getFilter($filter = array(),$where = false,$and = false) { |
|
| 16 | + public function getFilter($filter = array(), $where = false, $and = false) { |
|
| 17 | 17 | global $globalFilter, $globalStatsFilters, $globalFilterName, $globalDBdriver; |
| 18 | 18 | $filters = array(); |
| 19 | 19 | if (is_array($globalStatsFilters) && isset($globalStatsFilters[$globalFilterName])) { |
| 20 | 20 | if (isset($globalStatsFilters[$globalFilterName][0]['source'])) { |
| 21 | 21 | $filters = $globalStatsFilters[$globalFilterName]; |
| 22 | 22 | } else { |
| 23 | - $filter = array_merge($filter,$globalStatsFilters[$globalFilterName]); |
|
| 23 | + $filter = array_merge($filter, $globalStatsFilters[$globalFilterName]); |
|
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | if (isset($filter[0]['source'])) { |
| 27 | - $filters = array_merge($filters,$filter); |
|
| 27 | + $filters = array_merge($filters, $filter); |
|
| 28 | 28 | } |
| 29 | - if (is_array($globalFilter)) $filter = array_merge($filter,$globalFilter); |
|
| 29 | + if (is_array($globalFilter)) $filter = array_merge($filter, $globalFilter); |
|
| 30 | 30 | $filter_query_join = ''; |
| 31 | 31 | $filter_query_where = ''; |
| 32 | - foreach($filters as $flt) { |
|
| 32 | + foreach ($filters as $flt) { |
|
| 33 | 33 | if (isset($flt['idents']) && !empty($flt['idents'])) { |
| 34 | 34 | if (isset($flt['source'])) { |
| 35 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','",$flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id"; |
|
| 35 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."') AND marine_archive_output.format_source IN ('".implode("','", $flt['source'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id"; |
|
| 36 | 36 | } else { |
| 37 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','",$flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id"; |
|
| 37 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.ident IN ('".implode("','", $flt['idents'])."')) spid ON spid.fammarine_id = marine_archive.fammarine_id"; |
|
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 42 | - $filter_query_where .= " AND format_source IN ('".implode("','",$filter['source'])."')"; |
|
| 42 | + $filter_query_where .= " AND format_source IN ('".implode("','", $filter['source'])."')"; |
|
| 43 | 43 | } |
| 44 | 44 | if (isset($filter['ident']) && !empty($filter['ident'])) { |
| 45 | 45 | $filter_query_where .= " AND ident = '".$filter['ident']."'"; |
@@ -67,22 +67,22 @@ discard block |
||
| 67 | 67 | $filter_query_date .= " AND EXTRACT(DAY FROM marine_archive_output.date) = '".$filter['day']."'"; |
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | - $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/',' WHERE',$filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id"; |
|
| 70 | + $filter_query_join .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output".preg_replace('/^ AND/', ' WHERE', $filter_query_date).") sd ON sd.fammarine_id = marine_archive.fammarine_id"; |
|
| 71 | 71 | } |
| 72 | 72 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 73 | - $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 73 | + $filter_query_where .= " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 74 | 74 | } |
| 75 | 75 | if ($filter_query_where == '' && $where) $filter_query_where = ' WHERE'; |
| 76 | 76 | elseif ($filter_query_where != '' && $and) $filter_query_where .= ' AND'; |
| 77 | 77 | if ($filter_query_where != '') { |
| 78 | - $filter_query_where = preg_replace('/^ AND/',' WHERE',$filter_query_where); |
|
| 78 | + $filter_query_where = preg_replace('/^ AND/', ' WHERE', $filter_query_where); |
|
| 79 | 79 | } |
| 80 | 80 | $filter_query = $filter_query_join.$filter_query_where; |
| 81 | 81 | return $filter_query; |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | // marine_archive |
| 85 | - public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '',$type = '',$typeid = '',$imo = '', $callsign = '',$arrival_code = '',$arrival_date = '',$status = '',$statusid = '',$noarchive = false,$format_source = '', $source_name = '', $over_country = '') { |
|
| 85 | + public function addMarineArchiveData($fammarine_id = '', $ident = '', $latitude = '', $longitude = '', $heading = '', $groundspeed = '', $date = '', $putinarchive = false, $mmsi = '', $type = '', $typeid = '', $imo = '', $callsign = '', $arrival_code = '', $arrival_date = '', $status = '', $statusid = '', $noarchive = false, $format_source = '', $source_name = '', $over_country = '') { |
|
| 86 | 86 | /* |
| 87 | 87 | require_once(dirname(__FILE__).'/class.Marine.php'); |
| 88 | 88 | if ($over_country == '') { |
@@ -94,16 +94,16 @@ discard block |
||
| 94 | 94 | */ |
| 95 | 95 | $country = $over_country; |
| 96 | 96 | // Route is not added in marine_archive |
| 97 | - $query = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) |
|
| 97 | + $query = 'INSERT INTO marine_archive (fammarine_id, ident, latitude, longitude, heading, ground_speed, date, format_source, source_name, over_country, mmsi, type,status,imo,arrival_port_name,arrival_port_date) |
|
| 98 | 98 | VALUES (:fammarine_id,:ident,:latitude,:longitude,:heading,:groundspeed,:date,:format_source, :source_name, :over_country,:mmsi,:type,:status,:imo,:arrival_port_name,:arrival_port_date)'; |
| 99 | 99 | |
| 100 | - $query_values = array(':fammarine_id' => $fammarine_id,':ident' => $ident,':latitude' => $latitude,':longitude' => $longitude,':heading' => $heading,':groundspeed' => $groundspeed,':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country,':mmsi' => $mmsi,':type' => $type,':status' => $status,':imo' => $imo,':arrival_port_name' => $arrival_code,':arrival_port_date' => $arrival_date); |
|
| 100 | + $query_values = array(':fammarine_id' => $fammarine_id, ':ident' => $ident, ':latitude' => $latitude, ':longitude' => $longitude, ':heading' => $heading, ':groundspeed' => $groundspeed, ':date' => $date, ':format_source' => $format_source, ':source_name' => $source_name, ':over_country' => $over_country, ':mmsi' => $mmsi, ':type' => $type, ':status' => $status, ':imo' => $imo, ':arrival_port_name' => $arrival_code, ':arrival_port_date' => $arrival_date); |
|
| 101 | 101 | |
| 102 | 102 | try { |
| 103 | 103 | $sth = $this->db->prepare($query); |
| 104 | 104 | $sth->execute($query_values); |
| 105 | 105 | $sth->closeCursor(); |
| 106 | - } catch(PDOException $e) { |
|
| 106 | + } catch (PDOException $e) { |
|
| 107 | 107 | return "error : ".$e->getMessage(); |
| 108 | 108 | } |
| 109 | 109 | return "success"; |
@@ -123,9 +123,9 @@ discard block |
||
| 123 | 123 | |
| 124 | 124 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 125 | 125 | //$query = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
| 126 | - $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 126 | + $query = "SELECT marine_archive.* FROM marine_archive WHERE ident = :ident ORDER BY date DESC LIMIT 1"; |
|
| 127 | 127 | |
| 128 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident)); |
|
| 128 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident)); |
|
| 129 | 129 | |
| 130 | 130 | return $spotter_array; |
| 131 | 131 | } |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 145 | 145 | //$query = MarineArchive->$global_query." WHERE marine_archive.fammarine_id = :id"; |
| 146 | 146 | //$query = "SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
| 147 | - $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 147 | + $query = "SELECT * FROM marine_archive WHERE fammarine_id = :id ORDER BY date DESC LIMIT 1"; |
|
| 148 | 148 | |
| 149 | 149 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
| 150 | 150 | /* |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | } |
| 158 | 158 | $spotter_array = $sth->fetchAll(PDO->FETCH_ASSOC); |
| 159 | 159 | */ |
| 160 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id)); |
|
| 160 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id)); |
|
| 161 | 161 | |
| 162 | 162 | return $spotter_array; |
| 163 | 163 | } |
@@ -172,14 +172,14 @@ discard block |
||
| 172 | 172 | { |
| 173 | 173 | date_default_timezone_set('UTC'); |
| 174 | 174 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 175 | - $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 175 | + $query = $this->global_query." WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 176 | 176 | |
| 177 | 177 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
| 178 | 178 | |
| 179 | 179 | try { |
| 180 | 180 | $sth = $this->db->prepare($query); |
| 181 | 181 | $sth->execute(array(':id' => $id)); |
| 182 | - } catch(PDOException $e) { |
|
| 182 | + } catch (PDOException $e) { |
|
| 183 | 183 | echo $e->getMessage(); |
| 184 | 184 | die; |
| 185 | 185 | } |
@@ -198,14 +198,14 @@ discard block |
||
| 198 | 198 | { |
| 199 | 199 | date_default_timezone_set('UTC'); |
| 200 | 200 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 201 | - $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id"; |
|
| 201 | + $query = "SELECT marine_archive.latitude, marine_archive.longitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id"; |
|
| 202 | 202 | |
| 203 | 203 | // $spotter_array = Marine->getDataFromDB($query,array(':id' => $id)); |
| 204 | 204 | |
| 205 | 205 | try { |
| 206 | 206 | $sth = $this->db->prepare($query); |
| 207 | 207 | $sth->execute(array(':id' => $id)); |
| 208 | - } catch(PDOException $e) { |
|
| 208 | + } catch (PDOException $e) { |
|
| 209 | 209 | echo $e->getMessage(); |
| 210 | 210 | die; |
| 211 | 211 | } |
@@ -227,12 +227,12 @@ discard block |
||
| 227 | 227 | date_default_timezone_set('UTC'); |
| 228 | 228 | |
| 229 | 229 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 230 | - $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
| 230 | + $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
| 231 | 231 | |
| 232 | 232 | try { |
| 233 | 233 | $sth = $this->db->prepare($query); |
| 234 | 234 | $sth->execute(array(':ident' => $ident)); |
| 235 | - } catch(PDOException $e) { |
|
| 235 | + } catch (PDOException $e) { |
|
| 236 | 236 | echo $e->getMessage(); |
| 237 | 237 | die; |
| 238 | 238 | } |
@@ -253,12 +253,12 @@ discard block |
||
| 253 | 253 | date_default_timezone_set('UTC'); |
| 254 | 254 | |
| 255 | 255 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 256 | - $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
| 256 | + $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id AND marine_archive.latitude <> 0 AND marine_archive.longitude <> 0 ORDER BY date"; |
|
| 257 | 257 | |
| 258 | 258 | try { |
| 259 | 259 | $sth = $this->db->prepare($query); |
| 260 | 260 | $sth->execute(array(':id' => $id)); |
| 261 | - } catch(PDOException $e) { |
|
| 261 | + } catch (PDOException $e) { |
|
| 262 | 262 | echo $e->getMessage(); |
| 263 | 263 | die; |
| 264 | 264 | } |
@@ -279,12 +279,12 @@ discard block |
||
| 279 | 279 | date_default_timezone_set('UTC'); |
| 280 | 280 | |
| 281 | 281 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 282 | - $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 282 | + $query = "SELECT marine_archive.altitude, marine_archive.ground_speed, marine_archive.date FROM marine_archive WHERE marine_archive.fammarine_id = :id ORDER BY date"; |
|
| 283 | 283 | |
| 284 | 284 | try { |
| 285 | 285 | $sth = $this->db->prepare($query); |
| 286 | 286 | $sth->execute(array(':id' => $id)); |
| 287 | - } catch(PDOException $e) { |
|
| 287 | + } catch (PDOException $e) { |
|
| 288 | 288 | echo $e->getMessage(); |
| 289 | 289 | die; |
| 290 | 290 | } |
@@ -306,13 +306,13 @@ discard block |
||
| 306 | 306 | date_default_timezone_set('UTC'); |
| 307 | 307 | |
| 308 | 308 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 309 | - $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
| 309 | + $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate LIMIT 1"; |
|
| 310 | 310 | // $query = "SELECT marine_archive.altitude, marine_archive.date FROM marine_archive WHERE marine_archive.ident = :ident"; |
| 311 | 311 | |
| 312 | 312 | try { |
| 313 | 313 | $sth = $this->db->prepare($query); |
| 314 | 314 | $sth->execute(array(':ident' => $ident)); |
| 315 | - } catch(PDOException $e) { |
|
| 315 | + } catch (PDOException $e) { |
|
| 316 | 316 | echo $e->getMessage(); |
| 317 | 317 | die; |
| 318 | 318 | } |
@@ -329,13 +329,13 @@ discard block |
||
| 329 | 329 | * @return Array the spotter information |
| 330 | 330 | * |
| 331 | 331 | */ |
| 332 | - public function getMarineArchiveData($ident,$fammarine_id,$date) |
|
| 332 | + public function getMarineArchiveData($ident, $fammarine_id, $date) |
|
| 333 | 333 | { |
| 334 | 334 | $Marine = new Marine($this->db); |
| 335 | 335 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 336 | - $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.fammarine_id = :fammarine_id AND l.date LIKE :date GROUP BY l.fammarine_id) s on spotter_live.fammarine_id = s.fammarine_id AND spotter_live.date = s.maxdate"; |
|
| 336 | + $query = "SELECT spotter_live.* FROM spotter_live INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM spotter_live l WHERE l.ident = :ident AND l.fammarine_id = :fammarine_id AND l.date LIKE :date GROUP BY l.fammarine_id) s on spotter_live.fammarine_id = s.fammarine_id AND spotter_live.date = s.maxdate"; |
|
| 337 | 337 | |
| 338 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':fammarine_id' => $fammarine_id,':date' => $date.'%')); |
|
| 338 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':fammarine_id' => $fammarine_id, ':date' => $date.'%')); |
|
| 339 | 339 | |
| 340 | 340 | return $spotter_array; |
| 341 | 341 | } |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | try { |
| 349 | 349 | $sth = $this->db->prepare($query); |
| 350 | 350 | $sth->execute(); |
| 351 | - } catch(PDOException $e) { |
|
| 351 | + } catch (PDOException $e) { |
|
| 352 | 352 | echo $e->getMessage(); |
| 353 | 353 | die; |
| 354 | 354 | } |
@@ -360,24 +360,24 @@ discard block |
||
| 360 | 360 | * @return Array the spotter information |
| 361 | 361 | * |
| 362 | 362 | */ |
| 363 | - public function getMinLiveMarineData($begindate,$enddate,$filter = array()) |
|
| 363 | + public function getMinLiveMarineData($begindate, $enddate, $filter = array()) |
|
| 364 | 364 | { |
| 365 | 365 | global $globalDBdriver, $globalLiveInterval; |
| 366 | 366 | date_default_timezone_set('UTC'); |
| 367 | 367 | |
| 368 | 368 | $filter_query = ''; |
| 369 | 369 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 370 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 370 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 371 | 371 | } |
| 372 | 372 | // Use spotter_output also ? |
| 373 | 373 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 374 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 374 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 375 | 375 | } |
| 376 | 376 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 377 | 377 | $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
| 378 | 378 | } |
| 379 | 379 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 380 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 380 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 381 | 381 | } |
| 382 | 382 | |
| 383 | 383 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -396,14 +396,14 @@ discard block |
||
| 396 | 396 | GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id |
| 397 | 397 | AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao'; |
| 398 | 398 | */ |
| 399 | - $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 399 | + $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 400 | 400 | FROM marine_archive |
| 401 | 401 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao |
| 402 | 402 | WHERE marine_archive.date BETWEEN '."'".$begindate."'".' AND '."'".$begindate."'".' |
| 403 | 403 | '.$filter_query.' ORDER BY fammarine_id'; |
| 404 | 404 | } else { |
| 405 | 405 | //$query = 'SELECT marine_archive.ident, marine_archive.fammarine_id, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE DATE_SUB(UTC_TIMESTAMP(),INTERVAL '.$globalLiveInterval.' SECOND) <= l.date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao'; |
| 406 | - $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 406 | + $query = 'SELECT marine_archive.date,marine_archive.fammarine_id, marine_archive.ident, marine_archive.aircraft_icao, marine_archive.departure_airport_icao as departure_airport, marine_archive.arrival_airport_icao as arrival_airport, marine_archive.latitude, marine_archive.longitude, marine_archive.altitude, marine_archive.heading, marine_archive.ground_speed, marine_archive.squawk, a.aircraft_shadow,a.engine_type, a.engine_count, a.wake_category |
|
| 407 | 407 | FROM marine_archive |
| 408 | 408 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive.aircraft_icao = a.icao |
| 409 | 409 | WHERE marine_archive.date >= '."'".$begindate."'".' AND marine_archive.date <= '."'".$enddate."'".' |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | try { |
| 414 | 414 | $sth = $this->db->prepare($query); |
| 415 | 415 | $sth->execute(); |
| 416 | - } catch(PDOException $e) { |
|
| 416 | + } catch (PDOException $e) { |
|
| 417 | 417 | echo $e->getMessage(); |
| 418 | 418 | die; |
| 419 | 419 | } |
@@ -428,24 +428,24 @@ discard block |
||
| 428 | 428 | * @return Array the spotter information |
| 429 | 429 | * |
| 430 | 430 | */ |
| 431 | - public function getMinLiveMarineDataPlayback($begindate,$enddate,$filter = array()) |
|
| 431 | + public function getMinLiveMarineDataPlayback($begindate, $enddate, $filter = array()) |
|
| 432 | 432 | { |
| 433 | 433 | global $globalDBdriver, $globalLiveInterval; |
| 434 | 434 | date_default_timezone_set('UTC'); |
| 435 | 435 | |
| 436 | 436 | $filter_query = ''; |
| 437 | 437 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 438 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 438 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 439 | 439 | } |
| 440 | 440 | // Should use spotter_output also ? |
| 441 | 441 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 442 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 442 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 443 | 443 | } |
| 444 | 444 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 445 | 445 | $filter_query .= " INNER JOIN (SELECT fammarine_id FROM marine_archive_output WHERE marine_archive_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
| 446 | 446 | } |
| 447 | 447 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 448 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 448 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 449 | 449 | } |
| 450 | 450 | |
| 451 | 451 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | FROM marine_archive |
| 456 | 456 | INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE (l.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate '.$filter_query.'LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive.aircraft_icao = a.icao'; |
| 457 | 457 | */ |
| 458 | - $query = 'SELECT a.aircraft_shadow, marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk |
|
| 458 | + $query = 'SELECT a.aircraft_shadow, marine_archive_output.ident, marine_archive_output.fammarine_id, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk |
|
| 459 | 459 | FROM marine_archive_output |
| 460 | 460 | LEFT JOIN (SELECT aircraft_shadow,icao FROM aircraft) a ON marine_archive_output.aircraft_icao = a.icao |
| 461 | 461 | WHERE (marine_archive_output.date BETWEEN '."'".$begindate."'".' AND '."'".$enddate."'".') |
@@ -470,7 +470,7 @@ discard block |
||
| 470 | 470 | WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".' |
| 471 | 471 | '.$filter_query.' GROUP BY marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao, marine_archive_output.arrival_airport_icao, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow'; |
| 472 | 472 | */ |
| 473 | - $query = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow |
|
| 473 | + $query = 'SELECT DISTINCT marine_archive_output.fammarine_id, marine_archive_output.ident, marine_archive_output.aircraft_icao, marine_archive_output.departure_airport_icao as departure_airport, marine_archive_output.arrival_airport_icao as arrival_airport, marine_archive_output.latitude, marine_archive_output.longitude, marine_archive_output.altitude, marine_archive_output.heading, marine_archive_output.ground_speed, marine_archive_output.squawk, a.aircraft_shadow |
|
| 474 | 474 | FROM marine_archive_output |
| 475 | 475 | INNER JOIN (SELECT * FROM aircraft) a on marine_archive_output.aircraft_icao = a.icao |
| 476 | 476 | WHERE marine_archive_output.date >= '."'".$begindate."'".' AND marine_archive_output.date <= '."'".$enddate."'".' |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | try { |
| 483 | 483 | $sth = $this->db->prepare($query); |
| 484 | 484 | $sth->execute(); |
| 485 | - } catch(PDOException $e) { |
|
| 485 | + } catch (PDOException $e) { |
|
| 486 | 486 | echo $e->getMessage(); |
| 487 | 487 | die; |
| 488 | 488 | } |
@@ -497,23 +497,23 @@ discard block |
||
| 497 | 497 | * @return Array the spotter information |
| 498 | 498 | * |
| 499 | 499 | */ |
| 500 | - public function getLiveMarineCount($begindate,$enddate,$filter = array()) |
|
| 500 | + public function getLiveMarineCount($begindate, $enddate, $filter = array()) |
|
| 501 | 501 | { |
| 502 | 502 | global $globalDBdriver, $globalLiveInterval; |
| 503 | 503 | date_default_timezone_set('UTC'); |
| 504 | 504 | |
| 505 | 505 | $filter_query = ''; |
| 506 | 506 | if (isset($filter['source']) && !empty($filter['source'])) { |
| 507 | - $filter_query .= " AND format_source IN ('".implode("','",$filter['source'])."') "; |
|
| 507 | + $filter_query .= " AND format_source IN ('".implode("','", $filter['source'])."') "; |
|
| 508 | 508 | } |
| 509 | 509 | if (isset($filter['airlines']) && !empty($filter['airlines'])) { |
| 510 | - $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','",$filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 510 | + $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_icao IN ('".implode("','", $filter['airlines'])."')) so ON so.fammarine_id = marine_archive.fammarine_id "; |
|
| 511 | 511 | } |
| 512 | 512 | if (isset($filter['airlinestype']) && !empty($filter['airlinestype'])) { |
| 513 | 513 | $filter_query .= " INNER JOIN (SELECT fammarine_id FROM spotter_output WHERE spotter_output.airline_type = '".$filter['airlinestype']."') sa ON sa.fammarine_id = marine_archive.fammarine_id "; |
| 514 | 514 | } |
| 515 | 515 | if (isset($filter['source_aprs']) && !empty($filter['source_aprs'])) { |
| 516 | - $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','",$filter['source_aprs'])."')"; |
|
| 516 | + $filter_query = " AND format_source = 'aprs' AND source_name IN ('".implode("','", $filter['source_aprs'])."')"; |
|
| 517 | 517 | } |
| 518 | 518 | |
| 519 | 519 | //if (!isset($globalLiveInterval)) $globalLiveInterval = '200'; |
@@ -528,7 +528,7 @@ discard block |
||
| 528 | 528 | try { |
| 529 | 529 | $sth = $this->db->prepare($query); |
| 530 | 530 | $sth->execute(); |
| 531 | - } catch(PDOException $e) { |
|
| 531 | + } catch (PDOException $e) { |
|
| 532 | 532 | echo $e->getMessage(); |
| 533 | 533 | die; |
| 534 | 534 | } |
@@ -548,7 +548,7 @@ discard block |
||
| 548 | 548 | * @return Array the spotter information |
| 549 | 549 | * |
| 550 | 550 | */ |
| 551 | - public function searchMarineData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '',$pilot_id = '',$pilot_name = '',$altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '',$origLat = '',$origLon = '',$dist = '', $filters=array()) |
|
| 551 | + public function searchMarineData($q = '', $registration = '', $aircraft_icao = '', $aircraft_manufacturer = '', $highlights = '', $airline_icao = '', $airline_country = '', $airline_type = '', $airport = '', $airport_country = '', $callsign = '', $departure_airport_route = '', $arrival_airport_route = '', $owner = '', $pilot_id = '', $pilot_name = '', $altitude = '', $date_posted = '', $limit = '', $sort = '', $includegeodata = '', $origLat = '', $origLon = '', $dist = '', $filters = array()) |
|
| 552 | 552 | { |
| 553 | 553 | global $globalTimezone, $globalDBdriver; |
| 554 | 554 | require_once(dirname(__FILE__).'/class.Translation.php'); |
@@ -570,7 +570,7 @@ discard block |
||
| 570 | 570 | |
| 571 | 571 | $q_array = explode(" ", $q); |
| 572 | 572 | |
| 573 | - foreach ($q_array as $q_item){ |
|
| 573 | + foreach ($q_array as $q_item) { |
|
| 574 | 574 | $additional_query .= " AND ("; |
| 575 | 575 | $additional_query .= "(marine_archive_output.spotter_id like '%".$q_item."%') OR "; |
| 576 | 576 | $additional_query .= "(marine_archive_output.aircraft_icao like '%".$q_item."%') OR "; |
@@ -602,7 +602,7 @@ discard block |
||
| 602 | 602 | |
| 603 | 603 | if ($registration != "") |
| 604 | 604 | { |
| 605 | - $registration = filter_var($registration,FILTER_SANITIZE_STRING); |
|
| 605 | + $registration = filter_var($registration, FILTER_SANITIZE_STRING); |
|
| 606 | 606 | if (!is_string($registration)) |
| 607 | 607 | { |
| 608 | 608 | return false; |
@@ -613,7 +613,7 @@ discard block |
||
| 613 | 613 | |
| 614 | 614 | if ($aircraft_icao != "") |
| 615 | 615 | { |
| 616 | - $aircraft_icao = filter_var($aircraft_icao,FILTER_SANITIZE_STRING); |
|
| 616 | + $aircraft_icao = filter_var($aircraft_icao, FILTER_SANITIZE_STRING); |
|
| 617 | 617 | if (!is_string($aircraft_icao)) |
| 618 | 618 | { |
| 619 | 619 | return false; |
@@ -624,7 +624,7 @@ discard block |
||
| 624 | 624 | |
| 625 | 625 | if ($aircraft_manufacturer != "") |
| 626 | 626 | { |
| 627 | - $aircraft_manufacturer = filter_var($aircraft_manufacturer,FILTER_SANITIZE_STRING); |
|
| 627 | + $aircraft_manufacturer = filter_var($aircraft_manufacturer, FILTER_SANITIZE_STRING); |
|
| 628 | 628 | if (!is_string($aircraft_manufacturer)) |
| 629 | 629 | { |
| 630 | 630 | return false; |
@@ -645,7 +645,7 @@ discard block |
||
| 645 | 645 | |
| 646 | 646 | if ($airline_icao != "") |
| 647 | 647 | { |
| 648 | - $airline_icao = filter_var($airline_icao,FILTER_SANITIZE_STRING); |
|
| 648 | + $airline_icao = filter_var($airline_icao, FILTER_SANITIZE_STRING); |
|
| 649 | 649 | if (!is_string($airline_icao)) |
| 650 | 650 | { |
| 651 | 651 | return false; |
@@ -656,7 +656,7 @@ discard block |
||
| 656 | 656 | |
| 657 | 657 | if ($airline_country != "") |
| 658 | 658 | { |
| 659 | - $airline_country = filter_var($airline_country,FILTER_SANITIZE_STRING); |
|
| 659 | + $airline_country = filter_var($airline_country, FILTER_SANITIZE_STRING); |
|
| 660 | 660 | if (!is_string($airline_country)) |
| 661 | 661 | { |
| 662 | 662 | return false; |
@@ -667,7 +667,7 @@ discard block |
||
| 667 | 667 | |
| 668 | 668 | if ($airline_type != "") |
| 669 | 669 | { |
| 670 | - $airline_type = filter_var($airline_type,FILTER_SANITIZE_STRING); |
|
| 670 | + $airline_type = filter_var($airline_type, FILTER_SANITIZE_STRING); |
|
| 671 | 671 | if (!is_string($airline_type)) |
| 672 | 672 | { |
| 673 | 673 | return false; |
@@ -689,7 +689,7 @@ discard block |
||
| 689 | 689 | |
| 690 | 690 | if ($airport != "") |
| 691 | 691 | { |
| 692 | - $airport = filter_var($airport,FILTER_SANITIZE_STRING); |
|
| 692 | + $airport = filter_var($airport, FILTER_SANITIZE_STRING); |
|
| 693 | 693 | if (!is_string($airport)) |
| 694 | 694 | { |
| 695 | 695 | return false; |
@@ -700,7 +700,7 @@ discard block |
||
| 700 | 700 | |
| 701 | 701 | if ($airport_country != "") |
| 702 | 702 | { |
| 703 | - $airport_country = filter_var($airport_country,FILTER_SANITIZE_STRING); |
|
| 703 | + $airport_country = filter_var($airport_country, FILTER_SANITIZE_STRING); |
|
| 704 | 704 | if (!is_string($airport_country)) |
| 705 | 705 | { |
| 706 | 706 | return false; |
@@ -711,7 +711,7 @@ discard block |
||
| 711 | 711 | |
| 712 | 712 | if ($callsign != "") |
| 713 | 713 | { |
| 714 | - $callsign = filter_var($callsign,FILTER_SANITIZE_STRING); |
|
| 714 | + $callsign = filter_var($callsign, FILTER_SANITIZE_STRING); |
|
| 715 | 715 | if (!is_string($callsign)) |
| 716 | 716 | { |
| 717 | 717 | return false; |
@@ -719,7 +719,7 @@ discard block |
||
| 719 | 719 | $translate = $Translation->ident2icao($callsign); |
| 720 | 720 | if ($translate != $callsign) { |
| 721 | 721 | $additional_query .= " AND (marine_archive_output.ident = :callsign OR marine_archive_output.ident = :translate)"; |
| 722 | - $query_values = array_merge($query_values,array(':callsign' => $callsign,':translate' => $translate)); |
|
| 722 | + $query_values = array_merge($query_values, array(':callsign' => $callsign, ':translate' => $translate)); |
|
| 723 | 723 | } else { |
| 724 | 724 | $additional_query .= " AND (marine_archive_output.ident = '".$callsign."')"; |
| 725 | 725 | } |
@@ -728,7 +728,7 @@ discard block |
||
| 728 | 728 | |
| 729 | 729 | if ($owner != "") |
| 730 | 730 | { |
| 731 | - $owner = filter_var($owner,FILTER_SANITIZE_STRING); |
|
| 731 | + $owner = filter_var($owner, FILTER_SANITIZE_STRING); |
|
| 732 | 732 | if (!is_string($owner)) |
| 733 | 733 | { |
| 734 | 734 | return false; |
@@ -739,7 +739,7 @@ discard block |
||
| 739 | 739 | |
| 740 | 740 | if ($pilot_name != "") |
| 741 | 741 | { |
| 742 | - $pilot_name = filter_var($pilot_name,FILTER_SANITIZE_STRING); |
|
| 742 | + $pilot_name = filter_var($pilot_name, FILTER_SANITIZE_STRING); |
|
| 743 | 743 | if (!is_string($pilot_name)) |
| 744 | 744 | { |
| 745 | 745 | return false; |
@@ -750,7 +750,7 @@ discard block |
||
| 750 | 750 | |
| 751 | 751 | if ($pilot_id != "") |
| 752 | 752 | { |
| 753 | - $pilot_id = filter_var($pilot_id,FILTER_SANITIZE_NUMBER_INT); |
|
| 753 | + $pilot_id = filter_var($pilot_id, FILTER_SANITIZE_NUMBER_INT); |
|
| 754 | 754 | if (!is_string($pilot_id)) |
| 755 | 755 | { |
| 756 | 756 | return false; |
@@ -761,7 +761,7 @@ discard block |
||
| 761 | 761 | |
| 762 | 762 | if ($departure_airport_route != "") |
| 763 | 763 | { |
| 764 | - $departure_airport_route = filter_var($departure_airport_route,FILTER_SANITIZE_STRING); |
|
| 764 | + $departure_airport_route = filter_var($departure_airport_route, FILTER_SANITIZE_STRING); |
|
| 765 | 765 | if (!is_string($departure_airport_route)) |
| 766 | 766 | { |
| 767 | 767 | return false; |
@@ -772,7 +772,7 @@ discard block |
||
| 772 | 772 | |
| 773 | 773 | if ($arrival_airport_route != "") |
| 774 | 774 | { |
| 775 | - $arrival_airport_route = filter_var($arrival_airport_route,FILTER_SANITIZE_STRING); |
|
| 775 | + $arrival_airport_route = filter_var($arrival_airport_route, FILTER_SANITIZE_STRING); |
|
| 776 | 776 | if (!is_string($arrival_airport_route)) |
| 777 | 777 | { |
| 778 | 778 | return false; |
@@ -785,8 +785,8 @@ discard block |
||
| 785 | 785 | { |
| 786 | 786 | $altitude_array = explode(",", $altitude); |
| 787 | 787 | |
| 788 | - $altitude_array[0] = filter_var($altitude_array[0],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 789 | - $altitude_array[1] = filter_var($altitude_array[1],FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION); |
|
| 788 | + $altitude_array[0] = filter_var($altitude_array[0], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 789 | + $altitude_array[1] = filter_var($altitude_array[1], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); |
|
| 790 | 790 | |
| 791 | 791 | |
| 792 | 792 | if ($altitude_array[1] != "") |
@@ -804,8 +804,8 @@ discard block |
||
| 804 | 804 | { |
| 805 | 805 | $date_array = explode(",", $date_posted); |
| 806 | 806 | |
| 807 | - $date_array[0] = filter_var($date_array[0],FILTER_SANITIZE_STRING); |
|
| 808 | - $date_array[1] = filter_var($date_array[1],FILTER_SANITIZE_STRING); |
|
| 807 | + $date_array[0] = filter_var($date_array[0], FILTER_SANITIZE_STRING); |
|
| 808 | + $date_array[1] = filter_var($date_array[1], FILTER_SANITIZE_STRING); |
|
| 809 | 809 | |
| 810 | 810 | if ($globalTimezone != '') { |
| 811 | 811 | date_default_timezone_set($globalTimezone); |
@@ -837,8 +837,8 @@ discard block |
||
| 837 | 837 | { |
| 838 | 838 | $limit_array = explode(",", $limit); |
| 839 | 839 | |
| 840 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 841 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 840 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 841 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 842 | 842 | |
| 843 | 843 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 844 | 844 | { |
@@ -849,8 +849,8 @@ discard block |
||
| 849 | 849 | |
| 850 | 850 | |
| 851 | 851 | if ($origLat != "" && $origLon != "" && $dist != "") { |
| 852 | - $dist = number_format($dist*0.621371,2,'.',''); |
|
| 853 | - $query="SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 852 | + $dist = number_format($dist*0.621371, 2, '.', ''); |
|
| 853 | + $query = "SELECT marine_archive_output.*, 3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2))) as distance |
|
| 854 | 854 | FROM marine_archive_output, marine_archive WHERE spotter_output_archive.fammarine_id = marine_archive.fammarine_id AND spotter_output.ident <> '' ".$additional_query."AND CAST(marine_archive.longitude as double precision) between ($origLon-$dist/ABS(cos(radians($origLat))*69)) and ($origLon+$dist/ABS(cos(radians($origLat))*69)) and CAST(marine_archive.latitude as double precision) between ($origLat-($dist/69)) and ($origLat+($dist/69)) |
| 855 | 855 | AND (3956 * 2 * ASIN(SQRT( POWER(SIN(($origLat - ABS(CAST(marine_archive.latitude as double precision)))*pi()/180/2),2)+COS( $origLat *pi()/180)*COS(ABS(CAST(marine_archive.latitude as double precision))*pi()/180)*POWER(SIN(($origLon-CAST(marine_archive.longitude as double precision))*pi()/180/2),2)))) < $dist".$filter_query." ORDER BY distance"; |
| 856 | 856 | } else { |
@@ -867,12 +867,12 @@ discard block |
||
| 867 | 867 | $additional_query .= " AND (marine_archive_output.waypoints <> '')"; |
| 868 | 868 | } |
| 869 | 869 | |
| 870 | - $query = "SELECT marine_archive_output.* FROM marine_archive_output |
|
| 870 | + $query = "SELECT marine_archive_output.* FROM marine_archive_output |
|
| 871 | 871 | WHERE marine_archive_output.ident <> '' |
| 872 | 872 | ".$additional_query." |
| 873 | 873 | ".$filter_query.$orderby_query; |
| 874 | 874 | } |
| 875 | - $spotter_array = $Marine->getDataFromDB($query, $query_values,$limit_query); |
|
| 875 | + $spotter_array = $Marine->getDataFromDB($query, $query_values, $limit_query); |
|
| 876 | 876 | |
| 877 | 877 | return $spotter_array; |
| 878 | 878 | } |
@@ -889,7 +889,7 @@ discard block |
||
| 889 | 889 | try { |
| 890 | 890 | $sth = $this->db->prepare($query); |
| 891 | 891 | $sth->execute(); |
| 892 | - } catch(PDOException $e) { |
|
| 892 | + } catch (PDOException $e) { |
|
| 893 | 893 | return "error"; |
| 894 | 894 | } |
| 895 | 895 | } |
@@ -926,8 +926,8 @@ discard block |
||
| 926 | 926 | { |
| 927 | 927 | $limit_array = explode(",", $limit); |
| 928 | 928 | |
| 929 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 930 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 929 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 930 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 931 | 931 | |
| 932 | 932 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 933 | 933 | { |
@@ -968,7 +968,7 @@ discard block |
||
| 968 | 968 | $query_values = array(); |
| 969 | 969 | $limit_query = ''; |
| 970 | 970 | $additional_query = ''; |
| 971 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 971 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 972 | 972 | |
| 973 | 973 | if ($owner != "") |
| 974 | 974 | { |
@@ -985,8 +985,8 @@ discard block |
||
| 985 | 985 | { |
| 986 | 986 | $limit_array = explode(",", $limit); |
| 987 | 987 | |
| 988 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 989 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 988 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 989 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 990 | 990 | |
| 991 | 991 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 992 | 992 | { |
@@ -1026,7 +1026,7 @@ discard block |
||
| 1026 | 1026 | $query_values = array(); |
| 1027 | 1027 | $limit_query = ''; |
| 1028 | 1028 | $additional_query = ''; |
| 1029 | - $filter_query = $this->getFilter($filter,true,true); |
|
| 1029 | + $filter_query = $this->getFilter($filter, true, true); |
|
| 1030 | 1030 | |
| 1031 | 1031 | if ($pilot != "") |
| 1032 | 1032 | { |
@@ -1038,8 +1038,8 @@ discard block |
||
| 1038 | 1038 | { |
| 1039 | 1039 | $limit_array = explode(",", $limit); |
| 1040 | 1040 | |
| 1041 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1042 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1041 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1042 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1043 | 1043 | |
| 1044 | 1044 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1045 | 1045 | { |
@@ -1069,7 +1069,7 @@ discard block |
||
| 1069 | 1069 | * @return Array the airline country list |
| 1070 | 1070 | * |
| 1071 | 1071 | */ |
| 1072 | - public function countAllFlightOverCountries($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1072 | + public function countAllFlightOverCountries($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1073 | 1073 | { |
| 1074 | 1074 | global $globalDBdriver; |
| 1075 | 1075 | /* |
@@ -1098,7 +1098,7 @@ discard block |
||
| 1098 | 1098 | $flight_array = array(); |
| 1099 | 1099 | $temp_array = array(); |
| 1100 | 1100 | |
| 1101 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1101 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1102 | 1102 | { |
| 1103 | 1103 | $temp_array['flight_count'] = $row['nb']; |
| 1104 | 1104 | $temp_array['flight_country'] = $row['name']; |
@@ -1115,7 +1115,7 @@ discard block |
||
| 1115 | 1115 | * @return Array the airline country list |
| 1116 | 1116 | * |
| 1117 | 1117 | */ |
| 1118 | - public function countAllFlightOverCountriesByAirlines($limit = true,$olderthanmonths = 0,$sincedate = '') |
|
| 1118 | + public function countAllFlightOverCountriesByAirlines($limit = true, $olderthanmonths = 0, $sincedate = '') |
|
| 1119 | 1119 | { |
| 1120 | 1120 | global $globalDBdriver; |
| 1121 | 1121 | /* |
@@ -1144,7 +1144,7 @@ discard block |
||
| 1144 | 1144 | $flight_array = array(); |
| 1145 | 1145 | $temp_array = array(); |
| 1146 | 1146 | |
| 1147 | - while($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1147 | + while ($row = $sth->fetch(PDO::FETCH_ASSOC)) |
|
| 1148 | 1148 | { |
| 1149 | 1149 | $temp_array['airline_icao'] = $row['airline_icao']; |
| 1150 | 1150 | $temp_array['flight_count'] = $row['nb']; |
@@ -1162,14 +1162,14 @@ discard block |
||
| 1162 | 1162 | * @return Array the spotter information |
| 1163 | 1163 | * |
| 1164 | 1164 | */ |
| 1165 | - public function getDateArchiveMarineDataById($id,$date) |
|
| 1165 | + public function getDateArchiveMarineDataById($id, $date) |
|
| 1166 | 1166 | { |
| 1167 | 1167 | $Marine = new Marine($this->db); |
| 1168 | 1168 | date_default_timezone_set('UTC'); |
| 1169 | 1169 | $id = filter_var($id, FILTER_SANITIZE_STRING); |
| 1170 | 1170 | $query = 'SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.fammarine_id = :id AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC'; |
| 1171 | - $date = date('c',$date); |
|
| 1172 | - $spotter_array = $Marine->getDataFromDB($query,array(':id' => $id,':date' => $date)); |
|
| 1171 | + $date = date('c', $date); |
|
| 1172 | + $spotter_array = $Marine->getDataFromDB($query, array(':id' => $id, ':date' => $date)); |
|
| 1173 | 1173 | return $spotter_array; |
| 1174 | 1174 | } |
| 1175 | 1175 | |
@@ -1179,14 +1179,14 @@ discard block |
||
| 1179 | 1179 | * @return Array the spotter information |
| 1180 | 1180 | * |
| 1181 | 1181 | */ |
| 1182 | - public function getDateArchiveMarineDataByIdent($ident,$date) |
|
| 1182 | + public function getDateArchiveMarineDataByIdent($ident, $date) |
|
| 1183 | 1183 | { |
| 1184 | 1184 | $Marine = new Marine($this->db); |
| 1185 | 1185 | date_default_timezone_set('UTC'); |
| 1186 | 1186 | $ident = filter_var($ident, FILTER_SANITIZE_STRING); |
| 1187 | 1187 | $query = 'SELECT marine_archive.* FROM marine_archive INNER JOIN (SELECT l.fammarine_id, max(l.date) as maxdate FROM marine_archive l WHERE l.ident = :ident AND l.date <= :date GROUP BY l.fammarine_id) s on marine_archive.fammarine_id = s.fammarine_id AND marine_archive.date = s.maxdate ORDER BY marine_archive.date DESC'; |
| 1188 | - $date = date('c',$date); |
|
| 1189 | - $spotter_array = $Marine->getDataFromDB($query,array(':ident' => $ident,':date' => $date)); |
|
| 1188 | + $date = date('c', $date); |
|
| 1189 | + $spotter_array = $Marine->getDataFromDB($query, array(':ident' => $ident, ':date' => $date)); |
|
| 1190 | 1190 | return $spotter_array; |
| 1191 | 1191 | } |
| 1192 | 1192 | |
@@ -1196,7 +1196,7 @@ discard block |
||
| 1196 | 1196 | * @return Array the spotter information |
| 1197 | 1197 | * |
| 1198 | 1198 | */ |
| 1199 | - public function getMarineDataByAirport($airport = '', $limit = '', $sort = '',$filters = array()) |
|
| 1199 | + public function getMarineDataByAirport($airport = '', $limit = '', $sort = '', $filters = array()) |
|
| 1200 | 1200 | { |
| 1201 | 1201 | global $global_query; |
| 1202 | 1202 | $Marine = new Marine(); |
@@ -1204,7 +1204,7 @@ discard block |
||
| 1204 | 1204 | $query_values = array(); |
| 1205 | 1205 | $limit_query = ''; |
| 1206 | 1206 | $additional_query = ''; |
| 1207 | - $filter_query = $this->getFilter($filters,true,true); |
|
| 1207 | + $filter_query = $this->getFilter($filters, true, true); |
|
| 1208 | 1208 | |
| 1209 | 1209 | if ($airport != "") |
| 1210 | 1210 | { |
@@ -1221,8 +1221,8 @@ discard block |
||
| 1221 | 1221 | { |
| 1222 | 1222 | $limit_array = explode(",", $limit); |
| 1223 | 1223 | |
| 1224 | - $limit_array[0] = filter_var($limit_array[0],FILTER_SANITIZE_NUMBER_INT); |
|
| 1225 | - $limit_array[1] = filter_var($limit_array[1],FILTER_SANITIZE_NUMBER_INT); |
|
| 1224 | + $limit_array[0] = filter_var($limit_array[0], FILTER_SANITIZE_NUMBER_INT); |
|
| 1225 | + $limit_array[1] = filter_var($limit_array[1], FILTER_SANITIZE_NUMBER_INT); |
|
| 1226 | 1226 | |
| 1227 | 1227 | if ($limit_array[0] >= 0 && $limit_array[1] >= 0) |
| 1228 | 1228 | { |
@@ -33,12 +33,12 @@ discard block |
||
| 33 | 33 | $currentdate = date('Y-m-d'); |
| 34 | 34 | $sourcestat = $Stats->getStatsSource($currentdate); |
| 35 | 35 | if (!empty($sourcestat)) { |
| 36 | - foreach($sourcestat as $srcst) { |
|
| 36 | + foreach ($sourcestat as $srcst) { |
|
| 37 | 37 | $type = $srcst['stats_type']; |
| 38 | 38 | if ($type == 'polar' || $type == 'hist') { |
| 39 | 39 | $source = $srcst['source_name']; |
| 40 | 40 | $data = $srcst['source_data']; |
| 41 | - $this->stats[$currentdate][$source][$type] = json_decode($data,true); |
|
| 41 | + $this->stats[$currentdate][$source][$type] = json_decode($data, true); |
|
| 42 | 42 | } |
| 43 | 43 | } |
| 44 | 44 | } |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - public function get_Schedule($id,$ident) { |
|
| 53 | + public function get_Schedule($id, $ident) { |
|
| 54 | 54 | global $globalDebug, $globalFork, $globalSchedulesFetch; |
| 55 | 55 | // Get schedule here, so it's done only one time |
| 56 | 56 | |
@@ -75,8 +75,8 @@ discard block |
||
| 75 | 75 | $schedule = $Schedule->fetchSchedule($operator); |
| 76 | 76 | if (count($schedule) > 0 && isset($schedule['DepartureTime']) && isset($schedule['ArrivalTime'])) { |
| 77 | 77 | if ($globalDebug) echo "-> Schedule info for ".$operator." (".$ident.")\n"; |
| 78 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 78 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $schedule['DepartureTime'])); |
|
| 79 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $schedule['ArrivalTime'])); |
|
| 80 | 80 | // Should also check if route schedule = route from DB |
| 81 | 81 | if ($schedule['DepartureAirportIATA'] != '') { |
| 82 | 82 | if ($this->all_flights[$id]['departure_airport'] != $Spotter->getAirportIcao($schedule['DepartureAirportIATA'])) { |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | - $Schedule->addSchedule($operator,$this->all_flights[$id]['departure_airport'],$this->all_flights[$id]['departure_airport_time'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time'],$schedule['Source']); |
|
| 99 | + $Schedule->addSchedule($operator, $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time'], $schedule['Source']); |
|
| 100 | 100 | } |
| 101 | 101 | } else $scheduleexist = true; |
| 102 | 102 | } else $scheduleexist = true; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | if ($scheduleexist) { |
| 105 | 105 | if ($globalDebug) echo "-> get arrival/departure airport info for ".$ident."\n"; |
| 106 | 106 | $sch = $Schedule->getSchedule($operator); |
| 107 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport' => $sch['arrival_airport_icao'],'departure_airport' => $sch['departure_airport_icao'],'departure_airport_time' => $sch['departure_airport_time'],'arrival_airport_time' => $sch['arrival_airport_time'])); |
|
| 107 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport' => $sch['arrival_airport_icao'], 'departure_airport' => $sch['departure_airport_icao'], 'departure_airport_time' => $sch['departure_airport_time'], 'arrival_airport_time' => $sch['arrival_airport_time'])); |
|
| 108 | 108 | } |
| 109 | 109 | $Spotter->db = null; |
| 110 | 110 | $Schedule->db = null; |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | //echo $this->all_flights[$key]['id'].' - '.$this->all_flights[$key]['latitude'].' '.$this->all_flights[$key]['longitude']."\n"; |
| 132 | 132 | $Spotter = new Spotter($this->db); |
| 133 | 133 | $real_arrival = $this->arrival($key); |
| 134 | - if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 134 | + if (isset($this->all_flights[$key]['altitude'])) $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']); |
|
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | } |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | $airport_time = ''; |
| 146 | 146 | if (!isset($globalClosestMinDist) || $globalClosestMinDist == '') $globalClosestMinDist = 50; |
| 147 | 147 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 148 | - $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$globalClosestMinDist); |
|
| 148 | + $closestAirports = $Spotter->closestAirports($this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $globalClosestMinDist); |
|
| 149 | 149 | if (isset($closestAirports[0])) { |
| 150 | 150 | if (isset($this->all_flights[$key]['arrival_airport']) && $this->all_flights[$key]['arrival_airport'] == $closestAirports[0]['icao']) { |
| 151 | 151 | $airport_icao = $closestAirports[0]['icao']; |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | break; |
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | - } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude']+5000))) { |
|
| 163 | + } elseif ($this->all_flights[$key]['altitude'] == 0 || ($this->all_flights[$key]['altitude_real'] != '' && ($closestAirports[0]['altitude'] < $this->all_flights[$key]['altitude_real'] && $this->all_flights[$key]['altitude_real'] < $closestAirports[0]['altitude'] + 5000))) { |
|
| 164 | 164 | $airport_icao = $closestAirports[0]['icao']; |
| 165 | 165 | $airport_time = $this->all_flights[$key]['datetime']; |
| 166 | 166 | } else { |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | } else { |
| 174 | 174 | if ($globalDebug) echo "---- No latitude or longitude. Ident : ".$this->all_flights[$key]['ident']."\n"; |
| 175 | 175 | } |
| 176 | - return array('airport_icao' => $airport_icao,'airport_time' => $airport_time); |
|
| 176 | + return array('airport_icao' => $airport_icao, 'airport_time' => $airport_time); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 185 | 185 | foreach ($this->all_flights as $key => $flight) { |
| 186 | 186 | if (isset($flight['lastupdate'])) { |
| 187 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 187 | + if ($flight['lastupdate'] < (time() - 3000)) { |
|
| 188 | 188 | if (isset($this->all_flights[$key]['id'])) { |
| 189 | 189 | if ($globalDebug) echo "--- Delete old values with id ".$this->all_flights[$key]['id']."\n"; |
| 190 | 190 | /* |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | $real_arrival = $this->arrival($key); |
| 197 | 197 | $Spotter = new Spotter($this->db); |
| 198 | 198 | if ($this->all_flights[$key]['latitude'] != '' && $this->all_flights[$key]['longitude'] != '') { |
| 199 | - $result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'],$this->all_flights[$key]['ident'],$this->all_flights[$key]['latitude'],$this->all_flights[$key]['longitude'],$this->all_flights[$key]['altitude'],$this->all_flights[$key]['ground'],$this->all_flights[$key]['speed'],$this->all_flights[$key]['datetime'],$real_arrival['airport_icao'],$real_arrival['airport_time']); |
|
| 199 | + $result = $Spotter->updateLatestSpotterData($this->all_flights[$key]['id'], $this->all_flights[$key]['ident'], $this->all_flights[$key]['latitude'], $this->all_flights[$key]['longitude'], $this->all_flights[$key]['altitude'], $this->all_flights[$key]['ground'], $this->all_flights[$key]['speed'], $this->all_flights[$key]['datetime'], $real_arrival['airport_icao'], $real_arrival['airport_time']); |
|
| 200 | 200 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 201 | 201 | } |
| 202 | 202 | // Put in archive |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | $send = false; |
| 234 | 234 | |
| 235 | 235 | // SBS format is CSV format |
| 236 | - if(is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
| 236 | + if (is_array($line) && (isset($line['hex']) || isset($line['id']))) { |
|
| 237 | 237 | //print_r($line); |
| 238 | 238 | if (isset($line['id']) || (isset($line['hex']) && $line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6)) { |
| 239 | 239 | |
@@ -266,25 +266,25 @@ discard block |
||
| 266 | 266 | |
| 267 | 267 | if (!isset($this->all_flights[$id])) { |
| 268 | 268 | $this->all_flights[$id] = array(); |
| 269 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 270 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => '','departure_airport' => '', 'arrival_airport' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '','altitude_real' => '', 'heading' => '','departure_airport_time' => '','arrival_airport_time' => '','squawk' => '','route_stop' => '','registration' => '','pilot_id' => '','pilot_name' => '','waypoints' => '','ground' => '0', 'format_source' => '','source_name' => '','over_country' => '','verticalrate' => '','noarchive' => false,'putinarchive' => true,'source_type' => '')); |
|
| 271 | - if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('lastupdate' => time())); |
|
| 269 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 270 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => '', 'departure_airport' => '', 'arrival_airport' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'altitude_real' => '', 'heading' => '', 'departure_airport_time' => '', 'arrival_airport_time' => '', 'squawk' => '', 'route_stop' => '', 'registration' => '', 'pilot_id' => '', 'pilot_name' => '', 'waypoints' => '', 'ground' => '0', 'format_source' => '', 'source_name' => '', 'over_country' => '', 'verticalrate' => '', 'noarchive' => false, 'putinarchive' => true, 'source_type' => '')); |
|
| 271 | + if (isset($globalDaemon) && $globalDaemon === FALSE) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('lastupdate' => time())); |
|
| 272 | 272 | if (!isset($line['id'])) { |
| 273 | 273 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 274 | 274 | // if (isset($line['format_source']) && ($line['format_source'] == 'sbs' || $line['format_source'] == 'tsv' || $line['format_source'] == 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'].'-'.date('YmdGi'))); |
| 275 | 275 | // if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
| 276 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 276 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 277 | 277 | //else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 278 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 278 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 279 | 279 | if ($globalAllFlights !== FALSE) $dataFound = true; |
| 280 | 280 | } |
| 281 | 281 | if (isset($line['source_type']) && $line['source_type'] != '') { |
| 282 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_type' => $line['source_type'])); |
|
| 282 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_type' => $line['source_type'])); |
|
| 283 | 283 | } |
| 284 | 284 | |
| 285 | 285 | //print_r($this->all_flights); |
| 286 | 286 | if (isset($line['hex']) && !isset($this->all_flights[$id]['hex']) && ctype_xdigit($line['hex'])) { |
| 287 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('hex' => trim($line['hex']))); |
|
| 287 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('hex' => trim($line['hex']))); |
|
| 288 | 288 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 289 | 289 | //$this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
| 290 | 290 | //} else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
@@ -293,13 +293,13 @@ discard block |
||
| 293 | 293 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 294 | 294 | $Spotter = new Spotter($this->db); |
| 295 | 295 | if (isset($this->all_flights[$id]['source_type'])) { |
| 296 | - $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']),$this->all_flights[$id]['source_type']); |
|
| 296 | + $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex']), $this->all_flights[$id]['source_type']); |
|
| 297 | 297 | } else { |
| 298 | 298 | $aircraft_icao = $Spotter->getAllAircraftType(trim($line['hex'])); |
| 299 | 299 | } |
| 300 | 300 | $Spotter->db = null; |
| 301 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 302 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 301 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getallaircrattype : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 302 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 303 | 303 | } |
| 304 | 304 | } |
| 305 | 305 | if ($globalAllFlights !== FALSE) $dataFound = true; |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | $Spotter = new Spotter($this->db); |
| 311 | 311 | if (isset($Spotter->aircraft_correct_icaotype[$icao])) $icao = $Spotter->aircraft_correct_icaotype[$icao]; |
| 312 | 312 | $Spotter->db = null; |
| 313 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $icao)); |
|
| 313 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $icao)); |
|
| 314 | 314 | } |
| 315 | 315 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_name'])) { |
| 316 | 316 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
@@ -318,7 +318,7 @@ discard block |
||
| 318 | 318 | $Spotter = new Spotter($this->db); |
| 319 | 319 | $aircraft_icao = $Spotter->getAircraftIcao($line['aircraft_name']); |
| 320 | 320 | $Spotter->db = null; |
| 321 | - if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 321 | + if ($aircraft_icao != '') $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | if (!isset($this->all_flights[$id]['aircraft_icao']) && isset($line['aircraft_type'])) { |
@@ -326,15 +326,15 @@ discard block |
||
| 326 | 326 | elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL'; |
| 327 | 327 | elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE'; |
| 328 | 328 | elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC'; |
| 329 | - if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => $aircraft_icao)); |
|
| 329 | + if (isset($aircraft_icao)) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => $aircraft_icao)); |
|
| 330 | 330 | } |
| 331 | 331 | if (!isset($this->all_flights[$id]['aircraft_icao'])) { |
| 332 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('aircraft_icao' => 'NA')); |
|
| 332 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('aircraft_icao' => 'NA')); |
|
| 333 | 333 | } |
| 334 | 334 | //if (isset($line['datetime']) && preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) { |
| 335 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 335 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 336 | 336 | if (!isset($this->all_flights[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_flights[$id]['datetime'])) { |
| 337 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => $line['datetime'])); |
|
| 337 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => $line['datetime'])); |
|
| 338 | 338 | } else { |
| 339 | 339 | if (strtotime($line['datetime']) == strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
| 340 | 340 | elseif (strtotime($line['datetime']) > strtotime($this->all_flights[$id]['datetime']) && $globalDebug) echo "!!! Date previous latest data (".$line['datetime']." > ".$this->all_flights[$id]['datetime'].") !!! for ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."\n"; |
@@ -345,35 +345,35 @@ discard block |
||
| 345 | 345 | */ |
| 346 | 346 | return ''; |
| 347 | 347 | } |
| 348 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 348 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 349 | 349 | if ($globalDebug) echo "!!! Date is too old ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 350 | 350 | return ''; |
| 351 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 351 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 352 | 352 | if ($globalDebug) echo "!!! Date is in the future ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 353 | 353 | return ''; |
| 354 | 354 | } elseif (!isset($line['datetime'])) { |
| 355 | 355 | date_default_timezone_set('UTC'); |
| 356 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 356 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 357 | 357 | } else { |
| 358 | 358 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_flights[$id]['hex']." - format : ".$line['format_source']."!!!"; |
| 359 | 359 | return ''; |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | if (isset($line['registration']) && $line['registration'] != '' && $line['registration'] != 'z.NO-REG') { |
| 363 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('registration' => $line['registration'])); |
|
| 363 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('registration' => $line['registration'])); |
|
| 364 | 364 | } |
| 365 | 365 | if (isset($line['waypoints']) && $line['waypoints'] != '') { |
| 366 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('waypoints' => $line['waypoints'])); |
|
| 366 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('waypoints' => $line['waypoints'])); |
|
| 367 | 367 | } |
| 368 | 368 | if (isset($line['pilot_id']) && $line['pilot_id'] != '') { |
| 369 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_id' => $line['pilot_id'])); |
|
| 369 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_id' => $line['pilot_id'])); |
|
| 370 | 370 | } |
| 371 | 371 | if (isset($line['pilot_name']) && $line['pilot_name'] != '') { |
| 372 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('pilot_name' => $line['pilot_name'])); |
|
| 372 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('pilot_name' => $line['pilot_name'])); |
|
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_flights[$id]['ident'] != trim($line['ident'])) && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) { |
| 376 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ident' => trim($line['ident']))); |
|
| 376 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ident' => trim($line['ident']))); |
|
| 377 | 377 | if ($this->all_flights[$id]['addedSpotter'] == 1) { |
| 378 | 378 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 379 | 379 | $timeelapsed = microtime(true); |
@@ -384,10 +384,10 @@ discard block |
||
| 384 | 384 | elseif (isset($line['format_source']) && $line['format_source'] == 'whazzup') $fromsource = 'ivao'; |
| 385 | 385 | elseif (isset($globalVATSIM) && $globalVATSIM) $fromsource = 'vatsim'; |
| 386 | 386 | elseif (isset($globalIVAO) && $globalIVAO) $fromsource = 'ivao'; |
| 387 | - $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$fromsource); |
|
| 387 | + $result = $Spotter->updateIdentSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $fromsource); |
|
| 388 | 388 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 389 | 389 | $Spotter->db = null; |
| 390 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 390 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 391 | 391 | } |
| 392 | 392 | } |
| 393 | 393 | |
@@ -399,25 +399,25 @@ discard block |
||
| 399 | 399 | else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
| 400 | 400 | } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
| 401 | 401 | */ |
| 402 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 402 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 403 | 403 | |
| 404 | 404 | //$putinarchive = true; |
| 405 | 405 | if (isset($line['departure_airport_time']) && $line['departure_airport_time'] != 0) { |
| 406 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 406 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport_time' => $line['departure_airport_time'])); |
|
| 407 | 407 | } |
| 408 | 408 | if (isset($line['arrival_airport_time']) && $line['arrival_airport_time'] != 0) { |
| 409 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 409 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('arrival_airport_time' => $line['arrival_airport_time'])); |
|
| 410 | 410 | } |
| 411 | 411 | if (isset($line['departure_airport_icao']) && isset($line['arrival_airport_icao'])) { |
| 412 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 412 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => '')); |
|
| 413 | 413 | } elseif (isset($line['departure_airport_iata']) && isset($line['arrival_airport_iata'])) { |
| 414 | 414 | $timeelapsed = microtime(true); |
| 415 | 415 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 416 | 416 | $Spotter = new Spotter($this->db); |
| 417 | 417 | $line['departure_airport_icao'] = $Spotter->getAirportIcao($line['departure_airport_iata']); |
| 418 | 418 | $line['arrival_airport_icao'] = $Spotter->getAirportIcao($line['arrival_airport_iata']); |
| 419 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $line['departure_airport_icao'],'arrival_airport' => $line['arrival_airport_icao'],'route_stop' => '')); |
|
| 420 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 419 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $line['departure_airport_icao'], 'arrival_airport' => $line['arrival_airport_icao'], 'route_stop' => '')); |
|
| 420 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getAirportICAO : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 421 | 421 | } |
| 422 | 422 | } elseif (!isset($line['format_source']) || $line['format_source'] != 'aprs') { |
| 423 | 423 | $timeelapsed = microtime(true); |
@@ -431,34 +431,34 @@ discard block |
||
| 431 | 431 | $Translation->db = null; |
| 432 | 432 | } |
| 433 | 433 | $Spotter->db = null; |
| 434 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 434 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getrouteinfo : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 435 | 435 | } |
| 436 | 436 | if (isset($route['fromairport_icao']) && isset($route['toairport_icao'])) { |
| 437 | 437 | //if ($route['FromAirport_ICAO'] != $route['ToAirport_ICAO']) { |
| 438 | 438 | if ($route['fromairport_icao'] != $route['toairport_icao']) { |
| 439 | 439 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['FromAirport_ICAO'],'arrival_airport' => $route['ToAirport_ICAO'],'route_stop' => $route['RouteStop'])); |
| 440 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('departure_airport' => $route['fromairport_icao'],'arrival_airport' => $route['toairport_icao'],'route_stop' => $route['routestop'])); |
|
| 440 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('departure_airport' => $route['fromairport_icao'], 'arrival_airport' => $route['toairport_icao'], 'route_stop' => $route['routestop'])); |
|
| 441 | 441 | } |
| 442 | 442 | } |
| 443 | 443 | if (!isset($globalFork)) $globalFork = TRUE; |
| 444 | 444 | if (!$globalVA && !$globalIVAO && !$globalVATSIM && !$globalphpVMS && !$globalVAM && (!isset($line['format_source']) || $line['format_source'] != 'aprs')) { |
| 445 | - if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id,trim($line['ident'])); |
|
| 445 | + if (!isset($this->all_flights[$id]['schedule_check']) || $this->all_flights[$id]['schedule_check'] === false) $this->get_Schedule($id, trim($line['ident'])); |
|
| 446 | 446 | } |
| 447 | 447 | } |
| 448 | 448 | } |
| 449 | 449 | |
| 450 | 450 | if (isset($line['speed']) && $line['speed'] != '') { |
| 451 | 451 | // $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => $line[12])); |
| 452 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($line['speed']))); |
|
| 453 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed_fromsrc' => true)); |
|
| 452 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($line['speed']))); |
|
| 453 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed_fromsrc' => true)); |
|
| 454 | 454 | //$dataFound = true; |
| 455 | 455 | } else if (!isset($this->all_flights[$id]['speed_fromsrc']) && isset($this->all_flights[$id]['time_last_coord']) && $this->all_flights[$id]['time_last_coord'] != time() && isset($line['latitude']) && isset($line['longitude'])) { |
| 456 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m'); |
|
| 456 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm'); |
|
| 457 | 457 | if ($distance > 1000 && $distance < 10000) { |
| 458 | 458 | // use datetime |
| 459 | 459 | $speed = $distance/(time() - $this->all_flights[$id]['time_last_coord']); |
| 460 | 460 | $speed = $speed*3.6; |
| 461 | - if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('speed' => round($speed))); |
|
| 461 | + if ($speed < 1000) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('speed' => round($speed))); |
|
| 462 | 462 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_flights[$id]['hex']." : ".round($speed)." - distance : ".$distance."\n"; |
| 463 | 463 | } |
| 464 | 464 | } |
@@ -466,11 +466,11 @@ discard block |
||
| 466 | 466 | |
| 467 | 467 | |
| 468 | 468 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 469 | - if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time()-$this->all_flights[$id]['time_last_coord']); |
|
| 469 | + if (isset($this->all_flights[$id]['time_last_coord'])) $timediff = round(time() - $this->all_flights[$id]['time_last_coord']); |
|
| 470 | 470 | else unset($timediff); |
| 471 | - if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff,$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')))) { |
|
| 471 | + if ($this->tmd > 5 || (isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM) || (isset($globalphpVMS) && $globalphpVMS) || (isset($globalVAM) && $globalVAM) || !isset($timediff) || $timediff > 2000 || ($timediff > 30 && isset($this->all_flights[$id]['latitude']) && isset($this->all_flights[$id]['longitude']) && $Common->withinThreshold($timediff, $Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')))) { |
|
| 472 | 472 | if (isset($this->all_flights[$id]['archive_latitude']) && isset($this->all_flights[$id]['archive_longitude']) && isset($this->all_flights[$id]['livedb_latitude']) && isset($this->all_flights[$id]['livedb_longitude'])) { |
| 473 | - if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['livedb_latitude'],$this->all_flights[$id]['livedb_longitude'],$line['latitude'],$line['longitude'])) { |
|
| 473 | + if (!$Common->checkLine($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['livedb_latitude'], $this->all_flights[$id]['livedb_longitude'], $line['latitude'], $line['longitude'])) { |
|
| 474 | 474 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 475 | 475 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 476 | 476 | $this->all_flights[$id]['putinarchive'] = true; |
@@ -480,10 +480,10 @@ discard block |
||
| 480 | 480 | $timeelapsed = microtime(true); |
| 481 | 481 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 482 | 482 | $Spotter = new Spotter($this->db); |
| 483 | - $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 483 | + $all_country = $Spotter->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 484 | 484 | if (!empty($all_country)) $this->all_flights[$id]['over_country'] = $all_country['iso2']; |
| 485 | 485 | $Spotter->db = null; |
| 486 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 486 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 487 | 487 | if ($globalDebug) echo 'FOUND : '.$this->all_flights[$id]['over_country'].' ---------------'."\n"; |
| 488 | 488 | } |
| 489 | 489 | } |
@@ -493,13 +493,13 @@ discard block |
||
| 493 | 493 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 494 | 494 | //if (!isset($this->all_flights[$id]['latitude']) || $this->all_flights[$id]['latitude'] == '' || abs($this->all_flights[$id]['latitude']-$line['latitude']) < 3 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
| 495 | 495 | if (!isset($this->all_flights[$id]['archive_latitude'])) $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
| 496 | - if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude']-$line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
|
| 496 | + if (!isset($this->all_flights[$id]['livedb_latitude']) || abs($this->all_flights[$id]['livedb_latitude'] - $line['latitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
|
| 497 | 497 | $this->all_flights[$id]['livedb_latitude'] = $line['latitude']; |
| 498 | 498 | $dataFound = true; |
| 499 | 499 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 500 | 500 | } |
| 501 | 501 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 502 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('latitude' => $line['latitude'])); |
|
| 502 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('latitude' => $line['latitude'])); |
|
| 503 | 503 | /* |
| 504 | 504 | if (abs($this->all_flights[$id]['archive_latitude']-$this->all_flights[$id]['latitude']) > 0.3) { |
| 505 | 505 | $this->all_flights[$id]['archive_latitude'] = $line['latitude']; |
@@ -517,13 +517,13 @@ discard block |
||
| 517 | 517 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 518 | 518 | //if (!isset($this->all_flights[$id]['longitude']) || $this->all_flights[$id]['longitude'] == '' || abs($this->all_flights[$id]['longitude']-$line['longitude']) < 2 || $line['format_source'] != 'sbs' || time() - $this->all_flights[$id]['lastupdate'] > 30) { |
| 519 | 519 | if (!isset($this->all_flights[$id]['archive_longitude'])) $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
| 520 | - if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude']-$line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
|
| 520 | + if (!isset($this->all_flights[$id]['livedb_longitude']) || abs($this->all_flights[$id]['livedb_longitude'] - $line['longitude']) > $globalCoordMinChange || $this->all_flights[$id]['format_source'] == 'aprs') { |
|
| 521 | 521 | $this->all_flights[$id]['livedb_longitude'] = $line['longitude']; |
| 522 | 522 | $dataFound = true; |
| 523 | 523 | $this->all_flights[$id]['time_last_coord'] = time(); |
| 524 | 524 | } |
| 525 | 525 | // elseif ($globalDebug) echo '!*!*! Ignore data, too close to previous one'."\n"; |
| 526 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('longitude' => $line['longitude'])); |
|
| 526 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('longitude' => $line['longitude'])); |
|
| 527 | 527 | /* |
| 528 | 528 | if (abs($this->all_flights[$id]['archive_longitude']-$this->all_flights[$id]['longitude']) > 0.3) { |
| 529 | 529 | $this->all_flights[$id]['archive_longitude'] = $line['longitude']; |
@@ -541,46 +541,46 @@ discard block |
||
| 541 | 541 | } else if ($globalDebug && $timediff > 30) { |
| 542 | 542 | $this->tmd = $this->tmd + 1; |
| 543 | 543 | echo '!!! Too much distance in short time... for '.$this->all_flights[$id]['ident']."\n"; |
| 544 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')."m -"; |
|
| 545 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 544 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')."m -"; |
|
| 545 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 546 | 546 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_flights[$id]['latitude'].' - prev long : '.$this->all_flights[$id]['longitude']." \n"; |
| 547 | 547 | } |
| 548 | 548 | } |
| 549 | 549 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 550 | 550 | if (isset($this->all_flights[$id]['last_update']) && $this->all_flights[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 551 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('last_update' => $line['last_update'])); |
|
| 551 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('last_update' => $line['last_update'])); |
|
| 552 | 552 | } |
| 553 | 553 | if (isset($line['verticalrate']) && $line['verticalrate'] != '') { |
| 554 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('verticalrate' => $line['verticalrate'])); |
|
| 554 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('verticalrate' => $line['verticalrate'])); |
|
| 555 | 555 | //$dataFound = true; |
| 556 | 556 | } |
| 557 | 557 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 558 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('format_source' => $line['format_source'])); |
|
| 558 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('format_source' => $line['format_source'])); |
|
| 559 | 559 | } |
| 560 | 560 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 561 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('source_name' => $line['source_name'])); |
|
| 561 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('source_name' => $line['source_name'])); |
|
| 562 | 562 | } |
| 563 | 563 | if (isset($line['emergency']) && $line['emergency'] != '') { |
| 564 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('emergency' => $line['emergency'])); |
|
| 564 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('emergency' => $line['emergency'])); |
|
| 565 | 565 | //$dataFound = true; |
| 566 | 566 | } |
| 567 | 567 | if (isset($line['ground']) && $line['ground'] != '') { |
| 568 | 568 | if (isset($this->all_flights[$id]['ground']) && $this->all_flights[$id]['ground'] == 1 && $line['ground'] == 0) { |
| 569 | 569 | // Here we force archive of flight because after ground it's a new one (or should be) |
| 570 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('addedSpotter' => 0)); |
|
| 571 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 1)); |
|
| 572 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi'))); |
|
| 573 | - elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $line['id'])); |
|
| 574 | - elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 570 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('addedSpotter' => 0)); |
|
| 571 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 1)); |
|
| 572 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw') && $globalDaemon) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdGi'))); |
|
| 573 | + elseif (isset($line['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $line['id'])); |
|
| 574 | + elseif (isset($this->all_flights[$id]['ident'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.$this->all_flights[$id]['ident'])); |
|
| 575 | 575 | } |
| 576 | 576 | if ($line['ground'] != 1) $line['ground'] = 0; |
| 577 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('ground' => $line['ground'])); |
|
| 577 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('ground' => $line['ground'])); |
|
| 578 | 578 | //$dataFound = true; |
| 579 | 579 | } |
| 580 | 580 | if (isset($line['squawk']) && $line['squawk'] != '') { |
| 581 | 581 | if (isset($this->all_flights[$id]['squawk']) && $this->all_flights[$id]['squawk'] != '7500' && $this->all_flights[$id]['squawk'] != '7600' && $this->all_flights[$id]['squawk'] != '7700' && isset($this->all_flights[$id]['id'])) { |
| 582 | 582 | if ($this->all_flights[$id]['squawk'] != $line['squawk']) $this->all_flights[$id]['putinarchive'] = true; |
| 583 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 583 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 584 | 584 | $highlight = ''; |
| 585 | 585 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack at '.date('Y-m-d G:i').' UTC'; |
| 586 | 586 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure) at '.date('Y-m-d G:i').' UTC'; |
@@ -589,47 +589,47 @@ discard block |
||
| 589 | 589 | $timeelapsed = microtime(true); |
| 590 | 590 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 591 | 591 | $Spotter = new Spotter($this->db); |
| 592 | - $Spotter->setHighlightFlight($this->all_flights[$id]['id'],$highlight); |
|
| 592 | + $Spotter->setHighlightFlight($this->all_flights[$id]['id'], $highlight); |
|
| 593 | 593 | $Spotter->db = null; |
| 594 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 594 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update sethighlightflight : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 595 | 595 | } |
| 596 | 596 | //$putinarchive = true; |
| 597 | 597 | //$highlight = ''; |
| 598 | 598 | } |
| 599 | 599 | |
| 600 | - } else $this->all_flights[$id] = array_merge($this->all_flights[$id],array('squawk' => $line['squawk'])); |
|
| 600 | + } else $this->all_flights[$id] = array_merge($this->all_flights[$id], array('squawk' => $line['squawk'])); |
|
| 601 | 601 | //$dataFound = true; |
| 602 | 602 | } |
| 603 | 603 | |
| 604 | 604 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 605 | 605 | //if (!isset($this->all_flights[$id]['altitude']) || $this->all_flights[$id]['altitude'] == '' || ($this->all_flights[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 606 | - if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
| 607 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude' => round($line['altitude']/100))); |
|
| 608 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('altitude_real' => $line['altitude'])); |
|
| 606 | + if (is_int($this->all_flights[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_flights[$id]['altitude']) > 3) $this->all_flights[$id]['putinarchive'] = true; |
|
| 607 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude' => round($line['altitude']/100))); |
|
| 608 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('altitude_real' => $line['altitude'])); |
|
| 609 | 609 | //$dataFound = true; |
| 610 | 610 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 614 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('noarchive' => true)); |
|
| 614 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('noarchive' => true)); |
|
| 615 | 615 | } |
| 616 | 616 | |
| 617 | 617 | if (isset($line['heading']) && $line['heading'] != '') { |
| 618 | - if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading']-round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 619 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($line['heading']))); |
|
| 620 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading_fromsrc' => true)); |
|
| 618 | + if (is_int($this->all_flights[$id]['heading']) && abs($this->all_flights[$id]['heading'] - round($line['heading'])) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 619 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($line['heading']))); |
|
| 620 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading_fromsrc' => true)); |
|
| 621 | 621 | //$dataFound = true; |
| 622 | 622 | } elseif (!isset($this->all_flights[$id]['heading_fromsrc']) && isset($this->all_flights[$id]['archive_latitude']) && $this->all_flights[$id]['archive_latitude'] != $this->all_flights[$id]['latitude'] && isset($this->all_flights[$id]['archive_longitude']) && $this->all_flights[$id]['archive_longitude'] != $this->all_flights[$id]['longitude']) { |
| 623 | - $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'],$this->all_flights[$id]['archive_longitude'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 624 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => round($heading))); |
|
| 625 | - if (abs($this->all_flights[$id]['heading']-round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 623 | + $heading = $Common->getHeading($this->all_flights[$id]['archive_latitude'], $this->all_flights[$id]['archive_longitude'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 624 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => round($heading))); |
|
| 625 | + if (abs($this->all_flights[$id]['heading'] - round($heading)) > 10) $this->all_flights[$id]['putinarchive'] = true; |
|
| 626 | 626 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_flights[$id]['hex']." : ".$heading."\n"; |
| 627 | 627 | } elseif (isset($this->all_flights[$id]['format_source']) && $this->all_flights[$id]['format_source'] == 'ACARS') { |
| 628 | 628 | // If not enough messages and ACARS set heading to 0 |
| 629 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('heading' => 0)); |
|
| 629 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('heading' => 0)); |
|
| 630 | 630 | } |
| 631 | - if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 632 | - elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time()-$this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 631 | + if ($globalDaemon === TRUE && isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
|
| 632 | + elseif ($globalDaemon === TRUE && isset($globalSBS1update) && $globalSBS1update != '' && isset($this->all_flights[$id]['lastupdate']) && time() - $this->all_flights[$id]['lastupdate'] < $globalSBS1update) $dataFound = false; |
|
| 633 | 633 | |
| 634 | 634 | // print_r($this->all_flights[$id]); |
| 635 | 635 | //gets the callsign from the last hour |
@@ -639,7 +639,7 @@ discard block |
||
| 639 | 639 | if ($dataFound === true && isset($this->all_flights[$id]['hex'])) { |
| 640 | 640 | $this->all_flights[$id]['lastupdate'] = time(); |
| 641 | 641 | if ((!isset($globalNoImport) || $globalNoImport === FALSE) && $this->all_flights[$id]['addedSpotter'] == 0) { |
| 642 | - if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 642 | + if (!isset($globalDistanceIgnore['latitude']) || $this->all_flights[$id]['longitude'] == '' || $this->all_flights[$id]['latitude'] == '' || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 643 | 643 | //print_r($this->all_flights); |
| 644 | 644 | //echo $this->all_flights[$id]['id'].' - '.$this->all_flights[$id]['addedSpotter']."\n"; |
| 645 | 645 | //$last_hour_ident = Spotter->getIdentFromLastHour($this->all_flights[$id]['ident']); |
@@ -650,61 +650,61 @@ discard block |
||
| 650 | 650 | $SpotterLive = new SpotterLive($this->db); |
| 651 | 651 | if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'radarvirtueljson' || $line['format_source'] === 'famaprs')) { |
| 652 | 652 | $recent_ident = $SpotterLive->checkModeSRecent($this->all_flights[$id]['hex']); |
| 653 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 653 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkModeSRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 654 | 654 | } elseif (isset($line['id'])) { |
| 655 | 655 | $recent_ident = $SpotterLive->checkIdRecent($line['id']); |
| 656 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 656 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 657 | 657 | } elseif (isset($this->all_flights[$id]['ident']) && $this->all_flights[$id]['ident'] != '') { |
| 658 | 658 | $recent_ident = $SpotterLive->checkIdentRecent($this->all_flights[$id]['ident']); |
| 659 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 659 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 660 | 660 | } else $recent_ident = ''; |
| 661 | - $SpotterLive->db=null; |
|
| 661 | + $SpotterLive->db = null; |
|
| 662 | 662 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 663 | 663 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 664 | 664 | } else $recent_ident = ''; |
| 665 | 665 | } else { |
| 666 | 666 | $recent_ident = ''; |
| 667 | - $this->all_flights[$id] = array_merge($this->all_flights[$id],array('forcenew' => 0)); |
|
| 667 | + $this->all_flights[$id] = array_merge($this->all_flights[$id], array('forcenew' => 0)); |
|
| 668 | 668 | } |
| 669 | 669 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 670 | - if($recent_ident == "") |
|
| 670 | + if ($recent_ident == "") |
|
| 671 | 671 | { |
| 672 | 672 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." in archive DB : "; |
| 673 | 673 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 674 | 674 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 675 | 675 | //adds the spotter data for the archive |
| 676 | 676 | $ignoreImport = false; |
| 677 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 677 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 678 | 678 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 679 | 679 | $ignoreImport = true; |
| 680 | 680 | } |
| 681 | 681 | } |
| 682 | 682 | if (count($globalAirportAccept) > 0) { |
| 683 | 683 | $ignoreImport = true; |
| 684 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 684 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 685 | 685 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 686 | 686 | $ignoreImport = false; |
| 687 | 687 | } |
| 688 | 688 | } |
| 689 | 689 | } |
| 690 | 690 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 691 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 692 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 691 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 692 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) { |
|
| 693 | 693 | $ignoreImport = true; |
| 694 | 694 | } |
| 695 | 695 | } |
| 696 | 696 | } |
| 697 | 697 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 698 | 698 | $ignoreImport = true; |
| 699 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 700 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 699 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 700 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) { |
|
| 701 | 701 | $ignoreImport = false; |
| 702 | 702 | } |
| 703 | 703 | } |
| 704 | 704 | } |
| 705 | 705 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 706 | 706 | $ignoreImport = true; |
| 707 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 707 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 708 | 708 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 709 | 709 | $ignoreImport = false; |
| 710 | 710 | } |
@@ -716,32 +716,32 @@ discard block |
||
| 716 | 716 | if ($this->all_flights[$id]['squawk'] == '7500') $highlight = 'Squawk 7500 : Hijack'; |
| 717 | 717 | if ($this->all_flights[$id]['squawk'] == '7600') $highlight = 'Squawk 7600 : Lost Comm (radio failure)'; |
| 718 | 718 | if ($this->all_flights[$id]['squawk'] == '7700') $highlight = 'Squawk 7700 : Emergency'; |
| 719 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 719 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 720 | 720 | $timeelapsed = microtime(true); |
| 721 | 721 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 722 | 722 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 723 | 723 | $Spotter = new Spotter($this->db); |
| 724 | - $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'],$this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$highlight,$this->all_flights[$id]['hex'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'],$this->all_flights[$id]['verticalrate'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['source_type']); |
|
| 724 | + $result = $Spotter->addSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $highlight, $this->all_flights[$id]['hex'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['source_type']); |
|
| 725 | 725 | $Spotter->db = null; |
| 726 | 726 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 727 | 727 | } |
| 728 | 728 | } |
| 729 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 729 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 730 | 730 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 731 | 731 | |
| 732 | 732 | // Add source stat in DB |
| 733 | 733 | $Stats = new Stats($this->db); |
| 734 | 734 | if (!empty($this->stats)) { |
| 735 | 735 | if ($globalDebug) echo 'Add source stats : '; |
| 736 | - foreach($this->stats as $date => $data) { |
|
| 737 | - foreach($data as $source => $sourced) { |
|
| 736 | + foreach ($this->stats as $date => $data) { |
|
| 737 | + foreach ($data as $source => $sourced) { |
|
| 738 | 738 | //print_r($sourced); |
| 739 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar',$date); |
|
| 740 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist',$date); |
|
| 739 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar', $date); |
|
| 740 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist', $date); |
|
| 741 | 741 | if (isset($sourced['msg'])) { |
| 742 | 742 | if (time() - $sourced['msg']['date'] > 10) { |
| 743 | 743 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 744 | - echo $Stats->addStatSource($nbmsg,$source,'msg',$date); |
|
| 744 | + echo $Stats->addStatSource($nbmsg, $source, 'msg', $date); |
|
| 745 | 745 | unset($this->stats[$date][$source]['msg']); |
| 746 | 746 | } |
| 747 | 747 | } |
@@ -779,14 +779,14 @@ discard block |
||
| 779 | 779 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 780 | 780 | $SpotterLive = new SpotterLive($this->db); |
| 781 | 781 | $SpotterLive->deleteLiveSpotterData(); |
| 782 | - $SpotterLive->db=null; |
|
| 782 | + $SpotterLive->db = null; |
|
| 783 | 783 | } |
| 784 | 784 | } |
| 785 | 785 | if ($globalDebug) echo " Done\n"; |
| 786 | 786 | $this->last_delete = time(); |
| 787 | 787 | } |
| 788 | 788 | } else { |
| 789 | - if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt'|| $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs')) { |
|
| 789 | + if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'planeupdatefaa' || $line['format_source'] === 'aprs' || $line['format_source'] === 'aircraftlistjson' || $line['format_source'] === 'famaprs')) { |
|
| 790 | 790 | $this->all_flights[$id]['id'] = $recent_ident; |
| 791 | 791 | $this->all_flights[$id]['addedSpotter'] = 1; |
| 792 | 792 | } |
@@ -794,7 +794,7 @@ discard block |
||
| 794 | 794 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 795 | 795 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 796 | 796 | $Spotter = new Spotter($this->db); |
| 797 | - $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'],$this->all_flights[$id]['ident'],$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'],$this->all_flights[$id]['ground'],$this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'],$this->all_flights[$id]['arrival_airport'],$this->all_flights[$id]['arrival_airport_time']); |
|
| 797 | + $Spotter->updateLatestSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['arrival_airport_time']); |
|
| 798 | 798 | $Spotter->db = null; |
| 799 | 799 | } |
| 800 | 800 | } |
@@ -820,37 +820,37 @@ discard block |
||
| 820 | 820 | if ($this->all_flights[$id]['departure_airport'] == "") { $this->all_flights[$id]['departure_airport'] = "NA"; } |
| 821 | 821 | if ($this->all_flights[$id]['arrival_airport'] == "") { $this->all_flights[$id]['arrival_airport'] = "NA"; } |
| 822 | 822 | |
| 823 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 823 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 824 | 824 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 825 | 825 | $ignoreImport = true; |
| 826 | 826 | } |
| 827 | 827 | } |
| 828 | 828 | if (count($globalAirportAccept) > 0) { |
| 829 | 829 | $ignoreImport = true; |
| 830 | - foreach($globalAirportIgnore as $airportIgnore) { |
|
| 830 | + foreach ($globalAirportIgnore as $airportIgnore) { |
|
| 831 | 831 | if (($this->all_flights[$id]['departure_airport'] == $airportIgnore) || ($this->all_flights[$id]['arrival_airport'] == $airportIgnore)) { |
| 832 | 832 | $ignoreImport = false; |
| 833 | 833 | } |
| 834 | 834 | } |
| 835 | 835 | } |
| 836 | 836 | if (isset($globalAirlineIgnore) && is_array($globalAirlineIgnore)) { |
| 837 | - foreach($globalAirlineIgnore as $airlineIgnore) { |
|
| 838 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineIgnore)) { |
|
| 837 | + foreach ($globalAirlineIgnore as $airlineIgnore) { |
|
| 838 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineIgnore) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineIgnore)) { |
|
| 839 | 839 | $ignoreImport = true; |
| 840 | 840 | } |
| 841 | 841 | } |
| 842 | 842 | } |
| 843 | 843 | if (isset($globalAirlineAccept) && count($globalAirlineAccept) > 0) { |
| 844 | 844 | $ignoreImport = true; |
| 845 | - foreach($globalAirlineAccept as $airlineAccept) { |
|
| 846 | - if ((is_numeric(substr(substr($this->all_flights[$id]['ident'],0,4),-1,1)) && substr($this->all_flights[$id]['ident'],0,3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'],0,3),-1,1)) && substr($this->all_flights[$id]['ident'],0,2) == $airlineAccept)) { |
|
| 845 | + foreach ($globalAirlineAccept as $airlineAccept) { |
|
| 846 | + if ((is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 4), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 3) == $airlineAccept) || (is_numeric(substr(substr($this->all_flights[$id]['ident'], 0, 3), -1, 1)) && substr($this->all_flights[$id]['ident'], 0, 2) == $airlineAccept)) { |
|
| 847 | 847 | $ignoreImport = false; |
| 848 | 848 | } |
| 849 | 849 | } |
| 850 | 850 | } |
| 851 | 851 | if (isset($globalPilotIdAccept) && count($globalPilotIdAccept) > 0) { |
| 852 | 852 | $ignoreImport = true; |
| 853 | - foreach($globalPilotIdAccept as $pilotIdAccept) { |
|
| 853 | + foreach ($globalPilotIdAccept as $pilotIdAccept) { |
|
| 854 | 854 | if ($this->all_flights[$id]['pilot_id'] == $pilotIdAccept) { |
| 855 | 855 | $ignoreImport = false; |
| 856 | 856 | } |
@@ -858,23 +858,23 @@ discard block |
||
| 858 | 858 | } |
| 859 | 859 | |
| 860 | 860 | if (!$ignoreImport) { |
| 861 | - if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 862 | - if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id],array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 861 | + if (!isset($globalDistanceIgnore['latitude']) || (isset($globalDistanceIgnore['latitude']) && $Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude']) < $globalDistanceIgnore['distance'])) { |
|
| 862 | + if (!isset($this->all_flights[$id]['id'])) $this->all_flights[$id] = array_merge($this->all_flights[$id], array('id' => $this->all_flights[$id]['hex'].'-'.date('YmdHi'))); |
|
| 863 | 863 | $timeelapsed = microtime(true); |
| 864 | 864 | if (!isset($globalNoImport) || $globalNoImport === FALSE) { |
| 865 | 865 | if (!isset($globalNoDB) || $globalNoDB !== TRUE) { |
| 866 | 866 | if ($globalDebug) echo "\o/ Add ".$this->all_flights[$id]['ident']." from ".$this->all_flights[$id]['format_source']." in Live DB : "; |
| 867 | 867 | $SpotterLive = new SpotterLive($this->db); |
| 868 | - $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'],$this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
|
| 868 | + $result = $SpotterLive->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']); |
|
| 869 | 869 | $SpotterLive->db = null; |
| 870 | 870 | if ($globalDebug) echo $result."\n"; |
| 871 | 871 | } |
| 872 | 872 | } |
| 873 | 873 | if (isset($globalServerAPRS) && $globalServerAPRS && $this->all_flights[$id]['putinarchive']) { |
| 874 | - $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'],$this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'],$this->all_flights[$id]['route_stop'],$this->all_flights[$id]['hex'],$this->all_flights[$id]['putinarchive'],$this->all_flights[$id]['registration'],$this->all_flights[$id]['pilot_id'],$this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'],$this->all_flights[$id]['format_source'],$this->all_flights[$id]['source_name'],$this->all_flights[$id]['over_country']); |
|
| 874 | + $APRSSpotter->addLiveSpotterData($this->all_flights[$id]['id'], $this->all_flights[$id]['ident'], $this->all_flights[$id]['aircraft_icao'], $this->all_flights[$id]['departure_airport'], $this->all_flights[$id]['arrival_airport'], $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $this->all_flights[$id]['waypoints'], $this->all_flights[$id]['altitude'], $this->all_flights[$id]['altitude_real'], $this->all_flights[$id]['heading'], $this->all_flights[$id]['speed'], $this->all_flights[$id]['datetime'], $this->all_flights[$id]['departure_airport_time'], $this->all_flights[$id]['arrival_airport_time'], $this->all_flights[$id]['squawk'], $this->all_flights[$id]['route_stop'], $this->all_flights[$id]['hex'], $this->all_flights[$id]['putinarchive'], $this->all_flights[$id]['registration'], $this->all_flights[$id]['pilot_id'], $this->all_flights[$id]['pilot_name'], $this->all_flights[$id]['verticalrate'], $this->all_flights[$id]['noarchive'], $this->all_flights[$id]['ground'], $this->all_flights[$id]['format_source'], $this->all_flights[$id]['source_name'], $this->all_flights[$id]['over_country']); |
|
| 875 | 875 | } |
| 876 | 876 | $this->all_flights[$id]['putinarchive'] = false; |
| 877 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 877 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 878 | 878 | |
| 879 | 879 | // Put statistics in $this->stats variable |
| 880 | 880 | //if ($line['format_source'] != 'aprs') { |
@@ -893,19 +893,19 @@ discard block |
||
| 893 | 893 | $latitude = $globalCenterLatitude; |
| 894 | 894 | $longitude = $globalCenterLongitude; |
| 895 | 895 | } |
| 896 | - $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 896 | + $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 897 | 897 | } else { |
| 898 | 898 | $latitude = $this->source_location[$source]['latitude']; |
| 899 | 899 | $longitude = $this->source_location[$source]['longitude']; |
| 900 | 900 | } |
| 901 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 901 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 902 | 902 | //$stats_heading = $stats_heading%22.5; |
| 903 | 903 | $stats_heading = round($stats_heading/22.5); |
| 904 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude']); |
|
| 904 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude']); |
|
| 905 | 905 | $current_date = date('Y-m-d'); |
| 906 | 906 | if ($stats_heading == 16) $stats_heading = 0; |
| 907 | 907 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 908 | - for ($i=0;$i<=15;$i++) { |
|
| 908 | + for ($i = 0; $i <= 15; $i++) { |
|
| 909 | 909 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 910 | 910 | } |
| 911 | 911 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -920,9 +920,9 @@ discard block |
||
| 920 | 920 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 921 | 921 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 922 | 922 | end($this->stats[$current_date][$source]['hist']); |
| 923 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 923 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 924 | 924 | } else $mini = 0; |
| 925 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 925 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 926 | 926 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 927 | 927 | } |
| 928 | 928 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -935,7 +935,7 @@ discard block |
||
| 935 | 935 | $this->all_flights[$id]['lastupdate'] = time(); |
| 936 | 936 | if ($this->all_flights[$id]['putinarchive']) $send = true; |
| 937 | 937 | //if ($globalDebug) echo "Distance : ".Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
| 938 | - } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'],$this->all_flights[$id]['longitude'],$globalDistanceIgnore['latitude'],$globalDistanceIgnore['longitude'])."\n"; |
|
| 938 | + } elseif (isset($this->all_flights[$id]['latitude']) && isset($globalDistanceIgnore['latitude']) && $globalDebug) echo "!! Too far -> Distance : ".$Common->distance($this->all_flights[$id]['latitude'], $this->all_flights[$id]['longitude'], $globalDistanceIgnore['latitude'], $globalDistanceIgnore['longitude'])."\n"; |
|
| 939 | 939 | //$this->del(); |
| 940 | 940 | |
| 941 | 941 | if ($this->last_delete_hourly == 0 || time() - $this->last_delete_hourly > 900) { |
