@@ -3,10 +3,10 @@ discard block |
||
3 | 3 | require_once(dirname(__FILE__).'/class.Common.php'); |
4 | 4 | require_once(dirname(__FILE__).'/class.GeoidHeight.php'); |
5 | 5 | class aprs { |
6 | - private $socket; |
|
7 | - private $connected = false; |
|
6 | + private $socket; |
|
7 | + private $connected = false; |
|
8 | 8 | |
9 | - protected $symbols = array('/!' => 'Police', |
|
9 | + protected $symbols = array('/!' => 'Police', |
|
10 | 10 | '/#' => 'DIGI', |
11 | 11 | '/$' => 'Phone', |
12 | 12 | '/%' => 'DX Cluster', |
@@ -166,13 +166,13 @@ discard block |
||
166 | 166 | '\~' => 'TNC Stream SW'); |
167 | 167 | |
168 | 168 | |
169 | - private function urshift($n, $s) { |
|
169 | + private function urshift($n, $s) { |
|
170 | 170 | return ($n >= 0) ? ($n >> $s) : |
171 | - (($n & 0x7fffffff) >> $s) | |
|
171 | + (($n & 0x7fffffff) >> $s) | |
|
172 | 172 | (0x40000000 >> ($s - 1)); |
173 | - } |
|
173 | + } |
|
174 | 174 | |
175 | - public function parse($input) { |
|
175 | + public function parse($input) { |
|
176 | 176 | global $globalDebug; |
177 | 177 | $debug = false; |
178 | 178 | $result = array(); |
@@ -184,8 +184,8 @@ discard block |
||
184 | 184 | |
185 | 185 | /* Check that end was found and body has at least one byte. */ |
186 | 186 | if ($splitpos == 0 || $splitpos + 1 == $input_len || $splitpos === FALSE) { |
187 | - if ($globalDebug) echo '!!! APRS invalid : '.$input."\n"; |
|
188 | - return false; |
|
187 | + if ($globalDebug) echo '!!! APRS invalid : '.$input."\n"; |
|
188 | + return false; |
|
189 | 189 | } |
190 | 190 | |
191 | 191 | if ($debug) echo 'input : '.$input."\n"; |
@@ -199,34 +199,34 @@ discard block |
||
199 | 199 | /* Parse source, target and path. */ |
200 | 200 | //FLRDF0A52>APRS,qAS,LSTB |
201 | 201 | if (preg_match('/^([A-Z0-9\\-]{1,9})>(.*)$/',$header,$matches)) { |
202 | - $ident = $matches[1]; |
|
203 | - $all_elements = $matches[2]; |
|
204 | - if ($ident == 'AIRCRAFT') { |
|
202 | + $ident = $matches[1]; |
|
203 | + $all_elements = $matches[2]; |
|
204 | + if ($ident == 'AIRCRAFT') { |
|
205 | 205 | $result['format_source'] = 'famaprs'; |
206 | 206 | $result['source_type'] = 'modes'; |
207 | - } elseif ($ident == 'MARINE') { |
|
207 | + } elseif ($ident == 'MARINE') { |
|
208 | 208 | $result['format_source'] = 'famaprs'; |
209 | 209 | $result['source_type'] = 'ais'; |
210 | - } else { |
|
210 | + } else { |
|
211 | 211 | if ($debug) echo 'ident : '.$ident."\n"; |
212 | 212 | $result['ident'] = $ident; |
213 | - } |
|
213 | + } |
|
214 | 214 | } else { |
215 | - if ($debug) 'No ident'."\n"; |
|
216 | - return false; |
|
215 | + if ($debug) 'No ident'."\n"; |
|
216 | + return false; |
|
217 | 217 | } |
218 | 218 | $elements = explode(',',$all_elements); |
219 | 219 | $source = end($elements); |
220 | 220 | $result['source'] = $source; |
221 | 221 | foreach ($elements as $element) { |
222 | - if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) { |
|
223 | - //echo "ok"; |
|
224 | - //if ($element == 'TCPIP*') return false; |
|
225 | - } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
|
222 | + if (preg_match('/^([a-zA-Z0-9-]{1,9})([*]?)$/',$element)) { |
|
223 | + //echo "ok"; |
|
224 | + //if ($element == 'TCPIP*') return false; |
|
225 | + } elseif (!preg_match('/^([0-9A-F]{32})$/',$element)) { |
|
226 | 226 | if ($debug) echo 'element : '.$element."\n"; |
227 | 227 | return false; |
228 | - } |
|
229 | - /* |
|
228 | + } |
|
229 | + /* |
|
230 | 230 | } elseif (preg_match('/^([0-9A-F]{32})$/',$element)) { |
231 | 231 | //echo "ok"; |
232 | 232 | } else { |
@@ -253,48 +253,48 @@ discard block |
||
253 | 253 | $body_parse = substr($body,1); |
254 | 254 | //echo 'Body : '.$body."\n"; |
255 | 255 | if (preg_match('/^;(.){9}\*/',$body,$matches)) { |
256 | - $body_parse = substr($body_parse,10); |
|
257 | - $find = true; |
|
258 | - //echo $body_parse."\n"; |
|
256 | + $body_parse = substr($body_parse,10); |
|
257 | + $find = true; |
|
258 | + //echo $body_parse."\n"; |
|
259 | 259 | } |
260 | 260 | if (preg_match('/^`(.*)\//',$body,$matches)) { |
261 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
262 | - $find = true; |
|
263 | - //echo $body_parse."\n"; |
|
261 | + $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
262 | + $find = true; |
|
263 | + //echo $body_parse."\n"; |
|
264 | 264 | } |
265 | 265 | if (preg_match("/^'(.*)\//",$body,$matches)) { |
266 | - $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
267 | - $find = true; |
|
268 | - //echo $body_parse."\n"; |
|
266 | + $body_parse = substr($body_parse,strlen($matches[1])-1); |
|
267 | + $find = true; |
|
268 | + //echo $body_parse."\n"; |
|
269 | 269 | } |
270 | 270 | if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([zh\\/])/',$body_parse,$matches)) { |
271 | - $find = true; |
|
272 | - //print_r($matches); |
|
273 | - $timestamp = $matches[0]; |
|
274 | - if ($matches[4] == 'h') { |
|
271 | + $find = true; |
|
272 | + //print_r($matches); |
|
273 | + $timestamp = $matches[0]; |
|
274 | + if ($matches[4] == 'h') { |
|
275 | 275 | $timestamp = strtotime(date('Ymd').' '.$matches[1].':'.$matches[2].':'.$matches[3]); |
276 | 276 | //echo 'timestamp : '.$timestamp.' - now : '.time()."\n"; |
277 | 277 | /* |
278 | 278 | if (time() + 3900 < $timestamp) $timestamp -= 86400; |
279 | 279 | elseif (time() - 82500 > $timestamp) $timestamp += 86400; |
280 | 280 | */ |
281 | - } elseif ($matches[4] == 'z' || $matches[4] == '/') { |
|
281 | + } elseif ($matches[4] == 'z' || $matches[4] == '/') { |
|
282 | 282 | // This work or not ? |
283 | 283 | $timestamp = strtotime(date('Ym').$matches[1].' '.$matches[2].':'.$matches[3]); |
284 | - } |
|
285 | - $body_parse = substr($body_parse,7); |
|
286 | - $result['timestamp'] = $timestamp; |
|
287 | - //echo date('Ymd H:i:s',$timestamp); |
|
284 | + } |
|
285 | + $body_parse = substr($body_parse,7); |
|
286 | + $result['timestamp'] = $timestamp; |
|
287 | + //echo date('Ymd H:i:s',$timestamp); |
|
288 | 288 | } |
289 | 289 | if (preg_match('/^([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/',$body_parse,$matches)) { |
290 | - $find = true; |
|
291 | - $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]); |
|
292 | - $body_parse = substr($body_parse,8); |
|
293 | - $result['timestamp'] = $timestamp; |
|
294 | - //echo date('Ymd H:i:s',$timestamp); |
|
290 | + $find = true; |
|
291 | + $timestamp = strtotime(date('Y').$matches[1].$matches[2].' '.$matches[3].':'.$matches[4]); |
|
292 | + $body_parse = substr($body_parse,8); |
|
293 | + $result['timestamp'] = $timestamp; |
|
294 | + //echo date('Ymd H:i:s',$timestamp); |
|
295 | 295 | } |
296 | 296 | //if (strlen($body_parse) > 19) { |
297 | - if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) { |
|
297 | + if (preg_match('/^([0-9]{2})([0-7 ][0-9 ]\\.[0-9 ]{2})([NnSs])(.)([0-9]{3})([0-7 ][0-9 ]\\.[0-9 ]{2})([EeWw])(.)/',$body_parse,$matches)) { |
|
298 | 298 | $find = true; |
299 | 299 | // 4658.70N/00707.78Ez |
300 | 300 | //print_r(str_split($body_parse)); |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | $lon = intval($lon_deg); |
314 | 314 | if ($lat > 89 || $lon > 179) return false; |
315 | 315 | |
316 | - /* |
|
316 | + /* |
|
317 | 317 | $tmp_5b = str_replace('.','',$lat_min); |
318 | 318 | if (preg_match('/^([0-9]{0,4})( {0,4})$/',$tmp_5b,$matches)) { |
319 | 319 | print_r($matches); |
@@ -327,9 +327,9 @@ discard block |
||
327 | 327 | $result['longitude'] = $longitude; |
328 | 328 | $body_parse = substr($body_parse,18); |
329 | 329 | $body_parse_len = strlen($body_parse); |
330 | - } |
|
331 | - $body_parse_len = strlen($body_parse); |
|
332 | - if ($body_parse_len > 0) { |
|
330 | + } |
|
331 | + $body_parse_len = strlen($body_parse); |
|
332 | + if ($body_parse_len > 0) { |
|
333 | 333 | /* |
334 | 334 | if (!isset($result['timestamp']) && !isset($result['latitude'])) { |
335 | 335 | $body_split = str_split($body); |
@@ -363,95 +363,95 @@ discard block |
||
363 | 363 | if (isset($this->symbols[$symbol_code])) $result['symbol'] = $this->symbols[$symbol_code]; |
364 | 364 | if ($symbol_code != '_') { |
365 | 365 | } |
366 | - //$body_parse = substr($body_parse,1); |
|
367 | - //$body_parse = trim($body_parse); |
|
368 | - //$body_parse_len = strlen($body_parse); |
|
369 | - if ($body_parse_len >= 7) { |
|
366 | + //$body_parse = substr($body_parse,1); |
|
367 | + //$body_parse = trim($body_parse); |
|
368 | + //$body_parse_len = strlen($body_parse); |
|
369 | + if ($body_parse_len >= 7) { |
|
370 | 370 | |
371 | - if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
|
372 | - $course = substr($body_parse,0,3); |
|
373 | - $tmp_s = intval($course); |
|
374 | - if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
|
375 | - $speed = substr($body_parse,4,3); |
|
376 | - if ($speed != '...') { |
|
377 | - //$result['speed'] = round($speed*1.852); |
|
378 | - $result['speed'] = intval($speed); |
|
379 | - } |
|
380 | - $body_parse = substr($body_parse,7); |
|
381 | - } |
|
382 | - // Check PHGR, PHG, RNG |
|
383 | - } |
|
384 | - /* |
|
371 | + if (preg_match('/^([0-9\\. ]{3})\\/([0-9\\. ]{3})/',$body_parse)) { |
|
372 | + $course = substr($body_parse,0,3); |
|
373 | + $tmp_s = intval($course); |
|
374 | + if ($tmp_s >= 1 && $tmp_s <= 360) $result['heading'] = intval($course); |
|
375 | + $speed = substr($body_parse,4,3); |
|
376 | + if ($speed != '...') { |
|
377 | + //$result['speed'] = round($speed*1.852); |
|
378 | + $result['speed'] = intval($speed); |
|
379 | + } |
|
380 | + $body_parse = substr($body_parse,7); |
|
381 | + } |
|
382 | + // Check PHGR, PHG, RNG |
|
383 | + } |
|
384 | + /* |
|
385 | 385 | else if ($body_parse_len > 0) { |
386 | 386 | $rest = $body_parse; |
387 | 387 | } |
388 | 388 | */ |
389 | - if (strlen($body_parse) > 0) { |
|
390 | - if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) { |
|
391 | - $altitude = intval($matches[1]); |
|
392 | - //$result['altitude'] = round($altitude*0.3048); |
|
393 | - $result['altitude'] = $altitude; |
|
394 | - //$body_parse = trim(substr($body_parse,strlen($matches[0]))); |
|
395 | - $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse)); |
|
396 | - } |
|
397 | - } |
|
389 | + if (strlen($body_parse) > 0) { |
|
390 | + if (preg_match('/\\/A=(-[0-9]{5}|[0-9]{6})/',$body_parse,$matches)) { |
|
391 | + $altitude = intval($matches[1]); |
|
392 | + //$result['altitude'] = round($altitude*0.3048); |
|
393 | + $result['altitude'] = $altitude; |
|
394 | + //$body_parse = trim(substr($body_parse,strlen($matches[0]))); |
|
395 | + $body_parse = trim(preg_replace('/\\/A=(-[0-9]{5}|[0-9]{6})/','',$body_parse)); |
|
396 | + } |
|
397 | + } |
|
398 | 398 | |
399 | - // Telemetry |
|
400 | - /* |
|
399 | + // Telemetry |
|
400 | + /* |
|
401 | 401 | if (preg_match('/^([0-9]+),(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,(-?)([0-9]{1,6}|[0-9]+\\.[0-9]+|\\.[0-9]+)?,([01]{0,8})/',$body_parse,$matches)) { |
402 | 402 | // Nothing yet... |
403 | 403 | } |
404 | 404 | */ |
405 | - // DAO |
|
405 | + // DAO |
|
406 | 406 | |
407 | - if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) { |
|
407 | + if (preg_match('/^!([0-9A-Z]{3})/',$body_parse,$matches)) { |
|
408 | 408 | |
409 | - $dao = $matches[1]; |
|
410 | - if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) { |
|
409 | + $dao = $matches[1]; |
|
410 | + if (preg_match('/^([A-Z])([0-9]{2})/',$dao)) { |
|
411 | 411 | $dao_split = str_split($dao); |
412 | - $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
|
413 | - $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
|
412 | + $lat_off = (($dao_split[1])-48.0)*0.001/60.0; |
|
413 | + $lon_off = (($dao_split[2])-48.0)*0.001/60.0; |
|
414 | 414 | |
415 | 415 | if ($result['latitude'] < 0) $result['latitude'] -= $lat_off; |
416 | 416 | else $result['latitude'] += $lat_off; |
417 | 417 | if ($result['longitude'] < 0) $result['longitude'] -= $lon_off; |
418 | 418 | else $result['longitude'] += $lon_off; |
419 | - } |
|
419 | + } |
|
420 | 420 | |
421 | - $body_parse = substr($body_parse,6); |
|
422 | - } |
|
421 | + $body_parse = substr($body_parse,6); |
|
422 | + } |
|
423 | 423 | |
424 | - if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) { |
|
424 | + if (preg_match('/CS=([0-9A-Z_]*)/',$body_parse,$matches)) { |
|
425 | 425 | $result['ident'] = str_replace('_',' ',$matches[1]); |
426 | - } |
|
427 | - if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) { |
|
426 | + } |
|
427 | + if (preg_match('/SQ=([0-9]{4})/',$body_parse,$matches)) { |
|
428 | 428 | $result['squawk'] = $matches[1]; |
429 | - } |
|
430 | - if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) { |
|
429 | + } |
|
430 | + if (preg_match('/AI=([0-9A-Z]{4})/',$body_parse,$matches)) { |
|
431 | 431 | $result['aircraft_icao'] = $matches[1]; |
432 | - } |
|
433 | - if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) { |
|
432 | + } |
|
433 | + if (preg_match('/VR=([0-9]*)/',$body_parse,$matches)) { |
|
434 | 434 | $result['verticalrate'] = $matches[1]; |
435 | - } |
|
436 | - if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) { |
|
435 | + } |
|
436 | + if (preg_match('/TI=([0-9]*)/',$body_parse,$matches)) { |
|
437 | 437 | $result['typeid'] = $matches[1]; |
438 | - } |
|
439 | - if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) { |
|
438 | + } |
|
439 | + if (preg_match('/SI=([0-9]*)/',$body_parse,$matches)) { |
|
440 | 440 | $result['statusid'] = $matches[1]; |
441 | - } |
|
442 | - if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) { |
|
441 | + } |
|
442 | + if (preg_match('/IMO=([0-9]{7})/',$body_parse,$matches)) { |
|
443 | 443 | $result['imo'] = $matches[1]; |
444 | - } |
|
445 | - if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) { |
|
444 | + } |
|
445 | + if (preg_match('/AD=([0-9]*)/',$body_parse,$matches)) { |
|
446 | 446 | $result['arrival_date'] = $matches[1]; |
447 | - } |
|
448 | - if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) { |
|
447 | + } |
|
448 | + if (preg_match('/AC=([0-9A-Z_]*)/',$body_parse,$matches)) { |
|
449 | 449 | $result['arrival_code'] = str_replace('_',' ',$matches[1]); |
450 | - } |
|
451 | - // OGN comment |
|
450 | + } |
|
451 | + // OGN comment |
|
452 | 452 | // echo "Before OGN : ".$body_parse."\n"; |
453 | - //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) { |
|
454 | - if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) { |
|
453 | + //if (preg_match('/^id([0-9A-F]{8}) ([+-])([0-9]{3,4})fpm ([+-])([0-9.]{3,4})rot (.*)$/',$body_parse,$matches)) { |
|
454 | + if (preg_match('/^id([0-9A-F]{8})/',$body_parse,$matches)) { |
|
455 | 455 | $id = $matches[1]; |
456 | 456 | //$mode = substr($id,0,2); |
457 | 457 | $address = substr($id,2); |
@@ -481,42 +481,42 @@ discard block |
||
481 | 481 | $stealth = (intval(substr($id,0,2), 16) & 0b10000000) != 0; |
482 | 482 | $result['stealth'] = $stealth; |
483 | 483 | $result['address'] = $address; |
484 | - } |
|
484 | + } |
|
485 | 485 | |
486 | - //Comment |
|
487 | - $result['comment'] = trim($body_parse); |
|
486 | + //Comment |
|
487 | + $result['comment'] = trim($body_parse); |
|
488 | 488 | //} else { |
489 | - // parse weather |
|
490 | - //$body_parse = substr($body_parse,1); |
|
491 | - //$body_parse_len = strlen($body_parse); |
|
492 | - //echo 'weather'."\n"; |
|
493 | - if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
494 | - $result['wind_dir'] = intval($matches[1]); |
|
495 | - $result['wind_speed'] = round(intval($matches[2])*1.60934,1); |
|
496 | - $result['wind_gust'] = round(intval($matches[3])*1.60934,1); |
|
497 | - $result['temp'] = round(5/9*((intval($matches[4]))-32),1); |
|
498 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
499 | - } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
489 | + // parse weather |
|
490 | + //$body_parse = substr($body_parse,1); |
|
491 | + //$body_parse_len = strlen($body_parse); |
|
492 | + //echo 'weather'."\n"; |
|
493 | + if (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
494 | + $result['wind_dir'] = intval($matches[1]); |
|
495 | + $result['wind_speed'] = round(intval($matches[2])*1.60934,1); |
|
496 | + $result['wind_gust'] = round(intval($matches[3])*1.60934,1); |
|
497 | + $result['temp'] = round(5/9*((intval($matches[4]))-32),1); |
|
498 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
499 | + } elseif (preg_match('/^_{0,1}c([0-9 \\.\\-]{3})s([0-9 \\.]{3})g([0-9 \\.]+)t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
500 | 500 | $result['wind_dir'] = intval($matches[1]); |
501 | 501 | $result['wind_speed'] = round($matches[2]*1.60934,1); |
502 | 502 | $result['wind_gust'] = round($matches[3]*1.60934,1); |
503 | 503 | $result['temp'] = round(5/9*(($matches[4])-32),1); |
504 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
505 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
504 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
505 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})t(-{0,1}[0-9 \\.]+)/',$body_parse,$matches)) { |
|
506 | 506 | $result['wind_dir'] = intval($matches[1]); |
507 | 507 | $result['wind_speed'] = round($matches[2]*1.60934,1); |
508 | 508 | $result['wind_gust'] = round($matches[3]*1.60934,1); |
509 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
510 | - } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) { |
|
509 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
510 | + } elseif (preg_match('/^_{0,1}([0-9 \\.\\-]{3})\\/([0-9 \\.]{3})g([0-9 \\.]+)/',$body_parse,$matches)) { |
|
511 | 511 | $result['wind_dir'] = intval($matches[1]); |
512 | 512 | $result['wind_speed'] = round($matches[2]*1.60934,1); |
513 | 513 | $result['wind_gust'] = round($matches[3]*1.60934,1); |
514 | - $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
515 | - } |
|
516 | - //if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) { |
|
517 | - //g012t088r000p000P000h38b10110 |
|
518 | - //g011t086r000p000P000h29b10198 |
|
519 | - if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
514 | + $body_parse = substr($body_parse,strlen($matches[0])+1); |
|
515 | + } |
|
516 | + //if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9]+)t(-?[0-9 \\.]{1,3})/',$body_parse,$matches)) { |
|
517 | + //g012t088r000p000P000h38b10110 |
|
518 | + //g011t086r000p000P000h29b10198 |
|
519 | + if (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
520 | 520 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
521 | 521 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
522 | 522 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
@@ -524,8 +524,8 @@ discard block |
||
524 | 524 | if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1); |
525 | 525 | if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
526 | 526 | if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1); |
527 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
528 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
527 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
528 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3,4})r([0-9 \\.]{3})P([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2,3})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
529 | 529 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
530 | 530 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
531 | 531 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
@@ -533,8 +533,8 @@ discard block |
||
533 | 533 | if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1); |
534 | 534 | if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
535 | 535 | if ($matches[7] != '...') $result['pressure'] = round((intval($matches[7])/10),1); |
536 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
537 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
536 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
537 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
538 | 538 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
539 | 539 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
540 | 540 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
@@ -542,58 +542,58 @@ discard block |
||
542 | 542 | if ($matches[5] != '...') $result['precipitation24h'] = round((intval($matches[5])/100)*25.1,1); |
543 | 543 | if ($matches[7] != '...') $result['humidity'] = intval($matches[7]); |
544 | 544 | if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1); |
545 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
546 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
545 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
546 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})P([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
547 | 547 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
548 | 548 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
549 | 549 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
550 | 550 | if ($matches[4] != '...') $result['precipitation24h'] = round((intval($matches[4])/100)*25.1,1); |
551 | 551 | if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
552 | 552 | if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1); |
553 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
554 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
553 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
554 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})b([0-9 \\.]{5})h([0-9 \\.]{2})/',$body_parse,$matches)) { |
|
555 | 555 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
556 | 556 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
557 | 557 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
558 | 558 | if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
559 | 559 | if ($matches[6] != '...') $result['humidity'] = intval($matches[6]); |
560 | 560 | if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1); |
561 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
562 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
561 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
562 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{3})p([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
563 | 563 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
564 | 564 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
565 | 565 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
566 | 566 | if ($matches[4] != '...') $result['precipitation'] = round((intval($matches[4])/100)*25.1,1); |
567 | 567 | if ($matches[5] != '...') $result['humidity'] = intval($matches[5]); |
568 | 568 | if ($matches[6] != '...') $result['pressure'] = round((intval($matches[6])/10),1); |
569 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
570 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
569 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
570 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
571 | 571 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
572 | 572 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
573 | 573 | if ($matches[2] != '...') $result['humidity'] = intval($matches[3]); |
574 | 574 | if ($matches[4] != '...') $result['pressure'] = round((intval($matches[4])/10),1); |
575 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
576 | - } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
575 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
576 | + } elseif (!isset($result['temp']) && strlen($body_parse) > 0 && preg_match('/^g([0-9 \\.]{3})t([0-9 \\.]{3})r([0-9 \\.]{2,3})h([0-9 \\.]{2})b([0-9 \\.]{5})/',$body_parse,$matches)) { |
|
577 | 577 | if ($matches[1] != '...') $result['wind_gust'] = round($matches[1]*1.60934,1); |
578 | 578 | if ($matches[2] != '...') $result['temp'] = round(5/9*((intval($matches[2]))-32),1); |
579 | 579 | if ($matches[3] != '...') $result['rain'] = round((intval($matches[3])/100)*25.1,1); |
580 | 580 | if ($matches[4] != '...') $result['humidity'] = intval($matches[4]); |
581 | 581 | if ($matches[5] != '...') $result['pressure'] = round((intval($matches[5])/10),1); |
582 | - $body_parse = substr($body_parse,strlen($matches[0])); |
|
583 | - } |
|
584 | - $result['comment'] = trim($body_parse); |
|
582 | + $body_parse = substr($body_parse,strlen($matches[0])); |
|
583 | + } |
|
584 | + $result['comment'] = trim($body_parse); |
|
585 | 585 | } |
586 | 586 | } else $result['comment'] = trim($body_parse); |
587 | 587 | |
588 | - } |
|
588 | + } |
|
589 | 589 | //} |
590 | 590 | if (isset($result['latitude'])) $result['latitude'] = round($result['latitude'],4); |
591 | 591 | if (isset($result['longitude'])) $result['longitude'] = round($result['longitude'],4); |
592 | 592 | if ($debug) print_r($result); |
593 | 593 | return $result; |
594 | - } |
|
594 | + } |
|
595 | 595 | |
596 | - public function connect() { |
|
596 | + public function connect() { |
|
597 | 597 | global $globalAPRSversion, $globalServerAPRSssid, $globalServerAPRSpass,$globalName, $globalServerAPRShost, $globalServerAPRSport; |
598 | 598 | $aprs_connect = 0; |
599 | 599 | $aprs_keep = 120; |
@@ -617,24 +617,24 @@ discard block |
||
617 | 617 | socket_set_option($this->socket,SOL_SOCKET,SO_KEEPALIVE,1); |
618 | 618 | while ($msgin = socket_read($this->socket, 1000,PHP_NORMAL_READ)) { |
619 | 619 | if (strpos($msgin, "$aprs_ssid verified") !== FALSE) { |
620 | - echo 'APRS user verified !'."\n"; |
|
621 | - $this->connected = true; |
|
622 | - return true; |
|
623 | - break; |
|
620 | + echo 'APRS user verified !'."\n"; |
|
621 | + $this->connected = true; |
|
622 | + return true; |
|
623 | + break; |
|
624 | 624 | } |
625 | 625 | if (time()-$authstart > 5) { |
626 | - echo 'APRS timeout'."\n"; |
|
627 | - break; |
|
626 | + echo 'APRS timeout'."\n"; |
|
627 | + break; |
|
628 | 628 | } |
629 | 629 | } |
630 | 630 | } |
631 | - } |
|
631 | + } |
|
632 | 632 | |
633 | - public function disconnect() { |
|
633 | + public function disconnect() { |
|
634 | 634 | socket_close($this->socket); |
635 | - } |
|
635 | + } |
|
636 | 636 | |
637 | - public function send($data) { |
|
637 | + public function send($data) { |
|
638 | 638 | global $globalDebug; |
639 | 639 | if ($this->connected === false) $this->connect(); |
640 | 640 | $send = socket_send( $this->socket , $data , strlen($data),0); |
@@ -643,7 +643,7 @@ discard block |
||
643 | 643 | socket_close($this->socket); |
644 | 644 | $this->connect(); |
645 | 645 | } |
646 | - } |
|
646 | + } |
|
647 | 647 | } |
648 | 648 | |
649 | 649 | class APRSSpotter extends APRS { |
@@ -68,10 +68,10 @@ discard block |
||
68 | 68 | ); |
69 | 69 | |
70 | 70 | /** |
71 | - * Returns list of available locales |
|
72 | - * |
|
73 | - * @return array |
|
74 | - */ |
|
71 | + * Returns list of available locales |
|
72 | + * |
|
73 | + * @return array |
|
74 | + */ |
|
75 | 75 | public function listLocaleDir() |
76 | 76 | { |
77 | 77 | $result = array('en_GB'); |
@@ -96,9 +96,9 @@ discard block |
||
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
99 | - * Returns list of available languages |
|
100 | - * |
|
101 | - * @return array |
|
99 | + * Returns list of available languages |
|
100 | + * |
|
101 | + * @return array |
|
102 | 102 | */ |
103 | 103 | public function getLanguages() |
104 | 104 | { |
@@ -15,11 +15,11 @@ |
||
15 | 15 | |
16 | 16 | |
17 | 17 | /** |
18 | - * Change IATA to ICAO value for ident |
|
19 | - * |
|
20 | - * @param String $ident ident |
|
21 | - * @return String the icao |
|
22 | - */ |
|
18 | + * Change IATA to ICAO value for ident |
|
19 | + * |
|
20 | + * @param String $ident ident |
|
21 | + * @return String the icao |
|
22 | + */ |
|
23 | 23 | public function ident2icao($ident) { |
24 | 24 | $Spotter = new Spotter(); |
25 | 25 | if (!is_numeric(substr($ident, 0, 3))) { |
@@ -90,40 +90,40 @@ |
||
90 | 90 | if (!empty($spotter_array)) { |
91 | 91 | foreach($spotter_array as $spotter_item) { |
92 | 92 | array_push($flights, array( |
93 | - "id" => $spotter_item['spotter_id'], |
|
94 | - "ident" => $spotter_item['ident'], |
|
95 | - "registration" => $spotter_item['registration'], |
|
96 | - "aircraft_icao" => $spotter_item['aircraft_type'], |
|
97 | - "aircraft_name" => $spotter_item['aircraft_name'], |
|
98 | - "aircraft_manufacturer" => $spotter_item['aircraft_manufacturer'], |
|
99 | - "airline_name" => $spotter_item['airline_name'], |
|
100 | - "airline_icao" => $spotter_item['airline_icao'], |
|
101 | - "airline_iata" => $spotter_item['airline_iata'], |
|
102 | - "airline_country" => $spotter_item['airline_country'], |
|
103 | - "airline_callsign" => $spotter_item['airline_callsign'], |
|
104 | - "airline_type" => $spotter_item['airline_type'], |
|
105 | - "departure_airport_city" => $spotter_item['departure_airport_city'], |
|
106 | - "departure_airport_country" => $spotter_item['departure_airport_country'], |
|
107 | - "departure_airport_iata" => $spotter_item['departure_airport_iata'], |
|
108 | - "departure_airport_icao" => $spotter_item['departure_airport_icao'], |
|
109 | - "departure_airport_latitude" => $spotter_item['departure_airport_latitude'], |
|
110 | - "departure_airport_longitude" => $spotter_item['departure_airport_longitude'], |
|
111 | - "departure_airport_altitude" => $spotter_item['departure_airport_altitude'], |
|
112 | - "arrival_airport_city" => $spotter_item['arrival_airport_city'], |
|
113 | - "arrival_airport_country" => $spotter_item['arrival_airport_country'], |
|
114 | - "arrival_airport_iata" => $spotter_item['arrival_airport_iata'], |
|
115 | - "arrival_airport_icao" => $spotter_item['arrival_airport_icao'], |
|
116 | - "arrival_airport_latitude" => $spotter_item['arrival_airport_latitude'], |
|
117 | - "arrival_airport_longitude" => $spotter_item['arrival_airport_longitude'], |
|
118 | - "arrival_airport_altitude" => $spotter_item['arrival_airport_altitude'], |
|
119 | - "latitude" => $spotter_item['latitude'], |
|
120 | - "longitude" => $spotter_item['longitude'], |
|
121 | - "altitude" => $spotter_item['altitude'], |
|
122 | - "ground_speed" => $spotter_item['ground_speed'], |
|
123 | - "heading" => $spotter_item['heading'], |
|
124 | - "heading_name" => $spotter_item['heading_name'], |
|
125 | - "waypoints" => $spotter_item['waypoints'], |
|
126 | - "date" => date("c", strtotime($spotter_item['date_iso_8601'])) |
|
93 | + "id" => $spotter_item['spotter_id'], |
|
94 | + "ident" => $spotter_item['ident'], |
|
95 | + "registration" => $spotter_item['registration'], |
|
96 | + "aircraft_icao" => $spotter_item['aircraft_type'], |
|
97 | + "aircraft_name" => $spotter_item['aircraft_name'], |
|
98 | + "aircraft_manufacturer" => $spotter_item['aircraft_manufacturer'], |
|
99 | + "airline_name" => $spotter_item['airline_name'], |
|
100 | + "airline_icao" => $spotter_item['airline_icao'], |
|
101 | + "airline_iata" => $spotter_item['airline_iata'], |
|
102 | + "airline_country" => $spotter_item['airline_country'], |
|
103 | + "airline_callsign" => $spotter_item['airline_callsign'], |
|
104 | + "airline_type" => $spotter_item['airline_type'], |
|
105 | + "departure_airport_city" => $spotter_item['departure_airport_city'], |
|
106 | + "departure_airport_country" => $spotter_item['departure_airport_country'], |
|
107 | + "departure_airport_iata" => $spotter_item['departure_airport_iata'], |
|
108 | + "departure_airport_icao" => $spotter_item['departure_airport_icao'], |
|
109 | + "departure_airport_latitude" => $spotter_item['departure_airport_latitude'], |
|
110 | + "departure_airport_longitude" => $spotter_item['departure_airport_longitude'], |
|
111 | + "departure_airport_altitude" => $spotter_item['departure_airport_altitude'], |
|
112 | + "arrival_airport_city" => $spotter_item['arrival_airport_city'], |
|
113 | + "arrival_airport_country" => $spotter_item['arrival_airport_country'], |
|
114 | + "arrival_airport_iata" => $spotter_item['arrival_airport_iata'], |
|
115 | + "arrival_airport_icao" => $spotter_item['arrival_airport_icao'], |
|
116 | + "arrival_airport_latitude" => $spotter_item['arrival_airport_latitude'], |
|
117 | + "arrival_airport_longitude" => $spotter_item['arrival_airport_longitude'], |
|
118 | + "arrival_airport_altitude" => $spotter_item['arrival_airport_altitude'], |
|
119 | + "latitude" => $spotter_item['latitude'], |
|
120 | + "longitude" => $spotter_item['longitude'], |
|
121 | + "altitude" => $spotter_item['altitude'], |
|
122 | + "ground_speed" => $spotter_item['ground_speed'], |
|
123 | + "heading" => $spotter_item['heading'], |
|
124 | + "heading_name" => $spotter_item['heading_name'], |
|
125 | + "waypoints" => $spotter_item['waypoints'], |
|
126 | + "date" => date("c", strtotime($spotter_item['date_iso_8601'])) |
|
127 | 127 | )); |
128 | 128 | } |
129 | 129 | } |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | } |
91 | 91 | |
92 | 92 | //waypoint plotting |
93 | - /* |
|
93 | + /* |
|
94 | 94 | $output .= '{'; |
95 | 95 | $output .= '"type": "Feature",'; |
96 | 96 | $output .= '"properties": {'; |
@@ -269,8 +269,8 @@ discard block |
||
269 | 269 | $output_time .= (strtotime($spotter_history['date'])*1000).','; |
270 | 270 | } |
271 | 271 | if (isset($output_time)) { |
272 | - $output_time = substr($output_time, 0, -1); |
|
273 | - $output .= '"time": ['.$output_time.'],'; |
|
272 | + $output_time = substr($output_time, 0, -1); |
|
273 | + $output .= '"time": ['.$output_time.'],'; |
|
274 | 274 | } |
275 | 275 | |
276 | 276 | |
@@ -284,8 +284,8 @@ discard block |
||
284 | 284 | $output .= '"coordinates": ['; |
285 | 285 | |
286 | 286 | if (isset($output_history)) { |
287 | - $output_history = substr($output_history, 0, -1); |
|
288 | - $output .= $output_history; |
|
287 | + $output_history = substr($output_history, 0, -1); |
|
288 | + $output .= $output_history; |
|
289 | 289 | } |
290 | 290 | |
291 | 291 | $output .= ']'; |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | ?> |
250 | 250 | <div class="more"> |
251 | 251 | <?php |
252 | - /* |
|
252 | + /* |
|
253 | 253 | if ($year != '' && $month != '') { |
254 | 254 | ?> |
255 | 255 | <a href="<?php print $globalURL; ?>/marine/statistics/type/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | <?php |
261 | 261 | } |
262 | 262 | */ |
263 | - ?> |
|
263 | + ?> |
|
264 | 264 | </div> |
265 | 265 | </div> |
266 | 266 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -294,7 +294,7 @@ discard block |
||
294 | 294 | ?> |
295 | 295 | <div class="more"> |
296 | 296 | <?php |
297 | - /* |
|
297 | + /* |
|
298 | 298 | if ($year != '' && $month != '') { |
299 | 299 | ?> |
300 | 300 | <a href="<?php print $globalURL; ?>/marine/statistics/type/<?php echo $year; ?>/<?php echo $month ?>/" class="btn btn-default btn" role="button"><?php echo _("See full statistic"); ?>»</a> |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | <?php |
306 | 306 | } |
307 | 307 | */ |
308 | - ?> |
|
308 | + ?> |
|
309 | 309 | </div> |
310 | 310 | </div> |
311 | 311 | <!-- <?php print 'Time elapsed : '.(microtime(true)-$beginpage).'s' ?> --> |
@@ -404,17 +404,17 @@ discard block |
||
404 | 404 | } |
405 | 405 | $all = $sth->fetchAll(PDO::FETCH_ASSOC); |
406 | 406 | } else $all = array(); |
407 | - if (empty($all)) { |
|
408 | - $Spotter = new Spotter($this->db); |
|
409 | - $filters = array(); |
|
407 | + if (empty($all)) { |
|
408 | + $Spotter = new Spotter($this->db); |
|
409 | + $filters = array(); |
|
410 | 410 | $filters = array('year' => $year,'month' => $month); |
411 | - if ($filter_name != '') { |
|
412 | - $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
411 | + if ($filter_name != '') { |
|
412 | + $filters = array_merge($filters,$globalStatsFilters[$filter_name]); |
|
413 | 413 | } |
414 | 414 | //$all = $Spotter->countAllAirlines($limit,0,'',$filters,$year,$month); |
415 | - $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
416 | - } |
|
417 | - return $all; |
|
415 | + $all = $Spotter->countAllAirlines($limit,0,'',$filters); |
|
416 | + } |
|
417 | + return $all; |
|
418 | 418 | } |
419 | 419 | public function countAllAircraftRegistrations($limit = true,$stats_airline = '',$filter_name = '',$year = '',$month = '') { |
420 | 420 | global $globalStatsFilters; |
@@ -1611,7 +1611,7 @@ discard block |
||
1611 | 1611 | return "error : ".$e->getMessage(); |
1612 | 1612 | } |
1613 | 1613 | } |
1614 | - /* |
|
1614 | + /* |
|
1615 | 1615 | public function getStatsSource($date,$stats_type = '') { |
1616 | 1616 | if ($stats_type == '') { |
1617 | 1617 | $query = "SELECT * FROM stats_source WHERE stats_date = :date ORDER BY source_name"; |
@@ -7,35 +7,35 @@ discard block |
||
7 | 7 | public $latest_schema = 46; |
8 | 8 | |
9 | 9 | public function __construct($dbc = null,$dbname = null,$user = null,$pass = null) { |
10 | - global $globalNoDB; |
|
11 | - if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
10 | + global $globalNoDB; |
|
11 | + if (isset($globalNoDB) && $globalNoDB === TRUE) { |
|
12 | 12 | $this->db = null; |
13 | - } else { |
|
13 | + } else { |
|
14 | 14 | if ($dbc === null) { |
15 | - if ($this->db === null && $dbname === null) { |
|
15 | + if ($this->db === null && $dbname === null) { |
|
16 | 16 | if ($user === null && $pass === null) { |
17 | - $this->createDBConnection(); |
|
17 | + $this->createDBConnection(); |
|
18 | 18 | } else { |
19 | - $this->createDBConnection(null,$user,$pass); |
|
19 | + $this->createDBConnection(null,$user,$pass); |
|
20 | 20 | } |
21 | - } else { |
|
21 | + } else { |
|
22 | 22 | $this->createDBConnection($dbname); |
23 | - } |
|
23 | + } |
|
24 | 24 | } elseif ($dbname === null || $dbname === 'default') { |
25 | - $this->db = $dbc; |
|
26 | - if ($this->connectionExists() === false) { |
|
25 | + $this->db = $dbc; |
|
26 | + if ($this->connectionExists() === false) { |
|
27 | 27 | /* |
28 | 28 | echo 'Restart Connection !!!'."\n"; |
29 | 29 | $e = new \Exception; |
30 | 30 | var_dump($e->getTraceAsString()); |
31 | 31 | */ |
32 | 32 | $this->createDBConnection(); |
33 | - } |
|
33 | + } |
|
34 | 34 | } else { |
35 | - //$this->connectionExists(); |
|
36 | - $this->dbs[$dbname] = $dbc; |
|
35 | + //$this->connectionExists(); |
|
36 | + $this->dbs[$dbname] = $dbc; |
|
37 | + } |
|
37 | 38 | } |
38 | - } |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | public function db() { |
@@ -56,11 +56,11 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | /** |
59 | - * Creates the database connection |
|
60 | - * |
|
61 | - * @return Boolean of the database connection |
|
62 | - * |
|
63 | - */ |
|
59 | + * Creates the database connection |
|
60 | + * |
|
61 | + * @return Boolean of the database connection |
|
62 | + * |
|
63 | + */ |
|
64 | 64 | |
65 | 65 | public function createDBConnection($DBname = null, $user = null, $pass = null) |
66 | 66 | { |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | return false; |
159 | 159 | } |
160 | 160 | if($results->rowCount()>0) { |
161 | - return true; |
|
161 | + return true; |
|
162 | 162 | } |
163 | 163 | else return false; |
164 | 164 | } |
@@ -176,14 +176,14 @@ discard block |
||
176 | 176 | $sum = $sum->fetchColumn(0); |
177 | 177 | } else $sum = 0; |
178 | 178 | if (intval($sum) !== 2) { |
179 | - return false; |
|
179 | + return false; |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | } catch(PDOException $e) { |
183 | 183 | if($e->getCode() != 'HY000' || !stristr($e->getMessage(), 'server has gone away')) { |
184 | - throw $e; |
|
185 | - } |
|
186 | - //echo 'error ! '.$e->getMessage(); |
|
184 | + throw $e; |
|
185 | + } |
|
186 | + //echo 'error ! '.$e->getMessage(); |
|
187 | 187 | return false; |
188 | 188 | } |
189 | 189 | return true; |
@@ -287,8 +287,8 @@ discard block |
||
287 | 287 | $version = 0; |
288 | 288 | if ($this->tableExists('aircraft')) { |
289 | 289 | if (!$this->tableExists('config')) { |
290 | - $version = '1'; |
|
291 | - return $version; |
|
290 | + $version = '1'; |
|
291 | + return $version; |
|
292 | 292 | } else { |
293 | 293 | $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
294 | 294 | try { |
@@ -309,10 +309,10 @@ discard block |
||
309 | 309 | * @return Boolean if latest version or not |
310 | 310 | */ |
311 | 311 | public function latest() { |
312 | - global $globalNoDB; |
|
313 | - if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
314 | - if ($this->check_schema_version() == $this->latest_schema) return true; |
|
315 | - else return false; |
|
312 | + global $globalNoDB; |
|
313 | + if (isset($globalNoDB) && $globalNoDB === TRUE) return true; |
|
314 | + if ($this->check_schema_version() == $this->latest_schema) return true; |
|
315 | + else return false; |
|
316 | 316 | } |
317 | 317 | |
318 | 318 | } |
@@ -124,11 +124,11 @@ discard block |
||
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
127 | - * Gets all launch site |
|
128 | - * |
|
129 | - * @return Array the launch site list |
|
130 | - * |
|
131 | - */ |
|
127 | + * Gets all launch site |
|
128 | + * |
|
129 | + * @return Array the launch site list |
|
130 | + * |
|
131 | + */ |
|
132 | 132 | public function countAllLaunchSite($limit = true, $filters = array()) |
133 | 133 | { |
134 | 134 | global $globalDBdriver; |
@@ -153,11 +153,11 @@ discard block |
||
153 | 153 | } |
154 | 154 | |
155 | 155 | /** |
156 | - * Gets all owners |
|
157 | - * |
|
158 | - * @return Array the owners list |
|
159 | - * |
|
160 | - */ |
|
156 | + * Gets all owners |
|
157 | + * |
|
158 | + * @return Array the owners list |
|
159 | + * |
|
160 | + */ |
|
161 | 161 | public function countAllOwners($limit = true, $filters = array()) |
162 | 162 | { |
163 | 163 | global $globalDBdriver; |
@@ -182,11 +182,11 @@ discard block |
||
182 | 182 | } |
183 | 183 | |
184 | 184 | /** |
185 | - * Gets all countries owners |
|
186 | - * |
|
187 | - * @return Array the countries list |
|
188 | - * |
|
189 | - */ |
|
185 | + * Gets all countries owners |
|
186 | + * |
|
187 | + * @return Array the countries list |
|
188 | + * |
|
189 | + */ |
|
190 | 190 | public function countAllCountriesOwners($limit = true, $filters = array()) |
191 | 191 | { |
192 | 192 | global $globalDBdriver; |
@@ -211,11 +211,11 @@ discard block |
||
211 | 211 | } |
212 | 212 | |
213 | 213 | /** |
214 | - * Counts all launch dates during the last year |
|
215 | - * |
|
216 | - * @return Array the launch date list |
|
217 | - * |
|
218 | - */ |
|
214 | + * Counts all launch dates during the last year |
|
215 | + * |
|
216 | + * @return Array the launch date list |
|
217 | + * |
|
218 | + */ |
|
219 | 219 | public function countAllMonthsLastYear($filters = array(), $sincedate = '') |
220 | 220 | { |
221 | 221 | global $globalTimezone, $globalDBdriver; |
@@ -256,11 +256,11 @@ discard block |
||
256 | 256 | } |
257 | 257 | |
258 | 258 | /** |
259 | - * Counts all dates during the last 10 years |
|
260 | - * |
|
261 | - * @return Array the date list |
|
262 | - * |
|
263 | - */ |
|
259 | + * Counts all dates during the last 10 years |
|
260 | + * |
|
261 | + * @return Array the date list |
|
262 | + * |
|
263 | + */ |
|
264 | 264 | public function countAllYears($filters = array(), $sincedate = '') |
265 | 265 | { |
266 | 266 | global $globalTimezone, $globalDBdriver; |