@@ -3,8 +3,8 @@ |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | if (!isset($_GET['ident'])) { |
| 6 | - header('Location: '.$globalURL.'/ident'); |
|
| 7 | - die(); |
|
| 6 | + header('Location: '.$globalURL.'/ident'); |
|
| 7 | + die(); |
|
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | 10 | $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
@@ -3,8 +3,8 @@ |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | if (!isset($_GET['ident'])) { |
| 6 | - header('Location: '.$globalURL.'/ident'); |
|
| 7 | - die(); |
|
| 6 | + header('Location: '.$globalURL.'/ident'); |
|
| 7 | + die(); |
|
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | 10 | $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
@@ -3,8 +3,8 @@ |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | if (!isset($_GET['aircraft_manufacturer'])) { |
| 6 | - header('Location: '.$globalURL.'/manufacturer'); |
|
| 7 | - die(); |
|
| 6 | + header('Location: '.$globalURL.'/manufacturer'); |
|
| 7 | + die(); |
|
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | 10 | $manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING))); |
@@ -3,8 +3,8 @@ |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | if (!isset($_GET['country'])) { |
| 6 | - header('Location: '.$globalURL.'/country'); |
|
| 7 | - die(); |
|
| 6 | + header('Location: '.$globalURL.'/country'); |
|
| 7 | + die(); |
|
| 8 | 8 | } |
| 9 | 9 | $Spotter = new Spotter(); |
| 10 | 10 | $country = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING))); |
@@ -3,8 +3,8 @@ discard block |
||
| 3 | 3 | require_once('require/class.Spotter.php'); |
| 4 | 4 | require_once('require/class.Language.php'); |
| 5 | 5 | if (!isset($_GET['airport'])) { |
| 6 | - header('Location: '.$globalURL.'/airport'); |
|
| 7 | - die(); |
|
| 6 | + header('Location: '.$globalURL.'/airport'); |
|
| 7 | + die(); |
|
| 8 | 8 | } |
| 9 | 9 | $airport = filter_input(INPUT_GET,'airport',FILTER_SANITIZE_STRING); |
| 10 | 10 | $Spotter = new Spotter(); |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | function drawChart() { |
| 66 | 66 | var data = google.visualization.arrayToDataTable([ |
| 67 | 67 | ["'._("Country").'", "'._("# of times").'"], '; |
| 68 | - $country_data = ''; |
|
| 68 | + $country_data = ''; |
|
| 69 | 69 | foreach($airport_country_array as $airport_item) |
| 70 | 70 | { |
| 71 | 71 | $country_data .= '[ "'.$airport_item['departure_airport_country'].'",'.$airport_item['airport_departure_country_count'].'],'; |
@@ -9,10 +9,10 @@ discard block |
||
| 9 | 9 | $Common = new Common(); |
| 10 | 10 | |
| 11 | 11 | if (isset($_GET['download'])) { |
| 12 | - if ($_GET['download'] == "true") |
|
| 13 | - { |
|
| 12 | + if ($_GET['download'] == "true") |
|
| 13 | + { |
|
| 14 | 14 | header('Content-disposition: attachment; filename="flightairmap.json"'); |
| 15 | - } |
|
| 15 | + } |
|
| 16 | 16 | } |
| 17 | 17 | header('Content-Type: text/javascript'); |
| 18 | 18 | |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | //waypoint plotting |
| 94 | - /* |
|
| 94 | + /* |
|
| 95 | 95 | $output .= '{'; |
| 96 | 96 | $output .= '"type": "Feature",'; |
| 97 | 97 | $output .= '"properties": {'; |
@@ -270,8 +270,8 @@ discard block |
||
| 270 | 270 | $output_time .= (strtotime($spotter_history['date'])*1000).','; |
| 271 | 271 | } |
| 272 | 272 | if (isset($output_time)) { |
| 273 | - $output_time = substr($output_time, 0, -1); |
|
| 274 | - $output .= '"time": ['.$output_time.'],'; |
|
| 273 | + $output_time = substr($output_time, 0, -1); |
|
| 274 | + $output .= '"time": ['.$output_time.'],'; |
|
| 275 | 275 | } |
| 276 | 276 | |
| 277 | 277 | |
@@ -285,8 +285,8 @@ discard block |
||
| 285 | 285 | $output .= '"coordinates": ['; |
| 286 | 286 | |
| 287 | 287 | if (isset($output_history)) { |
| 288 | - $output_history = substr($output_history, 0, -1); |
|
| 289 | - $output .= $output_history; |
|
| 288 | + $output_history = substr($output_history, 0, -1); |
|
| 289 | + $output .= $output_history; |
|
| 290 | 290 | } |
| 291 | 291 | |
| 292 | 292 | $output .= ']'; |
@@ -13,30 +13,30 @@ |
||
| 13 | 13 | |
| 14 | 14 | |
| 15 | 15 | function quaternionrotate($heading, $attitude = 0, $bank = 0) { |
| 16 | - // Assuming the angles are in radians. |
|
| 17 | - $c1 = cos($heading/2); |
|
| 18 | - $s1 = sin($heading/2); |
|
| 19 | - $c2 = cos($attitude/2); |
|
| 20 | - $s2 = sin($attitude/2); |
|
| 21 | - $c3 = cos($bank/2); |
|
| 22 | - $s3 = sin($bank/2); |
|
| 23 | - $c1c2 = $c1*$c2; |
|
| 24 | - $s1s2 = $s1*$s2; |
|
| 25 | - $w =$c1c2*$c3 - $s1s2*$s3; |
|
| 26 | - $x =$c1c2*$s3 + $s1s2*$c3; |
|
| 27 | - $y =$s1*$c2*$c3 + $c1*$s2*$s3; |
|
| 28 | - $z =$c1*$s2*$c3 - $s1*$c2*$s3; |
|
| 29 | - return array('x' => $x,'y' => $y,'z' => $z,'w' => $w); |
|
| 16 | + // Assuming the angles are in radians. |
|
| 17 | + $c1 = cos($heading/2); |
|
| 18 | + $s1 = sin($heading/2); |
|
| 19 | + $c2 = cos($attitude/2); |
|
| 20 | + $s2 = sin($attitude/2); |
|
| 21 | + $c3 = cos($bank/2); |
|
| 22 | + $s3 = sin($bank/2); |
|
| 23 | + $c1c2 = $c1*$c2; |
|
| 24 | + $s1s2 = $s1*$s2; |
|
| 25 | + $w =$c1c2*$c3 - $s1s2*$s3; |
|
| 26 | + $x =$c1c2*$s3 + $s1s2*$c3; |
|
| 27 | + $y =$s1*$c2*$c3 + $c1*$s2*$s3; |
|
| 28 | + $z =$c1*$s2*$c3 - $s1*$c2*$s3; |
|
| 29 | + return array('x' => $x,'y' => $y,'z' => $z,'w' => $w); |
|
| 30 | 30 | // return array('x' => '0.0','y' => '-0.931','z' => '0.0','w' => '0.365'); |
| 31 | 31 | |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | |
| 35 | 35 | if (isset($_GET['download'])) { |
| 36 | - if ($_GET['download'] == "true") |
|
| 37 | - { |
|
| 36 | + if ($_GET['download'] == "true") |
|
| 37 | + { |
|
| 38 | 38 | header('Content-disposition: attachment; filename="flightairmap.json"'); |
| 39 | - } |
|
| 39 | + } |
|
| 40 | 40 | } |
| 41 | 41 | header('Content-Type: text/javascript'); |
| 42 | 42 | |
@@ -4,88 +4,88 @@ |
||
| 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 | $original = dirname(__FILE__).DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'aircrafts'.DIRECTORY_SEPARATOR.'new'.DIRECTORY_SEPARATOR.$filename; |
| 34 | 34 | if (!file_exists($original)) { |
| 35 | - echo "File not found"; |
|
| 35 | + echo "File not found"; |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 39 | - $image = imagecreatefrompng($original); |
|
| 40 | - $index = imagecolorexact($image,26,49,81); |
|
| 41 | - if ($index < 0) { |
|
| 39 | + $image = imagecreatefrompng($original); |
|
| 40 | + $index = imagecolorexact($image,26,49,81); |
|
| 41 | + if ($index < 0) { |
|
| 42 | 42 | $index = imagecolorexact($image,25,49,79); |
| 43 | - } |
|
| 44 | - if ($index < 0) { |
|
| 43 | + } |
|
| 44 | + if ($index < 0) { |
|
| 45 | 45 | $index = imagecolorexact($image,0,0,0); |
| 46 | - } |
|
| 47 | - $c = hexToRGB($color); |
|
| 48 | - imagecolorset($image,$index,$c['r'],$c['g'],$c['b']); |
|
| 46 | + } |
|
| 47 | + $c = hexToRGB($color); |
|
| 48 | + imagecolorset($image,$index,$c['r'],$c['g'],$c['b']); |
|
| 49 | 49 | /* |
| 50 | 50 | $ig = imagecolorat($image, 0, 0); |
| 51 | 51 | imagecolortransparent($image, $ig); |
| 52 | 52 | */ |
| 53 | 53 | |
| 54 | - header('Content-type: image/png'); |
|
| 55 | - if (isset($_GET['resize']) && function_exists('imagecopyresampled')) { |
|
| 54 | + header('Content-type: image/png'); |
|
| 55 | + if (isset($_GET['resize']) && function_exists('imagecopyresampled')) { |
|
| 56 | 56 | $resize = filter_input(INPUT_GET,'resize',FILTER_SANITIZE_NUMBER_INT); |
| 57 | 57 | $newimg = imagecreatetruecolor($resize,$resize); |
| 58 | - imagealphablending($newimg, false); |
|
| 58 | + imagealphablending($newimg, false); |
|
| 59 | 59 | imagesavealpha($newimg, true); |
| 60 | 60 | imagecopyresampled($newimg,$image,0,0,0,0,15,15,imagesx($image),imagesy($image)); |
| 61 | 61 | if (isset($_GET['heading'])) { |
| 62 | - $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT); |
|
| 63 | - $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127)); |
|
| 64 | - imagealphablending($rotation, false); |
|
| 65 | - imagesavealpha($rotation, true); |
|
| 66 | - imagepng($rotation); |
|
| 67 | - imagedestroy($newimg); |
|
| 68 | - imagedestroy($image); |
|
| 69 | - imagedestroy($rotation); |
|
| 62 | + $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT); |
|
| 63 | + $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127)); |
|
| 64 | + imagealphablending($rotation, false); |
|
| 65 | + imagesavealpha($rotation, true); |
|
| 66 | + imagepng($rotation); |
|
| 67 | + imagedestroy($newimg); |
|
| 68 | + imagedestroy($image); |
|
| 69 | + imagedestroy($rotation); |
|
| 70 | 70 | |
| 71 | 71 | } else { |
| 72 | - imagepng($newimg); |
|
| 73 | - imagedestroy($newimg); |
|
| 74 | - imagedestroy($image); |
|
| 75 | - } |
|
| 76 | - } else { |
|
| 72 | + imagepng($newimg); |
|
| 73 | + imagedestroy($newimg); |
|
| 74 | + imagedestroy($image); |
|
| 75 | + } |
|
| 76 | + } else { |
|
| 77 | 77 | imagealphablending($image, false); |
| 78 | - imagesavealpha($image, true); |
|
| 78 | + imagesavealpha($image, true); |
|
| 79 | 79 | imagepng($image); |
| 80 | 80 | imagepng($image); |
| 81 | 81 | if (is_writable('cache')) { |
| 82 | - imagepng($image,dirname(__FILE__).DIRECTORY_SEPARATOR.'cache/'.$color.'-'.$filename); |
|
| 82 | + imagepng($image,dirname(__FILE__).DIRECTORY_SEPARATOR.'cache/'.$color.'-'.$filename); |
|
| 83 | + } |
|
| 84 | + imagedestroy($image); |
|
| 83 | 85 | } |
| 84 | - imagedestroy($image); |
|
| 85 | - } |
|
| 86 | 86 | } else { |
| 87 | - header('Content-type: image/png'); |
|
| 88 | - if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename); |
|
| 89 | - else readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename); |
|
| 87 | + header('Content-type: image/png'); |
|
| 88 | + if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename); |
|
| 89 | + else readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename); |
|
| 90 | 90 | } |
| 91 | 91 | ?> |
| 92 | 92 | \ No newline at end of file |
@@ -16,11 +16,11 @@ discard block |
||
| 16 | 16 | $this->SI = new SpotterImport($this->db); |
| 17 | 17 | } |
| 18 | 18 | /** |
| 19 | - * Change IATA to ICAO value for ident |
|
| 20 | - * |
|
| 21 | - * @param String $ident ident |
|
| 22 | - * @return String the icao |
|
| 23 | - */ |
|
| 19 | + * Change IATA to ICAO value for ident |
|
| 20 | + * |
|
| 21 | + * @param String $ident ident |
|
| 22 | + * @return String the icao |
|
| 23 | + */ |
|
| 24 | 24 | public function ident2icao($ident) { |
| 25 | 25 | if (substr($ident,0,2) == 'AF') { |
| 26 | 26 | if (filter_var(substr($ident,2),FILTER_VALIDATE_INT,array("flags"=>FILTER_FLAG_ALLOW_OCTAL))) $icao = $ident; |
@@ -36,11 +36,11 @@ discard block |
||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | /** |
| 39 | - * Deletes all info in the live table |
|
| 40 | - * |
|
| 41 | - * @return String success or false |
|
| 42 | - * |
|
| 43 | - */ |
|
| 39 | + * Deletes all info in the live table |
|
| 40 | + * |
|
| 41 | + * @return String success or false |
|
| 42 | + * |
|
| 43 | + */ |
|
| 44 | 44 | public function deleteLiveAcarsData() |
| 45 | 45 | { |
| 46 | 46 | global $globalDBdriver; |
@@ -60,11 +60,11 @@ discard block |
||
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | - * Deletes all info in the archive table |
|
| 64 | - * |
|
| 65 | - * @return String success or false |
|
| 66 | - * |
|
| 67 | - */ |
|
| 63 | + * Deletes all info in the archive table |
|
| 64 | + * |
|
| 65 | + * @return String success or false |
|
| 66 | + * |
|
| 67 | + */ |
|
| 68 | 68 | public function deleteArchiveAcarsData() |
| 69 | 69 | { |
| 70 | 70 | global $globalACARSArchiveKeepMonths, $globalDBdriver; |
@@ -85,11 +85,11 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | |
| 87 | 87 | /** |
| 88 | - * Parse ACARS data |
|
| 89 | - * |
|
| 90 | - * @param String ACARS data in acarsdec data |
|
| 91 | - * |
|
| 92 | - */ |
|
| 88 | + * Parse ACARS data |
|
| 89 | + * |
|
| 90 | + * @param String ACARS data in acarsdec data |
|
| 91 | + * |
|
| 92 | + */ |
|
| 93 | 93 | public function parse($data) { |
| 94 | 94 | global $globalDebug, $globalACARSArchive; |
| 95 | 95 | //$Image = new Image($this->db); |
@@ -666,11 +666,11 @@ discard block |
||
| 666 | 666 | |
| 667 | 667 | |
| 668 | 668 | /** |
| 669 | - * Add ACARS data |
|
| 670 | - * |
|
| 671 | - * @param String ACARS data in acarsdec data |
|
| 672 | - * |
|
| 673 | - */ |
|
| 669 | + * Add ACARS data |
|
| 670 | + * |
|
| 671 | + * @param String ACARS data in acarsdec data |
|
| 672 | + * |
|
| 673 | + */ |
|
| 674 | 674 | function add($data) { |
| 675 | 675 | global $globalDebug, $globalACARSArchive; |
| 676 | 676 | $Image = new Image($this->db); |
@@ -725,15 +725,15 @@ discard block |
||
| 725 | 725 | } |
| 726 | 726 | |
| 727 | 727 | /** |
| 728 | - * Add Live ACARS data in DB |
|
| 729 | - * |
|
| 730 | - * @param String $ident ident |
|
| 731 | - * @param String $registration Registration of the aircraft |
|
| 732 | - * @param String $label Label of the ACARS message |
|
| 733 | - * @param String $block_id Block id of the ACARS message |
|
| 734 | - * @param String $msg_no Number of the ACARS message |
|
| 735 | - * @param String $message ACARS message |
|
| 736 | - */ |
|
| 728 | + * Add Live ACARS data in DB |
|
| 729 | + * |
|
| 730 | + * @param String $ident ident |
|
| 731 | + * @param String $registration Registration of the aircraft |
|
| 732 | + * @param String $label Label of the ACARS message |
|
| 733 | + * @param String $block_id Block id of the ACARS message |
|
| 734 | + * @param String $msg_no Number of the ACARS message |
|
| 735 | + * @param String $message ACARS message |
|
| 736 | + */ |
|
| 737 | 737 | public function addLiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') { |
| 738 | 738 | global $globalDebug; |
| 739 | 739 | date_default_timezone_set('UTC'); |
@@ -771,15 +771,15 @@ discard block |
||
| 771 | 771 | } |
| 772 | 772 | |
| 773 | 773 | /** |
| 774 | - * Add Archive ACARS data in DB |
|
| 775 | - * |
|
| 776 | - * @param String $ident ident |
|
| 777 | - * @param String $registration Registration of the aircraft |
|
| 778 | - * @param String $label Label of the ACARS message |
|
| 779 | - * @param String $block_id Block id of the ACARS message |
|
| 780 | - * @param String $msg_no Number of the ACARS message |
|
| 781 | - * @param String $message ACARS message |
|
| 782 | - */ |
|
| 774 | + * Add Archive ACARS data in DB |
|
| 775 | + * |
|
| 776 | + * @param String $ident ident |
|
| 777 | + * @param String $registration Registration of the aircraft |
|
| 778 | + * @param String $label Label of the ACARS message |
|
| 779 | + * @param String $block_id Block id of the ACARS message |
|
| 780 | + * @param String $msg_no Number of the ACARS message |
|
| 781 | + * @param String $message ACARS message |
|
| 782 | + */ |
|
| 783 | 783 | public function addArchiveAcarsData($ident,$registration,$label,$block_id,$msg_no,$message,$decode = '') { |
| 784 | 784 | global $globalDebug; |
| 785 | 785 | date_default_timezone_set('UTC'); |
@@ -813,11 +813,11 @@ discard block |
||
| 813 | 813 | } |
| 814 | 814 | |
| 815 | 815 | /** |
| 816 | - * Get Message title from label from DB |
|
| 817 | - * |
|
| 818 | - * @param String $label |
|
| 819 | - * @return String Return ACARS title |
|
| 820 | - */ |
|
| 816 | + * Get Message title from label from DB |
|
| 817 | + * |
|
| 818 | + * @param String $label |
|
| 819 | + * @return String Return ACARS title |
|
| 820 | + */ |
|
| 821 | 821 | public function getTitlefromLabel($label) { |
| 822 | 822 | $Connection = new Connection($this->db); |
| 823 | 823 | $this->db = $Connection->db; |
@@ -837,10 +837,10 @@ discard block |
||
| 837 | 837 | } |
| 838 | 838 | |
| 839 | 839 | /** |
| 840 | - * List all Message title & label from DB |
|
| 841 | - * |
|
| 842 | - * @return Array Return ACARS data in array |
|
| 843 | - */ |
|
| 840 | + * List all Message title & label from DB |
|
| 841 | + * |
|
| 842 | + * @return Array Return ACARS data in array |
|
| 843 | + */ |
|
| 844 | 844 | public function getAllTitleLabel() { |
| 845 | 845 | $query = "SELECT * FROM acars_label ORDER BY title"; |
| 846 | 846 | $query_values = array(); |
@@ -858,11 +858,11 @@ discard block |
||
| 858 | 858 | } |
| 859 | 859 | |
| 860 | 860 | /** |
| 861 | - * Get Live ACARS data from DB |
|
| 862 | - * |
|
| 863 | - * @param String $ident |
|
| 864 | - * @return Array Return ACARS data in array |
|
| 865 | - */ |
|
| 861 | + * Get Live ACARS data from DB |
|
| 862 | + * |
|
| 863 | + * @param String $ident |
|
| 864 | + * @return Array Return ACARS data in array |
|
| 865 | + */ |
|
| 866 | 866 | public function getLiveAcarsData($ident) { |
| 867 | 867 | $query = "SELECT * FROM acars_live WHERE ident = :ident ORDER BY acars_live_id DESC"; |
| 868 | 868 | $query_values = array(':ident' => $ident); |
@@ -880,10 +880,10 @@ discard block |
||
| 880 | 880 | } |
| 881 | 881 | |
| 882 | 882 | /** |
| 883 | - * Get Latest ACARS data from DB |
|
| 884 | - * |
|
| 885 | - * @return Array Return ACARS data in array |
|
| 886 | - */ |
|
| 883 | + * Get Latest ACARS data from DB |
|
| 884 | + * |
|
| 885 | + * @return Array Return ACARS data in array |
|
| 886 | + */ |
|
| 887 | 887 | public function getLatestAcarsData($limit = '',$label = '') { |
| 888 | 888 | global $globalURL, $globalDBdriver; |
| 889 | 889 | $Image = new Image($this->db); |
@@ -980,10 +980,10 @@ discard block |
||
| 980 | 980 | } |
| 981 | 981 | |
| 982 | 982 | /** |
| 983 | - * Get Archive ACARS data from DB |
|
| 984 | - * |
|
| 985 | - * @return Array Return ACARS data in array |
|
| 986 | - */ |
|
| 983 | + * Get Archive ACARS data from DB |
|
| 984 | + * |
|
| 985 | + * @return Array Return ACARS data in array |
|
| 986 | + */ |
|
| 987 | 987 | public function getArchiveAcarsData($limit = '',$label = '') { |
| 988 | 988 | global $globalURL, $globalDBdriver; |
| 989 | 989 | $Image = new Image($this->db); |
@@ -1085,13 +1085,13 @@ discard block |
||
| 1085 | 1085 | } |
| 1086 | 1086 | |
| 1087 | 1087 | /** |
| 1088 | - * Add ModeS data to DB |
|
| 1089 | - * |
|
| 1090 | - * @param String $ident ident |
|
| 1091 | - * @param String $registration Registration of the aircraft |
|
| 1092 | - * @param String $icao |
|
| 1093 | - * @param String $ICAOTypeCode |
|
| 1094 | - */ |
|
| 1088 | + * Add ModeS data to DB |
|
| 1089 | + * |
|
| 1090 | + * @param String $ident ident |
|
| 1091 | + * @param String $registration Registration of the aircraft |
|
| 1092 | + * @param String $icao |
|
| 1093 | + * @param String $ICAOTypeCode |
|
| 1094 | + */ |
|
| 1095 | 1095 | public function addModeSData($ident,$registration,$icao = '',$ICAOTypeCode = '',$latitude = '', $longitude = '') { |
| 1096 | 1096 | global $globalDebug, $globalDBdriver; |
| 1097 | 1097 | $ident = trim($ident); |