@@ -8,7 +8,7 @@ |
||
8 | 8 | if (!isset($filter_name)) $filter_name = ''; |
9 | 9 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
10 | 10 | if ($airline_icao == '' && isset($globalFilter)) { |
11 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
11 | + if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
12 | 12 | } |
13 | 13 | |
14 | 14 | require_once('header.php'); |
@@ -8,7 +8,7 @@ |
||
8 | 8 | if (!isset($filter_name)) $filter_name = ''; |
9 | 9 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
10 | 10 | if ($airline_icao == '' && isset($globalFilter)) { |
11 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
11 | + if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
12 | 12 | } |
13 | 13 | |
14 | 14 | require_once('header.php'); |
@@ -8,7 +8,7 @@ |
||
8 | 8 | if (!isset($filter_name)) $filter_name = ''; |
9 | 9 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
10 | 10 | if ($airline_icao == '' && isset($globalFilter)) { |
11 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
11 | + if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
12 | 12 | } |
13 | 13 | $year = filter_input(INPUT_GET,'year',FILTER_SANITIZE_NUMBER_INT); |
14 | 14 | $month = filter_input(INPUT_GET,'month',FILTER_SANITIZE_NUMBER_INT); |
@@ -8,7 +8,7 @@ |
||
8 | 8 | if (!isset($filter_name)) $filter_name = ''; |
9 | 9 | $airline_icao = (string)filter_input(INPUT_GET,'airline',FILTER_SANITIZE_STRING); |
10 | 10 | if ($airline_icao == '' && isset($globalFilter)) { |
11 | - if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
11 | + if (isset($globalFilter['airline'])) $airline_icao = $globalFilter['airline'][0]; |
|
12 | 12 | } |
13 | 13 | |
14 | 14 | require_once('header.php'); |
@@ -516,8 +516,8 @@ discard block |
||
516 | 516 | } |
517 | 517 | } |
518 | 518 | <?php |
519 | - } else { |
|
520 | - ?> |
|
519 | + } else { |
|
520 | + ?> |
|
521 | 521 | if (map.getZoom() > 7) { |
522 | 522 | var style = { |
523 | 523 | "color": "#1a3151", |
@@ -536,7 +536,7 @@ discard block |
||
536 | 536 | layer_marine_data.addLayer(layer); |
537 | 537 | } |
538 | 538 | <?php |
539 | - } |
|
539 | + } |
|
540 | 540 | ?> |
541 | 541 | } |
542 | 542 | } |
@@ -517,8 +517,8 @@ discard block |
||
517 | 517 | } |
518 | 518 | } |
519 | 519 | <?php |
520 | - } else { |
|
521 | - ?> |
|
520 | + } else { |
|
521 | + ?> |
|
522 | 522 | if (map.getZoom() > 7) { |
523 | 523 | var style = { |
524 | 524 | "color": "#1a3151", |
@@ -537,7 +537,7 @@ discard block |
||
537 | 537 | layer_tracker_data.addLayer(layer); |
538 | 538 | } |
539 | 539 | <?php |
540 | - } |
|
540 | + } |
|
541 | 541 | ?> |
542 | 542 | } |
543 | 543 | } |
@@ -352,10 +352,10 @@ discard block |
||
352 | 352 | }); |
353 | 353 | update_locationsLayer(); |
354 | 354 | <?php |
355 | - // Add support for custom json via $globalMapJson |
|
356 | - if (isset($globalMapJson) && is_array($globalMapJson)) { |
|
355 | + // Add support for custom json via $globalMapJson |
|
356 | + if (isset($globalMapJson) && is_array($globalMapJson)) { |
|
357 | 357 | foreach ($globalMapJson as $json) { |
358 | - if (isset($json['url'])) { |
|
358 | + if (isset($json['url'])) { |
|
359 | 359 | ?> |
360 | 360 | update_genLayer('<?php print $json['url']; ?>'); |
361 | 361 | <?php |
@@ -364,9 +364,9 @@ discard block |
||
364 | 364 | setInterval(function(){update_genLayer('<?php print $json['url']; ?>')}, <?php print $json['refresh']; ?>); |
365 | 365 | <?php |
366 | 366 | } |
367 | - } |
|
367 | + } |
|
368 | + } |
|
368 | 369 | } |
369 | - } |
|
370 | 370 | |
371 | 371 | ?> |
372 | 372 | //adds the bootstrap tooltip to the map icons |
@@ -4,31 +4,31 @@ discard block |
||
4 | 4 | $hex = str_replace("#", "", $hex); |
5 | 5 | $color = array(); |
6 | 6 | if (strlen($hex) == 3) { |
7 | - $color['r'] = hexdec(substr($hex, 0, 1) . substr($hex,0,1)); |
|
8 | - $color['g'] = hexdec(substr($hex, 1, 1) . substr($hex,1,1)); |
|
9 | - $color['b'] = hexdec(substr($hex, 2, 1) . substr($hex,2,1)); |
|
7 | + $color['r'] = hexdec(substr($hex, 0, 1) . substr($hex,0,1)); |
|
8 | + $color['g'] = hexdec(substr($hex, 1, 1) . substr($hex,1,1)); |
|
9 | + $color['b'] = hexdec(substr($hex, 2, 1) . substr($hex,2,1)); |
|
10 | 10 | } else if (strlen($hex) == 6) { |
11 | - $color['r'] = hexdec(substr($hex, 0, 2)); |
|
12 | - $color['g'] = hexdec(substr($hex, 2, 2)); |
|
13 | - $color['b'] = hexdec(substr($hex, 4, 2)); |
|
11 | + $color['r'] = hexdec(substr($hex, 0, 2)); |
|
12 | + $color['g'] = hexdec(substr($hex, 2, 2)); |
|
13 | + $color['b'] = hexdec(substr($hex, 4, 2)); |
|
14 | 14 | } |
15 | 15 | return $color; |
16 | 16 | } |
17 | 17 | |
18 | 18 | |
19 | 19 | if (!isset($_GET['color']) || $_GET['color'] == '' || !preg_match('/^([a-fA-F0-9]){3}(([a-fA-F0-9]){3})?\b/',$_GET['color'])) { |
20 | - exit(0); |
|
20 | + exit(0); |
|
21 | 21 | } |
22 | 22 | $color = $_GET['color']; |
23 | 23 | if (!isset($_GET['filename']) || !preg_match('/^[a-z0-9-_]+\.png$/', strtolower($_GET['filename']))) { |
24 | - echo "Incorrect filename"; |
|
25 | - exit(0); |
|
24 | + echo "Incorrect filename"; |
|
25 | + exit(0); |
|
26 | 26 | } |
27 | 27 | $filename = $_GET['filename']; |
28 | 28 | if (file_exists(dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.$color.'-'.$filename)) { |
29 | - header('Content-type: image/png'); |
|
30 | - readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.$color.'-'.$filename); |
|
31 | - exit(0); |
|
29 | + header('Content-type: image/png'); |
|
30 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.$color.'-'.$filename); |
|
31 | + exit(0); |
|
32 | 32 | } |
33 | 33 | if (isset($_GET['tracker'])) { |
34 | 34 | $original = dirname(__FILE__).DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'vehicules'.DIRECTORY_SEPARATOR.$filename; |
@@ -38,66 +38,66 @@ discard block |
||
38 | 38 | $original = dirname(__FILE__).DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'aircrafts'.DIRECTORY_SEPARATOR.'new'.DIRECTORY_SEPARATOR.$filename; |
39 | 39 | } |
40 | 40 | if (!file_exists($original)) { |
41 | - echo "File not found"; |
|
41 | + echo "File not found"; |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | if (extension_loaded('gd') && function_exists('gd_info')) { |
45 | - $image = imagecreatefrompng($original); |
|
46 | - $index = imagecolorexact($image,26,49,81); |
|
47 | - if ($index < 0) { |
|
45 | + $image = imagecreatefrompng($original); |
|
46 | + $index = imagecolorexact($image,26,49,81); |
|
47 | + if ($index < 0) { |
|
48 | 48 | $index = imagecolorexact($image,25,49,79); |
49 | - } |
|
50 | - if ($index < 0) { |
|
49 | + } |
|
50 | + if ($index < 0) { |
|
51 | 51 | $index = imagecolorexact($image,0,0,0); |
52 | - } |
|
53 | - $c = hexToRGB($color); |
|
54 | - imagecolorset($image,$index,$c['r'],$c['g'],$c['b']); |
|
52 | + } |
|
53 | + $c = hexToRGB($color); |
|
54 | + imagecolorset($image,$index,$c['r'],$c['g'],$c['b']); |
|
55 | 55 | /* |
56 | 56 | $ig = imagecolorat($image, 0, 0); |
57 | 57 | imagecolortransparent($image, $ig); |
58 | 58 | */ |
59 | 59 | |
60 | - header('Content-type: image/png'); |
|
61 | - if (isset($_GET['resize']) && function_exists('imagecopyresampled')) { |
|
60 | + header('Content-type: image/png'); |
|
61 | + if (isset($_GET['resize']) && function_exists('imagecopyresampled')) { |
|
62 | 62 | $resize = filter_input(INPUT_GET,'resize',FILTER_SANITIZE_NUMBER_INT); |
63 | 63 | $newimg = imagecreatetruecolor($resize,$resize); |
64 | - imagealphablending($newimg, false); |
|
64 | + imagealphablending($newimg, false); |
|
65 | 65 | imagesavealpha($newimg, true); |
66 | 66 | imagecopyresampled($newimg,$image,0,0,0,0,15,15,imagesx($image),imagesy($image)); |
67 | 67 | if (isset($_GET['heading'])) { |
68 | - $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT); |
|
69 | - $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127)); |
|
70 | - imagealphablending($rotation, false); |
|
71 | - imagesavealpha($rotation, true); |
|
72 | - imagepng($rotation); |
|
73 | - imagedestroy($newimg); |
|
74 | - imagedestroy($image); |
|
75 | - imagedestroy($rotation); |
|
68 | + $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT); |
|
69 | + $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127)); |
|
70 | + imagealphablending($rotation, false); |
|
71 | + imagesavealpha($rotation, true); |
|
72 | + imagepng($rotation); |
|
73 | + imagedestroy($newimg); |
|
74 | + imagedestroy($image); |
|
75 | + imagedestroy($rotation); |
|
76 | 76 | |
77 | 77 | } else { |
78 | - imagepng($newimg); |
|
79 | - imagedestroy($newimg); |
|
80 | - imagedestroy($image); |
|
81 | - } |
|
82 | - } else { |
|
78 | + imagepng($newimg); |
|
79 | + imagedestroy($newimg); |
|
80 | + imagedestroy($image); |
|
81 | + } |
|
82 | + } else { |
|
83 | 83 | imagealphablending($image, false); |
84 | - imagesavealpha($image, true); |
|
84 | + imagesavealpha($image, true); |
|
85 | 85 | imagepng($image); |
86 | 86 | imagepng($image); |
87 | 87 | if (is_writable('cache')) { |
88 | - imagepng($image,dirname(__FILE__).DIRECTORY_SEPARATOR.'cache/'.$color.'-'.$filename); |
|
88 | + imagepng($image,dirname(__FILE__).DIRECTORY_SEPARATOR.'cache/'.$color.'-'.$filename); |
|
89 | + } |
|
90 | + imagedestroy($image); |
|
89 | 91 | } |
90 | - imagedestroy($image); |
|
91 | - } |
|
92 | 92 | } else { |
93 | - header('Content-type: image/png'); |
|
94 | - if (isset($_GET['tracker'])) { |
|
95 | - readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
|
96 | - } elseif (isset($_GET['marine'])) { |
|
97 | - readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
|
98 | - } else { |
|
99 | - if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename); |
|
93 | + header('Content-type: image/png'); |
|
94 | + if (isset($_GET['tracker'])) { |
|
95 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
|
96 | + } elseif (isset($_GET['marine'])) { |
|
97 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
|
98 | + } else { |
|
99 | + if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename); |
|
100 | 100 | else readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename); |
101 | - } |
|
101 | + } |
|
102 | 102 | } |
103 | 103 | ?> |
104 | 104 | \ No newline at end of file |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | return ($dec); |
58 | 58 | } |
59 | 59 | |
60 | - /* |
|
60 | + /* |
|
61 | 61 | $ais_map64 = array( |
62 | 62 | '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', // 48 |
63 | 63 | ':', ';', '<', '=', '>', '?', '@', 'A', 'B', 'C', |
@@ -97,13 +97,13 @@ discard block |
||
97 | 97 | // ' ' --- '?', // 0x20 - 0x3F |
98 | 98 | // '@' --- '_', // 0x40 - 0x5F |
99 | 99 | $ais_chars = array( |
100 | - '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', |
|
101 | - 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', |
|
102 | - 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\', ']', |
|
103 | - '^', '_', ' ', '!', '\"', '#', '$', '%', '&', '\'', |
|
104 | - '(', ')', '*', '+', ',', '-', '.', '/', '0', '1', |
|
105 | - '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', |
|
106 | - '<', '=', '>', '?' |
|
100 | + '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', |
|
101 | + 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', |
|
102 | + 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\', ']', |
|
103 | + '^', '_', ' ', '!', '\"', '#', '$', '%', '&', '\'', |
|
104 | + '(', ')', '*', '+', ',', '-', '.', '/', '0', '1', |
|
105 | + '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', |
|
106 | + '<', '=', '>', '?' |
|
107 | 107 | ); |
108 | 108 | // " |
109 | 109 | $rv = ''; |
@@ -419,8 +419,8 @@ discard block |
||
419 | 419 | } |
420 | 420 | if ($num_seq > 1) { // for multipart messages |
421 | 421 | if ($cmsg_sid != $msg_sid // different msg_sid |
422 | - || $msg_sid == -1 // invalid initial msg_sid |
|
423 | - || ($seq - $pseq) != 1 // not insequence |
|
422 | + || $msg_sid == -1 // invalid initial msg_sid |
|
423 | + || ($seq - $pseq) != 1 // not insequence |
|
424 | 424 | ) { // invalid for multipart message |
425 | 425 | $msg_sid = -1; |
426 | 426 | $cmsg_sid = -1; |
@@ -433,7 +433,7 @@ discard block |
||
433 | 433 | $itu = $itu.$pcs[5]; // get itu message |
434 | 434 | $filler += (int)$pcs[6][0]; // get filler |
435 | 435 | if ($num_seq == 1 // valid single message |
436 | - || $num_seq == $pseq // valid multi-part message |
|
436 | + || $num_seq == $pseq // valid multi-part message |
|
437 | 437 | ) { |
438 | 438 | if ($num_seq != 1) { // test |
439 | 439 | //echo $rawdata; |
@@ -516,13 +516,13 @@ discard block |
||
516 | 516 | else $pad = ''; |
517 | 517 | $rv = ''; |
518 | 518 | $ais_chars = array( |
519 | - '@'=>0, 'A'=>1, 'B'=>2, 'C'=>3, 'D'=>4, 'E'=>5, 'F'=>6, 'G'=>7, 'H'=>8, 'I'=>9, |
|
520 | - 'J'=>10, 'K'=>11, 'L'=>12, 'M'=>13, 'N'=>14, 'O'=>15, 'P'=>16, 'Q'=>17, 'R'=>18, 'S'=>19, |
|
521 | - 'T'=>20, 'U'=>21, 'V'=>22, 'W'=>23, 'X'=>24, 'Y'=>25, 'Z'=>26, '['=>27, '\\'=>28, ']'=>29, |
|
522 | - '^'=>30, '_'=>31, ' '=>32, '!'=>33, '\"'=>34, '#'=>35, '$'=>36, '%'=>37, '&'=>38, '\''=>39, |
|
523 | - '('=>40, ')'=>41, '*'=>42, '+'=>43, ','=>44, '-'=>45, '.'=>46, '/'=>47, '0'=>48, '1'=>49, |
|
524 | - '2'=>50, '3'=>51, '4'=>52, '5'=>53, '6'=>54, '7'=>55, '8'=>56, '9'=>57, ':'=>58, ';'=>59, |
|
525 | - '<'=>60, '='=>61, '>'=>62, '?'=>63 |
|
519 | + '@'=>0, 'A'=>1, 'B'=>2, 'C'=>3, 'D'=>4, 'E'=>5, 'F'=>6, 'G'=>7, 'H'=>8, 'I'=>9, |
|
520 | + 'J'=>10, 'K'=>11, 'L'=>12, 'M'=>13, 'N'=>14, 'O'=>15, 'P'=>16, 'Q'=>17, 'R'=>18, 'S'=>19, |
|
521 | + 'T'=>20, 'U'=>21, 'V'=>22, 'W'=>23, 'X'=>24, 'Y'=>25, 'Z'=>26, '['=>27, '\\'=>28, ']'=>29, |
|
522 | + '^'=>30, '_'=>31, ' '=>32, '!'=>33, '\"'=>34, '#'=>35, '$'=>36, '%'=>37, '&'=>38, '\''=>39, |
|
523 | + '('=>40, ')'=>41, '*'=>42, '+'=>43, ','=>44, '-'=>45, '.'=>46, '/'=>47, '0'=>48, '1'=>49, |
|
524 | + '2'=>50, '3'=>51, '4'=>52, '5'=>53, '6'=>54, '7'=>55, '8'=>56, '9'=>57, ':'=>58, ';'=>59, |
|
525 | + '<'=>60, '='=>61, '>'=>62, '?'=>63 |
|
526 | 526 | ); |
527 | 527 | // " |
528 | 528 | $_a = str_split($name); |