Ysurac /
FlightAirMap
@@ -14,12 +14,12 @@ discard block |
||
| 14 | 14 | * @param Array $headers header to submit with the form |
| 15 | 15 | * @return String the result |
| 16 | 16 | */ |
| 17 | - public function getData($url, $type = 'get', $data = '', $headers = '',$cookie = '',$referer = '',$timeout = '',$useragent = '') { |
|
| 17 | + public function getData($url, $type = 'get', $data = '', $headers = '', $cookie = '', $referer = '', $timeout = '', $useragent = '') { |
|
| 18 | 18 | global $globalProxy, $globalForceIPv4; |
| 19 | 19 | $ch = curl_init(); |
| 20 | 20 | curl_setopt($ch, CURLOPT_URL, $url); |
| 21 | 21 | if (isset($globalForceIPv4) && $globalForceIPv4) { |
| 22 | - if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')){ |
|
| 22 | + if (defined('CURLOPT_IPRESOLVE') && defined('CURL_IPRESOLVE_V4')) { |
|
| 23 | 23 | curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); |
| 24 | 24 | } |
| 25 | 25 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); |
| 30 | 30 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); |
| 31 | 31 | curl_setopt($ch, CURLINFO_HEADER_OUT, true); |
| 32 | - curl_setopt($ch,CURLOPT_ENCODING , "gzip"); |
|
| 32 | + curl_setopt($ch, CURLOPT_ENCODING, "gzip"); |
|
| 33 | 33 | //curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.2) Gecko/20090729 Firefox/3.5.2 GTB5'); |
| 34 | 34 | // curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Firefox/42.0'); |
| 35 | 35 | if ($useragent == '') { |
@@ -39,13 +39,13 @@ discard block |
||
| 39 | 39 | } |
| 40 | 40 | if ($timeout == '') curl_setopt($ch, CURLOPT_TIMEOUT, 10); |
| 41 | 41 | else curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); |
| 42 | - curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common',"curlResponseHeaderCallback")); |
|
| 42 | + curl_setopt($ch, CURLOPT_HEADERFUNCTION, array('Common', "curlResponseHeaderCallback")); |
|
| 43 | 43 | if ($type == 'post') { |
| 44 | 44 | curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); |
| 45 | 45 | if (is_array($data)) { |
| 46 | 46 | curl_setopt($ch, CURLOPT_POST, count($data)); |
| 47 | 47 | $data_string = ''; |
| 48 | - foreach($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; } |
|
| 48 | + foreach ($data as $key=>$value) { $data_string .= $key.'='.$value.'&'; } |
|
| 49 | 49 | rtrim($data_string, '&'); |
| 50 | 50 | curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string); |
| 51 | 51 | } else { |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | } |
| 58 | 58 | if ($cookie != '') { |
| 59 | 59 | if (is_array($cookie)) { |
| 60 | - curl_setopt($ch, CURLOPT_COOKIE, implode($cookie,';')); |
|
| 60 | + curl_setopt($ch, CURLOPT_COOKIE, implode($cookie, ';')); |
|
| 61 | 61 | } else { |
| 62 | 62 | curl_setopt($ch, CURLOPT_COOKIE, $cookie); |
| 63 | 63 | } |
@@ -69,13 +69,13 @@ discard block |
||
| 69 | 69 | $info = curl_getinfo($ch); |
| 70 | 70 | //var_dump($info); |
| 71 | 71 | curl_close($ch); |
| 72 | - if ($info['http_code'] == '503' && strstr($result,'DDoS protection by CloudFlare')) { |
|
| 72 | + if ($info['http_code'] == '503' && strstr($result, 'DDoS protection by CloudFlare')) { |
|
| 73 | 73 | echo "Cloudflare Detected\n"; |
| 74 | 74 | require_once(dirname(__FILE__).'/libs/cloudflare-bypass/libraries/cloudflareClass.php'); |
| 75 | 75 | $useragent = UAgent::random(); |
| 76 | 76 | cloudflare::useUserAgent($useragent); |
| 77 | 77 | if ($clearanceCookie = cloudflare::bypass($url)) { |
| 78 | - return $this->getData($url,'get',$data,$headers,$clearanceCookie,$referer,$timeout,$useragent); |
|
| 78 | + return $this->getData($url, 'get', $data, $headers, $clearanceCookie, $referer, $timeout, $useragent); |
|
| 79 | 79 | } |
| 80 | 80 | } else { |
| 81 | 81 | return $result; |
@@ -106,20 +106,20 @@ discard block |
||
| 106 | 106 | fclose($fp); |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | - public static function gunzip($in_file,$out_file_name = '') { |
|
| 109 | + public static function gunzip($in_file, $out_file_name = '') { |
|
| 110 | 110 | //echo $in_file.' -> '.$out_file_name."\n"; |
| 111 | 111 | $buffer_size = 4096; // read 4kb at a time |
| 112 | 112 | if ($out_file_name == '') $out_file_name = str_replace('.gz', '', $in_file); |
| 113 | 113 | if ($in_file != '' && file_exists($in_file)) { |
| 114 | 114 | // PHP version of Ubuntu use gzopen64 instead of gzopen |
| 115 | - if (function_exists('gzopen')) $file = gzopen($in_file,'rb'); |
|
| 116 | - elseif (function_exists('gzopen64')) $file = gzopen64($in_file,'rb'); |
|
| 115 | + if (function_exists('gzopen')) $file = gzopen($in_file, 'rb'); |
|
| 116 | + elseif (function_exists('gzopen64')) $file = gzopen64($in_file, 'rb'); |
|
| 117 | 117 | else { |
| 118 | 118 | echo 'gzopen not available'; |
| 119 | 119 | die; |
| 120 | 120 | } |
| 121 | 121 | $out_file = fopen($out_file_name, 'wb'); |
| 122 | - while(!gzeof($file)) { |
|
| 122 | + while (!gzeof($file)) { |
|
| 123 | 123 | fwrite($out_file, gzread($file, $buffer_size)); |
| 124 | 124 | } |
| 125 | 125 | fclose($out_file); |
@@ -137,27 +137,27 @@ discard block |
||
| 137 | 137 | if ($data == '') return array(); |
| 138 | 138 | $html = str_get_html($data); |
| 139 | 139 | if ($html === false) return array(); |
| 140 | - $tabledata=array(); |
|
| 141 | - foreach($html->find('tr') as $element) |
|
| 140 | + $tabledata = array(); |
|
| 141 | + foreach ($html->find('tr') as $element) |
|
| 142 | 142 | { |
| 143 | 143 | $td = array(); |
| 144 | - foreach( $element->find('th') as $row) |
|
| 144 | + foreach ($element->find('th') as $row) |
|
| 145 | 145 | { |
| 146 | 146 | $td [] = trim($row->plaintext); |
| 147 | 147 | } |
| 148 | - $td=array_filter($td); |
|
| 148 | + $td = array_filter($td); |
|
| 149 | 149 | $tabledata[] = $td; |
| 150 | 150 | |
| 151 | 151 | $td = array(); |
| 152 | 152 | $tdi = array(); |
| 153 | - foreach( $element->find('td') as $row) |
|
| 153 | + foreach ($element->find('td') as $row) |
|
| 154 | 154 | { |
| 155 | 155 | $td [] = trim($row->plaintext); |
| 156 | 156 | $tdi [] = trim($row->innertext); |
| 157 | 157 | } |
| 158 | - $td=array_filter($td); |
|
| 159 | - $tdi=array_filter($tdi); |
|
| 160 | - $tabledata[]=array_merge($td,$tdi); |
|
| 158 | + $td = array_filter($td); |
|
| 159 | + $tdi = array_filter($tdi); |
|
| 160 | + $tabledata[] = array_merge($td, $tdi); |
|
| 161 | 161 | } |
| 162 | 162 | $html->clear(); |
| 163 | 163 | unset($html); |
@@ -172,8 +172,8 @@ discard block |
||
| 172 | 172 | public function text2array($data) { |
| 173 | 173 | $html = str_get_html($data); |
| 174 | 174 | if ($html === false) return array(); |
| 175 | - $tabledata=array(); |
|
| 176 | - foreach($html->find('p') as $element) |
|
| 175 | + $tabledata = array(); |
|
| 176 | + foreach ($html->find('p') as $element) |
|
| 177 | 177 | { |
| 178 | 178 | $tabledata [] = trim($element->plaintext); |
| 179 | 179 | } |
@@ -193,11 +193,11 @@ discard block |
||
| 193 | 193 | */ |
| 194 | 194 | public function distance($lat, $lon, $latc, $lonc, $unit = 'km') { |
| 195 | 195 | if ($lat == $latc && $lon == $lonc) return 0; |
| 196 | - $dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc)))+ cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon)-floatval($lonc)))))*60*1.1515; |
|
| 196 | + $dist = rad2deg(acos(sin(deg2rad(floatval($lat)))*sin(deg2rad(floatval($latc))) + cos(deg2rad(floatval($lat)))*cos(deg2rad(floatval($latc)))*cos(deg2rad(floatval($lon) - floatval($lonc)))))*60*1.1515; |
|
| 197 | 197 | if ($unit == "km") { |
| 198 | - return round($dist * 1.609344); |
|
| 198 | + return round($dist*1.609344); |
|
| 199 | 199 | } elseif ($unit == "m") { |
| 200 | - return round($dist * 1.609344 * 1000); |
|
| 200 | + return round($dist*1.609344*1000); |
|
| 201 | 201 | } elseif ($unit == "mile" || $unit == "mi") { |
| 202 | 202 | return round($dist); |
| 203 | 203 | } elseif ($unit == "nm") { |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | * @param float $distance distance covered |
| 214 | 214 | * @return whether distance is realistic |
| 215 | 215 | */ |
| 216 | - public function withinThreshold ($timeDifference, $distance) { |
|
| 216 | + public function withinThreshold($timeDifference, $distance) { |
|
| 217 | 217 | $x = abs($timeDifference); |
| 218 | 218 | $d = abs($distance); |
| 219 | 219 | if ($x == 0 || $d == 0) return true; |
@@ -229,12 +229,12 @@ discard block |
||
| 229 | 229 | return ($array !== array_values($array)); |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | - public function isInteger($input){ |
|
| 232 | + public function isInteger($input) { |
|
| 233 | 233 | return(ctype_digit(strval($input))); |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | |
| 237 | - public function convertDec($dms,$latlong) { |
|
| 237 | + public function convertDec($dms, $latlong) { |
|
| 238 | 238 | if ($latlong == 'latitude') { |
| 239 | 239 | $deg = substr($dms, 0, 2); |
| 240 | 240 | $min = substr($dms, 2, 4); |
@@ -242,10 +242,10 @@ discard block |
||
| 242 | 242 | $deg = substr($dms, 0, 3); |
| 243 | 243 | $min = substr($dms, 3, 5); |
| 244 | 244 | } |
| 245 | - return $deg+(($min*60)/3600); |
|
| 245 | + return $deg + (($min*60)/3600); |
|
| 246 | 246 | } |
| 247 | 247 | |
| 248 | - public function convertDM($coord,$latlong) { |
|
| 248 | + public function convertDM($coord, $latlong) { |
|
| 249 | 249 | if ($latlong == 'latitude') { |
| 250 | 250 | if ($coord < 0) $NSEW = 'S'; |
| 251 | 251 | else $NSEW = 'N'; |
@@ -255,9 +255,9 @@ discard block |
||
| 255 | 255 | } |
| 256 | 256 | $coord = abs($coord); |
| 257 | 257 | $deg = floor($coord); |
| 258 | - $coord = ($coord-$deg)*60; |
|
| 258 | + $coord = ($coord - $deg)*60; |
|
| 259 | 259 | $min = $coord; |
| 260 | - return array('deg' => $deg,'min' => $min,'NSEW' => $NSEW); |
|
| 260 | + return array('deg' => $deg, 'min' => $min, 'NSEW' => $NSEW); |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | /** |
@@ -269,8 +269,8 @@ discard block |
||
| 269 | 269 | public function xcopy($source, $dest) |
| 270 | 270 | { |
| 271 | 271 | $files = glob($source.'*.*'); |
| 272 | - foreach($files as $file){ |
|
| 273 | - $file_to_go = str_replace($source,$dest,$file); |
|
| 272 | + foreach ($files as $file) { |
|
| 273 | + $file_to_go = str_replace($source, $dest, $file); |
|
| 274 | 274 | copy($file, $file_to_go); |
| 275 | 275 | } |
| 276 | 276 | return true; |
@@ -281,9 +281,9 @@ discard block |
||
| 281 | 281 | * @param String $url url to check |
| 282 | 282 | * @return bool Return true on succes false on failure |
| 283 | 283 | */ |
| 284 | - public function urlexist($url){ |
|
| 285 | - $headers=get_headers($url); |
|
| 286 | - return stripos($headers[0],"200 OK")?true:false; |
|
| 284 | + public function urlexist($url) { |
|
| 285 | + $headers = get_headers($url); |
|
| 286 | + return stripos($headers[0], "200 OK") ? true : false; |
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | /** |
@@ -294,7 +294,7 @@ discard block |
||
| 294 | 294 | public function hex2str($hex) { |
| 295 | 295 | $str = ''; |
| 296 | 296 | $hexln = strlen($hex); |
| 297 | - for($i=0;$i<$hexln;$i+=2) $str .= chr(hexdec(substr($hex,$i,2))); |
|
| 297 | + for ($i = 0; $i < $hexln; $i += 2) $str .= chr(hexdec(substr($hex, $i, 2))); |
|
| 298 | 298 | return $str; |
| 299 | 299 | } |
| 300 | 300 | |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | * @return String Return result |
| 305 | 305 | */ |
| 306 | 306 | public function hex2rgb($hex) { |
| 307 | - $hex = str_replace('#','',$hex); |
|
| 307 | + $hex = str_replace('#', '', $hex); |
|
| 308 | 308 | return sscanf($hex, "%02x%02x%02x"); |
| 309 | 309 | } |
| 310 | 310 | |
@@ -312,33 +312,33 @@ discard block |
||
| 312 | 312 | //difference in longitudinal coordinates |
| 313 | 313 | $dLon = deg2rad($lon2) - deg2rad($lon1); |
| 314 | 314 | //difference in the phi of latitudinal coordinates |
| 315 | - $dPhi = log(tan(deg2rad($lat2) / 2 + pi() / 4) / tan(deg2rad($lat1) / 2 + pi() / 4)); |
|
| 315 | + $dPhi = log(tan(deg2rad($lat2)/2 + pi()/4)/tan(deg2rad($lat1)/2 + pi()/4)); |
|
| 316 | 316 | //we need to recalculate $dLon if it is greater than pi |
| 317 | - if(abs($dLon) > pi()) { |
|
| 318 | - if($dLon > 0) { |
|
| 319 | - $dLon = (2 * pi() - $dLon) * -1; |
|
| 317 | + if (abs($dLon) > pi()) { |
|
| 318 | + if ($dLon > 0) { |
|
| 319 | + $dLon = (2*pi() - $dLon)*-1; |
|
| 320 | 320 | } else { |
| 321 | - $dLon = 2 * pi() + $dLon; |
|
| 321 | + $dLon = 2*pi() + $dLon; |
|
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | //return the angle, normalized |
| 325 | - return (rad2deg(atan2($dLon, $dPhi)) + 360) % 360; |
|
| 325 | + return (rad2deg(atan2($dLon, $dPhi)) + 360)%360; |
|
| 326 | 326 | } |
| 327 | 327 | |
| 328 | - public function checkLine($lat1,$lon1,$lat2,$lon2,$lat3,$lon3,$approx = 0.2) { |
|
| 328 | + public function checkLine($lat1, $lon1, $lat2, $lon2, $lat3, $lon3, $approx = 0.2) { |
|
| 329 | 329 | //$a = ($lon2-$lon1)*$lat3+($lat2-$lat1)*$lon3+($lat1*$lon2+$lat2*$lon1); |
| 330 | - $a = -($lon2-$lon1); |
|
| 330 | + $a = -($lon2 - $lon1); |
|
| 331 | 331 | $b = $lat2 - $lat1; |
| 332 | - $c = -($a*$lat1+$b*$lon1); |
|
| 333 | - $d = $a*$lat3+$b*$lon3+$c; |
|
| 332 | + $c = -($a*$lat1 + $b*$lon1); |
|
| 333 | + $d = $a*$lat3 + $b*$lon3 + $c; |
|
| 334 | 334 | if ($d > -$approx && $d < $approx) return true; |
| 335 | 335 | else return false; |
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | public function array_merge_noappend() { |
| 339 | 339 | $output = array(); |
| 340 | - foreach(func_get_args() as $array) { |
|
| 341 | - foreach($array as $key => $value) { |
|
| 340 | + foreach (func_get_args() as $array) { |
|
| 341 | + foreach ($array as $key => $value) { |
|
| 342 | 342 | $output[$key] = isset($output[$key]) ? |
| 343 | 343 | array_merge($output[$key], $value) : $value; |
| 344 | 344 | } |
@@ -402,34 +402,34 @@ discard block |
||
| 402 | 402 | return $result; |
| 403 | 403 | } |
| 404 | 404 | |
| 405 | - public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1){ |
|
| 405 | + public function nextcoord($latitude, $longitude, $speed, $heading, $archivespeed = 1) { |
|
| 406 | 406 | global $globalMapRefresh; |
| 407 | 407 | $distance = ($speed*0.514444*$globalMapRefresh*$archivespeed)/1000; |
| 408 | 408 | $r = 6378; |
| 409 | 409 | $latitude = deg2rad($latitude); |
| 410 | 410 | $longitude = deg2rad($longitude); |
| 411 | 411 | $bearing = deg2rad($heading); |
| 412 | - $latitude2 = asin( (sin($latitude) * cos($distance/$r)) + (cos($latitude) * sin($distance/$r) * cos($bearing)) ); |
|
| 413 | - $longitude2 = $longitude + atan2( sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r)-(sin($latitude)*sin($latitude2)) ); |
|
| 414 | - return array('latitude' => number_format(rad2deg($latitude2),5,'.',''),'longitude' => number_format(rad2deg($longitude2),5,'.','')); |
|
| 412 | + $latitude2 = asin((sin($latitude)*cos($distance/$r)) + (cos($latitude)*sin($distance/$r)*cos($bearing))); |
|
| 413 | + $longitude2 = $longitude + atan2(sin($bearing)*sin($distance/$r)*cos($latitude), cos($distance/$r) - (sin($latitude)*sin($latitude2))); |
|
| 414 | + return array('latitude' => number_format(rad2deg($latitude2), 5, '.', ''), 'longitude' => number_format(rad2deg($longitude2), 5, '.', '')); |
|
| 415 | 415 | } |
| 416 | 416 | |
| 417 | - public function getCoordfromDistanceBearing($latitude,$longitude,$bearing,$distance) { |
|
| 417 | + public function getCoordfromDistanceBearing($latitude, $longitude, $bearing, $distance) { |
|
| 418 | 418 | // distance in meter |
| 419 | 419 | $R = 6378.14; |
| 420 | - $latitude1 = $latitude * (M_PI/180); |
|
| 421 | - $longitude1 = $longitude * (M_PI/180); |
|
| 422 | - $brng = $bearing * (M_PI/180); |
|
| 420 | + $latitude1 = $latitude*(M_PI/180); |
|
| 421 | + $longitude1 = $longitude*(M_PI/180); |
|
| 422 | + $brng = $bearing*(M_PI/180); |
|
| 423 | 423 | $d = $distance; |
| 424 | 424 | |
| 425 | 425 | $latitude2 = asin(sin($latitude1)*cos($d/$R) + cos($latitude1)*sin($d/$R)*cos($brng)); |
| 426 | - $longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1),cos($d/$R)-sin($latitude1)*sin($latitude2)); |
|
| 426 | + $longitude2 = $longitude1 + atan2(sin($brng)*sin($d/$R)*cos($latitude1), cos($d/$R) - sin($latitude1)*sin($latitude2)); |
|
| 427 | 427 | |
| 428 | - $latitude2 = $latitude2 * (180/M_PI); |
|
| 429 | - $longitude2 = $longitude2 * (180/M_PI); |
|
| 428 | + $latitude2 = $latitude2*(180/M_PI); |
|
| 429 | + $longitude2 = $longitude2*(180/M_PI); |
|
| 430 | 430 | |
| 431 | - $flat = round ($latitude2,6); |
|
| 432 | - $flong = round ($longitude2,6); |
|
| 431 | + $flat = round($latitude2, 6); |
|
| 432 | + $flong = round($longitude2, 6); |
|
| 433 | 433 | /* |
| 434 | 434 | $dx = $distance*cos($bearing); |
| 435 | 435 | $dy = $distance*sin($bearing); |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | $flong = $longitude + $dlong; |
| 439 | 439 | $flat = $latitude + $dlat; |
| 440 | 440 | */ |
| 441 | - return array('latitude' => $flat,'longitude' => $flong); |
|
| 441 | + return array('latitude' => $flat, 'longitude' => $flong); |
|
| 442 | 442 | } |
| 443 | 443 | |
| 444 | 444 | /** |
@@ -452,14 +452,14 @@ discard block |
||
| 452 | 452 | * @param integer $level GZIP compression level (default: 9) |
| 453 | 453 | * @return string New filename (with .gz appended) if success, or false if operation fails |
| 454 | 454 | */ |
| 455 | - public function gzCompressFile($source, $level = 9){ |
|
| 456 | - $dest = $source . '.gz'; |
|
| 457 | - $mode = 'wb' . $level; |
|
| 455 | + public function gzCompressFile($source, $level = 9) { |
|
| 456 | + $dest = $source.'.gz'; |
|
| 457 | + $mode = 'wb'.$level; |
|
| 458 | 458 | $error = false; |
| 459 | 459 | if ($fp_out = gzopen($dest, $mode)) { |
| 460 | - if ($fp_in = fopen($source,'rb')) { |
|
| 460 | + if ($fp_in = fopen($source, 'rb')) { |
|
| 461 | 461 | while (!feof($fp_in)) |
| 462 | - gzwrite($fp_out, fread($fp_in, 1024 * 512)); |
|
| 462 | + gzwrite($fp_out, fread($fp_in, 1024*512)); |
|
| 463 | 463 | fclose($fp_in); |
| 464 | 464 | } else { |
| 465 | 465 | $error = true; |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | } |
| 476 | 476 | |
| 477 | 477 | public function remove_accents($string) { |
| 478 | - if ( !preg_match('/[\x80-\xff]/', $string) ) return $string; |
|
| 478 | + if (!preg_match('/[\x80-\xff]/', $string)) return $string; |
|
| 479 | 479 | $chars = array( |
| 480 | 480 | // Decompositions for Latin-1 Supplement |
| 481 | 481 | chr(195).chr(128) => 'A', chr(195).chr(129) => 'A', |
@@ -532,7 +532,7 @@ discard block |
||
| 532 | 532 | chr(196).chr(172) => 'I', chr(196).chr(173) => 'i', |
| 533 | 533 | chr(196).chr(174) => 'I', chr(196).chr(175) => 'i', |
| 534 | 534 | chr(196).chr(176) => 'I', chr(196).chr(177) => 'i', |
| 535 | - chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij', |
|
| 535 | + chr(196).chr(178) => 'IJ', chr(196).chr(179) => 'ij', |
|
| 536 | 536 | chr(196).chr(180) => 'J', chr(196).chr(181) => 'j', |
| 537 | 537 | chr(196).chr(182) => 'K', chr(196).chr(183) => 'k', |
| 538 | 538 | chr(196).chr(184) => 'k', chr(196).chr(185) => 'L', |
@@ -548,13 +548,13 @@ discard block |
||
| 548 | 548 | chr(197).chr(140) => 'O', chr(197).chr(141) => 'o', |
| 549 | 549 | chr(197).chr(142) => 'O', chr(197).chr(143) => 'o', |
| 550 | 550 | chr(197).chr(144) => 'O', chr(197).chr(145) => 'o', |
| 551 | - chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe', |
|
| 552 | - chr(197).chr(148) => 'R',chr(197).chr(149) => 'r', |
|
| 553 | - chr(197).chr(150) => 'R',chr(197).chr(151) => 'r', |
|
| 554 | - chr(197).chr(152) => 'R',chr(197).chr(153) => 'r', |
|
| 555 | - chr(197).chr(154) => 'S',chr(197).chr(155) => 's', |
|
| 556 | - chr(197).chr(156) => 'S',chr(197).chr(157) => 's', |
|
| 557 | - chr(197).chr(158) => 'S',chr(197).chr(159) => 's', |
|
| 551 | + chr(197).chr(146) => 'OE', chr(197).chr(147) => 'oe', |
|
| 552 | + chr(197).chr(148) => 'R', chr(197).chr(149) => 'r', |
|
| 553 | + chr(197).chr(150) => 'R', chr(197).chr(151) => 'r', |
|
| 554 | + chr(197).chr(152) => 'R', chr(197).chr(153) => 'r', |
|
| 555 | + chr(197).chr(154) => 'S', chr(197).chr(155) => 's', |
|
| 556 | + chr(197).chr(156) => 'S', chr(197).chr(157) => 's', |
|
| 557 | + chr(197).chr(158) => 'S', chr(197).chr(159) => 's', |
|
| 558 | 558 | chr(197).chr(160) => 'S', chr(197).chr(161) => 's', |
| 559 | 559 | chr(197).chr(162) => 'T', chr(197).chr(163) => 't', |
| 560 | 560 | chr(197).chr(164) => 'T', chr(197).chr(165) => 't', |
@@ -588,7 +588,7 @@ discard block |
||
| 588 | 588 | for ($i = 0, $int = '', $concat_flag = true; $i < $length; $i++) { |
| 589 | 589 | if (is_numeric($string[$i]) && $concat_flag) { |
| 590 | 590 | $int .= $string[$i]; |
| 591 | - } elseif(!$concat && $concat_flag && strlen($int) > 0) { |
|
| 591 | + } elseif (!$concat && $concat_flag && strlen($int) > 0) { |
|
| 592 | 592 | $concat_flag = false; |
| 593 | 593 | } |
| 594 | 594 | } |
@@ -11,14 +11,14 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | $from_archive = false; |
| 13 | 13 | if (isset($_GET['ident'])) { |
| 14 | - $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 14 | + $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
| 15 | 15 | if (isset($_GET['currenttime'])) { |
| 16 | - $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT); |
|
| 16 | + $currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT); |
|
| 17 | 17 | $currenttime = round($currenttime/1000); |
| 18 | - $spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident,$currenttime); |
|
| 18 | + $spotter_array = $SpotterLive->getDateLiveSpotterDataByIdent($ident, $currenttime); |
|
| 19 | 19 | if (empty($spotter_array)) { |
| 20 | 20 | $from_archive = true; |
| 21 | - $spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident,$currenttime); |
|
| 21 | + $spotter_array = $SpotterArchive->getDateArchiveSpotterDataByIdent($ident, $currenttime); |
|
| 22 | 22 | } |
| 23 | 23 | } else { |
| 24 | 24 | $spotter_array = $SpotterLive->getLastLiveSpotterDataByIdent($ident); |
@@ -29,15 +29,15 @@ discard block |
||
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | if (isset($_GET['flightaware_id'])) { |
| 32 | - $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING); |
|
| 32 | + $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING); |
|
| 33 | 33 | if (isset($_GET['currenttime'])) { |
| 34 | - $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT); |
|
| 34 | + $currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT); |
|
| 35 | 35 | $currenttime = round($currenttime/1000); |
| 36 | - $spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id,$currenttime); |
|
| 36 | + $spotter_array = $SpotterLive->getDateLiveSpotterDataById($flightaware_id, $currenttime); |
|
| 37 | 37 | if (empty($spotter_array)) { |
| 38 | 38 | $from_archive = true; |
| 39 | 39 | // $spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id); |
| 40 | - $spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id,$currenttime); |
|
| 40 | + $spotter_array = $SpotterArchive->getDateArchiveSpotterDataById($flightaware_id, $currenttime); |
|
| 41 | 41 | } |
| 42 | 42 | } else { |
| 43 | 43 | $spotter_array = $SpotterLive->getLastLiveSpotterDataById($flightaware_id); |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "") |
| 57 | 57 | { |
| 58 | 58 | if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') { |
| 59 | - $image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 59 | + $image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 60 | 60 | } else $image = $spotter_item['image_thumbnail']; |
| 61 | 61 | |
| 62 | 62 | } |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | print '<div class="nomobile airports"><div class="airport"><span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['departure_airport'].'" target="_blank">'.$spotter_item['departure_airport'].'</a></span>'.$spotter_item['departure_airport_city'].' '.$spotter_item['departure_airport_country']; |
| 78 | 78 | if (isset($spotter_item['departure_airport_time']) && $spotter_item['departure_airport_time'] != 'NULL') { |
| 79 | 79 | if ($spotter_item['departure_airport_time'] > 2460) { |
| 80 | - print '<br /><span class="time">'.date('H:m',$spotter_item['departure_airport_time']).'</span>'; |
|
| 80 | + print '<br /><span class="time">'.date('H:m', $spotter_item['departure_airport_time']).'</span>'; |
|
| 81 | 81 | } else { |
| 82 | 82 | print '<br /><span class="time">'.$spotter_item['departure_airport_time'].'</span>'; |
| 83 | 83 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | print '<span class="code"><a href="'.$globalURL.'/airport/'.$spotter_item['arrival_airport'].'" target="_blank">'.$spotter_item['arrival_airport'].'</a></span>'.$spotter_item['arrival_airport_city'].' '.$spotter_item['arrival_airport_country']; |
| 87 | 87 | if (isset($spotter_item['arrival_airport_time']) && $spotter_item['arrival_airport_time'] != 'NULL') { |
| 88 | 88 | if ($spotter_item['arrival_airport_time'] > 2460) { |
| 89 | - print '<br /><span class="time">'.date('H:m',$spotter_item['arrival_airport_time']).'</span>'; |
|
| 89 | + print '<br /><span class="time">'.date('H:m', $spotter_item['arrival_airport_time']).'</span>'; |
|
| 90 | 90 | } else { |
| 91 | 91 | print '<br /><span class="time">'.$spotter_item['arrival_airport_time'].'</span>'; |
| 92 | 92 | } |
@@ -111,8 +111,8 @@ discard block |
||
| 111 | 111 | print '<div id ="altitude"><span>'._("Altitude").'</span>'; |
| 112 | 112 | if (isset($globalGroundAltitude) && $globalGroundAltitude) { |
| 113 | 113 | try { |
| 114 | - $groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']); |
|
| 115 | - } catch(Exception $e) { |
|
| 114 | + $groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']); |
|
| 115 | + } catch (Exception $e) { |
|
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | 118 | |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | |
| 182 | 182 | if (isset($globalVA) && $globalVA && isset($globalphpVMS) && $globalphpVMS && isset($globalVATSIM) && $globalVATSIM && isset($globalIVAO) && $globalIVAO && isset($spotter_item['format_source']) && $spotter_item['format_source'] != '' && $spotter_item['format_source'] != 'pireps') print '<div class="waypoints"><span>'._("Source").'</span>'.$spotter_item['format_source'].'</div>'; |
| 183 | 183 | if (isset($spotter_item['waypoints']) && $spotter_item['waypoints'] != '') print '<div class="waypoints"><span>'._("Route").'</span>'.$spotter_item['waypoints'].'</div>'; |
| 184 | -if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'<br/>',$spotter_item['acars']['message'])).'</div>'; |
|
| 184 | +if (isset($spotter_item['acars']['message'])) print '<div class="acars"><span>'._("Latest ACARS message").'</span>'.trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '<br/>', $spotter_item['acars']['message'])).'</div>'; |
|
| 185 | 185 | if (isset($spotter_item['squawk']) && $spotter_item['squawk'] != '' && $spotter_item['squawk'] != 0) print '<div class="bottom">'._("Squawk:").' '.$spotter_item['squawk'].' - '.$spotter_item['squawk_usage'].'</div>'; |
| 186 | 186 | print '</div>'; |
| 187 | 187 | ?> |
@@ -4,16 +4,16 @@ discard block |
||
| 4 | 4 | require_once('require/class.Stats.php'); |
| 5 | 5 | require_once('require/class.Language.php'); |
| 6 | 6 | $Spotter = new Spotter(); |
| 7 | -if (!isset($_GET['aircraft_manufacturer'])){ |
|
| 7 | +if (!isset($_GET['aircraft_manufacturer'])) { |
|
| 8 | 8 | header('Location: '.$globalURL.''); |
| 9 | 9 | } else { |
| 10 | 10 | //calculuation for the pagination |
| 11 | - if(!isset($_GET['limit'])) |
|
| 11 | + if (!isset($_GET['limit'])) |
|
| 12 | 12 | { |
| 13 | 13 | $limit_start = 0; |
| 14 | 14 | $limit_end = 25; |
| 15 | 15 | $absolute_difference = 25; |
| 16 | - } else { |
|
| 16 | + } else { |
|
| 17 | 17 | $limit_explode = explode(",", $_GET['limit']); |
| 18 | 18 | $limit_start = $limit_explode[0]; |
| 19 | 19 | $limit_end = $limit_explode[1]; |
@@ -27,19 +27,19 @@ discard block |
||
| 27 | 27 | $limit_previous_1 = $limit_start - $absolute_difference; |
| 28 | 28 | $limit_previous_2 = $limit_end - $absolute_difference; |
| 29 | 29 | |
| 30 | - $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING))); |
|
| 31 | - $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
| 30 | + $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING))); |
|
| 31 | + $sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
| 32 | 32 | $page_url = $globalURL.'/manufacturer/'.$manufacturer; |
| 33 | 33 | |
| 34 | 34 | if ($sort != '') { |
| 35 | - $spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,$limit_start.",".$absolute_difference, $sort); |
|
| 35 | + $spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, $limit_start.",".$absolute_difference, $sort); |
|
| 36 | 36 | } else { |
| 37 | - $spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,$limit_start.",".$absolute_difference, ''); |
|
| 37 | + $spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, $limit_start.",".$absolute_difference, ''); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | if (!empty($spotter_array)) |
| 41 | 41 | { |
| 42 | - $title = sprintf(_("Detailed View for %s"),$manufacturer); |
|
| 42 | + $title = sprintf(_("Detailed View for %s"), $manufacturer); |
|
| 43 | 43 | |
| 44 | 44 | require_once('header.php'); |
| 45 | 45 | print '<div class="select-item">'; |
@@ -48,9 +48,9 @@ discard block |
||
| 48 | 48 | $Stats = new Stats(); |
| 49 | 49 | $all_manufacturers = $Stats->getAllManufacturers(); |
| 50 | 50 | if (empty($all_manufacturers)) $all_manufacturers = $Spotter->getAllManufacturers(); |
| 51 | - foreach($all_manufacturers as $all_manufacturer) |
|
| 51 | + foreach ($all_manufacturers as $all_manufacturer) |
|
| 52 | 52 | { |
| 53 | - if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
|
| 53 | + if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer']))) |
|
| 54 | 54 | { |
| 55 | 55 | print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>'; |
| 56 | 56 | } else { |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | print '</div>'; |
| 68 | 68 | |
| 69 | 69 | print '<div class="table column">'; |
| 70 | - print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong>."),$manufacturer).'</p>'; |
|
| 70 | + print '<p>'.sprintf(_("The table below shows the detailed information of all flights from <strong>%s</strong>."), $manufacturer).'</p>'; |
|
| 71 | 71 | |
| 72 | 72 | include('manufacturer-sub-menu.php'); |
| 73 | 73 | include('table-output.php'); |
@@ -11,14 +11,14 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | $from_archive = false; |
| 13 | 13 | if (isset($_GET['ident'])) { |
| 14 | - $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 14 | + $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
| 15 | 15 | if (isset($_GET['currenttime'])) { |
| 16 | - $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT); |
|
| 16 | + $currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT); |
|
| 17 | 17 | $currenttime = round($currenttime/1000); |
| 18 | - $spotter_array = $TrackerLive->getDateLiveTrackerDataByIdent($ident,$currenttime); |
|
| 18 | + $spotter_array = $TrackerLive->getDateLiveTrackerDataByIdent($ident, $currenttime); |
|
| 19 | 19 | if (empty($spotter_array)) { |
| 20 | 20 | $from_archive = true; |
| 21 | - $spotter_array = $TrackerArchive->getDateArchiveTrackerDataByIdent($ident,$currenttime); |
|
| 21 | + $spotter_array = $TrackerArchive->getDateArchiveTrackerDataByIdent($ident, $currenttime); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | } else { |
@@ -30,16 +30,16 @@ discard block |
||
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | if (isset($_GET['famtrackid'])) { |
| 33 | - $famtrackid = filter_input(INPUT_GET,'famtrackid',FILTER_SANITIZE_STRING); |
|
| 33 | + $famtrackid = filter_input(INPUT_GET, 'famtrackid', FILTER_SANITIZE_STRING); |
|
| 34 | 34 | if (isset($_GET['currenttime'])) { |
| 35 | - $currenttime = filter_input(INPUT_GET,'currenttime',FILTER_SANITIZE_NUMBER_INT); |
|
| 35 | + $currenttime = filter_input(INPUT_GET, 'currenttime', FILTER_SANITIZE_NUMBER_INT); |
|
| 36 | 36 | $currenttime = round($currenttime/1000); |
| 37 | - $spotter_array = $TrackerLive->getDateLiveTrackerDataById($famtrackid,$currenttime); |
|
| 37 | + $spotter_array = $TrackerLive->getDateLiveTrackerDataById($famtrackid, $currenttime); |
|
| 38 | 38 | |
| 39 | 39 | if (empty($spotter_array)) { |
| 40 | 40 | $from_archive = true; |
| 41 | 41 | // $spotter_array = $SpotterArchive->getLastArchiveSpotterDataById($flightaware_id); |
| 42 | - $spotter_array = $TrackerArchive->getDateArchiveTrackerDataById($flightaware_id,$currenttime); |
|
| 42 | + $spotter_array = $TrackerArchive->getDateArchiveTrackerDataById($flightaware_id, $currenttime); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | } else { |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | if (isset($spotter_item['image_thumbnail']) && $spotter_item['image_thumbnail'] != "") |
| 60 | 60 | { |
| 61 | 61 | if ($spotter_item['image_source'] == 'flickr' || $spotter_item['image_source'] == 'wikimedia' || $spotter_item['image_source'] == 'devianart') { |
| 62 | - $image = preg_replace("/^http:/i","https:",$spotter_item['image_thumbnail']); |
|
| 62 | + $image = preg_replace("/^http:/i", "https:", $spotter_item['image_thumbnail']); |
|
| 63 | 63 | } else $image = $spotter_item['image_thumbnail']; |
| 64 | 64 | |
| 65 | 65 | } |
@@ -79,8 +79,8 @@ discard block |
||
| 79 | 79 | print '<div><span>'._("Altitude").'</span>'; |
| 80 | 80 | if (isset($globalGroundAltitude) && $globalGroundAltitude) { |
| 81 | 81 | try { |
| 82 | - $groundAltitude = $Elevation->getElevation($spotter_item['latitude'],$spotter_item['longitude']); |
|
| 83 | - } catch(Exception $e) { |
|
| 82 | + $groundAltitude = $Elevation->getElevation($spotter_item['latitude'], $spotter_item['longitude']); |
|
| 83 | + } catch (Exception $e) { |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | if ((!isset($_COOKIE['unitaltitude']) && isset($globalUnitAltitude) && $globalUnitAltitude == 'feet') || (isset($_COOKIE['unitaltitude']) && $_COOKIE['unitaltitude'] == 'feet')) { |
@@ -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; |
@@ -1700,7 +1700,7 @@ discard block |
||
| 1700 | 1700 | try { |
| 1701 | 1701 | $sth = $Connection->db->prepare($query); |
| 1702 | 1702 | $sth->execute(); |
| 1703 | - } catch(PDOException $e) { |
|
| 1703 | + } catch (PDOException $e) { |
|
| 1704 | 1704 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 1705 | 1705 | } |
| 1706 | 1706 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -1709,18 +1709,18 @@ discard block |
||
| 1709 | 1709 | try { |
| 1710 | 1710 | $sth = $Connection->db->prepare($query); |
| 1711 | 1711 | $sth->execute(); |
| 1712 | - } catch(PDOException $e) { |
|
| 1712 | + } catch (PDOException $e) { |
|
| 1713 | 1713 | return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n"; |
| 1714 | 1714 | } |
| 1715 | 1715 | } |
| 1716 | 1716 | } |
| 1717 | - if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) { |
|
| 1717 | + if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) { |
|
| 1718 | 1718 | // Add index key |
| 1719 | 1719 | $query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)"; |
| 1720 | 1720 | try { |
| 1721 | 1721 | $sth = $Connection->db->prepare($query); |
| 1722 | 1722 | $sth->execute(); |
| 1723 | - } catch(PDOException $e) { |
|
| 1723 | + } catch (PDOException $e) { |
|
| 1724 | 1724 | return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n"; |
| 1725 | 1725 | } |
| 1726 | 1726 | } |
@@ -1728,7 +1728,7 @@ discard block |
||
| 1728 | 1728 | try { |
| 1729 | 1729 | $sth = $Connection->db->prepare($query); |
| 1730 | 1730 | $sth->execute(); |
| 1731 | - } catch(PDOException $e) { |
|
| 1731 | + } catch (PDOException $e) { |
|
| 1732 | 1732 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1733 | 1733 | } |
| 1734 | 1734 | return $error; |
@@ -1739,148 +1739,148 @@ discard block |
||
| 1739 | 1739 | $Connection = new Connection(); |
| 1740 | 1740 | $error = ''; |
| 1741 | 1741 | if ($globalDBdriver == 'mysql') { |
| 1742 | - if (!$Connection->checkColumnName('marine_output','type_id')) { |
|
| 1742 | + if (!$Connection->checkColumnName('marine_output', 'type_id')) { |
|
| 1743 | 1743 | $query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1744 | 1744 | try { |
| 1745 | 1745 | $sth = $Connection->db->prepare($query); |
| 1746 | 1746 | $sth->execute(); |
| 1747 | - } catch(PDOException $e) { |
|
| 1747 | + } catch (PDOException $e) { |
|
| 1748 | 1748 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; |
| 1749 | 1749 | } |
| 1750 | 1750 | } |
| 1751 | - if (!$Connection->checkColumnName('marine_live','type_id')) { |
|
| 1751 | + if (!$Connection->checkColumnName('marine_live', 'type_id')) { |
|
| 1752 | 1752 | $query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1753 | 1753 | try { |
| 1754 | 1754 | $sth = $Connection->db->prepare($query); |
| 1755 | 1755 | $sth->execute(); |
| 1756 | - } catch(PDOException $e) { |
|
| 1756 | + } catch (PDOException $e) { |
|
| 1757 | 1757 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; |
| 1758 | 1758 | } |
| 1759 | 1759 | } |
| 1760 | - if (!$Connection->checkColumnName('marine_archive','type_id')) { |
|
| 1760 | + if (!$Connection->checkColumnName('marine_archive', 'type_id')) { |
|
| 1761 | 1761 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1762 | 1762 | try { |
| 1763 | 1763 | $sth = $Connection->db->prepare($query); |
| 1764 | 1764 | $sth->execute(); |
| 1765 | - } catch(PDOException $e) { |
|
| 1765 | + } catch (PDOException $e) { |
|
| 1766 | 1766 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1767 | 1767 | } |
| 1768 | 1768 | } |
| 1769 | - if (!$Connection->checkColumnName('marine_archive_output','type_id')) { |
|
| 1769 | + if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { |
|
| 1770 | 1770 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1771 | 1771 | try { |
| 1772 | 1772 | $sth = $Connection->db->prepare($query); |
| 1773 | 1773 | $sth->execute(); |
| 1774 | - } catch(PDOException $e) { |
|
| 1774 | + } catch (PDOException $e) { |
|
| 1775 | 1775 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1776 | 1776 | } |
| 1777 | 1777 | } |
| 1778 | - if (!$Connection->checkColumnName('marine_output','status_id')) { |
|
| 1778 | + if (!$Connection->checkColumnName('marine_output', 'status_id')) { |
|
| 1779 | 1779 | $query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1780 | 1780 | try { |
| 1781 | 1781 | $sth = $Connection->db->prepare($query); |
| 1782 | 1782 | $sth->execute(); |
| 1783 | - } catch(PDOException $e) { |
|
| 1783 | + } catch (PDOException $e) { |
|
| 1784 | 1784 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; |
| 1785 | 1785 | } |
| 1786 | 1786 | } |
| 1787 | - if (!$Connection->checkColumnName('marine_live','status_id')) { |
|
| 1787 | + if (!$Connection->checkColumnName('marine_live', 'status_id')) { |
|
| 1788 | 1788 | $query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1789 | 1789 | try { |
| 1790 | 1790 | $sth = $Connection->db->prepare($query); |
| 1791 | 1791 | $sth->execute(); |
| 1792 | - } catch(PDOException $e) { |
|
| 1792 | + } catch (PDOException $e) { |
|
| 1793 | 1793 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; |
| 1794 | 1794 | } |
| 1795 | 1795 | } |
| 1796 | - if (!$Connection->checkColumnName('marine_archive','status_id')) { |
|
| 1796 | + if (!$Connection->checkColumnName('marine_archive', 'status_id')) { |
|
| 1797 | 1797 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1798 | 1798 | try { |
| 1799 | 1799 | $sth = $Connection->db->prepare($query); |
| 1800 | 1800 | $sth->execute(); |
| 1801 | - } catch(PDOException $e) { |
|
| 1801 | + } catch (PDOException $e) { |
|
| 1802 | 1802 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1803 | 1803 | } |
| 1804 | 1804 | } |
| 1805 | - if (!$Connection->checkColumnName('marine_archive_output','status_id')) { |
|
| 1805 | + if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { |
|
| 1806 | 1806 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1807 | 1807 | try { |
| 1808 | 1808 | $sth = $Connection->db->prepare($query); |
| 1809 | 1809 | $sth->execute(); |
| 1810 | - } catch(PDOException $e) { |
|
| 1810 | + } catch (PDOException $e) { |
|
| 1811 | 1811 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1812 | 1812 | } |
| 1813 | 1813 | } |
| 1814 | 1814 | } else { |
| 1815 | - if (!$Connection->checkColumnName('marine_output','type_id')) { |
|
| 1815 | + if (!$Connection->checkColumnName('marine_output', 'type_id')) { |
|
| 1816 | 1816 | $query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL"; |
| 1817 | 1817 | try { |
| 1818 | 1818 | $sth = $Connection->db->prepare($query); |
| 1819 | 1819 | $sth->execute(); |
| 1820 | - } catch(PDOException $e) { |
|
| 1820 | + } catch (PDOException $e) { |
|
| 1821 | 1821 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; |
| 1822 | 1822 | } |
| 1823 | 1823 | } |
| 1824 | - if (!$Connection->checkColumnName('marine_live','type_id')) { |
|
| 1824 | + if (!$Connection->checkColumnName('marine_live', 'type_id')) { |
|
| 1825 | 1825 | $query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL"; |
| 1826 | 1826 | try { |
| 1827 | 1827 | $sth = $Connection->db->prepare($query); |
| 1828 | 1828 | $sth->execute(); |
| 1829 | - } catch(PDOException $e) { |
|
| 1829 | + } catch (PDOException $e) { |
|
| 1830 | 1830 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; |
| 1831 | 1831 | } |
| 1832 | 1832 | } |
| 1833 | - if (!$Connection->checkColumnName('marine_archive','type_id')) { |
|
| 1833 | + if (!$Connection->checkColumnName('marine_archive', 'type_id')) { |
|
| 1834 | 1834 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL"; |
| 1835 | 1835 | try { |
| 1836 | 1836 | $sth = $Connection->db->prepare($query); |
| 1837 | 1837 | $sth->execute(); |
| 1838 | - } catch(PDOException $e) { |
|
| 1838 | + } catch (PDOException $e) { |
|
| 1839 | 1839 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1840 | 1840 | } |
| 1841 | 1841 | } |
| 1842 | - if (!$Connection->checkColumnName('marine_archive_output','type_id')) { |
|
| 1842 | + if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { |
|
| 1843 | 1843 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL"; |
| 1844 | 1844 | try { |
| 1845 | 1845 | $sth = $Connection->db->prepare($query); |
| 1846 | 1846 | $sth->execute(); |
| 1847 | - } catch(PDOException $e) { |
|
| 1847 | + } catch (PDOException $e) { |
|
| 1848 | 1848 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1849 | 1849 | } |
| 1850 | 1850 | } |
| 1851 | - if (!$Connection->checkColumnName('marine_output','status_id')) { |
|
| 1851 | + if (!$Connection->checkColumnName('marine_output', 'status_id')) { |
|
| 1852 | 1852 | $query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL"; |
| 1853 | 1853 | try { |
| 1854 | 1854 | $sth = $Connection->db->prepare($query); |
| 1855 | 1855 | $sth->execute(); |
| 1856 | - } catch(PDOException $e) { |
|
| 1856 | + } catch (PDOException $e) { |
|
| 1857 | 1857 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; |
| 1858 | 1858 | } |
| 1859 | 1859 | } |
| 1860 | - if (!$Connection->checkColumnName('marine_live','status_id')) { |
|
| 1860 | + if (!$Connection->checkColumnName('marine_live', 'status_id')) { |
|
| 1861 | 1861 | $query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL"; |
| 1862 | 1862 | try { |
| 1863 | 1863 | $sth = $Connection->db->prepare($query); |
| 1864 | 1864 | $sth->execute(); |
| 1865 | - } catch(PDOException $e) { |
|
| 1865 | + } catch (PDOException $e) { |
|
| 1866 | 1866 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; |
| 1867 | 1867 | } |
| 1868 | 1868 | } |
| 1869 | - if (!$Connection->checkColumnName('marine_archive','status_id')) { |
|
| 1869 | + if (!$Connection->checkColumnName('marine_archive', 'status_id')) { |
|
| 1870 | 1870 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL"; |
| 1871 | 1871 | try { |
| 1872 | 1872 | $sth = $Connection->db->prepare($query); |
| 1873 | 1873 | $sth->execute(); |
| 1874 | - } catch(PDOException $e) { |
|
| 1874 | + } catch (PDOException $e) { |
|
| 1875 | 1875 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1876 | 1876 | } |
| 1877 | 1877 | } |
| 1878 | - if (!$Connection->checkColumnName('marine_archive_output','status_id')) { |
|
| 1878 | + if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { |
|
| 1879 | 1879 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL"; |
| 1880 | 1880 | try { |
| 1881 | 1881 | $sth = $Connection->db->prepare($query); |
| 1882 | 1882 | $sth->execute(); |
| 1883 | - } catch(PDOException $e) { |
|
| 1883 | + } catch (PDOException $e) { |
|
| 1884 | 1884 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1885 | 1885 | } |
| 1886 | 1886 | } |
@@ -1889,7 +1889,7 @@ discard block |
||
| 1889 | 1889 | try { |
| 1890 | 1890 | $sth = $Connection->db->prepare($query); |
| 1891 | 1891 | $sth->execute(); |
| 1892 | - } catch(PDOException $e) { |
|
| 1892 | + } catch (PDOException $e) { |
|
| 1893 | 1893 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1894 | 1894 | } |
| 1895 | 1895 | return $error; |
@@ -1904,14 +1904,14 @@ discard block |
||
| 1904 | 1904 | try { |
| 1905 | 1905 | $sth = $Connection->db->prepare($query); |
| 1906 | 1906 | $sth->execute(); |
| 1907 | - } catch(PDOException $e) { |
|
| 1907 | + } catch (PDOException $e) { |
|
| 1908 | 1908 | return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n"; |
| 1909 | 1909 | } |
| 1910 | 1910 | $query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL"; |
| 1911 | 1911 | try { |
| 1912 | 1912 | $sth = $Connection->db->prepare($query); |
| 1913 | 1913 | $sth->execute(); |
| 1914 | - } catch(PDOException $e) { |
|
| 1914 | + } catch (PDOException $e) { |
|
| 1915 | 1915 | return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n"; |
| 1916 | 1916 | } |
| 1917 | 1917 | } else { |
@@ -1919,14 +1919,14 @@ discard block |
||
| 1919 | 1919 | try { |
| 1920 | 1920 | $sth = $Connection->db->prepare($query); |
| 1921 | 1921 | $sth->execute(); |
| 1922 | - } catch(PDOException $e) { |
|
| 1922 | + } catch (PDOException $e) { |
|
| 1923 | 1923 | return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n"; |
| 1924 | 1924 | } |
| 1925 | 1925 | $query = "alter table marine_identity alter column mmsi type varchar(255)"; |
| 1926 | 1926 | try { |
| 1927 | 1927 | $sth = $Connection->db->prepare($query); |
| 1928 | 1928 | $sth->execute(); |
| 1929 | - } catch(PDOException $e) { |
|
| 1929 | + } catch (PDOException $e) { |
|
| 1930 | 1930 | return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n"; |
| 1931 | 1931 | } |
| 1932 | 1932 | } |
@@ -1934,7 +1934,7 @@ discard block |
||
| 1934 | 1934 | try { |
| 1935 | 1935 | $sth = $Connection->db->prepare($query); |
| 1936 | 1936 | $sth->execute(); |
| 1937 | - } catch(PDOException $e) { |
|
| 1937 | + } catch (PDOException $e) { |
|
| 1938 | 1938 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1939 | 1939 | } |
| 1940 | 1940 | return $error; |
@@ -1944,32 +1944,32 @@ discard block |
||
| 1944 | 1944 | global $globalDBdriver; |
| 1945 | 1945 | $Connection = new Connection(); |
| 1946 | 1946 | $error = ''; |
| 1947 | - if (!$Connection->checkColumnName('source_location','last_seen')) { |
|
| 1947 | + if (!$Connection->checkColumnName('source_location', 'last_seen')) { |
|
| 1948 | 1948 | $query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL"; |
| 1949 | 1949 | try { |
| 1950 | 1950 | $sth = $Connection->db->prepare($query); |
| 1951 | 1951 | $sth->execute(); |
| 1952 | - } catch(PDOException $e) { |
|
| 1952 | + } catch (PDOException $e) { |
|
| 1953 | 1953 | return "error (add column last_seen in source_location) : ".$e->getMessage()."\n"; |
| 1954 | 1954 | } |
| 1955 | 1955 | } |
| 1956 | 1956 | if ($globalDBdriver == 'mysql') { |
| 1957 | - if (!$Connection->checkColumnName('source_location','location_id')) { |
|
| 1957 | + if (!$Connection->checkColumnName('source_location', 'location_id')) { |
|
| 1958 | 1958 | $query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL"; |
| 1959 | 1959 | try { |
| 1960 | 1960 | $sth = $Connection->db->prepare($query); |
| 1961 | 1961 | $sth->execute(); |
| 1962 | - } catch(PDOException $e) { |
|
| 1962 | + } catch (PDOException $e) { |
|
| 1963 | 1963 | return "error (add column location_id in source_location) : ".$e->getMessage()."\n"; |
| 1964 | 1964 | } |
| 1965 | 1965 | } |
| 1966 | 1966 | } else { |
| 1967 | - if (!$Connection->checkColumnName('source_location','location_id')) { |
|
| 1967 | + if (!$Connection->checkColumnName('source_location', 'location_id')) { |
|
| 1968 | 1968 | $query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL"; |
| 1969 | 1969 | try { |
| 1970 | 1970 | $sth = $Connection->db->prepare($query); |
| 1971 | 1971 | $sth->execute(); |
| 1972 | - } catch(PDOException $e) { |
|
| 1972 | + } catch (PDOException $e) { |
|
| 1973 | 1973 | return "error (add column location_id in source_location) : ".$e->getMessage()."\n"; |
| 1974 | 1974 | } |
| 1975 | 1975 | } |
@@ -1978,7 +1978,7 @@ discard block |
||
| 1978 | 1978 | try { |
| 1979 | 1979 | $sth = $Connection->db->prepare($query); |
| 1980 | 1980 | $sth->execute(); |
| 1981 | - } catch(PDOException $e) { |
|
| 1981 | + } catch (PDOException $e) { |
|
| 1982 | 1982 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1983 | 1983 | } |
| 1984 | 1984 | return $error; |
@@ -1988,12 +1988,12 @@ discard block |
||
| 1988 | 1988 | global $globalDBdriver; |
| 1989 | 1989 | $Connection = new Connection(); |
| 1990 | 1990 | $error = ''; |
| 1991 | - if (!$Connection->checkColumnName('source_location','description')) { |
|
| 1991 | + if (!$Connection->checkColumnName('source_location', 'description')) { |
|
| 1992 | 1992 | $query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL"; |
| 1993 | 1993 | try { |
| 1994 | 1994 | $sth = $Connection->db->prepare($query); |
| 1995 | 1995 | $sth->execute(); |
| 1996 | - } catch(PDOException $e) { |
|
| 1996 | + } catch (PDOException $e) { |
|
| 1997 | 1997 | return "error (add column description in source_location) : ".$e->getMessage()."\n"; |
| 1998 | 1998 | } |
| 1999 | 1999 | } |
@@ -2001,7 +2001,7 @@ discard block |
||
| 2001 | 2001 | try { |
| 2002 | 2002 | $sth = $Connection->db->prepare($query); |
| 2003 | 2003 | $sth->execute(); |
| 2004 | - } catch(PDOException $e) { |
|
| 2004 | + } catch (PDOException $e) { |
|
| 2005 | 2005 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2006 | 2006 | } |
| 2007 | 2007 | return $error; |
@@ -2011,39 +2011,39 @@ discard block |
||
| 2011 | 2011 | global $globalDBdriver; |
| 2012 | 2012 | $Connection = new Connection(); |
| 2013 | 2013 | $error = ''; |
| 2014 | - if (!$Connection->checkColumnName('spotter_live','real_altitude')) { |
|
| 2014 | + if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) { |
|
| 2015 | 2015 | $query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2016 | 2016 | try { |
| 2017 | 2017 | $sth = $Connection->db->prepare($query); |
| 2018 | 2018 | $sth->execute(); |
| 2019 | - } catch(PDOException $e) { |
|
| 2019 | + } catch (PDOException $e) { |
|
| 2020 | 2020 | return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n"; |
| 2021 | 2021 | } |
| 2022 | 2022 | } |
| 2023 | - if (!$Connection->checkColumnName('spotter_output','real_altitude')) { |
|
| 2023 | + if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) { |
|
| 2024 | 2024 | $query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2025 | 2025 | try { |
| 2026 | 2026 | $sth = $Connection->db->prepare($query); |
| 2027 | 2027 | $sth->execute(); |
| 2028 | - } catch(PDOException $e) { |
|
| 2028 | + } catch (PDOException $e) { |
|
| 2029 | 2029 | return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n"; |
| 2030 | 2030 | } |
| 2031 | 2031 | } |
| 2032 | - if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) { |
|
| 2032 | + if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) { |
|
| 2033 | 2033 | $query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2034 | 2034 | try { |
| 2035 | 2035 | $sth = $Connection->db->prepare($query); |
| 2036 | 2036 | $sth->execute(); |
| 2037 | - } catch(PDOException $e) { |
|
| 2037 | + } catch (PDOException $e) { |
|
| 2038 | 2038 | return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n"; |
| 2039 | 2039 | } |
| 2040 | 2040 | } |
| 2041 | - if (!$Connection->checkColumnName('spotter_archive','real_altitude')) { |
|
| 2041 | + if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) { |
|
| 2042 | 2042 | $query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2043 | 2043 | try { |
| 2044 | 2044 | $sth = $Connection->db->prepare($query); |
| 2045 | 2045 | $sth->execute(); |
| 2046 | - } catch(PDOException $e) { |
|
| 2046 | + } catch (PDOException $e) { |
|
| 2047 | 2047 | return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n"; |
| 2048 | 2048 | } |
| 2049 | 2049 | } |
@@ -2051,7 +2051,7 @@ discard block |
||
| 2051 | 2051 | try { |
| 2052 | 2052 | $sth = $Connection->db->prepare($query); |
| 2053 | 2053 | $sth->execute(); |
| 2054 | - } catch(PDOException $e) { |
|
| 2054 | + } catch (PDOException $e) { |
|
| 2055 | 2055 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2056 | 2056 | } |
| 2057 | 2057 | return $error; |
@@ -2073,14 +2073,14 @@ discard block |
||
| 2073 | 2073 | try { |
| 2074 | 2074 | $sth = $Connection->db->prepare($query); |
| 2075 | 2075 | $sth->execute(); |
| 2076 | - } catch(PDOException $e) { |
|
| 2076 | + } catch (PDOException $e) { |
|
| 2077 | 2077 | return "error (modify column altitude in tracker_*) : ".$e->getMessage()."\n"; |
| 2078 | 2078 | } |
| 2079 | 2079 | $query = "UPDATE config SET value = '44' WHERE name = 'schema_version'"; |
| 2080 | 2080 | try { |
| 2081 | 2081 | $sth = $Connection->db->prepare($query); |
| 2082 | 2082 | $sth->execute(); |
| 2083 | - } catch(PDOException $e) { |
|
| 2083 | + } catch (PDOException $e) { |
|
| 2084 | 2084 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2085 | 2085 | } |
| 2086 | 2086 | return $error; |
@@ -2103,7 +2103,7 @@ discard block |
||
| 2103 | 2103 | try { |
| 2104 | 2104 | $sth = $Connection->db->prepare($query); |
| 2105 | 2105 | $sth->execute(); |
| 2106 | - } catch(PDOException $e) { |
|
| 2106 | + } catch (PDOException $e) { |
|
| 2107 | 2107 | return "error : ".$e->getMessage()."\n"; |
| 2108 | 2108 | } |
| 2109 | 2109 | $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 = 44; |
| 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); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | if (isset($this->all_tracked[$key]['id'])) { |
| 48 | 48 | //echo $this->all_tracked[$key]['id'].' - '.$this->all_tracked[$key]['latitude'].' '.$this->all_tracked[$key]['longitude']."\n"; |
| 49 | 49 | $Tracker = new Tracker($this->db); |
| 50 | - $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed'],$this->all_tracked[$key]['datetime']); |
|
| 50 | + $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['altitude'], $this->all_tracked[$key]['speed'], $this->all_tracked[$key]['datetime']); |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | if ($globalDebug) echo 'Delete old values and update latest data...'."\n"; |
| 59 | 59 | foreach ($this->all_tracked as $key => $flight) { |
| 60 | 60 | if (isset($flight['lastupdate'])) { |
| 61 | - if ($flight['lastupdate'] < (time()-3000)) { |
|
| 61 | + if ($flight['lastupdate'] < (time() - 3000)) { |
|
| 62 | 62 | if (isset($this->all_tracked[$key]['id'])) { |
| 63 | 63 | if ($globalDebug) echo "--- Delete old values with id ".$this->all_tracked[$key]['id']."\n"; |
| 64 | 64 | /* |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | //$real_arrival = $this->arrival($key); |
| 70 | 70 | $Tracker = new Tracker($this->db); |
| 71 | 71 | if ($this->all_tracked[$key]['latitude'] != '' && $this->all_tracked[$key]['longitude'] != '') { |
| 72 | - $result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'],$this->all_tracked[$key]['ident'],$this->all_tracked[$key]['latitude'],$this->all_tracked[$key]['longitude'],$this->all_tracked[$key]['altitude'],$this->all_tracked[$key]['speed']); |
|
| 72 | + $result = $Tracker->updateLatestTrackerData($this->all_tracked[$key]['id'], $this->all_tracked[$key]['ident'], $this->all_tracked[$key]['latitude'], $this->all_tracked[$key]['longitude'], $this->all_tracked[$key]['altitude'], $this->all_tracked[$key]['speed']); |
|
| 73 | 73 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 74 | 74 | } |
| 75 | 75 | // Put in archive |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | $send = false; |
| 90 | 90 | |
| 91 | 91 | // SBS format is CSV format |
| 92 | - if(is_array($line) && isset($line['ident'])) { |
|
| 92 | + if (is_array($line) && isset($line['ident'])) { |
|
| 93 | 93 | //print_r($line); |
| 94 | 94 | if (isset($line['ident'])) { |
| 95 | 95 | |
@@ -113,33 +113,33 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | if (!isset($this->all_tracked[$id])) { |
| 115 | 115 | $this->all_tracked[$id] = array(); |
| 116 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('addedTracker' => 0)); |
|
| 117 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => '','latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '','source_name' => '','comment'=> '','type' => '','noarchive' => false,'putinarchive' => true,'over_country' => '')); |
|
| 118 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('lastupdate' => time())); |
|
| 116 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('addedTracker' => 0)); |
|
| 117 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => '', 'latitude' => '', 'longitude' => '', 'speed' => '', 'altitude' => '', 'heading' => '', 'format_source' => '', 'source_name' => '', 'comment'=> '', 'type' => '', 'noarchive' => false, 'putinarchive' => true, 'over_country' => '')); |
|
| 118 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('lastupdate' => time())); |
|
| 119 | 119 | if (!isset($line['id'])) { |
| 120 | 120 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 121 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $id.'-'.date('YmdHi'))); |
|
| 122 | - } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $line['id'])); |
|
| 121 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $id.'-'.date('YmdHi'))); |
|
| 122 | + } else $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $line['id'])); |
|
| 123 | 123 | if ($globalAllTracked !== FALSE) $dataFound = true; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - if (isset($line['datetime']) && strtotime($line['datetime']) > time()-20*60 && strtotime($line['datetime']) < time()+20*60) { |
|
| 126 | + if (isset($line['datetime']) && strtotime($line['datetime']) > time() - 20*60 && strtotime($line['datetime']) < time() + 20*60) { |
|
| 127 | 127 | if (!isset($this->all_tracked[$id]['datetime']) || strtotime($line['datetime']) >= strtotime($this->all_tracked[$id]['datetime'])) { |
| 128 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => $line['datetime'])); |
|
| 128 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => $line['datetime'])); |
|
| 129 | 129 | } else { |
| 130 | 130 | if (strtotime($line['datetime']) == strtotime($this->all_tracked[$id]['datetime']) && $globalDebug) echo "!!! Date is the same as previous data for ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."\n"; |
| 131 | 131 | 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]['ident']." - format : ".$line['format_source']."\n"; |
| 132 | 132 | return ''; |
| 133 | 133 | } |
| 134 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time()-20*60) { |
|
| 134 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) < time() - 20*60) { |
|
| 135 | 135 | if ($globalDebug) echo "!!! Date is too old ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
| 136 | 136 | return ''; |
| 137 | - } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time()+20*60) { |
|
| 137 | + } elseif (isset($line['datetime']) && strtotime($line['datetime']) > time() + 20*60) { |
|
| 138 | 138 | if ($globalDebug) echo "!!! Date is in the future ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
| 139 | 139 | return ''; |
| 140 | 140 | } elseif (!isset($line['datetime'])) { |
| 141 | 141 | date_default_timezone_set('UTC'); |
| 142 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('datetime' => date('Y-m-d H:i:s'))); |
|
| 142 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('datetime' => date('Y-m-d H:i:s'))); |
|
| 143 | 143 | } else { |
| 144 | 144 | if ($globalDebug) echo "!!! Unknow date error ".$this->all_tracked[$id]['ident']." - format : ".$line['format_source']."!!!"; |
| 145 | 145 | return ''; |
@@ -147,38 +147,38 @@ discard block |
||
| 147 | 147 | |
| 148 | 148 | //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'])) { |
| 149 | 149 | if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && ($this->all_tracked[$id]['ident'] != trim($line['ident']))) { |
| 150 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('ident' => trim($line['ident']))); |
|
| 150 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('ident' => trim($line['ident']))); |
|
| 151 | 151 | if ($this->all_tracked[$id]['addedTracker'] == 1) { |
| 152 | 152 | $timeelapsed = microtime(true); |
| 153 | 153 | $Tracker = new Tracker($this->db); |
| 154 | 154 | $fromsource = NULL; |
| 155 | - $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$fromsource); |
|
| 155 | + $result = $Tracker->updateIdentTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $fromsource); |
|
| 156 | 156 | if ($globalDebug && $result != 'success') echo '!!! ERROR : '.$result."\n"; |
| 157 | 157 | $Tracker->db = null; |
| 158 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 158 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update identspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 159 | 159 | } |
| 160 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'])); |
|
| 160 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'])); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | if (isset($line['speed']) && $line['speed'] != '') { |
| 164 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($line['speed']))); |
|
| 165 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed_fromsrc' => true)); |
|
| 164 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($line['speed']))); |
|
| 165 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed_fromsrc' => true)); |
|
| 166 | 166 | } 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'])) { |
| 167 | - $distance = $Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m'); |
|
| 167 | + $distance = $Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm'); |
|
| 168 | 168 | if ($distance > 100 && $distance < 10000) { |
| 169 | 169 | $speed = $distance/(time() - $this->all_tracked[$id]['time_last_coord']); |
| 170 | 170 | $speed = $speed*3.6; |
| 171 | - if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('speed' => round($speed))); |
|
| 171 | + if ($speed < 1000) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('speed' => round($speed))); |
|
| 172 | 172 | if ($globalDebug) echo "ø Calculated Speed for ".$this->all_tracked[$id]['ident']." : ".$speed." - distance : ".$distance."\n"; |
| 173 | 173 | } |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '' && is_numeric($line['latitude']) && is_numeric($line['longitude'])) { |
| 177 | - if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time()-$this->all_tracked[$id]['time_last_coord']); |
|
| 177 | + if (isset($this->all_tracked[$id]['time_last_coord'])) $timediff = round(time() - $this->all_tracked[$id]['time_last_coord']); |
|
| 178 | 178 | else unset($timediff); |
| 179 | - if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($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')))) { |
|
| 179 | + if ($this->tmd > 5 || !isset($timediff) || $timediff > 100 || ($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')))) { |
|
| 180 | 180 | 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'])) { |
| 181 | - 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'])) { |
|
| 181 | + 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'])) { |
|
| 182 | 182 | $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 183 | 183 | $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 184 | 184 | $this->all_tracked[$id]['putinarchive'] = true; |
@@ -186,10 +186,10 @@ discard block |
||
| 186 | 186 | if ($globalDebug) echo "\n".' ------- Check Country for '.$this->all_tracked[$id]['ident'].' with latitude : '.$line['latitude'].' and longitude : '.$line['longitude'].'.... '; |
| 187 | 187 | $timeelapsed = microtime(true); |
| 188 | 188 | $Tracker = new Tracker($this->db); |
| 189 | - $all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'],$line['longitude']); |
|
| 189 | + $all_country = $Tracker->getCountryFromLatitudeLongitude($line['latitude'], $line['longitude']); |
|
| 190 | 190 | if (!empty($all_country)) $this->all_tracked[$id]['over_country'] = $all_country['iso2']; |
| 191 | 191 | $Tracker->db = null; |
| 192 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 192 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update getCountryFromlatitudeLongitude : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 193 | 193 | $this->tmd = 0; |
| 194 | 194 | if ($globalDebug) echo 'FOUND : '.$this->all_tracked[$id]['over_country'].' ---------------'."\n"; |
| 195 | 195 | } |
@@ -197,73 +197,73 @@ discard block |
||
| 197 | 197 | |
| 198 | 198 | if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) { |
| 199 | 199 | if (!isset($this->all_tracked[$id]['archive_latitude'])) $this->all_tracked[$id]['archive_latitude'] = $line['latitude']; |
| 200 | - 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') { |
|
| 200 | + 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') { |
|
| 201 | 201 | $this->all_tracked[$id]['livedb_latitude'] = $line['latitude']; |
| 202 | 202 | $dataFound = true; |
| 203 | 203 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 204 | 204 | } |
| 205 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('latitude' => $line['latitude'])); |
|
| 205 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('latitude' => $line['latitude'])); |
|
| 206 | 206 | } |
| 207 | 207 | if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) { |
| 208 | 208 | if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360; |
| 209 | 209 | if (!isset($this->all_tracked[$id]['archive_longitude'])) $this->all_tracked[$id]['archive_longitude'] = $line['longitude']; |
| 210 | - 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') { |
|
| 210 | + 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') { |
|
| 211 | 211 | $this->all_tracked[$id]['livedb_longitude'] = $line['longitude']; |
| 212 | 212 | $dataFound = true; |
| 213 | 213 | $this->all_tracked[$id]['time_last_coord'] = time(); |
| 214 | 214 | } |
| 215 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('longitude' => $line['longitude'])); |
|
| 215 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('longitude' => $line['longitude'])); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | } else if ($globalDebug && $timediff > 20) { |
| 219 | 219 | $this->tmd = $this->tmd + 1; |
| 220 | 220 | echo '!!! Too much distance in short time... for '.$this->all_tracked[$id]['ident']."\n"; |
| 221 | - echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')."m -"; |
|
| 222 | - echo 'Speed : '.(($Common->distance($line['latitude'],$line['longitude'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],'m')/$timediff)*3.6)." km/h - "; |
|
| 221 | + echo 'Time : '.$timediff.'s - Distance : '.$Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')."m -"; |
|
| 222 | + echo 'Speed : '.(($Common->distance($line['latitude'], $line['longitude'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], 'm')/$timediff)*3.6)." km/h - "; |
|
| 223 | 223 | echo 'Lat : '.$line['latitude'].' - long : '.$line['longitude'].' - prev lat : '.$this->all_tracked[$id]['latitude'].' - prev long : '.$this->all_tracked[$id]['longitude']." \n"; |
| 224 | 224 | } |
| 225 | 225 | } |
| 226 | 226 | if (isset($line['last_update']) && $line['last_update'] != '') { |
| 227 | 227 | if (isset($this->all_tracked[$id]['last_update']) && $this->all_tracked[$id]['last_update'] != $line['last_update']) $dataFound = true; |
| 228 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('last_update' => $line['last_update'])); |
|
| 228 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('last_update' => $line['last_update'])); |
|
| 229 | 229 | } |
| 230 | 230 | if (isset($line['format_source']) && $line['format_source'] != '') { |
| 231 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('format_source' => $line['format_source'])); |
|
| 231 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('format_source' => $line['format_source'])); |
|
| 232 | 232 | } |
| 233 | 233 | if (isset($line['source_name']) && $line['source_name'] != '') { |
| 234 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('source_name' => $line['source_name'])); |
|
| 234 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('source_name' => $line['source_name'])); |
|
| 235 | 235 | } |
| 236 | 236 | if (isset($line['comment']) && $line['comment'] != '') { |
| 237 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('comment' => $line['comment'])); |
|
| 237 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('comment' => $line['comment'])); |
|
| 238 | 238 | //$dataFound = true; |
| 239 | 239 | } |
| 240 | 240 | if (isset($line['type']) && $line['type'] != '') { |
| 241 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('type' => $line['type'])); |
|
| 241 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('type' => $line['type'])); |
|
| 242 | 242 | //$dataFound = true; |
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | if (isset($line['altitude']) && $line['altitude'] != '') { |
| 246 | 246 | //if (!isset($this->all_tracked[$id]['altitude']) || $this->all_tracked[$id]['altitude'] == '' || ($this->all_tracked[$id]['altitude'] > 0 && $line['altitude'] != 0)) { |
| 247 | - if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100)-$this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 248 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude' => $line['altitude'])); |
|
| 249 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('altitude_real' => $line['altitude'])); |
|
| 247 | + if (is_int($this->all_tracked[$id]['altitude']) && abs(round($line['altitude']/100) - $this->all_tracked[$id]['altitude']) > 3) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 248 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('altitude' => $line['altitude'])); |
|
| 249 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('altitude_real' => $line['altitude'])); |
|
| 250 | 250 | //$dataFound = true; |
| 251 | 251 | //} elseif ($globalDebug) echo "!!! Strange altitude data... not added.\n"; |
| 252 | 252 | } |
| 253 | 253 | |
| 254 | 254 | if (isset($line['noarchive']) && $line['noarchive'] === true) { |
| 255 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('noarchive' => true)); |
|
| 255 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('noarchive' => true)); |
|
| 256 | 256 | } |
| 257 | 257 | |
| 258 | 258 | if (isset($line['heading']) && $line['heading'] != '') { |
| 259 | - if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading']-round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 260 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($line['heading']))); |
|
| 261 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading_fromsrc' => true)); |
|
| 259 | + if (is_int($this->all_tracked[$id]['heading']) && abs($this->all_tracked[$id]['heading'] - round($line['heading'])) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 260 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($line['heading']))); |
|
| 261 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading_fromsrc' => true)); |
|
| 262 | 262 | //$dataFound = true; |
| 263 | 263 | } 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']) { |
| 264 | - $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']); |
|
| 265 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('heading' => round($heading))); |
|
| 266 | - if (abs($this->all_tracked[$id]['heading']-round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 264 | + $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']); |
|
| 265 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('heading' => round($heading))); |
|
| 266 | + if (abs($this->all_tracked[$id]['heading'] - round($heading)) > 10) $this->all_tracked[$id]['putinarchive'] = true; |
|
| 267 | 267 | if ($globalDebug) echo "ø Calculated Heading for ".$this->all_tracked[$id]['ident']." : ".$heading."\n"; |
| 268 | 268 | } |
| 269 | 269 | //if (isset($globalSourcesupdate) && $globalSourcesupdate != '' && isset($this->all_tracked[$id]['lastupdate']) && time()-$this->all_tracked[$id]['lastupdate'] < $globalSourcesupdate) $dataFound = false; |
@@ -271,54 +271,54 @@ discard block |
||
| 271 | 271 | if ($dataFound === true && isset($this->all_tracked[$id]['ident'])) { |
| 272 | 272 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 273 | 273 | if ($this->all_tracked[$id]['addedTracker'] == 0) { |
| 274 | - 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'])) { |
|
| 274 | + 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'])) { |
|
| 275 | 275 | if (!isset($this->all_tracked[$id]['forcenew']) || $this->all_tracked[$id]['forcenew'] == 0) { |
| 276 | 276 | if ($globalDebug) echo "Check if aircraft is already in DB..."; |
| 277 | 277 | $timeelapsed = microtime(true); |
| 278 | 278 | $TrackerLive = new TrackerLive($this->db); |
| 279 | 279 | if (isset($line['id'])) { |
| 280 | 280 | $recent_ident = $TrackerLive->checkIdRecent($line['id']); |
| 281 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 281 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 282 | 282 | } elseif (isset($this->all_tracked[$id]['ident']) && $this->all_tracked[$id]['ident'] != '') { |
| 283 | 283 | $recent_ident = $TrackerLive->checkIdentRecent($this->all_tracked[$id]['ident']); |
| 284 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 284 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update checkIdentRecent : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 285 | 285 | } else $recent_ident = ''; |
| 286 | - $TrackerLive->db=null; |
|
| 286 | + $TrackerLive->db = null; |
|
| 287 | 287 | |
| 288 | 288 | if ($globalDebug && $recent_ident == '') echo " Not in DB.\n"; |
| 289 | 289 | elseif ($globalDebug && $recent_ident != '') echo " Already in DB.\n"; |
| 290 | 290 | } else { |
| 291 | 291 | $recent_ident = ''; |
| 292 | - $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('forcenew' => 0)); |
|
| 292 | + $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('forcenew' => 0)); |
|
| 293 | 293 | } |
| 294 | 294 | //if there was no aircraft with the same callsign within the last hour and go post it into the archive |
| 295 | - if($recent_ident == "") |
|
| 295 | + if ($recent_ident == "") |
|
| 296 | 296 | { |
| 297 | 297 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." in archive DB : "; |
| 298 | 298 | //adds the spotter data for the archive |
| 299 | 299 | $highlight = ''; |
| 300 | - if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id],array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 300 | + if (!isset($this->all_tracked[$id]['id'])) $this->all_tracked[$id] = array_merge($this->all_tracked[$id], array('id' => $this->all_tracked[$id]['ident'].'-'.date('YmdHi'))); |
|
| 301 | 301 | $timeelapsed = microtime(true); |
| 302 | 302 | $Tracker = new Tracker($this->db); |
| 303 | - $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name']); |
|
| 303 | + $result = $Tracker->addTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['comment'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name']); |
|
| 304 | 304 | $Tracker->db = null; |
| 305 | 305 | if ($globalDebug && isset($result)) echo $result."\n"; |
| 306 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 306 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addspotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 307 | 307 | |
| 308 | 308 | |
| 309 | 309 | // Add source stat in DB |
| 310 | 310 | $Stats = new Stats($this->db); |
| 311 | 311 | if (!empty($this->stats)) { |
| 312 | 312 | if ($globalDebug) echo 'Add source stats : '; |
| 313 | - foreach($this->stats as $date => $data) { |
|
| 314 | - foreach($data as $source => $sourced) { |
|
| 313 | + foreach ($this->stats as $date => $data) { |
|
| 314 | + foreach ($data as $source => $sourced) { |
|
| 315 | 315 | //print_r($sourced); |
| 316 | - if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']),$source,'polar_tracker',$date); |
|
| 317 | - if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']),$source,'hist_tracker',$date); |
|
| 316 | + if (isset($sourced['polar'])) echo $Stats->addStatSource(json_encode($sourced['polar']), $source, 'polar_tracker', $date); |
|
| 317 | + if (isset($sourced['hist'])) echo $Stats->addStatSource(json_encode($sourced['hist']), $source, 'hist_tracker', $date); |
|
| 318 | 318 | if (isset($sourced['msg'])) { |
| 319 | 319 | if (time() - $sourced['msg']['date'] > 10) { |
| 320 | 320 | $nbmsg = round($sourced['msg']['nb']/(time() - $sourced['msg']['date'])); |
| 321 | - echo $Stats->addStatSource($nbmsg,$source,'msg_tracker',$date); |
|
| 321 | + echo $Stats->addStatSource($nbmsg, $source, 'msg_tracker', $date); |
|
| 322 | 322 | unset($this->stats[$date][$source]['msg']); |
| 323 | 323 | } |
| 324 | 324 | } |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | //TrackerLive->deleteLiveTrackerDataNotUpdated(); |
| 342 | 342 | $TrackerLive = new TrackerLive($this->db); |
| 343 | 343 | $TrackerLive->deleteLiveTrackerData(); |
| 344 | - $TrackerLive->db=null; |
|
| 344 | + $TrackerLive->db = null; |
|
| 345 | 345 | if ($globalDebug) echo " Done\n"; |
| 346 | 346 | $this->last_delete = time(); |
| 347 | 347 | } |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | $this->all_tracked[$id]['addedTracker'] = 1; |
| 351 | 351 | if (isset($globalDaemon) && !$globalDaemon) { |
| 352 | 352 | $Tracker = new Tracker($this->db); |
| 353 | - $Tracker->updateLatestTrackerData($this->all_tracked[$id]['id'],$this->all_tracked[$id]['ident'],$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude'],$this->all_tracked[$id]['altitude'],$this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime']); |
|
| 353 | + $Tracker->updateLatestTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime']); |
|
| 354 | 354 | $Tracker->db = null; |
| 355 | 355 | } |
| 356 | 356 | |
@@ -364,14 +364,14 @@ discard block |
||
| 364 | 364 | $ignoreImport = false; |
| 365 | 365 | |
| 366 | 366 | if (!$ignoreImport) { |
| 367 | - 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'])) { |
|
| 367 | + 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'])) { |
|
| 368 | 368 | if ($globalDebug) echo "\o/ Add ".$this->all_tracked[$id]['ident']." from ".$this->all_tracked[$id]['format_source']." in Live DB : "; |
| 369 | 369 | $timeelapsed = microtime(true); |
| 370 | 370 | $TrackerLive = new TrackerLive($this->db); |
| 371 | - $result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'],$this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'],$this->all_tracked[$id]['comment'],$this->all_tracked[$id]['type'],$this->all_tracked[$id]['noarchive'],$this->all_tracked[$id]['format_source'],$this->all_tracked[$id]['source_name'],$this->all_tracked[$id]['over_country']); |
|
| 371 | + $result = $TrackerLive->addLiveTrackerData($this->all_tracked[$id]['id'], $this->all_tracked[$id]['ident'], $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude'], $this->all_tracked[$id]['altitude'], $this->all_tracked[$id]['heading'], $this->all_tracked[$id]['speed'], $this->all_tracked[$id]['datetime'], $this->all_tracked[$id]['putinarchive'], $this->all_tracked[$id]['comment'], $this->all_tracked[$id]['type'], $this->all_tracked[$id]['noarchive'], $this->all_tracked[$id]['format_source'], $this->all_tracked[$id]['source_name'], $this->all_tracked[$id]['over_country']); |
|
| 372 | 372 | $TrackerLive->db = null; |
| 373 | 373 | $this->all_tracked[$id]['putinarchive'] = false; |
| 374 | - if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true)-$timeelapsed,2).'s'."\n"; |
|
| 374 | + if ($globalDebugTimeElapsed) echo 'Time elapsed for update addlivespotterdata : '.round(microtime(true) - $timeelapsed, 2).'s'."\n"; |
|
| 375 | 375 | |
| 376 | 376 | // Put statistics in $this->stats variable |
| 377 | 377 | |
@@ -388,19 +388,19 @@ discard block |
||
| 388 | 388 | $latitude = $globalCenterLatitude; |
| 389 | 389 | $longitude = $globalCenterLongitude; |
| 390 | 390 | } |
| 391 | - $this->source_location[$source] = array('latitude' => $latitude,'longitude' => $longitude); |
|
| 391 | + $this->source_location[$source] = array('latitude' => $latitude, 'longitude' => $longitude); |
|
| 392 | 392 | } else { |
| 393 | 393 | $latitude = $this->source_location[$source]['latitude']; |
| 394 | 394 | $longitude = $this->source_location[$source]['longitude']; |
| 395 | 395 | } |
| 396 | - $stats_heading = $Common->getHeading($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 396 | + $stats_heading = $Common->getHeading($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 397 | 397 | //$stats_heading = $stats_heading%22.5; |
| 398 | 398 | $stats_heading = round($stats_heading/22.5); |
| 399 | - $stats_distance = $Common->distance($latitude,$longitude,$this->all_tracked[$id]['latitude'],$this->all_tracked[$id]['longitude']); |
|
| 399 | + $stats_distance = $Common->distance($latitude, $longitude, $this->all_tracked[$id]['latitude'], $this->all_tracked[$id]['longitude']); |
|
| 400 | 400 | $current_date = date('Y-m-d'); |
| 401 | 401 | if ($stats_heading == 16) $stats_heading = 0; |
| 402 | 402 | if (!isset($this->stats[$current_date][$source]['polar'][1])) { |
| 403 | - for ($i=0;$i<=15;$i++) { |
|
| 403 | + for ($i = 0; $i <= 15; $i++) { |
|
| 404 | 404 | $this->stats[$current_date][$source]['polar'][$i] = 0; |
| 405 | 405 | } |
| 406 | 406 | $this->stats[$current_date][$source]['polar'][$stats_heading] = $stats_distance; |
@@ -415,9 +415,9 @@ discard block |
||
| 415 | 415 | if (!isset($this->stats[$current_date][$source]['hist'][$distance])) { |
| 416 | 416 | if (isset($this->stats[$current_date][$source]['hist'][0])) { |
| 417 | 417 | end($this->stats[$current_date][$source]['hist']); |
| 418 | - $mini = key($this->stats[$current_date][$source]['hist'])+10; |
|
| 418 | + $mini = key($this->stats[$current_date][$source]['hist']) + 10; |
|
| 419 | 419 | } else $mini = 0; |
| 420 | - for ($i=$mini;$i<=$distance;$i+=10) { |
|
| 420 | + for ($i = $mini; $i <= $distance; $i += 10) { |
|
| 421 | 421 | $this->stats[$current_date][$source]['hist'][$i] = 0; |
| 422 | 422 | } |
| 423 | 423 | $this->stats[$current_date][$source]['hist'][$distance] = 1; |
@@ -429,7 +429,7 @@ discard block |
||
| 429 | 429 | $this->all_tracked[$id]['lastupdate'] = time(); |
| 430 | 430 | if ($this->all_tracked[$id]['putinarchive']) $send = true; |
| 431 | 431 | if ($globalDebug) echo $result."\n"; |
| 432 | - } 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"; |
|
| 432 | + } 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"; |
|
| 433 | 433 | //$this->del(); |
| 434 | 434 | |
| 435 | 435 | |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | default: |
| 42 | 42 | throw new \Exception("bad resolution can be only one of 1,3"); |
| 43 | 43 | } |
| 44 | - register_shutdown_function(function () { |
|
| 44 | + register_shutdown_function(function() { |
|
| 45 | 45 | $this->closeAllFiles(); |
| 46 | 46 | }); |
| 47 | 47 | } |
@@ -55,10 +55,10 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | private function getElevationAtPosition($fileName, $row, $column) { |
| 57 | 57 | if (!array_key_exists($fileName, $this->openedFiles)) { |
| 58 | - if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) { |
|
| 58 | + if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) { |
|
| 59 | 59 | throw new \Exception("File '{$fileName}' not exists."); |
| 60 | 60 | } |
| 61 | - $file = fopen($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName, "r"); |
|
| 61 | + $file = fopen($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName, "r"); |
|
| 62 | 62 | if ($file === false) { |
| 63 | 63 | throw new \Exception("Cant open file '{$fileName}' for reading."); |
| 64 | 64 | } |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | throw new \Exception("Not implemented yet"); |
| 73 | 73 | } |
| 74 | 74 | $aRow = $this->measPerDeg - $row; |
| 75 | - $position = ($this->measPerDeg * ($aRow - 1)) + $column; |
|
| 75 | + $position = ($this->measPerDeg*($aRow - 1)) + $column; |
|
| 76 | 76 | $position *= 2; |
| 77 | 77 | fseek($file, $position); |
| 78 | 78 | $short = fread($file, 2); |
@@ -100,8 +100,8 @@ discard block |
||
| 100 | 100 | $latSec = $this->getSec($lat); |
| 101 | 101 | $lonSec = $this->getSec($lon); |
| 102 | 102 | |
| 103 | - $Xn = round($latSec / $this->resolution, 3); |
|
| 104 | - $Yn = round($lonSec / $this->resolution, 3); |
|
| 103 | + $Xn = round($latSec/$this->resolution, 3); |
|
| 104 | + $Yn = round($lonSec/$this->resolution, 3); |
|
| 105 | 105 | |
| 106 | 106 | $a1 = round($Xn); |
| 107 | 107 | $a2 = round($Yn); |
@@ -133,55 +133,55 @@ discard block |
||
| 133 | 133 | $b3 = $this->getElevationAtPosition($fName, $b1, $b2); |
| 134 | 134 | $c3 = $this->getElevationAtPosition($fName, $c1, $c2); |
| 135 | 135 | |
| 136 | - $n1 = ($c2 - $a2) * ($b3 - $a3) - ($c3 - $a3) * ($b2 - $a2); |
|
| 137 | - $n2 = ($c3 - $a3) * ($b1 - $a1) - ($c1 - $a1) * ($b3 - $a3); |
|
| 138 | - $n3 = ($c1 - $a1) * ($b2 - $a2) - ($c2 - $a2) * ($b1 - $a1); |
|
| 136 | + $n1 = ($c2 - $a2)*($b3 - $a3) - ($c3 - $a3)*($b2 - $a2); |
|
| 137 | + $n2 = ($c3 - $a3)*($b1 - $a1) - ($c1 - $a1)*($b3 - $a3); |
|
| 138 | + $n3 = ($c1 - $a1)*($b2 - $a2) - ($c2 - $a2)*($b1 - $a1); |
|
| 139 | 139 | |
| 140 | - $d = -$n1 * $a1 - $n2 * $a2 - $n3 * $a3; |
|
| 141 | - $zN = (-$n1 * $Xn - $n2 * $Yn - $d) / $n3; |
|
| 140 | + $d = -$n1*$a1 - $n2*$a2 - $n3*$a3; |
|
| 141 | + $zN = (-$n1*$Xn - $n2*$Yn - $d)/$n3; |
|
| 142 | 142 | |
| 143 | 143 | return $zN; |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | private function getDeg($deg, $numPrefix) { |
| 147 | 147 | $deg = abs($deg); |
| 148 | - $d = floor($deg); // round degrees |
|
| 148 | + $d = floor($deg); // round degrees |
|
| 149 | 149 | if ($numPrefix >= 3) { |
| 150 | 150 | if ($d < 100) { |
| 151 | - $d = '0' . $d; |
|
| 151 | + $d = '0'.$d; |
|
| 152 | 152 | } |
| 153 | 153 | } // pad with leading zeros |
| 154 | 154 | if ($d < 10) { |
| 155 | - $d = '0' . $d; |
|
| 155 | + $d = '0'.$d; |
|
| 156 | 156 | } |
| 157 | 157 | return $d; |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | private function getSec($deg) { |
| 161 | 161 | $deg = abs($deg); |
| 162 | - $sec = round($deg * 3600, 4); |
|
| 163 | - $m = fmod(floor($sec / 60), 60); |
|
| 162 | + $sec = round($deg*3600, 4); |
|
| 163 | + $m = fmod(floor($sec/60), 60); |
|
| 164 | 164 | $s = round(fmod($sec, 60), 4); |
| 165 | - return ($m * 60) + $s; |
|
| 165 | + return ($m*60) + $s; |
|
| 166 | 166 | } |
| 167 | 167 | |
| 168 | - public function download($lat,$lon, $debug = false) { |
|
| 168 | + public function download($lat, $lon, $debug = false) { |
|
| 169 | 169 | $N = $this->getDeg($lat, 2); |
| 170 | 170 | $E = $this->getDeg($lon, 3); |
| 171 | - $fileName = "N{$N}E{$E}.hgt"; |
|
| 172 | - if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName)) { |
|
| 171 | + $fileName = "N{$N}E{$E}.hgt"; |
|
| 172 | + if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName)) { |
|
| 173 | 173 | $Common = new Common(); |
| 174 | 174 | if ($debug) echo 'Downloading '.$fileName.'.gz ...'; |
| 175 | - $Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz'); |
|
| 176 | - if (!file_exists($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz')) { |
|
| 175 | + $Common->download('https://s3.amazonaws.com/elevation-tiles-prod/skadi/N'.$N.'/'.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz'); |
|
| 176 | + if (!file_exists($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz')) { |
|
| 177 | 177 | if ($debug) echo "File '{$fileName}.gz' not exists."; |
| 178 | 178 | return false; |
| 179 | 179 | } |
| 180 | 180 | if ($debug) echo 'Done'."\n"; |
| 181 | 181 | if ($debug) echo 'Decompress '.$fileName.' ....'; |
| 182 | - $Common->gunzip($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz',$this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName); |
|
| 182 | + $Common->gunzip($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz', $this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName); |
|
| 183 | 183 | if ($debug) echo 'Done'."\n"; |
| 184 | - unlink($this->htgFilesDestination . DIRECTORY_SEPARATOR . $fileName . '.gz'); |
|
| 184 | + unlink($this->htgFilesDestination.DIRECTORY_SEPARATOR.$fileName.'.gz'); |
|
| 185 | 185 | } |
| 186 | 186 | return true; |
| 187 | 187 | } |
@@ -194,22 +194,22 @@ discard block |
||
| 194 | 194 | try { |
| 195 | 195 | $sth = $db->prepare($query); |
| 196 | 196 | $sth->execute($query_values); |
| 197 | - } catch(PDOException $e) { |
|
| 197 | + } catch (PDOException $e) { |
|
| 198 | 198 | return "error : ".$e->getMessage(); |
| 199 | 199 | } |
| 200 | 200 | while ($data = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 201 | - $this->download($data['latitude'],$data['longitude'],true); |
|
| 201 | + $this->download($data['latitude'], $data['longitude'], true); |
|
| 202 | 202 | } |
| 203 | 203 | $query = 'SELECT latitude, longitude FROM tracker_output WHERE latitude <> 0 AND longitude <> 0 ORDER BY date DESC LIMIT 100'; |
| 204 | 204 | $query_values = array(); |
| 205 | 205 | try { |
| 206 | 206 | $sth = $db->prepare($query); |
| 207 | 207 | $sth->execute($query_values); |
| 208 | - } catch(PDOException $e) { |
|
| 208 | + } catch (PDOException $e) { |
|
| 209 | 209 | return "error : ".$e->getMessage(); |
| 210 | 210 | } |
| 211 | 211 | while ($data = $sth->fetch(PDO::FETCH_ASSOC)) { |
| 212 | - $this->download($data['latitude'],$data['longitude'],true); |
|
| 212 | + $this->download($data['latitude'], $data['longitude'], true); |
|
| 213 | 213 | } |
| 214 | 214 | } |
| 215 | 215 | } |
@@ -46,20 +46,20 @@ discard block |
||
| 46 | 46 | die; |
| 47 | 47 | } |
| 48 | 48 | //$hosts = array($globalSBS1Host.':'.$globalSBS1Port); |
| 49 | - $globalSources[] = array('host' => $globalSBS1Host,'port' => $globalSBS1Port); |
|
| 49 | + $globalSources[] = array('host' => $globalSBS1Host, 'port' => $globalSBS1Port); |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | -$options = getopt('s::',array('source::','server','nodaemon','idsource::','aprsserverssid::','aprsserverpass::','aprsserverhost::','aprsserverport::','format::','noaprsserver')); |
|
| 53 | +$options = getopt('s::', array('source::', 'server', 'nodaemon', 'idsource::', 'aprsserverssid::', 'aprsserverpass::', 'aprsserverhost::', 'aprsserverport::', 'format::', 'noaprsserver')); |
|
| 54 | 54 | //if (isset($options['s'])) $hosts = array($options['s']); |
| 55 | 55 | //elseif (isset($options['source'])) $hosts = array($options['source']); |
| 56 | 56 | if (isset($options['s'])) { |
| 57 | 57 | $globalSources = array(); |
| 58 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['s'],'format' => $options['format']); |
|
| 58 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['s'], 'format' => $options['format']); |
|
| 59 | 59 | else $globalSources[] = array('host' => $options['s']); |
| 60 | 60 | } elseif (isset($options['source'])) { |
| 61 | 61 | $globalSources = array(); |
| 62 | - if (isset($options['format'])) $globalSources[] = array('host' => $options['source'],'format' => $options['format']); |
|
| 62 | + if (isset($options['format'])) $globalSources[] = array('host' => $options['source'], 'format' => $options['format']); |
|
| 63 | 63 | else $globalSources[] = array('host' => $options['source']); |
| 64 | 64 | } |
| 65 | 65 | if (isset($options['aprsserverhost'])) { |
@@ -76,28 +76,28 @@ discard block |
||
| 76 | 76 | else $id_source = 1; |
| 77 | 77 | if (isset($globalServer) && $globalServer) { |
| 78 | 78 | if ($globalDebug) echo "Using Server Mode\n"; |
| 79 | - $SI=new SpotterServer(); |
|
| 79 | + $SI = new SpotterServer(); |
|
| 80 | 80 | /* |
| 81 | 81 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 82 | 82 | $SI = new adsb2aprs(); |
| 83 | 83 | $SI->connect(); |
| 84 | 84 | */ |
| 85 | -} else $SI=new SpotterImport($Connection->db); |
|
| 85 | +} else $SI = new SpotterImport($Connection->db); |
|
| 86 | 86 | if (isset($globalTracker) && $globalTracker) $TI = new TrackerImport($Connection->db); |
| 87 | 87 | if (isset($globalMarine) && $globalMarine) { |
| 88 | 88 | $AIS = new AIS(); |
| 89 | 89 | $MI = new MarineImport($Connection->db); |
| 90 | 90 | } |
| 91 | 91 | //$APRS=new APRS($Connection->db); |
| 92 | -$SBS=new SBS(); |
|
| 93 | -$ACARS=new ACARS($Connection->db); |
|
| 94 | -$Source=new Source($Connection->db); |
|
| 95 | -$Common=new Common(); |
|
| 92 | +$SBS = new SBS(); |
|
| 93 | +$ACARS = new ACARS($Connection->db); |
|
| 94 | +$Source = new Source($Connection->db); |
|
| 95 | +$Common = new Common(); |
|
| 96 | 96 | date_default_timezone_set('UTC'); |
| 97 | 97 | //$servertz = system('date +%Z'); |
| 98 | 98 | // signal handler - playing nice with sockets and dump1090 |
| 99 | 99 | if (function_exists('pcntl_fork')) { |
| 100 | - pcntl_signal(SIGINT, function() { |
|
| 100 | + pcntl_signal(SIGINT, function() { |
|
| 101 | 101 | global $sockets; |
| 102 | 102 | echo "\n\nctrl-c or kill signal received. Tidying up ... "; |
| 103 | 103 | die("Bye!\n"); |
@@ -113,30 +113,30 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | function connect_all($hosts) { |
| 115 | 115 | //global $sockets, $formats, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs; |
| 116 | - global $sockets,$httpfeeds, $globalSources, $globalDebug,$aprs_connect,$last_exec, $globalSourcesRights, $use_aprs, $reset,$context; |
|
| 116 | + global $sockets, $httpfeeds, $globalSources, $globalDebug, $aprs_connect, $last_exec, $globalSourcesRights, $use_aprs, $reset, $context; |
|
| 117 | 117 | $reset++; |
| 118 | 118 | if ($globalDebug) echo 'Connect to all...'."\n"; |
| 119 | 119 | foreach ($hosts as $id => $value) { |
| 120 | 120 | $host = $value['host']; |
| 121 | 121 | $globalSources[$id]['last_exec'] = 0; |
| 122 | 122 | // Here we check type of source(s) |
| 123 | - if (filter_var($host,FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
|
| 124 | - if (preg_match('/deltadb.txt$/i',$host)) { |
|
| 123 | + if (filter_var($host, FILTER_VALIDATE_URL) && (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto')) { |
|
| 124 | + if (preg_match('/deltadb.txt$/i', $host)) { |
|
| 125 | 125 | //$formats[$id] = 'deltadbtxt'; |
| 126 | 126 | $globalSources[$id]['format'] = 'deltadbtxt'; |
| 127 | 127 | //$last_exec['deltadbtxt'] = 0; |
| 128 | 128 | if ($globalDebug) echo "Connect to deltadb source (".$host.")...\n"; |
| 129 | - } else if (preg_match('/vatsim-data.txt$/i',$host)) { |
|
| 129 | + } else if (preg_match('/vatsim-data.txt$/i', $host)) { |
|
| 130 | 130 | //$formats[$id] = 'vatsimtxt'; |
| 131 | 131 | $globalSources[$id]['format'] = 'vatsimtxt'; |
| 132 | 132 | //$last_exec['vatsimtxt'] = 0; |
| 133 | 133 | if ($globalDebug) echo "Connect to vatsim source (".$host.")...\n"; |
| 134 | - } else if (preg_match('/aircraftlist.json$/i',$host)) { |
|
| 134 | + } else if (preg_match('/aircraftlist.json$/i', $host)) { |
|
| 135 | 135 | //$formats[$id] = 'aircraftlistjson'; |
| 136 | 136 | $globalSources[$id]['format'] = 'aircraftlistjson'; |
| 137 | 137 | //$last_exec['aircraftlistjson'] = 0; |
| 138 | 138 | if ($globalDebug) echo "Connect to aircraftlist.json source (".$host.")...\n"; |
| 139 | - } else if (preg_match('/opensky/i',$host)) { |
|
| 139 | + } else if (preg_match('/opensky/i', $host)) { |
|
| 140 | 140 | //$formats[$id] = 'aircraftlistjson'; |
| 141 | 141 | $globalSources[$id]['format'] = 'opensky'; |
| 142 | 142 | //$last_exec['aircraftlistjson'] = 0; |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | exit(0); |
| 154 | 154 | } |
| 155 | 155 | */ |
| 156 | - } else if (preg_match('/planeUpdateFAA.php$/i',$host)) { |
|
| 156 | + } else if (preg_match('/planeUpdateFAA.php$/i', $host)) { |
|
| 157 | 157 | //$formats[$id] = 'planeupdatefaa'; |
| 158 | 158 | $globalSources[$id]['format'] = 'planeupdatefaa'; |
| 159 | 159 | //$last_exec['planeupdatefaa'] = 0; |
@@ -162,29 +162,29 @@ discard block |
||
| 162 | 162 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 163 | 163 | exit(0); |
| 164 | 164 | } |
| 165 | - } else if (preg_match('/\/action.php\/acars\/data$/i',$host)) { |
|
| 165 | + } else if (preg_match('/\/action.php\/acars\/data$/i', $host)) { |
|
| 166 | 166 | //$formats[$id] = 'phpvmacars'; |
| 167 | 167 | $globalSources[$id]['format'] = 'phpvmacars'; |
| 168 | 168 | //$last_exec['phpvmacars'] = 0; |
| 169 | 169 | if ($globalDebug) echo "Connect to phpvmacars source (".$host.")...\n"; |
| 170 | - } else if (preg_match('/VAM-json.php$/i',$host)) { |
|
| 170 | + } else if (preg_match('/VAM-json.php$/i', $host)) { |
|
| 171 | 171 | //$formats[$id] = 'phpvmacars'; |
| 172 | 172 | $globalSources[$id]['format'] = 'vam'; |
| 173 | 173 | if ($globalDebug) echo "Connect to Vam source (".$host.")...\n"; |
| 174 | - } else if (preg_match('/whazzup/i',$host)) { |
|
| 174 | + } else if (preg_match('/whazzup/i', $host)) { |
|
| 175 | 175 | //$formats[$id] = 'whazzup'; |
| 176 | 176 | $globalSources[$id]['format'] = 'whazzup'; |
| 177 | 177 | //$last_exec['whazzup'] = 0; |
| 178 | 178 | if ($globalDebug) echo "Connect to whazzup source (".$host.")...\n"; |
| 179 | - } else if (preg_match('/airwhere/i',$host)) { |
|
| 179 | + } else if (preg_match('/airwhere/i', $host)) { |
|
| 180 | 180 | $globalSources[$id]['format'] = 'airwhere'; |
| 181 | 181 | if ($globalDebug) echo "Connect to airwhere source (".$host.")...\n"; |
| 182 | - } else if (preg_match('/recentpireps/i',$host)) { |
|
| 182 | + } else if (preg_match('/recentpireps/i', $host)) { |
|
| 183 | 183 | //$formats[$id] = 'pirepsjson'; |
| 184 | 184 | $globalSources[$id]['format'] = 'pirepsjson'; |
| 185 | 185 | //$last_exec['pirepsjson'] = 0; |
| 186 | 186 | if ($globalDebug) echo "Connect to pirepsjson source (".$host.")...\n"; |
| 187 | - } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i',$host)) { |
|
| 187 | + } else if (preg_match(':data.fr24.com/zones/fcgi/feed.js:i', $host)) { |
|
| 188 | 188 | //$formats[$id] = 'fr24json'; |
| 189 | 189 | $globalSources[$id]['format'] = 'fr24json'; |
| 190 | 190 | //$last_exec['fr24json'] = 0; |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | echo '!!! You MUST set $globalSourcesRights = TRUE in settings.php if you have the right to use this feed !!!'."\n"; |
| 194 | 194 | exit(0); |
| 195 | 195 | } |
| 196 | - } else if (preg_match(':myshiptracking.com/:i',$host)) { |
|
| 196 | + } else if (preg_match(':myshiptracking.com/:i', $host)) { |
|
| 197 | 197 | //$formats[$id] = 'fr24json'; |
| 198 | 198 | $globalSources[$id]['format'] = 'myshiptracking'; |
| 199 | 199 | //$last_exec['fr24json'] = 0; |
@@ -203,22 +203,22 @@ discard block |
||
| 203 | 203 | exit(0); |
| 204 | 204 | } |
| 205 | 205 | //} else if (preg_match('/10001/',$host)) { |
| 206 | - } else if (preg_match('/10001/',$host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 206 | + } else if (preg_match('/10001/', $host) || (isset($globalSources[$id]['port']) && $globalSources[$id]['port'] == '10001')) { |
|
| 207 | 207 | //$formats[$id] = 'tsv'; |
| 208 | 208 | $globalSources[$id]['format'] = 'tsv'; |
| 209 | 209 | if ($globalDebug) echo "Connect to tsv source (".$host.")...\n"; |
| 210 | 210 | } |
| 211 | - } elseif (filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 211 | + } elseif (filter_var($host, FILTER_VALIDATE_URL)) { |
|
| 212 | 212 | if ($globalSources[$id]['format'] == 'aisnmeahttp') { |
| 213 | - $idf = fopen($globalSources[$id]['host'],'r',false,$context); |
|
| 213 | + $idf = fopen($globalSources[$id]['host'], 'r', false, $context); |
|
| 214 | 214 | if ($idf !== false) { |
| 215 | 215 | $httpfeeds[$id] = $idf; |
| 216 | 216 | if ($globalDebug) echo "Connected to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
| 217 | 217 | } |
| 218 | 218 | elseif ($globalDebug) echo "Can't connect to ".$globalSources[$id]['host']."\n"; |
| 219 | 219 | } elseif ($globalDebug) echo "Connect to ".$globalSources[$id]['format']." source (".$host.")...\n"; |
| 220 | - } elseif (!filter_var($host,FILTER_VALIDATE_URL)) { |
|
| 221 | - $hostport = explode(':',$host); |
|
| 220 | + } elseif (!filter_var($host, FILTER_VALIDATE_URL)) { |
|
| 221 | + $hostport = explode(':', $host); |
|
| 222 | 222 | if (isset($hostport[1])) { |
| 223 | 223 | $port = $hostport[1]; |
| 224 | 224 | $hostn = $hostport[0]; |
@@ -228,19 +228,19 @@ discard block |
||
| 228 | 228 | } |
| 229 | 229 | $Common = new Common(); |
| 230 | 230 | if (!isset($globalSources[$id]['format']) || ($globalSources[$id]['format'] != 'acars' && $globalSources[$id]['format'] != 'flightgearsp')) { |
| 231 | - $s = $Common->create_socket($hostn,$port, $errno, $errstr); |
|
| 231 | + $s = $Common->create_socket($hostn, $port, $errno, $errstr); |
|
| 232 | 232 | } else { |
| 233 | - $s = $Common->create_socket_udp($hostn,$port, $errno, $errstr); |
|
| 233 | + $s = $Common->create_socket_udp($hostn, $port, $errno, $errstr); |
|
| 234 | 234 | } |
| 235 | 235 | if ($s) { |
| 236 | 236 | $sockets[$id] = $s; |
| 237 | 237 | if (!isset($globalSources[$id]['format']) || strtolower($globalSources[$id]['format']) == 'auto') { |
| 238 | - if (preg_match('/aprs/',$hostn) || $port == '10152' || $port == '14580') { |
|
| 238 | + if (preg_match('/aprs/', $hostn) || $port == '10152' || $port == '14580') { |
|
| 239 | 239 | //$formats[$id] = 'aprs'; |
| 240 | 240 | $globalSources[$id]['format'] = 'aprs'; |
| 241 | 241 | //$aprs_connect = 0; |
| 242 | 242 | //$use_aprs = true; |
| 243 | - } elseif (preg_match('/pub-vrs/',$hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 243 | + } elseif (preg_match('/pub-vrs/', $hostn) || $port == '32001' || $port == '32005' || $port == '32010' || $port == '32015' || $port == '32030') { |
|
| 244 | 244 | $globalSources[$id]['format'] = 'vrstcp'; |
| 245 | 245 | } elseif ($port == '10001') { |
| 246 | 246 | //$formats[$id] = 'tsv'; |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | else if (isset($globalSBS1TimeOut)) $timeout = $globalSBS1TimeOut; |
| 280 | 280 | else $timeout = 20; |
| 281 | 281 | $errno = ''; |
| 282 | -$errstr=''; |
|
| 282 | +$errstr = ''; |
|
| 283 | 283 | |
| 284 | 284 | if (!isset($globalDaemon)) $globalDaemon = TRUE; |
| 285 | 285 | /* Initiate connections to all the hosts simultaneously */ |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | //connect_all($globalSources); |
| 288 | 288 | |
| 289 | 289 | if (isset($globalProxy) && $globalProxy) { |
| 290 | - $context = stream_context_create(array('http' => array('timeout' => $timeout,'proxy' => $globalProxy,'request_fulluri' => true))); |
|
| 290 | + $context = stream_context_create(array('http' => array('timeout' => $timeout, 'proxy' => $globalProxy, 'request_fulluri' => true))); |
|
| 291 | 291 | } else { |
| 292 | 292 | $context = stream_context_create(array('http' => array('timeout' => $timeout))); |
| 293 | 293 | } |
@@ -314,16 +314,16 @@ discard block |
||
| 314 | 314 | |
| 315 | 315 | if ($use_aprs) { |
| 316 | 316 | require_once(dirname(__FILE__).'/../require/class.APRS.php'); |
| 317 | - $APRS=new APRS(); |
|
| 317 | + $APRS = new APRS(); |
|
| 318 | 318 | $aprs_connect = 0; |
| 319 | 319 | $aprs_keep = 120; |
| 320 | 320 | $aprs_last_tx = time(); |
| 321 | 321 | if (isset($globalAPRSversion)) $aprs_version = $globalAPRSversion; |
| 322 | - else $aprs_version = 'FlightAirMap '.str_replace(' ','_',$globalName); |
|
| 322 | + else $aprs_version = 'FlightAirMap '.str_replace(' ', '_', $globalName); |
|
| 323 | 323 | if (isset($globalAPRSssid)) $aprs_ssid = $globalAPRSssid; |
| 324 | - else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ','_',$globalName)),0,8); |
|
| 324 | + else $aprs_ssid = substr('FAM'.strtoupper(str_replace(' ', '_', $globalName)), 0, 8); |
|
| 325 | 325 | if (isset($globalAPRSfilter)) $aprs_filter = $globalAPRSfilter; |
| 326 | - else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 326 | + else $aprs_filter = 'r/'.$globalCenterLatitude.'/'.$globalCenterLongitude.'/250.0'; |
|
| 327 | 327 | if ($aprs_full) $aprs_filter = ''; |
| 328 | 328 | if (isset($globalAPRSpass)) $aprs_pass = $globalAPRSpass; |
| 329 | 329 | else $aprs_pass = '-1'; |
@@ -337,12 +337,12 @@ discard block |
||
| 337 | 337 | sleep(1); |
| 338 | 338 | if ($globalDebug) echo "SCAN MODE \n\n"; |
| 339 | 339 | if (!isset($globalCronEnd)) $globalCronEnd = 60; |
| 340 | -$endtime = time()+$globalCronEnd; |
|
| 340 | +$endtime = time() + $globalCronEnd; |
|
| 341 | 341 | $i = 1; |
| 342 | 342 | $tt = array(); |
| 343 | 343 | // Delete all ATC |
| 344 | 344 | if ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM)) { |
| 345 | - $ATC=new ATC($Connection->db); |
|
| 345 | + $ATC = new ATC($Connection->db); |
|
| 346 | 346 | } |
| 347 | 347 | if (!$globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 348 | 348 | $ATC->deleteAll(); |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | |
| 351 | 351 | // Infinite loop if daemon, else work for time defined in $globalCronEnd or only one time. |
| 352 | 352 | while ($i > 0) { |
| 353 | - if (!$globalDaemon) $i = $endtime-time(); |
|
| 353 | + if (!$globalDaemon) $i = $endtime - time(); |
|
| 354 | 354 | // Delete old ATC |
| 355 | 355 | if ($globalDaemon && ((isset($globalVA) && $globalVA) || (isset($globalIVAO) && $globalIVAO) || (isset($globalVATSIM) && $globalVATSIM))) { |
| 356 | 356 | if ($globalDebug) echo 'Delete old ATC...'."\n"; |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | } |
| 365 | 365 | if ($max != $globalMinFetch) { |
| 366 | 366 | if ($globalDebug) echo 'Sleeping...'."\n"; |
| 367 | - sleep($globalMinFetch-$max+2); |
|
| 367 | + sleep($globalMinFetch - $max + 2); |
|
| 368 | 368 | } |
| 369 | 369 | } |
| 370 | 370 | |
@@ -377,8 +377,8 @@ discard block |
||
| 377 | 377 | //$buffer = $Common->getData($hosts[$id]); |
| 378 | 378 | $buffer = $Common->getData($value['host']); |
| 379 | 379 | if ($buffer != '') $reset = 0; |
| 380 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 381 | - $buffer = explode('\n',$buffer); |
|
| 380 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 381 | + $buffer = explode('\n', $buffer); |
|
| 382 | 382 | foreach ($buffer as $line) { |
| 383 | 383 | if ($line != '' && count($line) > 7) { |
| 384 | 384 | $line = explode(',', $line); |
@@ -406,11 +406,11 @@ discard block |
||
| 406 | 406 | $last_exec[$id]['last'] = time(); |
| 407 | 407 | } elseif ($value['format'] == 'aisnmeatxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 408 | 408 | date_default_timezone_set('CET'); |
| 409 | - $buffer = $Common->getData(str_replace('{date}',date('Ymd'),$value['host'])); |
|
| 409 | + $buffer = $Common->getData(str_replace('{date}', date('Ymd'), $value['host'])); |
|
| 410 | 410 | date_default_timezone_set('UTC'); |
| 411 | 411 | if ($buffer != '') $reset = 0; |
| 412 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 413 | - $buffer = explode('\n',$buffer); |
|
| 412 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 413 | + $buffer = explode('\n', $buffer); |
|
| 414 | 414 | foreach ($buffer as $line) { |
| 415 | 415 | if ($line != '') { |
| 416 | 416 | echo "'".$line."'\n"; |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 429 | 429 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 430 | 430 | if (isset($ais_data['timestamp'])) { |
| 431 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 431 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 432 | 432 | if (!isset($last_exec[$id]['timestamp']) || $ais_data['timestamp'] >= $last_exec[$id]['timestamp']) { |
| 433 | 433 | $last_exec[$id]['timestamp'] = $ais_data['timestamp']; |
| 434 | 434 | $add = true; |
@@ -451,12 +451,12 @@ discard block |
||
| 451 | 451 | $w = $e = null; |
| 452 | 452 | |
| 453 | 453 | if (isset($arr[$id])) { |
| 454 | - $nn = stream_select($arr,$w,$e,$timeout); |
|
| 454 | + $nn = stream_select($arr, $w, $e, $timeout); |
|
| 455 | 455 | if ($nn > 0) { |
| 456 | 456 | foreach ($httpfeeds as $feed) { |
| 457 | - $buffer = stream_get_line($feed,2000,"\n"); |
|
| 458 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 459 | - $buffer = explode('\n',$buffer); |
|
| 457 | + $buffer = stream_get_line($feed, 2000, "\n"); |
|
| 458 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 459 | + $buffer = explode('\n', $buffer); |
|
| 460 | 460 | foreach ($buffer as $line) { |
| 461 | 461 | if ($line != '') { |
| 462 | 462 | $ais_data = $AIS->parse_line(trim($line)); |
@@ -474,9 +474,9 @@ discard block |
||
| 474 | 474 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 475 | 475 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 476 | 476 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 477 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 477 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']); |
|
| 478 | 478 | if (isset($ais_data['timestamp'])) { |
| 479 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 479 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 480 | 480 | } else { |
| 481 | 481 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 482 | 482 | } |
@@ -502,10 +502,10 @@ discard block |
||
| 502 | 502 | } |
| 503 | 503 | } |
| 504 | 504 | } elseif ($value['format'] == 'myshiptracking' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 505 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 505 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20'); |
|
| 506 | 506 | if ($buffer != '') { |
| 507 | 507 | //echo $buffer; |
| 508 | - $all_data = json_decode($buffer,true); |
|
| 508 | + $all_data = json_decode($buffer, true); |
|
| 509 | 509 | //print_r($all_data); |
| 510 | 510 | if (isset($all_data[0]['DATA'])) { |
| 511 | 511 | foreach ($all_data[0]['DATA'] as $line) { |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | // if (isset($ais_data['type'])) $data['type'] = $ais_data['type']; |
| 521 | 521 | $data['imo'] = $line['IMO']; |
| 522 | 522 | //$data['arrival_code'] = $ais_data['destination']; |
| 523 | - $data['datetime'] = date('Y-m-d H:i:s',$line['T']); |
|
| 523 | + $data['datetime'] = date('Y-m-d H:i:s', $line['T']); |
|
| 524 | 524 | $data['format_source'] = 'myshiptracking'; |
| 525 | 525 | $data['id_source'] = $id_source; |
| 526 | 526 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -532,9 +532,9 @@ discard block |
||
| 532 | 532 | } |
| 533 | 533 | $last_exec[$id]['last'] = time(); |
| 534 | 534 | } elseif ($value['format'] == 'boatbeaconapp' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 535 | - $buffer = $Common->getData(str_replace('{timestamp}',time(),$value['host'])); |
|
| 535 | + $buffer = $Common->getData(str_replace('{timestamp}', time(), $value['host'])); |
|
| 536 | 536 | if ($buffer != '') { |
| 537 | - $all_data = json_decode($buffer,true); |
|
| 537 | + $all_data = json_decode($buffer, true); |
|
| 538 | 538 | if (isset($all_data[0]['mmsi'])) { |
| 539 | 539 | foreach ($all_data as $line) { |
| 540 | 540 | if ($line != '') { |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | } elseif ($value['format'] == 'boatnerd' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 564 | 564 | $buffer = $Common->getData($value['host']); |
| 565 | 565 | if ($buffer != '') { |
| 566 | - $all_data = json_decode($buffer,true); |
|
| 566 | + $all_data = json_decode($buffer, true); |
|
| 567 | 567 | if (isset($all_data['features'][0]['id'])) { |
| 568 | 568 | foreach ($all_data['features'] as $line) { |
| 569 | 569 | $data = array(); |
@@ -591,27 +591,27 @@ discard block |
||
| 591 | 591 | $last_exec[$id]['last'] = time(); |
| 592 | 592 | } elseif ($value['format'] == 'shipplotter' && (time() - $last_exec[$id]['last'] > $globalMinFetch*3)) { |
| 593 | 593 | echo 'download...'; |
| 594 | - $buffer = $Common->getData($value['host'],'post',$value['post'],'','','','','ShipPlotter'); |
|
| 594 | + $buffer = $Common->getData($value['host'], 'post', $value['post'], '', '', '', '', 'ShipPlotter'); |
|
| 595 | 595 | echo 'done !'."\n"; |
| 596 | 596 | if ($buffer != '') $reset = 0; |
| 597 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 598 | - $buffer = explode('\n',$buffer); |
|
| 597 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 598 | + $buffer = explode('\n', $buffer); |
|
| 599 | 599 | foreach ($buffer as $line) { |
| 600 | 600 | if ($line != '') { |
| 601 | 601 | $data = array(); |
| 602 | - $data['mmsi'] = (int)substr($line,0,9); |
|
| 603 | - $data['datetime'] = date('Y-m-d H:i:s',substr($line,10,10)); |
|
| 602 | + $data['mmsi'] = (int) substr($line, 0, 9); |
|
| 603 | + $data['datetime'] = date('Y-m-d H:i:s', substr($line, 10, 10)); |
|
| 604 | 604 | //$data['status'] = substr($line,21,2); |
| 605 | 605 | //$data['type'] = substr($line,24,3); |
| 606 | - $data['latitude'] = substr($line,29,9); |
|
| 607 | - $data['longitude'] = substr($line,41,9); |
|
| 608 | - $data['speed'] = round(substr($line,51,5)); |
|
| 606 | + $data['latitude'] = substr($line, 29, 9); |
|
| 607 | + $data['longitude'] = substr($line, 41, 9); |
|
| 608 | + $data['speed'] = round(substr($line, 51, 5)); |
|
| 609 | 609 | //$data['course'] = substr($line,57,5); |
| 610 | - $data['heading'] = round(substr($line,63,3)); |
|
| 610 | + $data['heading'] = round(substr($line, 63, 3)); |
|
| 611 | 611 | //$data['draft'] = substr($line,67,4); |
| 612 | 612 | //$data['length'] = substr($line,72,3); |
| 613 | 613 | //$data['beam'] = substr($line,76,2); |
| 614 | - $data['ident'] = trim(utf8_encode(substr($line,79,20))); |
|
| 614 | + $data['ident'] = trim(utf8_encode(substr($line, 79, 20))); |
|
| 615 | 615 | //$data['callsign'] = trim(substr($line,100,7); |
| 616 | 616 | //$data['dest'] = substr($line,108,20); |
| 617 | 617 | //$data['etaDate'] = substr($line,129,5); |
@@ -630,8 +630,8 @@ discard block |
||
| 630 | 630 | } elseif (($value['format'] == 'whazzup' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) || ($value['format'] == 'vatsimtxt' && (time() - $last_exec[$id]['last'] > $globalMinFetch))) { |
| 631 | 631 | //$buffer = $Common->getData($hosts[$id]); |
| 632 | 632 | $buffer = $Common->getData($value['host']); |
| 633 | - $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'\n',$buffer)); |
|
| 634 | - $buffer = explode('\n',$buffer); |
|
| 633 | + $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '\n', $buffer)); |
|
| 634 | + $buffer = explode('\n', $buffer); |
|
| 635 | 635 | $reset = 0; |
| 636 | 636 | foreach ($buffer as $line) { |
| 637 | 637 | if ($line != '') { |
@@ -642,7 +642,7 @@ discard block |
||
| 642 | 642 | else $data['id'] = $value['format'].'-'.$line[1].'-'.$line[0]; |
| 643 | 643 | $data['pilot_id'] = $line[1]; |
| 644 | 644 | $data['pilot_name'] = $line[2]; |
| 645 | - $data['hex'] = str_pad(dechex($Common->str2int($line[1])),6,'000000',STR_PAD_LEFT); |
|
| 645 | + $data['hex'] = str_pad(dechex($Common->str2int($line[1])), 6, '000000', STR_PAD_LEFT); |
|
| 646 | 646 | $data['ident'] = $line[0]; // ident |
| 647 | 647 | if ($line[7] != '' && $line[7] != 0) $data['altitude'] = $line[7]; // altitude |
| 648 | 648 | $data['speed'] = $line[8]; // speed |
@@ -658,7 +658,7 @@ discard block |
||
| 658 | 658 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($line[37])); |
| 659 | 659 | //if (isset($line[37])) $data['last_update'] = $line[37]; |
| 660 | 660 | $data['departure_airport_icao'] = $line[11]; |
| 661 | - $data['departure_airport_time'] = rtrim(chunk_split($line[22],2,':'),':'); |
|
| 661 | + $data['departure_airport_time'] = rtrim(chunk_split($line[22], 2, ':'), ':'); |
|
| 662 | 662 | $data['arrival_airport_icao'] = $line[13]; |
| 663 | 663 | $data['frequency'] = $line[4]; |
| 664 | 664 | $data['type'] = $line[18]; |
@@ -667,7 +667,7 @@ discard block |
||
| 667 | 667 | $data['id_source'] = $id_source; |
| 668 | 668 | //$data['arrival_airport_time'] = ; |
| 669 | 669 | if ($line[9] != '') { |
| 670 | - $aircraft_data = explode('/',$line[9]); |
|
| 670 | + $aircraft_data = explode('/', $line[9]); |
|
| 671 | 671 | if (isset($aircraft_data[1])) { |
| 672 | 672 | $data['aircraft_icao'] = $aircraft_data[1]; |
| 673 | 673 | } |
@@ -682,9 +682,9 @@ discard block |
||
| 682 | 682 | if ($line[3] == 'PILOT') $SI->add($data); |
| 683 | 683 | elseif ($line[3] == 'ATC') { |
| 684 | 684 | //print_r($data); |
| 685 | - $data['info'] = str_replace('^§','<br />',$data['info']); |
|
| 686 | - $data['info'] = str_replace('&sect;','',$data['info']); |
|
| 687 | - $typec = substr($data['ident'],-3); |
|
| 685 | + $data['info'] = str_replace('^§', '<br />', $data['info']); |
|
| 686 | + $data['info'] = str_replace('&sect;', '', $data['info']); |
|
| 687 | + $typec = substr($data['ident'], -3); |
|
| 688 | 688 | if ($typec == 'APP') $data['type'] = 'Approach'; |
| 689 | 689 | elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
| 690 | 690 | elseif ($typec == 'OBS') $data['type'] = 'Observer'; |
@@ -696,8 +696,8 @@ discard block |
||
| 696 | 696 | elseif ($data['type'] == '') $data['type'] = 'Observer'; |
| 697 | 697 | if (!isset($data['source_name'])) $data['source_name'] = ''; |
| 698 | 698 | if (isset($ATC)) { |
| 699 | - if (count($ATC->getByIdent($data['ident'],$data['format_source'])) > 0) echo $ATC->update($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 700 | - else echo $ATC->add($data['ident'],$data['frequency'],$data['latitude'],$data['longitude'],$data['range'],$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source'],$data['source_name']); |
|
| 699 | + if (count($ATC->getByIdent($data['ident'], $data['format_source'])) > 0) echo $ATC->update($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']); |
|
| 700 | + else echo $ATC->add($data['ident'], $data['frequency'], $data['latitude'], $data['longitude'], $data['range'], $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source'], $data['source_name']); |
|
| 701 | 701 | } |
| 702 | 702 | } |
| 703 | 703 | unset($data); |
@@ -708,23 +708,23 @@ discard block |
||
| 708 | 708 | //elseif ($value == 'vatsimtxt') $last_exec['vatsimtxt'] = time(); |
| 709 | 709 | $last_exec[$id]['last'] = time(); |
| 710 | 710 | } elseif ($value['format'] == 'airwhere' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 711 | - $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php','get','','','','','20'); |
|
| 711 | + $buffer = $Common->getData('http://www.airwhere.co.uk/pilots.php', 'get', '', '', '', '', '20'); |
|
| 712 | 712 | if ($buffer != '') { |
| 713 | 713 | $all_data = simplexml_load_string($buffer); |
| 714 | - foreach($all_data->children() as $childdata) { |
|
| 714 | + foreach ($all_data->children() as $childdata) { |
|
| 715 | 715 | $data = array(); |
| 716 | 716 | $line = $childdata; |
| 717 | 717 | //$data['hex'] = str_pad(dechex((int)$line['pktPilotID']),6,'000000',STR_PAD_LEFT); |
| 718 | - $data['id'] = date('Ymd').(int)$line['pktPilotID']; |
|
| 719 | - $data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['entryTime'].' BST')); |
|
| 720 | - $data['latitude'] = (float)$line['pktLatitude']; |
|
| 721 | - $data['longitude'] = (float)$line['pktLongitude']; |
|
| 722 | - if ((float)$line['pktTrack'] != 0) $data['heading'] = (float)$line['pktTrack']; |
|
| 723 | - if ((int)$line['pktSpeed'] != 0) $data['speed'] = (int)$line['pktSpeed']; |
|
| 724 | - $data['altitude'] = round((int)$line['pktAltitude']*3.28084); |
|
| 725 | - $data['pilot_id'] = (int)$line['pktPilotID']; |
|
| 718 | + $data['id'] = date('Ymd').(int) $line['pktPilotID']; |
|
| 719 | + $data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['entryTime'].' BST')); |
|
| 720 | + $data['latitude'] = (float) $line['pktLatitude']; |
|
| 721 | + $data['longitude'] = (float) $line['pktLongitude']; |
|
| 722 | + if ((float) $line['pktTrack'] != 0) $data['heading'] = (float) $line['pktTrack']; |
|
| 723 | + if ((int) $line['pktSpeed'] != 0) $data['speed'] = (int) $line['pktSpeed']; |
|
| 724 | + $data['altitude'] = round((int) $line['pktAltitude']*3.28084); |
|
| 725 | + $data['pilot_id'] = (int) $line['pktPilotID']; |
|
| 726 | 726 | $data['aircraft_icao'] = 'PARAGLIDER'; |
| 727 | - $pilot_data = explode(',',$Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id'])); |
|
| 727 | + $pilot_data = explode(',', $Common->getData('http://www.airwhere.co.uk/pilotdetails.php?pilot='.$data['pilot_id'])); |
|
| 728 | 728 | if (isset($pilot_data[4])) $data['pilot_name'] = $pilot_data[4]; |
| 729 | 729 | $data['format_source'] = $value['format']; |
| 730 | 730 | $SI->add($data); |
@@ -732,30 +732,30 @@ discard block |
||
| 732 | 732 | } |
| 733 | 733 | } |
| 734 | 734 | $Source->deleteOldLocationByType('gs'); |
| 735 | - $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php','get','','','','','20'); |
|
| 735 | + $buffer = $Common->getData('http://www.airwhere.co.uk/gspositions.php', 'get', '', '', '', '', '20'); |
|
| 736 | 736 | if ($buffer != '') { |
| 737 | 737 | $all_data = simplexml_load_string($buffer); |
| 738 | - foreach($all_data->children() as $childdata) { |
|
| 738 | + foreach ($all_data->children() as $childdata) { |
|
| 739 | 739 | $data = array(); |
| 740 | 740 | $line = $childdata; |
| 741 | - $data['id'] = (int)$line['gsID']; |
|
| 742 | - $data['latitude'] = (float)$line['gsLatitude']; |
|
| 743 | - $data['longitude'] = (float)$line['gsLongitude']; |
|
| 744 | - $data['altitude'] = round((int)$line['gsHeight']*3.28084); |
|
| 745 | - $data['datetime'] = date('Y-m-d H:i:s',strtotime((string)$line['gsLastUpdate'].' BST')); |
|
| 741 | + $data['id'] = (int) $line['gsID']; |
|
| 742 | + $data['latitude'] = (float) $line['gsLatitude']; |
|
| 743 | + $data['longitude'] = (float) $line['gsLongitude']; |
|
| 744 | + $data['altitude'] = round((int) $line['gsHeight']*3.28084); |
|
| 745 | + $data['datetime'] = date('Y-m-d H:i:s', strtotime((string) $line['gsLastUpdate'].' BST')); |
|
| 746 | 746 | if (count($Source->getLocationInfoByLocationID($data['id'])) > 0) { |
| 747 | - $Source->updateLocationByLocationID('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']); |
|
| 747 | + $Source->updateLocationByLocationID('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']); |
|
| 748 | 748 | } else { |
| 749 | - $Source->addLocation('',$data['latitude'],$data['longitude'],$data['altitude'],'','','airwhere','antenna.png','gs',$id,$data['id'],$data['datetime']); |
|
| 749 | + $Source->addLocation('', $data['latitude'], $data['longitude'], $data['altitude'], '', '', 'airwhere', 'antenna.png', 'gs', $id, $data['id'], $data['datetime']); |
|
| 750 | 750 | } |
| 751 | 751 | unset($data); |
| 752 | 752 | } |
| 753 | 753 | } |
| 754 | 754 | $last_exec[$id]['last'] = time(); |
| 755 | 755 | } elseif ($value['format'] == 'aircraftlistjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 756 | - $buffer = $Common->getData($value['host'],'get','','','','','20'); |
|
| 756 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '20'); |
|
| 757 | 757 | if ($buffer != '') { |
| 758 | - $all_data = json_decode($buffer,true); |
|
| 758 | + $all_data = json_decode($buffer, true); |
|
| 759 | 759 | if (isset($all_data['acList'])) { |
| 760 | 760 | $reset = 0; |
| 761 | 761 | foreach ($all_data['acList'] as $line) { |
@@ -772,7 +772,7 @@ discard block |
||
| 772 | 772 | $data['emergency'] = ''; // emergency |
| 773 | 773 | if (isset($line['Reg'])) $data['registration'] = $line['Reg']; |
| 774 | 774 | |
| 775 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 775 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000)); |
|
| 776 | 776 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 777 | 777 | |
| 778 | 778 | //$data['datetime'] = date('Y-m-d H:i:s'); |
@@ -798,7 +798,7 @@ discard block |
||
| 798 | 798 | $data['verticalrate'] = $line['vrt']; // verticale rate |
| 799 | 799 | $data['squawk'] = $line['squawk']; // squawk |
| 800 | 800 | $data['emergency'] = ''; // emergency |
| 801 | - if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s',round($line['PosTime']/1000)); |
|
| 801 | + if (isset($line['PosTime'])) $data['datetime'] = date('Y-m-d H:i:s', round($line['PosTime']/1000)); |
|
| 802 | 802 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 803 | 803 | $data['format_source'] = 'aircraftlistjson'; |
| 804 | 804 | $data['id_source'] = $id_source; |
@@ -814,7 +814,7 @@ discard block |
||
| 814 | 814 | //} elseif ($value == 'planeupdatefaa' && (time() - $last_exec['planeupdatefaa'] > $globalMinFetch)) { |
| 815 | 815 | } elseif ($value['format'] == 'planeupdatefaa' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 816 | 816 | $buffer = $Common->getData($value['host']); |
| 817 | - $all_data = json_decode($buffer,true); |
|
| 817 | + $all_data = json_decode($buffer, true); |
|
| 818 | 818 | if (isset($all_data['planes'])) { |
| 819 | 819 | $reset = 0; |
| 820 | 820 | foreach ($all_data['planes'] as $key => $line) { |
@@ -831,12 +831,12 @@ discard block |
||
| 831 | 831 | $data['emergency'] = ''; // emergency |
| 832 | 832 | $data['registration'] = $line[2]; |
| 833 | 833 | $data['aircraft_icao'] = $line[0]; |
| 834 | - $deparr = explode('-',$line[1]); |
|
| 834 | + $deparr = explode('-', $line[1]); |
|
| 835 | 835 | if (count($deparr) == 2) { |
| 836 | 836 | $data['departure_airport_icao'] = $deparr[0]; |
| 837 | 837 | $data['arrival_airport_icao'] = $deparr[1]; |
| 838 | 838 | } |
| 839 | - $data['datetime'] = date('Y-m-d H:i:s',$line[9]); |
|
| 839 | + $data['datetime'] = date('Y-m-d H:i:s', $line[9]); |
|
| 840 | 840 | $data['format_source'] = 'planeupdatefaa'; |
| 841 | 841 | $data['id_source'] = $id_source; |
| 842 | 842 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -849,7 +849,7 @@ discard block |
||
| 849 | 849 | $last_exec[$id]['last'] = time(); |
| 850 | 850 | } elseif ($value['format'] == 'opensky' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 851 | 851 | $buffer = $Common->getData($value['host']); |
| 852 | - $all_data = json_decode($buffer,true); |
|
| 852 | + $all_data = json_decode($buffer, true); |
|
| 853 | 853 | if (isset($all_data['states'])) { |
| 854 | 854 | $reset = 0; |
| 855 | 855 | foreach ($all_data['states'] as $key => $line) { |
@@ -866,7 +866,7 @@ discard block |
||
| 866 | 866 | //$data['emergency'] = ''; // emergency |
| 867 | 867 | //$data['registration'] = $line[2]; |
| 868 | 868 | //$data['aircraft_icao'] = $line[0]; |
| 869 | - $data['datetime'] = date('Y-m-d H:i:s',$line[3]); |
|
| 869 | + $data['datetime'] = date('Y-m-d H:i:s', $line[3]); |
|
| 870 | 870 | $data['format_source'] = 'opensky'; |
| 871 | 871 | $data['id_source'] = $id_source; |
| 872 | 872 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -880,7 +880,7 @@ discard block |
||
| 880 | 880 | } elseif ($value['format'] == 'fr24json' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 881 | 881 | //$buffer = $Common->getData($hosts[$id]); |
| 882 | 882 | $buffer = $Common->getData($value['host']); |
| 883 | - $all_data = json_decode($buffer,true); |
|
| 883 | + $all_data = json_decode($buffer, true); |
|
| 884 | 884 | if (!empty($all_data)) $reset = 0; |
| 885 | 885 | foreach ($all_data as $key => $line) { |
| 886 | 886 | if ($key != 'full_count' && $key != 'version' && $key != 'stats') { |
@@ -913,11 +913,11 @@ discard block |
||
| 913 | 913 | //} elseif ($value == 'radarvirtueljson' && (time() - $last_exec['radarvirtueljson'] > $globalMinFetch)) { |
| 914 | 914 | } elseif ($value['format'] == 'radarvirtueljson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 915 | 915 | //$buffer = $Common->getData($hosts[$id],'get','','','','','150'); |
| 916 | - $buffer = $Common->getData($value['host'],'get','','','','','150'); |
|
| 916 | + $buffer = $Common->getData($value['host'], 'get', '', '', '', '', '150'); |
|
| 917 | 917 | //echo $buffer; |
| 918 | - $buffer = str_replace(array("\n","\r"),"",$buffer); |
|
| 919 | - $buffer = preg_replace('/,"num":(.+)/','}',$buffer); |
|
| 920 | - $all_data = json_decode($buffer,true); |
|
| 918 | + $buffer = str_replace(array("\n", "\r"), "", $buffer); |
|
| 919 | + $buffer = preg_replace('/,"num":(.+)/', '}', $buffer); |
|
| 920 | + $all_data = json_decode($buffer, true); |
|
| 921 | 921 | if (json_last_error() != JSON_ERROR_NONE) { |
| 922 | 922 | die(json_last_error_msg()); |
| 923 | 923 | } |
@@ -940,7 +940,7 @@ discard block |
||
| 940 | 940 | //$data['departure_airport_iata'] = $line[11]; |
| 941 | 941 | //$data['arrival_airport_iata'] = $line[12]; |
| 942 | 942 | //$data['emergency'] = ''; // emergency |
| 943 | - $data['datetime'] = date('Y-m-d H:i:s',$line['inf']['dt']); //$line[10] |
|
| 943 | + $data['datetime'] = date('Y-m-d H:i:s', $line['inf']['dt']); //$line[10] |
|
| 944 | 944 | $data['format_source'] = 'radarvirtueljson'; |
| 945 | 945 | $data['id_source'] = $id_source; |
| 946 | 946 | if (isset($value['noarchive']) && $value['noarchive'] === TRUE) $data['noarchive'] = true; |
@@ -956,14 +956,14 @@ discard block |
||
| 956 | 956 | } elseif ($value['format'] == 'pirepsjson' && (time() - $last_exec[$id]['last'] > $globalMinFetch)) { |
| 957 | 957 | //$buffer = $Common->getData($hosts[$id]); |
| 958 | 958 | $buffer = $Common->getData($value['host'].'?'.time()); |
| 959 | - $all_data = json_decode(utf8_encode($buffer),true); |
|
| 959 | + $all_data = json_decode(utf8_encode($buffer), true); |
|
| 960 | 960 | |
| 961 | 961 | if (isset($all_data['pireps'])) { |
| 962 | 962 | $reset = 0; |
| 963 | 963 | foreach ($all_data['pireps'] as $line) { |
| 964 | 964 | $data = array(); |
| 965 | 965 | $data['id'] = $line['id']; |
| 966 | - $data['hex'] = substr(str_pad(dechex($line['id']),6,'000000',STR_PAD_LEFT),0,6); |
|
| 966 | + $data['hex'] = substr(str_pad(dechex($line['id']), 6, '000000', STR_PAD_LEFT), 0, 6); |
|
| 967 | 967 | $data['ident'] = $line['callsign']; // ident |
| 968 | 968 | if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; // pilot id |
| 969 | 969 | if (isset($line['name'])) $data['pilot_name'] = $line['name']; // pilot name |
@@ -993,9 +993,9 @@ discard block |
||
| 993 | 993 | $SI->add($data); |
| 994 | 994 | // print_r($data); |
| 995 | 995 | } elseif ($line['icon'] == 'ct') { |
| 996 | - $data['info'] = str_replace('^§','<br />',$data['info']); |
|
| 997 | - $data['info'] = str_replace('&sect;','',$data['info']); |
|
| 998 | - $typec = substr($data['ident'],-3); |
|
| 996 | + $data['info'] = str_replace('^§', '<br />', $data['info']); |
|
| 997 | + $data['info'] = str_replace('&sect;', '', $data['info']); |
|
| 998 | + $typec = substr($data['ident'], -3); |
|
| 999 | 999 | $data['type'] = ''; |
| 1000 | 1000 | if ($typec == 'APP') $data['type'] = 'Approach'; |
| 1001 | 1001 | elseif ($typec == 'TWR') $data['type'] = 'Tower'; |
@@ -1006,7 +1006,7 @@ discard block |
||
| 1006 | 1006 | elseif ($typec == 'FSS') $data['type'] = 'Flight Service Station'; |
| 1007 | 1007 | elseif ($typec == 'CTR') $data['type'] = 'Control Radar or Centre'; |
| 1008 | 1008 | else $data['type'] = 'Observer'; |
| 1009 | - if (isset($ATC)) echo $ATC->add($data['ident'],'',$data['latitude'],$data['longitude'],'0',$data['info'],$data['datetime'],$data['type'],$data['pilot_id'],$data['pilot_name'],$data['format_source']); |
|
| 1009 | + if (isset($ATC)) echo $ATC->add($data['ident'], '', $data['latitude'], $data['longitude'], '0', $data['info'], $data['datetime'], $data['type'], $data['pilot_id'], $data['pilot_name'], $data['format_source']); |
|
| 1010 | 1010 | } |
| 1011 | 1011 | unset($data); |
| 1012 | 1012 | } |
@@ -1018,14 +1018,14 @@ discard block |
||
| 1018 | 1018 | //$buffer = $Common->getData($hosts[$id]); |
| 1019 | 1019 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 1020 | 1020 | $buffer = $Common->getData($value['host']); |
| 1021 | - $all_data = json_decode($buffer,true); |
|
| 1021 | + $all_data = json_decode($buffer, true); |
|
| 1022 | 1022 | if ($buffer != '' && is_array($all_data)) { |
| 1023 | 1023 | $reset = 0; |
| 1024 | 1024 | foreach ($all_data as $line) { |
| 1025 | 1025 | $data = array(); |
| 1026 | 1026 | //$data['id'] = $line['id']; // id not usable |
| 1027 | 1027 | if (isset($line['pilotid'])) $data['id'] = $line['pilotid'].$line['flightnum']; |
| 1028 | - $data['hex'] = substr(str_pad(bin2hex($line['flightnum']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1028 | + $data['hex'] = substr(str_pad(bin2hex($line['flightnum']), 6, '000000', STR_PAD_LEFT), -6); // hex |
|
| 1029 | 1029 | if (isset($line['pilotname'])) $data['pilot_name'] = $line['pilotname']; |
| 1030 | 1030 | if (isset($line['pilotid'])) $data['pilot_id'] = $line['pilotid']; |
| 1031 | 1031 | $data['ident'] = $line['flightnum']; // ident |
@@ -1040,7 +1040,7 @@ discard block |
||
| 1040 | 1040 | //$data['datetime'] = $line['lastupdate']; |
| 1041 | 1041 | //$data['last_update'] = $line['lastupdate']; |
| 1042 | 1042 | if (isset($value['timezone'])) { |
| 1043 | - $datetime = new DateTime($line['lastupdate'],new DateTimeZone($value['timezone'])); |
|
| 1043 | + $datetime = new DateTime($line['lastupdate'], new DateTimeZone($value['timezone'])); |
|
| 1044 | 1044 | $datetime->setTimeZone(new DateTimeZone('UTC')); |
| 1045 | 1045 | $data['datetime'] = $datetime->format('Y-m-d H:i:s'); |
| 1046 | 1046 | } else $data['datetime'] = date('Y-m-d H:i:s'); |
@@ -1053,14 +1053,14 @@ discard block |
||
| 1053 | 1053 | if (isset($line['route'])) $data['waypoints'] = $line['route']; // route |
| 1054 | 1054 | if (isset($line['aircraftname'])) { |
| 1055 | 1055 | $line['aircraftname'] = strtoupper($line['aircraftname']); |
| 1056 | - $line['aircraftname'] = str_replace('BOEING ','B',$line['aircraftname']); |
|
| 1057 | - $aircraft_data = explode('-',$line['aircraftname']); |
|
| 1056 | + $line['aircraftname'] = str_replace('BOEING ', 'B', $line['aircraftname']); |
|
| 1057 | + $aircraft_data = explode('-', $line['aircraftname']); |
|
| 1058 | 1058 | if (isset($aircraft_data[1]) && strlen($aircraft_data[0]) >= 3 && strlen($aircraft_data[0]) <= 4) $data['aircraft_icao'] = $aircraft_data[0]; |
| 1059 | 1059 | elseif (isset($aircraft_data[1]) && strlen($aircraft_data[1]) >= 3 && strlen($aircraft_data[1]) <= 4) $data['aircraft_icao'] = $aircraft_data[1]; |
| 1060 | 1060 | else { |
| 1061 | - $aircraft_data = explode(' ',$line['aircraftname']); |
|
| 1062 | - if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-','',$aircraft_data[1]); |
|
| 1063 | - else $data['aircraft_icao'] = str_replace('-','',$line['aircraftname']); |
|
| 1061 | + $aircraft_data = explode(' ', $line['aircraftname']); |
|
| 1062 | + if (isset($aircraft_data[1])) $data['aircraft_icao'] = str_replace('-', '', $aircraft_data[1]); |
|
| 1063 | + else $data['aircraft_icao'] = str_replace('-', '', $line['aircraftname']); |
|
| 1064 | 1064 | } |
| 1065 | 1065 | } |
| 1066 | 1066 | if (isset($line['route'])) $data['waypoints'] = $line['route']; |
@@ -1080,14 +1080,14 @@ discard block |
||
| 1080 | 1080 | //$buffer = $Common->getData($hosts[$id]); |
| 1081 | 1081 | if ($globalDebug) echo 'Get Data...'."\n"; |
| 1082 | 1082 | $buffer = $Common->getData($value['host']); |
| 1083 | - $all_data = json_decode($buffer,true); |
|
| 1083 | + $all_data = json_decode($buffer, true); |
|
| 1084 | 1084 | if ($buffer != '' && is_array($all_data)) { |
| 1085 | 1085 | $reset = 0; |
| 1086 | 1086 | foreach ($all_data as $line) { |
| 1087 | 1087 | $data = array(); |
| 1088 | 1088 | //$data['id'] = $line['id']; // id not usable |
| 1089 | 1089 | $data['id'] = trim($line['flight_id']); |
| 1090 | - $data['hex'] = substr(str_pad(bin2hex($line['callsign']),6,'000000',STR_PAD_LEFT),-6); // hex |
|
| 1090 | + $data['hex'] = substr(str_pad(bin2hex($line['callsign']), 6, '000000', STR_PAD_LEFT), -6); // hex |
|
| 1091 | 1091 | $data['pilot_name'] = $line['pilot_name']; |
| 1092 | 1092 | $data['pilot_id'] = $line['pilot_id']; |
| 1093 | 1093 | $data['ident'] = trim($line['callsign']); // ident |
@@ -1139,11 +1139,11 @@ discard block |
||
| 1139 | 1139 | //$value = $formats[$nb]; |
| 1140 | 1140 | $format = $globalSources[$nb]['format']; |
| 1141 | 1141 | if ($format == 'sbs' || $format == 'aprs' || $format == 'famaprs' || $format == 'raw' || $format == 'tsv' || $format == 'acarssbs3') { |
| 1142 | - $buffer = @socket_read($r, 6000,PHP_NORMAL_READ); |
|
| 1142 | + $buffer = @socket_read($r, 6000, PHP_NORMAL_READ); |
|
| 1143 | 1143 | } elseif ($format == 'vrstcp') { |
| 1144 | 1144 | $buffer = @socket_read($r, 6000); |
| 1145 | 1145 | } else { |
| 1146 | - $az = socket_recvfrom($r,$buffer,6000,0,$remote_ip,$remote_port); |
|
| 1146 | + $az = socket_recvfrom($r, $buffer, 6000, 0, $remote_ip, $remote_port); |
|
| 1147 | 1147 | } |
| 1148 | 1148 | //$buffer = socket_read($r, 60000,PHP_NORMAL_READ); |
| 1149 | 1149 | //echo $buffer."\n"; |
@@ -1152,8 +1152,8 @@ discard block |
||
| 1152 | 1152 | $error = false; |
| 1153 | 1153 | //$SI::del(); |
| 1154 | 1154 | if ($format == 'vrstcp') { |
| 1155 | - $buffer = explode('},{',$buffer); |
|
| 1156 | - } else $buffer=trim(str_replace(array("\r\n","\r","\n","\\r","\\n","\\r\\n"),'',$buffer)); |
|
| 1155 | + $buffer = explode('},{', $buffer); |
|
| 1156 | + } else $buffer = trim(str_replace(array("\r\n", "\r", "\n", "\\r", "\\n", "\\r\\n"), '', $buffer)); |
|
| 1157 | 1157 | // SBS format is CSV format |
| 1158 | 1158 | if ($buffer !== FALSE && $buffer != '') { |
| 1159 | 1159 | $tt[$format] = 0; |
@@ -1187,13 +1187,13 @@ discard block |
||
| 1187 | 1187 | if (isset($ais_data['imo'])) $data['imo'] = $ais_data['imo']; |
| 1188 | 1188 | if (isset($ais_data['callsign'])) $data['callsign'] = $ais_data['callsign']; |
| 1189 | 1189 | if (isset($ais_data['destination'])) $data['arrival_code'] = $ais_data['destination']; |
| 1190 | - if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s',$ais_data['eta_ts']); |
|
| 1190 | + if (isset($ais_data['eta_ts'])) $data['arrival_date'] = date('Y-m-d H:i:s', $ais_data['eta_ts']); |
|
| 1191 | 1191 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1192 | 1192 | if (isset($globalSources[$nb]['name']) && $globalSources[$nb]['name'] != '') $data['source_name'] = $globalSources[$nb]['name']; |
| 1193 | 1193 | if (isset($globalSources[$nb]['sourcestats'])) $data['sourcestats'] = $globalSources[$nb]['sourcestats']; |
| 1194 | 1194 | |
| 1195 | 1195 | if (isset($ais_data['timestamp'])) { |
| 1196 | - $data['datetime'] = date('Y-m-d H:i:s',$ais_data['timestamp']); |
|
| 1196 | + $data['datetime'] = date('Y-m-d H:i:s', $ais_data['timestamp']); |
|
| 1197 | 1197 | } else { |
| 1198 | 1198 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1199 | 1199 | } |
@@ -1204,10 +1204,10 @@ discard block |
||
| 1204 | 1204 | } elseif ($format == 'flightgearsp') { |
| 1205 | 1205 | //echo $buffer."\n"; |
| 1206 | 1206 | if (strlen($buffer) > 5) { |
| 1207 | - $line = explode(',',$buffer); |
|
| 1207 | + $line = explode(',', $buffer); |
|
| 1208 | 1208 | $data = array(); |
| 1209 | 1209 | //XGPS,2.0947,41.3093,-3047.6953,198.930,0.000,callsign,c172p |
| 1210 | - $data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]),6,'000000',STR_PAD_LEFT),0,6); |
|
| 1210 | + $data['hex'] = substr(str_pad(bin2hex($line[6].$line[7]), 6, '000000', STR_PAD_LEFT), 0, 6); |
|
| 1211 | 1211 | $data['ident'] = $line[6]; |
| 1212 | 1212 | $data['aircraft_name'] = $line[7]; |
| 1213 | 1213 | $data['longitude'] = $line[1]; |
@@ -1224,16 +1224,16 @@ discard block |
||
| 1224 | 1224 | } elseif ($format == 'acars') { |
| 1225 | 1225 | if ($globalDebug) echo 'ACARS : '.$buffer."\n"; |
| 1226 | 1226 | $ACARS->add(trim($buffer)); |
| 1227 | - socket_sendto($r, "OK " . $buffer , 100 , 0 , $remote_ip , $remote_port); |
|
| 1227 | + socket_sendto($r, "OK ".$buffer, 100, 0, $remote_ip, $remote_port); |
|
| 1228 | 1228 | $ACARS->deleteLiveAcarsData(); |
| 1229 | 1229 | } elseif ($format == 'flightgearmp') { |
| 1230 | - if (substr($buffer,0,1) != '#') { |
|
| 1230 | + if (substr($buffer, 0, 1) != '#') { |
|
| 1231 | 1231 | $data = array(); |
| 1232 | 1232 | //echo $buffer."\n"; |
| 1233 | - $line = explode(' ',$buffer); |
|
| 1233 | + $line = explode(' ', $buffer); |
|
| 1234 | 1234 | if (count($line) == 11) { |
| 1235 | - $userserver = explode('@',$line[0]); |
|
| 1236 | - $data['hex'] = substr(str_pad(bin2hex($line[0]),6,'000000',STR_PAD_LEFT),0,6); // hex |
|
| 1235 | + $userserver = explode('@', $line[0]); |
|
| 1236 | + $data['hex'] = substr(str_pad(bin2hex($line[0]), 6, '000000', STR_PAD_LEFT), 0, 6); // hex |
|
| 1237 | 1237 | $data['ident'] = $userserver[0]; |
| 1238 | 1238 | $data['registration'] = $userserver[0]; |
| 1239 | 1239 | $data['latitude'] = $line[4]; |
@@ -1241,8 +1241,8 @@ discard block |
||
| 1241 | 1241 | $data['altitude'] = $line[6]; |
| 1242 | 1242 | $data['datetime'] = date('Y-m-d H:i:s'); |
| 1243 | 1243 | $aircraft_type = $line[10]; |
| 1244 | - $aircraft_type = preg_split(':/:',$aircraft_type); |
|
| 1245 | - $data['aircraft_name'] = substr(end($aircraft_type),0,-4); |
|
| 1244 | + $aircraft_type = preg_split(':/:', $aircraft_type); |
|
| 1245 | + $data['aircraft_name'] = substr(end($aircraft_type), 0, -4); |
|
| 1246 | 1246 | if (isset($globalSources[$nb]['noarchive']) && $globalSources[$nb]['noarchive'] === TRUE) $data['noarchive'] = true; |
| 1247 | 1247 | if (($data['latitude'] == '' && $data['longitude'] == '') || (is_numeric($data['latitude']) && is_numeric($data['longitude']))) $SI->add($data); |
| 1248 | 1248 | } |
@@ -1251,8 +1251,8 @@ discard block |
||
| 1251 | 1251 | echo 'Beast Binary format not yet supported. Beast AVR format is supported in alpha state'."\n"; |
| 1252 | 1252 | die; |
| 1253 | 1253 | } elseif ($format == 'vrstcp') { |
| 1254 | - foreach($buffer as $all_data) { |
|
| 1255 | - $line = json_decode('{'.$all_data.'}',true); |
|
| 1254 | + foreach ($buffer as $all_data) { |
|
| 1255 | + $line = json_decode('{'.$all_data.'}', true); |
|
| 1256 | 1256 | $data = array(); |
| 1257 | 1257 | if (isset($line['Icao'])) $data['hex'] = $line['Icao']; // hex |
| 1258 | 1258 | if (isset($line['Call'])) $data['ident'] = $line['Call']; // ident |
@@ -1278,16 +1278,16 @@ discard block |
||
| 1278 | 1278 | if (isset($data['latitude']) && isset($data['hex'])) $SI->add($data); |
| 1279 | 1279 | unset($data); |
| 1280 | 1280 | } |
| 1281 | - } elseif ($format == 'tsv' || substr($buffer,0,4) == 'clock') { |
|
| 1281 | + } elseif ($format == 'tsv' || substr($buffer, 0, 4) == 'clock') { |
|
| 1282 | 1282 | $line = explode("\t", $buffer); |
| 1283 | - for($k = 0; $k < count($line); $k=$k+2) { |
|
| 1283 | + for ($k = 0; $k < count($line); $k = $k + 2) { |
|
| 1284 | 1284 | $key = $line[$k]; |
| 1285 | - $lined[$key] = $line[$k+1]; |
|
| 1285 | + $lined[$key] = $line[$k + 1]; |
|
| 1286 | 1286 | } |
| 1287 | 1287 | if (count($lined) > 3) { |
| 1288 | 1288 | $data['hex'] = $lined['hexid']; |
| 1289 | 1289 | //$data['datetime'] = date('Y-m-d H:i:s',strtotime($lined['clock']));; |
| 1290 | - $data['datetime'] = date('Y-m-d H:i:s');; |
|
| 1290 | + $data['datetime'] = date('Y-m-d H:i:s'); ; |
|
| 1291 | 1291 | if (isset($lined['ident'])) $data['ident'] = $lined['ident']; |
| 1292 | 1292 | if (isset($lined['lat'])) $data['latitude'] = $lined['lat']; |
| 1293 | 1293 | if (isset($lined['lon'])) $data['longitude'] = $lined['lon']; |
@@ -1306,22 +1306,22 @@ discard block |
||
| 1306 | 1306 | } else $error = true; |
| 1307 | 1307 | } elseif ($format == 'aprs' && $use_aprs) { |
| 1308 | 1308 | if ($aprs_connect == 0) { |
| 1309 | - $send = @ socket_send( $r , $aprs_login , strlen($aprs_login) , 0 ); |
|
| 1309 | + $send = @ socket_send($r, $aprs_login, strlen($aprs_login), 0); |
|
| 1310 | 1310 | $aprs_connect = 1; |
| 1311 | 1311 | } |
| 1312 | 1312 | |
| 1313 | - if ( $aprs_keep>60 && time() - $aprs_last_tx > $aprs_keep ) { |
|
| 1313 | + if ($aprs_keep > 60 && time() - $aprs_last_tx > $aprs_keep) { |
|
| 1314 | 1314 | $aprs_last_tx = time(); |
| 1315 | 1315 | $data_aprs = "# Keep alive"; |
| 1316 | - $send = @ socket_send( $r , $data_aprs , strlen($data_aprs) , 0 ); |
|
| 1316 | + $send = @ socket_send($r, $data_aprs, strlen($data_aprs), 0); |
|
| 1317 | 1317 | } |
| 1318 | 1318 | |
| 1319 | 1319 | //echo 'Connect : '.$aprs_connect.' '.$buffer."\n"; |
| 1320 | 1320 | //echo 'APRS data : '.$buffer."\n"; |
| 1321 | - $buffer = str_replace('APRS <- ','',$buffer); |
|
| 1322 | - $buffer = str_replace('APRS -> ','',$buffer); |
|
| 1321 | + $buffer = str_replace('APRS <- ', '', $buffer); |
|
| 1322 | + $buffer = str_replace('APRS -> ', '', $buffer); |
|
| 1323 | 1323 | //echo $buffer."\n"; |
| 1324 | - if (substr($buffer,0,1) != '#' && substr($buffer,0,1) != '@' && substr($buffer,0,5) != 'APRS ') { |
|
| 1324 | + if (substr($buffer, 0, 1) != '#' && substr($buffer, 0, 1) != '@' && substr($buffer, 0, 5) != 'APRS ') { |
|
| 1325 | 1325 | $line = $APRS->parse($buffer); |
| 1326 | 1326 | //if (is_array($line) && isset($line['address']) && $line['address'] != '' && isset($line['ident'])) { |
| 1327 | 1327 | if (is_array($line) && isset($line['latitude']) && isset($line['longitude']) && (isset($line['ident']) || isset($line['address']) || isset($line['mmsi']))) { |
@@ -1336,7 +1336,7 @@ discard block |
||
| 1336 | 1336 | if (isset($line['arrival_date'])) $data['arrical_date'] = $line['arrival_date']; |
| 1337 | 1337 | if (isset($line['type_id'])) $data['type_id'] = $line['typeid']; |
| 1338 | 1338 | if (isset($line['status_id'])) $data['status_id'] = $line['statusid']; |
| 1339 | - if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s',$line['timestamp']); |
|
| 1339 | + if (isset($line['timestamp'])) $data['datetime'] = date('Y-m-d H:i:s', $line['timestamp']); |
|
| 1340 | 1340 | else $data['datetime'] = date('Y-m-d H:i:s'); |
| 1341 | 1341 | //$data['datetime'] = date('Y-m-d H:i:s'); |
| 1342 | 1342 | if (isset($line['ident'])) $data['ident'] = $line['ident']; |
@@ -1382,9 +1382,9 @@ discard block |
||
| 1382 | 1382 | if (!isset($data['altitude'])) $data['altitude'] = 0; |
| 1383 | 1383 | $Source->deleteOldLocationByType('gs'); |
| 1384 | 1384 | if (count($Source->getLocationInfoByName($data['ident'])) > 0) { |
| 1385 | - $Source->updateLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']); |
|
| 1385 | + $Source->updateLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']); |
|
| 1386 | 1386 | } else { |
| 1387 | - $Source->addLocation($data['ident'],$data['latitude'],$data['longitude'],$data['altitude'],'','',$data['source_name'],'antenna.png','gs',$id,0,$data['datetime']); |
|
| 1387 | + $Source->addLocation($data['ident'], $data['latitude'], $data['longitude'], $data['altitude'], '', '', $data['source_name'], 'antenna.png', 'gs', $id, 0, $data['datetime']); |
|
| 1388 | 1388 | } |
| 1389 | 1389 | } else { |
| 1390 | 1390 | echo '/!\ Not added'."\n"; |
@@ -1397,7 +1397,7 @@ discard block |
||
| 1397 | 1397 | } |
| 1398 | 1398 | |
| 1399 | 1399 | elseif (is_array($line) && isset($line['ident']) && $line['ident'] != '') { |
| 1400 | - $Source->updateLocationDescByName($line['ident'],$line['source'],$id,$line['comment']); |
|
| 1400 | + $Source->updateLocationDescByName($line['ident'], $line['source'], $id, $line['comment']); |
|
| 1401 | 1401 | } |
| 1402 | 1402 | /* |
| 1403 | 1403 | elseif (is_array($line) && $globalDebug && isset($line['symbol']) && isset($line['latitude']) && isset($line['longitude']) && ($line['symbol'] == 'Car' || $line['symbol'] == 'Ambulance' || $line['symbol'] == 'Van' || $line['symbol'] == 'Truck' || $line['symbol'] == 'Truck (18 Wheeler)' || $line['symbol'] == 'Motorcycle')) { |
@@ -1484,7 +1484,7 @@ discard block |
||
| 1484 | 1484 | connect_all($sourceee); |
| 1485 | 1485 | $sourceee = array(); |
| 1486 | 1486 | //connect_all($globalSources); |
| 1487 | - $tt[$format]=0; |
|
| 1487 | + $tt[$format] = 0; |
|
| 1488 | 1488 | break; |
| 1489 | 1489 | } |
| 1490 | 1490 | } |
@@ -1493,14 +1493,14 @@ discard block |
||
| 1493 | 1493 | } else { |
| 1494 | 1494 | $error = socket_strerror(socket_last_error()); |
| 1495 | 1495 | if (($error != SOCKET_EINPROGRESS && $error != SOCKET_EALREADY && $error != 'Success') || (time() - $time >= $timeout && $error != 'Success')) { |
| 1496 | - if ($globalDebug) echo "ERROR : socket_select give this error ".$error . "\n"; |
|
| 1496 | + if ($globalDebug) echo "ERROR : socket_select give this error ".$error."\n"; |
|
| 1497 | 1497 | if (isset($globalDebug)) echo "Restarting...\n"; |
| 1498 | 1498 | // Restart the script if possible |
| 1499 | 1499 | if (is_array($sockets)) { |
| 1500 | 1500 | if ($globalDebug) echo "Shutdown all sockets..."; |
| 1501 | 1501 | |
| 1502 | 1502 | foreach ($sockets as $sock) { |
| 1503 | - @socket_shutdown($sock,2); |
|
| 1503 | + @socket_shutdown($sock, 2); |
|
| 1504 | 1504 | @socket_close($sock); |
| 1505 | 1505 | } |
| 1506 | 1506 | |
