Ysurac /
FlightAirMap
@@ -4,9 +4,9 @@ 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 | 11 | $color['r'] = hexdec(substr($hex, 0, 2)); |
| 12 | 12 | $color['g'] = hexdec(substr($hex, 2, 2)); |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | |
| 19 | -if (!isset($_GET['color']) || $_GET['color'] == '' || !preg_match('/^([a-fA-F0-9]){3}(([a-fA-F0-9]){3})?\b/',$_GET['color'])) { |
|
| 19 | +if (!isset($_GET['color']) || $_GET['color'] == '' || !preg_match('/^([a-fA-F0-9]){3}(([a-fA-F0-9]){3})?\b/', $_GET['color'])) { |
|
| 20 | 20 | exit(0); |
| 21 | 21 | } |
| 22 | 22 | $color = $_GET['color']; |
@@ -47,15 +47,15 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 49 | 49 | $image = imagecreatefrompng($original); |
| 50 | - $index = imagecolorexact($image,26,49,81); |
|
| 50 | + $index = imagecolorexact($image, 26, 49, 81); |
|
| 51 | 51 | if ($index < 0) { |
| 52 | - $index = imagecolorexact($image,25,49,79); |
|
| 52 | + $index = imagecolorexact($image, 25, 49, 79); |
|
| 53 | 53 | } |
| 54 | 54 | if ($index < 0) { |
| 55 | - $index = imagecolorexact($image,0,0,0); |
|
| 55 | + $index = imagecolorexact($image, 0, 0, 0); |
|
| 56 | 56 | } |
| 57 | 57 | $c = hexToRGB($color); |
| 58 | - imagecolorset($image,$index,$c['r'],$c['g'],$c['b']); |
|
| 58 | + imagecolorset($image, $index, $c['r'], $c['g'], $c['b']); |
|
| 59 | 59 | /* |
| 60 | 60 | $ig = imagecolorat($image, 0, 0); |
| 61 | 61 | imagecolortransparent($image, $ig); |
@@ -63,14 +63,14 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | header('Content-type: image/png'); |
| 65 | 65 | if (isset($_GET['resize']) && function_exists('imagecopyresampled')) { |
| 66 | - $resize = filter_input(INPUT_GET,'resize',FILTER_SANITIZE_NUMBER_INT); |
|
| 67 | - $newimg = imagecreatetruecolor($resize,$resize); |
|
| 66 | + $resize = filter_input(INPUT_GET, 'resize', FILTER_SANITIZE_NUMBER_INT); |
|
| 67 | + $newimg = imagecreatetruecolor($resize, $resize); |
|
| 68 | 68 | imagealphablending($newimg, false); |
| 69 | 69 | imagesavealpha($newimg, true); |
| 70 | - imagecopyresampled($newimg,$image,0,0,0,0,15,15,imagesx($image),imagesy($image)); |
|
| 70 | + imagecopyresampled($newimg, $image, 0, 0, 0, 0, 15, 15, imagesx($image), imagesy($image)); |
|
| 71 | 71 | if (isset($_GET['heading'])) { |
| 72 | - $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT); |
|
| 73 | - $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127)); |
|
| 72 | + $heading = filter_input(INPUT_GET, 'heading', FILTER_SANITIZE_NUMBER_INT); |
|
| 73 | + $rotation = imagerotate($newimg, $heading, imageColorAllocateAlpha($newimg, 0, 0, 0, 127)); |
|
| 74 | 74 | imagealphablending($rotation, false); |
| 75 | 75 | imagesavealpha($rotation, true); |
| 76 | 76 | imagepng($rotation); |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | imagepng($image); |
| 90 | 90 | imagepng($image); |
| 91 | 91 | if (is_writable(dirname(__FILE__).'/cache')) { |
| 92 | - imagepng($image,dirname(__FILE__).'/cache/'.$color.'-'.$filename); |
|
| 92 | + imagepng($image, dirname(__FILE__).'/cache/'.$color.'-'.$filename); |
|
| 93 | 93 | } |
| 94 | 94 | imagedestroy($image); |
| 95 | 95 | } |
@@ -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) && is_readable(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.'color'.DIRECTORY_SEPARATOR.$filename; |
@@ -45,68 +45,68 @@ discard block |
||
| 45 | 45 | $original = dirname(__FILE__).DIRECTORY_SEPARATOR.'images'.DIRECTORY_SEPARATOR.'aircrafts'.DIRECTORY_SEPARATOR.'new'.DIRECTORY_SEPARATOR.$filename; |
| 46 | 46 | } |
| 47 | 47 | if (!file_exists($original)) { |
| 48 | - echo "File not found"; |
|
| 48 | + echo "File not found"; |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | if (extension_loaded('gd') && function_exists('gd_info')) { |
| 52 | - $image = imagecreatefrompng($original); |
|
| 53 | - $index = imagecolorexact($image,26,49,81); |
|
| 54 | - if ($index < 0) { |
|
| 52 | + $image = imagecreatefrompng($original); |
|
| 53 | + $index = imagecolorexact($image,26,49,81); |
|
| 54 | + if ($index < 0) { |
|
| 55 | 55 | $index = imagecolorexact($image,25,49,79); |
| 56 | - } |
|
| 57 | - if ($index < 0) { |
|
| 56 | + } |
|
| 57 | + if ($index < 0) { |
|
| 58 | 58 | $index = imagecolorexact($image,0,0,0); |
| 59 | - } |
|
| 60 | - $c = hexToRGB($color); |
|
| 61 | - imagecolorset($image,$index,$c['r'],$c['g'],$c['b']); |
|
| 59 | + } |
|
| 60 | + $c = hexToRGB($color); |
|
| 61 | + imagecolorset($image,$index,$c['r'],$c['g'],$c['b']); |
|
| 62 | 62 | /* |
| 63 | 63 | $ig = imagecolorat($image, 0, 0); |
| 64 | 64 | imagecolortransparent($image, $ig); |
| 65 | 65 | */ |
| 66 | 66 | |
| 67 | - header('Content-type: image/png'); |
|
| 68 | - if (isset($_GET['resize']) && function_exists('imagecopyresampled')) { |
|
| 67 | + header('Content-type: image/png'); |
|
| 68 | + if (isset($_GET['resize']) && function_exists('imagecopyresampled')) { |
|
| 69 | 69 | $resize = filter_input(INPUT_GET,'resize',FILTER_SANITIZE_NUMBER_INT); |
| 70 | 70 | $newimg = imagecreatetruecolor($resize,$resize); |
| 71 | - imagealphablending($newimg, false); |
|
| 71 | + imagealphablending($newimg, false); |
|
| 72 | 72 | imagesavealpha($newimg, true); |
| 73 | 73 | imagecopyresampled($newimg,$image,0,0,0,0,15,15,imagesx($image),imagesy($image)); |
| 74 | 74 | if (isset($_GET['heading'])) { |
| 75 | - $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT); |
|
| 76 | - $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127)); |
|
| 77 | - imagealphablending($rotation, false); |
|
| 78 | - imagesavealpha($rotation, true); |
|
| 79 | - imagepng($rotation); |
|
| 80 | - imagedestroy($newimg); |
|
| 81 | - imagedestroy($image); |
|
| 82 | - imagedestroy($rotation); |
|
| 75 | + $heading = filter_input(INPUT_GET,'heading',FILTER_SANITIZE_NUMBER_INT); |
|
| 76 | + $rotation = imagerotate($newimg,$heading,imageColorAllocateAlpha($newimg,0,0,0,127)); |
|
| 77 | + imagealphablending($rotation, false); |
|
| 78 | + imagesavealpha($rotation, true); |
|
| 79 | + imagepng($rotation); |
|
| 80 | + imagedestroy($newimg); |
|
| 81 | + imagedestroy($image); |
|
| 82 | + imagedestroy($rotation); |
|
| 83 | 83 | |
| 84 | 84 | } else { |
| 85 | - imagepng($newimg); |
|
| 86 | - imagedestroy($newimg); |
|
| 87 | - imagedestroy($image); |
|
| 88 | - } |
|
| 89 | - } else { |
|
| 85 | + imagepng($newimg); |
|
| 86 | + imagedestroy($newimg); |
|
| 87 | + imagedestroy($image); |
|
| 88 | + } |
|
| 89 | + } else { |
|
| 90 | 90 | imagealphablending($image, false); |
| 91 | - imagesavealpha($image, true); |
|
| 91 | + imagesavealpha($image, true); |
|
| 92 | 92 | imagepng($image); |
| 93 | 93 | imagepng($image); |
| 94 | 94 | if (is_writable(dirname(__FILE__).'/cache')) { |
| 95 | - imagepng($image,dirname(__FILE__).'/cache/'.$color.'-'.$filename); |
|
| 95 | + imagepng($image,dirname(__FILE__).'/cache/'.$color.'-'.$filename); |
|
| 96 | + } |
|
| 97 | + imagedestroy($image); |
|
| 96 | 98 | } |
| 97 | - imagedestroy($image); |
|
| 98 | - } |
|
| 99 | 99 | } else { |
| 100 | - header('Content-type: image/png'); |
|
| 101 | - if (isset($_GET['tracker'])) { |
|
| 102 | - readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
|
| 103 | - } elseif (isset($_GET['marine'])) { |
|
| 104 | - readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
|
| 105 | - } elseif (isset($_GET['satellite'])) { |
|
| 106 | - readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/satellites/'.$filename); |
|
| 107 | - } else { |
|
| 108 | - if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename); |
|
| 100 | + header('Content-type: image/png'); |
|
| 101 | + if (isset($_GET['tracker'])) { |
|
| 102 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
|
| 103 | + } elseif (isset($_GET['marine'])) { |
|
| 104 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/vehicules/'.$filename); |
|
| 105 | + } elseif (isset($_GET['satellite'])) { |
|
| 106 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/satellites/'.$filename); |
|
| 107 | + } else { |
|
| 108 | + if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename); |
|
| 109 | 109 | else readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename); |
| 110 | - } |
|
| 110 | + } |
|
| 111 | 111 | } |
| 112 | 112 | ?> |
| 113 | 113 | \ No newline at end of file |
@@ -105,8 +105,11 @@ |
||
| 105 | 105 | } elseif (isset($_GET['satellite'])) { |
| 106 | 106 | readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/satellites/'.$filename); |
| 107 | 107 | } else { |
| 108 | - if ($color == 'FF0000') readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename); |
|
| 109 | - else readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename); |
|
| 108 | + if ($color == 'FF0000') { |
|
| 109 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/selected/'.$filename); |
|
| 110 | + } else { |
|
| 111 | + readfile(dirname(__FILE__).DIRECTORY_SEPARATOR.'images/aircrafts/'.$filename); |
|
| 112 | + } |
|
| 110 | 113 | } |
| 111 | 114 | } |
| 112 | 115 | ?> |
| 113 | 116 | \ No newline at end of file |
@@ -1,49 +1,49 @@ |
||
| 1 | 1 | #!/usr/bin/php |
| 2 | 2 | <?php |
| 3 | - require_once('../require/settings.php'); |
|
| 4 | - if ($globalInstalled) { |
|
| 5 | - //echo '$globalInstalled must be set to FALSE in require/settings.php'; |
|
| 6 | - echo "Use install/index.php instead. You really don't want to use this."; |
|
| 7 | - exit; |
|
| 8 | - } |
|
| 9 | - require('class.update_db.php'); |
|
| 10 | - echo "Populate all tables...\n"; |
|
| 11 | - update_db::update_all(); |
|
| 12 | - echo "\nInstall waypoints...(VERY slow!)"; |
|
| 13 | - update_db::update_waypoints(); |
|
| 14 | - echo "Done !\n"; |
|
| 15 | - echo "Install airspace..."; |
|
| 16 | - update_db::update_airspace(); |
|
| 17 | - echo "Done !\n"; |
|
| 18 | - echo "Install countries..."; |
|
| 19 | - update_db::update_countries(); |
|
| 20 | - echo "Done !\n"; |
|
| 21 | - if (isset($globalOwner) && $globalOwner) { |
|
| 3 | + require_once('../require/settings.php'); |
|
| 4 | + if ($globalInstalled) { |
|
| 5 | + //echo '$globalInstalled must be set to FALSE in require/settings.php'; |
|
| 6 | + echo "Use install/index.php instead. You really don't want to use this."; |
|
| 7 | + exit; |
|
| 8 | + } |
|
| 9 | + require('class.update_db.php'); |
|
| 10 | + echo "Populate all tables...\n"; |
|
| 11 | + update_db::update_all(); |
|
| 12 | + echo "\nInstall waypoints...(VERY slow!)"; |
|
| 13 | + update_db::update_waypoints(); |
|
| 14 | + echo "Done !\n"; |
|
| 15 | + echo "Install airspace..."; |
|
| 16 | + update_db::update_airspace(); |
|
| 17 | + echo "Done !\n"; |
|
| 18 | + echo "Install countries..."; |
|
| 19 | + update_db::update_countries(); |
|
| 20 | + echo "Done !\n"; |
|
| 21 | + if (isset($globalOwner) && $globalOwner) { |
|
| 22 | 22 | echo "Install private owners..."; |
| 23 | 23 | update_db::update_owner_fam(); |
| 24 | - echo "Done !\n"; |
|
| 25 | - } |
|
| 26 | - /* |
|
| 24 | + echo "Done !\n"; |
|
| 25 | + } |
|
| 26 | + /* |
|
| 27 | 27 | if (isset($globalIVAO) && $globalIVAO) { |
| 28 | 28 | echo "Install IVAO airlines and logos..."; |
| 29 | 29 | update_db::update_IVAO(); |
| 30 | 30 | echo "Done !\n"; |
| 31 | 31 | } |
| 32 | 32 | */ |
| 33 | - if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
|
| 33 | + if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
|
| 34 | 34 | echo "Install NOTAM from notaminfo.com..."; |
| 35 | - update_db:update_notam(); |
|
| 36 | - echo "Done !\n"; |
|
| 37 | - } |
|
| 38 | - if (isset($globalMap3D) && $globalMap3D) { |
|
| 35 | + update_db:update_notam(); |
|
| 36 | + echo "Done !\n"; |
|
| 37 | + } |
|
| 38 | + if (isset($globalMap3D) && $globalMap3D) { |
|
| 39 | 39 | echo "Install 3D models..."; |
| 40 | 40 | update_db::update_models(); |
| 41 | 41 | echo "Done !\n"; |
| 42 | 42 | if (isset($globalMapSatellites) && $globalMapSatellites) { |
| 43 | - echo "Install Space 3D models..."; |
|
| 44 | - update_db::update_space_models(); |
|
| 45 | - echo "Done !\n"; |
|
| 46 | - } |
|
| 47 | - } |
|
| 43 | + echo "Install Space 3D models..."; |
|
| 44 | + update_db::update_space_models(); |
|
| 45 | + echo "Done !\n"; |
|
| 46 | + } |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | 49 | ?> |
| 50 | 50 | \ No newline at end of file |
@@ -1,31 +1,31 @@ |
||
| 1 | 1 | #!/usr/bin/php |
| 2 | 2 | <?php |
| 3 | - require_once('../require/settings.php'); |
|
| 4 | - if ($globalInstalled) { |
|
| 5 | - //echo '$globalInstalled must be set to FALSE in require/settings.php'; |
|
| 6 | - echo "Use install/index.php instead. You really don't want to use this."; |
|
| 7 | - exit; |
|
| 8 | - } |
|
| 9 | - require('class.create_db.php'); |
|
| 10 | - echo "Create and import all tables..."; |
|
| 11 | - create_db::import_all_db('../db/'); |
|
| 12 | - echo "Done !\n"; |
|
| 3 | + require_once('../require/settings.php'); |
|
| 4 | + if ($globalInstalled) { |
|
| 5 | + //echo '$globalInstalled must be set to FALSE in require/settings.php'; |
|
| 6 | + echo "Use install/index.php instead. You really don't want to use this."; |
|
| 7 | + exit; |
|
| 8 | + } |
|
| 9 | + require('class.create_db.php'); |
|
| 10 | + echo "Create and import all tables..."; |
|
| 11 | + create_db::import_all_db('../db/'); |
|
| 12 | + echo "Done !\n"; |
|
| 13 | 13 | |
| 14 | - require('class.update_db.php'); |
|
| 15 | - echo "Populate all tables...\n"; |
|
| 16 | - update_db::update_all(); |
|
| 17 | - echo "\nInstall waypoints...(VERY slow!)"; |
|
| 18 | - update_db::update_waypoints(); |
|
| 19 | - echo "Done !\n"; |
|
| 20 | - echo "Install airspace..."; |
|
| 21 | - update_db::update_airspace(); |
|
| 22 | - echo "Done !\n"; |
|
| 23 | - echo 'All is now installed ! Thanks'."\n"; |
|
| 24 | - if ($globalSBS1) { |
|
| 25 | - echo 'You need to run cron-sbs.php as a daemon. You can use init script in the install/init directory.'."\n"; |
|
| 26 | - } |
|
| 27 | - if ($globalACARS) { |
|
| 28 | - echo 'You need to run cron-acars.php as a daemon. You can use init script in the install/init directory.'."\n"; |
|
| 29 | - } |
|
| 14 | + require('class.update_db.php'); |
|
| 15 | + echo "Populate all tables...\n"; |
|
| 16 | + update_db::update_all(); |
|
| 17 | + echo "\nInstall waypoints...(VERY slow!)"; |
|
| 18 | + update_db::update_waypoints(); |
|
| 19 | + echo "Done !\n"; |
|
| 20 | + echo "Install airspace..."; |
|
| 21 | + update_db::update_airspace(); |
|
| 22 | + echo "Done !\n"; |
|
| 23 | + echo 'All is now installed ! Thanks'."\n"; |
|
| 24 | + if ($globalSBS1) { |
|
| 25 | + echo 'You need to run cron-sbs.php as a daemon. You can use init script in the install/init directory.'."\n"; |
|
| 26 | + } |
|
| 27 | + if ($globalACARS) { |
|
| 28 | + echo 'You need to run cron-acars.php as a daemon. You can use init script in the install/init directory.'."\n"; |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | 31 | ?> |
| 32 | 32 | \ No newline at end of file |
@@ -8,18 +8,18 @@ discard block |
||
| 8 | 8 | class update_schema { |
| 9 | 9 | |
| 10 | 10 | public static function update_schedule() { |
| 11 | - $Connection = new Connection(); |
|
| 12 | - $Schedule = new Schedule(); |
|
| 13 | - $query = "SELECT * FROM schedule"; |
|
| 14 | - try { |
|
| 15 | - $sth = $Connection->db->prepare($query); |
|
| 11 | + $Connection = new Connection(); |
|
| 12 | + $Schedule = new Schedule(); |
|
| 13 | + $query = "SELECT * FROM schedule"; |
|
| 14 | + try { |
|
| 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 | - } |
|
| 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']); |
|
| 22 | - } |
|
| 19 | + } |
|
| 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']); |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | 24 | } |
| 25 | 25 | /* |
@@ -43,198 +43,198 @@ discard block |
||
| 43 | 43 | } |
| 44 | 44 | */ |
| 45 | 45 | private static function update_from_1() { |
| 46 | - $Connection = new Connection(); |
|
| 47 | - // Add new column to routes table |
|
| 48 | - //$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME"; |
|
| 46 | + $Connection = new Connection(); |
|
| 47 | + // Add new column to routes table |
|
| 48 | + //$query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10),`ToAirport_Time` VARCHAR(10),`Source` VARCHAR(255),`date_added` DATETIME DEFAULT CURRENT TIMESTAMP,`date_modified` DATETIME,`date_lastseen` DATETIME"; |
|
| 49 | 49 | $query = "ALTER TABLE `routes` ADD `FromAirport_Time` VARCHAR(10) NULL , ADD `ToAirport_Time` VARCHAR(10) NULL , ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP, ADD `date_modified` timestamp NULL, ADD `date_lastseen` timestamp NULL"; |
| 50 | - try { |
|
| 51 | - $sth = $Connection->db->prepare($query); |
|
| 52 | - $sth->execute(); |
|
| 53 | - } catch(PDOException $e) { |
|
| 54 | - return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
|
| 55 | - } |
|
| 56 | - // Copy schedules data to routes table |
|
| 57 | - self::update_schedule(); |
|
| 58 | - // Delete schedule table |
|
| 50 | + try { |
|
| 51 | + $sth = $Connection->db->prepare($query); |
|
| 52 | + $sth->execute(); |
|
| 53 | + } catch(PDOException $e) { |
|
| 54 | + return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
|
| 55 | + } |
|
| 56 | + // Copy schedules data to routes table |
|
| 57 | + self::update_schedule(); |
|
| 58 | + // Delete schedule table |
|
| 59 | 59 | $query = "DROP TABLE `schedule`"; |
| 60 | - try { |
|
| 61 | - $sth = $Connection->db->prepare($query); |
|
| 62 | - $sth->execute(); |
|
| 63 | - } catch(PDOException $e) { |
|
| 64 | - return "error (delete schedule table) : ".$e->getMessage()."\n"; |
|
| 65 | - } |
|
| 66 | - // Add source column |
|
| 67 | - $query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL"; |
|
| 68 | - try { |
|
| 69 | - $sth = $Connection->db->prepare($query); |
|
| 70 | - $sth->execute(); |
|
| 71 | - } catch(PDOException $e) { |
|
| 72 | - return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 73 | - } |
|
| 60 | + try { |
|
| 61 | + $sth = $Connection->db->prepare($query); |
|
| 62 | + $sth->execute(); |
|
| 63 | + } catch(PDOException $e) { |
|
| 64 | + return "error (delete schedule table) : ".$e->getMessage()."\n"; |
|
| 65 | + } |
|
| 66 | + // Add source column |
|
| 67 | + $query = "ALTER TABLE `aircraft_modes` ADD `Source` VARCHAR(255) NULL"; |
|
| 68 | + try { |
|
| 69 | + $sth = $Connection->db->prepare($query); |
|
| 70 | + $sth->execute(); |
|
| 71 | + } catch(PDOException $e) { |
|
| 72 | + return "error (add source column to aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 73 | + } |
|
| 74 | 74 | // Delete unused column |
| 75 | 75 | $query = "ALTER TABLE `aircraft_modes` DROP `SerialNo`, DROP `OperatorFlagCode`, DROP `Manufacturer`, DROP `Type`, DROP `FirstRegDate`, DROP `CurrentRegDate`, DROP `Country`, DROP `PreviousID`, DROP `DeRegDate`, DROP `Status`, DROP `PopularName`, DROP `GenericName`, DROP `AircraftClass`, DROP `Engines`, DROP `OwnershipStatus`, DROP `RegisteredOwners`, DROP `MTOW`, DROP `TotalHours`, DROP `YearBuilt`, DROP `CofACategory`, DROP `CofAExpiry`, DROP `UserNotes`, DROP `Interested`, DROP `UserTag`, DROP `InfoUrl`, DROP `PictureUrl1`, DROP `PictureUrl2`, DROP `PictureUrl3`, DROP `UserBool1`, DROP `UserBool2`, DROP `UserBool3`, DROP `UserBool4`, DROP `UserBool5`, DROP `UserString1`, DROP `UserString2`, DROP `UserString3`, DROP `UserString4`, DROP `UserString5`, DROP `UserInt1`, DROP `UserInt2`, DROP `UserInt3`, DROP `UserInt4`, DROP `UserInt5`"; |
| 76 | - try { |
|
| 77 | - $sth = $Connection->db->prepare($query); |
|
| 78 | - $sth->execute(); |
|
| 79 | - } catch(PDOException $e) { |
|
| 80 | - return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 81 | - } |
|
| 76 | + try { |
|
| 77 | + $sth = $Connection->db->prepare($query); |
|
| 78 | + $sth->execute(); |
|
| 79 | + } catch(PDOException $e) { |
|
| 80 | + return "error (Delete unused column of aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 81 | + } |
|
| 82 | 82 | // Add ModeS column |
| 83 | 83 | $query = "ALTER TABLE `spotter_output` ADD `ModeS` VARCHAR(255) NULL"; |
| 84 | - try { |
|
| 85 | - $sth = $Connection->db->prepare($query); |
|
| 86 | - $sth->execute(); |
|
| 87 | - } catch(PDOException $e) { |
|
| 88 | - return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n"; |
|
| 89 | - } |
|
| 84 | + try { |
|
| 85 | + $sth = $Connection->db->prepare($query); |
|
| 86 | + $sth->execute(); |
|
| 87 | + } catch(PDOException $e) { |
|
| 88 | + return "error (Add ModeS column in spotter_output) : ".$e->getMessage()."\n"; |
|
| 89 | + } |
|
| 90 | 90 | $query = "ALTER TABLE `spotter_live` ADD `ModeS` VARCHAR(255)"; |
| 91 | - try { |
|
| 92 | - $sth = $Connection->db->prepare($query); |
|
| 93 | - $sth->execute(); |
|
| 94 | - } catch(PDOException $e) { |
|
| 95 | - return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n"; |
|
| 96 | - } |
|
| 97 | - // Add auto_increment for aircraft_modes |
|
| 98 | - $query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT"; |
|
| 99 | - try { |
|
| 100 | - $sth = $Connection->db->prepare($query); |
|
| 101 | - $sth->execute(); |
|
| 102 | - } catch(PDOException $e) { |
|
| 103 | - return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 104 | - } |
|
| 105 | - $error = ''; |
|
| 91 | + try { |
|
| 92 | + $sth = $Connection->db->prepare($query); |
|
| 93 | + $sth->execute(); |
|
| 94 | + } catch(PDOException $e) { |
|
| 95 | + return "error (Add ModeS column in spotter_live) : ".$e->getMessage()."\n"; |
|
| 96 | + } |
|
| 97 | + // Add auto_increment for aircraft_modes |
|
| 98 | + $query = "ALTER TABLE `aircraft_modes` CHANGE `AircraftID` `AircraftID` INT(11) NOT NULL AUTO_INCREMENT"; |
|
| 99 | + try { |
|
| 100 | + $sth = $Connection->db->prepare($query); |
|
| 101 | + $sth->execute(); |
|
| 102 | + } catch(PDOException $e) { |
|
| 103 | + return "error (Add Auto increment in aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 104 | + } |
|
| 105 | + $error = ''; |
|
| 106 | 106 | $error .= create_db::import_file('../db/acars_live.sql'); |
| 107 | 107 | $error .= create_db::import_file('../db/config.sql'); |
| 108 | 108 | // Update schema_version to 2 |
| 109 | 109 | $query = "UPDATE `config` SET `value` = '2' WHERE `name` = 'schema_version'"; |
| 110 | - try { |
|
| 111 | - $sth = $Connection->db->prepare($query); |
|
| 112 | - $sth->execute(); |
|
| 113 | - } catch(PDOException $e) { |
|
| 114 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 115 | - } |
|
| 110 | + try { |
|
| 111 | + $sth = $Connection->db->prepare($query); |
|
| 112 | + $sth->execute(); |
|
| 113 | + } catch(PDOException $e) { |
|
| 114 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 115 | + } |
|
| 116 | 116 | return $error; |
| 117 | - } |
|
| 117 | + } |
|
| 118 | 118 | |
| 119 | 119 | private static function update_from_2() { |
| 120 | - $Connection = new Connection(); |
|
| 121 | - // Add new column decode to acars_live table |
|
| 120 | + $Connection = new Connection(); |
|
| 121 | + // Add new column decode to acars_live table |
|
| 122 | 122 | $query = "ALTER TABLE `acars_live` ADD `decode` TEXT"; |
| 123 | - try { |
|
| 124 | - $sth = $Connection->db->prepare($query); |
|
| 125 | - $sth->execute(); |
|
| 126 | - } catch(PDOException $e) { |
|
| 127 | - return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
|
| 128 | - } |
|
| 129 | - $error = ''; |
|
| 130 | - // Create table acars_archive |
|
| 123 | + try { |
|
| 124 | + $sth = $Connection->db->prepare($query); |
|
| 125 | + $sth->execute(); |
|
| 126 | + } catch(PDOException $e) { |
|
| 127 | + return "error (add new columns to routes table) : ".$e->getMessage()."\n"; |
|
| 128 | + } |
|
| 129 | + $error = ''; |
|
| 130 | + // Create table acars_archive |
|
| 131 | 131 | $error .= create_db::import_file('../db/acars_archive.sql'); |
| 132 | 132 | // Update schema_version to 3 |
| 133 | 133 | $query = "UPDATE `config` SET `value` = '3' WHERE `name` = 'schema_version'"; |
| 134 | - try { |
|
| 135 | - $sth = $Connection->db->prepare($query); |
|
| 136 | - $sth->execute(); |
|
| 137 | - } catch(PDOException $e) { |
|
| 138 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 139 | - } |
|
| 134 | + try { |
|
| 135 | + $sth = $Connection->db->prepare($query); |
|
| 136 | + $sth->execute(); |
|
| 137 | + } catch(PDOException $e) { |
|
| 138 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 139 | + } |
|
| 140 | 140 | return $error; |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | private static function update_from_3() { |
| 144 | - $Connection = new Connection(); |
|
| 145 | - // Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated |
|
| 144 | + $Connection = new Connection(); |
|
| 145 | + // Add default CURRENT_TIMESTAMP to aircraft_modes column FirstCreated |
|
| 146 | 146 | $query = "ALTER TABLE `aircraft_modes` CHANGE `FirstCreated` `FirstCreated` timestamp DEFAULT CURRENT_TIMESTAMP"; |
| 147 | - try { |
|
| 148 | - $sth = $Connection->db->prepare($query); |
|
| 149 | - $sth->execute(); |
|
| 150 | - } catch(PDOException $e) { |
|
| 151 | - return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 152 | - } |
|
| 153 | - // Add image_source_website column to spotter_image |
|
| 147 | + try { |
|
| 148 | + $sth = $Connection->db->prepare($query); |
|
| 149 | + $sth->execute(); |
|
| 150 | + } catch(PDOException $e) { |
|
| 151 | + return "error (add new columns to aircraft_modes) : ".$e->getMessage()."\n"; |
|
| 152 | + } |
|
| 153 | + // Add image_source_website column to spotter_image |
|
| 154 | 154 | $query = "ALTER TABLE `spotter_image` ADD `image_source_website` VARCHAR(999) NULL"; |
| 155 | - try { |
|
| 156 | - $sth = $Connection->db->prepare($query); |
|
| 157 | - $sth->execute(); |
|
| 158 | - } catch(PDOException $e) { |
|
| 159 | - return "error (add new columns to spotter_image) : ".$e->getMessage()."\n"; |
|
| 160 | - } |
|
| 161 | - $error = ''; |
|
| 155 | + try { |
|
| 156 | + $sth = $Connection->db->prepare($query); |
|
| 157 | + $sth->execute(); |
|
| 158 | + } catch(PDOException $e) { |
|
| 159 | + return "error (add new columns to spotter_image) : ".$e->getMessage()."\n"; |
|
| 160 | + } |
|
| 161 | + $error = ''; |
|
| 162 | 162 | // Update schema_version to 4 |
| 163 | 163 | $query = "UPDATE `config` SET `value` = '4' WHERE `name` = 'schema_version'"; |
| 164 | - try { |
|
| 165 | - $sth = $Connection->db->prepare($query); |
|
| 166 | - $sth->execute(); |
|
| 167 | - } catch(PDOException $e) { |
|
| 168 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 169 | - } |
|
| 164 | + try { |
|
| 165 | + $sth = $Connection->db->prepare($query); |
|
| 166 | + $sth->execute(); |
|
| 167 | + } catch(PDOException $e) { |
|
| 168 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 169 | + } |
|
| 170 | 170 | return $error; |
| 171 | 171 | } |
| 172 | 172 | |
| 173 | 173 | private static function update_from_4() { |
| 174 | - $Connection = new Connection(); |
|
| 174 | + $Connection = new Connection(); |
|
| 175 | 175 | |
| 176 | - $error = ''; |
|
| 177 | - // Create table acars_label |
|
| 176 | + $error = ''; |
|
| 177 | + // Create table acars_label |
|
| 178 | 178 | $error .= create_db::import_file('../db/acars_label.sql'); |
| 179 | 179 | if ($error == '') { |
| 180 | - // Update schema_version to 5 |
|
| 181 | - $query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'"; |
|
| 182 | - try { |
|
| 183 | - $sth = $Connection->db->prepare($query); |
|
| 180 | + // Update schema_version to 5 |
|
| 181 | + $query = "UPDATE `config` SET `value` = '5' WHERE `name` = 'schema_version'"; |
|
| 182 | + try { |
|
| 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 | - } |
|
| 188 | - } |
|
| 187 | + } |
|
| 188 | + } |
|
| 189 | 189 | return $error; |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | private static function update_from_5() { |
| 193 | - $Connection = new Connection(); |
|
| 194 | - // Add columns to translation |
|
| 193 | + $Connection = new Connection(); |
|
| 194 | + // Add columns to translation |
|
| 195 | 195 | $query = "ALTER TABLE `translation` ADD `Source` VARCHAR(255) NULL, ADD `date_added` timestamp DEFAULT CURRENT_TIMESTAMP , ADD `date_modified` timestamp DEFAULT CURRENT_TIMESTAMP ;"; |
| 196 | - try { |
|
| 197 | - $sth = $Connection->db->prepare($query); |
|
| 198 | - $sth->execute(); |
|
| 199 | - } catch(PDOException $e) { |
|
| 200 | - return "error (add new columns to translation) : ".$e->getMessage()."\n"; |
|
| 201 | - } |
|
| 202 | - // Add aircraft_shadow column to aircraft |
|
| 203 | - $query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL"; |
|
| 204 | - try { |
|
| 205 | - $sth = $Connection->db->prepare($query); |
|
| 206 | - $sth->execute(); |
|
| 207 | - } catch(PDOException $e) { |
|
| 208 | - return "error (add new column to aircraft) : ".$e->getMessage()."\n"; |
|
| 209 | - } |
|
| 210 | - // Add aircraft_shadow column to spotter_live |
|
| 211 | - $query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL"; |
|
| 212 | - try { |
|
| 213 | - $sth = $Connection->db->prepare($query); |
|
| 214 | - $sth->execute(); |
|
| 215 | - } catch(PDOException $e) { |
|
| 216 | - return "error (add new column to spotter_live) : ".$e->getMessage()."\n"; |
|
| 217 | - } |
|
| 218 | - $error = ''; |
|
| 219 | - // Update table aircraft |
|
| 196 | + try { |
|
| 197 | + $sth = $Connection->db->prepare($query); |
|
| 198 | + $sth->execute(); |
|
| 199 | + } catch(PDOException $e) { |
|
| 200 | + return "error (add new columns to translation) : ".$e->getMessage()."\n"; |
|
| 201 | + } |
|
| 202 | + // Add aircraft_shadow column to aircraft |
|
| 203 | + $query = "ALTER TABLE `aircraft` ADD `aircraft_shadow` VARCHAR(255) NULL"; |
|
| 204 | + try { |
|
| 205 | + $sth = $Connection->db->prepare($query); |
|
| 206 | + $sth->execute(); |
|
| 207 | + } catch(PDOException $e) { |
|
| 208 | + return "error (add new column to aircraft) : ".$e->getMessage()."\n"; |
|
| 209 | + } |
|
| 210 | + // Add aircraft_shadow column to spotter_live |
|
| 211 | + $query = "ALTER TABLE `spotter_live` ADD `aircraft_shadow` VARCHAR(255) NULL"; |
|
| 212 | + try { |
|
| 213 | + $sth = $Connection->db->prepare($query); |
|
| 214 | + $sth->execute(); |
|
| 215 | + } catch(PDOException $e) { |
|
| 216 | + return "error (add new column to spotter_live) : ".$e->getMessage()."\n"; |
|
| 217 | + } |
|
| 218 | + $error = ''; |
|
| 219 | + // Update table aircraft |
|
| 220 | 220 | $error .= create_db::import_file('../db/aircraft.sql'); |
| 221 | 221 | $error .= create_db::import_file('../db/spotter_archive.sql'); |
| 222 | 222 | |
| 223 | 223 | // Update schema_version to 6 |
| 224 | 224 | $query = "UPDATE `config` SET `value` = '6' WHERE `name` = 'schema_version'"; |
| 225 | - try { |
|
| 226 | - $sth = $Connection->db->prepare($query); |
|
| 227 | - $sth->execute(); |
|
| 228 | - } catch(PDOException $e) { |
|
| 229 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 230 | - } |
|
| 225 | + try { |
|
| 226 | + $sth = $Connection->db->prepare($query); |
|
| 227 | + $sth->execute(); |
|
| 228 | + } catch(PDOException $e) { |
|
| 229 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 230 | + } |
|
| 231 | 231 | return $error; |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | private static function update_from_6() { |
| 235 | - $Connection = new Connection(); |
|
| 236 | - if (!$Connection->indexExists('spotter_output','flightaware_id')) { |
|
| 237 | - $query = "ALTER TABLE spotter_output ADD INDEX(flightaware_id); |
|
| 235 | + $Connection = new Connection(); |
|
| 236 | + if (!$Connection->indexExists('spotter_output','flightaware_id')) { |
|
| 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); |
| 240 | 240 | ALTER TABLE spotter_live ADD INDEX(flightaware_id); |
@@ -247,147 +247,147 @@ discard block |
||
| 247 | 247 | ALTER TABLE aircraft ADD INDEX(icao); |
| 248 | 248 | ALTER TABLE airport ADD INDEX(icao); |
| 249 | 249 | ALTER TABLE translation ADD INDEX(Operator);"; |
| 250 | - try { |
|
| 251 | - $sth = $Connection->db->prepare($query); |
|
| 250 | + try { |
|
| 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 | - } |
|
| 256 | - } |
|
| 257 | - $error = ''; |
|
| 258 | - // Update table countries |
|
| 259 | - if ($Connection->tableExists('airspace')) { |
|
| 260 | - $error .= update_db::update_countries(); |
|
| 261 | - if ($error != '') return $error; |
|
| 255 | + } |
|
| 256 | + } |
|
| 257 | + $error = ''; |
|
| 258 | + // Update table countries |
|
| 259 | + if ($Connection->tableExists('airspace')) { |
|
| 260 | + $error .= update_db::update_countries(); |
|
| 261 | + if ($error != '') return $error; |
|
| 262 | 262 | } |
| 263 | 263 | // Update schema_version to 7 |
| 264 | 264 | $query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'"; |
| 265 | - try { |
|
| 266 | - $sth = $Connection->db->prepare($query); |
|
| 267 | - $sth->execute(); |
|
| 268 | - } catch(PDOException $e) { |
|
| 269 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 270 | - } |
|
| 265 | + try { |
|
| 266 | + $sth = $Connection->db->prepare($query); |
|
| 267 | + $sth->execute(); |
|
| 268 | + } catch(PDOException $e) { |
|
| 269 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 270 | + } |
|
| 271 | 271 | return $error; |
| 272 | - } |
|
| 272 | + } |
|
| 273 | 273 | |
| 274 | 274 | private static function update_from_7() { |
| 275 | 275 | global $globalDBname, $globalDBdriver; |
| 276 | - $Connection = new Connection(); |
|
| 277 | - $query="ALTER TABLE spotter_live ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
|
| 276 | + $Connection = new Connection(); |
|
| 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 | - try { |
|
| 280 | - $sth = $Connection->db->prepare($query); |
|
| 281 | - $sth->execute(); |
|
| 282 | - } catch(PDOException $e) { |
|
| 283 | - return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
|
| 284 | - } |
|
| 285 | - if ($globalDBdriver == 'mysql') { |
|
| 286 | - $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'"; |
|
| 287 | - try { |
|
| 288 | - $sth = $Connection->db->prepare($query); |
|
| 289 | - $sth->execute(); |
|
| 290 | - } catch(PDOException $e) { |
|
| 279 | + try { |
|
| 280 | + $sth = $Connection->db->prepare($query); |
|
| 281 | + $sth->execute(); |
|
| 282 | + } catch(PDOException $e) { |
|
| 283 | + return "error (add pilot column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
|
| 284 | + } |
|
| 285 | + if ($globalDBdriver == 'mysql') { |
|
| 286 | + $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'"; |
|
| 287 | + try { |
|
| 288 | + $sth = $Connection->db->prepare($query); |
|
| 289 | + $sth->execute(); |
|
| 290 | + } catch(PDOException $e) { |
|
| 291 | 291 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 292 | - } |
|
| 293 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 294 | - if ($row['engine'] == 'ARCHIVE') { |
|
| 292 | + } |
|
| 293 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 294 | + if ($row['engine'] == 'ARCHIVE') { |
|
| 295 | 295 | $query = "CREATE TABLE copy LIKE spotter_archive; |
| 296 | 296 | ALTER TABLE copy ENGINE=ARCHIVE; |
| 297 | 297 | ALTER TABLE copy ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL; |
| 298 | 298 | INSERT INTO copy SELECT *, '' as pilot_name, '' as pilot_id FROM spotter_archive ORDER BY `spotter_archive_id`; |
| 299 | 299 | DROP TABLE spotter_archive; |
| 300 | 300 | RENAME TABLE copy TO spotter_archive;"; |
| 301 | - } else { |
|
| 302 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 303 | - } |
|
| 304 | - } else { |
|
| 305 | - $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 306 | - } |
|
| 307 | - try { |
|
| 308 | - $sth = $Connection->db->prepare($query); |
|
| 309 | - $sth->execute(); |
|
| 310 | - } catch(PDOException $e) { |
|
| 311 | - return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n"; |
|
| 312 | - } |
|
| 301 | + } else { |
|
| 302 | + $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 303 | + } |
|
| 304 | + } else { |
|
| 305 | + $query="ALTER TABLE spotter_archive ADD pilot_name VARCHAR(255) NULL, ADD pilot_id VARCHAR(255) NULL"; |
|
| 306 | + } |
|
| 307 | + try { |
|
| 308 | + $sth = $Connection->db->prepare($query); |
|
| 309 | + $sth->execute(); |
|
| 310 | + } catch(PDOException $e) { |
|
| 311 | + return "error (add pilot column to spotter_archive) : ".$e->getMessage()."\n"; |
|
| 312 | + } |
|
| 313 | 313 | |
| 314 | - $error = ''; |
|
| 315 | - // Update table aircraft |
|
| 314 | + $error = ''; |
|
| 315 | + // Update table aircraft |
|
| 316 | 316 | $error .= create_db::import_file('../db/source_location.sql'); |
| 317 | 317 | if ($error != '') return $error; |
| 318 | 318 | // Update schema_version to 6 |
| 319 | 319 | $query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'"; |
| 320 | - try { |
|
| 321 | - $sth = $Connection->db->prepare($query); |
|
| 322 | - $sth->execute(); |
|
| 323 | - } catch(PDOException $e) { |
|
| 324 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 325 | - } |
|
| 320 | + try { |
|
| 321 | + $sth = $Connection->db->prepare($query); |
|
| 322 | + $sth->execute(); |
|
| 323 | + } catch(PDOException $e) { |
|
| 324 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 325 | + } |
|
| 326 | 326 | return $error; |
| 327 | 327 | } |
| 328 | 328 | |
| 329 | 329 | private static function update_from_8() { |
| 330 | - $Connection = new Connection(); |
|
| 331 | - $error = ''; |
|
| 332 | - // Update table aircraft |
|
| 330 | + $Connection = new Connection(); |
|
| 331 | + $error = ''; |
|
| 332 | + // Update table aircraft |
|
| 333 | 333 | $error .= create_db::import_file('../db/notam.sql'); |
| 334 | 334 | if ($error != '') return $error; |
| 335 | 335 | $query = "DELETE FROM config WHERE name = 'last_update_db'; |
| 336 | 336 | INSERT INTO config (name,value) VALUES ('last_update_db',NOW()); |
| 337 | 337 | DELETE FROM config WHERE name = 'last_update_notam_db'; |
| 338 | 338 | INSERT INTO config (name,value) VALUES ('last_update_notam_db',NOW());"; |
| 339 | - try { |
|
| 340 | - $sth = $Connection->db->prepare($query); |
|
| 341 | - $sth->execute(); |
|
| 342 | - } catch(PDOException $e) { |
|
| 343 | - return "error (insert last_update values) : ".$e->getMessage()."\n"; |
|
| 344 | - } |
|
| 339 | + try { |
|
| 340 | + $sth = $Connection->db->prepare($query); |
|
| 341 | + $sth->execute(); |
|
| 342 | + } catch(PDOException $e) { |
|
| 343 | + return "error (insert last_update values) : ".$e->getMessage()."\n"; |
|
| 344 | + } |
|
| 345 | 345 | $query = "UPDATE `config` SET `value` = '9' WHERE `name` = 'schema_version'"; |
| 346 | - try { |
|
| 347 | - $sth = $Connection->db->prepare($query); |
|
| 348 | - $sth->execute(); |
|
| 349 | - } catch(PDOException $e) { |
|
| 350 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 351 | - } |
|
| 346 | + try { |
|
| 347 | + $sth = $Connection->db->prepare($query); |
|
| 348 | + $sth->execute(); |
|
| 349 | + } catch(PDOException $e) { |
|
| 350 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 351 | + } |
|
| 352 | 352 | return $error; |
| 353 | 353 | } |
| 354 | 354 | |
| 355 | 355 | private static function update_from_9() { |
| 356 | - $Connection = new Connection(); |
|
| 357 | - $query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 356 | + $Connection = new Connection(); |
|
| 357 | + $query="ALTER TABLE spotter_live ADD verticalrate INT(11) NULL; |
|
| 358 | 358 | ALTER TABLE spotter_output ADD verticalrate INT(11) NULL;"; |
| 359 | - try { |
|
| 360 | - $sth = $Connection->db->prepare($query); |
|
| 361 | - $sth->execute(); |
|
| 362 | - } catch(PDOException $e) { |
|
| 363 | - return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
|
| 364 | - } |
|
| 359 | + try { |
|
| 360 | + $sth = $Connection->db->prepare($query); |
|
| 361 | + $sth->execute(); |
|
| 362 | + } catch(PDOException $e) { |
|
| 363 | + return "error (add verticalrate column to spotter_live and spotter_output) : ".$e->getMessage()."\n"; |
|
| 364 | + } |
|
| 365 | 365 | $error = ''; |
| 366 | - // Update table atc |
|
| 366 | + // Update table atc |
|
| 367 | 367 | $error .= create_db::import_file('../db/atc.sql'); |
| 368 | 368 | if ($error != '') return $error; |
| 369 | 369 | |
| 370 | 370 | $query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'"; |
| 371 | - try { |
|
| 372 | - $sth = $Connection->db->prepare($query); |
|
| 373 | - $sth->execute(); |
|
| 374 | - } catch(PDOException $e) { |
|
| 375 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 376 | - } |
|
| 371 | + try { |
|
| 372 | + $sth = $Connection->db->prepare($query); |
|
| 373 | + $sth->execute(); |
|
| 374 | + } catch(PDOException $e) { |
|
| 375 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 376 | + } |
|
| 377 | 377 | return $error; |
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | private static function update_from_10() { |
| 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"; |
|
| 383 | - try { |
|
| 384 | - $sth = $Connection->db->prepare($query); |
|
| 385 | - $sth->execute(); |
|
| 386 | - } catch(PDOException $e) { |
|
| 387 | - return "error (add new enum to ATC table) : ".$e->getMessage()."\n"; |
|
| 388 | - } |
|
| 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"; |
|
| 383 | + try { |
|
| 384 | + $sth = $Connection->db->prepare($query); |
|
| 385 | + $sth->execute(); |
|
| 386 | + } catch(PDOException $e) { |
|
| 387 | + return "error (add new enum to ATC table) : ".$e->getMessage()."\n"; |
|
| 388 | + } |
|
| 389 | 389 | $error = ''; |
| 390 | - // Add tables |
|
| 390 | + // Add tables |
|
| 391 | 391 | $error .= create_db::import_file('../db/aircraft_owner.sql'); |
| 392 | 392 | if ($error != '') return $error; |
| 393 | 393 | $error .= create_db::import_file('../db/metar.sql'); |
@@ -398,76 +398,76 @@ discard block |
||
| 398 | 398 | if ($error != '') return $error; |
| 399 | 399 | |
| 400 | 400 | $query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'"; |
| 401 | - try { |
|
| 402 | - $sth = $Connection->db->prepare($query); |
|
| 403 | - $sth->execute(); |
|
| 404 | - } catch(PDOException $e) { |
|
| 405 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 406 | - } |
|
| 401 | + try { |
|
| 402 | + $sth = $Connection->db->prepare($query); |
|
| 403 | + $sth->execute(); |
|
| 404 | + } catch(PDOException $e) { |
|
| 405 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 406 | + } |
|
| 407 | 407 | return $error; |
| 408 | 408 | } |
| 409 | 409 | |
| 410 | 410 | private static function update_from_11() { |
| 411 | 411 | global $globalDBdriver, $globalDBname; |
| 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)"; |
|
| 414 | - try { |
|
| 415 | - $sth = $Connection->db->prepare($query); |
|
| 416 | - $sth->execute(); |
|
| 417 | - } catch(PDOException $e) { |
|
| 418 | - return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n"; |
|
| 419 | - } |
|
| 420 | - $query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 421 | - try { |
|
| 422 | - $sth = $Connection->db->prepare($query); |
|
| 423 | - $sth->execute(); |
|
| 424 | - } catch(PDOException $e) { |
|
| 425 | - return "error (format_source column to spotter_live) : ".$e->getMessage()."\n"; |
|
| 426 | - } |
|
| 427 | - if ($globalDBdriver == 'mysql') { |
|
| 428 | - $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'"; |
|
| 429 | - try { |
|
| 430 | - $sth = $Connection->db->prepare($query); |
|
| 431 | - $sth->execute(); |
|
| 432 | - } catch(PDOException $e) { |
|
| 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)"; |
|
| 414 | + try { |
|
| 415 | + $sth = $Connection->db->prepare($query); |
|
| 416 | + $sth->execute(); |
|
| 417 | + } catch(PDOException $e) { |
|
| 418 | + return "error (add owner_name & format_source column to spotter_output) : ".$e->getMessage()."\n"; |
|
| 419 | + } |
|
| 420 | + $query="ALTER TABLE spotter_live ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE"; |
|
| 421 | + try { |
|
| 422 | + $sth = $Connection->db->prepare($query); |
|
| 423 | + $sth->execute(); |
|
| 424 | + } catch(PDOException $e) { |
|
| 425 | + return "error (format_source column to spotter_live) : ".$e->getMessage()."\n"; |
|
| 426 | + } |
|
| 427 | + if ($globalDBdriver == 'mysql') { |
|
| 428 | + $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'"; |
|
| 429 | + try { |
|
| 430 | + $sth = $Connection->db->prepare($query); |
|
| 431 | + $sth->execute(); |
|
| 432 | + } catch(PDOException $e) { |
|
| 433 | 433 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 434 | - } |
|
| 435 | - $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 436 | - if ($row['engine'] == 'ARCHIVE') { |
|
| 434 | + } |
|
| 435 | + $row = $sth->fetch(PDO::FETCH_ASSOC); |
|
| 436 | + if ($row['engine'] == 'ARCHIVE') { |
|
| 437 | 437 | $query = "CREATE TABLE copy LIKE spotter_archive; |
| 438 | 438 | ALTER TABLE copy ENGINE=ARCHIVE; |
| 439 | 439 | ALTER TABLE copy ADD verticalrate INT(11) NULL, ADD format_source VARCHAR(255) NULL DEFAULT NULL, ADD ground BOOLEAN NOT NULL DEFAULT FALSE; |
| 440 | 440 | INSERT INTO copy SELECT *, '' as verticalrate, '' as format_source, '0' as ground FROM spotter_archive ORDER BY `spotter_archive_id`; |
| 441 | 441 | DROP TABLE spotter_archive; |
| 442 | 442 | RENAME TABLE copy TO spotter_archive;"; |
| 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"; |
|
| 445 | - } |
|
| 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"; |
|
| 448 | - } |
|
| 449 | - try { |
|
| 450 | - $sth = $Connection->db->prepare($query); |
|
| 451 | - $sth->execute(); |
|
| 452 | - } catch(PDOException $e) { |
|
| 453 | - return "error (add columns to spotter_archive) : ".$e->getMessage()."\n"; |
|
| 454 | - } |
|
| 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"; |
|
| 445 | + } |
|
| 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"; |
|
| 448 | + } |
|
| 449 | + try { |
|
| 450 | + $sth = $Connection->db->prepare($query); |
|
| 451 | + $sth->execute(); |
|
| 452 | + } catch(PDOException $e) { |
|
| 453 | + return "error (add columns to spotter_archive) : ".$e->getMessage()."\n"; |
|
| 454 | + } |
|
| 455 | 455 | |
| 456 | 456 | $error = ''; |
| 457 | 457 | |
| 458 | 458 | $query = "UPDATE `config` SET `value` = '12' WHERE `name` = 'schema_version'"; |
| 459 | - try { |
|
| 460 | - $sth = $Connection->db->prepare($query); |
|
| 461 | - $sth->execute(); |
|
| 462 | - } catch(PDOException $e) { |
|
| 463 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 464 | - } |
|
| 459 | + try { |
|
| 460 | + $sth = $Connection->db->prepare($query); |
|
| 461 | + $sth->execute(); |
|
| 462 | + } catch(PDOException $e) { |
|
| 463 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 464 | + } |
|
| 465 | 465 | return $error; |
| 466 | 466 | } |
| 467 | 467 | private static function update_from_12() { |
| 468 | - $Connection = new Connection(); |
|
| 468 | + $Connection = new Connection(); |
|
| 469 | 469 | $error = ''; |
| 470 | - // Add tables |
|
| 470 | + // Add tables |
|
| 471 | 471 | $error .= create_db::import_file('../db/stats.sql'); |
| 472 | 472 | if ($error != '') return $error; |
| 473 | 473 | $error .= create_db::import_file('../db/stats_aircraft.sql'); |
@@ -484,166 +484,166 @@ discard block |
||
| 484 | 484 | if ($error != '') return $error; |
| 485 | 485 | |
| 486 | 486 | $query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'"; |
| 487 | - try { |
|
| 488 | - $sth = $Connection->db->prepare($query); |
|
| 489 | - $sth->execute(); |
|
| 490 | - } catch(PDOException $e) { |
|
| 491 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 492 | - } |
|
| 487 | + try { |
|
| 488 | + $sth = $Connection->db->prepare($query); |
|
| 489 | + $sth->execute(); |
|
| 490 | + } catch(PDOException $e) { |
|
| 491 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 492 | + } |
|
| 493 | 493 | return $error; |
| 494 | 494 | } |
| 495 | 495 | |
| 496 | 496 | private static function update_from_13() { |
| 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)"; |
|
| 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)"; |
|
| 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 | } |
| 507 | - $error = ''; |
|
| 507 | + $error = ''; |
|
| 508 | 508 | $query = "UPDATE `config` SET `value` = '14' WHERE `name` = 'schema_version'"; |
| 509 | - try { |
|
| 510 | - $sth = $Connection->db->prepare($query); |
|
| 511 | - $sth->execute(); |
|
| 512 | - } catch(PDOException $e) { |
|
| 513 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 514 | - } |
|
| 509 | + try { |
|
| 510 | + $sth = $Connection->db->prepare($query); |
|
| 511 | + $sth->execute(); |
|
| 512 | + } catch(PDOException $e) { |
|
| 513 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 514 | + } |
|
| 515 | 515 | return $error; |
| 516 | 516 | } |
| 517 | 517 | |
| 518 | 518 | private static function update_from_14() { |
| 519 | - $Connection = new Connection(); |
|
| 519 | + $Connection = new Connection(); |
|
| 520 | 520 | $error = ''; |
| 521 | - // Add tables |
|
| 522 | - if (!$Connection->tableExists('stats_flight')) { |
|
| 521 | + // Add tables |
|
| 522 | + if (!$Connection->tableExists('stats_flight')) { |
|
| 523 | 523 | $error .= create_db::import_file('../db/stats_flight.sql'); |
| 524 | 524 | if ($error != '') return $error; |
| 525 | 525 | } |
| 526 | 526 | $query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'"; |
| 527 | - try { |
|
| 528 | - $sth = $Connection->db->prepare($query); |
|
| 529 | - $sth->execute(); |
|
| 530 | - } catch(PDOException $e) { |
|
| 531 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 532 | - } |
|
| 527 | + try { |
|
| 528 | + $sth = $Connection->db->prepare($query); |
|
| 529 | + $sth->execute(); |
|
| 530 | + } catch(PDOException $e) { |
|
| 531 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 532 | + } |
|
| 533 | 533 | return $error; |
| 534 | 534 | } |
| 535 | 535 | |
| 536 | 536 | |
| 537 | 537 | private static function update_from_15() { |
| 538 | - $Connection = new Connection(); |
|
| 538 | + $Connection = new Connection(); |
|
| 539 | 539 | $error = ''; |
| 540 | - // Add tables |
|
| 541 | - $query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 542 | - try { |
|
| 543 | - $sth = $Connection->db->prepare($query); |
|
| 544 | - $sth->execute(); |
|
| 545 | - } catch(PDOException $e) { |
|
| 546 | - return "error (update stats) : ".$e->getMessage()."\n"; |
|
| 547 | - } |
|
| 540 | + // Add tables |
|
| 541 | + $query="ALTER TABLE `stats` CHANGE `stats_date` `stats_date` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP"; |
|
| 542 | + try { |
|
| 543 | + $sth = $Connection->db->prepare($query); |
|
| 544 | + $sth->execute(); |
|
| 545 | + } catch(PDOException $e) { |
|
| 546 | + return "error (update stats) : ".$e->getMessage()."\n"; |
|
| 547 | + } |
|
| 548 | 548 | if ($error != '') return $error; |
| 549 | 549 | $query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'"; |
| 550 | - try { |
|
| 551 | - $sth = $Connection->db->prepare($query); |
|
| 552 | - $sth->execute(); |
|
| 553 | - } catch(PDOException $e) { |
|
| 554 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 555 | - } |
|
| 550 | + try { |
|
| 551 | + $sth = $Connection->db->prepare($query); |
|
| 552 | + $sth->execute(); |
|
| 553 | + } catch(PDOException $e) { |
|
| 554 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 555 | + } |
|
| 556 | 556 | return $error; |
| 557 | 557 | } |
| 558 | 558 | |
| 559 | 559 | private static function update_from_16() { |
| 560 | - $Connection = new Connection(); |
|
| 560 | + $Connection = new Connection(); |
|
| 561 | 561 | $error = ''; |
| 562 | - // Add tables |
|
| 563 | - if (!$Connection->tableExists('stats_registration')) { |
|
| 562 | + // Add tables |
|
| 563 | + if (!$Connection->tableExists('stats_registration')) { |
|
| 564 | 564 | $error .= create_db::import_file('../db/stats_registration.sql'); |
| 565 | 565 | } |
| 566 | - if (!$Connection->tableExists('stats_callsign')) { |
|
| 566 | + if (!$Connection->tableExists('stats_callsign')) { |
|
| 567 | 567 | $error .= create_db::import_file('../db/stats_callsign.sql'); |
| 568 | 568 | } |
| 569 | 569 | if ($error != '') return $error; |
| 570 | 570 | $query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'"; |
| 571 | - try { |
|
| 572 | - $sth = $Connection->db->prepare($query); |
|
| 573 | - $sth->execute(); |
|
| 574 | - } catch(PDOException $e) { |
|
| 575 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 576 | - } |
|
| 571 | + try { |
|
| 572 | + $sth = $Connection->db->prepare($query); |
|
| 573 | + $sth->execute(); |
|
| 574 | + } catch(PDOException $e) { |
|
| 575 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 576 | + } |
|
| 577 | 577 | return $error; |
| 578 | 578 | } |
| 579 | 579 | |
| 580 | 580 | private static function update_from_17() { |
| 581 | - $Connection = new Connection(); |
|
| 581 | + $Connection = new Connection(); |
|
| 582 | 582 | $error = ''; |
| 583 | - // Add tables |
|
| 584 | - if (!$Connection->tableExists('stats_country')) { |
|
| 583 | + // Add tables |
|
| 584 | + if (!$Connection->tableExists('stats_country')) { |
|
| 585 | 585 | $error .= create_db::import_file('../db/stats_country.sql'); |
| 586 | 586 | } |
| 587 | 587 | if ($error != '') return $error; |
| 588 | 588 | $query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'"; |
| 589 | - try { |
|
| 590 | - $sth = $Connection->db->prepare($query); |
|
| 591 | - $sth->execute(); |
|
| 592 | - } catch(PDOException $e) { |
|
| 593 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 594 | - } |
|
| 589 | + try { |
|
| 590 | + $sth = $Connection->db->prepare($query); |
|
| 591 | + $sth->execute(); |
|
| 592 | + } catch(PDOException $e) { |
|
| 593 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 594 | + } |
|
| 595 | 595 | return $error; |
| 596 | 596 | } |
| 597 | 597 | private static function update_from_18() { |
| 598 | - $Connection = new Connection(); |
|
| 598 | + $Connection = new Connection(); |
|
| 599 | 599 | $error = ''; |
| 600 | - // Modify stats_airport table |
|
| 601 | - if (!$Connection->checkColumnName('stats_airport','airport_name')) { |
|
| 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 | - try { |
|
| 604 | - $sth = $Connection->db->prepare($query); |
|
| 605 | - $sth->execute(); |
|
| 606 | - } catch(PDOException $e) { |
|
| 607 | - return "error (update stats) : ".$e->getMessage()."\n"; |
|
| 608 | - } |
|
| 609 | - } |
|
| 600 | + // Modify stats_airport table |
|
| 601 | + if (!$Connection->checkColumnName('stats_airport','airport_name')) { |
|
| 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 | + try { |
|
| 604 | + $sth = $Connection->db->prepare($query); |
|
| 605 | + $sth->execute(); |
|
| 606 | + } catch(PDOException $e) { |
|
| 607 | + return "error (update stats) : ".$e->getMessage()."\n"; |
|
| 608 | + } |
|
| 609 | + } |
|
| 610 | 610 | if ($error != '') return $error; |
| 611 | 611 | $query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'"; |
| 612 | - try { |
|
| 613 | - $sth = $Connection->db->prepare($query); |
|
| 614 | - $sth->execute(); |
|
| 615 | - } catch(PDOException $e) { |
|
| 616 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 617 | - } |
|
| 612 | + try { |
|
| 613 | + $sth = $Connection->db->prepare($query); |
|
| 614 | + $sth->execute(); |
|
| 615 | + } catch(PDOException $e) { |
|
| 616 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 617 | + } |
|
| 618 | 618 | return $error; |
| 619 | 619 | } |
| 620 | 620 | |
| 621 | 621 | private static function update_from_19() { |
| 622 | - $Connection = new Connection(); |
|
| 622 | + $Connection = new Connection(); |
|
| 623 | 623 | $error = ''; |
| 624 | - // Update airport table |
|
| 624 | + // Update airport table |
|
| 625 | 625 | $error .= create_db::import_file('../db/airport.sql'); |
| 626 | 626 | if ($error != '') return 'Import airport.sql : '.$error; |
| 627 | 627 | // Remove primary key on Spotter_Archive |
| 628 | 628 | $query = "alter table spotter_archive drop spotter_archive_id"; |
| 629 | - try { |
|
| 630 | - $sth = $Connection->db->prepare($query); |
|
| 631 | - $sth->execute(); |
|
| 632 | - } catch(PDOException $e) { |
|
| 633 | - return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n"; |
|
| 634 | - } |
|
| 629 | + try { |
|
| 630 | + $sth = $Connection->db->prepare($query); |
|
| 631 | + $sth->execute(); |
|
| 632 | + } catch(PDOException $e) { |
|
| 633 | + return "error (remove primary key on spotter_archive) : ".$e->getMessage()."\n"; |
|
| 634 | + } |
|
| 635 | 635 | $query = "alter table spotter_archive add spotter_archive_id INT(11)"; |
| 636 | - try { |
|
| 637 | - $sth = $Connection->db->prepare($query); |
|
| 638 | - $sth->execute(); |
|
| 639 | - } catch(PDOException $e) { |
|
| 640 | - return "error (add id again on spotter_archive) : ".$e->getMessage()."\n"; |
|
| 641 | - } |
|
| 636 | + try { |
|
| 637 | + $sth = $Connection->db->prepare($query); |
|
| 638 | + $sth->execute(); |
|
| 639 | + } catch(PDOException $e) { |
|
| 640 | + return "error (add id again on spotter_archive) : ".$e->getMessage()."\n"; |
|
| 641 | + } |
|
| 642 | 642 | if (!$Connection->checkColumnName('spotter_archive','over_country')) { |
| 643 | 643 | // Add column over_country |
| 644 | - $query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
|
| 644 | + $query = "ALTER TABLE `spotter_archive` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
|
| 645 | 645 | try { |
| 646 | - $sth = $Connection->db->prepare($query); |
|
| 646 | + $sth = $Connection->db->prepare($query); |
|
| 647 | 647 | $sth->execute(); |
| 648 | 648 | } catch(PDOException $e) { |
| 649 | 649 | return "error (add over_country) : ".$e->getMessage()."\n"; |
@@ -651,9 +651,9 @@ discard block |
||
| 651 | 651 | } |
| 652 | 652 | if (!$Connection->checkColumnName('spotter_live','over_country')) { |
| 653 | 653 | // Add column over_country |
| 654 | - $query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
|
| 654 | + $query = "ALTER TABLE `spotter_live` ADD `over_country` VARCHAR(5) NULL DEFAULT NULL"; |
|
| 655 | 655 | try { |
| 656 | - $sth = $Connection->db->prepare($query); |
|
| 656 | + $sth = $Connection->db->prepare($query); |
|
| 657 | 657 | $sth->execute(); |
| 658 | 658 | } catch(PDOException $e) { |
| 659 | 659 | return "error (add over_country) : ".$e->getMessage()."\n"; |
@@ -661,74 +661,74 @@ discard block |
||
| 661 | 661 | } |
| 662 | 662 | if (!$Connection->checkColumnName('spotter_output','source_name')) { |
| 663 | 663 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 664 | - $query = "ALTER TABLE `spotter_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
|
| 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 | 668 | } catch(PDOException $e) { |
| 669 | 669 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 670 | - } |
|
| 671 | - } |
|
| 670 | + } |
|
| 671 | + } |
|
| 672 | 672 | if (!$Connection->checkColumnName('spotter_live','source_name')) { |
| 673 | 673 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 674 | - $query = "ALTER TABLE `spotter_live` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
|
| 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 | 678 | } catch(PDOException $e) { |
| 679 | 679 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 680 | - } |
|
| 681 | - } |
|
| 680 | + } |
|
| 681 | + } |
|
| 682 | 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 | - $query = "ALTER TABLE `spotter_archive_output` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`"; |
|
| 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 | 688 | } catch(PDOException $e) { |
| 689 | 689 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 690 | - } |
|
| 691 | - } |
|
| 690 | + } |
|
| 691 | + } |
|
| 692 | 692 | if (!$Connection->checkColumnName('spotter_archive','source_name')) { |
| 693 | 693 | // Add source_name to spotter_output, spotter_live, spotter_archive, spotter_archive_output |
| 694 | - $query = "ALTER TABLE `spotter_archive` ADD `source_name` VARCHAR(255) NULL AFTER `format_source`;"; |
|
| 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 | 698 | } catch(PDOException $e) { |
| 699 | 699 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 700 | - } |
|
| 701 | - } |
|
| 700 | + } |
|
| 701 | + } |
|
| 702 | 702 | if ($error != '') return $error; |
| 703 | 703 | $query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'"; |
| 704 | - try { |
|
| 705 | - $sth = $Connection->db->prepare($query); |
|
| 706 | - $sth->execute(); |
|
| 707 | - } catch(PDOException $e) { |
|
| 708 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 709 | - } |
|
| 704 | + try { |
|
| 705 | + $sth = $Connection->db->prepare($query); |
|
| 706 | + $sth->execute(); |
|
| 707 | + } catch(PDOException $e) { |
|
| 708 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 709 | + } |
|
| 710 | 710 | return $error; |
| 711 | 711 | } |
| 712 | 712 | |
| 713 | 713 | private static function update_from_20() { |
| 714 | 714 | global $globalIVAO, $globalVATSIM, $globalphpVMS; |
| 715 | - $Connection = new Connection(); |
|
| 715 | + $Connection = new Connection(); |
|
| 716 | 716 | $error = ''; |
| 717 | - // Update airline table |
|
| 718 | - if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
|
| 717 | + // Update airline table |
|
| 718 | + if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
|
| 719 | 719 | $error .= create_db::import_file('../db/airlines.sql'); |
| 720 | 720 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 721 | 721 | } |
| 722 | 722 | if (!$Connection->checkColumnName('aircraft_modes','type_flight')) { |
| 723 | 723 | // Add column over_country |
| 724 | - $query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;"; |
|
| 725 | - try { |
|
| 724 | + $query = "ALTER TABLE `aircraft_modes` ADD `type_flight` VARCHAR(50) NULL DEFAULT NULL;"; |
|
| 725 | + try { |
|
| 726 | 726 | $sth = $Connection->db->prepare($query); |
| 727 | 727 | $sth->execute(); |
| 728 | 728 | } catch(PDOException $e) { |
| 729 | 729 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 730 | - } |
|
| 731 | - } |
|
| 730 | + } |
|
| 731 | + } |
|
| 732 | 732 | if ($error != '') return $error; |
| 733 | 733 | /* |
| 734 | 734 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
@@ -738,12 +738,12 @@ discard block |
||
| 738 | 738 | } |
| 739 | 739 | */ |
| 740 | 740 | $query = "UPDATE `config` SET `value` = '21' WHERE `name` = 'schema_version'"; |
| 741 | - try { |
|
| 742 | - $sth = $Connection->db->prepare($query); |
|
| 743 | - $sth->execute(); |
|
| 744 | - } catch(PDOException $e) { |
|
| 745 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 746 | - } |
|
| 741 | + try { |
|
| 742 | + $sth = $Connection->db->prepare($query); |
|
| 743 | + $sth->execute(); |
|
| 744 | + } catch(PDOException $e) { |
|
| 745 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 746 | + } |
|
| 747 | 747 | return $error; |
| 748 | 748 | } |
| 749 | 749 | |
@@ -762,35 +762,35 @@ discard block |
||
| 762 | 762 | if ($error != '') return $error; |
| 763 | 763 | } |
| 764 | 764 | $query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'"; |
| 765 | - try { |
|
| 766 | - $sth = $Connection->db->prepare($query); |
|
| 767 | - $sth->execute(); |
|
| 768 | - } catch(PDOException $e) { |
|
| 769 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 770 | - } |
|
| 765 | + try { |
|
| 766 | + $sth = $Connection->db->prepare($query); |
|
| 767 | + $sth->execute(); |
|
| 768 | + } catch(PDOException $e) { |
|
| 769 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 770 | + } |
|
| 771 | 771 | return $error; |
| 772 | 772 | } |
| 773 | 773 | |
| 774 | 774 | private static function update_from_22() { |
| 775 | 775 | global $globalDBdriver; |
| 776 | - $Connection = new Connection(); |
|
| 776 | + $Connection = new Connection(); |
|
| 777 | 777 | $error = ''; |
| 778 | 778 | // Add table stats polar |
| 779 | - if (!$Connection->tableExists('stats_source')) { |
|
| 779 | + if (!$Connection->tableExists('stats_source')) { |
|
| 780 | 780 | if ($globalDBdriver == 'mysql') { |
| 781 | - $error .= create_db::import_file('../db/stats_source.sql'); |
|
| 781 | + $error .= create_db::import_file('../db/stats_source.sql'); |
|
| 782 | 782 | } else { |
| 783 | 783 | $error .= create_db::import_file('../db/pgsql/stats_source.sql'); |
| 784 | 784 | } |
| 785 | 785 | if ($error != '') return $error; |
| 786 | 786 | } |
| 787 | 787 | $query = "UPDATE config SET value = '23' WHERE name = 'schema_version'"; |
| 788 | - try { |
|
| 789 | - $sth = $Connection->db->prepare($query); |
|
| 790 | - $sth->execute(); |
|
| 791 | - } catch(PDOException $e) { |
|
| 792 | - return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 793 | - } |
|
| 788 | + try { |
|
| 789 | + $sth = $Connection->db->prepare($query); |
|
| 790 | + $sth->execute(); |
|
| 791 | + } catch(PDOException $e) { |
|
| 792 | + return "error (update schema_version) : ".$e->getMessage()."\n"; |
|
| 793 | + } |
|
| 794 | 794 | return $error; |
| 795 | 795 | } |
| 796 | 796 | |
@@ -820,14 +820,14 @@ discard block |
||
| 820 | 820 | } |
| 821 | 821 | if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) { |
| 822 | 822 | // Add aircraft_manufacturer to stats_aircraft |
| 823 | - $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; |
|
| 823 | + $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; |
|
| 824 | 824 | try { |
| 825 | 825 | $sth = $Connection->db->prepare($query); |
| 826 | 826 | $sth->execute(); |
| 827 | 827 | } catch(PDOException $e) { |
| 828 | 828 | return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n"; |
| 829 | - } |
|
| 830 | - } |
|
| 829 | + } |
|
| 830 | + } |
|
| 831 | 831 | |
| 832 | 832 | $query = "UPDATE config SET value = '24' WHERE name = 'schema_version'"; |
| 833 | 833 | try { |
@@ -1175,7 +1175,7 @@ discard block |
||
| 1175 | 1175 | } catch(PDOException $e) { |
| 1176 | 1176 | return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n"; |
| 1177 | 1177 | } |
| 1178 | - } |
|
| 1178 | + } |
|
| 1179 | 1179 | if (!$Connection->checkColumnName('aircraft','mfr')) { |
| 1180 | 1180 | // Add mfr to aircraft |
| 1181 | 1181 | $query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL"; |
@@ -1249,7 +1249,7 @@ discard block |
||
| 1249 | 1249 | } catch(PDOException $e) { |
| 1250 | 1250 | return "error (add index ref on notam) : ".$e->getMessage()."\n"; |
| 1251 | 1251 | } |
| 1252 | - } |
|
| 1252 | + } |
|
| 1253 | 1253 | if (!$Connection->indexExists('accidents','registration_idx')) { |
| 1254 | 1254 | // Add index key |
| 1255 | 1255 | $query = "create index registration_idx on accidents (registration)"; |
@@ -1259,7 +1259,7 @@ discard block |
||
| 1259 | 1259 | } catch(PDOException $e) { |
| 1260 | 1260 | return "error (add index registration on accidents) : ".$e->getMessage()."\n"; |
| 1261 | 1261 | } |
| 1262 | - } |
|
| 1262 | + } |
|
| 1263 | 1263 | if (!$Connection->indexExists('accidents','rdts')) { |
| 1264 | 1264 | // Add index key |
| 1265 | 1265 | $query = "create index rdts on accidents (registration,date,type,source)"; |
@@ -1269,7 +1269,7 @@ discard block |
||
| 1269 | 1269 | } catch(PDOException $e) { |
| 1270 | 1270 | return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n"; |
| 1271 | 1271 | } |
| 1272 | - } |
|
| 1272 | + } |
|
| 1273 | 1273 | |
| 1274 | 1274 | $query = "UPDATE config SET value = '31' WHERE name = 'schema_version'"; |
| 1275 | 1275 | try { |
@@ -1561,7 +1561,7 @@ discard block |
||
| 1561 | 1561 | } catch(PDOException $e) { |
| 1562 | 1562 | return "error (add index type on accidents) : ".$e->getMessage()."\n"; |
| 1563 | 1563 | } |
| 1564 | - } |
|
| 1564 | + } |
|
| 1565 | 1565 | $query = "UPDATE config SET value = '36' WHERE name = 'schema_version'"; |
| 1566 | 1566 | try { |
| 1567 | 1567 | $sth = $Connection->db->prepare($query); |
@@ -1722,7 +1722,7 @@ discard block |
||
| 1722 | 1722 | } catch(PDOException $e) { |
| 1723 | 1723 | return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n"; |
| 1724 | 1724 | } |
| 1725 | - } |
|
| 1725 | + } |
|
| 1726 | 1726 | $query = "UPDATE config SET value = '38' WHERE name = 'schema_version'"; |
| 1727 | 1727 | try { |
| 1728 | 1728 | $sth = $Connection->db->prepare($query); |
@@ -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; |
@@ -814,17 +814,17 @@ discard block |
||
| 814 | 814 | try { |
| 815 | 815 | $sth = $Connection->db->prepare($query); |
| 816 | 816 | $sth->execute(); |
| 817 | - } catch(PDOException $e) { |
|
| 817 | + } catch (PDOException $e) { |
|
| 818 | 818 | return "error (create index on spotter_archive) : ".$e->getMessage()."\n"; |
| 819 | 819 | } |
| 820 | 820 | } |
| 821 | - if (!$Connection->checkColumnName('stats_aircraft','aircraft_manufacturer')) { |
|
| 821 | + if (!$Connection->checkColumnName('stats_aircraft', 'aircraft_manufacturer')) { |
|
| 822 | 822 | // Add aircraft_manufacturer to stats_aircraft |
| 823 | 823 | $query = "ALTER TABLE stats_aircraft ADD aircraft_manufacturer VARCHAR(255) NULL"; |
| 824 | 824 | try { |
| 825 | 825 | $sth = $Connection->db->prepare($query); |
| 826 | 826 | $sth->execute(); |
| 827 | - } catch(PDOException $e) { |
|
| 827 | + } catch (PDOException $e) { |
|
| 828 | 828 | return "error (add aircraft_manufacturer column) : ".$e->getMessage()."\n"; |
| 829 | 829 | } |
| 830 | 830 | } |
@@ -833,7 +833,7 @@ discard block |
||
| 833 | 833 | try { |
| 834 | 834 | $sth = $Connection->db->prepare($query); |
| 835 | 835 | $sth->execute(); |
| 836 | - } catch(PDOException $e) { |
|
| 836 | + } catch (PDOException $e) { |
|
| 837 | 837 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 838 | 838 | } |
| 839 | 839 | return $error; |
@@ -849,23 +849,23 @@ discard block |
||
| 849 | 849 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 850 | 850 | } |
| 851 | 851 | if ($error != '') return 'Import airlines.sql : '.$error; |
| 852 | - if (!$Connection->checkColumnName('airlines','forsource')) { |
|
| 852 | + if (!$Connection->checkColumnName('airlines', 'forsource')) { |
|
| 853 | 853 | // Add forsource to airlines |
| 854 | 854 | $query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL"; |
| 855 | 855 | try { |
| 856 | 856 | $sth = $Connection->db->prepare($query); |
| 857 | 857 | $sth->execute(); |
| 858 | - } catch(PDOException $e) { |
|
| 858 | + } catch (PDOException $e) { |
|
| 859 | 859 | return "error (add forsource column) : ".$e->getMessage()."\n"; |
| 860 | 860 | } |
| 861 | 861 | } |
| 862 | - if (!$Connection->checkColumnName('stats_aircraft','stats_airline')) { |
|
| 862 | + if (!$Connection->checkColumnName('stats_aircraft', 'stats_airline')) { |
|
| 863 | 863 | // Add forsource to airlines |
| 864 | 864 | $query = "ALTER TABLE stats_aircraft ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 865 | 865 | try { |
| 866 | 866 | $sth = $Connection->db->prepare($query); |
| 867 | 867 | $sth->execute(); |
| 868 | - } catch(PDOException $e) { |
|
| 868 | + } catch (PDOException $e) { |
|
| 869 | 869 | return "error (add stats_airline & filter_name column in stats_aircraft) : ".$e->getMessage()."\n"; |
| 870 | 870 | } |
| 871 | 871 | // Add unique key |
@@ -877,17 +877,17 @@ discard block |
||
| 877 | 877 | try { |
| 878 | 878 | $sth = $Connection->db->prepare($query); |
| 879 | 879 | $sth->execute(); |
| 880 | - } catch(PDOException $e) { |
|
| 880 | + } catch (PDOException $e) { |
|
| 881 | 881 | return "error (add unique key in stats_aircraft) : ".$e->getMessage()."\n"; |
| 882 | 882 | } |
| 883 | 883 | } |
| 884 | - if (!$Connection->checkColumnName('stats_airport','stats_airline')) { |
|
| 884 | + if (!$Connection->checkColumnName('stats_airport', 'stats_airline')) { |
|
| 885 | 885 | // Add forsource to airlines |
| 886 | 886 | $query = "ALTER TABLE stats_airport ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 887 | 887 | try { |
| 888 | 888 | $sth = $Connection->db->prepare($query); |
| 889 | 889 | $sth->execute(); |
| 890 | - } catch(PDOException $e) { |
|
| 890 | + } catch (PDOException $e) { |
|
| 891 | 891 | return "error (add filter_name column in stats_airport) : ".$e->getMessage()."\n"; |
| 892 | 892 | } |
| 893 | 893 | // Add unique key |
@@ -899,17 +899,17 @@ discard block |
||
| 899 | 899 | try { |
| 900 | 900 | $sth = $Connection->db->prepare($query); |
| 901 | 901 | $sth->execute(); |
| 902 | - } catch(PDOException $e) { |
|
| 902 | + } catch (PDOException $e) { |
|
| 903 | 903 | return "error (add unique key in stats_airport) : ".$e->getMessage()."\n"; |
| 904 | 904 | } |
| 905 | 905 | } |
| 906 | - if (!$Connection->checkColumnName('stats_country','stats_airline')) { |
|
| 906 | + if (!$Connection->checkColumnName('stats_country', 'stats_airline')) { |
|
| 907 | 907 | // Add forsource to airlines |
| 908 | 908 | $query = "ALTER TABLE stats_country ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 909 | 909 | try { |
| 910 | 910 | $sth = $Connection->db->prepare($query); |
| 911 | 911 | $sth->execute(); |
| 912 | - } catch(PDOException $e) { |
|
| 912 | + } catch (PDOException $e) { |
|
| 913 | 913 | return "error (add stats_airline & filter_name column in stats_country) : ".$e->getMessage()."\n"; |
| 914 | 914 | } |
| 915 | 915 | // Add unique key |
@@ -921,36 +921,36 @@ discard block |
||
| 921 | 921 | try { |
| 922 | 922 | $sth = $Connection->db->prepare($query); |
| 923 | 923 | $sth->execute(); |
| 924 | - } catch(PDOException $e) { |
|
| 924 | + } catch (PDOException $e) { |
|
| 925 | 925 | return "error (add unique key in stats_airline) : ".$e->getMessage()."\n"; |
| 926 | 926 | } |
| 927 | 927 | } |
| 928 | - if (!$Connection->checkColumnName('stats_flight','stats_airline')) { |
|
| 928 | + if (!$Connection->checkColumnName('stats_flight', 'stats_airline')) { |
|
| 929 | 929 | // Add forsource to airlines |
| 930 | 930 | $query = "ALTER TABLE stats_flight ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 931 | 931 | try { |
| 932 | 932 | $sth = $Connection->db->prepare($query); |
| 933 | 933 | $sth->execute(); |
| 934 | - } catch(PDOException $e) { |
|
| 934 | + } catch (PDOException $e) { |
|
| 935 | 935 | return "error (add stats_airline & filter_name column in stats_flight) : ".$e->getMessage()."\n"; |
| 936 | 936 | } |
| 937 | 937 | } |
| 938 | - if (!$Connection->checkColumnName('stats','stats_airline')) { |
|
| 938 | + if (!$Connection->checkColumnName('stats', 'stats_airline')) { |
|
| 939 | 939 | // Add forsource to airlines |
| 940 | 940 | $query = "ALTER TABLE stats ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 941 | 941 | try { |
| 942 | 942 | $sth = $Connection->db->prepare($query); |
| 943 | 943 | $sth->execute(); |
| 944 | - } catch(PDOException $e) { |
|
| 944 | + } catch (PDOException $e) { |
|
| 945 | 945 | return "error (add stats_airline & filter_name column in stats) : ".$e->getMessage()."\n"; |
| 946 | 946 | } |
| 947 | - if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats','type')) { |
|
| 947 | + if ($globalDBdriver == 'mysql' && $Connection->indexExists('stats', 'type')) { |
|
| 948 | 948 | // Add unique key |
| 949 | 949 | $query = "drop index type on stats;ALTER TABLE stats ADD UNIQUE stats_type (stats_type,stats_date,stats_airline,filter_name);"; |
| 950 | 950 | try { |
| 951 | 951 | $sth = $Connection->db->prepare($query); |
| 952 | 952 | $sth->execute(); |
| 953 | - } catch(PDOException $e) { |
|
| 953 | + } catch (PDOException $e) { |
|
| 954 | 954 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; |
| 955 | 955 | } |
| 956 | 956 | } else { |
@@ -963,18 +963,18 @@ discard block |
||
| 963 | 963 | try { |
| 964 | 964 | $sth = $Connection->db->prepare($query); |
| 965 | 965 | $sth->execute(); |
| 966 | - } catch(PDOException $e) { |
|
| 966 | + } catch (PDOException $e) { |
|
| 967 | 967 | return "error (add unique key in stats) : ".$e->getMessage()."\n"; |
| 968 | 968 | } |
| 969 | 969 | } |
| 970 | 970 | } |
| 971 | - if (!$Connection->checkColumnName('stats_registration','stats_airline')) { |
|
| 971 | + if (!$Connection->checkColumnName('stats_registration', 'stats_airline')) { |
|
| 972 | 972 | // Add forsource to airlines |
| 973 | 973 | $query = "ALTER TABLE stats_registration ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 974 | 974 | try { |
| 975 | 975 | $sth = $Connection->db->prepare($query); |
| 976 | 976 | $sth->execute(); |
| 977 | - } catch(PDOException $e) { |
|
| 977 | + } catch (PDOException $e) { |
|
| 978 | 978 | return "error (add stats_airline & filter_name column in stats_registration) : ".$e->getMessage()."\n"; |
| 979 | 979 | } |
| 980 | 980 | // Add unique key |
@@ -986,17 +986,17 @@ discard block |
||
| 986 | 986 | try { |
| 987 | 987 | $sth = $Connection->db->prepare($query); |
| 988 | 988 | $sth->execute(); |
| 989 | - } catch(PDOException $e) { |
|
| 989 | + } catch (PDOException $e) { |
|
| 990 | 990 | return "error (add unique key in stats_registration) : ".$e->getMessage()."\n"; |
| 991 | 991 | } |
| 992 | 992 | } |
| 993 | - if (!$Connection->checkColumnName('stats_callsign','filter_name')) { |
|
| 993 | + if (!$Connection->checkColumnName('stats_callsign', 'filter_name')) { |
|
| 994 | 994 | // Add forsource to airlines |
| 995 | 995 | $query = "ALTER TABLE stats_callsign ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 996 | 996 | try { |
| 997 | 997 | $sth = $Connection->db->prepare($query); |
| 998 | 998 | $sth->execute(); |
| 999 | - } catch(PDOException $e) { |
|
| 999 | + } catch (PDOException $e) { |
|
| 1000 | 1000 | return "error (add filter_name column in stats_callsign) : ".$e->getMessage()."\n"; |
| 1001 | 1001 | } |
| 1002 | 1002 | // Add unique key |
@@ -1008,17 +1008,17 @@ discard block |
||
| 1008 | 1008 | try { |
| 1009 | 1009 | $sth = $Connection->db->prepare($query); |
| 1010 | 1010 | $sth->execute(); |
| 1011 | - } catch(PDOException $e) { |
|
| 1011 | + } catch (PDOException $e) { |
|
| 1012 | 1012 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; |
| 1013 | 1013 | } |
| 1014 | 1014 | } |
| 1015 | - if (!$Connection->checkColumnName('stats_airline','filter_name')) { |
|
| 1015 | + if (!$Connection->checkColumnName('stats_airline', 'filter_name')) { |
|
| 1016 | 1016 | // Add forsource to airlines |
| 1017 | 1017 | $query = "ALTER TABLE stats_airline ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1018 | 1018 | try { |
| 1019 | 1019 | $sth = $Connection->db->prepare($query); |
| 1020 | 1020 | $sth->execute(); |
| 1021 | - } catch(PDOException $e) { |
|
| 1021 | + } catch (PDOException $e) { |
|
| 1022 | 1022 | return "error (add filter_name column in stats_airline) : ".$e->getMessage()."\n"; |
| 1023 | 1023 | } |
| 1024 | 1024 | // Add unique key |
@@ -1030,7 +1030,7 @@ discard block |
||
| 1030 | 1030 | try { |
| 1031 | 1031 | $sth = $Connection->db->prepare($query); |
| 1032 | 1032 | $sth->execute(); |
| 1033 | - } catch(PDOException $e) { |
|
| 1033 | + } catch (PDOException $e) { |
|
| 1034 | 1034 | return "error (add unique key in stats_callsign) : ".$e->getMessage()."\n"; |
| 1035 | 1035 | } |
| 1036 | 1036 | } |
@@ -1039,7 +1039,7 @@ discard block |
||
| 1039 | 1039 | try { |
| 1040 | 1040 | $sth = $Connection->db->prepare($query); |
| 1041 | 1041 | $sth->execute(); |
| 1042 | - } catch(PDOException $e) { |
|
| 1042 | + } catch (PDOException $e) { |
|
| 1043 | 1043 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1044 | 1044 | } |
| 1045 | 1045 | return $error; |
@@ -1049,13 +1049,13 @@ discard block |
||
| 1049 | 1049 | global $globalDBdriver; |
| 1050 | 1050 | $Connection = new Connection(); |
| 1051 | 1051 | $error = ''; |
| 1052 | - if (!$Connection->checkColumnName('stats_owner','stats_airline')) { |
|
| 1052 | + if (!$Connection->checkColumnName('stats_owner', 'stats_airline')) { |
|
| 1053 | 1053 | // Add forsource to airlines |
| 1054 | 1054 | $query = "ALTER TABLE stats_owner ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1055 | 1055 | try { |
| 1056 | 1056 | $sth = $Connection->db->prepare($query); |
| 1057 | 1057 | $sth->execute(); |
| 1058 | - } catch(PDOException $e) { |
|
| 1058 | + } catch (PDOException $e) { |
|
| 1059 | 1059 | return "error (add stats_airline & filter_name column in stats_owner) : ".$e->getMessage()."\n"; |
| 1060 | 1060 | } |
| 1061 | 1061 | // Add unique key |
@@ -1067,17 +1067,17 @@ discard block |
||
| 1067 | 1067 | try { |
| 1068 | 1068 | $sth = $Connection->db->prepare($query); |
| 1069 | 1069 | $sth->execute(); |
| 1070 | - } catch(PDOException $e) { |
|
| 1070 | + } catch (PDOException $e) { |
|
| 1071 | 1071 | return "error (add unique key in stats_owner) : ".$e->getMessage()."\n"; |
| 1072 | 1072 | } |
| 1073 | 1073 | } |
| 1074 | - if (!$Connection->checkColumnName('stats_pilot','stats_airline')) { |
|
| 1074 | + if (!$Connection->checkColumnName('stats_pilot', 'stats_airline')) { |
|
| 1075 | 1075 | // Add forsource to airlines |
| 1076 | 1076 | $query = "ALTER TABLE stats_pilot ADD stats_airline VARCHAR(255) NULL DEFAULT '', ADD filter_name VARCHAR(255) NULL DEFAULT ''"; |
| 1077 | 1077 | try { |
| 1078 | 1078 | $sth = $Connection->db->prepare($query); |
| 1079 | 1079 | $sth->execute(); |
| 1080 | - } catch(PDOException $e) { |
|
| 1080 | + } catch (PDOException $e) { |
|
| 1081 | 1081 | return "error (add stats_airline & filter_name column in stats_pilot) : ".$e->getMessage()."\n"; |
| 1082 | 1082 | } |
| 1083 | 1083 | // Add unique key |
@@ -1089,7 +1089,7 @@ discard block |
||
| 1089 | 1089 | try { |
| 1090 | 1090 | $sth = $Connection->db->prepare($query); |
| 1091 | 1091 | $sth->execute(); |
| 1092 | - } catch(PDOException $e) { |
|
| 1092 | + } catch (PDOException $e) { |
|
| 1093 | 1093 | return "error (add unique key in stats_pilot) : ".$e->getMessage()."\n"; |
| 1094 | 1094 | } |
| 1095 | 1095 | } |
@@ -1097,7 +1097,7 @@ discard block |
||
| 1097 | 1097 | try { |
| 1098 | 1098 | $sth = $Connection->db->prepare($query); |
| 1099 | 1099 | $sth->execute(); |
| 1100 | - } catch(PDOException $e) { |
|
| 1100 | + } catch (PDOException $e) { |
|
| 1101 | 1101 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1102 | 1102 | } |
| 1103 | 1103 | return $error; |
@@ -1107,12 +1107,12 @@ discard block |
||
| 1107 | 1107 | global $globalDBdriver; |
| 1108 | 1108 | $Connection = new Connection(); |
| 1109 | 1109 | $error = ''; |
| 1110 | - if (!$Connection->checkColumnName('atc','format_source')) { |
|
| 1110 | + if (!$Connection->checkColumnName('atc', 'format_source')) { |
|
| 1111 | 1111 | $query = "ALTER TABLE atc ADD format_source VARCHAR(255) DEFAULT NULL, ADD source_name VARCHAR(255) DEFAULT NULL"; |
| 1112 | 1112 | try { |
| 1113 | 1113 | $sth = $Connection->db->prepare($query); |
| 1114 | 1114 | $sth->execute(); |
| 1115 | - } catch(PDOException $e) { |
|
| 1115 | + } catch (PDOException $e) { |
|
| 1116 | 1116 | return "error (add format_source & source_name column in atc) : ".$e->getMessage()."\n"; |
| 1117 | 1117 | } |
| 1118 | 1118 | } |
@@ -1120,7 +1120,7 @@ discard block |
||
| 1120 | 1120 | try { |
| 1121 | 1121 | $sth = $Connection->db->prepare($query); |
| 1122 | 1122 | $sth->execute(); |
| 1123 | - } catch(PDOException $e) { |
|
| 1123 | + } catch (PDOException $e) { |
|
| 1124 | 1124 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1125 | 1125 | } |
| 1126 | 1126 | return $error; |
@@ -1130,13 +1130,13 @@ discard block |
||
| 1130 | 1130 | global $globalDBdriver; |
| 1131 | 1131 | $Connection = new Connection(); |
| 1132 | 1132 | $error = ''; |
| 1133 | - if (!$Connection->checkColumnName('stats_pilot','format_source')) { |
|
| 1133 | + if (!$Connection->checkColumnName('stats_pilot', 'format_source')) { |
|
| 1134 | 1134 | // Add forsource to airlines |
| 1135 | 1135 | $query = "ALTER TABLE stats_pilot ADD format_source VARCHAR(255) NULL DEFAULT ''"; |
| 1136 | 1136 | try { |
| 1137 | 1137 | $sth = $Connection->db->prepare($query); |
| 1138 | 1138 | $sth->execute(); |
| 1139 | - } catch(PDOException $e) { |
|
| 1139 | + } catch (PDOException $e) { |
|
| 1140 | 1140 | return "error (add format_source column in stats_pilot) : ".$e->getMessage()."\n"; |
| 1141 | 1141 | } |
| 1142 | 1142 | // Add unique key |
@@ -1148,7 +1148,7 @@ discard block |
||
| 1148 | 1148 | try { |
| 1149 | 1149 | $sth = $Connection->db->prepare($query); |
| 1150 | 1150 | $sth->execute(); |
| 1151 | - } catch(PDOException $e) { |
|
| 1151 | + } catch (PDOException $e) { |
|
| 1152 | 1152 | return "error (modify unique key in stats_pilot) : ".$e->getMessage()."\n"; |
| 1153 | 1153 | } |
| 1154 | 1154 | } |
@@ -1156,7 +1156,7 @@ discard block |
||
| 1156 | 1156 | try { |
| 1157 | 1157 | $sth = $Connection->db->prepare($query); |
| 1158 | 1158 | $sth->execute(); |
| 1159 | - } catch(PDOException $e) { |
|
| 1159 | + } catch (PDOException $e) { |
|
| 1160 | 1160 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1161 | 1161 | } |
| 1162 | 1162 | return $error; |
@@ -1166,23 +1166,23 @@ discard block |
||
| 1166 | 1166 | global $globalDBdriver; |
| 1167 | 1167 | $Connection = new Connection(); |
| 1168 | 1168 | $error = ''; |
| 1169 | - if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live','latitude')) { |
|
| 1169 | + if ($globalDBdriver == 'mysql' && !$Connection->indexExists('spotter_live', 'latitude')) { |
|
| 1170 | 1170 | // Add unique key |
| 1171 | 1171 | $query = "alter table spotter_live add index(latitude,longitude)"; |
| 1172 | 1172 | try { |
| 1173 | 1173 | $sth = $Connection->db->prepare($query); |
| 1174 | 1174 | $sth->execute(); |
| 1175 | - } catch(PDOException $e) { |
|
| 1175 | + } catch (PDOException $e) { |
|
| 1176 | 1176 | return "error (add index latitude,longitude on spotter_live) : ".$e->getMessage()."\n"; |
| 1177 | 1177 | } |
| 1178 | 1178 | } |
| 1179 | - if (!$Connection->checkColumnName('aircraft','mfr')) { |
|
| 1179 | + if (!$Connection->checkColumnName('aircraft', 'mfr')) { |
|
| 1180 | 1180 | // Add mfr to aircraft |
| 1181 | 1181 | $query = "ALTER TABLE aircraft ADD mfr VARCHAR(255) NULL"; |
| 1182 | 1182 | try { |
| 1183 | 1183 | $sth = $Connection->db->prepare($query); |
| 1184 | 1184 | $sth->execute(); |
| 1185 | - } catch(PDOException $e) { |
|
| 1185 | + } catch (PDOException $e) { |
|
| 1186 | 1186 | return "error (add mfr column in aircraft) : ".$e->getMessage()."\n"; |
| 1187 | 1187 | } |
| 1188 | 1188 | } |
@@ -1198,7 +1198,7 @@ discard block |
||
| 1198 | 1198 | try { |
| 1199 | 1199 | $sth = $Connection->db->prepare($query); |
| 1200 | 1200 | $sth->execute(); |
| 1201 | - } catch(PDOException $e) { |
|
| 1201 | + } catch (PDOException $e) { |
|
| 1202 | 1202 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1203 | 1203 | } |
| 1204 | 1204 | return $error; |
@@ -1208,13 +1208,13 @@ discard block |
||
| 1208 | 1208 | global $globalDBdriver; |
| 1209 | 1209 | $Connection = new Connection(); |
| 1210 | 1210 | $error = ''; |
| 1211 | - if ($Connection->checkColumnName('aircraft','mfr')) { |
|
| 1211 | + if ($Connection->checkColumnName('aircraft', 'mfr')) { |
|
| 1212 | 1212 | // drop mfr to aircraft |
| 1213 | 1213 | $query = "ALTER TABLE aircraft DROP COLUMN mfr"; |
| 1214 | 1214 | try { |
| 1215 | 1215 | $sth = $Connection->db->prepare($query); |
| 1216 | 1216 | $sth->execute(); |
| 1217 | - } catch(PDOException $e) { |
|
| 1217 | + } catch (PDOException $e) { |
|
| 1218 | 1218 | return "error (drop mfr column in aircraft) : ".$e->getMessage()."\n"; |
| 1219 | 1219 | } |
| 1220 | 1220 | } |
@@ -1230,7 +1230,7 @@ discard block |
||
| 1230 | 1230 | try { |
| 1231 | 1231 | $sth = $Connection->db->prepare($query); |
| 1232 | 1232 | $sth->execute(); |
| 1233 | - } catch(PDOException $e) { |
|
| 1233 | + } catch (PDOException $e) { |
|
| 1234 | 1234 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1235 | 1235 | } |
| 1236 | 1236 | return $error; |
@@ -1240,33 +1240,33 @@ discard block |
||
| 1240 | 1240 | global $globalDBdriver; |
| 1241 | 1241 | $Connection = new Connection(); |
| 1242 | 1242 | $error = ''; |
| 1243 | - if (!$Connection->indexExists('notam','ref_idx')) { |
|
| 1243 | + if (!$Connection->indexExists('notam', 'ref_idx')) { |
|
| 1244 | 1244 | // Add index key |
| 1245 | 1245 | $query = "create index ref_idx on notam (ref)"; |
| 1246 | 1246 | try { |
| 1247 | 1247 | $sth = $Connection->db->prepare($query); |
| 1248 | 1248 | $sth->execute(); |
| 1249 | - } catch(PDOException $e) { |
|
| 1249 | + } catch (PDOException $e) { |
|
| 1250 | 1250 | return "error (add index ref on notam) : ".$e->getMessage()."\n"; |
| 1251 | 1251 | } |
| 1252 | 1252 | } |
| 1253 | - if (!$Connection->indexExists('accidents','registration_idx')) { |
|
| 1253 | + if (!$Connection->indexExists('accidents', 'registration_idx')) { |
|
| 1254 | 1254 | // Add index key |
| 1255 | 1255 | $query = "create index registration_idx on accidents (registration)"; |
| 1256 | 1256 | try { |
| 1257 | 1257 | $sth = $Connection->db->prepare($query); |
| 1258 | 1258 | $sth->execute(); |
| 1259 | - } catch(PDOException $e) { |
|
| 1259 | + } catch (PDOException $e) { |
|
| 1260 | 1260 | return "error (add index registration on accidents) : ".$e->getMessage()."\n"; |
| 1261 | 1261 | } |
| 1262 | 1262 | } |
| 1263 | - if (!$Connection->indexExists('accidents','rdts')) { |
|
| 1263 | + if (!$Connection->indexExists('accidents', 'rdts')) { |
|
| 1264 | 1264 | // Add index key |
| 1265 | 1265 | $query = "create index rdts on accidents (registration,date,type,source)"; |
| 1266 | 1266 | try { |
| 1267 | 1267 | $sth = $Connection->db->prepare($query); |
| 1268 | 1268 | $sth->execute(); |
| 1269 | - } catch(PDOException $e) { |
|
| 1269 | + } catch (PDOException $e) { |
|
| 1270 | 1270 | return "error (add index registration, date, type & source on accidents) : ".$e->getMessage()."\n"; |
| 1271 | 1271 | } |
| 1272 | 1272 | } |
@@ -1275,7 +1275,7 @@ discard block |
||
| 1275 | 1275 | try { |
| 1276 | 1276 | $sth = $Connection->db->prepare($query); |
| 1277 | 1277 | $sth->execute(); |
| 1278 | - } catch(PDOException $e) { |
|
| 1278 | + } catch (PDOException $e) { |
|
| 1279 | 1279 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1280 | 1280 | } |
| 1281 | 1281 | return $error; |
@@ -1285,23 +1285,23 @@ discard block |
||
| 1285 | 1285 | global $globalDBdriver; |
| 1286 | 1286 | $Connection = new Connection(); |
| 1287 | 1287 | $error = ''; |
| 1288 | - if (!$Connection->checkColumnName('accidents','airline_name')) { |
|
| 1288 | + if (!$Connection->checkColumnName('accidents', 'airline_name')) { |
|
| 1289 | 1289 | // Add airline_name to accidents |
| 1290 | 1290 | $query = "ALTER TABLE accidents ADD airline_name VARCHAR(255) NULL"; |
| 1291 | 1291 | try { |
| 1292 | 1292 | $sth = $Connection->db->prepare($query); |
| 1293 | 1293 | $sth->execute(); |
| 1294 | - } catch(PDOException $e) { |
|
| 1294 | + } catch (PDOException $e) { |
|
| 1295 | 1295 | return "error (add airline_name column in accidents) : ".$e->getMessage()."\n"; |
| 1296 | 1296 | } |
| 1297 | 1297 | } |
| 1298 | - if (!$Connection->checkColumnName('accidents','airline_icao')) { |
|
| 1298 | + if (!$Connection->checkColumnName('accidents', 'airline_icao')) { |
|
| 1299 | 1299 | // Add airline_icao to accidents |
| 1300 | 1300 | $query = "ALTER TABLE accidents ADD airline_icao VARCHAR(10) NULL"; |
| 1301 | 1301 | try { |
| 1302 | 1302 | $sth = $Connection->db->prepare($query); |
| 1303 | 1303 | $sth->execute(); |
| 1304 | - } catch(PDOException $e) { |
|
| 1304 | + } catch (PDOException $e) { |
|
| 1305 | 1305 | return "error (add airline_icao column in accidents) : ".$e->getMessage()."\n"; |
| 1306 | 1306 | } |
| 1307 | 1307 | } |
@@ -1309,7 +1309,7 @@ discard block |
||
| 1309 | 1309 | try { |
| 1310 | 1310 | $sth = $Connection->db->prepare($query); |
| 1311 | 1311 | $sth->execute(); |
| 1312 | - } catch(PDOException $e) { |
|
| 1312 | + } catch (PDOException $e) { |
|
| 1313 | 1313 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1314 | 1314 | } |
| 1315 | 1315 | return $error; |
@@ -1319,13 +1319,13 @@ discard block |
||
| 1319 | 1319 | global $globalDBdriver, $globalVATSIM, $globalIVAO; |
| 1320 | 1320 | $Connection = new Connection(); |
| 1321 | 1321 | $error = ''; |
| 1322 | - if (!$Connection->checkColumnName('airlines','alliance')) { |
|
| 1322 | + if (!$Connection->checkColumnName('airlines', 'alliance')) { |
|
| 1323 | 1323 | // Add alliance to airlines |
| 1324 | 1324 | $query = "ALTER TABLE airlines ADD alliance VARCHAR(255) NULL"; |
| 1325 | 1325 | try { |
| 1326 | 1326 | $sth = $Connection->db->prepare($query); |
| 1327 | 1327 | $sth->execute(); |
| 1328 | - } catch(PDOException $e) { |
|
| 1328 | + } catch (PDOException $e) { |
|
| 1329 | 1329 | return "error (add alliance column in airlines) : ".$e->getMessage()."\n"; |
| 1330 | 1330 | } |
| 1331 | 1331 | } |
@@ -1352,7 +1352,7 @@ discard block |
||
| 1352 | 1352 | try { |
| 1353 | 1353 | $sth = $Connection->db->prepare($query); |
| 1354 | 1354 | $sth->execute(); |
| 1355 | - } catch(PDOException $e) { |
|
| 1355 | + } catch (PDOException $e) { |
|
| 1356 | 1356 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1357 | 1357 | } |
| 1358 | 1358 | return $error; |
@@ -1362,13 +1362,13 @@ discard block |
||
| 1362 | 1362 | global $globalDBdriver, $globalVATSIM, $globalIVAO; |
| 1363 | 1363 | $Connection = new Connection(); |
| 1364 | 1364 | $error = ''; |
| 1365 | - if (!$Connection->checkColumnName('airlines','ban_eu')) { |
|
| 1365 | + if (!$Connection->checkColumnName('airlines', 'ban_eu')) { |
|
| 1366 | 1366 | // Add ban_eu to airlines |
| 1367 | 1367 | $query = "ALTER TABLE airlines ADD ban_eu INTEGER NOT NULL DEFAULT '0'"; |
| 1368 | 1368 | try { |
| 1369 | 1369 | $sth = $Connection->db->prepare($query); |
| 1370 | 1370 | $sth->execute(); |
| 1371 | - } catch(PDOException $e) { |
|
| 1371 | + } catch (PDOException $e) { |
|
| 1372 | 1372 | return "error (add ban_eu column in airlines) : ".$e->getMessage()."\n"; |
| 1373 | 1373 | } |
| 1374 | 1374 | } |
@@ -1376,7 +1376,7 @@ discard block |
||
| 1376 | 1376 | try { |
| 1377 | 1377 | $sth = $Connection->db->prepare($query); |
| 1378 | 1378 | $sth->execute(); |
| 1379 | - } catch(PDOException $e) { |
|
| 1379 | + } catch (PDOException $e) { |
|
| 1380 | 1380 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1381 | 1381 | } |
| 1382 | 1382 | return $error; |
@@ -1387,19 +1387,19 @@ discard block |
||
| 1387 | 1387 | $Connection = new Connection(); |
| 1388 | 1388 | $error = ''; |
| 1389 | 1389 | if ($globalDBdriver == 'mysql') { |
| 1390 | - if ($Connection->getColumnType('spotter_output','date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output','last_seen') != 'TIMESTAMP') { |
|
| 1390 | + if ($Connection->getColumnType('spotter_output', 'date') == 'TIMESTAMP' && $Connection->getColumnType('spotter_output', 'last_seen') != 'TIMESTAMP') { |
|
| 1391 | 1391 | $query = "ALTER TABLE spotter_output CHANGE date date TIMESTAMP NULL DEFAULT NULL"; |
| 1392 | 1392 | try { |
| 1393 | 1393 | $sth = $Connection->db->prepare($query); |
| 1394 | 1394 | $sth->execute(); |
| 1395 | - } catch(PDOException $e) { |
|
| 1395 | + } catch (PDOException $e) { |
|
| 1396 | 1396 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; |
| 1397 | 1397 | } |
| 1398 | 1398 | $query = "ALTER TABLE spotter_output MODIFY COLUMN last_seen timestamp not null default current_timestamp()"; |
| 1399 | 1399 | try { |
| 1400 | 1400 | $sth = $Connection->db->prepare($query); |
| 1401 | 1401 | $sth->execute(); |
| 1402 | - } catch(PDOException $e) { |
|
| 1402 | + } catch (PDOException $e) { |
|
| 1403 | 1403 | return "error (convert spotter_output last_seen to timestamp) : ".$e->getMessage()."\n"; |
| 1404 | 1404 | } |
| 1405 | 1405 | |
@@ -1407,7 +1407,7 @@ discard block |
||
| 1407 | 1407 | try { |
| 1408 | 1408 | $sth = $Connection->db->prepare($query); |
| 1409 | 1409 | $sth->execute(); |
| 1410 | - } catch(PDOException $e) { |
|
| 1410 | + } catch (PDOException $e) { |
|
| 1411 | 1411 | return "error (delete default timestamp spotter_output) : ".$e->getMessage()."\n"; |
| 1412 | 1412 | } |
| 1413 | 1413 | /*$query = "SELECT date,last_seen FROM spotter_output WHERE last_seen < date ORDER BY date DESC LIMIT 150"; |
@@ -1458,7 +1458,7 @@ discard block |
||
| 1458 | 1458 | try { |
| 1459 | 1459 | $sth = $Connection->db->prepare($query); |
| 1460 | 1460 | $sth->execute(); |
| 1461 | - } catch(PDOException $e) { |
|
| 1461 | + } catch (PDOException $e) { |
|
| 1462 | 1462 | return "error (fix date) : ".$e->getMessage()."\n"; |
| 1463 | 1463 | } |
| 1464 | 1464 | } |
@@ -1543,7 +1543,7 @@ discard block |
||
| 1543 | 1543 | try { |
| 1544 | 1544 | $sth = $Connection->db->prepare($query); |
| 1545 | 1545 | $sth->execute(); |
| 1546 | - } catch(PDOException $e) { |
|
| 1546 | + } catch (PDOException $e) { |
|
| 1547 | 1547 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1548 | 1548 | } |
| 1549 | 1549 | return $error; |
@@ -1552,13 +1552,13 @@ discard block |
||
| 1552 | 1552 | global $globalDBdriver; |
| 1553 | 1553 | $Connection = new Connection(); |
| 1554 | 1554 | $error = ''; |
| 1555 | - if (!$Connection->indexExists('accidents','type')) { |
|
| 1555 | + if (!$Connection->indexExists('accidents', 'type')) { |
|
| 1556 | 1556 | // Add index key |
| 1557 | 1557 | $query = "create index type on accidents (type,date)"; |
| 1558 | 1558 | try { |
| 1559 | 1559 | $sth = $Connection->db->prepare($query); |
| 1560 | 1560 | $sth->execute(); |
| 1561 | - } catch(PDOException $e) { |
|
| 1561 | + } catch (PDOException $e) { |
|
| 1562 | 1562 | return "error (add index type on accidents) : ".$e->getMessage()."\n"; |
| 1563 | 1563 | } |
| 1564 | 1564 | } |
@@ -1566,7 +1566,7 @@ discard block |
||
| 1566 | 1566 | try { |
| 1567 | 1567 | $sth = $Connection->db->prepare($query); |
| 1568 | 1568 | $sth->execute(); |
| 1569 | - } catch(PDOException $e) { |
|
| 1569 | + } catch (PDOException $e) { |
|
| 1570 | 1570 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1571 | 1571 | } |
| 1572 | 1572 | return $error; |
@@ -1576,12 +1576,12 @@ discard block |
||
| 1576 | 1576 | global $globalDBdriver; |
| 1577 | 1577 | $Connection = new Connection(); |
| 1578 | 1578 | $error = ''; |
| 1579 | - if (!$Connection->checkColumnName('aircraft_modes','source_type')) { |
|
| 1579 | + if (!$Connection->checkColumnName('aircraft_modes', 'source_type')) { |
|
| 1580 | 1580 | $query = "ALTER TABLE aircraft_modes ADD source_type VARCHAR(255) DEFAULT 'modes'"; |
| 1581 | 1581 | try { |
| 1582 | 1582 | $sth = $Connection->db->prepare($query); |
| 1583 | 1583 | $sth->execute(); |
| 1584 | - } catch(PDOException $e) { |
|
| 1584 | + } catch (PDOException $e) { |
|
| 1585 | 1585 | return "error (add source_type column in aircraft_modes) : ".$e->getMessage()."\n"; |
| 1586 | 1586 | } |
| 1587 | 1587 | } |
@@ -1647,7 +1647,7 @@ discard block |
||
| 1647 | 1647 | try { |
| 1648 | 1648 | $sth = $Connection->db->prepare($query); |
| 1649 | 1649 | $sth->execute(); |
| 1650 | - } catch(PDOException $e) { |
|
| 1650 | + } catch (PDOException $e) { |
|
| 1651 | 1651 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1652 | 1652 | } |
| 1653 | 1653 | return $error; |
@@ -1699,7 +1699,7 @@ discard block |
||
| 1699 | 1699 | try { |
| 1700 | 1700 | $sth = $Connection->db->prepare($query); |
| 1701 | 1701 | $sth->execute(); |
| 1702 | - } catch(PDOException $e) { |
|
| 1702 | + } catch (PDOException $e) { |
|
| 1703 | 1703 | return "error (problem when select engine for spotter_engine) : ".$e->getMessage()."\n"; |
| 1704 | 1704 | } |
| 1705 | 1705 | $row = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -1708,18 +1708,18 @@ discard block |
||
| 1708 | 1708 | try { |
| 1709 | 1709 | $sth = $Connection->db->prepare($query); |
| 1710 | 1710 | $sth->execute(); |
| 1711 | - } catch(PDOException $e) { |
|
| 1711 | + } catch (PDOException $e) { |
|
| 1712 | 1712 | return "error (Change table format from archive to InnoDB for spotter_archive) : ".$e->getMessage()."\n"; |
| 1713 | 1713 | } |
| 1714 | 1714 | } |
| 1715 | 1715 | } |
| 1716 | - if (!$Connection->indexExists('spotter_archive','flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive','flightaware_id')) { |
|
| 1716 | + if (!$Connection->indexExists('spotter_archive', 'flightaware_id_date_idx') && !$Connection->indexExists('spotter_archive', 'flightaware_id')) { |
|
| 1717 | 1717 | // Add index key |
| 1718 | 1718 | $query = "create index flightaware_id_date_idx on spotter_archive (flightaware_id,date)"; |
| 1719 | 1719 | try { |
| 1720 | 1720 | $sth = $Connection->db->prepare($query); |
| 1721 | 1721 | $sth->execute(); |
| 1722 | - } catch(PDOException $e) { |
|
| 1722 | + } catch (PDOException $e) { |
|
| 1723 | 1723 | return "error (add index flightaware_id, date on spotter_archive) : ".$e->getMessage()."\n"; |
| 1724 | 1724 | } |
| 1725 | 1725 | } |
@@ -1727,7 +1727,7 @@ discard block |
||
| 1727 | 1727 | try { |
| 1728 | 1728 | $sth = $Connection->db->prepare($query); |
| 1729 | 1729 | $sth->execute(); |
| 1730 | - } catch(PDOException $e) { |
|
| 1730 | + } catch (PDOException $e) { |
|
| 1731 | 1731 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1732 | 1732 | } |
| 1733 | 1733 | return $error; |
@@ -1738,148 +1738,148 @@ discard block |
||
| 1738 | 1738 | $Connection = new Connection(); |
| 1739 | 1739 | $error = ''; |
| 1740 | 1740 | if ($globalDBdriver == 'mysql') { |
| 1741 | - if (!$Connection->checkColumnName('marine_output','type_id')) { |
|
| 1741 | + if (!$Connection->checkColumnName('marine_output', 'type_id')) { |
|
| 1742 | 1742 | $query = "ALTER TABLE marine_output ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1743 | 1743 | try { |
| 1744 | 1744 | $sth = $Connection->db->prepare($query); |
| 1745 | 1745 | $sth->execute(); |
| 1746 | - } catch(PDOException $e) { |
|
| 1746 | + } catch (PDOException $e) { |
|
| 1747 | 1747 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; |
| 1748 | 1748 | } |
| 1749 | 1749 | } |
| 1750 | - if (!$Connection->checkColumnName('marine_live','type_id')) { |
|
| 1750 | + if (!$Connection->checkColumnName('marine_live', 'type_id')) { |
|
| 1751 | 1751 | $query = "ALTER TABLE marine_live ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1752 | 1752 | try { |
| 1753 | 1753 | $sth = $Connection->db->prepare($query); |
| 1754 | 1754 | $sth->execute(); |
| 1755 | - } catch(PDOException $e) { |
|
| 1755 | + } catch (PDOException $e) { |
|
| 1756 | 1756 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; |
| 1757 | 1757 | } |
| 1758 | 1758 | } |
| 1759 | - if (!$Connection->checkColumnName('marine_archive','type_id')) { |
|
| 1759 | + if (!$Connection->checkColumnName('marine_archive', 'type_id')) { |
|
| 1760 | 1760 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1761 | 1761 | try { |
| 1762 | 1762 | $sth = $Connection->db->prepare($query); |
| 1763 | 1763 | $sth->execute(); |
| 1764 | - } catch(PDOException $e) { |
|
| 1764 | + } catch (PDOException $e) { |
|
| 1765 | 1765 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1766 | 1766 | } |
| 1767 | 1767 | } |
| 1768 | - if (!$Connection->checkColumnName('marine_archive_output','type_id')) { |
|
| 1768 | + if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { |
|
| 1769 | 1769 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id int(11) DEFAULT NULL"; |
| 1770 | 1770 | try { |
| 1771 | 1771 | $sth = $Connection->db->prepare($query); |
| 1772 | 1772 | $sth->execute(); |
| 1773 | - } catch(PDOException $e) { |
|
| 1773 | + } catch (PDOException $e) { |
|
| 1774 | 1774 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1775 | 1775 | } |
| 1776 | 1776 | } |
| 1777 | - if (!$Connection->checkColumnName('marine_output','status_id')) { |
|
| 1777 | + if (!$Connection->checkColumnName('marine_output', 'status_id')) { |
|
| 1778 | 1778 | $query = "ALTER TABLE marine_output ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1779 | 1779 | try { |
| 1780 | 1780 | $sth = $Connection->db->prepare($query); |
| 1781 | 1781 | $sth->execute(); |
| 1782 | - } catch(PDOException $e) { |
|
| 1782 | + } catch (PDOException $e) { |
|
| 1783 | 1783 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; |
| 1784 | 1784 | } |
| 1785 | 1785 | } |
| 1786 | - if (!$Connection->checkColumnName('marine_live','status_id')) { |
|
| 1786 | + if (!$Connection->checkColumnName('marine_live', 'status_id')) { |
|
| 1787 | 1787 | $query = "ALTER TABLE marine_live ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1788 | 1788 | try { |
| 1789 | 1789 | $sth = $Connection->db->prepare($query); |
| 1790 | 1790 | $sth->execute(); |
| 1791 | - } catch(PDOException $e) { |
|
| 1791 | + } catch (PDOException $e) { |
|
| 1792 | 1792 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; |
| 1793 | 1793 | } |
| 1794 | 1794 | } |
| 1795 | - if (!$Connection->checkColumnName('marine_archive','status_id')) { |
|
| 1795 | + if (!$Connection->checkColumnName('marine_archive', 'status_id')) { |
|
| 1796 | 1796 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1797 | 1797 | try { |
| 1798 | 1798 | $sth = $Connection->db->prepare($query); |
| 1799 | 1799 | $sth->execute(); |
| 1800 | - } catch(PDOException $e) { |
|
| 1800 | + } catch (PDOException $e) { |
|
| 1801 | 1801 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1802 | 1802 | } |
| 1803 | 1803 | } |
| 1804 | - if (!$Connection->checkColumnName('marine_archive_output','status_id')) { |
|
| 1804 | + if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { |
|
| 1805 | 1805 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id int(11) DEFAULT NULL"; |
| 1806 | 1806 | try { |
| 1807 | 1807 | $sth = $Connection->db->prepare($query); |
| 1808 | 1808 | $sth->execute(); |
| 1809 | - } catch(PDOException $e) { |
|
| 1809 | + } catch (PDOException $e) { |
|
| 1810 | 1810 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1811 | 1811 | } |
| 1812 | 1812 | } |
| 1813 | 1813 | } else { |
| 1814 | - if (!$Connection->checkColumnName('marine_output','type_id')) { |
|
| 1814 | + if (!$Connection->checkColumnName('marine_output', 'type_id')) { |
|
| 1815 | 1815 | $query = "ALTER TABLE marine_output ADD COLUMN type_id integer DEFAULT NULL"; |
| 1816 | 1816 | try { |
| 1817 | 1817 | $sth = $Connection->db->prepare($query); |
| 1818 | 1818 | $sth->execute(); |
| 1819 | - } catch(PDOException $e) { |
|
| 1819 | + } catch (PDOException $e) { |
|
| 1820 | 1820 | return "error (add column type_id in marine_output) : ".$e->getMessage()."\n"; |
| 1821 | 1821 | } |
| 1822 | 1822 | } |
| 1823 | - if (!$Connection->checkColumnName('marine_live','type_id')) { |
|
| 1823 | + if (!$Connection->checkColumnName('marine_live', 'type_id')) { |
|
| 1824 | 1824 | $query = "ALTER TABLE marine_live ADD COLUMN type_id integer DEFAULT NULL"; |
| 1825 | 1825 | try { |
| 1826 | 1826 | $sth = $Connection->db->prepare($query); |
| 1827 | 1827 | $sth->execute(); |
| 1828 | - } catch(PDOException $e) { |
|
| 1828 | + } catch (PDOException $e) { |
|
| 1829 | 1829 | return "error (add column type_id in marine_live) : ".$e->getMessage()."\n"; |
| 1830 | 1830 | } |
| 1831 | 1831 | } |
| 1832 | - if (!$Connection->checkColumnName('marine_archive','type_id')) { |
|
| 1832 | + if (!$Connection->checkColumnName('marine_archive', 'type_id')) { |
|
| 1833 | 1833 | $query = "ALTER TABLE marine_archive ADD COLUMN type_id integer DEFAULT NULL"; |
| 1834 | 1834 | try { |
| 1835 | 1835 | $sth = $Connection->db->prepare($query); |
| 1836 | 1836 | $sth->execute(); |
| 1837 | - } catch(PDOException $e) { |
|
| 1837 | + } catch (PDOException $e) { |
|
| 1838 | 1838 | return "error (add column type_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1839 | 1839 | } |
| 1840 | 1840 | } |
| 1841 | - if (!$Connection->checkColumnName('marine_archive_output','type_id')) { |
|
| 1841 | + if (!$Connection->checkColumnName('marine_archive_output', 'type_id')) { |
|
| 1842 | 1842 | $query = "ALTER TABLE marine_archive_output ADD COLUMN type_id integer DEFAULT NULL"; |
| 1843 | 1843 | try { |
| 1844 | 1844 | $sth = $Connection->db->prepare($query); |
| 1845 | 1845 | $sth->execute(); |
| 1846 | - } catch(PDOException $e) { |
|
| 1846 | + } catch (PDOException $e) { |
|
| 1847 | 1847 | return "error (add column type_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1848 | 1848 | } |
| 1849 | 1849 | } |
| 1850 | - if (!$Connection->checkColumnName('marine_output','status_id')) { |
|
| 1850 | + if (!$Connection->checkColumnName('marine_output', 'status_id')) { |
|
| 1851 | 1851 | $query = "ALTER TABLE marine_output ADD COLUMN status_id integer DEFAULT NULL"; |
| 1852 | 1852 | try { |
| 1853 | 1853 | $sth = $Connection->db->prepare($query); |
| 1854 | 1854 | $sth->execute(); |
| 1855 | - } catch(PDOException $e) { |
|
| 1855 | + } catch (PDOException $e) { |
|
| 1856 | 1856 | return "error (add column status_id in marine_output) : ".$e->getMessage()."\n"; |
| 1857 | 1857 | } |
| 1858 | 1858 | } |
| 1859 | - if (!$Connection->checkColumnName('marine_live','status_id')) { |
|
| 1859 | + if (!$Connection->checkColumnName('marine_live', 'status_id')) { |
|
| 1860 | 1860 | $query = "ALTER TABLE marine_live ADD COLUMN status_id integer DEFAULT NULL"; |
| 1861 | 1861 | try { |
| 1862 | 1862 | $sth = $Connection->db->prepare($query); |
| 1863 | 1863 | $sth->execute(); |
| 1864 | - } catch(PDOException $e) { |
|
| 1864 | + } catch (PDOException $e) { |
|
| 1865 | 1865 | return "error (add column status_id in marine_live) : ".$e->getMessage()."\n"; |
| 1866 | 1866 | } |
| 1867 | 1867 | } |
| 1868 | - if (!$Connection->checkColumnName('marine_archive','status_id')) { |
|
| 1868 | + if (!$Connection->checkColumnName('marine_archive', 'status_id')) { |
|
| 1869 | 1869 | $query = "ALTER TABLE marine_archive ADD COLUMN status_id integer DEFAULT NULL"; |
| 1870 | 1870 | try { |
| 1871 | 1871 | $sth = $Connection->db->prepare($query); |
| 1872 | 1872 | $sth->execute(); |
| 1873 | - } catch(PDOException $e) { |
|
| 1873 | + } catch (PDOException $e) { |
|
| 1874 | 1874 | return "error (add column status_id in marine_archive) : ".$e->getMessage()."\n"; |
| 1875 | 1875 | } |
| 1876 | 1876 | } |
| 1877 | - if (!$Connection->checkColumnName('marine_archive_output','status_id')) { |
|
| 1877 | + if (!$Connection->checkColumnName('marine_archive_output', 'status_id')) { |
|
| 1878 | 1878 | $query = "ALTER TABLE marine_archive_output ADD COLUMN status_id integer DEFAULT NULL"; |
| 1879 | 1879 | try { |
| 1880 | 1880 | $sth = $Connection->db->prepare($query); |
| 1881 | 1881 | $sth->execute(); |
| 1882 | - } catch(PDOException $e) { |
|
| 1882 | + } catch (PDOException $e) { |
|
| 1883 | 1883 | return "error (add column status_id in marine_archive_output) : ".$e->getMessage()."\n"; |
| 1884 | 1884 | } |
| 1885 | 1885 | } |
@@ -1888,7 +1888,7 @@ discard block |
||
| 1888 | 1888 | try { |
| 1889 | 1889 | $sth = $Connection->db->prepare($query); |
| 1890 | 1890 | $sth->execute(); |
| 1891 | - } catch(PDOException $e) { |
|
| 1891 | + } catch (PDOException $e) { |
|
| 1892 | 1892 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1893 | 1893 | } |
| 1894 | 1894 | return $error; |
@@ -1903,14 +1903,14 @@ discard block |
||
| 1903 | 1903 | try { |
| 1904 | 1904 | $sth = $Connection->db->prepare($query); |
| 1905 | 1905 | $sth->execute(); |
| 1906 | - } catch(PDOException $e) { |
|
| 1906 | + } catch (PDOException $e) { |
|
| 1907 | 1907 | return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n"; |
| 1908 | 1908 | } |
| 1909 | 1909 | $query = "ALTER TABLE marine_identity MODIFY COLUMN mmsi varchar(255) DEFAULT NULL"; |
| 1910 | 1910 | try { |
| 1911 | 1911 | $sth = $Connection->db->prepare($query); |
| 1912 | 1912 | $sth->execute(); |
| 1913 | - } catch(PDOException $e) { |
|
| 1913 | + } catch (PDOException $e) { |
|
| 1914 | 1914 | return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n"; |
| 1915 | 1915 | } |
| 1916 | 1916 | } else { |
@@ -1918,14 +1918,14 @@ discard block |
||
| 1918 | 1918 | try { |
| 1919 | 1919 | $sth = $Connection->db->prepare($query); |
| 1920 | 1920 | $sth->execute(); |
| 1921 | - } catch(PDOException $e) { |
|
| 1921 | + } catch (PDOException $e) { |
|
| 1922 | 1922 | return "error (change pilot_id type to varchar in stats_pilot) : ".$e->getMessage()."\n"; |
| 1923 | 1923 | } |
| 1924 | 1924 | $query = "alter table marine_identity alter column mmsi type varchar(255)"; |
| 1925 | 1925 | try { |
| 1926 | 1926 | $sth = $Connection->db->prepare($query); |
| 1927 | 1927 | $sth->execute(); |
| 1928 | - } catch(PDOException $e) { |
|
| 1928 | + } catch (PDOException $e) { |
|
| 1929 | 1929 | return "error (change mmsi type to varchar in marine_identity) : ".$e->getMessage()."\n"; |
| 1930 | 1930 | } |
| 1931 | 1931 | } |
@@ -1933,7 +1933,7 @@ discard block |
||
| 1933 | 1933 | try { |
| 1934 | 1934 | $sth = $Connection->db->prepare($query); |
| 1935 | 1935 | $sth->execute(); |
| 1936 | - } catch(PDOException $e) { |
|
| 1936 | + } catch (PDOException $e) { |
|
| 1937 | 1937 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1938 | 1938 | } |
| 1939 | 1939 | return $error; |
@@ -1943,32 +1943,32 @@ discard block |
||
| 1943 | 1943 | global $globalDBdriver; |
| 1944 | 1944 | $Connection = new Connection(); |
| 1945 | 1945 | $error = ''; |
| 1946 | - if (!$Connection->checkColumnName('source_location','last_seen')) { |
|
| 1946 | + if (!$Connection->checkColumnName('source_location', 'last_seen')) { |
|
| 1947 | 1947 | $query = "ALTER TABLE source_location ADD COLUMN last_seen timestamp NULL DEFAULT NULL"; |
| 1948 | 1948 | try { |
| 1949 | 1949 | $sth = $Connection->db->prepare($query); |
| 1950 | 1950 | $sth->execute(); |
| 1951 | - } catch(PDOException $e) { |
|
| 1951 | + } catch (PDOException $e) { |
|
| 1952 | 1952 | return "error (add column last_seen in source_location) : ".$e->getMessage()."\n"; |
| 1953 | 1953 | } |
| 1954 | 1954 | } |
| 1955 | 1955 | if ($globalDBdriver == 'mysql') { |
| 1956 | - if (!$Connection->checkColumnName('source_location','location_id')) { |
|
| 1956 | + if (!$Connection->checkColumnName('source_location', 'location_id')) { |
|
| 1957 | 1957 | $query = "ALTER TABLE source_location ADD COLUMN location_id int(11) DEFAULT NULL"; |
| 1958 | 1958 | try { |
| 1959 | 1959 | $sth = $Connection->db->prepare($query); |
| 1960 | 1960 | $sth->execute(); |
| 1961 | - } catch(PDOException $e) { |
|
| 1961 | + } catch (PDOException $e) { |
|
| 1962 | 1962 | return "error (add column location_id in source_location) : ".$e->getMessage()."\n"; |
| 1963 | 1963 | } |
| 1964 | 1964 | } |
| 1965 | 1965 | } else { |
| 1966 | - if (!$Connection->checkColumnName('source_location','location_id')) { |
|
| 1966 | + if (!$Connection->checkColumnName('source_location', 'location_id')) { |
|
| 1967 | 1967 | $query = "ALTER TABLE source_location ADD COLUMN location_id integer DEFAULT NULL"; |
| 1968 | 1968 | try { |
| 1969 | 1969 | $sth = $Connection->db->prepare($query); |
| 1970 | 1970 | $sth->execute(); |
| 1971 | - } catch(PDOException $e) { |
|
| 1971 | + } catch (PDOException $e) { |
|
| 1972 | 1972 | return "error (add column location_id in source_location) : ".$e->getMessage()."\n"; |
| 1973 | 1973 | } |
| 1974 | 1974 | } |
@@ -1977,7 +1977,7 @@ discard block |
||
| 1977 | 1977 | try { |
| 1978 | 1978 | $sth = $Connection->db->prepare($query); |
| 1979 | 1979 | $sth->execute(); |
| 1980 | - } catch(PDOException $e) { |
|
| 1980 | + } catch (PDOException $e) { |
|
| 1981 | 1981 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 1982 | 1982 | } |
| 1983 | 1983 | return $error; |
@@ -1987,12 +1987,12 @@ discard block |
||
| 1987 | 1987 | global $globalDBdriver; |
| 1988 | 1988 | $Connection = new Connection(); |
| 1989 | 1989 | $error = ''; |
| 1990 | - if (!$Connection->checkColumnName('source_location','description')) { |
|
| 1990 | + if (!$Connection->checkColumnName('source_location', 'description')) { |
|
| 1991 | 1991 | $query = "ALTER TABLE source_location ADD COLUMN description text DEFAULT NULL"; |
| 1992 | 1992 | try { |
| 1993 | 1993 | $sth = $Connection->db->prepare($query); |
| 1994 | 1994 | $sth->execute(); |
| 1995 | - } catch(PDOException $e) { |
|
| 1995 | + } catch (PDOException $e) { |
|
| 1996 | 1996 | return "error (add column description in source_location) : ".$e->getMessage()."\n"; |
| 1997 | 1997 | } |
| 1998 | 1998 | } |
@@ -2000,7 +2000,7 @@ discard block |
||
| 2000 | 2000 | try { |
| 2001 | 2001 | $sth = $Connection->db->prepare($query); |
| 2002 | 2002 | $sth->execute(); |
| 2003 | - } catch(PDOException $e) { |
|
| 2003 | + } catch (PDOException $e) { |
|
| 2004 | 2004 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2005 | 2005 | } |
| 2006 | 2006 | return $error; |
@@ -2010,39 +2010,39 @@ discard block |
||
| 2010 | 2010 | global $globalDBdriver; |
| 2011 | 2011 | $Connection = new Connection(); |
| 2012 | 2012 | $error = ''; |
| 2013 | - if (!$Connection->checkColumnName('spotter_live','real_altitude')) { |
|
| 2013 | + if (!$Connection->checkColumnName('spotter_live', 'real_altitude')) { |
|
| 2014 | 2014 | $query = "ALTER TABLE spotter_live ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2015 | 2015 | try { |
| 2016 | 2016 | $sth = $Connection->db->prepare($query); |
| 2017 | 2017 | $sth->execute(); |
| 2018 | - } catch(PDOException $e) { |
|
| 2018 | + } catch (PDOException $e) { |
|
| 2019 | 2019 | return "error (add column real_altitude in spotter_live) : ".$e->getMessage()."\n"; |
| 2020 | 2020 | } |
| 2021 | 2021 | } |
| 2022 | - if (!$Connection->checkColumnName('spotter_output','real_altitude')) { |
|
| 2022 | + if (!$Connection->checkColumnName('spotter_output', 'real_altitude')) { |
|
| 2023 | 2023 | $query = "ALTER TABLE spotter_output ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2024 | 2024 | try { |
| 2025 | 2025 | $sth = $Connection->db->prepare($query); |
| 2026 | 2026 | $sth->execute(); |
| 2027 | - } catch(PDOException $e) { |
|
| 2027 | + } catch (PDOException $e) { |
|
| 2028 | 2028 | return "error (add column real_altitude in spotter_output) : ".$e->getMessage()."\n"; |
| 2029 | 2029 | } |
| 2030 | 2030 | } |
| 2031 | - if (!$Connection->checkColumnName('spotter_archive_output','real_altitude')) { |
|
| 2031 | + if (!$Connection->checkColumnName('spotter_archive_output', 'real_altitude')) { |
|
| 2032 | 2032 | $query = "ALTER TABLE spotter_archive_output ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2033 | 2033 | try { |
| 2034 | 2034 | $sth = $Connection->db->prepare($query); |
| 2035 | 2035 | $sth->execute(); |
| 2036 | - } catch(PDOException $e) { |
|
| 2036 | + } catch (PDOException $e) { |
|
| 2037 | 2037 | return "error (add column real_altitude in spotter_archive_output) : ".$e->getMessage()."\n"; |
| 2038 | 2038 | } |
| 2039 | 2039 | } |
| 2040 | - if (!$Connection->checkColumnName('spotter_archive','real_altitude')) { |
|
| 2040 | + if (!$Connection->checkColumnName('spotter_archive', 'real_altitude')) { |
|
| 2041 | 2041 | $query = "ALTER TABLE spotter_archive ADD COLUMN real_altitude float DEFAULT NULL"; |
| 2042 | 2042 | try { |
| 2043 | 2043 | $sth = $Connection->db->prepare($query); |
| 2044 | 2044 | $sth->execute(); |
| 2045 | - } catch(PDOException $e) { |
|
| 2045 | + } catch (PDOException $e) { |
|
| 2046 | 2046 | return "error (add column real_altitude in spotter_archive) : ".$e->getMessage()."\n"; |
| 2047 | 2047 | } |
| 2048 | 2048 | } |
@@ -2050,7 +2050,7 @@ discard block |
||
| 2050 | 2050 | try { |
| 2051 | 2051 | $sth = $Connection->db->prepare($query); |
| 2052 | 2052 | $sth->execute(); |
| 2053 | - } catch(PDOException $e) { |
|
| 2053 | + } catch (PDOException $e) { |
|
| 2054 | 2054 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2055 | 2055 | } |
| 2056 | 2056 | return $error; |
@@ -2072,14 +2072,14 @@ discard block |
||
| 2072 | 2072 | try { |
| 2073 | 2073 | $sth = $Connection->db->prepare($query); |
| 2074 | 2074 | $sth->execute(); |
| 2075 | - } catch(PDOException $e) { |
|
| 2075 | + } catch (PDOException $e) { |
|
| 2076 | 2076 | return "error (modify column altitude in tracker_*) : ".$e->getMessage()."\n"; |
| 2077 | 2077 | } |
| 2078 | 2078 | $query = "UPDATE config SET value = '44' WHERE name = 'schema_version'"; |
| 2079 | 2079 | try { |
| 2080 | 2080 | $sth = $Connection->db->prepare($query); |
| 2081 | 2081 | $sth->execute(); |
| 2082 | - } catch(PDOException $e) { |
|
| 2082 | + } catch (PDOException $e) { |
|
| 2083 | 2083 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2084 | 2084 | } |
| 2085 | 2085 | return $error; |
@@ -2120,7 +2120,7 @@ discard block |
||
| 2120 | 2120 | try { |
| 2121 | 2121 | $sth = $Connection->db->prepare($query); |
| 2122 | 2122 | $sth->execute(); |
| 2123 | - } catch(PDOException $e) { |
|
| 2123 | + } catch (PDOException $e) { |
|
| 2124 | 2124 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2125 | 2125 | } |
| 2126 | 2126 | return $error; |
@@ -2143,7 +2143,7 @@ discard block |
||
| 2143 | 2143 | try { |
| 2144 | 2144 | $sth = $Connection->db->prepare($query); |
| 2145 | 2145 | $sth->execute(); |
| 2146 | - } catch(PDOException $e) { |
|
| 2146 | + } catch (PDOException $e) { |
|
| 2147 | 2147 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2148 | 2148 | } |
| 2149 | 2149 | return $error; |
@@ -2193,7 +2193,7 @@ discard block |
||
| 2193 | 2193 | try { |
| 2194 | 2194 | $sth = $Connection->db->prepare($query); |
| 2195 | 2195 | $sth->execute(); |
| 2196 | - } catch(PDOException $e) { |
|
| 2196 | + } catch (PDOException $e) { |
|
| 2197 | 2197 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2198 | 2198 | } |
| 2199 | 2199 | return $error; |
@@ -2216,7 +2216,7 @@ discard block |
||
| 2216 | 2216 | try { |
| 2217 | 2217 | $sth = $Connection->db->prepare($query); |
| 2218 | 2218 | $sth->execute(); |
| 2219 | - } catch(PDOException $e) { |
|
| 2219 | + } catch (PDOException $e) { |
|
| 2220 | 2220 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2221 | 2221 | } |
| 2222 | 2222 | return $error; |
@@ -2239,7 +2239,7 @@ discard block |
||
| 2239 | 2239 | try { |
| 2240 | 2240 | $sth = $Connection->db->prepare($query); |
| 2241 | 2241 | $sth->execute(); |
| 2242 | - } catch(PDOException $e) { |
|
| 2242 | + } catch (PDOException $e) { |
|
| 2243 | 2243 | return "error (update schema_version) : ".$e->getMessage()."\n"; |
| 2244 | 2244 | } |
| 2245 | 2245 | return $error; |
@@ -2262,7 +2262,7 @@ discard block |
||
| 2262 | 2262 | try { |
| 2263 | 2263 | $sth = $Connection->db->prepare($query); |
| 2264 | 2264 | $sth->execute(); |
| 2265 | - } catch(PDOException $e) { |
|
| 2265 | + } catch (PDOException $e) { |
|
| 2266 | 2266 | return "error (check_version): ".$e->getMessage()."\n"; |
| 2267 | 2267 | } |
| 2268 | 2268 | $result = $sth->fetch(PDO::FETCH_ASSOC); |
@@ -258,7 +258,9 @@ discard block |
||
| 258 | 258 | // Update table countries |
| 259 | 259 | if ($Connection->tableExists('airspace')) { |
| 260 | 260 | $error .= update_db::update_countries(); |
| 261 | - if ($error != '') return $error; |
|
| 261 | + if ($error != '') { |
|
| 262 | + return $error; |
|
| 263 | + } |
|
| 262 | 264 | } |
| 263 | 265 | // Update schema_version to 7 |
| 264 | 266 | $query = "UPDATE `config` SET `value` = '7' WHERE `name` = 'schema_version'"; |
@@ -314,7 +316,9 @@ discard block |
||
| 314 | 316 | $error = ''; |
| 315 | 317 | // Update table aircraft |
| 316 | 318 | $error .= create_db::import_file('../db/source_location.sql'); |
| 317 | - if ($error != '') return $error; |
|
| 319 | + if ($error != '') { |
|
| 320 | + return $error; |
|
| 321 | + } |
|
| 318 | 322 | // Update schema_version to 6 |
| 319 | 323 | $query = "UPDATE `config` SET `value` = '8' WHERE `name` = 'schema_version'"; |
| 320 | 324 | try { |
@@ -331,7 +335,9 @@ discard block |
||
| 331 | 335 | $error = ''; |
| 332 | 336 | // Update table aircraft |
| 333 | 337 | $error .= create_db::import_file('../db/notam.sql'); |
| 334 | - if ($error != '') return $error; |
|
| 338 | + if ($error != '') { |
|
| 339 | + return $error; |
|
| 340 | + } |
|
| 335 | 341 | $query = "DELETE FROM config WHERE name = 'last_update_db'; |
| 336 | 342 | INSERT INTO config (name,value) VALUES ('last_update_db',NOW()); |
| 337 | 343 | DELETE FROM config WHERE name = 'last_update_notam_db'; |
@@ -365,7 +371,9 @@ discard block |
||
| 365 | 371 | $error = ''; |
| 366 | 372 | // Update table atc |
| 367 | 373 | $error .= create_db::import_file('../db/atc.sql'); |
| 368 | - if ($error != '') return $error; |
|
| 374 | + if ($error != '') { |
|
| 375 | + return $error; |
|
| 376 | + } |
|
| 369 | 377 | |
| 370 | 378 | $query = "UPDATE `config` SET `value` = '10' WHERE `name` = 'schema_version'"; |
| 371 | 379 | try { |
@@ -389,13 +397,21 @@ discard block |
||
| 389 | 397 | $error = ''; |
| 390 | 398 | // Add tables |
| 391 | 399 | $error .= create_db::import_file('../db/aircraft_owner.sql'); |
| 392 | - if ($error != '') return $error; |
|
| 400 | + if ($error != '') { |
|
| 401 | + return $error; |
|
| 402 | + } |
|
| 393 | 403 | $error .= create_db::import_file('../db/metar.sql'); |
| 394 | - if ($error != '') return $error; |
|
| 404 | + if ($error != '') { |
|
| 405 | + return $error; |
|
| 406 | + } |
|
| 395 | 407 | $error .= create_db::import_file('../db/taf.sql'); |
| 396 | - if ($error != '') return $error; |
|
| 408 | + if ($error != '') { |
|
| 409 | + return $error; |
|
| 410 | + } |
|
| 397 | 411 | $error .= create_db::import_file('../db/airport.sql'); |
| 398 | - if ($error != '') return $error; |
|
| 412 | + if ($error != '') { |
|
| 413 | + return $error; |
|
| 414 | + } |
|
| 399 | 415 | |
| 400 | 416 | $query = "UPDATE `config` SET `value` = '11' WHERE `name` = 'schema_version'"; |
| 401 | 417 | try { |
@@ -469,19 +485,33 @@ discard block |
||
| 469 | 485 | $error = ''; |
| 470 | 486 | // Add tables |
| 471 | 487 | $error .= create_db::import_file('../db/stats.sql'); |
| 472 | - if ($error != '') return $error; |
|
| 488 | + if ($error != '') { |
|
| 489 | + return $error; |
|
| 490 | + } |
|
| 473 | 491 | $error .= create_db::import_file('../db/stats_aircraft.sql'); |
| 474 | - if ($error != '') return $error; |
|
| 492 | + if ($error != '') { |
|
| 493 | + return $error; |
|
| 494 | + } |
|
| 475 | 495 | $error .= create_db::import_file('../db/stats_airline.sql'); |
| 476 | - if ($error != '') return $error; |
|
| 496 | + if ($error != '') { |
|
| 497 | + return $error; |
|
| 498 | + } |
|
| 477 | 499 | $error .= create_db::import_file('../db/stats_airport.sql'); |
| 478 | - if ($error != '') return $error; |
|
| 500 | + if ($error != '') { |
|
| 501 | + return $error; |
|
| 502 | + } |
|
| 479 | 503 | $error .= create_db::import_file('../db/stats_owner.sql'); |
| 480 | - if ($error != '') return $error; |
|
| 504 | + if ($error != '') { |
|
| 505 | + return $error; |
|
| 506 | + } |
|
| 481 | 507 | $error .= create_db::import_file('../db/stats_pilot.sql'); |
| 482 | - if ($error != '') return $error; |
|
| 508 | + if ($error != '') { |
|
| 509 | + return $error; |
|
| 510 | + } |
|
| 483 | 511 | $error .= create_db::import_file('../db/spotter_archive_output.sql'); |
| 484 | - if ($error != '') return $error; |
|
| 512 | + if ($error != '') { |
|
| 513 | + return $error; |
|
| 514 | + } |
|
| 485 | 515 | |
| 486 | 516 | $query = "UPDATE `config` SET `value` = '13' WHERE `name` = 'schema_version'"; |
| 487 | 517 | try { |
@@ -521,7 +551,9 @@ discard block |
||
| 521 | 551 | // Add tables |
| 522 | 552 | if (!$Connection->tableExists('stats_flight')) { |
| 523 | 553 | $error .= create_db::import_file('../db/stats_flight.sql'); |
| 524 | - if ($error != '') return $error; |
|
| 554 | + if ($error != '') { |
|
| 555 | + return $error; |
|
| 556 | + } |
|
| 525 | 557 | } |
| 526 | 558 | $query = "UPDATE `config` SET `value` = '15' WHERE `name` = 'schema_version'"; |
| 527 | 559 | try { |
@@ -545,7 +577,9 @@ discard block |
||
| 545 | 577 | } catch(PDOException $e) { |
| 546 | 578 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 547 | 579 | } |
| 548 | - if ($error != '') return $error; |
|
| 580 | + if ($error != '') { |
|
| 581 | + return $error; |
|
| 582 | + } |
|
| 549 | 583 | $query = "UPDATE `config` SET `value` = '16' WHERE `name` = 'schema_version'"; |
| 550 | 584 | try { |
| 551 | 585 | $sth = $Connection->db->prepare($query); |
@@ -566,7 +600,9 @@ discard block |
||
| 566 | 600 | if (!$Connection->tableExists('stats_callsign')) { |
| 567 | 601 | $error .= create_db::import_file('../db/stats_callsign.sql'); |
| 568 | 602 | } |
| 569 | - if ($error != '') return $error; |
|
| 603 | + if ($error != '') { |
|
| 604 | + return $error; |
|
| 605 | + } |
|
| 570 | 606 | $query = "UPDATE `config` SET `value` = '17' WHERE `name` = 'schema_version'"; |
| 571 | 607 | try { |
| 572 | 608 | $sth = $Connection->db->prepare($query); |
@@ -584,7 +620,9 @@ discard block |
||
| 584 | 620 | if (!$Connection->tableExists('stats_country')) { |
| 585 | 621 | $error .= create_db::import_file('../db/stats_country.sql'); |
| 586 | 622 | } |
| 587 | - if ($error != '') return $error; |
|
| 623 | + if ($error != '') { |
|
| 624 | + return $error; |
|
| 625 | + } |
|
| 588 | 626 | $query = "UPDATE `config` SET `value` = '18' WHERE `name` = 'schema_version'"; |
| 589 | 627 | try { |
| 590 | 628 | $sth = $Connection->db->prepare($query); |
@@ -607,7 +645,9 @@ discard block |
||
| 607 | 645 | return "error (update stats) : ".$e->getMessage()."\n"; |
| 608 | 646 | } |
| 609 | 647 | } |
| 610 | - if ($error != '') return $error; |
|
| 648 | + if ($error != '') { |
|
| 649 | + return $error; |
|
| 650 | + } |
|
| 611 | 651 | $query = "UPDATE `config` SET `value` = '19' WHERE `name` = 'schema_version'"; |
| 612 | 652 | try { |
| 613 | 653 | $sth = $Connection->db->prepare($query); |
@@ -623,7 +663,9 @@ discard block |
||
| 623 | 663 | $error = ''; |
| 624 | 664 | // Update airport table |
| 625 | 665 | $error .= create_db::import_file('../db/airport.sql'); |
| 626 | - if ($error != '') return 'Import airport.sql : '.$error; |
|
| 666 | + if ($error != '') { |
|
| 667 | + return 'Import airport.sql : '.$error; |
|
| 668 | + } |
|
| 627 | 669 | // Remove primary key on Spotter_Archive |
| 628 | 670 | $query = "alter table spotter_archive drop spotter_archive_id"; |
| 629 | 671 | try { |
@@ -699,7 +741,9 @@ discard block |
||
| 699 | 741 | return "error (add source_name column) : ".$e->getMessage()."\n"; |
| 700 | 742 | } |
| 701 | 743 | } |
| 702 | - if ($error != '') return $error; |
|
| 744 | + if ($error != '') { |
|
| 745 | + return $error; |
|
| 746 | + } |
|
| 703 | 747 | $query = "UPDATE `config` SET `value` = '20' WHERE `name` = 'schema_version'"; |
| 704 | 748 | try { |
| 705 | 749 | $sth = $Connection->db->prepare($query); |
@@ -717,7 +761,9 @@ discard block |
||
| 717 | 761 | // Update airline table |
| 718 | 762 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 719 | 763 | $error .= create_db::import_file('../db/airlines.sql'); |
| 720 | - if ($error != '') return 'Import airlines.sql : '.$error; |
|
| 764 | + if ($error != '') { |
|
| 765 | + return 'Import airlines.sql : '.$error; |
|
| 766 | + } |
|
| 721 | 767 | } |
| 722 | 768 | if (!$Connection->checkColumnName('aircraft_modes','type_flight')) { |
| 723 | 769 | // Add column over_country |
@@ -729,7 +775,9 @@ discard block |
||
| 729 | 775 | return "error (add over_country) : ".$e->getMessage()."\n"; |
| 730 | 776 | } |
| 731 | 777 | } |
| 732 | - if ($error != '') return $error; |
|
| 778 | + if ($error != '') { |
|
| 779 | + return $error; |
|
| 780 | + } |
|
| 733 | 781 | /* |
| 734 | 782 | if (!$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 735 | 783 | // Force update ModeS (this will put type_flight data |
@@ -759,7 +807,9 @@ discard block |
||
| 759 | 807 | } catch(PDOException $e) { |
| 760 | 808 | return "error (rename type to stats_type on stats*) : ".$e->getMessage()."\n"; |
| 761 | 809 | } |
| 762 | - if ($error != '') return $error; |
|
| 810 | + if ($error != '') { |
|
| 811 | + return $error; |
|
| 812 | + } |
|
| 763 | 813 | } |
| 764 | 814 | $query = "UPDATE `config` SET `value` = '22' WHERE `name` = 'schema_version'"; |
| 765 | 815 | try { |
@@ -782,7 +832,9 @@ discard block |
||
| 782 | 832 | } else { |
| 783 | 833 | $error .= create_db::import_file('../db/pgsql/stats_source.sql'); |
| 784 | 834 | } |
| 785 | - if ($error != '') return $error; |
|
| 835 | + if ($error != '') { |
|
| 836 | + return $error; |
|
| 837 | + } |
|
| 786 | 838 | } |
| 787 | 839 | $query = "UPDATE config SET value = '23' WHERE name = 'schema_version'"; |
| 788 | 840 | try { |
@@ -803,12 +855,16 @@ discard block |
||
| 803 | 855 | if ($globalDBdriver == 'mysql') { |
| 804 | 856 | if (!$Connection->tableExists('tle')) { |
| 805 | 857 | $error .= create_db::import_file('../db/tle.sql'); |
| 806 | - if ($error != '') return $error; |
|
| 858 | + if ($error != '') { |
|
| 859 | + return $error; |
|
| 860 | + } |
|
| 807 | 861 | } |
| 808 | 862 | } else { |
| 809 | 863 | if (!$Connection->tableExists('tle')) { |
| 810 | 864 | $error .= create_db::import_file('../db/pgsql/tle.sql'); |
| 811 | - if ($error != '') return $error; |
|
| 865 | + if ($error != '') { |
|
| 866 | + return $error; |
|
| 867 | + } |
|
| 812 | 868 | } |
| 813 | 869 | $query = "create index flightaware_id_idx ON spotter_archive USING btree(flightaware_id)"; |
| 814 | 870 | try { |
@@ -848,7 +904,9 @@ discard block |
||
| 848 | 904 | } else { |
| 849 | 905 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 850 | 906 | } |
| 851 | - if ($error != '') return 'Import airlines.sql : '.$error; |
|
| 907 | + if ($error != '') { |
|
| 908 | + return 'Import airlines.sql : '.$error; |
|
| 909 | + } |
|
| 852 | 910 | if (!$Connection->checkColumnName('airlines','forsource')) { |
| 853 | 911 | // Add forsource to airlines |
| 854 | 912 | $query = "ALTER TABLE airlines ADD forsource VARCHAR(255) NULL DEFAULT NULL"; |
@@ -1331,20 +1389,28 @@ discard block |
||
| 1331 | 1389 | } |
| 1332 | 1390 | if ($globalDBdriver == 'mysql') { |
| 1333 | 1391 | $error .= create_db::import_file('../db/airlines.sql'); |
| 1334 | - if ($error != '') return $error; |
|
| 1392 | + if ($error != '') { |
|
| 1393 | + return $error; |
|
| 1394 | + } |
|
| 1335 | 1395 | } else { |
| 1336 | 1396 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 1337 | - if ($error != '') return $error; |
|
| 1397 | + if ($error != '') { |
|
| 1398 | + return $error; |
|
| 1399 | + } |
|
| 1338 | 1400 | } |
| 1339 | 1401 | if ((isset($globalVATSIM) && $globalVATSIM) || (isset($globalIVAO) && $globalIVAO)) { |
| 1340 | 1402 | include_once(dirname(__FILE__).'/class.update_db.php'); |
| 1341 | 1403 | if (isset($globalVATSIM) && $globalVATSIM) { |
| 1342 | 1404 | $error .= update_db::update_vatsim(); |
| 1343 | - if ($error != '') return $error; |
|
| 1405 | + if ($error != '') { |
|
| 1406 | + return $error; |
|
| 1407 | + } |
|
| 1344 | 1408 | } |
| 1345 | 1409 | if (isset($globalIVAO) && $globalIVAO && file_exists('tmp/ivae_feb2013.zip')) { |
| 1346 | 1410 | $error .= update_db::update_IVAO(); |
| 1347 | - if ($error != '') return $error; |
|
| 1411 | + if ($error != '') { |
|
| 1412 | + return $error; |
|
| 1413 | + } |
|
| 1348 | 1414 | } |
| 1349 | 1415 | } |
| 1350 | 1416 | |
@@ -1607,41 +1673,65 @@ discard block |
||
| 1607 | 1673 | if ($globalDBdriver == 'mysql') { |
| 1608 | 1674 | if (!$Connection->tableExists('tracker_output')) { |
| 1609 | 1675 | $error .= create_db::import_file('../db/tracker_output.sql'); |
| 1610 | - if ($error != '') return $error; |
|
| 1676 | + if ($error != '') { |
|
| 1677 | + return $error; |
|
| 1678 | + } |
|
| 1611 | 1679 | } |
| 1612 | 1680 | if (!$Connection->tableExists('tracker_live')) { |
| 1613 | 1681 | $error .= create_db::import_file('../db/tracker_live.sql'); |
| 1614 | - if ($error != '') return $error; |
|
| 1682 | + if ($error != '') { |
|
| 1683 | + return $error; |
|
| 1684 | + } |
|
| 1615 | 1685 | } |
| 1616 | 1686 | if (!$Connection->tableExists('marine_output')) { |
| 1617 | 1687 | $error .= create_db::import_file('../db/marine_output.sql'); |
| 1618 | - if ($error != '') return $error; |
|
| 1688 | + if ($error != '') { |
|
| 1689 | + return $error; |
|
| 1690 | + } |
|
| 1619 | 1691 | } |
| 1620 | 1692 | if (!$Connection->tableExists('marine_live')) { |
| 1621 | 1693 | $error .= create_db::import_file('../db/marine_live.sql'); |
| 1622 | - if ($error != '') return $error; |
|
| 1694 | + if ($error != '') { |
|
| 1695 | + return $error; |
|
| 1696 | + } |
|
| 1623 | 1697 | } |
| 1624 | 1698 | if (!$Connection->tableExists('marine_identity')) { |
| 1625 | 1699 | $error .= create_db::import_file('../db/marine_identity.sql'); |
| 1626 | - if ($error != '') return $error; |
|
| 1700 | + if ($error != '') { |
|
| 1701 | + return $error; |
|
| 1702 | + } |
|
| 1627 | 1703 | } |
| 1628 | 1704 | if (!$Connection->tableExists('marine_mid')) { |
| 1629 | 1705 | $error .= create_db::import_file('../db/marine_mid.sql'); |
| 1630 | - if ($error != '') return $error; |
|
| 1706 | + if ($error != '') { |
|
| 1707 | + return $error; |
|
| 1708 | + } |
|
| 1631 | 1709 | } |
| 1632 | 1710 | } else { |
| 1633 | 1711 | $error .= create_db::import_file('../db/pgsql/tracker_output.sql'); |
| 1634 | - if ($error != '') return $error; |
|
| 1712 | + if ($error != '') { |
|
| 1713 | + return $error; |
|
| 1714 | + } |
|
| 1635 | 1715 | $error .= create_db::import_file('../db/pgsql/tracker_live.sql'); |
| 1636 | - if ($error != '') return $error; |
|
| 1716 | + if ($error != '') { |
|
| 1717 | + return $error; |
|
| 1718 | + } |
|
| 1637 | 1719 | $error .= create_db::import_file('../db/pgsql/marine_output.sql'); |
| 1638 | - if ($error != '') return $error; |
|
| 1720 | + if ($error != '') { |
|
| 1721 | + return $error; |
|
| 1722 | + } |
|
| 1639 | 1723 | $error .= create_db::import_file('../db/pgsql/marine_live.sql'); |
| 1640 | - if ($error != '') return $error; |
|
| 1724 | + if ($error != '') { |
|
| 1725 | + return $error; |
|
| 1726 | + } |
|
| 1641 | 1727 | $error .= create_db::import_file('../db/pgsql/marine_identity.sql'); |
| 1642 | - if ($error != '') return $error; |
|
| 1728 | + if ($error != '') { |
|
| 1729 | + return $error; |
|
| 1730 | + } |
|
| 1643 | 1731 | $error .= create_db::import_file('../db/pgsql/marine_mid.sql'); |
| 1644 | - if ($error != '') return $error; |
|
| 1732 | + if ($error != '') { |
|
| 1733 | + return $error; |
|
| 1734 | + } |
|
| 1645 | 1735 | } |
| 1646 | 1736 | $query = "UPDATE config SET value = '37' WHERE name = 'schema_version'"; |
| 1647 | 1737 | try { |
@@ -1660,39 +1750,61 @@ discard block |
||
| 1660 | 1750 | if ($globalDBdriver == 'mysql') { |
| 1661 | 1751 | if (!$Connection->tableExists('marine_image')) { |
| 1662 | 1752 | $error .= create_db::import_file('../db/marine_image.sql'); |
| 1663 | - if ($error != '') return $error; |
|
| 1753 | + if ($error != '') { |
|
| 1754 | + return $error; |
|
| 1755 | + } |
|
| 1664 | 1756 | } |
| 1665 | 1757 | if (!$Connection->tableExists('marine_archive')) { |
| 1666 | 1758 | $error .= create_db::import_file('../db/marine_archive.sql'); |
| 1667 | - if ($error != '') return $error; |
|
| 1759 | + if ($error != '') { |
|
| 1760 | + return $error; |
|
| 1761 | + } |
|
| 1668 | 1762 | } |
| 1669 | 1763 | if (!$Connection->tableExists('marine_archive_output')) { |
| 1670 | 1764 | $error .= create_db::import_file('../db/marine_archive_output.sql'); |
| 1671 | - if ($error != '') return $error; |
|
| 1765 | + if ($error != '') { |
|
| 1766 | + return $error; |
|
| 1767 | + } |
|
| 1672 | 1768 | } |
| 1673 | 1769 | if (!$Connection->tableExists('tracker_archive')) { |
| 1674 | 1770 | $error .= create_db::import_file('../db/tracker_archive.sql'); |
| 1675 | - if ($error != '') return $error; |
|
| 1771 | + if ($error != '') { |
|
| 1772 | + return $error; |
|
| 1773 | + } |
|
| 1676 | 1774 | } |
| 1677 | 1775 | if (!$Connection->tableExists('tracker_archive_output')) { |
| 1678 | 1776 | $error .= create_db::import_file('../db/tracker_archive_output.sql'); |
| 1679 | - if ($error != '') return $error; |
|
| 1777 | + if ($error != '') { |
|
| 1778 | + return $error; |
|
| 1779 | + } |
|
| 1680 | 1780 | } |
| 1681 | 1781 | if (!$Connection->tableExists('marine_archive_output')) { |
| 1682 | 1782 | $error .= create_db::import_file('../db/tracker_archive_output.sql'); |
| 1683 | - if ($error != '') return $error; |
|
| 1783 | + if ($error != '') { |
|
| 1784 | + return $error; |
|
| 1785 | + } |
|
| 1684 | 1786 | } |
| 1685 | 1787 | } else { |
| 1686 | 1788 | $error .= create_db::import_file('../db/pgsql/marine_image.sql'); |
| 1687 | - if ($error != '') return $error; |
|
| 1789 | + if ($error != '') { |
|
| 1790 | + return $error; |
|
| 1791 | + } |
|
| 1688 | 1792 | $error .= create_db::import_file('../db/pgsql/marine_archive.sql'); |
| 1689 | - if ($error != '') return $error; |
|
| 1793 | + if ($error != '') { |
|
| 1794 | + return $error; |
|
| 1795 | + } |
|
| 1690 | 1796 | $error .= create_db::import_file('../db/pgsql/marine_archive_output.sql'); |
| 1691 | - if ($error != '') return $error; |
|
| 1797 | + if ($error != '') { |
|
| 1798 | + return $error; |
|
| 1799 | + } |
|
| 1692 | 1800 | $error .= create_db::import_file('../db/pgsql/tracker_archive.sql'); |
| 1693 | - if ($error != '') return $error; |
|
| 1801 | + if ($error != '') { |
|
| 1802 | + return $error; |
|
| 1803 | + } |
|
| 1694 | 1804 | $error .= create_db::import_file('../db/pgsql/tracker_archive_output.sql'); |
| 1695 | - if ($error != '') return $error; |
|
| 1805 | + if ($error != '') { |
|
| 1806 | + return $error; |
|
| 1807 | + } |
|
| 1696 | 1808 | } |
| 1697 | 1809 | if ($globalDBdriver == 'mysql') { |
| 1698 | 1810 | $query = "SELECT ENGINE FROM information_schema.TABLES where TABLE_SCHEMA = '".$globalDBname."' AND TABLE_NAME = 'spotter_archive'"; |
@@ -2063,7 +2175,9 @@ discard block |
||
| 2063 | 2175 | if ($globalDBdriver == 'mysql') { |
| 2064 | 2176 | if (!$Connection->tableExists('tracker_archive_output')) { |
| 2065 | 2177 | $error .= create_db::import_file('../db/tracker_archive_output.sql'); |
| 2066 | - if ($error != '') return $error; |
|
| 2178 | + if ($error != '') { |
|
| 2179 | + return $error; |
|
| 2180 | + } |
|
| 2067 | 2181 | } |
| 2068 | 2182 | $query = "ALTER TABLE tracker_live MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive MODIFY COLUMN altitude float DEFAULT NULL;ALTER TABLE tracker_archive_output MODIFY COLUMN last_altitude float DEFAULT NULL;ALTER TABLE tracker_output MODIFY COLUMN altitude float DEFAULT NULL;"; |
| 2069 | 2183 | } else { |
@@ -2091,14 +2205,22 @@ discard block |
||
| 2091 | 2205 | $error = ''; |
| 2092 | 2206 | if ($globalDBdriver == 'mysql') { |
| 2093 | 2207 | $error .= create_db::import_file('../db/airport.sql'); |
| 2094 | - if ($error != '') return $error; |
|
| 2208 | + if ($error != '') { |
|
| 2209 | + return $error; |
|
| 2210 | + } |
|
| 2095 | 2211 | $error .= create_db::import_file('../db/airlines.sql'); |
| 2096 | - if ($error != '') return $error; |
|
| 2212 | + if ($error != '') { |
|
| 2213 | + return $error; |
|
| 2214 | + } |
|
| 2097 | 2215 | } else { |
| 2098 | 2216 | $error .= create_db::import_file('../db/pgsql/airport.sql'); |
| 2099 | - if ($error != '') return $error; |
|
| 2217 | + if ($error != '') { |
|
| 2218 | + return $error; |
|
| 2219 | + } |
|
| 2100 | 2220 | $error .= create_db::import_file('../db/pgsql/airlines.sql'); |
| 2101 | - if ($error != '') return $error; |
|
| 2221 | + if ($error != '') { |
|
| 2222 | + return $error; |
|
| 2223 | + } |
|
| 2102 | 2224 | } |
| 2103 | 2225 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 2104 | 2226 | if (file_exists('tmp/ivae_feb2013.zip')) { |
@@ -2115,7 +2237,9 @@ discard block |
||
| 2115 | 2237 | $error .= update_db::update_vatsim(); |
| 2116 | 2238 | } |
| 2117 | 2239 | } |
| 2118 | - if ($error != '') return $error; |
|
| 2240 | + if ($error != '') { |
|
| 2241 | + return $error; |
|
| 2242 | + } |
|
| 2119 | 2243 | $query = "UPDATE config SET value = '45' WHERE name = 'schema_version'"; |
| 2120 | 2244 | try { |
| 2121 | 2245 | $sth = $Connection->db->prepare($query); |
@@ -2133,10 +2257,14 @@ discard block |
||
| 2133 | 2257 | if (!$Connection->tableExists('satellite')) { |
| 2134 | 2258 | if ($globalDBdriver == 'mysql') { |
| 2135 | 2259 | $error .= create_db::import_file('../db/satellite.sql'); |
| 2136 | - if ($error != '') return $error; |
|
| 2260 | + if ($error != '') { |
|
| 2261 | + return $error; |
|
| 2262 | + } |
|
| 2137 | 2263 | } else { |
| 2138 | 2264 | $error .= create_db::import_file('../db/pgsql/satellite.sql'); |
| 2139 | - if ($error != '') return $error; |
|
| 2265 | + if ($error != '') { |
|
| 2266 | + return $error; |
|
| 2267 | + } |
|
| 2140 | 2268 | } |
| 2141 | 2269 | } |
| 2142 | 2270 | $query = "UPDATE config SET value = '46' WHERE name = 'schema_version'"; |
@@ -2156,37 +2284,53 @@ discard block |
||
| 2156 | 2284 | if (!$Connection->tableExists('stats_marine')) { |
| 2157 | 2285 | if ($globalDBdriver == 'mysql') { |
| 2158 | 2286 | $error .= create_db::import_file('../db/stats_marine.sql'); |
| 2159 | - if ($error != '') return $error; |
|
| 2287 | + if ($error != '') { |
|
| 2288 | + return $error; |
|
| 2289 | + } |
|
| 2160 | 2290 | } else { |
| 2161 | 2291 | $error .= create_db::import_file('../db/pgsql/stats_marine.sql'); |
| 2162 | - if ($error != '') return $error; |
|
| 2292 | + if ($error != '') { |
|
| 2293 | + return $error; |
|
| 2294 | + } |
|
| 2163 | 2295 | } |
| 2164 | 2296 | } |
| 2165 | 2297 | if (!$Connection->tableExists('stats_marine_country')) { |
| 2166 | 2298 | if ($globalDBdriver == 'mysql') { |
| 2167 | 2299 | $error .= create_db::import_file('../db/stats_marine_country.sql'); |
| 2168 | - if ($error != '') return $error; |
|
| 2300 | + if ($error != '') { |
|
| 2301 | + return $error; |
|
| 2302 | + } |
|
| 2169 | 2303 | } else { |
| 2170 | 2304 | $error .= create_db::import_file('../db/pgsql/stats_marine_country.sql'); |
| 2171 | - if ($error != '') return $error; |
|
| 2305 | + if ($error != '') { |
|
| 2306 | + return $error; |
|
| 2307 | + } |
|
| 2172 | 2308 | } |
| 2173 | 2309 | } |
| 2174 | 2310 | if (!$Connection->tableExists('stats_tracker')) { |
| 2175 | 2311 | if ($globalDBdriver == 'mysql') { |
| 2176 | 2312 | $error .= create_db::import_file('../db/stats_tracker.sql'); |
| 2177 | - if ($error != '') return $error; |
|
| 2313 | + if ($error != '') { |
|
| 2314 | + return $error; |
|
| 2315 | + } |
|
| 2178 | 2316 | } else { |
| 2179 | 2317 | $error .= create_db::import_file('../db/pgsql/stats_tracker.sql'); |
| 2180 | - if ($error != '') return $error; |
|
| 2318 | + if ($error != '') { |
|
| 2319 | + return $error; |
|
| 2320 | + } |
|
| 2181 | 2321 | } |
| 2182 | 2322 | } |
| 2183 | 2323 | if (!$Connection->tableExists('stats_tracker_country')) { |
| 2184 | 2324 | if ($globalDBdriver == 'mysql') { |
| 2185 | 2325 | $error .= create_db::import_file('../db/stats_tracker_country.sql'); |
| 2186 | - if ($error != '') return $error; |
|
| 2326 | + if ($error != '') { |
|
| 2327 | + return $error; |
|
| 2328 | + } |
|
| 2187 | 2329 | } else { |
| 2188 | 2330 | $error .= create_db::import_file('../db/pgsql/stats_tracker_country.sql'); |
| 2189 | - if ($error != '') return $error; |
|
| 2331 | + if ($error != '') { |
|
| 2332 | + return $error; |
|
| 2333 | + } |
|
| 2190 | 2334 | } |
| 2191 | 2335 | } |
| 2192 | 2336 | $query = "UPDATE config SET value = '47' WHERE name = 'schema_version'"; |
@@ -2206,10 +2350,14 @@ discard block |
||
| 2206 | 2350 | if (!$Connection->tableExists('stats_marine_type')) { |
| 2207 | 2351 | if ($globalDBdriver == 'mysql') { |
| 2208 | 2352 | $error .= create_db::import_file('../db/stats_marine_type.sql'); |
| 2209 | - if ($error != '') return $error; |
|
| 2353 | + if ($error != '') { |
|
| 2354 | + return $error; |
|
| 2355 | + } |
|
| 2210 | 2356 | } else { |
| 2211 | 2357 | $error .= create_db::import_file('../db/pgsql/stats_marine_type.sql'); |
| 2212 | - if ($error != '') return $error; |
|
| 2358 | + if ($error != '') { |
|
| 2359 | + return $error; |
|
| 2360 | + } |
|
| 2213 | 2361 | } |
| 2214 | 2362 | } |
| 2215 | 2363 | $query = "UPDATE config SET value = '48' WHERE name = 'schema_version'"; |
@@ -2229,10 +2377,14 @@ discard block |
||
| 2229 | 2377 | if (!$Connection->tableExists('stats_tracker_type')) { |
| 2230 | 2378 | if ($globalDBdriver == 'mysql') { |
| 2231 | 2379 | $error .= create_db::import_file('../db/stats_tracker_type.sql'); |
| 2232 | - if ($error != '') return $error; |
|
| 2380 | + if ($error != '') { |
|
| 2381 | + return $error; |
|
| 2382 | + } |
|
| 2233 | 2383 | } else { |
| 2234 | 2384 | $error .= create_db::import_file('../db/pgsql/stats_tracker_type.sql'); |
| 2235 | - if ($error != '') return $error; |
|
| 2385 | + if ($error != '') { |
|
| 2386 | + return $error; |
|
| 2387 | + } |
|
| 2236 | 2388 | } |
| 2237 | 2389 | } |
| 2238 | 2390 | $query = "UPDATE config SET value = '49' WHERE name = 'schema_version'"; |
@@ -2255,8 +2407,11 @@ discard block |
||
| 2255 | 2407 | if ($Connection->tableExists('aircraft')) { |
| 2256 | 2408 | if (!$Connection->tableExists('config')) { |
| 2257 | 2409 | $version = '1'; |
| 2258 | - if ($update) return self::update_from_1(); |
|
| 2259 | - else return $version; |
|
| 2410 | + if ($update) { |
|
| 2411 | + return self::update_from_1(); |
|
| 2412 | + } else { |
|
| 2413 | + return $version; |
|
| 2414 | + } |
|
| 2260 | 2415 | } else { |
| 2261 | 2416 | $query = "SELECT value FROM config WHERE name = 'schema_version' LIMIT 1"; |
| 2262 | 2417 | try { |
@@ -2269,199 +2424,347 @@ discard block |
||
| 2269 | 2424 | if ($update) { |
| 2270 | 2425 | if ($result['value'] == '2') { |
| 2271 | 2426 | $error = self::update_from_2(); |
| 2272 | - if ($error != '') return $error; |
|
| 2273 | - else return self::check_version(true); |
|
| 2427 | + if ($error != '') { |
|
| 2428 | + return $error; |
|
| 2429 | + } else { |
|
| 2430 | + return self::check_version(true); |
|
| 2431 | + } |
|
| 2274 | 2432 | } elseif ($result['value'] == '3') { |
| 2275 | 2433 | $error = self::update_from_3(); |
| 2276 | - if ($error != '') return $error; |
|
| 2277 | - else return self::check_version(true); |
|
| 2434 | + if ($error != '') { |
|
| 2435 | + return $error; |
|
| 2436 | + } else { |
|
| 2437 | + return self::check_version(true); |
|
| 2438 | + } |
|
| 2278 | 2439 | } elseif ($result['value'] == '4') { |
| 2279 | 2440 | $error = self::update_from_4(); |
| 2280 | - if ($error != '') return $error; |
|
| 2281 | - else return self::check_version(true); |
|
| 2441 | + if ($error != '') { |
|
| 2442 | + return $error; |
|
| 2443 | + } else { |
|
| 2444 | + return self::check_version(true); |
|
| 2445 | + } |
|
| 2282 | 2446 | } elseif ($result['value'] == '5') { |
| 2283 | 2447 | $error = self::update_from_5(); |
| 2284 | - if ($error != '') return $error; |
|
| 2285 | - else return self::check_version(true); |
|
| 2448 | + if ($error != '') { |
|
| 2449 | + return $error; |
|
| 2450 | + } else { |
|
| 2451 | + return self::check_version(true); |
|
| 2452 | + } |
|
| 2286 | 2453 | } elseif ($result['value'] == '6') { |
| 2287 | 2454 | $error = self::update_from_6(); |
| 2288 | - if ($error != '') return $error; |
|
| 2289 | - else return self::check_version(true); |
|
| 2455 | + if ($error != '') { |
|
| 2456 | + return $error; |
|
| 2457 | + } else { |
|
| 2458 | + return self::check_version(true); |
|
| 2459 | + } |
|
| 2290 | 2460 | } elseif ($result['value'] == '7') { |
| 2291 | 2461 | $error = self::update_from_7(); |
| 2292 | - if ($error != '') return $error; |
|
| 2293 | - else return self::check_version(true); |
|
| 2462 | + if ($error != '') { |
|
| 2463 | + return $error; |
|
| 2464 | + } else { |
|
| 2465 | + return self::check_version(true); |
|
| 2466 | + } |
|
| 2294 | 2467 | } elseif ($result['value'] == '8') { |
| 2295 | 2468 | $error = self::update_from_8(); |
| 2296 | - if ($error != '') return $error; |
|
| 2297 | - else return self::check_version(true); |
|
| 2469 | + if ($error != '') { |
|
| 2470 | + return $error; |
|
| 2471 | + } else { |
|
| 2472 | + return self::check_version(true); |
|
| 2473 | + } |
|
| 2298 | 2474 | } elseif ($result['value'] == '9') { |
| 2299 | 2475 | $error = self::update_from_9(); |
| 2300 | - if ($error != '') return $error; |
|
| 2301 | - else return self::check_version(true); |
|
| 2476 | + if ($error != '') { |
|
| 2477 | + return $error; |
|
| 2478 | + } else { |
|
| 2479 | + return self::check_version(true); |
|
| 2480 | + } |
|
| 2302 | 2481 | } elseif ($result['value'] == '10') { |
| 2303 | 2482 | $error = self::update_from_10(); |
| 2304 | - if ($error != '') return $error; |
|
| 2305 | - else return self::check_version(true); |
|
| 2483 | + if ($error != '') { |
|
| 2484 | + return $error; |
|
| 2485 | + } else { |
|
| 2486 | + return self::check_version(true); |
|
| 2487 | + } |
|
| 2306 | 2488 | } elseif ($result['value'] == '11') { |
| 2307 | 2489 | $error = self::update_from_11(); |
| 2308 | - if ($error != '') return $error; |
|
| 2309 | - else return self::check_version(true); |
|
| 2490 | + if ($error != '') { |
|
| 2491 | + return $error; |
|
| 2492 | + } else { |
|
| 2493 | + return self::check_version(true); |
|
| 2494 | + } |
|
| 2310 | 2495 | } elseif ($result['value'] == '12') { |
| 2311 | 2496 | $error = self::update_from_12(); |
| 2312 | - if ($error != '') return $error; |
|
| 2313 | - else return self::check_version(true); |
|
| 2497 | + if ($error != '') { |
|
| 2498 | + return $error; |
|
| 2499 | + } else { |
|
| 2500 | + return self::check_version(true); |
|
| 2501 | + } |
|
| 2314 | 2502 | } elseif ($result['value'] == '13') { |
| 2315 | 2503 | $error = self::update_from_13(); |
| 2316 | - if ($error != '') return $error; |
|
| 2317 | - else return self::check_version(true); |
|
| 2504 | + if ($error != '') { |
|
| 2505 | + return $error; |
|
| 2506 | + } else { |
|
| 2507 | + return self::check_version(true); |
|
| 2508 | + } |
|
| 2318 | 2509 | } elseif ($result['value'] == '14') { |
| 2319 | 2510 | $error = self::update_from_14(); |
| 2320 | - if ($error != '') return $error; |
|
| 2321 | - else return self::check_version(true); |
|
| 2511 | + if ($error != '') { |
|
| 2512 | + return $error; |
|
| 2513 | + } else { |
|
| 2514 | + return self::check_version(true); |
|
| 2515 | + } |
|
| 2322 | 2516 | } elseif ($result['value'] == '15') { |
| 2323 | 2517 | $error = self::update_from_15(); |
| 2324 | - if ($error != '') return $error; |
|
| 2325 | - else return self::check_version(true); |
|
| 2518 | + if ($error != '') { |
|
| 2519 | + return $error; |
|
| 2520 | + } else { |
|
| 2521 | + return self::check_version(true); |
|
| 2522 | + } |
|
| 2326 | 2523 | } elseif ($result['value'] == '16') { |
| 2327 | 2524 | $error = self::update_from_16(); |
| 2328 | - if ($error != '') return $error; |
|
| 2329 | - else return self::check_version(true); |
|
| 2525 | + if ($error != '') { |
|
| 2526 | + return $error; |
|
| 2527 | + } else { |
|
| 2528 | + return self::check_version(true); |
|
| 2529 | + } |
|
| 2330 | 2530 | } elseif ($result['value'] == '17') { |
| 2331 | 2531 | $error = self::update_from_17(); |
| 2332 | - if ($error != '') return $error; |
|
| 2333 | - else return self::check_version(true); |
|
| 2532 | + if ($error != '') { |
|
| 2533 | + return $error; |
|
| 2534 | + } else { |
|
| 2535 | + return self::check_version(true); |
|
| 2536 | + } |
|
| 2334 | 2537 | } elseif ($result['value'] == '18') { |
| 2335 | 2538 | $error = self::update_from_18(); |
| 2336 | - if ($error != '') return $error; |
|
| 2337 | - else return self::check_version(true); |
|
| 2539 | + if ($error != '') { |
|
| 2540 | + return $error; |
|
| 2541 | + } else { |
|
| 2542 | + return self::check_version(true); |
|
| 2543 | + } |
|
| 2338 | 2544 | } elseif ($result['value'] == '19') { |
| 2339 | 2545 | $error = self::update_from_19(); |
| 2340 | - if ($error != '') return $error; |
|
| 2341 | - else return self::check_version(true); |
|
| 2546 | + if ($error != '') { |
|
| 2547 | + return $error; |
|
| 2548 | + } else { |
|
| 2549 | + return self::check_version(true); |
|
| 2550 | + } |
|
| 2342 | 2551 | } elseif ($result['value'] == '20') { |
| 2343 | 2552 | $error = self::update_from_20(); |
| 2344 | - if ($error != '') return $error; |
|
| 2345 | - else return self::check_version(true); |
|
| 2553 | + if ($error != '') { |
|
| 2554 | + return $error; |
|
| 2555 | + } else { |
|
| 2556 | + return self::check_version(true); |
|
| 2557 | + } |
|
| 2346 | 2558 | } elseif ($result['value'] == '21') { |
| 2347 | 2559 | $error = self::update_from_21(); |
| 2348 | - if ($error != '') return $error; |
|
| 2349 | - else return self::check_version(true); |
|
| 2560 | + if ($error != '') { |
|
| 2561 | + return $error; |
|
| 2562 | + } else { |
|
| 2563 | + return self::check_version(true); |
|
| 2564 | + } |
|
| 2350 | 2565 | } elseif ($result['value'] == '22') { |
| 2351 | 2566 | $error = self::update_from_22(); |
| 2352 | - if ($error != '') return $error; |
|
| 2353 | - else return self::check_version(true); |
|
| 2567 | + if ($error != '') { |
|
| 2568 | + return $error; |
|
| 2569 | + } else { |
|
| 2570 | + return self::check_version(true); |
|
| 2571 | + } |
|
| 2354 | 2572 | } elseif ($result['value'] == '23') { |
| 2355 | 2573 | $error = self::update_from_23(); |
| 2356 | - if ($error != '') return $error; |
|
| 2357 | - else return self::check_version(true); |
|
| 2574 | + if ($error != '') { |
|
| 2575 | + return $error; |
|
| 2576 | + } else { |
|
| 2577 | + return self::check_version(true); |
|
| 2578 | + } |
|
| 2358 | 2579 | } elseif ($result['value'] == '24') { |
| 2359 | 2580 | $error = self::update_from_24(); |
| 2360 | - if ($error != '') return $error; |
|
| 2361 | - else return self::check_version(true); |
|
| 2581 | + if ($error != '') { |
|
| 2582 | + return $error; |
|
| 2583 | + } else { |
|
| 2584 | + return self::check_version(true); |
|
| 2585 | + } |
|
| 2362 | 2586 | } elseif ($result['value'] == '25') { |
| 2363 | 2587 | $error = self::update_from_25(); |
| 2364 | - if ($error != '') return $error; |
|
| 2365 | - else return self::check_version(true); |
|
| 2588 | + if ($error != '') { |
|
| 2589 | + return $error; |
|
| 2590 | + } else { |
|
| 2591 | + return self::check_version(true); |
|
| 2592 | + } |
|
| 2366 | 2593 | } elseif ($result['value'] == '26') { |
| 2367 | 2594 | $error = self::update_from_26(); |
| 2368 | - if ($error != '') return $error; |
|
| 2369 | - else return self::check_version(true); |
|
| 2595 | + if ($error != '') { |
|
| 2596 | + return $error; |
|
| 2597 | + } else { |
|
| 2598 | + return self::check_version(true); |
|
| 2599 | + } |
|
| 2370 | 2600 | } elseif ($result['value'] == '27') { |
| 2371 | 2601 | $error = self::update_from_27(); |
| 2372 | - if ($error != '') return $error; |
|
| 2373 | - else return self::check_version(true); |
|
| 2602 | + if ($error != '') { |
|
| 2603 | + return $error; |
|
| 2604 | + } else { |
|
| 2605 | + return self::check_version(true); |
|
| 2606 | + } |
|
| 2374 | 2607 | } elseif ($result['value'] == '28') { |
| 2375 | 2608 | $error = self::update_from_28(); |
| 2376 | - if ($error != '') return $error; |
|
| 2377 | - else return self::check_version(true); |
|
| 2609 | + if ($error != '') { |
|
| 2610 | + return $error; |
|
| 2611 | + } else { |
|
| 2612 | + return self::check_version(true); |
|
| 2613 | + } |
|
| 2378 | 2614 | } elseif ($result['value'] == '29') { |
| 2379 | 2615 | $error = self::update_from_29(); |
| 2380 | - if ($error != '') return $error; |
|
| 2381 | - else return self::check_version(true); |
|
| 2616 | + if ($error != '') { |
|
| 2617 | + return $error; |
|
| 2618 | + } else { |
|
| 2619 | + return self::check_version(true); |
|
| 2620 | + } |
|
| 2382 | 2621 | } elseif ($result['value'] == '30') { |
| 2383 | 2622 | $error = self::update_from_30(); |
| 2384 | - if ($error != '') return $error; |
|
| 2385 | - else return self::check_version(true); |
|
| 2623 | + if ($error != '') { |
|
| 2624 | + return $error; |
|
| 2625 | + } else { |
|
| 2626 | + return self::check_version(true); |
|
| 2627 | + } |
|
| 2386 | 2628 | } elseif ($result['value'] == '31') { |
| 2387 | 2629 | $error = self::update_from_31(); |
| 2388 | - if ($error != '') return $error; |
|
| 2389 | - else return self::check_version(true); |
|
| 2630 | + if ($error != '') { |
|
| 2631 | + return $error; |
|
| 2632 | + } else { |
|
| 2633 | + return self::check_version(true); |
|
| 2634 | + } |
|
| 2390 | 2635 | } elseif ($result['value'] == '32') { |
| 2391 | 2636 | $error = self::update_from_32(); |
| 2392 | - if ($error != '') return $error; |
|
| 2393 | - else return self::check_version(true); |
|
| 2637 | + if ($error != '') { |
|
| 2638 | + return $error; |
|
| 2639 | + } else { |
|
| 2640 | + return self::check_version(true); |
|
| 2641 | + } |
|
| 2394 | 2642 | } elseif ($result['value'] == '33') { |
| 2395 | 2643 | $error = self::update_from_33(); |
| 2396 | - if ($error != '') return $error; |
|
| 2397 | - else return self::check_version(true); |
|
| 2644 | + if ($error != '') { |
|
| 2645 | + return $error; |
|
| 2646 | + } else { |
|
| 2647 | + return self::check_version(true); |
|
| 2648 | + } |
|
| 2398 | 2649 | } elseif ($result['value'] == '34') { |
| 2399 | 2650 | $error = self::update_from_34(); |
| 2400 | - if ($error != '') return $error; |
|
| 2401 | - else return self::check_version(true); |
|
| 2651 | + if ($error != '') { |
|
| 2652 | + return $error; |
|
| 2653 | + } else { |
|
| 2654 | + return self::check_version(true); |
|
| 2655 | + } |
|
| 2402 | 2656 | } elseif ($result['value'] == '35') { |
| 2403 | 2657 | $error = self::update_from_35(); |
| 2404 | - if ($error != '') return $error; |
|
| 2405 | - else return self::check_version(true); |
|
| 2658 | + if ($error != '') { |
|
| 2659 | + return $error; |
|
| 2660 | + } else { |
|
| 2661 | + return self::check_version(true); |
|
| 2662 | + } |
|
| 2406 | 2663 | } elseif ($result['value'] == '36') { |
| 2407 | 2664 | $error = self::update_from_36(); |
| 2408 | - if ($error != '') return $error; |
|
| 2409 | - else return self::check_version(true); |
|
| 2665 | + if ($error != '') { |
|
| 2666 | + return $error; |
|
| 2667 | + } else { |
|
| 2668 | + return self::check_version(true); |
|
| 2669 | + } |
|
| 2410 | 2670 | } elseif ($result['value'] == '37') { |
| 2411 | 2671 | $error = self::update_from_37(); |
| 2412 | - if ($error != '') return $error; |
|
| 2413 | - else return self::check_version(true); |
|
| 2672 | + if ($error != '') { |
|
| 2673 | + return $error; |
|
| 2674 | + } else { |
|
| 2675 | + return self::check_version(true); |
|
| 2676 | + } |
|
| 2414 | 2677 | } elseif ($result['value'] == '38') { |
| 2415 | 2678 | $error = self::update_from_38(); |
| 2416 | - if ($error != '') return $error; |
|
| 2417 | - else return self::check_version(true); |
|
| 2679 | + if ($error != '') { |
|
| 2680 | + return $error; |
|
| 2681 | + } else { |
|
| 2682 | + return self::check_version(true); |
|
| 2683 | + } |
|
| 2418 | 2684 | } elseif ($result['value'] == '39') { |
| 2419 | 2685 | $error = self::update_from_39(); |
| 2420 | - if ($error != '') return $error; |
|
| 2421 | - else return self::check_version(true); |
|
| 2686 | + if ($error != '') { |
|
| 2687 | + return $error; |
|
| 2688 | + } else { |
|
| 2689 | + return self::check_version(true); |
|
| 2690 | + } |
|
| 2422 | 2691 | } elseif ($result['value'] == '40') { |
| 2423 | 2692 | $error = self::update_from_40(); |
| 2424 | - if ($error != '') return $error; |
|
| 2425 | - else return self::check_version(true); |
|
| 2693 | + if ($error != '') { |
|
| 2694 | + return $error; |
|
| 2695 | + } else { |
|
| 2696 | + return self::check_version(true); |
|
| 2697 | + } |
|
| 2426 | 2698 | } elseif ($result['value'] == '41') { |
| 2427 | 2699 | $error = self::update_from_41(); |
| 2428 | - if ($error != '') return $error; |
|
| 2429 | - else return self::check_version(true); |
|
| 2700 | + if ($error != '') { |
|
| 2701 | + return $error; |
|
| 2702 | + } else { |
|
| 2703 | + return self::check_version(true); |
|
| 2704 | + } |
|
| 2430 | 2705 | } elseif ($result['value'] == '42') { |
| 2431 | 2706 | $error = self::update_from_42(); |
| 2432 | - if ($error != '') return $error; |
|
| 2433 | - else return self::check_version(true); |
|
| 2707 | + if ($error != '') { |
|
| 2708 | + return $error; |
|
| 2709 | + } else { |
|
| 2710 | + return self::check_version(true); |
|
| 2711 | + } |
|
| 2434 | 2712 | } elseif ($result['value'] == '43') { |
| 2435 | 2713 | $error = self::update_from_43(); |
| 2436 | - if ($error != '') return $error; |
|
| 2437 | - else return self::check_version(true); |
|
| 2714 | + if ($error != '') { |
|
| 2715 | + return $error; |
|
| 2716 | + } else { |
|
| 2717 | + return self::check_version(true); |
|
| 2718 | + } |
|
| 2438 | 2719 | } elseif ($result['value'] == '44') { |
| 2439 | 2720 | $error = self::update_from_44(); |
| 2440 | - if ($error != '') return $error; |
|
| 2441 | - else return self::check_version(true); |
|
| 2721 | + if ($error != '') { |
|
| 2722 | + return $error; |
|
| 2723 | + } else { |
|
| 2724 | + return self::check_version(true); |
|
| 2725 | + } |
|
| 2442 | 2726 | } elseif ($result['value'] == '45') { |
| 2443 | 2727 | $error = self::update_from_45(); |
| 2444 | - if ($error != '') return $error; |
|
| 2445 | - else return self::check_version(true); |
|
| 2728 | + if ($error != '') { |
|
| 2729 | + return $error; |
|
| 2730 | + } else { |
|
| 2731 | + return self::check_version(true); |
|
| 2732 | + } |
|
| 2446 | 2733 | } elseif ($result['value'] == '46') { |
| 2447 | 2734 | $error = self::update_from_46(); |
| 2448 | - if ($error != '') return $error; |
|
| 2449 | - else return self::check_version(true); |
|
| 2735 | + if ($error != '') { |
|
| 2736 | + return $error; |
|
| 2737 | + } else { |
|
| 2738 | + return self::check_version(true); |
|
| 2739 | + } |
|
| 2450 | 2740 | } elseif ($result['value'] == '47') { |
| 2451 | 2741 | $error = self::update_from_47(); |
| 2452 | - if ($error != '') return $error; |
|
| 2453 | - else return self::check_version(true); |
|
| 2742 | + if ($error != '') { |
|
| 2743 | + return $error; |
|
| 2744 | + } else { |
|
| 2745 | + return self::check_version(true); |
|
| 2746 | + } |
|
| 2454 | 2747 | } elseif ($result['value'] == '48') { |
| 2455 | 2748 | $error = self::update_from_48(); |
| 2456 | - if ($error != '') return $error; |
|
| 2457 | - else return self::check_version(true); |
|
| 2458 | - } else return ''; |
|
| 2749 | + if ($error != '') { |
|
| 2750 | + return $error; |
|
| 2751 | + } else { |
|
| 2752 | + return self::check_version(true); |
|
| 2753 | + } |
|
| 2754 | + } else { |
|
| 2755 | + return ''; |
|
| 2756 | + } |
|
| 2459 | 2757 | } else { |
| 2460 | - if (isset($result['value']) && $result['value'] != '') return $result['value']; |
|
| 2461 | - else return 0; |
|
| 2758 | + if (isset($result['value']) && $result['value'] != '') { |
|
| 2759 | + return $result['value']; |
|
| 2760 | + } else { |
|
| 2761 | + return 0; |
|
| 2762 | + } |
|
| 2462 | 2763 | } |
| 2463 | 2764 | } |
| 2464 | - } else return $version; |
|
| 2765 | + } else { |
|
| 2766 | + return $version; |
|
| 2767 | + } |
|
| 2465 | 2768 | } |
| 2466 | 2769 | } |
| 2467 | 2770 | } |
@@ -33,7 +33,9 @@ discard block |
||
| 33 | 33 | if (file_exists('images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png')) |
| 34 | 34 | { |
| 35 | 35 | print '<img src="'.$globalURL.'/images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png" alt="'._("Click to see alliance activity").'" title="'._("Click to see alliance activity").'" /> '; |
| 36 | - } else print $alliance['alliance']; |
|
| 36 | + } else { |
|
| 37 | + print $alliance['alliance']; |
|
| 38 | + } |
|
| 37 | 39 | print '</a>'; |
| 38 | 40 | print '</div>'; |
| 39 | 41 | } |
@@ -42,13 +44,21 @@ discard block |
||
| 42 | 44 | } |
| 43 | 45 | print '<div class="select-item"><form action="'.$globalURL.'/airline" method="post"><select name="airline_type" class="selectpicker" data-live-search="true">'; |
| 44 | 46 | print '<option value="all"'; |
| 45 | - if ($airline_type == 'all') print 'selected="selected" '; |
|
| 47 | + if ($airline_type == 'all') { |
|
| 48 | + print 'selected="selected" '; |
|
| 49 | + } |
|
| 46 | 50 | print '>'._("All").'</option><option value="passenger"'; |
| 47 | - if ($airline_type == 'passenger') print 'selected="selected" '; |
|
| 51 | + if ($airline_type == 'passenger') { |
|
| 52 | + print 'selected="selected" '; |
|
| 53 | + } |
|
| 48 | 54 | print '>'._("Passenger").'</option><option value="cargo"'; |
| 49 | - if ($airline_type == 'cargo') print 'selected="selected" '; |
|
| 55 | + if ($airline_type == 'cargo') { |
|
| 56 | + print 'selected="selected" '; |
|
| 57 | + } |
|
| 50 | 58 | print '>'._("Cargo").'</option><option value="military"'; |
| 51 | - if ($airline_type == 'military') print 'selected="selected" '; |
|
| 59 | + if ($airline_type == 'military') { |
|
| 60 | + print 'selected="selected" '; |
|
| 61 | + } |
|
| 52 | 62 | print '>'._("Military").'</option></select>'; |
| 53 | 63 | print '<button type="submit"><i class="fa fa-angle-double-right"></i></button></form></div>'; |
| 54 | 64 | |
@@ -75,7 +85,9 @@ discard block |
||
| 75 | 85 | $firstLetter = strtoupper($Common->replace_mb_substr($value['airline_name'], 0, 1)); |
| 76 | 86 | if($previous !== $firstLetter) |
| 77 | 87 | { |
| 78 | - if ($previous !== null) print ' | '; |
|
| 88 | + if ($previous !== null) { |
|
| 89 | + print ' | '; |
|
| 90 | + } |
|
| 79 | 91 | print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>'; |
| 80 | 92 | } |
| 81 | 93 | $previous = $firstLetter; |
@@ -88,7 +100,9 @@ discard block |
||
| 88 | 100 | { |
| 89 | 101 | if($previous !== $firstLetter) |
| 90 | 102 | { |
| 91 | - if ($previous !== null) print '</div>'; |
|
| 103 | + if ($previous !== null) { |
|
| 104 | + print '</div>'; |
|
| 105 | + } |
|
| 92 | 106 | print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">'; |
| 93 | 107 | } |
| 94 | 108 | $previous = $firstLetter; |
@@ -102,10 +116,14 @@ discard block |
||
| 102 | 116 | } elseif (file_exists('images/airlines/'.$value['airline_icao'].'.png')) |
| 103 | 117 | { |
| 104 | 118 | print '<img src="'.$globalURL.'/images/airlines/'.$value['airline_icao'].'.png" alt="'._("Click to see airline activity").'" title="'._("Click to see airline activity").'" /> '; |
| 105 | - if (isset($value['ban_eu']) && $value['ban_eu'] == 1) print '<img src="'.$globalURL.'/images/baneu.png" alt="'._("Banned in Europe").'" title="'._("Banned in Europe").'" /> '; |
|
| 119 | + if (isset($value['ban_eu']) && $value['ban_eu'] == 1) { |
|
| 120 | + print '<img src="'.$globalURL.'/images/baneu.png" alt="'._("Banned in Europe").'" title="'._("Banned in Europe").'" /> '; |
|
| 121 | + } |
|
| 106 | 122 | } else { |
| 107 | 123 | print $value['airline_name']; |
| 108 | - if (isset($value['ban_eu']) && $value['ban_eu'] == 1) print '<img src="'.$globalURL.'/images/baneu.png" alt="'._("Banned in Europe").'" title="'._("Banned in Europe").'" /> '; |
|
| 124 | + if (isset($value['ban_eu']) && $value['ban_eu'] == 1) { |
|
| 125 | + print '<img src="'.$globalURL.'/images/baneu.png" alt="'._("Banned in Europe").'" title="'._("Banned in Europe").'" /> '; |
|
| 126 | + } |
|
| 109 | 127 | } |
| 110 | 128 | print '</a>'; |
| 111 | 129 | print '</div>'; |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | |
| 9 | 9 | if (isset($_POST['airline'])) |
| 10 | 10 | { |
| 11 | - header('Location: '.$globalURL.'/airline/'.filter_input(INPUT_POST,'airline',FILTER_SANITIZE_STRING)); |
|
| 11 | + header('Location: '.$globalURL.'/airline/'.filter_input(INPUT_POST, 'airline', FILTER_SANITIZE_STRING)); |
|
| 12 | 12 | } else { |
| 13 | 13 | $title = "Airlines"; |
| 14 | 14 | require_once('header.php'); |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | print '<div class="column">'; |
| 18 | 18 | print '<h1>'._("Airlines").'</h1>'; |
| 19 | 19 | if (isset($_POST['airline_type'])) { |
| 20 | - $airline_type = filter_input(INPUT_POST,'airline_type',FILTER_SANITIZE_STRING); |
|
| 20 | + $airline_type = filter_input(INPUT_POST, 'airline_type', FILTER_SANITIZE_STRING); |
|
| 21 | 21 | //$airline_names = $Spotter->getAllAirlineNames($airline_type); |
| 22 | 22 | } else { |
| 23 | 23 | //$airline_names = $Spotter->getAllAirlineNames(); |
@@ -29,10 +29,10 @@ discard block |
||
| 29 | 29 | print '<div class="alphabet">'; |
| 30 | 30 | foreach ($alliances as $alliance) { |
| 31 | 31 | print '<div class="alphabet-airline alphabet-item">'; |
| 32 | - print '<a href="'.$globalURL.'/airline/alliance_'.str_replace(' ','_',$alliance['alliance']).'">'; |
|
| 33 | - if (file_exists('images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png')) |
|
| 32 | + print '<a href="'.$globalURL.'/airline/alliance_'.str_replace(' ', '_', $alliance['alliance']).'">'; |
|
| 33 | + if (file_exists('images/airlines/'.str_replace(' ', '_', $alliance['alliance']).'.png')) |
|
| 34 | 34 | { |
| 35 | - print '<img src="'.$globalURL.'/images/airlines/'.str_replace(' ','_',$alliance['alliance']).'.png" alt="'._("Click to see alliance activity").'" title="'._("Click to see alliance activity").'" /> '; |
|
| 35 | + print '<img src="'.$globalURL.'/images/airlines/'.str_replace(' ', '_', $alliance['alliance']).'.png" alt="'._("Click to see alliance activity").'" title="'._("Click to see alliance activity").'" /> '; |
|
| 36 | 36 | } else print $alliance['alliance']; |
| 37 | 37 | print '</a>'; |
| 38 | 38 | print '</div>'; |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | $Stats = new Stats(); |
| 56 | 56 | if (isset($_POST['airline_type'])) |
| 57 | 57 | { |
| 58 | - $airline_type = filter_input(INPUT_POST,'airline_type',FILTER_SANITIZE_STRING); |
|
| 58 | + $airline_type = filter_input(INPUT_POST, 'airline_type', FILTER_SANITIZE_STRING); |
|
| 59 | 59 | //$airline_names = $Stats->getAllAirlineNames($airline_type); |
| 60 | 60 | $airline_names = $Spotter->getAllAirlineNames($airline_type); |
| 61 | 61 | } else { |
@@ -68,12 +68,12 @@ discard block |
||
| 68 | 68 | } |
| 69 | 69 | $previous = null; |
| 70 | 70 | print '<div class="alphabet-legend">'; |
| 71 | - foreach($airline_names as $value) |
|
| 71 | + foreach ($airline_names as $value) |
|
| 72 | 72 | { |
| 73 | 73 | //echo $value['airline_name']."\n"; |
| 74 | 74 | //echo mb_substr($value['airline_name'],0,1).' - '.$value['airline_name']."\n"; |
| 75 | 75 | $firstLetter = strtoupper($Common->replace_mb_substr($value['airline_name'], 0, 1)); |
| 76 | - if($previous !== $firstLetter) |
|
| 76 | + if ($previous !== $firstLetter) |
|
| 77 | 77 | { |
| 78 | 78 | if ($previous !== null) print ' | '; |
| 79 | 79 | print '<a href="#'.$firstLetter.'">'.$firstLetter.'</a>'; |
@@ -82,11 +82,11 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | print '</div>'; |
| 84 | 84 | $previous = null; |
| 85 | - foreach($airline_names as $value) { |
|
| 85 | + foreach ($airline_names as $value) { |
|
| 86 | 86 | $firstLetter = strtoupper($Common->replace_mb_substr($value['airline_name'], 0, 1)); |
| 87 | 87 | if ($firstLetter != "") |
| 88 | 88 | { |
| 89 | - if($previous !== $firstLetter) |
|
| 89 | + if ($previous !== $firstLetter) |
|
| 90 | 90 | { |
| 91 | 91 | if ($previous !== null) print '</div>'; |
| 92 | 92 | print '<a name="'.$firstLetter.'"></a><h4 class="alphabet-header">'.$firstLetter.'</h4><div class="alphabet">'; |
@@ -553,8 +553,8 @@ discard block |
||
| 553 | 553 | } |
| 554 | 554 | } |
| 555 | 555 | <?php |
| 556 | - } else { |
|
| 557 | - ?> |
|
| 556 | + } else { |
|
| 557 | + ?> |
|
| 558 | 558 | if (map.getZoom() > 7) { |
| 559 | 559 | var style = { |
| 560 | 560 | "color": "#1a3151", |
@@ -573,7 +573,7 @@ discard block |
||
| 573 | 573 | layer_satellite_data.addLayer(layer); |
| 574 | 574 | } |
| 575 | 575 | <?php |
| 576 | - } |
|
| 576 | + } |
|
| 577 | 577 | ?> |
| 578 | 578 | } |
| 579 | 579 | } |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | require_once('../require/settings.php'); |
| 3 | 3 | require_once('../require/class.Language.php'); |
| 4 | 4 | |
| 5 | -setcookie("MapFormat",'2d'); |
|
| 5 | +setcookie("MapFormat", '2d'); |
|
| 6 | 6 | |
| 7 | 7 | // Compressed GeoJson is used if true |
| 8 | 8 | if (!isset($globalJsonCompress)) $compress = true; |
@@ -18,10 +18,10 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | <?php |
| 20 | 20 | if (isset($_GET['famsatid'])) { |
| 21 | - $famsatid = filter_input(INPUT_GET,'famsatid',FILTER_SANITIZE_STRING); |
|
| 21 | + $famsatid = filter_input(INPUT_GET, 'famsatid', FILTER_SANITIZE_STRING); |
|
| 22 | 22 | } |
| 23 | 23 | if (isset($_GET['ident'])) { |
| 24 | - $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
| 24 | + $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
| 25 | 25 | } |
| 26 | 26 | if (!isset($ident) && !isset($famsatid)) { |
| 27 | 27 | ?> |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | <?php |
| 195 | 195 | } else { |
| 196 | 196 | ?> |
| 197 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 197 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 198 | 198 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 199 | 199 | <?php |
| 200 | 200 | } |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | /* |
| 211 | 211 | shadowUrl: iconURLShadowpath, |
| 212 | 212 | shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>], |
| 213 | - shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>] |
|
| 213 | + shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>] |
|
| 214 | 214 | */ |
| 215 | 215 | }) |
| 216 | 216 | }) |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | <?php |
| 251 | 251 | } else { |
| 252 | 252 | ?> |
| 253 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 253 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 254 | 254 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 255 | 255 | <?php |
| 256 | 256 | } |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | <?php |
| 306 | 306 | } else { |
| 307 | 307 | ?> |
| 308 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 308 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
| 309 | 309 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 310 | 310 | <?php |
| 311 | 311 | } |
@@ -5,8 +5,11 @@ discard block |
||
| 5 | 5 | setcookie("MapFormat",'2d'); |
| 6 | 6 | |
| 7 | 7 | // Compressed GeoJson is used if true |
| 8 | -if (!isset($globalJsonCompress)) $compress = true; |
|
| 9 | -else $compress = $globalJsonCompress; |
|
| 8 | +if (!isset($globalJsonCompress)) { |
|
| 9 | + $compress = true; |
|
| 10 | +} else { |
|
| 11 | + $compress = $globalJsonCompress; |
|
| 12 | +} |
|
| 10 | 13 | $compress = false; |
| 11 | 14 | ?> |
| 12 | 15 | |
@@ -159,9 +162,13 @@ discard block |
||
| 159 | 162 | if (callsign != ""){ markerSatelliteLabel += callsign; } |
| 160 | 163 | if (type != ""){ markerSatelliteLabel += ' - '+type; } |
| 161 | 164 | <?php |
| 162 | - if (isset($_COOKIE['SatelliteIconColor'])) $IconColor = $_COOKIE['SatelliteIconColor']; |
|
| 163 | - elseif (isset($globalSatelliteIconColor)) $IconColor = $globalSatelliteIconColor; |
|
| 164 | - else $IconColor = '1a3151'; |
|
| 165 | + if (isset($_COOKIE['SatelliteIconColor'])) { |
|
| 166 | + $IconColor = $_COOKIE['SatelliteIconColor']; |
|
| 167 | + } elseif (isset($globalSatelliteIconColor)) { |
|
| 168 | + $IconColor = $globalSatelliteIconColor; |
|
| 169 | + } else { |
|
| 170 | + $IconColor = '1a3151'; |
|
| 171 | + } |
|
| 165 | 172 | if (!isset($ident) && !isset($famsatid)) { |
| 166 | 173 | ?> |
| 167 | 174 | info_satellite_update(feature.properties.fc); |
@@ -195,7 +202,12 @@ discard block |
||
| 195 | 202 | <?php |
| 196 | 203 | } else { |
| 197 | 204 | ?> |
| 198 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 205 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 206 | + print $archiveupdatetime*1000; |
|
| 207 | +} else { |
|
| 208 | + print $globalMapRefresh*1000+20000; |
|
| 209 | +} |
|
| 210 | +?>+feature.properties.sqt*1000); |
|
| 199 | 211 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 200 | 212 | <?php |
| 201 | 213 | } |
@@ -251,7 +263,12 @@ discard block |
||
| 251 | 263 | <?php |
| 252 | 264 | } else { |
| 253 | 265 | ?> |
| 254 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 266 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 267 | + print $archiveupdatetime*1000; |
|
| 268 | +} else { |
|
| 269 | + print $globalMapRefresh*1000+20000; |
|
| 270 | +} |
|
| 271 | +?>+feature.properties.sqt*1000); |
|
| 255 | 272 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 256 | 273 | <?php |
| 257 | 274 | } |
@@ -306,7 +323,12 @@ discard block |
||
| 306 | 323 | <?php |
| 307 | 324 | } else { |
| 308 | 325 | ?> |
| 309 | - var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
| 326 | + var movingtime = Math.round(<?php if (isset($archiveupdatetime)) { |
|
| 327 | + print $archiveupdatetime*1000; |
|
| 328 | +} else { |
|
| 329 | + print $globalMapRefresh*1000+20000; |
|
| 330 | +} |
|
| 331 | +?>+feature.properties.sqt*1000); |
|
| 310 | 332 | return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
| 311 | 333 | <?php |
| 312 | 334 | } |
@@ -601,14 +623,24 @@ discard block |
||
| 601 | 623 | if (isset($archive) && $archive) { |
| 602 | 624 | ?> |
| 603 | 625 | //then load it again every 30 seconds |
| 604 | -// var reload = setInterval(function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) print ($globalMapRefresh*1000)/2; else print '15000'; ?>); |
|
| 626 | +// var reload = setInterval(function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) { |
|
| 627 | + print ($globalMapRefresh*1000)/2; |
|
| 628 | +} else { |
|
| 629 | + print '15000'; |
|
| 630 | +} |
|
| 631 | +?>); |
|
| 605 | 632 | reloadSatellitePage = setInterval(function(){if (noTimeout) updateSat(0)},<?php print $archiveupdatetime*1000; ?>); |
| 606 | 633 | <?php |
| 607 | 634 | } else { |
| 608 | 635 | ?> |
| 609 | 636 | //then load it again every 30 seconds |
| 610 | 637 | reloadSatellitePage = setInterval( |
| 611 | - function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) print $globalMapRefresh*1000; else print '30000'; ?>); |
|
| 638 | + function(){if (noTimeout) updateSat(0)},<?php if (isset($globalMapRefresh)) { |
|
| 639 | + print $globalMapRefresh*1000; |
|
| 640 | +} else { |
|
| 641 | + print '30000'; |
|
| 642 | +} |
|
| 643 | +?>); |
|
| 612 | 644 | <?php |
| 613 | 645 | } |
| 614 | 646 | ?> |
@@ -74,7 +74,9 @@ discard block |
||
| 74 | 74 | if ($error != '') { |
| 75 | 75 | $_SESSION['error'] = $error; |
| 76 | 76 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database')); |
| 77 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 77 | + } else { |
|
| 78 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 79 | + } |
|
| 78 | 80 | $_SESSION['install'] = 'database_import'; |
| 79 | 81 | $_SESSION['next'] = 'Create and import tables'; |
| 80 | 82 | $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -89,7 +91,9 @@ discard block |
||
| 89 | 91 | if ($error != '') { |
| 90 | 92 | $_SESSION['error'] = $error; |
| 91 | 93 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables')); |
| 92 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 94 | + } else { |
|
| 95 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 96 | + } |
|
| 93 | 97 | if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 94 | 98 | $_SESSION['install'] = 'populate'; |
| 95 | 99 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
@@ -104,7 +108,9 @@ discard block |
||
| 104 | 108 | if ($error != '') { |
| 105 | 109 | $_SESSION['error'] = $error; |
| 106 | 110 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed')); |
| 107 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 111 | + } else { |
|
| 112 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 113 | + } |
|
| 108 | 114 | $_SESSION['install'] = 'sources'; |
| 109 | 115 | $_SESSION['next'] = 'Insert data in source table'; |
| 110 | 116 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -117,7 +123,9 @@ discard block |
||
| 117 | 123 | if ($error != '') { |
| 118 | 124 | $_SESSION['error'] = $error; |
| 119 | 125 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database')); |
| 120 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 126 | + } else { |
|
| 127 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 128 | + } |
|
| 121 | 129 | $_SESSION['install'] = 'airspace'; |
| 122 | 130 | $_SESSION['next'] = 'Populate airspace table'; |
| 123 | 131 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -129,7 +137,9 @@ discard block |
||
| 129 | 137 | if ($error != '') { |
| 130 | 138 | $_SESSION['error'] = $error; |
| 131 | 139 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate airspace database')); |
| 132 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database')); |
|
| 140 | + } else { |
|
| 141 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database')); |
|
| 142 | + } |
|
| 133 | 143 | $_SESSION['install'] = 'countries'; |
| 134 | 144 | $_SESSION['next'] = 'Populate countries table'; |
| 135 | 145 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -141,7 +151,9 @@ discard block |
||
| 141 | 151 | if ($error != '') { |
| 142 | 152 | $_SESSION['error'] = $error; |
| 143 | 153 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
| 144 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 154 | + } else { |
|
| 155 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 156 | + } |
|
| 145 | 157 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 146 | 158 | $_SESSION['install'] = 'notam'; |
| 147 | 159 | $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
@@ -173,7 +185,9 @@ discard block |
||
| 173 | 185 | if ($error != '') { |
| 174 | 186 | $_SESSION['error'] = $error; |
| 175 | 187 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
| 176 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 188 | + } else { |
|
| 189 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 190 | + } |
|
| 177 | 191 | $_SESSION['install'] = 'populate_flarm'; |
| 178 | 192 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM'; |
| 179 | 193 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -194,18 +208,26 @@ discard block |
||
| 194 | 208 | if ($error != '') { |
| 195 | 209 | $_SESSION['error'] = $error; |
| 196 | 210 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM')); |
| 197 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 211 | + } else { |
|
| 212 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 213 | + } |
|
| 198 | 214 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 199 | 215 | $_SESSION['install'] = 'vatsim'; |
| 200 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 201 | - else $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 216 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 217 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 218 | + } else { |
|
| 219 | + $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 220 | + } |
|
| 202 | 221 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 203 | 222 | $_SESSION['install'] = 'vatsim'; |
| 204 | 223 | $_SESSION['next'] = 'Insert VATSIM data'; |
| 205 | 224 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 206 | 225 | $_SESSION['install'] = 'vatsim'; |
| 207 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 208 | - else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 226 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 227 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 228 | + } else { |
|
| 229 | + $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 230 | + } |
|
| 209 | 231 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 210 | 232 | $_SESSION['install'] = 'vatsim'; |
| 211 | 233 | $_SESSION['next'] = 'Insert phpVMS data'; |
@@ -230,7 +252,9 @@ discard block |
||
| 230 | 252 | if ($error != '') { |
| 231 | 253 | $_SESSION['error'] = $error; |
| 232 | 254 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data')); |
| 233 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 255 | + } else { |
|
| 256 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 257 | + } |
|
| 234 | 258 | $_SESSION['install'] = 'translation'; |
| 235 | 259 | $_SESSION['next'] = 'Populate translation table with externals data'; |
| 236 | 260 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -250,7 +274,9 @@ discard block |
||
| 250 | 274 | if ($error != '') { |
| 251 | 275 | $_SESSION['error'] = $error; |
| 252 | 276 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data')); |
| 253 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 277 | + } else { |
|
| 278 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 279 | + } |
|
| 254 | 280 | if ($_SESSION['waypoints'] == 1) { |
| 255 | 281 | $_SESSION['install'] = 'waypoints'; |
| 256 | 282 | $_SESSION['next'] = 'Populate waypoints table'; |
@@ -283,7 +309,9 @@ discard block |
||
| 283 | 309 | if ($error != '') { |
| 284 | 310 | $_SESSION['error'] = $error; |
| 285 | 311 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data')); |
| 286 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 312 | + } else { |
|
| 313 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 314 | + } |
|
| 287 | 315 | $_SESSION['install'] = 'sources'; |
| 288 | 316 | $_SESSION['next'] = 'Insert data in source table'; |
| 289 | 317 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -304,12 +332,16 @@ discard block |
||
| 304 | 332 | if ($error != '') { |
| 305 | 333 | $_SESSION['error'] = $error; |
| 306 | 334 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data')); |
| 307 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 335 | + } else { |
|
| 336 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 337 | + } |
|
| 308 | 338 | } else { |
| 309 | 339 | if ($error != '') { |
| 310 | 340 | $_SESSION['error'] = $error; |
| 311 | 341 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)')); |
| 312 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 342 | + } else { |
|
| 343 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 344 | + } |
|
| 313 | 345 | } |
| 314 | 346 | if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 315 | 347 | $_SESSION['install'] = 'owner'; |
@@ -357,7 +389,9 @@ discard block |
||
| 357 | 389 | $Source = new Source(); |
| 358 | 390 | $Source->deleteAllLocation(); |
| 359 | 391 | foreach ($sources as $src) { |
| 360 | - if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 392 | + if (isset($src['latitude']) && $src['latitude'] != '') { |
|
| 393 | + $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 394 | + } |
|
| 361 | 395 | } |
| 362 | 396 | $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
| 363 | 397 | unset($_SESSION['sources']); |
@@ -368,15 +402,21 @@ discard block |
||
| 368 | 402 | */ |
| 369 | 403 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 370 | 404 | $_SESSION['install'] = 'vatsim'; |
| 371 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 372 | - else $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 405 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 406 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 407 | + } else { |
|
| 408 | + $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 409 | + } |
|
| 373 | 410 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 374 | 411 | $_SESSION['install'] = 'vatsim'; |
| 375 | 412 | $_SESSION['next'] = 'Insert VATSIM data'; |
| 376 | 413 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 377 | 414 | $_SESSION['install'] = 'vatsim'; |
| 378 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 379 | - else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 415 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 416 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 417 | + } else { |
|
| 418 | + $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 419 | + } |
|
| 380 | 420 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 381 | 421 | $_SESSION['install'] = 'vatsim'; |
| 382 | 422 | $_SESSION['next'] = 'Insert phpVMS data'; |
@@ -397,33 +437,43 @@ discard block |
||
| 397 | 437 | if ($error != '') { |
| 398 | 438 | $_SESSION['error'] = $error; |
| 399 | 439 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
| 400 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 440 | + } else { |
|
| 441 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 442 | + } |
|
| 401 | 443 | } else { |
| 402 | 444 | $error .= update_db::update_vatsim(); |
| 403 | 445 | if ($error != '') { |
| 404 | 446 | $_SESSION['error'] = $error; |
| 405 | 447 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
| 406 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 448 | + } else { |
|
| 449 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 450 | + } |
|
| 407 | 451 | } |
| 408 | 452 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 409 | 453 | $error .= update_db::update_vatsim(); |
| 410 | 454 | if ($error != '') { |
| 411 | 455 | $_SESSION['error'] = $error; |
| 412 | 456 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
| 413 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 457 | + } else { |
|
| 458 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 459 | + } |
|
| 414 | 460 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 415 | 461 | if (file_exists('tmp/ivae_feb2013.zip')) { |
| 416 | 462 | $error .= update_db::update_IVAO(); |
| 417 | 463 | if ($error != '') { |
| 418 | 464 | $_SESSION['error'] = $error; |
| 419 | 465 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
| 420 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 466 | + } else { |
|
| 467 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 468 | + } |
|
| 421 | 469 | } else { |
| 422 | 470 | $error .= update_db::update_vatsim(); |
| 423 | 471 | if ($error != '') { |
| 424 | 472 | $_SESSION['error'] = $error; |
| 425 | 473 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)')); |
| 426 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 474 | + } else { |
|
| 475 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 476 | + } |
|
| 427 | 477 | } |
| 428 | 478 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 429 | 479 | $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data')); |
@@ -84,9 +84,9 @@ discard block |
||
| 84 | 84 | if ($check_version == '0') { |
| 85 | 85 | |
| 86 | 86 | if ($globalDBdriver == 'mysql') { |
| 87 | - $error .= create_db::import_all_db('../db/'); |
|
| 87 | + $error .= create_db::import_all_db('../db/'); |
|
| 88 | 88 | } elseif ($globalDBdriver == 'pgsql') { |
| 89 | - $error .= create_db::import_all_db('../db/pgsql/'); |
|
| 89 | + $error .= create_db::import_all_db('../db/pgsql/'); |
|
| 90 | 90 | } |
| 91 | 91 | if ($error != '') { |
| 92 | 92 | $_SESSION['error'] = $error; |
@@ -96,8 +96,8 @@ discard block |
||
| 96 | 96 | $_SESSION['install'] = 'populate'; |
| 97 | 97 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
| 98 | 98 | } else { |
| 99 | - $_SESSION['install'] = 'sources'; |
|
| 100 | - $_SESSION['next'] = 'Insert data in source table'; |
|
| 99 | + $_SESSION['install'] = 'sources'; |
|
| 100 | + $_SESSION['next'] = 'Insert data in source table'; |
|
| 101 | 101 | } |
| 102 | 102 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
| 103 | 103 | print json_encode($result); |
@@ -149,21 +149,21 @@ discard block |
||
| 149 | 149 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
| 150 | 150 | } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
| 151 | 151 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 152 | - $_SESSION['install'] = 'notam'; |
|
| 153 | - $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
|
| 154 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 155 | - print json_encode($result); |
|
| 152 | + $_SESSION['install'] = 'notam'; |
|
| 153 | + $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
|
| 154 | + $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 155 | + print json_encode($result); |
|
| 156 | 156 | } elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 157 | - $_SESSION['install'] = 'owner'; |
|
| 158 | - $_SESSION['next'] = 'Populate owner table with externals data'; |
|
| 159 | - unset($_SESSION['owner']); |
|
| 160 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 161 | - print json_encode($result); |
|
| 157 | + $_SESSION['install'] = 'owner'; |
|
| 158 | + $_SESSION['next'] = 'Populate owner table with externals data'; |
|
| 159 | + unset($_SESSION['owner']); |
|
| 160 | + $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 161 | + print json_encode($result); |
|
| 162 | 162 | } else { |
| 163 | - $_SESSION['install'] = 'sources'; |
|
| 164 | - $_SESSION['next'] = 'Insert data in source table'; |
|
| 165 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 166 | - print json_encode($result); |
|
| 163 | + $_SESSION['install'] = 'sources'; |
|
| 164 | + $_SESSION['next'] = 'Insert data in source table'; |
|
| 165 | + $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 166 | + print json_encode($result); |
|
| 167 | 167 | } |
| 168 | 168 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') { |
| 169 | 169 | if (!is_writable('tmp')) { |
@@ -70,15 +70,15 @@ discard block |
||
| 70 | 70 | $globalDebug = FALSE; |
| 71 | 71 | $dbroot = $_SESSION['database_root']; |
| 72 | 72 | $dbrootpass = $_SESSION['database_rootpass']; |
| 73 | - $error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost); |
|
| 73 | + $error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost); |
|
| 74 | 74 | sleep(5); |
| 75 | 75 | if ($error != '') { |
| 76 | 76 | $_SESSION['error'] = $error; |
| 77 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database')); |
|
| 78 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 77 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create database')); |
|
| 78 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create database')); |
|
| 79 | 79 | $_SESSION['install'] = 'database_import'; |
| 80 | 80 | $_SESSION['next'] = 'Create and import tables'; |
| 81 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 81 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 82 | 82 | print json_encode($result); |
| 83 | 83 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') { |
| 84 | 84 | $globalDebug = FALSE; |
@@ -92,8 +92,8 @@ discard block |
||
| 92 | 92 | } |
| 93 | 93 | if ($error != '') { |
| 94 | 94 | $_SESSION['error'] = $error; |
| 95 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables')); |
|
| 96 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 95 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables')); |
|
| 96 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables')); |
|
| 97 | 97 | if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 98 | 98 | $_SESSION['install'] = 'populate'; |
| 99 | 99 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
@@ -101,23 +101,23 @@ discard block |
||
| 101 | 101 | $_SESSION['install'] = 'sources'; |
| 102 | 102 | $_SESSION['next'] = 'Insert data in source table'; |
| 103 | 103 | } |
| 104 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 104 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 105 | 105 | print json_encode($result); |
| 106 | 106 | } elseif (!is_numeric($check_version)) { |
| 107 | 107 | $error .= $check_version; |
| 108 | 108 | $_SESSION['error'] = $error; |
| 109 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables')); |
|
| 110 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 109 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables')); |
|
| 110 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 111 | 111 | print json_encode($result); |
| 112 | 112 | } else { |
| 113 | 113 | $error .= update_schema::check_version(true); |
| 114 | 114 | if ($error != '') { |
| 115 | 115 | $_SESSION['error'] = $error; |
| 116 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed')); |
|
| 117 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 116 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Update schema if needed')); |
|
| 117 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed')); |
|
| 118 | 118 | $_SESSION['install'] = 'sources'; |
| 119 | 119 | $_SESSION['next'] = 'Insert data in source table'; |
| 120 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 120 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 121 | 121 | print json_encode($result); |
| 122 | 122 | } |
| 123 | 123 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') { |
@@ -126,11 +126,11 @@ discard block |
||
| 126 | 126 | $error .= update_db::update_waypoints(); |
| 127 | 127 | if ($error != '') { |
| 128 | 128 | $_SESSION['error'] = $error; |
| 129 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database')); |
|
| 130 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 129 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate waypoints database')); |
|
| 130 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database')); |
|
| 131 | 131 | $_SESSION['install'] = 'airspace'; |
| 132 | 132 | $_SESSION['next'] = 'Populate airspace table'; |
| 133 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 133 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 134 | 134 | print json_encode($result); |
| 135 | 135 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') { |
| 136 | 136 | include_once('class.update_db.php'); |
@@ -138,11 +138,11 @@ discard block |
||
| 138 | 138 | $error .= update_db::update_airspace_fam(); |
| 139 | 139 | if ($error != '') { |
| 140 | 140 | $_SESSION['error'] = $error; |
| 141 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate airspace database')); |
|
| 142 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database')); |
|
| 141 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate airspace database')); |
|
| 142 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database')); |
|
| 143 | 143 | $_SESSION['install'] = 'countries'; |
| 144 | 144 | $_SESSION['next'] = 'Populate countries table'; |
| 145 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 145 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 146 | 146 | print json_encode($result); |
| 147 | 147 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') { |
| 148 | 148 | include_once('class.update_db.php'); |
@@ -150,31 +150,31 @@ discard block |
||
| 150 | 150 | $error .= update_db::update_countries(); |
| 151 | 151 | if ($error != '') { |
| 152 | 152 | $_SESSION['error'] = $error; |
| 153 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
|
| 154 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 153 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate countries database')); |
|
| 154 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database')); |
|
| 155 | 155 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 156 | 156 | $_SESSION['install'] = 'notam'; |
| 157 | 157 | $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
| 158 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 158 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 159 | 159 | print json_encode($result); |
| 160 | 160 | } elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 161 | 161 | $_SESSION['install'] = 'owner'; |
| 162 | 162 | $_SESSION['next'] = 'Populate owner table with externals data'; |
| 163 | 163 | unset($_SESSION['owner']); |
| 164 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 164 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 165 | 165 | print json_encode($result); |
| 166 | 166 | } else { |
| 167 | 167 | $_SESSION['install'] = 'sources'; |
| 168 | 168 | $_SESSION['next'] = 'Insert data in source table'; |
| 169 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 169 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 170 | 170 | print json_encode($result); |
| 171 | 171 | } |
| 172 | 172 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') { |
| 173 | 173 | if (!is_writable('tmp')) { |
| 174 | 174 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 175 | 175 | $_SESSION['error'] = $error; |
| 176 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 177 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 176 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 177 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 178 | 178 | print json_encode($result); |
| 179 | 179 | } else { |
| 180 | 180 | include_once('class.update_db.php'); |
@@ -182,19 +182,19 @@ discard block |
||
| 182 | 182 | $error .= update_db::update_ModeS_fam(); |
| 183 | 183 | if ($error != '') { |
| 184 | 184 | $_SESSION['error'] = $error; |
| 185 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 186 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 185 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 186 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 187 | 187 | $_SESSION['install'] = 'populate_flarm'; |
| 188 | 188 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM'; |
| 189 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 189 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 190 | 190 | print json_encode($result); |
| 191 | 191 | } |
| 192 | 192 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') { |
| 193 | 193 | if (!is_writable('tmp')) { |
| 194 | 194 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 195 | 195 | $_SESSION['error'] = $error; |
| 196 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 197 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 196 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 197 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 198 | 198 | print json_encode($result); |
| 199 | 199 | } else { |
| 200 | 200 | include_once('class.update_db.php'); |
@@ -203,8 +203,8 @@ discard block |
||
| 203 | 203 | $error .= update_db::update_ModeS_ogn(); |
| 204 | 204 | if ($error != '') { |
| 205 | 205 | $_SESSION['error'] = $error; |
| 206 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 207 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 206 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 207 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 208 | 208 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 209 | 209 | $_SESSION['install'] = 'vatsim'; |
| 210 | 210 | if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
@@ -223,15 +223,15 @@ discard block |
||
| 223 | 223 | $_SESSION['install'] = 'routes'; |
| 224 | 224 | $_SESSION['next'] = 'Populate routes table with externals data'; |
| 225 | 225 | } |
| 226 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 226 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 227 | 227 | print json_encode($result); |
| 228 | 228 | } |
| 229 | 229 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') { |
| 230 | 230 | if (!is_writable('tmp')) { |
| 231 | 231 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 232 | 232 | $_SESSION['error'] = $error; |
| 233 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 234 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 233 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 234 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 235 | 235 | print json_encode($result); |
| 236 | 236 | } else { |
| 237 | 237 | include_once('class.update_db.php'); |
@@ -239,19 +239,19 @@ discard block |
||
| 239 | 239 | $error .= update_db::update_routes_fam(); |
| 240 | 240 | if ($error != '') { |
| 241 | 241 | $_SESSION['error'] = $error; |
| 242 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data')); |
|
| 243 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 242 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate routes table with externals data')); |
|
| 243 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data')); |
|
| 244 | 244 | $_SESSION['install'] = 'translation'; |
| 245 | 245 | $_SESSION['next'] = 'Populate translation table with externals data'; |
| 246 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 246 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 247 | 247 | print json_encode($result); |
| 248 | 248 | } |
| 249 | 249 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') { |
| 250 | 250 | if (!is_writable('tmp')) { |
| 251 | 251 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 252 | 252 | $_SESSION['error'] = $error; |
| 253 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data')); |
|
| 254 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 253 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data')); |
|
| 254 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 255 | 255 | print json_encode($result); |
| 256 | 256 | } else { |
| 257 | 257 | include_once('class.update_db.php'); |
@@ -259,8 +259,8 @@ discard block |
||
| 259 | 259 | $error .= update_db::update_translation_fam(); |
| 260 | 260 | if ($error != '') { |
| 261 | 261 | $_SESSION['error'] = $error; |
| 262 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data')); |
|
| 263 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 262 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data')); |
|
| 263 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data')); |
|
| 264 | 264 | if ($_SESSION['waypoints'] == 1) { |
| 265 | 265 | $_SESSION['install'] = 'waypoints'; |
| 266 | 266 | $_SESSION['next'] = 'Populate waypoints table'; |
@@ -276,15 +276,15 @@ discard block |
||
| 276 | 276 | $_SESSION['install'] = 'sources'; |
| 277 | 277 | $_SESSION['next'] = 'Insert data in source table'; |
| 278 | 278 | } |
| 279 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 279 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 280 | 280 | print json_encode($result); |
| 281 | 281 | } |
| 282 | 282 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') { |
| 283 | 283 | if (!is_writable('tmp')) { |
| 284 | 284 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 285 | 285 | $_SESSION['error'] = $error; |
| 286 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data')); |
|
| 287 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 286 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data')); |
|
| 287 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 288 | 288 | print json_encode($result); |
| 289 | 289 | } else { |
| 290 | 290 | include_once('class.update_db.php'); |
@@ -292,19 +292,19 @@ discard block |
||
| 292 | 292 | $error = update_db::update_owner_fam(); |
| 293 | 293 | if ($error != '') { |
| 294 | 294 | $_SESSION['error'] = $error; |
| 295 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data')); |
|
| 296 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 295 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data')); |
|
| 296 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data')); |
|
| 297 | 297 | $_SESSION['install'] = 'sources'; |
| 298 | 298 | $_SESSION['next'] = 'Insert data in source table'; |
| 299 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 299 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 300 | 300 | print json_encode($result); |
| 301 | 301 | } |
| 302 | 302 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') { |
| 303 | 303 | if (!is_writable('tmp')) { |
| 304 | 304 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 305 | 305 | $_SESSION['error'] = $error; |
| 306 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data')); |
|
| 307 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 306 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data')); |
|
| 307 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 308 | 308 | print json_encode($result); |
| 309 | 309 | } else { |
| 310 | 310 | include_once('class.update_db.php'); |
@@ -313,24 +313,24 @@ discard block |
||
| 313 | 313 | $error .= update_db::update_notam(); |
| 314 | 314 | if ($error != '') { |
| 315 | 315 | $_SESSION['error'] = $error; |
| 316 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data')); |
|
| 317 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 316 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data')); |
|
| 317 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data')); |
|
| 318 | 318 | } else { |
| 319 | 319 | if ($error != '') { |
| 320 | 320 | $_SESSION['error'] = $error; |
| 321 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)')); |
|
| 322 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 321 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data (no source defined)')); |
|
| 322 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)')); |
|
| 323 | 323 | } |
| 324 | 324 | if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 325 | 325 | $_SESSION['install'] = 'owner'; |
| 326 | 326 | $_SESSION['next'] = 'Populate owner table'; |
| 327 | 327 | unset($_SESSION['owner']); |
| 328 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 328 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 329 | 329 | print json_encode($result); |
| 330 | 330 | } else { |
| 331 | 331 | $_SESSION['install'] = 'sources'; |
| 332 | 332 | $_SESSION['next'] = 'Insert data in source table'; |
| 333 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 333 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 334 | 334 | print json_encode($result); |
| 335 | 335 | } |
| 336 | 336 | } |
@@ -367,9 +367,9 @@ discard block |
||
| 367 | 367 | $Source = new Source(); |
| 368 | 368 | $Source->deleteAllLocation(); |
| 369 | 369 | foreach ($sources as $src) { |
| 370 | - if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 370 | + if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png'); |
|
| 371 | 371 | } |
| 372 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
|
| 372 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table')); |
|
| 373 | 373 | unset($_SESSION['sources']); |
| 374 | 374 | } |
| 375 | 375 | /* |
@@ -394,7 +394,7 @@ discard block |
||
| 394 | 394 | $_SESSION['install'] = 'finish'; |
| 395 | 395 | $_SESSION['next'] = 'finish'; |
| 396 | 396 | } |
| 397 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 397 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 398 | 398 | print json_encode($result); |
| 399 | 399 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') { |
| 400 | 400 | include_once('../install/class.create_db.php'); |
@@ -406,48 +406,48 @@ discard block |
||
| 406 | 406 | $error .= update_db::update_IVAO(); |
| 407 | 407 | if ($error != '') { |
| 408 | 408 | $_SESSION['error'] = $error; |
| 409 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
|
| 410 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 409 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data')); |
|
| 410 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data')); |
|
| 411 | 411 | } else { |
| 412 | 412 | $error .= update_db::update_vatsim(); |
| 413 | 413 | if ($error != '') { |
| 414 | 414 | $_SESSION['error'] = $error; |
| 415 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
|
| 416 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 415 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data')); |
|
| 416 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data')); |
|
| 417 | 417 | } |
| 418 | 418 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 419 | 419 | $error .= update_db::update_vatsim(); |
| 420 | 420 | if ($error != '') { |
| 421 | 421 | $_SESSION['error'] = $error; |
| 422 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
|
| 423 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 422 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data')); |
|
| 423 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data')); |
|
| 424 | 424 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 425 | 425 | if (file_exists('tmp/ivae_feb2013.zip')) { |
| 426 | 426 | $error .= update_db::update_IVAO(); |
| 427 | 427 | if ($error != '') { |
| 428 | 428 | $_SESSION['error'] = $error; |
| 429 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
|
| 430 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 429 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data')); |
|
| 430 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data')); |
|
| 431 | 431 | } else { |
| 432 | 432 | $error .= update_db::update_vatsim(); |
| 433 | 433 | if ($error != '') { |
| 434 | 434 | $_SESSION['error'] = $error; |
| 435 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)')); |
|
| 436 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 435 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data (IVAO not found)')); |
|
| 436 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)')); |
|
| 437 | 437 | } |
| 438 | 438 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 439 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data')); |
|
| 439 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data')); |
|
| 440 | 440 | } |
| 441 | 441 | //$_SESSION['install'] = 'routes'; |
| 442 | 442 | //$_SESSION['next'] = 'Populate routes table with externals data'; |
| 443 | 443 | $_SESSION['install'] = 'finish'; |
| 444 | 444 | $_SESSION['next'] = 'finish'; |
| 445 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 445 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 446 | 446 | print json_encode($result); |
| 447 | 447 | } else { |
| 448 | 448 | //unset($_SESSION['install']); |
| 449 | 449 | $_SESSION['error'] = 'Unknwon task : '.$_SESSION['install']; |
| 450 | - $result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish'); |
|
| 450 | + $result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish'); |
|
| 451 | 451 | print json_encode($result); |
| 452 | 452 | } |
| 453 | 453 | ?> |
| 454 | 454 | \ No newline at end of file |
@@ -8,25 +8,25 @@ discard block |
||
| 8 | 8 | * @param string $filename |
| 9 | 9 | */ |
| 10 | 10 | public static function import_file($filename) { |
| 11 | - $filename = filter_var($filename,FILTER_SANITIZE_STRING); |
|
| 11 | + $filename = filter_var($filename, FILTER_SANITIZE_STRING); |
|
| 12 | 12 | $Connection = new Connection(); |
| 13 | 13 | if (!$Connection->connectionExists()) return 'error: DB connection failed'; |
| 14 | 14 | //Connection::$db->beginTransaction(); |
| 15 | 15 | $templine = ''; |
| 16 | - $handle = @fopen($filename,"r"); |
|
| 16 | + $handle = @fopen($filename, "r"); |
|
| 17 | 17 | if ($handle) { |
| 18 | 18 | //$lines = file($filename); |
| 19 | 19 | //foreach ($lines as $line) |
| 20 | - while (($line = fgets($handle,4096)) !== false) |
|
| 20 | + while (($line = fgets($handle, 4096)) !== false) |
|
| 21 | 21 | { |
| 22 | - if (substr($line,0,2) == '--' || $line == '') continue; |
|
| 22 | + if (substr($line, 0, 2) == '--' || $line == '') continue; |
|
| 23 | 23 | $templine .= $line; |
| 24 | - if (substr(trim($line), -1,1) == ';') |
|
| 24 | + if (substr(trim($line), -1, 1) == ';') |
|
| 25 | 25 | { |
| 26 | 26 | try { |
| 27 | 27 | $sth = $Connection->db->prepare($templine); |
| 28 | 28 | $sth->execute(); |
| 29 | - } catch(PDOException $e) { |
|
| 29 | + } catch (PDOException $e) { |
|
| 30 | 30 | return "error (import ".$filename.") : ".$e->getMessage()."\n"; |
| 31 | 31 | } |
| 32 | 32 | $templine = ''; |
@@ -43,21 +43,21 @@ discard block |
||
| 43 | 43 | $error = ''; |
| 44 | 44 | $dh = opendir($directory); |
| 45 | 45 | //foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename) |
| 46 | - while(false !== ($filename = readdir($dh))) |
|
| 46 | + while (false !== ($filename = readdir($dh))) |
|
| 47 | 47 | { |
| 48 | - if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename); |
|
| 48 | + if (preg_match('/\.sql$/', $filename)) $error .= create_db::import_file($directory.$filename); |
|
| 49 | 49 | } |
| 50 | 50 | return $error; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - public static function create_database($root,$root_pass,$user,$pass,$db,$db_type,$host,$port = '') { |
|
| 54 | - $root = filter_var($root,FILTER_SANITIZE_STRING); |
|
| 55 | - $root_pass = filter_var($root_pass,FILTER_SANITIZE_STRING); |
|
| 56 | - $user = filter_var($user,FILTER_SANITIZE_STRING); |
|
| 57 | - $password = filter_var($pass,FILTER_SANITIZE_STRING); |
|
| 58 | - $db = filter_var($db,FILTER_SANITIZE_STRING); |
|
| 59 | - $db_type = filter_var($db_type,FILTER_SANITIZE_STRING); |
|
| 60 | - $host = filter_var($host,FILTER_SANITIZE_STRING); |
|
| 53 | + public static function create_database($root, $root_pass, $user, $pass, $db, $db_type, $host, $port = '') { |
|
| 54 | + $root = filter_var($root, FILTER_SANITIZE_STRING); |
|
| 55 | + $root_pass = filter_var($root_pass, FILTER_SANITIZE_STRING); |
|
| 56 | + $user = filter_var($user, FILTER_SANITIZE_STRING); |
|
| 57 | + $password = filter_var($pass, FILTER_SANITIZE_STRING); |
|
| 58 | + $db = filter_var($db, FILTER_SANITIZE_STRING); |
|
| 59 | + $db_type = filter_var($db_type, FILTER_SANITIZE_STRING); |
|
| 60 | + $host = filter_var($host, FILTER_SANITIZE_STRING); |
|
| 61 | 61 | if ($db_type == 'mysql' && $port == '') $port = 3306; |
| 62 | 62 | elseif ($port == '') $port = 5432; |
| 63 | 63 | // Dirty hack |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | $grantright = $_SERVER['SERVER_ADDR']; |
| 66 | 66 | } else $grantright = 'localhost'; |
| 67 | 67 | try { |
| 68 | - if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1',$root,$root_pass); |
|
| 69 | - else $dbh = new PDO($db_type.':host='.$host.';port='.$port,$root,$root_pass); |
|
| 68 | + if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1', $root, $root_pass); |
|
| 69 | + else $dbh = new PDO($db_type.':host='.$host.';port='.$port, $root, $root_pass); |
|
| 70 | 70 | $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 71 | 71 | if ($db_type == 'mysql') { |
| 72 | 72 | $dbh->exec('CREATE DATABASE IF NOT EXISTS `'.$db.'`;GRANT ALL ON `'.$db."`.* TO '".$user."'@'".$grantright."' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;"); |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | $dbh->exec("CREATE USER ".$user." WITH PASSWORD '".$password."'; |
| 77 | 77 | GRANT ALL PRIVILEGES ON DATABASE ".$db." TO ".$user.";"); |
| 78 | 78 | } |
| 79 | - } catch(PDOException $e) { |
|
| 79 | + } catch (PDOException $e) { |
|
| 80 | 80 | $dbh = null; |
| 81 | 81 | return "error : ".$e->getMessage(); |
| 82 | 82 | } |
@@ -10,7 +10,9 @@ discard block |
||
| 10 | 10 | public static function import_file($filename) { |
| 11 | 11 | $filename = filter_var($filename,FILTER_SANITIZE_STRING); |
| 12 | 12 | $Connection = new Connection(); |
| 13 | - if (!$Connection->connectionExists()) return 'error: DB connection failed'; |
|
| 13 | + if (!$Connection->connectionExists()) { |
|
| 14 | + return 'error: DB connection failed'; |
|
| 15 | + } |
|
| 14 | 16 | //Connection::$db->beginTransaction(); |
| 15 | 17 | $templine = ''; |
| 16 | 18 | $handle = @fopen($filename,"r"); |
@@ -19,7 +21,9 @@ discard block |
||
| 19 | 21 | //foreach ($lines as $line) |
| 20 | 22 | while (($line = fgets($handle,4096)) !== false) |
| 21 | 23 | { |
| 22 | - if (substr($line,0,2) == '--' || $line == '') continue; |
|
| 24 | + if (substr($line,0,2) == '--' || $line == '') { |
|
| 25 | + continue; |
|
| 26 | + } |
|
| 23 | 27 | $templine .= $line; |
| 24 | 28 | if (substr(trim($line), -1,1) == ';') |
| 25 | 29 | { |
@@ -45,7 +49,9 @@ discard block |
||
| 45 | 49 | //foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)) as $filename) |
| 46 | 50 | while(false !== ($filename = readdir($dh))) |
| 47 | 51 | { |
| 48 | - if (preg_match('/\.sql$/',$filename)) $error .= create_db::import_file($directory.$filename); |
|
| 52 | + if (preg_match('/\.sql$/',$filename)) { |
|
| 53 | + $error .= create_db::import_file($directory.$filename); |
|
| 54 | + } |
|
| 49 | 55 | } |
| 50 | 56 | return $error; |
| 51 | 57 | } |
@@ -58,19 +64,29 @@ discard block |
||
| 58 | 64 | $db = filter_var($db,FILTER_SANITIZE_STRING); |
| 59 | 65 | $db_type = filter_var($db_type,FILTER_SANITIZE_STRING); |
| 60 | 66 | $host = filter_var($host,FILTER_SANITIZE_STRING); |
| 61 | - if ($db_type == 'mysql' && $port == '') $port = 3306; |
|
| 62 | - elseif ($port == '') $port = 5432; |
|
| 67 | + if ($db_type == 'mysql' && $port == '') { |
|
| 68 | + $port = 3306; |
|
| 69 | + } elseif ($port == '') { |
|
| 70 | + $port = 5432; |
|
| 71 | + } |
|
| 63 | 72 | // Dirty hack |
| 64 | 73 | if ($host != 'localhost' && $host != '127.0.0.1') { |
| 65 | 74 | $grantright = $_SERVER['SERVER_ADDR']; |
| 66 | - } else $grantright = 'localhost'; |
|
| 75 | + } else { |
|
| 76 | + $grantright = 'localhost'; |
|
| 77 | + } |
|
| 67 | 78 | try { |
| 68 | - if ($host == 'localhost') $dbh = new PDO($db_type.':host=127.0.0.1',$root,$root_pass); |
|
| 69 | - else $dbh = new PDO($db_type.':host='.$host.';port='.$port,$root,$root_pass); |
|
| 79 | + if ($host == 'localhost') { |
|
| 80 | + $dbh = new PDO($db_type.':host=127.0.0.1',$root,$root_pass); |
|
| 81 | + } else { |
|
| 82 | + $dbh = new PDO($db_type.':host='.$host.';port='.$port,$root,$root_pass); |
|
| 83 | + } |
|
| 70 | 84 | $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
| 71 | 85 | if ($db_type == 'mysql') { |
| 72 | 86 | $dbh->exec('CREATE DATABASE IF NOT EXISTS `'.$db.'`;GRANT ALL ON `'.$db."`.* TO '".$user."'@'".$grantright."' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;"); |
| 73 | - if ($grantright == 'localhost') $dbh->exec('GRANT ALL ON `'.$db."`.* TO '".$user."'@'127.0.0.1' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;"); |
|
| 87 | + if ($grantright == 'localhost') { |
|
| 88 | + $dbh->exec('GRANT ALL ON `'.$db."`.* TO '".$user."'@'127.0.0.1' IDENTIFIED BY '".$password."';FLUSH PRIVILEGES;"); |
|
| 89 | + } |
|
| 74 | 90 | } else if ($db_type == 'pgsql') { |
| 75 | 91 | $dbh->exec("CREATE DATABASE ".$db.";"); |
| 76 | 92 | $dbh->exec("CREATE USER ".$user." WITH PASSWORD '".$password."'; |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | header('Content-disposition: attachment; filename="flightairmap-sat.json"'); |
| 14 | 14 | } |
| 15 | 15 | } |
| 16 | -$history = urldecode(filter_input(INPUT_GET,'history',FILTER_SANITIZE_STRING)); |
|
| 16 | +$history = urldecode(filter_input(INPUT_GET, 'history', FILTER_SANITIZE_STRING)); |
|
| 17 | 17 | header('Content-Type: text/javascript'); |
| 18 | 18 | |
| 19 | 19 | $begintime = microtime(true); |
@@ -21,10 +21,10 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | $spotter_array = array(); |
| 23 | 23 | if (isset($_COOKIE['sattypes']) && $_COOKIE['sattypes'] != '') { |
| 24 | - $sattypes = explode(',',$_COOKIE['sattypes']); |
|
| 24 | + $sattypes = explode(',', $_COOKIE['sattypes']); |
|
| 25 | 25 | foreach ($sattypes as $sattype) { |
| 26 | 26 | //$spotter_array = array_merge($Satellite->position_all_type($sattype,$timeb-$globalLiveInterval,$timeb),$spotter_array); |
| 27 | - $spotter_array = array_merge($Satellite->position_all_type($sattype),$spotter_array); |
|
| 27 | + $spotter_array = array_merge($Satellite->position_all_type($sattype), $spotter_array); |
|
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | //$spotter_array = array_unique($spotter_array,SORT_REGULAR); |
| 38 | 38 | //print_r($spotter_array); |
| 39 | -$sqltime = round(microtime(true)-$begintime,2); |
|
| 39 | +$sqltime = round(microtime(true) - $begintime, 2); |
|
| 40 | 40 | |
| 41 | 41 | $output = '{"type":"FeatureCollection","features":['; |
| 42 | 42 | if (!empty($spotter_array) && is_array($spotter_array)) |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | $last_name = ''; |
| 45 | 45 | $coordinatearray = ''; |
| 46 | 46 | $timearray = array(); |
| 47 | - foreach($spotter_array as $spotter_item) |
|
| 47 | + foreach ($spotter_array as $spotter_item) |
|
| 48 | 48 | { |
| 49 | 49 | $output_data = ''; |
| 50 | 50 | $output_data .= '{"type":"Feature","properties":{'; |
@@ -61,14 +61,14 @@ discard block |
||
| 61 | 61 | } |
| 62 | 62 | $output_data .= '"altitude":0,'; |
| 63 | 63 | $output_data .= '"sqt":'.$sqltime.','; |
| 64 | - $nextlatlon = $Satellite->position($spotter_item['name'],time()+$globalMapRefresh+20); |
|
| 64 | + $nextlatlon = $Satellite->position($spotter_item['name'], time() + $globalMapRefresh + 20); |
|
| 65 | 65 | $nextlat = $nextlatlon['latitude']; |
| 66 | - if (abs($nextlat-$spotter_item['latitude']) > 90) { |
|
| 66 | + if (abs($nextlat - $spotter_item['latitude']) > 90) { |
|
| 67 | 67 | if ($spotter_item['latitude'] < 0) $nexlat = -90; |
| 68 | 68 | else $nexlat = 90; |
| 69 | 69 | } |
| 70 | 70 | $nextlon = $nextlatlon['longitude']; |
| 71 | - if (abs($nextlon-$spotter_item['longitude']) > 180) { |
|
| 71 | + if (abs($nextlon - $spotter_item['longitude']) > 180) { |
|
| 72 | 72 | if ($spotter_item['longitude'] < 0) $nextlon = -180; |
| 73 | 73 | else $nextlon = 180; |
| 74 | 74 | } |
@@ -79,27 +79,27 @@ discard block |
||
| 79 | 79 | $output_data .= ']}},'; |
| 80 | 80 | $output .= $output_data; |
| 81 | 81 | if ($history == $spotter_item['name']) { |
| 82 | - $spotter_history_array = $Satellite->position($spotter_item['name'],time()-6000,time()); |
|
| 82 | + $spotter_history_array = $Satellite->position($spotter_item['name'], time() - 6000, time()); |
|
| 83 | 83 | $spotter_history_array = array_reverse($spotter_history_array); |
| 84 | 84 | $output_history = '{"type": "Feature","properties": {"callsign": "'.$spotter_item['name'].'","type": "history"},"geometry": {"type": "LineString","coordinates": ['; |
| 85 | 85 | foreach ($spotter_history_array as $key => $spotter_history) { |
| 86 | - if ((isset($previous_lon) && abs($previous_lon-$spotter_history['longitude']) > 180) || (isset($previous_lat) && abs($previous_lat-$spotter_history['latitude']) > 90)) { |
|
| 86 | + if ((isset($previous_lon) && abs($previous_lon - $spotter_history['longitude']) > 180) || (isset($previous_lat) && abs($previous_lat - $spotter_history['latitude']) > 90)) { |
|
| 87 | 87 | break; |
| 88 | 88 | } |
| 89 | 89 | $output_history .= '['; |
| 90 | - $output_history .= $spotter_history['longitude'].', '; |
|
| 91 | - $output_history .= $spotter_history['latitude']; |
|
| 90 | + $output_history .= $spotter_history['longitude'].', '; |
|
| 91 | + $output_history .= $spotter_history['latitude']; |
|
| 92 | 92 | $output_history .= '],'; |
| 93 | 93 | $previous_lon = $spotter_history['longitude']; |
| 94 | 94 | $previous_lat = $spotter_history['latitude']; |
| 95 | 95 | } |
| 96 | - $output_history = substr($output_history,0,-1); |
|
| 96 | + $output_history = substr($output_history, 0, -1); |
|
| 97 | 97 | $output_history .= ']}},'; |
| 98 | 98 | $output .= $output_history; |
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | -if (isset($output_data)) $output = substr($output,0,-1); |
|
| 102 | +if (isset($output_data)) $output = substr($output, 0, -1); |
|
| 103 | 103 | $output .= ']}'; |
| 104 | 104 | print $output; |
| 105 | 105 | ?> |
@@ -64,13 +64,19 @@ discard block |
||
| 64 | 64 | $nextlatlon = $Satellite->position($spotter_item['name'],time()+$globalMapRefresh+20); |
| 65 | 65 | $nextlat = $nextlatlon['latitude']; |
| 66 | 66 | if (abs($nextlat-$spotter_item['latitude']) > 90) { |
| 67 | - if ($spotter_item['latitude'] < 0) $nexlat = -90; |
|
| 68 | - else $nexlat = 90; |
|
| 67 | + if ($spotter_item['latitude'] < 0) { |
|
| 68 | + $nexlat = -90; |
|
| 69 | + } else { |
|
| 70 | + $nexlat = 90; |
|
| 71 | + } |
|
| 69 | 72 | } |
| 70 | 73 | $nextlon = $nextlatlon['longitude']; |
| 71 | 74 | if (abs($nextlon-$spotter_item['longitude']) > 180) { |
| 72 | - if ($spotter_item['longitude'] < 0) $nextlon = -180; |
|
| 73 | - else $nextlon = 180; |
|
| 75 | + if ($spotter_item['longitude'] < 0) { |
|
| 76 | + $nextlon = -180; |
|
| 77 | + } else { |
|
| 78 | + $nextlon = 180; |
|
| 79 | + } |
|
| 74 | 80 | } |
| 75 | 81 | $output_data .= '"nextlatlon":['.$nextlat.','.$nextlon.']},'; |
| 76 | 82 | //$output_data .= '"heading":"'.$Common->getHeading($spotter_item['latitude'],$spotter_item['longitude'],$nextlatlon['latitude'],$nextlatlon['longitude']).'",'; |
@@ -99,7 +105,9 @@ discard block |
||
| 99 | 105 | } |
| 100 | 106 | } |
| 101 | 107 | } |
| 102 | -if (isset($output_data)) $output = substr($output,0,-1); |
|
| 108 | +if (isset($output_data)) { |
|
| 109 | + $output = substr($output,0,-1); |
|
| 110 | +} |
|
| 103 | 111 | $output .= ']}'; |
| 104 | 112 | print $output; |
| 105 | 113 | ?> |
