Ysurac /
FlightAirMap
@@ -40,11 +40,11 @@ discard block |
||
| 40 | 40 | die; |
| 41 | 41 | } |
| 42 | 42 | //$hosts = array($globalSBS1Host.':'.$globalSBS1Port); |
| 43 | - $globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port); |
|
| 43 | + $globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port); |
|
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | -$options = getopt('s::',array('source::','server','idsource::')); |
|
| 47 | +$options = getopt('s::', array('source::', 'server', 'idsource::')); |
|
| 48 | 48 | //if (isset($options['s'])) $hosts = array($options['s']); |
| 49 | 49 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 50 | 50 | if (isset($options['s'])) { |
@@ -59,17 +59,17 @@ discard block |
||
| 59 | 59 | else $id_source = 1; |
| 60 | 60 | if (isset($globalServer) && $globalServer) { |
| 61 | 61 | if ($globalDebug) echo "Using Server Mode\n"; |
| 62 | - $SI=new SpotterServer(); |
|
| 63 | -} else $SI=new SpotterImport($Connection->db); |
|
| 62 | + $SI = new SpotterServer(); |
|
| 63 | +} else $SI = new SpotterImport($Connection->db); |
|
| 64 | 64 | //$APRS=new APRS($Connection->db); |
| 65 | -$SBS=new SBS(); |
|
| 66 | -$ACARS=new ACARS($Connection->db); |
|
| 67 | -$Common=new Common(); |
|
| 65 | +$SBS = new SBS(); |
|
| 66 | +$ACARS = new ACARS($Connection->db); |
|
| 67 | +$Common = new Common(); |
|
| 68 | 68 | date_default_timezone_set('UTC'); |
| 69 | 69 | //$servertz = system('date +%Z'); |
| 70 | 70 | // signal handler - playing nice with sockets and dump1090 |
| 71 | 71 | if (function_exists('pcntl_fork')) { |
| 72 | - pcntl_signal(SIGINT, function() { |
|
| 72 | + pcntl_signal(SIGINT, function() { |
|
| 73 | 73 | global $sockets; |
| 74 | 74 | echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
| 75 | 75 | die("Bye!\n"); |
@@ -112,34 +112,34 @@ discard block |
||
| 112 | 112 | |
| 113 | 113 | function connect_all($hosts) { |
| 114 | 114 | //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
| 115 | - global $sockets, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
|
| 115 | + global $sockets, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs; |
|
| 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; |
@@ -186,15 +186,15 @@ discard block |
||
| 186 | 186 | exit(0); |
| 187 | 187 | } |
| 188 | 188 | //} else if (preg_match('/10001/',$host)) { |
| 189 | - } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 189 | + } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 190 | 190 | //$formats[$id] = 'tsv'; |
| 191 | 191 | $globalSources[$id]['format'] = 'tsv'; |
| 192 | 192 | if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
| 193 | 193 | } |
| 194 | - } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 194 | + } elseif (filter_var($host, FILTER_VALIDATE_URL)) { |
|
| 195 | 195 | if ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
| 196 | - } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 197 | - $hostport = explode(':',$host); |
|
| 196 | + } elseif (!filter_var($host, FILTER_VALIDATE_URL)) { |
|
| 197 | + $hostport = explode(':', $host); |
|
| 198 | 198 | if (isset($hostport[1])) { |
| 199 | 199 | $port = $hostport[1]; |
| 200 | 200 | $hostn = $hostport[0]; |
@@ -203,14 +203,14 @@ discard block |
||
| 203 | 203 | $hostn = $globalSources[$id]['host']; |
| 204 | 204 | } |
| 205 | 205 | if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
| 206 | - $s = create_socket($hostn,$port, $errno, $errstr); |
|
| 206 | + $s = create_socket($hostn, $port, $errno, $errstr); |
|
| 207 | 207 | } else { |
| 208 | - $s = create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 208 | + $s = create_socket_udp($hostn, $port, $errno, $errstr); |
|
| 209 | 209 | } |
| 210 | 210 | if ($s) { |
| 211 | 211 | $sockets[$id] = $s; |
| 212 | 212 | if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
| 213 | - if (preg_match('/aprs/',$hostn)) { |
|
| 213 | + if (preg_match('/aprs/', $hostn)) { |
|
| 214 | 214 | //$formats[$id] = 'aprs'; |
| 215 | 215 | $globalSources[$id]['format'] = 'aprs'; |
| 216 | 216 | //$aprs_connect = 0; |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut; |
| 252 | 252 | else $timeout = 20; |
| 253 | 253 | $errno = ''; |
| 254 | -$errstr=''; |
|
| 254 | +$errstr = ''; |
|
| 255 | 255 | |
| 256 | 256 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 257 | 257 | /* Initiate connections to all the hosts simultaneously */ |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | |
| 281 | 281 | if ($use_aprs) { |
| 282 | 282 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 283 | - $APRS=new APRS(); |
|
| 283 | + $APRS = new APRS(); |
|
| 284 | 284 | $aprs_connect = 0; |
| 285 | 285 | $aprs_keep = 120; |
| 286 | 286 | $aprs_last_tx = time(); |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | else $aprs_ssid = 'FAM'; |
| 292 | 292 | //else $aprs_ssid = 'PerlEx'; |
| 293 | 293 | if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter; |
| 294 | - else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 294 | + else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 295 | 295 | if ($aprs_full) $aprs_filter = ''; |
| 296 | 296 | if ($aprs_filter != '') $aprs_login = "user {$aprs_ssid} appid {$aprs_version} filter {$aprs_filter}\n"; |
| 297 | 297 | else $aprs_login = "user {$aprs_ssid} appid {$aprs_version}\n"; |
@@ -302,12 +302,12 @@ discard block |
||
| 302 | 302 | sleep(1); |
| 303 | 303 | if ($globalDebug) echo "SCAN MODE \n\n"; |
| 304 | 304 | if (!isset($globalCronEnd)) $globalCronEnd = 60; |
| 305 | -$endtime = time()+$globalCronEnd; |
|
| 305 | +$endtime = time() + $globalCronEnd; |
|
| 306 | 306 | $i = 1; |
| 307 | 307 | $tt = array(); |
| 308 | 308 | // Delete all ATC |
| 309 | 309 | if ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) { |
| 310 | - $ATC=new ATC($Connection->db); |
|
| 310 | + $ATC = new ATC($Connection->db); |
|
| 311 | 311 | } |
| 312 | 312 | if (!$globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 313 | 313 | $ATC->deleteAll(); |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | |
| 316 | 316 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 317 | 317 | while ($i > 0) { |
| 318 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 318 | + if (!$globalDaemon) $i = $endtime - time(); |
|
| 319 | 319 | // Delete old ATC |
| 320 | 320 | if ($globalDaemon && ((isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 321 | 321 | if ($globalDebug) echo 'Delete old ATC...'."\n"; |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | } |
| 330 | 330 | if ($max != $globalMinFetch) { |
| 331 | 331 | if ($globalDebug) echo 'Sleeping...'."\n"; |
| 332 | - sleep($globalMinFetch-$max+2); |
|
| 332 | + sleep($globalMinFetch - $max + 2); |
|
| 333 | 333 | } |
| 334 | 334 | } |
| 335 | 335 | |
@@ -340,8 +340,8 @@ discard block |
||
| 340 | 340 | if ($value['format'] == 'deltadbtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 341 | 341 | //$buffer = $Common->getData($hosts[$id]); |
| 342 | 342 | $buffer = $Common->getData($value['host']); |
| 343 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 344 | - $buffer = explode('\n',$buffer); |
|
| 343 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 344 | + $buffer = explode('\n', $buffer); |
|
| 345 | 345 | foreach ($buffer as $line) { |
| 346 | 346 | if ($line != '' && count($line) > 7) { |
| 347 | 347 | $line = explode(',', $line); |
@@ -370,8 +370,8 @@ discard block |
||
| 370 | 370 | } elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $value[' last_exec'] > $globalMinFetch))) { |
| 371 | 371 | //$buffer = $Common->getData($hosts[$id]); |
| 372 | 372 | $buffer = $Common->getData($value['host']); |
| 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 != '') { |
| 377 | 377 | $line = explode(':', $line); |
@@ -380,7 +380,7 @@ discard block |
||
| 380 | 380 | $data['id'] = $line[1].'-'.$line[0]; |
| 381 | 381 | $data['pilot_id'] = $line[1]; |
| 382 | 382 | $data['pilot_name'] = $line[2]; |
| 383 | - $data['hex'] = str_pad(dechex($line[1]),6,'000000',STR_PAD_LEFT); |
|
| 383 | + $data['hex'] = str_pad(dechex($line[1]), 6, '000000', STR_PAD_LEFT); |
|
| 384 | 384 | $data['ident'] = $line[0]; // ident |
| 385 | 385 | if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude |
| 386 | 386 | $data['speed'] = $line[8]; // speed |
@@ -396,7 +396,7 @@ discard block |
||
| 396 | 396 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37])); |
| 397 | 397 | if (isset($line[37])) $data['last_update'] = $line[37]; |
| 398 | 398 | $data['departure_airport_icao'] = $line[11]; |
| 399 | - $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 399 | + $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':'); |
|
| 400 | 400 | $data['arrival_airport_icao'] = $line[13]; |
| 401 | 401 | $data['frequency'] = $line[4]; |
| 402 | 402 | $data['type'] = $line[18]; |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | $data['id_source'] = $id_source; |
| 406 | 406 | //$data['arrival_airport_time'] = ; |
| 407 | 407 | if ($line[9] != '') { |
| 408 | - $aircraft_data = explode('/',$line[9]); |
|
| 408 | + $aircraft_data = explode('/', $line[9]); |
|
| 409 | 409 | if (isset($aircraft_data[1])) { |
| 410 | 410 | $data['aircraft_icao'] = $aircraft_data[1]; |
| 411 | 411 | } |
@@ -419,9 +419,9 @@ discard block |
||
| 419 | 419 | if ($line[3] == 'PILOT') $SI->add($data); |
| 420 | 420 | elseif ($line[3] == 'ATC') { |
| 421 | 421 | //print_r($data); |
| 422 | - $data['info'] = str_replace('^§','<br />',$data['info']); |
|
| 423 | - $data['info'] = str_replace('&sect;','',$data['info']); |
|
| 424 | - $typec = substr($data['ident'],-3); |
|
| 422 | + $data['info'] = str_replace('^§', '<br />', $data['info']); |
|
| 423 | + $data['info'] = str_replace('&sect;', '', $data['info']); |
|
| 424 | + $typec = substr($data['ident'], -3); |
|
| 425 | 425 | if ($typec == 'APP') $data['type'] = 'Approach'; |
| 426 | 426 | elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
| 427 | 427 | elseif ($typec == 'OBS') $data['type'] = 'Observer'; |
@@ -432,7 +432,7 @@ discard block |
||
| 432 | 432 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 433 | 433 | elseif ($data['type'] == '') $data['type'] = 'Observer'; |
| 434 | 434 | if (!isset($data['source_name'])) $data['source_name'] = ''; |
| 435 | - 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']); |
|
| 435 | + 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']); |
|
| 436 | 436 | } |
| 437 | 437 | unset($data); |
| 438 | 438 | } |
@@ -443,9 +443,9 @@ discard block |
||
| 443 | 443 | $last_exec[$id]['last'] = time(); |
| 444 | 444 | //} elseif ($value == 'aircraftlistjson' && (time() - $last_exec['aircraftlistjson'] > $globalMinFetch)) { |
| 445 | 445 | } elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 446 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 446 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20'); |
|
| 447 | 447 | if ($buffer != '') { |
| 448 | - $all_data = json_decode($buffer,true); |
|
| 448 | + $all_data = json_decode($buffer, true); |
|
| 449 | 449 | if (isset($all_data['acList'])) { |
| 450 | 450 | foreach ($all_data['acList'] as $line) { |
| 451 | 451 | $data = array(); |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
| 500 | 500 | } elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 501 | 501 | $buffer = $Common->getData($value['host']); |
| 502 | - $all_data = json_decode($buffer,true); |
|
| 502 | + $all_data = json_decode($buffer, true); |
|
| 503 | 503 | if (isset($all_data['planes'])) { |
| 504 | 504 | foreach ($all_data['planes'] as $key => $line) { |
| 505 | 505 | $data = array(); |
@@ -515,12 +515,12 @@ discard block |
||
| 515 | 515 | $data['emergency'] = ''; // emergency |
| 516 | 516 | $data['registration'] = $line[2]; |
| 517 | 517 | $data['aircraft_icao'] = $line[0]; |
| 518 | - $deparr = explode('-',$line[1]); |
|
| 518 | + $deparr = explode('-', $line[1]); |
|
| 519 | 519 | if (count($deparr) == 2) { |
| 520 | 520 | $data['departure_airport_icao'] = $deparr[0]; |
| 521 | 521 | $data['arrival_airport_icao'] = $deparr[1]; |
| 522 | 522 | } |
| 523 | - $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 523 | + $data['datetime'] = date('Y-m-d H:i:s', $line[9]); |
|
| 524 | 524 | $data['format_source'] = 'planeupdatefaa'; |
| 525 | 525 | $data['id_source'] = $id_source; |
| 526 | 526 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
@@ -532,7 +532,7 @@ discard block |
||
| 532 | 532 | $last_exec[$id]['last'] = time(); |
| 533 | 533 | } elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 534 | 534 | $buffer = $Common->getData($value['host']); |
| 535 | - $all_data = json_decode($buffer,true); |
|
| 535 | + $all_data = json_decode($buffer, true); |
|
| 536 | 536 | if (isset($all_data['states'])) { |
| 537 | 537 | foreach ($all_data['states'] as $key => $line) { |
| 538 | 538 | $data = array(); |
@@ -548,7 +548,7 @@ discard block |
||
| 548 | 548 | //$data['emergency'] = ''; // emergency |
| 549 | 549 | //$data['registration'] = $line[2]; |
| 550 | 550 | //$data['aircraft_icao'] = $line[0]; |
| 551 | - $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 551 | + $data['datetime'] = date('Y-m-d H:i:s', $line[3]); |
|
| 552 | 552 | $data['format_source'] = 'opensky'; |
| 553 | 553 | $data['id_source'] = $id_source; |
| 554 | 554 | $SI->add($data); |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | } elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 562 | 562 | //$buffer = $Common->getData($hosts[$id]); |
| 563 | 563 | $buffer = $Common->getData($value['host']); |
| 564 | - $all_data = json_decode($buffer,true); |
|
| 564 | + $all_data = json_decode($buffer, true); |
|
| 565 | 565 | foreach ($all_data as $key => $line) { |
| 566 | 566 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
| 567 | 567 | $data = array(); |
@@ -592,11 +592,11 @@ discard block |
||
| 592 | 592 | //} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { |
| 593 | 593 | } elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 594 | 594 | //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
| 595 | - $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 595 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150'); |
|
| 596 | 596 | //echo $buffer; |
| 597 | - $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 598 | - $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 599 | - $all_data = json_decode($buffer,true); |
|
| 597 | + $buffer = str_replace(array("\n", "\r"), "", $buffer); |
|
| 598 | + $buffer = preg_replace('/,"num":(.+)/', '}', $buffer); |
|
| 599 | + $all_data = json_decode($buffer, true); |
|
| 600 | 600 | if (json_last_error() != JSON_ERROR_NONE) { |
| 601 | 601 | die(json_last_error_msg()); |
| 602 | 602 | } |
@@ -618,7 +618,7 @@ discard block |
||
| 618 | 618 | //$data['departure_airport_iata'] = $line[11]; |
| 619 | 619 | //$data['arrival_airport_iata'] = $line[12]; |
| 620 | 620 | //$data['emergency'] = ''; // emergency |
| 621 | - $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
|
| 621 | + $data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10] |
|
| 622 | 622 | $data['format_source'] = 'radarvirtueljson'; |
| 623 | 623 | $data['id_source'] = $id_source; |
| 624 | 624 | if (isset($value['name']) && $value['name'] != '') $data['source_name'] = $value['name']; |
@@ -633,13 +633,13 @@ discard block |
||
| 633 | 633 | } elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 634 | 634 | //$buffer = $Common->getData($hosts[$id]); |
| 635 | 635 | $buffer = $Common->getData($value['host'].'?'.time()); |
| 636 | - $all_data = json_decode(utf8_encode($buffer),true); |
|
| 636 | + $all_data = json_decode(utf8_encode($buffer), true); |
|
| 637 | 637 | |
| 638 | 638 | if (isset($all_data['pireps'])) { |
| 639 | 639 | foreach ($all_data['pireps'] as $line) { |
| 640 | 640 | $data = array(); |
| 641 | 641 | $data['id'] = $line['id']; |
| 642 | - $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 642 | + $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6); |
|
| 643 | 643 | $data['ident'] = $line['callsign']; // ident |
| 644 | 644 | if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
| 645 | 645 | if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
@@ -668,9 +668,9 @@ discard block |
||
| 668 | 668 | $SI->add($data); |
| 669 | 669 | // print_r($data); |
| 670 | 670 | } elseif ($line['icon'] == 'ct') { |
| 671 | - $data['info'] = str_replace('^§','<br />',$data['info']); |
|
| 672 | - $data['info'] = str_replace('&sect;','',$data['info']); |
|
| 673 | - $typec = substr($data['ident'],-3); |
|
| 671 | + $data['info'] = str_replace('^§', '<br />', $data['info']); |
|
| 672 | + $data['info'] = str_replace('&sect;', '', $data['info']); |
|
| 673 | + $typec = substr($data['ident'], -3); |
|
| 674 | 674 | $data['type'] = ''; |
| 675 | 675 | if ($typec == 'APP') $data['type'] = 'Approach'; |
| 676 | 676 | elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
@@ -681,7 +681,7 @@ discard block |
||
| 681 | 681 | elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station'; |
| 682 | 682 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 683 | 683 | else $data['type'] = 'Observer'; |
| 684 | - 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']); |
|
| 684 | + 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']); |
|
| 685 | 685 | } |
| 686 | 686 | unset($data); |
| 687 | 687 | } |
@@ -693,13 +693,13 @@ discard block |
||
| 693 | 693 | //$buffer = $Common->getData($hosts[$id]); |
| 694 | 694 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 695 | 695 | $buffer = $Common->getData($value['host']); |
| 696 | - $all_data = json_decode($buffer,true); |
|
| 696 | + $all_data = json_decode($buffer, true); |
|
| 697 | 697 | if ($buffer != '' && is_array($all_data)) { |
| 698 | 698 | foreach ($all_data as $line) { |
| 699 | 699 | $data = array(); |
| 700 | 700 | //$data['id'] = $line['id']; // id not usable |
| 701 | 701 | if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
| 702 | - $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 702 | + $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex |
|
| 703 | 703 | if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
| 704 | 704 | if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
| 705 | 705 | $data['ident'] = $line['flightnum']; // ident |
@@ -722,12 +722,12 @@ discard block |
||
| 722 | 722 | if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
| 723 | 723 | if (isset($line['aircraftname'])) { |
| 724 | 724 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 725 | - $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
|
| 726 | - $aircraft_data = explode('-',$line['aircraftname']); |
|
| 725 | + $line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']); |
|
| 726 | + $aircraft_data = explode('-', $line['aircraftname']); |
|
| 727 | 727 | if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) < 5) $data['aircraft_icao'] = $aircraft_data[0]; |
| 728 | 728 | elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) < 5) $data['aircraft_icao'] = $aircraft_data[1]; |
| 729 | 729 | else { |
| 730 | - $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 730 | + $aircraft_data = explode(' ', $line['aircraftname']); |
|
| 731 | 731 | if (isset($aircraft_data[1])) $data['aircraft_icao'] = $aircraft_data[1]; |
| 732 | 732 | else $data['aircraft_icao'] = $line['aircraftname']; |
| 733 | 733 | } |
@@ -749,13 +749,13 @@ discard block |
||
| 749 | 749 | //$buffer = $Common->getData($hosts[$id]); |
| 750 | 750 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 751 | 751 | $buffer = $Common->getData($value['host']); |
| 752 | - $all_data = json_decode($buffer,true); |
|
| 752 | + $all_data = json_decode($buffer, true); |
|
| 753 | 753 | if ($buffer != '' && is_array($all_data)) { |
| 754 | 754 | foreach ($all_data as $line) { |
| 755 | 755 | $data = array(); |
| 756 | 756 | //$data['id'] = $line['id']; // id not usable |
| 757 | 757 | $data['id'] = trim($line['flight_id']); |
| 758 | - $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 758 | + $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex |
|
| 759 | 759 | $data['pilot_name'] = $line['pilot_name']; |
| 760 | 760 | $data['pilot_id'] = $line['pilot_id']; |
| 761 | 761 | $data['ident'] = trim($line['callsign']); // ident |
@@ -805,9 +805,9 @@ discard block |
||
| 805 | 805 | //$value = $formats[$nb]; |
| 806 | 806 | $format = $globalSources[$nb]['format']; |
| 807 | 807 | if ($format == 'sbs' || $format == 'aprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
| 808 | - $buffer = socket_read($r, 6000,PHP_NORMAL_READ); |
|
| 808 | + $buffer = socket_read($r, 6000, PHP_NORMAL_READ); |
|
| 809 | 809 | } else { |
| 810 | - $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port); |
|
| 810 | + $az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port); |
|
| 811 | 811 | } |
| 812 | 812 | //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
| 813 | 813 | //echo $buffer."\n"; |
@@ -815,7 +815,7 @@ discard block |
||
| 815 | 815 | //if (function_exists('pcntl_fork')) pcntl_signal_dispatch(); |
| 816 | 816 | $error = false; |
| 817 | 817 | //$SI::del(); |
| 818 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 818 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer)); |
|
| 819 | 819 | // SBS format is CSV format |
| 820 | 820 | if ($buffer != '') { |
| 821 | 821 | $tt[$format] = 0; |
@@ -836,10 +836,10 @@ discard block |
||
| 836 | 836 | } elseif ($format == 'flightgearsp') { |
| 837 | 837 | //echo $buffer."\n"; |
| 838 | 838 | if (strlen($buffer) > 5) { |
| 839 | - $line = explode(',',$buffer); |
|
| 839 | + $line = explode(',', $buffer); |
|
| 840 | 840 | $data = array(); |
| 841 | 841 | //XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p |
| 842 | - $data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6); |
|
| 842 | + $data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6); |
|
| 843 | 843 | $data['ident'] = $line[6]; |
| 844 | 844 | $data['aircraft_name'] = $line[7]; |
| 845 | 845 | $data['longitude'] = $line[1]; |
@@ -850,21 +850,21 @@ discard block |
||
| 850 | 850 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 851 | 851 | $data['format_source'] = 'flightgearsp'; |
| 852 | 852 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 853 | - $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
|
| 853 | + $send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0); |
|
| 854 | 854 | } |
| 855 | 855 | } elseif ($format == 'acars') { |
| 856 | 856 | if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
| 857 | 857 | $ACARS->add(trim($buffer)); |
| 858 | - socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 858 | + socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port); |
|
| 859 | 859 | $ACARS->deleteLiveAcarsData(); |
| 860 | 860 | } elseif ($format == 'flightgearmp') { |
| 861 | - if (substr($buffer,0,1) != '#') { |
|
| 861 | + if (substr($buffer, 0, 1) != '#') { |
|
| 862 | 862 | $data = array(); |
| 863 | 863 | //echo $buffer."\n"; |
| 864 | - $line = explode(' ',$buffer); |
|
| 864 | + $line = explode(' ', $buffer); |
|
| 865 | 865 | if (count($line) == 11) { |
| 866 | - $userserver = explode('@',$line[0]); |
|
| 867 | - $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 866 | + $userserver = explode('@', $line[0]); |
|
| 867 | + $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex |
|
| 868 | 868 | $data['ident'] = $userserver[0]; |
| 869 | 869 | $data['registration'] = $userserver[0]; |
| 870 | 870 | $data['latitude'] = $line[4]; |
@@ -872,24 +872,24 @@ discard block |
||
| 872 | 872 | $data['altitude'] = $line[6]; |
| 873 | 873 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 874 | 874 | $aircraft_type = $line[10]; |
| 875 | - $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 876 | - $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 875 | + $aircraft_type = preg_split(':/:', $aircraft_type); |
|
| 876 | + $data['aircraft_name'] = substr(end($aircraft_type), 0, -4); |
|
| 877 | 877 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 878 | 878 | } |
| 879 | 879 | } |
| 880 | 880 | } elseif ($format == 'beast') { |
| 881 | 881 | echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
| 882 | 882 | die; |
| 883 | - } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
|
| 883 | + } elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') { |
|
| 884 | 884 | $line = explode("\t", $buffer); |
| 885 | - for($k = 0; $k < count($line); $k=$k+2) { |
|
| 885 | + for ($k = 0; $k < count($line); $k = $k + 2) { |
|
| 886 | 886 | $key = $line[$k]; |
| 887 | - $lined[$key] = $line[$k+1]; |
|
| 887 | + $lined[$key] = $line[$k + 1]; |
|
| 888 | 888 | } |
| 889 | 889 | if (count($lined) > 3) { |
| 890 | 890 | $data['hex'] = $lined['hexid']; |
| 891 | 891 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
| 892 | - $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 892 | + $data['datetime'] = date('Y-m-d H:i:s'); ; |
|
| 893 | 893 | if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
| 894 | 894 | if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
| 895 | 895 | if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
@@ -907,24 +907,24 @@ discard block |
||
| 907 | 907 | } else $error = true; |
| 908 | 908 | } elseif ($format == 'aprs' && $use_aprs) { |
| 909 | 909 | if ($aprs_connect == 0) { |
| 910 | - $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
|
| 910 | + $send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0); |
|
| 911 | 911 | $aprs_connect = 1; |
| 912 | 912 | } |
| 913 | - if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 913 | + if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) { |
|
| 914 | 914 | $aprs_last_tx = time(); |
| 915 | 915 | $data_aprs = "# Keep alive"; |
| 916 | - $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
|
| 916 | + $send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0); |
|
| 917 | 917 | } |
| 918 | 918 | //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
| 919 | - $buffer = str_replace('APRS <- ','',$buffer); |
|
| 920 | - $buffer = str_replace('APRS -> ','',$buffer); |
|
| 921 | - if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 919 | + $buffer = str_replace('APRS <- ', '', $buffer); |
|
| 920 | + $buffer = str_replace('APRS -> ', '', $buffer); |
|
| 921 | + if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') { |
|
| 922 | 922 | $line = $APRS->parse($buffer); |
| 923 | 923 | if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) { |
| 924 | 924 | $data = array(); |
| 925 | 925 | //print_r($line); |
| 926 | 926 | $data['hex'] = $line['address']; |
| 927 | - $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 927 | + $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']); |
|
| 928 | 928 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 929 | 929 | $data['ident'] = $line['ident']; |
| 930 | 930 | $data['latitude'] = $line['latitude']; |
@@ -944,7 +944,7 @@ discard block |
||
| 944 | 944 | $currentdate = date('Y-m-d H:i:s'); |
| 945 | 945 | $aprsdate = strtotime($data['datetime']); |
| 946 | 946 | // Accept data if time <= system time + 20s |
| 947 | - if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate)+20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) $send = $SI->add($data); |
|
| 947 | + if ($line['stealth'] == 0 && (strtotime($data['datetime']) <= strtotime($currentdate) + 20) && (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude'])))) $send = $SI->add($data); |
|
| 948 | 948 | else { |
| 949 | 949 | if ($line['stealth'] != 0) echo '-------- '.$data['ident'].' : APRS stealth ON => not adding'."\n"; |
| 950 | 950 | else echo '--------- '.$data['ident'].' : Date APRS : '.$data['datetime'].' - Current date : '.$currentdate.' => not adding future event'."\n"; |
@@ -1029,7 +1029,7 @@ discard block |
||
| 1029 | 1029 | connect_all($sourceee); |
| 1030 | 1030 | $sourceee = array(); |
| 1031 | 1031 | //connect_all($globalSources); |
| 1032 | - $tt[$format]=0; |
|
| 1032 | + $tt[$format] = 0; |
|
| 1033 | 1033 | break; |
| 1034 | 1034 | } |
| 1035 | 1035 | } |
@@ -1037,7 +1037,7 @@ discard block |
||
| 1037 | 1037 | } |
| 1038 | 1038 | } else { |
| 1039 | 1039 | $error = socket_strerror(socket_last_error()); |
| 1040 | - if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
|
| 1040 | + if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n"; |
|
| 1041 | 1041 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || time() - $time >= $timeout) { |
| 1042 | 1042 | if (isset($globalDebug)) echo "Restarting...\n"; |
| 1043 | 1043 | // Restart the script if possible |
@@ -1045,7 +1045,7 @@ discard block |
||
| 1045 | 1045 | if ($globalDebug) echo "Shutdown all sockets..."; |
| 1046 | 1046 | |
| 1047 | 1047 | foreach ($sockets as $sock) { |
| 1048 | - @socket_shutdown($sock,2); |
|
| 1048 | + @socket_shutdown($sock, 2); |
|
| 1049 | 1049 | @socket_close($sock); |
| 1050 | 1050 | } |
| 1051 | 1051 | |
@@ -15,25 +15,25 @@ discard block |
||
| 15 | 15 | try { |
| 16 | 16 | $sth = $this->db->prepare($query); |
| 17 | 17 | $sth->execute($query_values); |
| 18 | - } catch(PDOException $e) { |
|
| 18 | + } catch (PDOException $e) { |
|
| 19 | 19 | return "error : ".$e->getMessage(); |
| 20 | 20 | } |
| 21 | 21 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
| 22 | 22 | return $all; |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '',$format_source = '',$source_name = '') { |
|
| 26 | - $info = preg_replace('/[^(\x20-\x7F)]*/','',$info); |
|
| 27 | - $info = str_replace('^','<br />',$info); |
|
| 28 | - $info = str_replace('&sect;','',$info); |
|
| 29 | - $info = str_replace('"','',$info); |
|
| 25 | + public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '', $format_source = '', $source_name = '') { |
|
| 26 | + $info = preg_replace('/[^(\x20-\x7F)]*/', '', $info); |
|
| 27 | + $info = str_replace('^', '<br />', $info); |
|
| 28 | + $info = str_replace('&sect;', '', $info); |
|
| 29 | + $info = str_replace('"', '', $info); |
|
| 30 | 30 | if ($type == '') $type = NULL; |
| 31 | 31 | $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name,format_source,source_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name,:format_source,:source_name)"; |
| 32 | - $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type,':format_source' => $format_source,':source_name' => $source_name); |
|
| 32 | + $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type, ':format_source' => $format_source, ':source_name' => $source_name); |
|
| 33 | 33 | try { |
| 34 | 34 | $sth = $this->db->prepare($query); |
| 35 | 35 | $sth->execute($query_values); |
| 36 | - } catch(PDOException $e) { |
|
| 36 | + } catch (PDOException $e) { |
|
| 37 | 37 | return "error : ".$e->getMessage(); |
| 38 | 38 | } |
| 39 | 39 | } |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | try { |
| 45 | 45 | $sth = $this->db->prepare($query); |
| 46 | 46 | $sth->execute($query_values); |
| 47 | - } catch(PDOException $e) { |
|
| 47 | + } catch (PDOException $e) { |
|
| 48 | 48 | return "error : ".$e->getMessage(); |
| 49 | 49 | } |
| 50 | 50 | } |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | try { |
| 56 | 56 | $sth = $this->db->prepare($query); |
| 57 | 57 | $sth->execute($query_values); |
| 58 | - } catch(PDOException $e) { |
|
| 58 | + } catch (PDOException $e) { |
|
| 59 | 59 | return "error : ".$e->getMessage(); |
| 60 | 60 | } |
| 61 | 61 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | try { |
| 71 | 71 | $sth = $this->db->prepare($query); |
| 72 | 72 | $sth->execute(); |
| 73 | - } catch(PDOException $e) { |
|
| 73 | + } catch (PDOException $e) { |
|
| 74 | 74 | return "error"; |
| 75 | 75 | } |
| 76 | 76 | return "success"; |
@@ -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; |
@@ -1144,7 +1144,7 @@ discard block |
||
| 1144 | 1144 | try { |
| 1145 | 1145 | $sth = $Connection->db->prepare($query); |
| 1146 | 1146 | $sth->execute(); |
| 1147 | - } catch(PDOException $e) { |
|
| 1147 | + } catch (PDOException $e) { |
|
| 1148 | 1148 | return "error : ".$e->getMessage()."\n"; |
| 1149 | 1149 | } |
| 1150 | 1150 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
